2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed typo in Larxus's dialogue (champion's challenge)

Browse source
This commit is contained in:
oftheshire 2025-11-25 07:28:09 +00:00 • committed by Ryan
parent e6b1203be4
commit 4b3cfae309
3 changed files with 30 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Server/src/main/content/global/activity/cchallange/ChampionChallengeListener.kt
View file

@ -45,35 +45,35 @@ class ChampionChallengeListener : InteractionListener, MapArea {
private val IMP_SCROLL_TEXT = arrayOf( private val IMP_SCROLL_TEXT = arrayOf(
"How about picking on someone your own size? I'll", "How about picking on someone your own size? I'll",
"see you at the Champion's Guild.", "see you at the Champions' Guild.",
"", "",
"Champion of Imps" "Champion of Imps"
) )
private val GOBLIN_SCROLL_TEXT = arrayOf( private val GOBLIN_SCROLL_TEXT = arrayOf(
"Fight me if you think you can human, I'll wait", "Fight me if you think you can human, I'll wait",
"for you in the Champion's Guild.", "for you in the Champions' Guild.",
"", "",
"Champion of Goblins" "Champion of Goblins"
) )
private val SKELETON_SCROLL_TEXT = arrayOf( private val SKELETON_SCROLL_TEXT = arrayOf(
"I'll be waiting at the Champions' Guild to", "I'll be waiting at the Champions' Guild to collect",
"collect your bones.", "your bones.",
"", "",
"Champion of Skeletons" "Champion of Skeletons"
) )
private val ZOMBIE_SCROLL_TEXT = arrayOf( private val ZOMBIE_SCROLL_TEXT = arrayOf(
"You come to Champions' Guild, you fight me,", "You come to Champions' Guild, you fight me, I",
"I squish you, I get brains!", "squish you, I get brains!",
"", "",
"Champion of Zombies" "Champion of Zombies"
) )
private val GIANT_SCROLL_TEXT = arrayOf( private val GIANT_SCROLL_TEXT = arrayOf(
"Get yourself to the Champions' Guild, if you", "Get yourself to the Champions' Guild, if you dare",
"dare to face me puny human.", "to face me puny human.",
"", "",
"Champion of Giants" "Champion of Giants"
) )
@ -93,21 +93,22 @@ class ChampionChallengeListener : InteractionListener, MapArea {
) )
private val EARTH_WARRIOR_TEXT = arrayOf( private val EARTH_WARRIOR_TEXT = arrayOf(
"I challenge you to a duel, come to the arena beneath", "I challenge you to a duel, come to the arena",
"the Champion's Guild and fight me if you dare.", "beneath the Champions' Guild and fight me if you",
"dare.",
"", "",
"Champion of Earth Warriors" "Champion of Earth Warriors"
) )
private val JOGRE_SCROLL_TEXT = arrayOf( private val JOGRE_SCROLL_TEXT = arrayOf(
"You think you can defeat me? Come to the", "You think you can defeat me? Come to the",
"Champion's Guild and prove it!", "Champions' Guild and prove it!",
"", "",
"Champion of Jogres" "Champion of Jogres"
) )
private val LESSER_DEMON_SCROLL_TEXT = arrayOf( private val LESSER_DEMON_SCROLL_TEXT = arrayOf(
"Come to the Champion's Guild so I can banish", "Come to the Champions' Guild so I can banish",
"you mortal!", "you mortal!",
"", "",
"Champion of Lesser Demons" "Champion of Lesser Demons"

26
Server/src/main/content/global/activity/cchallange/LarxusDialogue.kt
View file

@ -27,24 +27,24 @@ class LarxusDialogue(val ChallengeStart: Boolean = false) : DialogueFile() {
0 -> { 0 -> {
face(findNPC(NPCs.LARXUS_3050)!!, player!!, 1) face(findNPC(NPCs.LARXUS_3050)!!, player!!, 1)
for (i in scrolls)when{ for (i in scrolls)when{
inInventory(player!!,Items.CHAMPION_SCROLL_6798) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use prayer's. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6798) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use any Prayers. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6799) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only weapons. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6799) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're only allowed to take Weapons, no other items are allowed. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6800) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only melee combat skill. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6800) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're only allowed to use Melee attacks, no Ranged or Magic. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6801) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only magic skill. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6801) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're only allowed to use Magic attacks, no Melee or Ranged. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6802) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use melee combat skills. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6802) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use any Melee attacks. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6803) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use weapons with special attack. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6803) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use any Special Attacks. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6804) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use ranged skill. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6804) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use any Ranged attacks. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6805) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only equipment. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6805) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed any Weapons or Armour. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6806) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're allowed to use only ranged skill. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6806) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're only allowed to use Ranged attacks, no Melee or Magic. Do you still want to proceed?").also { stage = 1 }
inInventory(player!!,Items.CHAMPION_SCROLL_6807) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use magic skill. Do you still want to proceed?").also { stage = 1 } inInventory(player!!,Items.CHAMPION_SCROLL_6807) -> npcl("So you want to accept the challenge huh? Well there are some specific rules for these Champion fights. For this fight you're not allowed to use any Magic attacks. Do you still want to proceed?").also { stage = 1 }
else -> { else -> {
sendMessage(player!!, "Nothing interesting happens.").also { stage = END_DIALOGUE } } sendMessage(player!!, "Nothing interesting happens.").also { stage = END_DIALOGUE } }
} }
} }
1 -> options("Yes, let me at him!", "No, thanks I'll pass.").also { stage = 2 } 1 -> options("Yes, let me at him!", "No thanks, I'll pass.").also { stage = 2 }
2 -> when (buttonID) { 2 -> when (buttonID) {
1 -> playerl("Yes, let me at him!").also { stage = 3 } 1 -> playerl("Yes, let me at him!").also { stage = 3 }
2 -> playerl("No, thanks I'll pass.").also { stage = END_DIALOGUE } 2 -> playerl("No thanks, I'll pass.").also { stage = END_DIALOGUE }
} }
3 -> npcl("Your challenger is ready, please go down through the trapdoor when you're ready.").also { stage = 4 } 3 -> npcl("Your challenger is ready, please go down through the trapdoor when you're ready.").also { stage = 4 }
4 -> { 4 -> {
@ -65,7 +65,7 @@ class LarxusDialogue(val ChallengeStart: Boolean = false) : DialogueFile() {
3 -> playerl("Nothing thanks.").also { stage = END_DIALOGUE } 3 -> playerl("Nothing thanks.").also { stage = END_DIALOGUE }
} }
3 -> npcl("Well pass it here and we'll get you started.").also { stage = END_DIALOGUE } 3 -> npcl("Well pass it here and we'll get you started.").also { stage = END_DIALOGUE }
4 -> npcl("This is the champions' arena, the champions of various, races use it to duel those they deem worthy of the, honour.").also { stage = END_DIALOGUE } 4 -> npcl("This is the champions' arena. The champions of various races use it to duel those they deem worthy of the honour. If you find a challenge scroll in your travels, bring it here to face your challenger.").also { stage = END_DIALOGUE }
} }
} }
} }

