From d3a53e490120d22d81c191f4816ccd3c1bc1d60f Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 2 Jul 2021 10:47:25 -0500 Subject: [PATCH] Gathering and using compost now rewards XP. --- .../kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt | 4 ++++ .../game/node/entity/skill/farming/UseWithPatchHandler.kt | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt index 887f047c5..f7a430719 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt @@ -1,6 +1,8 @@ package rs09.game.node.entity.skill.farming +import api.ContentAPI import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.tools.RandomFunction import org.json.simple.JSONArray @@ -44,6 +46,8 @@ class CompostBin(val player: Player, val bin: CompostBins) { isClosed = false } updateBit() + if(isSuperCompost) ContentAPI.rewardXP(player, Skills.FARMING, 8.5) + else ContentAPI.rewardXP(player, Skills.FARMING, 4.5) return Item(item) } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt index be2ae30ab..1d45b2b70 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt @@ -1,5 +1,6 @@ package rs09.game.node.entity.skill.farming +import api.ContentAPI import core.game.interaction.NodeUsageEvent import core.game.node.entity.skill.Skills import core.game.node.item.Item @@ -123,6 +124,7 @@ object UseWithPatchHandler{ override fun pulse(): Boolean { if(player.inventory.remove(event.usedItem,false)){ p.compost = if(usedItem.id == Items.SUPERCOMPOST_6034) CompostType.SUPER else CompostType.NORMAL + if(p.compost == CompostType.SUPER) ContentAPI.rewardXP(player, Skills.FARMING, 26.0) else ContentAPI.rewardXP(player, Skills.FARMING, 18.5) if(p.plantable != null){ p.harvestAmt += if(p.compost == CompostType.NORMAL) 1 else if(p.compost == CompostType.SUPER) 2 else 0 }