2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed seers diary inferno adze bonus

Browse source 
Fixed Thormac staff enchantment
This commit is contained in:
Syndromeramo 2025-08-18 11:13:31 +00:00 • committed by Ryan
parent 89edf78e54
commit 1ff19880ef
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Server/src/main/content/global/handlers/iface/MysticStaffEnchantInterface.kt
View file

@ -12,7 +12,6 @@ class MysticStaffEnchantInterface : InterfaceListener {
override fun defineInterfaceListeners() { override fun defineInterfaceListeners() {
on(INTERFACE_332) { player, _, _, buttonID, _, _ -> on(INTERFACE_332) { player, _, _, buttonID, _, _ ->
val staff = buttonMap[buttonID] ?: return@on true val staff = buttonMap[buttonID] ?: return@on true
val price = if (inEquipment(player, Items.SEERS_HEADBAND_14631)) 27000 else 40000
if (!inInventory(player, staff.basicID)) { 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.") 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) closeInterface(player)
if (!inInventory(player, Items.COINS_995, price)) { if (!inInventory(player, Items.COINS_995, 40000)) {
sendNPCDialogue(player, NPCs.THORMAC_389, "I need ${String.format("%,d", price)} coins for materials. Come back when you have the money!", FacialExpression.NEUTRAL) 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 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) 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) addItem(player, staff.enchantedID, 1)
} }

4
Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt
View file

@ -93,7 +93,9 @@ class WoodcuttingListener : InteractionListener {
).send() ).send()
//add woodcutting experience //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 //nullcheck the fire, and only if it exists award the firemaking XP
val fire = Log.forId(reward) val fire = Log.forId(reward)

4
Server/src/main/content/region/kandarin/dialogue/ThormacDialogue.kt
View file

@ -9,7 +9,6 @@ import core.game.node.entity.npc.NPC
import core.game.node.entity.player.Player import core.game.node.entity.player.Player
import core.plugin.Initializable import core.plugin.Initializable
import core.tools.END_DIALOGUE import core.tools.END_DIALOGUE
import org.rs09.consts.Items
import org.rs09.consts.NPCs import org.rs09.consts.NPCs
import content.data.Quests import content.data.Quests
@ -43,8 +42,7 @@ class ThormacDialogue(player: Player? = null) : DialoguePlugin(player) {
) )
ENCHANT_DIALOGUE -> { ENCHANT_DIALOGUE -> {
val cost = if (player.equipment.contains(Items.SEERS_HEADBAND_14631, 1)) 27 else 40 npcl(FacialExpression.HAPPY, "Yes, it'll cost you 40,000 coins for the materials needed though. " +
npcl(FacialExpression.HAPPY, "Yes, it'll cost you $cost,000 coins for the materials needed though. " +
"Which sort of staff did you want enchanting?").also { stage++ } "Which sort of staff did you want enchanting?").also { stage++ }
} }
ENCHANT_DIALOGUE + 1 -> { ENCHANT_DIALOGUE + 1 -> {