ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Make ItemVariationsMapping use generated json

Browse Source 
This adds support for many new variations (mostly slayer helmets,
tridents and items with different ids but same names).

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-11-02 11:44:42 +01:00
parent 3f904d3804
commit 91dd07f405
3 changed files with 8888 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
runelite-client/src/test/java/net/runelite/client/game/ItemVariationMappingTest.java
View File

@@ -60,8 +60,8 @@ public class ItemVariationMappingTest
put(ANTIDOTE2, ANTIDOTE_UNF);
put(ANTIDOTE3, ANTIDOTE_UNF);
put(ANTIDOTE4, ANTIDOTE_UNF);
put(ANTIDOTE1_5958, ANTIDOTE_UNF_5951);
put(ANTIDOTE2_5956, ANTIDOTE_UNF_5951);
put(ANTIDOTE1_5958, ANTIDOTE_UNF);
put(ANTIDOTE2_5956, ANTIDOTE_UNF);
put(APPLES2, APPLES1);
put(APPLES3, APPLES1);
put(APPLES4, APPLES1);
@@ -78,16 +78,16 @@ public class ItemVariationMappingTest
put(BANANAS5, BANANAS1);
put(BANDOS_PAGE_1, BANDOS_PAGE_1);
put(BLACK_KITESHIELD_T, BLACK_KITESHIELD);
put(BLACK_MASK_1, BLACK_MASK);
put(BLACK_MASK_2, BLACK_MASK);
put(BLACK_MASK_3, BLACK_MASK);
put(BLACK_MASK_4, BLACK_MASK);
put(BLACK_MASK_1, BLACK_MASK_10);
put(BLACK_MASK_2, BLACK_MASK_10);
put(BLACK_MASK_3, BLACK_MASK_10);
put(BLACK_MASK_4, BLACK_MASK_10);
put(BLUE_SKIRT_T, BLUE_SKIRT);
put(BLUE_WIZARD_HAT_T, BLUE_WIZARD_HAT);
put(BLUE_WIZARD_ROBE_T, BLUE_WIZARD_ROBE);
put(BOOK_PAGE_1, BOOK_PAGE_1);
put(BOOK_PAGE_2, BOOK_PAGE_1);
put(BROODOO_SHIELD_9, BROODOO_SHIELD);
put(BROODOO_SHIELD_9, BROODOO_SHIELD_10);
put(BROWN_SPICE_1, BROWN_SPICE_4);
put(BROWN_SPICE_2, BROWN_SPICE_4);
put(BROWN_SPICE_3, BROWN_SPICE_4);
@@ -112,21 +112,21 @@ public class ItemVariationMappingTest
put(COMPOST_POTION2, COMPOST_POTION4);
put(COMPOST_POTION3, COMPOST_POTION4);
put(COMPOST_POTION4, COMPOST_POTION4);
put(CRYSTAL_BOW_510_I, CRYSTAL_BOW_FULL);
put(CRYSTAL_BOW_510, CRYSTAL_BOW_FULL);
put(CRYSTAL_BOW_610_I, CRYSTAL_BOW_FULL);
put(CRYSTAL_BOW_610, CRYSTAL_BOW_FULL);
put(CRYSTAL_BOW_710_I, CRYSTAL_BOW_FULL);
put(CRYSTAL_HALBERD_510_I, CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_510, CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_610_I, CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_610, CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_710_I, CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_SHIELD_510_I, CRYSTAL_SHIELD_FULL);
put(CRYSTAL_SHIELD_510, CRYSTAL_SHIELD_FULL);
put(CRYSTAL_SHIELD_610_I, CRYSTAL_SHIELD_FULL);
put(CRYSTAL_SHIELD_610, CRYSTAL_SHIELD_FULL);
put(CRYSTAL_SHIELD_710_I, CRYSTAL_SHIELD_FULL);
put(CRYSTAL_BOW_510_I, NEW_CRYSTAL_BOW);
put(CRYSTAL_BOW_510, NEW_CRYSTAL_BOW);
put(CRYSTAL_BOW_610_I, NEW_CRYSTAL_BOW);
put(CRYSTAL_BOW_610, NEW_CRYSTAL_BOW);
put(CRYSTAL_BOW_710_I, NEW_CRYSTAL_BOW);
put(CRYSTAL_HALBERD_510_I, NEW_CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_510, NEW_CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_610_I, NEW_CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_610, NEW_CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_HALBERD_710_I, NEW_CRYSTAL_HALBERD_FULL_I);
put(CRYSTAL_SHIELD_510_I, NEW_CRYSTAL_SHIELD);
put(CRYSTAL_SHIELD_510, NEW_CRYSTAL_SHIELD);
put(CRYSTAL_SHIELD_610_I, NEW_CRYSTAL_SHIELD);
put(CRYSTAL_SHIELD_610, NEW_CRYSTAL_SHIELD);
put(CRYSTAL_SHIELD_710_I, NEW_CRYSTAL_SHIELD);
put(DEFENCE_POTION2, DEFENCE_POTION3);
put(DEFENCE_POTION3, DEFENCE_POTION3);
put(DEFENCE_POTION4, DEFENCE_POTION3);
@@ -140,8 +140,8 @@ public class ItemVariationMappingTest
put(DRAGON_BITTERM3, DRAGON_BITTER);
put(DRAGON_BITTERM4, DRAGON_BITTER);
put(DRAGON_DEFENDER_T, DRAGON_DEFENDER);
put(DRAGONSTONE_BOLTS_E, DRAGONSTONE_BOLTS);
put(DRAGONSTONE_DRAGON_BOLTS_E, DRAGONSTONE_DRAGON_BOLTS);
put(DRAGONSTONE_BOLTS, DRAGONSTONE_BOLTS_E);
put(DRAGONSTONE_DRAGON_BOLTS, DRAGONSTONE_DRAGON_BOLTS_E);
put(ENCHANTED_LYRE2, ENCHANTED_LYRE);
put(ENCHANTED_LYRE3, ENCHANTED_LYRE);
put(ENCHANTED_LYRE4, ENCHANTED_LYRE);
@@ -162,19 +162,19 @@ public class ItemVariationMappingTest
put(GAMES_NECKLACE5, GAMES_NECKLACE8);
put(GAMES_NECKLACE6, GAMES_NECKLACE8);
put(GAMES_NECKLACE7, GAMES_NECKLACE8);
put(GREENMANS_ALE4, GREENMANS_ALE1);
put(GREENMANS_ALEM1, GREENMANS_ALE1);
put(GREENMANS_ALEM2, GREENMANS_ALE1);
put(GREENMANS_ALEM3, GREENMANS_ALE1);
put(GREENMANS_ALEM4, GREENMANS_ALE1);
put(GREENMANS_ALE4, GREENMANS_ALE);
put(GREENMANS_ALEM1, GREENMANS_ALE);
put(GREENMANS_ALEM2, GREENMANS_ALE);
put(GREENMANS_ALEM3, GREENMANS_ALE);
put(GREENMANS_ALEM4, GREENMANS_ALE);
put(GUTHANS_PLATEBODY_75, GUTHANS_PLATEBODY);
put(GUTHANS_WARSPEAR_0, GUTHANS_WARSPEAR);
put(GUTHANS_WARSPEAR_100, GUTHANS_WARSPEAR);
put(GUTHANS_WARSPEAR_25, GUTHANS_WARSPEAR);
put(GUTHANS_WARSPEAR_50, GUTHANS_WARSPEAR);
put(HALF_A_GARDEN_PIE, GARDEN_PIE);
put(HALF_A_GARDEN_PIE, PART_GARDEN_PIE);
put(HALF_A_MEAT_PIE, MEAT_PIE);
put(HALF_A_MUSHROOM_PIE, MUSHROOM_PIE);
put(MUSHROOM_PIE, HALF_A_MUSHROOM_PIE);
put(HALF_A_REDBERRY_PIE, REDBERRY_PIE);
put(HALF_A_ROCK, ROCK);
put(HUNTING_MIX1, HUNTING_MIX2);
@@ -196,7 +196,7 @@ public class ItemVariationMappingTest
put(MAGIC_POTION2, MAGIC_POTION4);
put(MAGIC_POTION3, MAGIC_POTION4);
put(MAGIC_POTION4, MAGIC_POTION4);
put(MAGIC_SHORTBOW_I, MAGIC_SHORTBOW);
put(MAGIC_SHORTBOW_I, MAGIC_SHORTBOW_U);
put(MITHRIL_FULL_HELM_T, MITHRIL_FULL_HELM);
put(MITHRIL_KITESHIELD_T, MITHRIL_KITESHIELD);
put(MITHRIL_PLATEBODY_T, MITHRIL_PLATEBODY);
@@ -217,11 +217,11 @@ public class ItemVariationMappingTest
put(ORANGES5, ORANGES1);
put(OVERLOAD_1, OVERLOAD_4);
put(OVERLOAD_2, OVERLOAD_4);
put(PHARAOHS_SCEPTRE_3, PHARAOHS_SCEPTRE);
put(PHARAOHS_SCEPTRE_4, PHARAOHS_SCEPTRE);
put(PHARAOHS_SCEPTRE_5, PHARAOHS_SCEPTRE);
put(PHARAOHS_SCEPTRE_6, PHARAOHS_SCEPTRE);
put(PHARAOHS_SCEPTRE_7, PHARAOHS_SCEPTRE);
put(PHARAOHS_SCEPTRE_3, PHARAOHS_SCEPTRE_3);
put(PHARAOHS_SCEPTRE_4, PHARAOHS_SCEPTRE_3);
put(PHARAOHS_SCEPTRE_5, PHARAOHS_SCEPTRE_3);
put(PHARAOHS_SCEPTRE_6, PHARAOHS_SCEPTRE_3);
put(PHARAOHS_SCEPTRE_7, PHARAOHS_SCEPTRE_3);
put(PRAEL_BAT_1, PRAEL_BAT_1);
put(PRAYER_CAPET, PRAYER_CAPE);
put(PRAYER_ENHANCE_1_20965, PRAYER_ENHANCE_1);
@@ -234,7 +234,7 @@ public class ItemVariationMappingTest
put(RANGING_POTION3, RANGING_POTION3);
put(RED_DHIDE_BODY_T, RED_DHIDE_BODY);
put(RED_DHIDE_CHAPS_T, RED_DHIDE_CHAPS);
put(RED_SLAYER_HELMET_I, RED_SLAYER_HELMET);
put(RED_SLAYER_HELMET_I, SLAYER_HELMET);
put(RED_SPICE_1, RED_SPICE_4);
put(RED_SPICE_2, RED_SPICE_4);
put(RESTORE_MIX1, RESTORE_MIX2);
@@ -307,15 +307,15 @@ public class ItemVariationMappingTest
put(TELEPORT_CRYSTAL_2, TELEPORT_CRYSTAL_4);
put(TELEPORT_CRYSTAL_3, TELEPORT_CRYSTAL_4);
put(TELEPORT_CRYSTAL_4, TELEPORT_CRYSTAL_4);
put(TOPAZ_BOLTS_E, TOPAZ_BOLTS);
put(TOPAZ_DRAGON_BOLTS_E, TOPAZ_DRAGON_BOLTS);
put(TOPAZ_BOLTS, TOPAZ_BOLTS_E);
put(TOPAZ_DRAGON_BOLTS, TOPAZ_DRAGON_BOLTS_E);
put(TORAGS_HAMMERS_0, TORAGS_HAMMERS);
put(TORAGS_HAMMERS_100, TORAGS_HAMMERS);
put(TORAGS_HAMMERS_25, TORAGS_HAMMERS);
put(TORAGS_PLATELEGS_50, TORAGS_PLATELEGS);
put(TORAGS_PLATELEGS_75, TORAGS_PLATELEGS);
put(TREASONOUS_RING_I, TREASONOUS_RING);
put(TRIDENT_OF_THE_SEAS_E, TRIDENT_OF_THE_SEAS);
put(TRIDENT_OF_THE_SEAS_E, TRIDENT_OF_THE_SEAS_FULL);
put(TRIDENT_OF_THE_SWAMP_E, TRIDENT_OF_THE_SWAMP);
put(VERACS_BRASSARD_50, VERACS_BRASSARD);
put(VERACS_BRASSARD_75, VERACS_BRASSARD);