Fixed bracelet of clay charge counting (now uses an attribute)

Removed GatheringSkillPulse
This commit is contained in:
Avi Weinstock
2022-07-30 15:45:19 +00:00
committed by Ryan
parent 6dd470cc66
commit e3623e16ec
6 changed files with 10 additions and 405 deletions
@@ -2,7 +2,7 @@ package rs09.game.content.quest.members.thelostcity
import core.game.content.quest.members.lostcity.TreeSpiritNPC
import core.game.node.scenery.Scenery
import core.game.node.entity.skill.gather.GatheringSkillPulse
import core.game.node.entity.skill.gather.woodcutting.WoodcuttingSkillPulse
import core.game.node.entity.skill.gather.SkillingTool
import core.game.world.map.Location
import rs09.game.interaction.InteractionListener
@@ -35,10 +35,10 @@ class DramenTreeListener : InteractionListener {
spirit.sendChat("You must defeat me before touching the tree!")
return@on true
}
player.getPulseManager().run(GatheringSkillPulse(player, node as Scenery?))
player.getPulseManager().run(WoodcuttingSkillPulse(player, node as Scenery?))
return@on true
}
}
}
}
@@ -386,7 +386,6 @@ class PlayerSaver (val player: Player){
globalData.put("readPlaques",readPlaques)
globalData.put("forgingUses",player.savedData.globalData.forgingUses.toString())
globalData.put("ectoCharges",player.savedData.globalData.ectoCharges.toString())
globalData.put("braceletClayUses",player.savedData.globalData.braceletClayUses.toString())
globalData.put("dropDelay",player.savedData.globalData.dropDelay.toString())
val abyssData = JSONArray()
player.savedData.globalData.abyssData.map {
@@ -122,10 +122,6 @@ class MiningSkillPulse(private val player: Player, private val node: Node) : Pul
if (++ticks % (if (isMiningEssence) 3 else 4) != 0) {
return false
}
if (node.id == 10041) {
sendNPCDialogue(player, NPCs.BANK_GUARD_2574,if (RandomFunction.random(2) == 1) "You'll blow my cover! I'm meant to be hidden!" else "Will you stop that?", FacialExpression.FURIOUS)
return true
}
if (!checkReward()) {
return false
}
@@ -148,15 +144,17 @@ class MiningSkillPulse(private val player: Player, private val node: Node) : Pul
if(reward == Items.CLAY_434){
val bracelet = getItemFromEquipment(player, EquipmentSlot.HANDS)
if(bracelet != null && bracelet.id == Items.BRACELET_OF_CLAY_11074){
if(bracelet.charge > 28) bracelet.charge = 28
bracelet.charge--
var charges = player.getAttribute("jewellery-charges:bracelet-of-clay", 28);
charges--
reward = Items.SOFT_CLAY_1761
sendMessage(player, "Your bracelet of clay softens the clay for you.")
if(bracelet.charge <= 0){
if(removeItem(player, bracelet)) {
if(charges <= 0) {
if(removeItem(player, bracelet, Container.EQUIPMENT)) {
sendMessage(player, "Your bracelet of clay crumbles to dust.")
charges = 28
}
}
player.setAttribute("/save:jewellery-charges:bracelet-of-clay", charges)
}
}
val rewardName = getItemName(reward).lowercase()
@@ -275,4 +273,4 @@ class MiningSkillPulse(private val player: Player, private val node: Node) : Pul
init {
super.stop()
}
}
}