diff --git a/Server/src/main/content/region/desert/bandits/handlers/BanditNPC.kt b/Server/src/main/content/region/desert/bandits/handlers/BanditNPC.kt index f8c69da7c..29a7809d1 100644 --- a/Server/src/main/content/region/desert/bandits/handlers/BanditNPC.kt +++ b/Server/src/main/content/region/desert/bandits/handlers/BanditNPC.kt @@ -2,6 +2,7 @@ package content.region.desert.bandits.handlers import core.api.God import core.api.hasGodItem +import core.api.inEquipment import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.npc.AbstractNPC @@ -9,6 +10,7 @@ import core.game.node.entity.player.Player import core.game.world.map.Location import core.game.world.map.RegionManager import core.plugin.Initializable +import org.rs09.consts.Items import org.rs09.consts.NPCs @Initializable @@ -28,7 +30,7 @@ class BanditNPC(id: Int = NPCs.BANDIT_1926, location: Location? = null) : Abstra sendChat("Time to die, Saradominist filth!") attack(player) break - } else if (hasGodItem(player, God.ZAMORAK)) { + } else if (hasGodItem(player, God.ZAMORAK) || inEquipment(player, Items.DAGONHAI_HAT_14499) || inEquipment(player, Items.DAGONHAI_ROBE_TOP_14497) || inEquipment(player, Items.DAGONHAI_ROBE_BOTTOM_14501)) { sendChat("Prepare to suffer, Zamorakian scum!") attack(player) break diff --git a/Server/src/main/core/api/God.kt b/Server/src/main/core/api/God.kt index c2e16c32d..70eb2b0fd 100644 --- a/Server/src/main/core/api/God.kt +++ b/Server/src/main/core/api/God.kt @@ -20,14 +20,11 @@ enum class God(vararg val validItems: Int) { Items.BANDOS_TASSETS_11726, ), SARADOMIN( - Items.ANCIENT_SYMBOL_11181, - Items.GILDED_KITESHIELD_3489, + Items.DAMAGED_BOOK_3839, Items.HOLY_BOOK_3840, Items.HOLY_SYMBOL_1718, - Items.HOLY_SYMBOL_4682, Items.MONKS_ROBE_542, Items.MONKS_ROBE_544, - Items.RUNE_HERALDIC_HELM_8488, Items.SARADOMIN_BRACERS_10384, Items.SARADOMIN_CAPE_2412, Items.SARADOMIN_CHAPS_10388, @@ -43,26 +40,16 @@ enum class God(vararg val validItems: Int) { Items.SARADOMIN_PLATEBODY_2661, Items.SARADOMIN_PLATELEGS_2663, Items.SARADOMIN_PLATESKIRT_3479, - Items.SARADOMIN_PLATESKIRT_3675, Items.SARADOMIN_ROBE_LEGS_10464, Items.SARADOMIN_ROBE_TOP_10458, Items.SARADOMIN_STAFF_2415, Items.SARADOMIN_STOLE_10470, Items.SARADOMIN_SWORD_11730, - Items.SARADOMIN_SYMBOL_8055, - Items.STEEL_HERALDIC_HELM_8706, ), ZAMORAK( - Items.DAGONHAI_HAT_14499, - Items.DAGONHAI_ROBE_TOP_14497, - Items.DAGONHAI_ROBE_BOTTOM_14501, Items.DAMAGED_BOOK_3841, - Items.RUNE_HERALDIC_HELM_8494, - Items.STEEL_HERALDIC_HELM_8712, Items.UNHOLY_BOOK_3842, Items.UNHOLY_SYMBOL_1724, - Items.UNHOLY_SYMBOL_3852, - Items.UNHOLY_SYMBOL_4683, Items.ZAMORAK_BRACERS_10368, Items.ZAMORAK_CAPE_2414, Items.ZAMORAK_CHAPS_10372, @@ -81,19 +68,17 @@ enum class God(vararg val validItems: Int) { Items.ZAMORAK_PLATEBODY_2653, Items.ZAMORAK_PLATELEGS_2655, Items.ZAMORAK_PLATESKIRT_3478, - Items.ZAMORAK_PLATESKIRT_3674, Items.ZAMORAK_ROBE_LEGS_10468, Items.ZAMORAK_ROBE_TOP_10460, Items.ZAMORAK_ROBE_TOP_10786, Items.ZAMORAK_STAFF_2417, Items.ZAMORAK_STOLE_10474, - Items.ZAMORAK_SYMBOL_8056, Items.ZAMORAK_ROBE_1033, Items.ZAMORAK_ROBE_1035, ), GUTHIX( - Items.STEEL_HERALDIC_HELM_8692, - Items.RUNE_HERALDIC_HELM_8474, + Items.DAMAGED_BOOK_3843, + Items.BOOK_OF_BALANCE_3844, Items.GUTHIX_BRACERS_10376, Items.GUTHIX_CAPE_10720, Items.GUTHIX_CHAPS_10380, @@ -102,24 +87,18 @@ enum class God(vararg val validItems: Int) { Items.GUTHIX_CROZIER_10442, Items.GUTHIX_DRAGONHIDE_10378, Items.GUTHIX_DRAGONHIDE_10794, - Items.GUTHIX_FULL_HELM_13833, Items.GUTHIX_FULL_HELM_2673, - Items.GUTHIX_KITESHIELD_13834, Items.GUTHIX_KITESHIELD_2675, Items.GUTHIX_MITRE_10454, Items.GUTHIX_MJOLNIR_6760, Items.GUTHIX_PLATEBODY_10780, Items.GUTHIX_PLATEBODY_2669, - Items.GUTHIX_PLATEBODY_13830, Items.GUTHIX_PLATELEGS_2671, - Items.GUTHIX_PLATELEGS_13831, - Items.GUTHIX_PLATESKIRT_13832, Items.GUTHIX_PLATESKIRT_3676, Items.GUTHIX_ROBE_LEGS_10466, Items.GUTHIX_ROBE_TOP_10462, Items.GUTHIX_ROBE_TOP_10788, Items.GUTHIX_STAFF_2416, Items.GUTHIX_STOLE_10472, - Items.GUTHIX_SYMBOL_8057, ) }