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

Pharaoh's Sceptre

Browse source 
Charges now go down when used
Examine texts corrected
This commit is contained in:
DebbySaurus 2022-09-09 11:06:56 +00:00 • committed by Ryan
parent 500c65d436
commit 15feadf344
2 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Server/data/configs/item_configs.json
View file

@ -82673,7 +82673,7 @@
{ {
"ge_buy_limit": "10", "ge_buy_limit": "10",
"turn90cw_anim": "1207", "turn90cw_anim": "1207",
"examine": "Fully charged: This sceptre is fully charged.", "examine": "This sceptre is fully charged.",
"walk_anim": "1205", "walk_anim": "1205",
"low_alchemy": "40", "low_alchemy": "40",
"turn90ccw_anim": "1208", "turn90ccw_anim": "1208",
@ -82709,7 +82709,7 @@
}, },
{ {
"turn90cw_anim": "1207", "turn90cw_anim": "1207",
"examine": "Fully charged: This sceptre is fully charged.", "examine": "This sceptre has two charges left.",
"walk_anim": "1205", "walk_anim": "1205",
"low_alchemy": "40", "low_alchemy": "40",
"turn90ccw_anim": "1208", "turn90ccw_anim": "1208",
@ -82743,7 +82743,7 @@
}, },
{ {
"turn90cw_anim": "1207", "turn90cw_anim": "1207",
"examine": "Fully charged: This sceptre is fully charged.", "examine": "This sceptre has one charge left.",
"walk_anim": "1205", "walk_anim": "1205",
"low_alchemy": "40", "low_alchemy": "40",
"turn90ccw_anim": "1208", "turn90ccw_anim": "1208",
@ -82778,7 +82778,7 @@
{ {
"ge_buy_limit": "10", "ge_buy_limit": "10",
"turn90cw_anim": "1207", "turn90cw_anim": "1207",
"examine": "Fully charged: This sceptre is fully charged.", "examine": "This sceptre has no charges left.",
"walk_anim": "1205", "walk_anim": "1205",
"low_alchemy": "40", "low_alchemy": "40",
"turn90ccw_anim": "1208", "turn90ccw_anim": "1208",

55
Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PharaohSceptre.kt
View file

@ -75,28 +75,43 @@ class PharaohSceptre : InteractionListener {
} }
4 -> return 4 -> return
} }
//This sucks but I'm too lazy to fix it. //Checks the equipment slot. 9044 = full, 9046 = 2 charges, 9048 = 1 charge, 9050 = 0 charges.
if (player!!.equipment.containsItem(Item(9044))) { if (player!!.equipment.containsItem(Item(Items.PHARAOHS_SCEPTRE_9044)))
player!!.equipment.replace(Item(9046), EquipmentSlot.WEAPON.ordinal) {
player!!.equipment.replace(Item(Items.PHARAOHS_SCEPTRE_9046), EquipmentSlot.WEAPON.ordinal)
player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 2 charges remaining.") player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 2 charges remaining.")
} else if (player!!.equipment.containsItem(Item(9046))) { }
player!!.equipment.replace(Item(9048), EquipmentSlot.WEAPON.ordinal) else if (player!!.equipment.containsItem(Item(Items.PHARAOHS_SCEPTRE_9046)))
{
player!!.equipment.replace(Item(Items.PHARAOHS_SCEPTRE_9048), EquipmentSlot.WEAPON.ordinal)
player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 1 charge remaining.") player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 1 charge remaining.")
} else if (player!!.equipment.containsItem(Item(9048))) { }
player!!.equipment.replace(Item(9050), EquipmentSlot.WEAPON.ordinal) else if (player!!.equipment.containsItem(Item(Items.PHARAOHS_SCEPTRE_9048)))
player!!.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has used its last charge.") {
} else if (player!!.inventory.containsItem(Item(9050))) { player!!.equipment.replace(Item(Items.PHARAOHS_SCEPTRE_9050), EquipmentSlot.WEAPON.ordinal)
player!!.inventory.remove(Item(9050)) player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has no charges remaining.")
player!!.inventory.add(Item(9048)) }
player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 2 charges remaining.") //Checks the inventory. 9044 = full, 9046 = 2 charges, 9048 = 1 charge, 9050 = 0 charges.
} else if (player!!.inventory.containsItem(Item(9048))) { else if (player!!.inventory.containsItem(Item(Items.PHARAOHS_SCEPTRE_9044)))
player!!.inventory.remove(Item(9048)) {
player!!.inventory.add(Item(9046)) if (player!!.inventory.remove(Item(Items.PHARAOHS_SCEPTRE_9044))) {
player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 1 charge remaining.") player!!.inventory.add(Item(Items.PHARAOHS_SCEPTRE_9046))
} else if (player!!.inventory.containsItem(Item(9046))) { player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 2 charges remaining.")
player!!.inventory.remove(Item(9046)) }
player!!.inventory.add(Item(9044)) }
player!!.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has used its last charge.") else if (player!!.inventory.containsItem(Item(Items.PHARAOHS_SCEPTRE_9046)))
{
if (player!!.inventory.remove(Item(Items.PHARAOHS_SCEPTRE_9046))) {
player!!.inventory.add(Item(Items.PHARAOHS_SCEPTRE_9048))
player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has 1 charge remaining.")
}
}
else if (player!!.inventory.containsItem(Item(Items.PHARAOHS_SCEPTRE_9048)))
{
if (player!!.inventory.remove(Item(Items.PHARAOHS_SCEPTRE_9048))) {
player!!.inventory.add(Item(Items.PHARAOHS_SCEPTRE_9050))
player!!.packetDispatch.sendMessage("<col=7f03ff>Your Pharoah's Sceptre has no charges remaining.")
}
} }
} }
} }