Zamorak robe top and bottom now count as Zamorak god items

Zamorak robe top and bottom now allowed into Entrana
Implemented the right-click take-boat options for the monks of Entrana
Fixed some silly typos in the Monk-of-Entrana dialogue
Removed unused god item definitions
This commit is contained in:
Player Name
2025-02-16 10:23:21 +00:00
committed by Ryan
parent 4f97dbef8c
commit 2d1a626df0
5 changed files with 72 additions and 16 deletions
+2 -2
View File
@@ -1731,7 +1731,7 @@ fun sendPlayerOnInterface(player: Player, iface: Int, child: Int) {
}
/**
* Sends a dialogue that uses the player's chathead.
* Sends a dialogue that uses the npc's chathead.
* @param player the player to send the dialogue to
* @param npc the ID of the NPC to use for the chathead
* @param msg the message to send.
@@ -1744,7 +1744,7 @@ fun sendNPCDialogue(player: Player, npc: Int, msg: String, expr: core.game.dialo
}
/**
* Sends a dialogue that uses the player's chathead.
* Sends a dialogue that uses the npc's chathead.
* @param player the player to send the dialogue to
* @param npc the ID of the NPC to use for the chathead
* @param expr the FacialExpression to use. An enum exists for these called FacialExpression.
+3 -7
View File
@@ -88,6 +88,8 @@ enum class God(vararg val validItems: Int) {
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,
@@ -118,12 +120,6 @@ enum class God(vararg val validItems: Int) {
Items.GUTHIX_ROBE_TOP_10788,
Items.GUTHIX_STAFF_2416,
Items.GUTHIX_STOLE_10472,
Items.GUTHIX_SYMBOL_8057
),
ZAROS(
Items.ANCIENT_STAFF_13406,
Items.ANCIENT_STAFF_4675,
Items.ANCIENT_MACE_11061,
Items.ANCIENT_BOOK_7633,
Items.GUTHIX_SYMBOL_8057,
)
}
+3 -1
View File
@@ -661,7 +661,9 @@ public class ItemDefinition extends Definition<Item> {
Items.HAM_CLOAK_4304,
Items.HAM_LOGO_4306,
Items.GLOVES_4308,
Items.BOOTS_4310
Items.BOOTS_4310,
Items.ZAMORAK_ROBE_1033,
Items.ZAMORAK_ROBE_1035
));
private static final HashSet<Integer> entranaBannedItems = new HashSet(Arrays.asList(
/**Items.BUTTERFLY_NET_10010, easing the restriction until barehanded implementation**/