ItemsKeptOnDeath: Update Pets (#2065)

ItemsKeptOnDeath: Update Pets
2019-11-22 18:20:09 +01:00
parent f082e43971 3b4a2e89db
commit fbdc3c362d
1 changed files with 132 additions and 53 deletions
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/Pets.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/Pets.java
@@ -35,61 +35,140 @@ final class Pets
 	}

 	private static final Set<Integer> PETS = ImmutableSet.of(
-		BABY_MOLE,
-		PRINCE_BLACK_DRAGON,
-		PET_CORPOREAL_CRITTER, PET_DARK_CORE,
-		JALNIBREK, TZREKZUK,
-		KALPHITE_PRINCESS, KALPHITE_PRINCESS_12654,
-		LIL_ZIK,
-		SKOTOS,
-		PET_SNAKELING, PET_SNAKELING_12939, PET_SNAKELING_12940,
-		TZREKJAD,
-		VORKI,
-
-		OLMLET, PUPPADILE, TEKTINY, VANGUARD, VASA_MINIRIO, VESPINA,
-
-		PET_DAGANNOTH_PRIME, PET_DAGANNOTH_REX, PET_DAGANNOTH_SUPREME,
-
-		PET_GENERAL_GRAARDOR, PET_KRIL_TSUTSAROTH, PET_KREEARRA, PET_ZILYANA,
-
-		ABYSSAL_ORPHAN,
-		HELLPUPPY,
-		PET_KRAKEN,
-		MIDNIGHT, NOON,
-		PET_SMOKE_DEVIL, PET_SMOKE_DEVIL_22663,
-		IKKLE_HYDRA, IKKLE_HYDRA_22748, IKKLE_HYDRA_22750, IKKLE_HYDRA_22752,
-
-		CALLISTO_CUB,
-		PET_CHAOS_ELEMENTAL,
-		SCORPIAS_OFFSPRING,
-		VENENATIS_SPIDERLING,
-		VETION_JR, VETION_JR_13180,
-
-		BABY_CHINCHOMPA, BABY_CHINCHOMPA_13324, BABY_CHINCHOMPA_13325, BABY_CHINCHOMPA_13326,
-		BEAVER,
-		GIANT_SQUIRREL,
-		HERON,
-		RIFT_GUARDIAN, RIFT_GUARDIAN_20667, RIFT_GUARDIAN_20669, RIFT_GUARDIAN_20671, RIFT_GUARDIAN_20673, RIFT_GUARDIAN_20675,
-		RIFT_GUARDIAN_20677, RIFT_GUARDIAN_20679, RIFT_GUARDIAN_20681, RIFT_GUARDIAN_20683, RIFT_GUARDIAN_20685, RIFT_GUARDIAN_20687,
-		RIFT_GUARDIAN_20689, RIFT_GUARDIAN_20691, RIFT_GUARDIAN_21990,
-		ROCK_GOLEM, ROCK_GOLEM_21187, ROCK_GOLEM_21188, ROCK_GOLEM_21189, ROCK_GOLEM_21190, ROCK_GOLEM_21191, ROCK_GOLEM_21192,
-		ROCK_GOLEM_21193, ROCK_GOLEM_21194, ROCK_GOLEM_21195, ROCK_GOLEM_21196, ROCK_GOLEM_21197, ROCK_GOLEM_21340, ROCK_GOLEM_21358,
-		ROCK_GOLEM_21359, ROCK_GOLEM_21360,
-		ROCKY,
-		TANGLEROOT,
-
-		PET_KITTEN, PET_KITTEN_1556, PET_KITTEN_1557, PET_KITTEN_1558, PET_KITTEN_1559, PET_KITTEN_1560,
-		PET_CAT, PET_CAT_1562, PET_CAT_1563, PET_CAT_1564, PET_CAT_1565, PET_CAT_1566, PET_CAT_1567, PET_CAT_1568, PET_CAT_1569,
-		PET_CAT_1570, PET_CAT_1571, PET_CAT_1572,
-		LAZY_CAT, LAZY_CAT_6550, LAZY_CAT_6551, LAZY_CAT_6552, LAZY_CAT_6553, LAZY_CAT_6554,
-		WILY_CAT, WILY_CAT_6556, WILY_CAT_6557, WILY_CAT_6558, WILY_CAT_6559, WILY_CAT_6560,
-		OVERGROWN_HELLCAT, HELL_CAT, HELLKITTEN, LAZY_HELL_CAT, WILY_HELLCAT,
-
+		//Cats
+		HELL_CAT, 
+		HELLKITTEN, 
+		LAZY_CAT, 
+		LAZY_CAT_6550, 
+		LAZY_CAT_6551, 
+		LAZY_CAT_6552, 
+		LAZY_CAT_6553, 
+		LAZY_CAT_6554,
+		LAZY_HELL_CAT, 
+		OVERGROWN_HELLCAT, 
+		PET_CAT,
+		PET_CAT_1562,
+		PET_CAT_1563,
+		PET_CAT_1564,
+		PET_CAT_1565, 
+		PET_CAT_1566,
+		PET_CAT_1567,
+		PET_CAT_1568,
+		PET_CAT_1569,
+		PET_CAT_1570,
+		PET_CAT_1571, 
+		PET_CAT_1572,
+		PET_KITTEN,
+		PET_KITTEN_1556,
+		PET_KITTEN_1557,
+		PET_KITTEN_1558,
+		PET_KITTEN_1559,
+		PET_KITTEN_1560,
+		WILY_CAT, 
+		WILY_CAT_6556, 
+		WILY_CAT_6557, 
+		WILY_CAT_6558, 
+		WILY_CAT_6559, 
+		WILY_CAT_6560,
+		WILY_HELLCAT,
+			
+		//ClueScroll Pets
 		BLOODHOUND,
-		CHOMPY_CHICK,
-		HERBI,
+			
+		//PVM Pets
+		ABYSSAL_ORPHAN,
+		BABY_MOLE,
+		CALLISTO_CUB,
+		CORRUPTED_YOUNGLLEF,
+		HELLPUPPY,
+		IKKLE_HYDRA,
+		IKKLE_HYDRA_22748,
+		IKKLE_HYDRA_22750,
+		IKKLE_HYDRA_22752,
+		JALNIBREK,
+		KALPHITE_PRINCESS,
+		KALPHITE_PRINCESS_12654,
+		LIL_ZIK,
+		MIDNIGHT,
+		NOON,
+		OLMLET,
+		PET_CHAOS_ELEMENTAL,
+		PET_CORPOREAL_CRITTER,
+		PET_DAGANNOTH_PRIME,
+		PET_DAGANNOTH_REX,
+		PET_DAGANNOTH_SUPREME,
+		PET_DARK_CORE,
+		PET_GENERAL_GRAARDOR,
+		PET_KRAKEN,
+		PET_KREEARRA,
+		PET_KRIL_TSUTSAROTH,
 		PET_PENANCE_QUEEN,
-		PHOENIX
+		PET_SMOKE_DEVIL,
+		PET_SMOKE_DEVIL_22663,
+		PET_SNAKELING,
+		PET_SNAKELING_12939,
+		PET_SNAKELING_12940,
+		PET_ZILYANA,
+		PRINCE_BLACK_DRAGON,
+		PUPPADILE,
+		SCORPIAS_OFFSPRING,
+		SKOTOS,
+		SMOLCANO,
+		SRARACHA,
+		TEKTINY,
+		TZREKJAD,
+		TZREKZUK,
+		VANGUARD,
+		VASA_MINIRIO,
+		VENENATIS_SPIDERLING,
+		VESPINA,
+		VETION_JR,
+		VETION_JR_13180,
+		VORKI,
+		YOUNGLLEF,
+		
+		//Skilling Pets
+		BABY_CHINCHOMPA,
+		BABY_CHINCHOMPA_13324,
+		BABY_CHINCHOMPA_13325,
+		BABY_CHINCHOMPA_13326,
+		BEAVER,
+		CHOMPY_CHICK,
+		GIANT_SQUIRREL,
+		HERBI,
+		HERON,
+		PHOENIX,
+		RIFT_GUARDIAN,
+		RIFT_GUARDIAN_20667,
+		RIFT_GUARDIAN_20669,
+		RIFT_GUARDIAN_20671,
+		RIFT_GUARDIAN_20673,
+		RIFT_GUARDIAN_20675,
+		RIFT_GUARDIAN_20677,
+		RIFT_GUARDIAN_20679,
+		RIFT_GUARDIAN_20681,
+		RIFT_GUARDIAN_20683,
+		RIFT_GUARDIAN_20685,
+		RIFT_GUARDIAN_20687,
+		RIFT_GUARDIAN_20689,
+		RIFT_GUARDIAN_20691,
+		RIFT_GUARDIAN_21990,
+		ROCK_GOLEM,
+		ROCK_GOLEM_21187,
+		ROCK_GOLEM_21188,
+		ROCK_GOLEM_21189,
+		ROCK_GOLEM_21190,
+		ROCK_GOLEM_21191,
+		ROCK_GOLEM_21192,
+		ROCK_GOLEM_21193,
+		ROCK_GOLEM_21194,
+		ROCK_GOLEM_21195,
+		ROCK_GOLEM_21196,
+		ROCK_GOLEM_21197,
+		ROCK_GOLEM_21340,
+		ROCK_GOLEM_21358,
+		ROCK_GOLEM_21359,
+		ROCK_GOLEM_21360
 	);

 	public static boolean isPet(int id)