Fixed Inferno Adze not awarding xp

This commit is contained in:
xmomoz
2023-04-19 08:44:40 +00:00
committed by Ryan
parent d4565fd728
commit 642d946c17
@@ -4,6 +4,7 @@ import content.data.skill.SkillingPets
import content.data.skill.SkillingTool import content.data.skill.SkillingTool
import content.data.tables.BirdNest import content.data.tables.BirdNest
import content.global.skill.farming.FarmingPatch.Companion.forObject import content.global.skill.farming.FarmingPatch.Companion.forObject
import content.global.skill.firemaking.Log
import content.global.skill.skillcapeperks.SkillcapePerks import content.global.skill.skillcapeperks.SkillcapePerks
import content.global.skill.skillcapeperks.SkillcapePerks.Companion.isActive import content.global.skill.skillcapeperks.SkillcapePerks.Companion.isActive
import content.region.misc.miscellania.dialogue.KjallakOnChopDialogue import content.region.misc.miscellania.dialogue.KjallakOnChopDialogue
@@ -74,6 +75,9 @@ class WoodcuttingListener : InteractionListener {
if (!checkReward(player, resource, tool)) if (!checkReward(player, resource, tool))
return delayClock(player, Clocks.SKILLING, 3) return delayClock(player, Clocks.SKILLING, 3)
val reward = resource.getReward()
val rewardAmount: Int
if (tool.id == Items.INFERNO_ADZE_13661 && RandomFunction.roll(4)) { if (tool.id == Items.INFERNO_ADZE_13661 && RandomFunction.roll(4)) {
sendMessage(player, "You chop some logs. The heat of the inferno adze incinerates them.") sendMessage(player, "You chop some logs. The heat of the inferno adze incinerates them.")
Projectile.create( Projectile.create(
@@ -87,12 +91,20 @@ class WoodcuttingListener : InteractionListener {
true, true,
25, 25 25, 25
).send() ).send()
//add woodcutting experience
player.getSkills().addExperience(Skills.WOODCUTTING, resource.getExperience())
//nullcheck the fire, and only if it exists award the firemaking XP
val fire = Log.forId(reward)
if (fire != null) {
player.getSkills().addExperience(Skills.FIREMAKING, fire.getXp())
}
delayClock(player, Clocks.SKILLING, 3) delayClock(player, Clocks.SKILLING, 3)
return rollDepletion(player, node.asScenery(), resource) return rollDepletion(player, node.asScenery(), resource)
} }
val reward = resource.getReward()
val rewardAmount: Int
if (reward > 0) { if (reward > 0) {
rewardAmount = calculateRewardAmount(player, reward) // calculate amount rewardAmount = calculateRewardAmount(player, reward) // calculate amount
SkillingPets.checkPetDrop(player, SkillingPets.BEAVER) // roll for pet SkillingPets.checkPetDrop(player, SkillingPets.BEAVER) // roll for pet