yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimised, fixed and refactored container (bank/inventory/equipment) checks

Browse Source
This commit is contained in:
RiL
2023-04-25 14:21:00 +00:00
committed by Ryan
parent 0af42c77c8
commit 05da44aa52
13 changed files with 114 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/handlers/npc/NPCDepositListener.kt
+2 -4
View File
@@ -1,6 +1,6 @@
package content.global.handlers.npc
import core.api.isEquipped
import core.api.anyInEquipment
import core.api.openDepositBox
import core.api.sendNPCDialogue
import core.api.setInterfaceText
@@ -14,9 +14,7 @@ class NPCDepositListener : InteractionListener {
override fun defineListeners() {
on(NPCs.PEER_THE_SEER_1288, IntType.NPC, "deposit") { player, _ ->
if (isEquipped(player, Items.FREMENNIK_SEA_BOOTS_1_14571) ||
isEquipped(player, Items.FREMENNIK_SEA_BOOTS_2_14572) ||
isEquipped(player, Items.FREMENNIK_SEA_BOOTS_3_14573)) {
if (anyInEquipment(player, Items.FREMENNIK_SEA_BOOTS_1_14571, Items.FREMENNIK_SEA_BOOTS_2_14572, Items.FREMENNIK_SEA_BOOTS_3_14573)) {
openDepositBox(player)
setInterfaceText(player, "Peer the Seer's Deposits", 11, 12)
} else {
Server/src/main/content/global/skill/agility/shortcuts/CatherbyGrappleShortcut.kt
+9 -9
View File
@@ -42,7 +42,7 @@ class CatherbyGrappleShortcut : InteractionListener {
on(Scenery.ROCKS_17042, IntType.SCENERY, "grapple") { player, _ ->
if (isPlayerInRangeToGrapple(player)) {
forceWalk(player, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.START_LOCATION, "smart")
forceWalk(player, START_LOCATION, "smart")
} else {
sendMessage(player, "Nothing interesting happens.")
return@on true
@@ -56,10 +56,10 @@ class CatherbyGrappleShortcut : InteractionListener {
if (!doesPlayerHaveRequiredLevels(player)) {
sendDialogueLines(player,
"You need at least " +
content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.REQUIREMENTS[Skills.AGILITY] + " " + Skills.SKILL_NAME[Skills.AGILITY] + ", " +
content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.REQUIREMENTS[Skills.RANGE] + " " + Skills.SKILL_NAME[Skills.RANGE] + ", ",
REQUIREMENTS[Skills.AGILITY] + " " + Skills.SKILL_NAME[Skills.AGILITY] + ", " +
REQUIREMENTS[Skills.RANGE] + " " + Skills.SKILL_NAME[Skills.RANGE] + ", ",
"and " +
content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.REQUIREMENTS[Skills.STRENGTH] + " " + Skills.SKILL_NAME[Skills.STRENGTH] + " to use this shortcut."
REQUIREMENTS[Skills.STRENGTH] + " " + Skills.SKILL_NAME[Skills.STRENGTH] + " to use this shortcut."
)
return@on true
}
@@ -70,7 +70,7 @@ class CatherbyGrappleShortcut : InteractionListener {
override fun pulse() : Boolean {
when (counter++) {
1 -> {
face(player, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.END_LOCATION)
face(player, END_LOCATION)
// Audit: shows player climbing (probably a wall), need a cliff climb animation
animate(player, Animation(4455))
}
@@ -79,7 +79,7 @@ class CatherbyGrappleShortcut : InteractionListener {
replaceScenery(rocks!!, rocks!!.id + 1, 10)
}
8 -> {
teleport(player, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.END_LOCATION)
teleport(player, END_LOCATION)
}
9 -> {
sendMessage(player, "You successfully grapple the rock and climb the cliffside.")
@@ -96,11 +96,11 @@ class CatherbyGrappleShortcut : InteractionListener {
}
private fun doesPlayerHaveRequiredItemsEquipped(player: Player): Boolean {
return isEquipped(player, Items.MITH_GRAPPLE_9419) && areAnyEquipped(player, *content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.VALID_CROSSBOWS)
return inEquipment(player, Items.MITH_GRAPPLE_9419) && anyInEquipment(player, *VALID_CROSSBOWS)
}
private fun doesPlayerHaveRequiredLevels(player: Player): Boolean {
for ((skill, requiredLevel) in content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.REQUIREMENTS) {
for ((skill, requiredLevel) in REQUIREMENTS) {
if (!hasLevelDyn(player, skill, requiredLevel)) {
return false
}
@@ -109,6 +109,6 @@ class CatherbyGrappleShortcut : InteractionListener {
}
private fun isPlayerInRangeToGrapple(player: Player): Boolean {
return inBorders(player, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.START_LOCATION.x - 2, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.START_LOCATION.y - 2, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.START_LOCATION.x, content.global.skill.agility.shortcuts.CatherbyGrappleShortcut.Companion.START_LOCATION.y)
return inBorders(player, START_LOCATION.x - 2, START_LOCATION.y - 2, START_LOCATION.x, START_LOCATION.y)
}
}