20
Server/src/main/content/global/activity/cchallange/npc/ImpChampionNPC.kt
View file

@ -3,8 +3,6 @@ package content.global.activity.cchallange.npc
import core.api.* import core.api.*
import core.game.node.entity.Entity import core.game.node.entity.Entity
import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.BattleState
import core.game.node.entity.combat.CombatStyle
import core.game.node.entity.combat.equipment.WeaponInterface
import core.game.node.entity.npc.AbstractNPC import core.game.node.entity.npc.AbstractNPC
import core.game.node.entity.player.Player import core.game.node.entity.player.Player
import core.game.node.entity.skill.Skills import core.game.node.entity.skill.Skills
@ -63,21 +61,11 @@ class ImpChampionNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id,
super.checkImpact(state) super.checkImpact(state)
val player = state.attacker val player = state.attacker
if (player is Player) { if (player is Player) {
val w = player.getExtension<WeaponInterface>(WeaponInterface::class.java)
if (state.style == CombatStyle.MELEE || state.style == CombatStyle.MAGIC || state.style == CombatStyle.RANGE) { //somehow the maximumHit is determined to be zero by this point if you're using a melee special attack.
if (state.maximumHit == 0) {
state.neutralizeHits() state.neutralizeHits()
state.estimatedHit = state.maximumHit sendMessage(player, "Larxus said you couldn't use special attacks in this duel.")
}
if (w.weaponInterface.interfaceId == 10) {
sendMessage(player, "You cannot use special attack in this challenge.")
if (state.estimatedHit > -1) {
state.estimatedHit = 0
return
}
if (state.secondaryHit > -1) {
state.secondaryHit = 0
return
}
} }
} }
} }