diff --git a/Server/src/main/content/global/handlers/iface/MysticStaffEnchantInterface.kt b/Server/src/main/content/global/handlers/iface/MysticStaffEnchantInterface.kt index 46a3bde24..6d9748d09 100644 --- a/Server/src/main/content/global/handlers/iface/MysticStaffEnchantInterface.kt +++ b/Server/src/main/content/global/handlers/iface/MysticStaffEnchantInterface.kt @@ -12,7 +12,6 @@ class MysticStaffEnchantInterface : InterfaceListener { override fun defineInterfaceListeners() { on(INTERFACE_332) { player, _, _, buttonID, _, _ -> val staff = buttonMap[buttonID] ?: return@on true - val price = if (inEquipment(player, Items.SEERS_HEADBAND_14631)) 27000 else 40000 if (!inInventory(player, staff.basicID)) { sendMessage(player, "You don't have a${if (StringUtils.isPlusN(getItemName(staff.basicID))) "n" else ""} ${getItemName(staff.basicID)} to enchant.") @@ -21,12 +20,12 @@ class MysticStaffEnchantInterface : InterfaceListener { closeInterface(player) - if (!inInventory(player, Items.COINS_995, price)) { - sendNPCDialogue(player, NPCs.THORMAC_389, "I need ${String.format("%,d", price)} coins for materials. Come back when you have the money!", FacialExpression.NEUTRAL) + if (!inInventory(player, Items.COINS_995, 40000)) { + sendNPCDialogue(player, NPCs.THORMAC_389, "I need ${String.format("%,d", 40000)} coins for materials. Come back when you have the money!", FacialExpression.NEUTRAL) return@on true } - if (removeItem(player, Item(staff.basicID, 1)) && removeItem(player, Item(Items.COINS_995, price))) { + if (removeItem(player, Item(staff.basicID, 1)) && removeItem(player, Item(Items.COINS_995, 40000))) { sendNPCDialogue(player, NPCs.THORMAC_389, "Just a moment... hang on... hocus pocus abra-cadabra... there you go! Enjoy your enchanted staff!", FacialExpression.NEUTRAL) addItem(player, staff.enchantedID, 1) } diff --git a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt index c73b135b6..6914f02fb 100644 --- a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt +++ b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt @@ -93,7 +93,9 @@ class WoodcuttingListener : InteractionListener { ).send() //add woodcutting experience - player.getSkills().addExperience(Skills.WOODCUTTING, resource.getExperience()) + rewardAmount = calculateRewardAmount(player, reward) // calculate amount + val experience: Double = calculateExperience(player, resource, rewardAmount) + player.getSkills().addExperience(Skills.WOODCUTTING, experience, true) //nullcheck the fire, and only if it exists award the firemaking XP val fire = Log.forId(reward) diff --git a/Server/src/main/content/region/kandarin/dialogue/ThormacDialogue.kt b/Server/src/main/content/region/kandarin/dialogue/ThormacDialogue.kt index f21493f59..ed2bc611e 100644 --- a/Server/src/main/content/region/kandarin/dialogue/ThormacDialogue.kt +++ b/Server/src/main/content/region/kandarin/dialogue/ThormacDialogue.kt @@ -9,7 +9,6 @@ import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable import core.tools.END_DIALOGUE -import org.rs09.consts.Items import org.rs09.consts.NPCs import content.data.Quests @@ -43,8 +42,7 @@ class ThormacDialogue(player: Player? = null) : DialoguePlugin(player) { ) ENCHANT_DIALOGUE -> { - val cost = if (player.equipment.contains(Items.SEERS_HEADBAND_14631, 1)) 27 else 40 - npcl(FacialExpression.HAPPY, "Yes, it'll cost you $cost,000 coins for the materials needed though. " + + npcl(FacialExpression.HAPPY, "Yes, it'll cost you 40,000 coins for the materials needed though. " + "Which sort of staff did you want enchanting?").also { stage++ } } ENCHANT_DIALOGUE + 1 -> {