diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json
index e2fe1ea6d..1c31d0554 100644
--- a/Server/data/configs/item_configs.json
+++ b/Server/data/configs/item_configs.json
@@ -82673,7 +82673,7 @@
{
"ge_buy_limit": "10",
"turn90cw_anim": "1207",
- "examine": "Fully charged: This sceptre is fully charged.",
+ "examine": "This sceptre is fully charged.",
"walk_anim": "1205",
"low_alchemy": "40",
"turn90ccw_anim": "1208",
@@ -82709,7 +82709,7 @@
},
{
"turn90cw_anim": "1207",
- "examine": "Fully charged: This sceptre is fully charged.",
+ "examine": "This sceptre has two charges left.",
"walk_anim": "1205",
"low_alchemy": "40",
"turn90ccw_anim": "1208",
@@ -82743,7 +82743,7 @@
},
{
"turn90cw_anim": "1207",
- "examine": "Fully charged: This sceptre is fully charged.",
+ "examine": "This sceptre has one charge left.",
"walk_anim": "1205",
"low_alchemy": "40",
"turn90ccw_anim": "1208",
@@ -82778,7 +82778,7 @@
{
"ge_buy_limit": "10",
"turn90cw_anim": "1207",
- "examine": "Fully charged: This sceptre is fully charged.",
+ "examine": "This sceptre has no charges left.",
"walk_anim": "1205",
"low_alchemy": "40",
"turn90ccw_anim": "1208",
diff --git a/Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PharaohSceptre.kt b/Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PharaohSceptre.kt
index 6746d2cd8..ab5d76d55 100644
--- a/Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PharaohSceptre.kt
+++ b/Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PharaohSceptre.kt
@@ -75,28 +75,43 @@ class PharaohSceptre : InteractionListener {
}
4 -> return
}
- //This sucks but I'm too lazy to fix it.
- if (player!!.equipment.containsItem(Item(9044))) {
- player!!.equipment.replace(Item(9046), EquipmentSlot.WEAPON.ordinal)
+ //Checks the equipment slot. 9044 = full, 9046 = 2 charges, 9048 = 1 charge, 9050 = 0 charges.
+ if (player!!.equipment.containsItem(Item(Items.PHARAOHS_SCEPTRE_9044)))
+ {
+ player!!.equipment.replace(Item(Items.PHARAOHS_SCEPTRE_9046), EquipmentSlot.WEAPON.ordinal)
player!!.packetDispatch.sendMessage("
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("Your Pharoah's Sceptre has 1 charge remaining.")
- } else if (player!!.equipment.containsItem(Item(9048))) {
- player!!.equipment.replace(Item(9050), EquipmentSlot.WEAPON.ordinal)
- player!!.sendMessage("Your Pharoah's Sceptre has used its last charge.")
- } else if (player!!.inventory.containsItem(Item(9050))) {
- player!!.inventory.remove(Item(9050))
- player!!.inventory.add(Item(9048))
- player!!.packetDispatch.sendMessage("Your Pharoah's Sceptre has 2 charges remaining.")
- } else if (player!!.inventory.containsItem(Item(9048))) {
- player!!.inventory.remove(Item(9048))
- player!!.inventory.add(Item(9046))
- player!!.packetDispatch.sendMessage("Your Pharoah's Sceptre has 1 charge remaining.")
- } else if (player!!.inventory.containsItem(Item(9046))) {
- player!!.inventory.remove(Item(9046))
- player!!.inventory.add(Item(9044))
- player!!.sendMessage("Your Pharoah's Sceptre has used its last charge.")
+ }
+ else if (player!!.equipment.containsItem(Item(Items.PHARAOHS_SCEPTRE_9048)))
+ {
+ player!!.equipment.replace(Item(Items.PHARAOHS_SCEPTRE_9050), EquipmentSlot.WEAPON.ordinal)
+ player!!.packetDispatch.sendMessage("Your Pharoah's Sceptre has no charges remaining.")
+ }
+ //Checks the inventory. 9044 = full, 9046 = 2 charges, 9048 = 1 charge, 9050 = 0 charges.
+ else if (player!!.inventory.containsItem(Item(Items.PHARAOHS_SCEPTRE_9044)))
+ {
+ if (player!!.inventory.remove(Item(Items.PHARAOHS_SCEPTRE_9044))) {
+ player!!.inventory.add(Item(Items.PHARAOHS_SCEPTRE_9046))
+ player!!.packetDispatch.sendMessage("Your Pharoah's Sceptre has 2 charges remaining.")
+ }
+ }
+ 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("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("Your Pharoah's Sceptre has no charges remaining.")
+ }
}
}
}