From 30b391520e166a0ab5d49420233abe3368049a26 Mon Sep 17 00:00:00 2001
From: vk <vkretov@opentable.com>
Date: Thu, 21 Oct 2021 20:58:14 +0000
Subject: [PATCH] various clue loot fixes

---
 .../core/game/content/ttrail/ClueLevel.java   | 660 +++++++++---------
 1 file changed, 328 insertions(+), 332 deletions(-)

diff --git a/Server/src/main/java/core/game/content/ttrail/ClueLevel.java b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java
index 9bc32478d..85a8a76b9 100644
--- a/Server/src/main/java/core/game/content/ttrail/ClueLevel.java
+++ b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java
@@ -8,6 +8,7 @@ import core.game.node.entity.player.Player;
 import core.game.node.item.ChanceItem;
 import core.game.node.item.Item;
 import core.game.node.item.WeightedChanceItem;
+import org.rs09.consts.Items;
 import rs09.game.world.GameWorld;
 import core.tools.RandomFunction;
 
@@ -25,370 +26,373 @@ import java.util.List;
 public enum ClueLevel {
 
 	EASY(new Item(2714), 1 << 16 | 5,
-			new ChanceItem(2633, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2635, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2637, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2587, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_BERET_2633, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_BERET_2635, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WHITE_BERET_2637, 1, 1, DropFrequency.UNCOMMON),
 			// black
 			// t
-			new ChanceItem(2583, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2585, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3472, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2589, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2595, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_FULL_HELMT_2587, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_PLATEBODY_T_2583, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_PLATELEGS_T_2585, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_PLATESKIRT_T_3472, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_KITESHIELD_T_2589, 1, 1, DropFrequency.UNCOMMON),
 			// black
 			// g
-			new ChanceItem(2591, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2593, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3473, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2597, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2631, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_FULL_HELMG_2595, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_PLATEBODY_G_2591, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_PLATELEGS_G_2593, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_PLATESKIRT_G_3473, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_KITESHIELD_G_2597, 1, 1, DropFrequency.UNCOMMON),
+			//black h helms
+			new ChanceItem(Items.BLACK_HELM_H1_10306, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_HELM_H2_10308, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_HELM_H3_10310, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_HELM_H4_10312, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_HELM_H5_10314, 1, 1, DropFrequency.UNCOMMON),
+			//black h shields
+			new ChanceItem(Items.BLACK_SHIELDH1_7332, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_SHIELDH2_7338, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_SHIELDH3_7344, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_SHIELDH4_7350, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_SHIELDH5_7356, 1, 1, DropFrequency.UNCOMMON),
 			// highway
 			// man
 			// mask
-			new ChanceItem(7392, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.HIGHWAYMAN_MASK_2631, 1, 1, DropFrequency.UNCOMMON),
 			// wizard t
-			new ChanceItem(7396, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7388, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7390, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WIZARD_ROBE_T_7392, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WIZARD_HAT_T_7396, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_SKIRT_T_7388, 1, 1, DropFrequency.UNCOMMON),
 			// wizard
 			// g
-			new ChanceItem(7386, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7394, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7362, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WIZARD_ROBE_G_7390, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_SKIRT_G_7386, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WIZARD_HAT_G_7394, 1, 1, DropFrequency.UNCOMMON),
 			// studded
 			// g
-			new ChanceItem(7366, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7364, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.STUDDED_BODY_G_7362, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.STUDDED_CHAPS_G_7366, 1, 1, DropFrequency.UNCOMMON),
 			// studded
 			// t
-			new ChanceItem(7368, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10404, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.STUDDED_BODY_T_7364, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.STUDDED_CHAPS_T_7368, 1, 1, DropFrequency.UNCOMMON),
 			// red
 			// ele
 			// shirt
-			new ChanceItem(10406, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10424, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10426, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10408, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_ELE_SHIRT_10404, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_ELE_LEGS_10406, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_ELE_BLOUSE_10424, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_ELE_SKIRT_10426, 1, 1, DropFrequency.UNCOMMON),
 			// blue
 			// ele
 			// shirt
-			new ChanceItem(10410, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10428, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10430, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10412, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_ELE_SHIRT_10408, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_ELE_LEGS_10410, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_ELE_BLOUSE_10428, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_ELE_SKIRT_10430, 1, 1, DropFrequency.UNCOMMON),
 			// green
 			// ele
 			// shirt
-			new ChanceItem(10414, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10432, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10434, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10316, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GREEN_ELE_SHIRT_10412, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GREEN_ELE_LEGS_10414, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GREEN_ELE_BLOUSE_10432, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GREEN_ELE_SKIRT_10434, 1, 1, DropFrequency.UNCOMMON),
 			// bob
 			// the
 			// cat
-			new ChanceItem(10318, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10320, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10322, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10324, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10392, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BOB_SHIRT_10316, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BOB_SHIRT_10318, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BOB_SHIRT_10320, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BOB_SHIRT_10322, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BOB_SHIRT_10324, 1, 1, DropFrequency.RARE),
 			// emote
 			// enhancers
-			new ChanceItem(10394, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10396, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10398, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10366, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10458, 1, 1, DropFrequency.UNCOMMON),
-			// vestement
+			new ChanceItem(Items.A_POWDERED_WIG_10392, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.FLARED_TROUSERS_10394, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.PANTALOONS_10396, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SLEEPING_CAP_10398, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.AMULET_OF_MAGICT_10366, 1, 1, DropFrequency.UNCOMMON),
+			// vestment
 			// robes(sara,
 			// guthix,
 			// zammy)
-			new ChanceItem(10464, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10462, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10466, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10460, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10468, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13095, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.SARADOMIN_ROBE_TOP_10458, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.SARADOMIN_ROBE_LEGS_10464, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GUTHIX_ROBE_TOP_10462, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GUTHIX_ROBE_LEGS_10466, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ZAMORAK_ROBE_TOP_10460, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ZAMORAK_ROBE_LEGS_10468, 1, 1, DropFrequency.UNCOMMON),
 			// black
 			// cane
-			new ChanceItem(13105, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BLACK_CANE_13095, 1, 1, DropFrequency.UNCOMMON),
 			// spikey
 			// helmet
-			new ChanceItem(1077, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1089, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1107, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1125, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1151, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1165, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1179, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1195, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1217, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1283, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1297, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1313, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1327, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1341, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1361, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1367, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1426, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(3098, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(4821, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(8779, 4, 38, DropFrequency.COMMON),
-			new ChanceItem(850, 1, 4, DropFrequency.COMMON),
-			new ChanceItem(334, 4, 19, DropFrequency.COMMON),
-			new ChanceItem(1169, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1059, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1061, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1063, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1095, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1129, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1167, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1131, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(858, 1, 4, DropFrequency.COMMON),
-			new ChanceItem(330, 3, 23, DropFrequency.COMMON),
-			new ChanceItem(1441, 1, 3, DropFrequency.COMMON),
-			new ChanceItem(1443, 1, 3, DropFrequency.COMMON),
-			new ChanceItem(1270, 1, 3, DropFrequency.COMMON),
-			new ChanceItem(1097, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1133, 1, 1, DropFrequency.COMMON)),
+			new ChanceItem(Items.SPIKED_HELMET_13105, 1, 1, DropFrequency.RARE),
+			//comp bow
+			new ChanceItem(Items.WILLOW_COMP_BOW_10280, 1, 1, DropFrequency.UNCOMMON),
+			//other common crap
+			new ChanceItem(Items.BLACK_PLATELEGS_1077, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_PLATESKIRT_1089, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_CHAINBODY_1107, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_PLATEBODY_1125, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_MED_HELM_1151, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_FULL_HELM_1165, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_SQ_SHIELD_1179, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_KITESHIELD_1195, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_DAGGER_1217, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_SWORD_1283, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_LONGSWORD_1297, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_2H_SWORD_1313, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_SCIMITAR_1327, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_WARHAMMER_1341, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_AXE_1361, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_BATTLEAXE_1367, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_MACE_1426, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_CLAWS_3098, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_NAILS_4821, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.OAK_PLANK_8779, 4, 38, DropFrequency.COMMON),
+			new ChanceItem(Items.WILLOW_SHORTBOW_850, 1, 4, DropFrequency.COMMON),
+			new ChanceItem(Items.TROUT_334, 4, 19, DropFrequency.COMMON),
+			new ChanceItem(Items.COIF_1169, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.LEATHER_GLOVES_1059, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.LEATHER_BOOTS_1061, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.LEATHER_VAMBRACES_1063, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.LEATHER_CHAPS_1095, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.LEATHER_BODY_1129, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.LEATHER_COWL_1167, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.HARDLEATHER_BODY_1131, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.YEW_SHORTBOW_858, 1, 4, DropFrequency.COMMON),
+			new ChanceItem(Items.SALMON_330, 3, 23, DropFrequency.COMMON),
+			new ChanceItem(Items.EARTH_TALISMAN_1441, 1, 3, DropFrequency.COMMON),
+			new ChanceItem(Items.FIRE_TALISMAN_1443, 1, 3, DropFrequency.COMMON),
+			new ChanceItem(Items.STEEL_PICKAXE_1270, 1, 3, DropFrequency.COMMON),
+			new ChanceItem(Items.STUDDED_CHAPS_1097, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.STUDDED_BODY_1133, 1, 1, DropFrequency.COMMON)),
 
 	MEDIUM(new Item(2717), 1 << 16 | 6,
-			new ChanceItem(2605, 1, 1, DropFrequency.UNCOMMON),
 			// Trimmed
 			// addy
 			// shit
-			new ChanceItem(2599, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2601, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2603, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3474, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2613, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2607, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2609, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3475, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2611, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2579, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2647, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_FULL_HELMT_2605, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_PLATEBODY_T_2599, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_PLATELEGS_T_2601, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_KITESHIELD_T_2603, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_PLATESKIRT_T_3474, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_FULL_HELMG_2613, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_PLATEBODY_G_2607, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_PLATELEGS_G_2609, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_PLATESKIRT_G_3475, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAM_KITESHIELD_G_2611, 1, 1, DropFrequency.UNCOMMON),
 			// Headbands
-			new ChanceItem(2645, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2649, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2605, 1, 1, DropFrequency.UNCOMMON),
-			// addy
-			// trimmed
-			// shit
-			new ChanceItem(2599, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2601, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2603, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3474, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2613, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2607, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2609, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3475, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2611, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2577, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BLACK_HEADBAND_2647, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_HEADBAND_2645, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BROWN_HEADBAND_2649, 1, 1, DropFrequency.UNCOMMON),
 			// Boots
-			new ChanceItem(2579, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2647, 1, 1, DropFrequency.UNCOMMON),
-			// Headbands
-			new ChanceItem(2645, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2649, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7319, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RANGER_BOOTS_2577, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.WIZARD_BOOTS_2579, 1, 1, DropFrequency.UNCOMMON),
 			// Boaters
-			new ChanceItem(7321, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7323, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7325, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7327, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7372, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_BOATER_7319, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ORANGE_BOATER_7321, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GREEN_BOATER_7323, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_BOATER_7325, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_BOATER_7327, 1, 1, DropFrequency.UNCOMMON),
 			// Trimmed
 			// Dragonhide
 			// shit
-			new ChanceItem(7380, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7370, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7378, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13103, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13097, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13109, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.DHIDE_BODY_T_7372, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.DHIDE_CHAPS_T_7380, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.DHIDE_BODYG_7370, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.DHIDE_CHAPS_G_7378, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PITH_HELMET_13103, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_CANE_13097, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.YEW_COMP_BOW_10282, 1, 1, DropFrequency.UNCOMMON),
 			// animal
 			// masks
-			new ChanceItem(13107, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13111, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13113, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13115, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10364, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PENGUIN_MASK_13109, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.SHEEP_MASK_13107, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BAT_MASK_13111, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.CAT_MASK_13113, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WOLF_MASK_13115, 1, 1, DropFrequency.UNCOMMON),
 			// ammy
 			// of
 			// strength
 			// (t)
-			new ChanceItem(10420, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.STRENGTH_AMULETT_10364, 1, 1, DropFrequency.UNCOMMON),
 			// white ele
-			new ChanceItem(10422, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10400, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.WHITE_ELE_BLOUSE_10420, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WHITE_ELE_SKIRT_10422, 1, 1, DropFrequency.UNCOMMON),
 			// black
 			// ele
-			new ChanceItem(10402, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10416, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLACK_ELE_SHIRT_10400, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.BLACK_ELE_LEGS_10402, 1, 1, DropFrequency.RARE),
 			// purple
 			// ele
-			new ChanceItem(10418, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10436, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10438, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10296, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PURPLE_ELE_SHIRT_10416, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PURPLE_ELE_LEGS_10418, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PURPLE_ELE_BLOUSE_10436, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PURPLE_ELE_SKIRT_10438, 1, 1, DropFrequency.UNCOMMON),
 			// addy
 			// heraldic
 			// helms
-			new ChanceItem(10298, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10300, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10302, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10304, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10666, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_HELM_H1_10296, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_HELM_H2_10298, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_HELM_H3_10300, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_HELM_H4_10302, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_HELM_H5_10304, 1, 1, DropFrequency.UNCOMMON),
 			// addy
 			// heraldic
 			// shield
-			new ChanceItem(10669, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10672, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10675, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10678, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10446, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_SHIELDH1_10666, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_SHIELDH2_10669, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_SHIELDH3_10672, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_SHIELDH4_10675, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ADAMANT_SHIELDH5_10678, 1, 1, DropFrequency.UNCOMMON),
 			// cloaks
-			new ChanceItem(10448, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10450, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(1161, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1123, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1073, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1091, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1199, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1183, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1111, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1211, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1271, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1287, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1301, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1317, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1357, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1371, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1430, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(4823, 10, 40, DropFrequency.COMMON),
-			new ChanceItem(9183, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1393, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1099, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1135, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(857, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(8781, 10, 43, DropFrequency.COMMON),
-			new ChanceItem(374, 6, 23, DropFrequency.COMMON),
-			new ChanceItem(380, 15, 43, DropFrequency.COMMON),
-			new ChanceItem(10452, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10454, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10456, 1, 1, DropFrequency.UNCOMMON)),
+			new ChanceItem(Items.SARADOMIN_CLOAK_10446, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GUTHIX_CLOAK_10448, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ZAMORAK_CLOAK_10450, 1, 1, DropFrequency.UNCOMMON),
+			//mitres
+			new ChanceItem(Items.SARADOMIN_MITRE_10452, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GUTHIX_MITRE_10454, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ZAMORAK_MITRE_10456, 1, 1, DropFrequency.UNCOMMON),
+
+			new ChanceItem(Items.ADAMANT_FULL_HELM_1161, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_PLATEBODY_1123, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_PLATELEGS_1073, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_PLATESKIRT_1091, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_KITESHIELD_1199, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_SQ_SHIELD_1183, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_CHAINBODY_1111, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_DAGGER_1211, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_PICKAXE_1271, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_SWORD_1287, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_LONGSWORD_1301, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_2H_SWORD_1317, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_AXE_1357, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_BATTLEAXE_1371, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_MACE_1430, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANTITE_NAILS_4823, 10, 40, DropFrequency.COMMON),
+			new ChanceItem(Items.ADAMANT_CROSSBOW_9183, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.FIRE_BATTLESTAFF_1393, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.GREEN_DHIDE_CHAPS_1099, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.GREEN_DHIDE_BODY_1135, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.YEW_SHORTBOW_857, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.TEAK_PLANK_8781, 10, 43, DropFrequency.COMMON),
+			new ChanceItem(Items.SWORDFISH_374, 6, 23, DropFrequency.COMMON),
+			new ChanceItem(Items.LOBSTER_380, 15, 43, DropFrequency.COMMON)),
 
 	HARD(new Item(2720), 1 << 16 | 8,
-			new ChanceItem(13101, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(13099, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10470, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10472, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10474, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10440, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10442, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10444, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2628, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.MAGIC_COMP_BOW_10284, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.TOP_HAT_13101, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_CANE_13099, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.SARADOMIN_STOLE_10470, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GUTHIX_STOLE_10472, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ZAMORAK_STOLE_10474, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.SARADOMIN_CROZIER_10440, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GUTHIX_CROZIER_10442, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ZAMORAK_CROZIER_10444, 1, 1, DropFrequency.UNCOMMON),
 			// Trimmed
 			// rune
 			// shit
-			new ChanceItem(2623, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2625, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2629, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2619, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3477, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2615, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2617, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2628, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2628, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3476, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2621, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2673, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_FULL_HELM_T_2627, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_PLATEBODY_T_2623, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_PLATELEGS_T_2625, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_PLATESKIRT_T_3477, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_KITESHIELD_T_2629, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_FULL_HELMG_2619, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_PLATEBODY_G_2615, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_PLATELEGS_G_2617, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_PLATESKIRT_G_3476, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_KITESHIELD_G_2621, 1, 1, DropFrequency.UNCOMMON),
 			// God
 			// armour
 			// shit
-			new ChanceItem(2669, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2671, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3480, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2675, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2657, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2653, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2655, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2659, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2665, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2661, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3478, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2663, 1, 1, DropFrequency.RARE),
-			new ChanceItem(2667, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3479, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10286, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_FULL_HELM_2673, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PLATEBODY_2669, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PLATELEGS_2671, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PLATESKIRT_3480, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_KITESHIELD_2675, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_FULL_HELM_2657, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PLATEBODY_2653, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PLATELEGS_2655, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PLATESKIRT_3478, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_KITESHIELD_2659, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_FULL_HELM_2665, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_PLATEBODY_2661, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_PLATELEGS_2663, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_PLATESKIRT_3479, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_KITESHIELD_2667, 1, 1, DropFrequency.RARE),
 			// heraldic
 			// shit
-			new ChanceItem(10667, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10288, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10670, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10290, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10673, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10292, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10676, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10294, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10679, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7376, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_HELM_H1_10286, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_SHIELDH1_10667, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_HELM_H2_10288, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_SHIELDH2_10670, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_HELM_H3_10290, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_SHIELDH3_10673, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_HELM_H4_10292, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_SHIELDH4_10676, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_HELM_H5_10294, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RUNE_SHIELDH5_10679, 1, 1, DropFrequency.UNCOMMON),
 			// Blue
 			// dragonhide
 			// trimmed
-			new ChanceItem(7384, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(7374, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(7382, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.DHIDE_BODY_T_7376, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.DHIDE_CHAPS_T_7384, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.DHIDE_BODY_G_7374, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.DHIDE_CHAPS_G_7382, 1, 1, DropFrequency.COMMON),
 			// God
 			// dhide
-			new ChanceItem(10368, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10370, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10372, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10376, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10378, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10380, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10384, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10386, 1, 1, DropFrequency.RARE),
-			new ChanceItem(10388, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_COIF_10374, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_BRACERS_10368, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_DHIDE_10370, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_CHAPS_10372, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_COIF_10382, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_BRACERS_10376, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_DRAGONHIDE_10378, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_CHAPS_10380, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_COIF_10390, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_BRACERS_10384, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_DHIDE_10386, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_CHAPS_10388, 1, 1, DropFrequency.RARE),
 			// Hats
-			new ChanceItem(2651, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2581, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(2639, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PIRATES_HAT_2651, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ROBIN_HOOD_HAT_2581, 1, 1, DropFrequency.UNCOMMON),
 			// Cavaliers
-			new ChanceItem(2641, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(2643, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1163, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1127, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1079, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1093, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1201, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1185, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1213, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1275, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1289, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1303, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1319, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1359, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1373, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1432, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(4824, 10, 43, DropFrequency.COMMON),
-			new ChanceItem(9144, 6, 23, DropFrequency.COMMON),
-			new ChanceItem(9185, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(1747, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(2503, 1, 1, DropFrequency.COMMON),
-			new ChanceItem(861, 1, 2, DropFrequency.COMMON),
-			new ChanceItem(859, 1, 2, DropFrequency.COMMON),
-			new ChanceItem(8783, 6, 27, DropFrequency.COMMON),
-			new ChanceItem(380, 16, 38, DropFrequency.COMMON),
-			new ChanceItem(386, 7, 32, DropFrequency.COMMON),
-			new ChanceItem(10382, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10374, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(10389, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7398, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7399, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(7400, 1, 1, DropFrequency.UNCOMMON)),
+			new ChanceItem(Items.TAN_CAVALIER_2639, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.DARK_CAVALIER_2641, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_CAVALIER_2643, 1, 1, DropFrequency.COMMON),
+			//rune crap
+			new ChanceItem(Items.RUNE_FULL_HELM_1163, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_PLATEBODY_1127, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_PLATELEGS_1079, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_PLATESKIRT_1093, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_KITESHIELD_1201, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_SQ_SHIELD_1185, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_DAGGER_1213, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_PICKAXE_1275, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_SWORD_1289, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_LONGSWORD_1303, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_2H_SWORD_1319, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_AXE_1359, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_BATTLEAXE_1373, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_MACE_1432, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_NAILS_4824, 10, 43, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_BOLTS_9144, 6, 23, DropFrequency.COMMON),
+			new ChanceItem(Items.RUNE_CROSSBOW_9185, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_DHIDE_CHAPS_2497, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.BLACK_DHIDE_BODY_2503, 1, 1, DropFrequency.COMMON),
+			new ChanceItem(Items.MAGIC_SHORTBOW_861, 1, 2, DropFrequency.COMMON),
+			new ChanceItem(Items.MAGIC_LONGBOW_859, 1, 2, DropFrequency.COMMON),
+			//planks
+			new ChanceItem(Items.MAHOGANY_PLANK_8783, 6, 27, DropFrequency.COMMON),
+			//food
+			new ChanceItem(Items.LOBSTER_380, 16, 38, DropFrequency.COMMON),
+			new ChanceItem(Items.SHARK_386, 7, 32, DropFrequency.COMMON),
+			//enchanted robes
+			new ChanceItem(Items.ENCHANTED_ROBE_7398, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ENCHANTED_TOP_7399, 1, 1, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.ENCHANTED_HAT_7400, 1, 1, DropFrequency.UNCOMMON)),
 
 	;
 
@@ -396,37 +400,29 @@ public enum ClueLevel {
 	 * The default rewards.
 	 */
 	private static final ChanceItem[] DEFAULT_REWARDS = new ChanceItem[] {
-			new ChanceItem(995, 500, 7000, DropFrequency.COMMON),
-			new ChanceItem(10326, 15, 40, DropFrequency.UNCOMMON),
-			new ChanceItem(7329, 15, 40, DropFrequency.UNCOMMON),
-			new ChanceItem(7331, 15, 40, DropFrequency.UNCOMMON),
-			new ChanceItem(7330, 15, 40, DropFrequency.UNCOMMON),
-			new ChanceItem(10327, 15, 40, DropFrequency.UNCOMMON),
-			new ChanceItem(10476, 1, 27, DropFrequency.UNCOMMON),
-			new ChanceItem(556, 1, 228, DropFrequency.COMMON),
-			new ChanceItem(554, 1, 228, DropFrequency.COMMON),
-			new ChanceItem(557, 1, 228, DropFrequency.COMMON),
-			new ChanceItem(557, 1, 228, DropFrequency.COMMON),
-			new ChanceItem(1694, 1, 1, DropFrequency.RARE),
-			new ChanceItem(1696, 1, 1, DropFrequency.RARE),
-			new ChanceItem(1698, 1, 1, DropFrequency.RARE),
-			new ChanceItem(1700, 1, 1, DropFrequency.RARE),
-			new ChanceItem(1702, 1, 1, DropFrequency.RARE),
-			new ChanceItem(847, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(855, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(859, 1, 1, DropFrequency.UNCOMMON),
-			new ChanceItem(3827, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3828, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3829, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3830, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3831, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3832, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3833, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3834, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3835, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3836, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3837, 1, 1, DropFrequency.RARE),
-			new ChanceItem(3838, 1, 1, DropFrequency.RARE)
+			new ChanceItem(Items.COINS_995, 500, 7000, DropFrequency.COMMON),
+			new ChanceItem(Items.PURPLE_FIRELIGHTER_10326, 15, 40, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.RED_FIRELIGHTER_7329, 15, 40, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.BLUE_FIRELIGHTER_7331, 15, 40, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.GREEN_FIRELIGHTER_7330, 15, 40, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.WHITE_FIRELIGHTER_10327, 15, 40, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.PURPLE_SWEETS_10476, 1, 27, DropFrequency.UNCOMMON),
+			new ChanceItem(Items.AIR_RUNE_556, 1, 228, DropFrequency.COMMON),
+			new ChanceItem(Items.FIRE_RUNE_554, 1, 228, DropFrequency.COMMON),
+			new ChanceItem(Items.EARTH_RUNE_557, 1, 228, DropFrequency.COMMON),
+			new ChanceItem(Items.WATER_RUNE_555, 1, 228, DropFrequency.COMMON),
+			new ChanceItem(Items.SARADOMIN_PAGE_1_3827, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_PAGE_2_3828, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_PAGE_3_3829, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.SARADOMIN_PAGE_4_3830, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PAGE_1_3831, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PAGE_2_3832, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PAGE_3_3833, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.ZAMORAK_PAGE_4_3834, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PAGE_1_3835, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PAGE_2_3836, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PAGE_3_3837, 1, 1, DropFrequency.RARE),
+			new ChanceItem(Items.GUTHIX_PAGE_4_3838, 1, 1, DropFrequency.RARE)
 	};
 
 	/**
@@ -434,26 +430,26 @@ public enum ClueLevel {
 	 */
 	private static final WeightedChanceItem[] SUPER_RARE = new WeightedChanceItem[] {
 			//1 Trimmed Glory = 50 = to hit 15%
-			new WeightedChanceItem(10362, 1, 1, 50),
+			new WeightedChanceItem(Items.AMULET_OF_GLORYT_10362, 1, 1, 50),
 			//5 Gilded Items = 150 = to hit 9%
-			new WeightedChanceItem(3486, 1, 1, 30),
-			new WeightedChanceItem(3481, 1, 1, 30),
-			new WeightedChanceItem(3483, 1, 1, 30),
-			new WeightedChanceItem(3485, 1, 1, 30),
-			new WeightedChanceItem(3488, 1, 1, 30),
+			new WeightedChanceItem(Items.GILDED_FULL_HELM_3486, 1, 1, 30),
+			new WeightedChanceItem(Items.GILDED_PLATEBODY_3481, 1, 1, 30),
+			new WeightedChanceItem(Items.GILDED_PLATELEGS_3483, 1, 1, 30),
+			new WeightedChanceItem(Items.GILDED_PLATESKIRT_3485, 1, 1, 30),
+			new WeightedChanceItem(Items.GILDED_KITESHIELD_3488, 1, 1, 30),
 			//12 3rd Age = 120 = to hit 3%
-			new WeightedChanceItem(10330, 1, 1, 10),
-			new WeightedChanceItem(10332, 1, 1, 10),
-			new WeightedChanceItem(10334, 1, 1, 10),
-			new WeightedChanceItem(10336, 1, 1, 10),
-			new WeightedChanceItem(10338, 1, 1, 10),
-			new WeightedChanceItem(10340, 1, 1, 10),
-			new WeightedChanceItem(10342, 1, 1, 10),
-			new WeightedChanceItem(10344, 1, 1, 10),
-			new WeightedChanceItem(10346, 1, 1, 10),
-			new WeightedChanceItem(10348, 1, 1, 10),
-			new WeightedChanceItem(10350, 1, 1, 10),
-			new WeightedChanceItem(10352, 1, 1, 10) };
+			new WeightedChanceItem(Items.THIRD_AGE_RANGE_TOP_10330, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_RANGE_LEGS_10332, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_RANGE_COIF_10334, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_VAMBRACES_10336, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_ROBE_TOP_10338, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_ROBE_10340, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_MAGE_HAT_10342, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_AMULET_10344, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_PLATELEGS_10346, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_PLATEBODY_10348, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_FULL_HELMET_10350, 1, 1, 10),
+			new WeightedChanceItem(Items.THIRD_AGE_KITESHIELD_10352, 1, 1, 10) };
 
 	/**
 	 * The casket.