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

Peer the Seer fixes

Browse Source 
Players can no longer enter with any items in inventory or equipped
The full vase is now removed from the player's inventory when placing it on the frozen table
This commit is contained in:
Zerken
2023-06-25 13:45:11 +00:00
committed by Ryan
parent e9a373e328
commit 89cbbe2765
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/SeersHouseListeners.kt
+10 -6
View File
@@ -11,8 +11,10 @@ import core.game.world.map.zone.ZoneBorders
import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Animation
import org.rs09.consts.Items import org.rs09.consts.Items
import core.game.dialogue.DialogueFile import core.game.dialogue.DialogueFile
import core.game.global.action.DoorActionHandler
import core.game.interaction.InteractionListener import core.game.interaction.InteractionListener
import core.game.interaction.IntType import core.game.interaction.IntType
import org.rs09.consts.NPCs
class SeersHouseListeners : InteractionListener { class SeersHouseListeners : InteractionListener {
@@ -108,13 +110,15 @@ class SeersHouseListeners : InteractionListener {
player.dialogueInterpreter.open(DoorRiddleDialogue(player), Scenery(WESTDOOR,node.location)) player.dialogueInterpreter.open(DoorRiddleDialogue(player), Scenery(WESTDOOR,node.location))
} }
else if(player.getAttribute("riddlesolved",false)) { else if(player.getAttribute("riddlesolved",false)) {
if(player.location.x == 2631){ val insideHouse = (player.location == Location.create(2631, 3666, 0))
if(insideHouse) {
DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
player.inventory.clear() player.inventory.clear()
core.game.global.action.DoorActionHandler.handleAutowalkDoor(player,node.asScenery()) } else if(player.inventory.isEmpty && player.equipment.isEmpty) {
DoorActionHandler.handleAutowalkDoor(player, node.asScenery())
} else { } else {
core.game.global.action.DoorActionHandler.handleAutowalkDoor(player,node.asScenery()) openDialogue(player, NPCs.PEER_THE_SEER_1288, findNPC(NPCs.PEER_THE_SEER_1288)!!)
} }
core.game.global.action.DoorActionHandler.handleAutowalkDoor(player,node.asScenery())
} }
return@on true return@on true
} }
@@ -873,7 +877,7 @@ class SeersHouseListeners : InteractionListener {
onUseWith(IntType.SCENERY, FULLVASE, FROZENTABLE) { player, used, with -> onUseWith(IntType.SCENERY, FULLVASE, FROZENTABLE) { player, used, with ->
player.animate(Animation(883,Animator.Priority.HIGH)) player.animate(Animation(883,Animator.Priority.HIGH))
removeItem(player,VASE) removeItem(player,FULLVASE)
addItem(player,FROZENVASE) addItem(player,FROZENVASE)
sendMessage(player,"The icy table immediately freezes the water in your vase.") sendMessage(player,"The icy table immediately freezes the water in your vase.")
return@onUseWith true return@onUseWith true
@@ -928,7 +932,7 @@ class SeersHouseListeners : InteractionListener {
if(player.inventory.contains(SEERSKEY,1)){ if(player.inventory.contains(SEERSKEY,1)){
player.setAttribute("/save:housepuzzlesolved",true) player.setAttribute("/save:housepuzzlesolved",true)
player.inventory.clear() player.inventory.clear()
core.game.global.action.DoorActionHandler.handleAutowalkDoor(player,node.asScenery()) DoorActionHandler.handleAutowalkDoor(player,node.asScenery())
player.setAttribute("/save:fremtrials:peer-vote",true) player.setAttribute("/save:fremtrials:peer-vote",true)
player.setAttribute("/save:fremtrials:votes",player.getAttribute("fremtrials:votes",0) + 1) player.setAttribute("/save:fremtrials:votes",player.getAttribute("fremtrials:votes",0) + 1)
sendNPCDialogue(player,1288,"Incredible! To have solved my puzzle so quickly! I have no choice but to vote in your favour!") sendNPCDialogue(player,1288,"Incredible! To have solved my puzzle so quickly! I have no choice but to vote in your favour!")