diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index c7f10a9869..43e9cce93d 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -98,7 +98,7 @@ public final class NpcID public static final int GHOST_95 = 95; public static final int GHOST_96 = 96; public static final int GHOST_97 = 97; - public static final int SOULESS = 98; + public static final int SOULLESS = 98; public static final int DEATH_WING = 99; public static final int ROCK_CRAB = 100; public static final int ROCKS = 101; @@ -795,8 +795,7 @@ public final class NpcID public static final int LONGHALL_BOUNCER = 813; public static final int GUILDMASTER = 814; public static final int DUKE_HORACIO = 815; - public static final int ELVARG = 816; - public static final int ELVARG_817 = 817; + public static final int ELVARG = 817; public static final int KLARENSE = 819; public static final int WORMBRAIN = 820; public static final int ORACLE = 821; @@ -1446,17 +1445,17 @@ public final class NpcID public static final int HUNTING_EXPERT = 1503; public static final int HUNTING_EXPERT_1504 = 1504; public static final int FERRET = 1505; - public static final int FISHING_SPOT_1506 = 1506; - public static final int FISHING_SPOT_1507 = 1507; - public static final int FISHING_SPOT_1508 = 1508; - public static final int FISHING_SPOT_1509 = 1509; + public static final int ROD_FISHING_SPOT = 1506; + public static final int ROD_FISHING_SPOT_1507 = 1507; + public static final int ROD_FISHING_SPOT_1508 = 1508; + public static final int ROD_FISHING_SPOT_1509 = 1509; public static final int FISHING_SPOT_1510 = 1510; public static final int FISHING_SPOT_1511 = 1511; - public static final int FISHING_SPOT_1512 = 1512; - public static final int FISHING_SPOT_1513 = 1513; + public static final int ROD_FISHING_SPOT_1512 = 1512; + public static final int ROD_FISHING_SPOT_1513 = 1513; public static final int FISHING_SPOT_1514 = 1514; - public static final int FISHING_SPOT_1515 = 1515; - public static final int FISHING_SPOT_1516 = 1516; + public static final int ROD_FISHING_SPOT_1515 = 1515; + public static final int ROD_FISHING_SPOT_1516 = 1516; public static final int FISHING_SPOT_1517 = 1517; public static final int FISHING_SPOT_1518 = 1518; public static final int FISHING_SPOT_1519 = 1519; @@ -1466,12 +1465,12 @@ public final class NpcID public static final int FISHING_SPOT_1523 = 1523; public static final int FISHING_SPOT_1524 = 1524; public static final int FISHING_SPOT_1525 = 1525; - public static final int FISHING_SPOT_1526 = 1526; - public static final int FISHING_SPOT_1527 = 1527; + public static final int ROD_FISHING_SPOT_1526 = 1526; + public static final int ROD_FISHING_SPOT_1527 = 1527; public static final int FISHING_SPOT_1528 = 1528; - public static final int FISHING_SPOT_1529 = 1529; + public static final int ROD_FISHING_SPOT_1529 = 1529; public static final int FISHING_SPOT_1530 = 1530; - public static final int FISHING_SPOT_1531 = 1531; + public static final int ROD_FISHING_SPOT_1531 = 1531; public static final int FISHING_SPOT_1532 = 1532; public static final int FISHING_SPOT_1533 = 1533; public static final int FISHING_SPOT_1534 = 1534; @@ -1793,8 +1792,8 @@ public final class NpcID public static final int SIR_AMIK_VARZE = 1867; public static final int SIR_AMIK_VARZE_1869 = 1869; public static final int EVIL_CHICKEN = 1870; - public static final int BABY_BLACK_DRAGON = 1871; - public static final int BABY_BLACK_DRAGON_1872 = 1872; + public static final int BABY_DRAGON_1871 = 1871; + public static final int BABY_DRAGON_1872 = 1872; public static final int KKLIK = 1873; public static final int ICE_TROLL_RUNT = 1874; public static final int ICE_TROLL_MALE = 1875; @@ -2939,6 +2938,7 @@ public final class NpcID public static final int WARRIOR_WOMAN = 3100; public static final int MAN_3101 = 3101; public static final int BARBARIAN_3102 = 3102; + public static final int ALKHARID_WARRIOR = 3103; public static final int PALADIN_3104 = 3104; public static final int PALADIN_3105 = 3105; public static final int HERO = 3106; @@ -3225,8 +3225,8 @@ public final class NpcID public static final int IDRIS = 3414; public static final int ESSYLLT = 3415; public static final int MORVRAN = 3416; - public static final int FISHING_SPOT_3417 = 3417; - public static final int FISHING_SPOT_3418 = 3418; + public static final int ROD_FISHING_SPOT_3417 = 3417; + public static final int ROD_FISHING_SPOT_3418 = 3418; public static final int FISHING_SPOT_3419 = 3419; public static final int RABBIT_3420 = 3420; public static final int RABBIT_3421 = 3421; @@ -3307,7 +3307,6 @@ public final class NpcID public static final int GERTRUDES_CAT_3497 = 3497; public static final int KITTEN = 3498; public static final int CRATE = 3499; - public static final int GERTRUDE = 3500; public static final int SHILOP = 3501; public static final int PHILOP = 3502; public static final int WILOUGH = 3503; @@ -3909,7 +3908,6 @@ public final class NpcID public static final int HYGD = 4110; public static final int CEOLBURG = 4111; public static final int HILD_4112 = 4112; - public static final int BOB_4113 = 4113; public static final int WHITE_KNIGHT_4114 = 4114; public static final int FAREED_HARD = 4115; public static final int BILLY = 4116; @@ -4007,7 +4005,6 @@ public final class NpcID public static final int PRIEST_4208 = 4208; public static final int SPHINX_4209 = 4209; public static final int POSSESSED_PRIEST = 4210; - public static final int NEITE_4211 = 4211; public static final int DONOVAN_THE_FAMILY_HANDYMAN = 4212; public static final int PIERRE = 4213; public static final int HOBBES = 4214; @@ -4081,6 +4078,7 @@ public final class NpcID public static final int PRINCE_ALI = 4282; public static final int PRINCE_ALI_4283 = 4283; public static final int AGGIE = 4284; + public static final int HASSAN = 4285; public static final int OSMAN_4286 = 4286; public static final int BORDER_GUARD = 4287; public static final int BORDER_GUARD_4288 = 4288; @@ -4341,7 +4339,6 @@ public final class NpcID public static final int OTHAINIAN = 4555; public static final int DOOMION = 4556; public static final int HOLTHION = 4557; - public static final int DARK_MAGE_4558 = 4558; public static final int DISCIPLE_OF_IBAN = 4559; public static final int LORD_IBAN = 4560; public static final int SPIDER_4561 = 4561; @@ -4756,7 +4753,6 @@ public final class NpcID public static final int ELEMENTAL_BALANCE_5002 = 5002; public static final int ELEMENTAL_BALANCE_5003 = 5003; public static final int ELEMENTAL_BALANCE_5004 = 5004; - public static final int WIZARD_MIZGOG = 5005; public static final int WIZARD_GRAYZAG = 5006; public static final int IMP_5007 = 5007; public static final int IMP_5008 = 5008; @@ -4820,7 +4816,6 @@ public final class NpcID public static final int HOLGART = 5068; public static final int HOLGART_5069 = 5069; public static final int HOLGART_5070 = 5070; - public static final int HOLGART_5071 = 5071; public static final int HOLGART_5072 = 5072; public static final int HOLGART_5073 = 5073; public static final int KENT = 5074; @@ -5193,7 +5188,7 @@ public final class NpcID public static final int RELOBO_BLINYO_LOGS = 5451; public static final int HOFUTHAND_WEAPONS_AND_ARMOUR = 5452; public static final int BANKER_5453 = 5453; - public static final int BANKER_5454 = 5454; + public static final int THUMPY = 5454; public static final int BANKER_5455 = 5455; public static final int BANKER_5456 = 5456; public static final int DRUID_5457 = 5457; @@ -5677,7 +5672,7 @@ public final class NpcID public static final int SWEEPER = 5974; public static final int FLYING_BOOK = 5975; public static final int FLYING_BOOK_5976 = 5976; - public static final int PIZZAZ_HAT = 5977; + public static final int JUSTICIAR_ZACHARIAH = 5977; public static final int ENTRANCE_GUARDIAN = 5978; public static final int TELEKINETIC_GUARDIAN = 5979; public static final int ALCHEMY_GUARDIAN = 5980; @@ -6074,7 +6069,7 @@ public final class NpcID public static final int MANDRITH = 6599; public static final int RUNITE_GOLEM = 6600; public static final int COL00FFFFROCKSCOL = 6601; - public static final int DRUID_6602 = 6602; + public static final int NUMPTY = 6602; public static final int ROGUE_6603 = 6603; public static final int MAMMOTH = 6604; public static final int BANDIT_6605 = 6605; @@ -6258,7 +6253,7 @@ public final class NpcID public static final int GHOST_6822 = 6822; public static final int TOWN_CRIER_6823 = 6823; public static final int GIANT_BAT_6824 = 6824; - public static final int FISHING_SPOT_6825 = 6825; + public static final int ROD_FISHING_SPOT_6825 = 6825; public static final int WOUNDED_SOLDIER = 6826; public static final int WOUNDED_SOLDIER_6827 = 6827; public static final int WOUNDED_SOLDIER_6828 = 6828; @@ -6687,7 +6682,7 @@ public final class NpcID public static final int MAN_7281 = 7281; public static final int PIRATE_7282 = 7282; public static final int LILLIA = 7283; - public static final int HOTPHEEX = 7284; + public static final int GERTRUDE = 7284; public static final int BARBARIAN_GUARD_7285 = 7285; public static final int SKOTIZO = 7286; public static final int REANIMATED_DEMON_SPAWN = 7287; @@ -6721,10 +6716,8 @@ public final class NpcID public static final int BEAR = 7318; public static final int NESTY = 7321; public static final int WILD_DOG_7322 = 7322; - public static final int ALKHARID_WARRIOR = 7323; - public static final int HASSAN = 7324; - public static final int CAROL_7325 = 7325; - public static final int HOLLY = 7326; + public static final int FISHING_SPOT_7323 = 7323; + public static final int HOLGART_7324 = 7324; public static final int RICK_7327 = 7327; public static final int MAID_7328 = 7328; public static final int COOK_7329 = 7329; @@ -6849,12 +6842,12 @@ public final class NpcID public static final int FISHING_SPOT_7460 = 7460; public static final int FISHING_SPOT_7461 = 7461; public static final int FISHING_SPOT_7462 = 7462; - public static final int FISHING_SPOT_7463 = 7463; - public static final int FISHING_SPOT_7464 = 7464; + public static final int ROD_FISHING_SPOT_7463 = 7463; + public static final int ROD_FISHING_SPOT_7464 = 7464; public static final int FISHING_SPOT_7465 = 7465; public static final int FISHING_SPOT_7466 = 7466; public static final int FISHING_SPOT_7467 = 7467; - public static final int FISHING_SPOT_7468 = 7468; + public static final int ROD_FISHING_SPOT_7468 = 7468; public static final int FISHING_SPOT_7469 = 7469; public static final int FISHING_SPOT_7470 = 7470; public static final int CAPTAIN_MAGORO = 7471; @@ -6875,30 +6868,15 @@ public final class NpcID public static final int ZOMBIE_7486 = 7486; public static final int ZOMBIE_7487 = 7487; public static final int ZOMBIE_7488 = 7488; - public static final int HOLLY_7492 = 7492; - public static final int HOLLY_7493 = 7493; - public static final int IVY = 7494; - public static final int TROLL_CHILD_7495 = 7495; - public static final int TOM = 7496; - public static final int DYLAN = 7497; - public static final int SAM_7498 = 7498; - public static final int ULINA = 7499; - public static final int ULINA_7500 = 7500; - public static final int BILLAM = 7501; - public static final int TRAGACANTH = 7502; - public static final int CAVE_GOBLIN_WORKER = 7503; - public static final int PALUM = 7504; - public static final int RED_BOUNCY_BALL = 7505; - public static final int BLUE_BOUNCY_BALL = 7506; - public static final int GREEN_BOUNCY_BALL = 7507; - public static final int RED_MARIONETTE = 7508; - public static final int BLUE_MARIONETTE = 7509; - public static final int GREEN_MARIONETTE = 7510; - public static final int RED_PARTYHAT = 7511; - public static final int BLUE_PARTYHAT = 7512; - public static final int GREEN_PARTYHAT = 7513; - public static final int FROSTY_SPIDER = 7514; - public static final int FROSTY_SNAKELING = 7515; + public static final int JARDRIC = 7509; + public static final int ANNETTE = 7510; + public static final int SHIELD_MASTER = 7511; + public static final int PIZAZZ_HAT = 7512; + public static final int DERWEN = 7513; + public static final int COLFF9040ENERGY_BALLCOL = 7514; + public static final int PORAZDIR = 7515; + public static final int FISHING_SPOT_7516 = 7516; + public static final int DUNCE_7517 = 7517; public static final int JELLY_7518 = 7518; public static final int OLMLET = 7519; public static final int OLMLET_7520 = 7520; @@ -7049,7 +7027,7 @@ public final class NpcID public static final int SOLZTUN = 7673; public static final int JALNIBREK = 7674; public static final int JALNIBREK_7675 = 7675; - public static final int FISHING_SPOT_7676 = 7676; + public static final int ROD_FISHING_SPOT_7676 = 7676; public static final int TZHAARKETZUH = 7677; public static final int TZHAARKETYIL = 7678; public static final int TZHAARKET_7679 = 7679; @@ -7096,7 +7074,7 @@ public final class NpcID public static final int UTREC = 7720; public static final int DWARF_7721 = 7721; public static final int COL00FFFFROCKSCOL_7722 = 7722; - public static final int DRUID_7723 = 7723; + public static final int GERTRUDE_7723 = 7723; public static final int BARBARIAN_GUARD_7724 = 7724; public static final int DWARVEN_BOATMAN_7725 = 7725; public static final int DWARVEN_BOATMAN_7726 = 7726; @@ -7106,5 +7084,379 @@ public final class NpcID public static final int FISHING_SPOT_7731 = 7731; public static final int FISHING_SPOT_7732 = 7732; public static final int FISHING_SPOT_7733 = 7733; - public static final int FISHING_SPOT_7734 = 7734; + public static final int RECRUITER_7734 = 7734; + public static final int ROCK_GOLEM_7736 = 7736; + public static final int ROCK_GOLEM_7737 = 7737; + public static final int ROCK_GOLEM_7738 = 7738; + public static final int ROCK_GOLEM_7739 = 7739; + public static final int ROCK_GOLEM_7740 = 7740; + public static final int ROCK_GOLEM_7741 = 7741; + public static final int CAPTAIN_CLEIVE = 7742; + public static final int SOLDIER_7743 = 7743; + public static final int LIZARDMAN_SHAMAN_7744 = 7744; + public static final int LIZARDMAN_SHAMAN_7745 = 7745; + public static final int WIZARD_MIZGOG = 7746; + public static final int WIZARD_MIZGOG_7747 = 7747; + public static final int FAIRY_7748 = 7748; + public static final int ARMOURED_FOE = 7750; + public static final int WELLARMED_FOE = 7751; + public static final int DARK_MAGE_7752 = 7752; + public static final int DARK_MAGE_7753 = 7753; + public static final int SQUIRREL_7754 = 7754; + public static final int SQUIRREL_7755 = 7755; + public static final int SQUIRREL_7756 = 7756; + public static final int TOOL_LEPRECHAUN_7757 = 7757; + public static final int MERNIA = 7758; + public static final int HERBI = 7759; + public static final int HERBI_7760 = 7760; + public static final int LEAD_NAVIGATOR = 7761; + public static final int LEAD_NAVIGATOR_7762 = 7762; + public static final int JUNIOR_NAVIGATOR = 7763; + public static final int JUNIOR_NAVIGATOR_7764 = 7764; + public static final int JOHN_7765 = 7765; + public static final int DAVID_7766 = 7766; + public static final int BARGE_GUARD = 7768; + public static final int SHOP_KEEPER_7769 = 7769; + public static final int FOSSIL_COLLECTOR = 7770; + public static final int DOG_7771 = 7771; + public static final int PETER = 7772; + public static final int CHARLES_7773 = 7773; + public static final int JOHN_7774 = 7774; + public static final int DUNCE_7775 = 7775; + public static final int PETRIFIED_PETE = 7776; + public static final int WEVE = 7777; + public static final int IRENE = 7778; + public static final int BOBBING_FOSSIL = 7779; + public static final int PUFFER_FISH = 7780; + public static final int PUFFER_FISH_7781 = 7781; + public static final int FISH_SHOAL = 7782; + public static final int CETO = 7783; + public static final int MAIRIN = 7784; + public static final int HERBIBOAR = 7785; + public static final int HERBIBOAR_7786 = 7786; + public static final int MATTIMEO = 7787; + public static final int CHARLES_CHARLINGTON = 7788; + public static final int HOLGART_7789 = 7789; + public static final int JOHN_7790 = 7790; + public static final int DAVID_7791 = 7791; + public static final int LONGTAILED_WYVERN = 7792; + public static final int TALONED_WYVERN = 7793; + public static final int SPITTING_WYVERN = 7794; + public static final int ANCIENT_WYVERN = 7795; + public static final int LOBSTROSITY = 7796; + public static final int ANCIENT_ZYGOMITE = 7797; + public static final int ANCIENT_FUNGI = 7798; + public static final int AMMONITE_CRAB = 7799; + public static final int FOSSIL_ROCK = 7800; + public static final int TAR_BUBBLES = 7801; + public static final int HOOP_SNAKE = 7802; + public static final int STUNNED_HOOP_SNAKE = 7803; + public static final int TAR_MONSTER = 7804; + public static final int PASSIVE_TAR_MONSTER = 7805; + public static final int DERANGED_ARCHAEOLOGIST = 7806; + public static final int COL00FFFFGIANT_BOULDERCOL = 7807; + public static final int COL00FFFFGIANT_BOULDERCOL_7808 = 7808; + public static final int COL00FFFFGIANT_BOULDERCOL_7809 = 7809; + public static final int COL00FFFFLARGE_BOULDERCOL = 7810; + public static final int COL00FFFFLARGE_BOULDERCOL_7811 = 7811; + public static final int COL00FFFFMEDIUM_BOULDERCOL = 7812; + public static final int COL00FFFFMEDIUM_BOULDERCOL_7813 = 7813; + public static final int COL00FFFFSMALL_BOULDERCOL = 7814; + public static final int COL00FFFFSMALL_BOULDERCOL_7815 = 7815; + public static final int COL00FFFFSMALL_BOULDERCOL_7816 = 7816; + public static final int LAVA_BEAST = 7817; + public static final int DAVID_7818 = 7818; + public static final int DUSK = 7849; + public static final int DAWN = 7850; + public static final int DUSK_7851 = 7851; + public static final int DAWN_7852 = 7852; + public static final int DAWN_7853 = 7853; + public static final int DUSK_7854 = 7854; + public static final int DUSK_7855 = 7855; + public static final int JUSTICIAR_ZACHARIAH_7858 = 7858; + public static final int DERWEN_7859 = 7859; + public static final int PORAZDIR_7860 = 7860; + public static final int BLACK_DRAGON_7861 = 7861; + public static final int BLACK_DRAGON_7862 = 7862; + public static final int BLACK_DRAGON_7863 = 7863; + public static final int ANKOU_7864 = 7864; + public static final int LESSER_DEMON_7865 = 7865; + public static final int LESSER_DEMON_7866 = 7866; + public static final int LESSER_DEMON_7867 = 7867; + public static final int GREEN_DRAGON_7868 = 7868; + public static final int GREEN_DRAGON_7869 = 7869; + public static final int GREEN_DRAGON_7870 = 7870; + public static final int GREATER_DEMON_7871 = 7871; + public static final int GREATER_DEMON_7872 = 7872; + public static final int GREATER_DEMON_7873 = 7873; + public static final int BLACK_DEMON_7874 = 7874; + public static final int BLACK_DEMON_7875 = 7875; + public static final int BLACK_DEMON_7876 = 7876; + public static final int HELLHOUND_7877 = 7877; + public static final int ICE_GIANT_7878 = 7878; + public static final int ICE_GIANT_7879 = 7879; + public static final int ICE_GIANT_7880 = 7880; + public static final int REVENANT_IMP = 7881; + public static final int DUSK_7882 = 7882; + public static final int DUSK_7883 = 7883; + public static final int DAWN_7884 = 7884; + public static final int DAWN_7885 = 7885; + public static final int DUSK_7886 = 7886; + public static final int DUSK_7887 = 7887; + public static final int DUSK_7888 = 7888; + public static final int DUSK_7889 = 7889; + public static final int MIDNIGHT = 7890; + public static final int NOON = 7891; + public static final int NOON_7892 = 7892; + public static final int MIDNIGHT_7893 = 7893; + public static final int SAND_SNAKE_HARD = 7894; + public static final int SAND_SNAKE = 7895; + public static final int LORD_KANDUR_HOSIDIUS = 7896; + public static final int ELENA_HOSIDIUS = 7897; + public static final int ARTUR_HOSIDIUS = 7898; + public static final int ARTUR_HOSIDIUS_7899 = 7899; + public static final int BUTLER_JARVIS = 7900; + public static final int CHEF_OLIVIA = 7901; + public static final int GALANA = 7902; + public static final int SAND_SNAKE_7903 = 7903; + public static final int TOMAS_LAWRY = 7904; + public static final int ROBERT_OREILLY = 7905; + public static final int DEVAN_RUTTER = 7906; + public static final int CONRAD_KING = 7907; + public static final int THE_QUEEN_OF_THIEVES = 7908; + public static final int LADY_SHAUNA_PISCARILIUS = 7909; + public static final int COUNCILLOR_HUGHES = 7910; + public static final int BARTENDER_7911 = 7911; + public static final int FISH_MONGER_7912 = 7912; + public static final int SHOP_KEEPER_7913 = 7913; + public static final int THIEF_7914 = 7914; + public static final int THIEF_7915 = 7915; + public static final int THIEF_7916 = 7916; + public static final int PIRATE_7917 = 7917; + public static final int PIRATE_7918 = 7918; + public static final int MAN_7919 = 7919; + public static final int MAN_7920 = 7920; + public static final int WOMAN_7921 = 7921; + public static final int WOMAN_7922 = 7922; + public static final int POOR_LOOKING_WOMAN_7923 = 7923; + public static final int COUNCILLOR_ANDREWS = 7924; + public static final int REVENANT_GOBLIN = 7931; + public static final int REVENANT_PYREFIEND = 7932; + public static final int REVENANT_HOBGOBLIN = 7933; + public static final int REVENANT_CYCLOPS = 7934; + public static final int REVENANT_HELLHOUND = 7935; + public static final int REVENANT_DEMON = 7936; + public static final int REVENANT_ORK = 7937; + public static final int REVENANT_DARK_BEAST = 7938; + public static final int REVENANT_KNIGHT = 7939; + public static final int REVENANT_DRAGON = 7940; + public static final int EMBLEM_TRADER_7941 = 7941; + public static final int EMBLEM_TRADER_7942 = 7942; + public static final int FISHING_SPOT_7946 = 7946; + public static final int FISHING_SPOT_7947 = 7947; + public static final int CORSAIR_TRAITOR_HARD = 7948; + public static final int CORSAIR_TRAITOR = 7949; + public static final int ALEC_KINCADE = 7950; + public static final int PONTS_THE_BRIDGEMASTER = 7951; + public static final int ERDAN = 7952; + public static final int PRIMULA = 7953; + public static final int MYSTERIOUS_ADVENTURER = 7954; + public static final int BABY_DRAGON_7955 = 7955; + public static final int CAPTAIN_TOCK = 7956; + public static final int CAPTAIN_TOCK_7957 = 7957; + public static final int CAPTAIN_TOCK_7958 = 7958; + public static final int ITHOI_THE_NAVIGATOR = 7961; + public static final int ITHOI_THE_NAVIGATOR_7963 = 7963; + public static final int ITHOI_THE_NAVIGATOR_7964 = 7964; + public static final int CABIN_BOY_COLIN = 7965; + public static final int CABIN_BOY_COLIN_7966 = 7966; + public static final int CABIN_BOY_COLIN_7967 = 7967; + public static final int BUGS_7969 = 7969; + public static final int GNOCCI_THE_COOK = 7970; + public static final int GNOCCI_THE_COOK_7971 = 7971; + public static final int GNOCCI_THE_COOK_7972 = 7972; + public static final int DOLL = 7975; + public static final int ARSEN_THE_THIEF = 7976; + public static final int YUSUF = 7981; + public static final int YUSUF_7982 = 7982; + public static final int FRANCOIS = 7983; + public static final int MADAME_CALDARIUM = 7984; + public static final int HARIS = 7985; + public static final int ALTARKIZ = 7986; + public static final int LORD_MARSHAL_BROGAN = 7987; + public static final int CHIEF_TESS = 7988; + public static final int OGRESS_WARRIOR = 7989; + public static final int OGRESS_WARRIOR_7990 = 7990; + public static final int OGRESS_SHAMAN = 7991; + public static final int OGRESS_SHAMAN_7992 = 7992; + public static final int ELDER_CHAOS_DRUID_7995 = 7995; + public static final int DA_VINCI_7996 = 7996; + public static final int GNOME_CHILD_7997 = 7997; + public static final int WISE_OLD_MAN_7998 = 7998; + public static final int COW31337KILLER_7999 = 7999; + public static final int EVIL_DAVE_8000 = 8000; + public static final int CRUNCHY = 8001; + public static final int TIM = 8002; + public static final int DAVE = 8003; + public static final int GENE = 8004; + public static final int ART = 8005; + public static final int CORPOREAL_CRITTER = 8008; + public static final int TZREKZUK = 8009; + public static final int CORPOREAL_CRITTER_8010 = 8010; + public static final int TZREKZUK_8011 = 8011; + public static final int BARGE_GUARD_8012 = 8012; + public static final int BARGE_GUARD_8013 = 8013; + public static final int RIFT_GUARDIAN_8024 = 8024; + public static final int VORKI = 8025; + public static final int VORKATH = 8026; + public static final int RUNE_DRAGON = 8027; + public static final int RIFT_GUARDIAN_8028 = 8028; + public static final int VORKI_8029 = 8029; + public static final int ADAMANT_DRAGON = 8030; + public static final int RUNE_DRAGON_8031 = 8031; + public static final int ELVARG_8033 = 8033; + public static final int BOB_8034 = 8034; + public static final int NEITE_8035 = 8035; + public static final int DIANA = 8036; + public static final int JACK_8037 = 8037; + public static final int ELLEN = 8038; + public static final int FREJA = 8039; + public static final int LUTWIDGE = 8040; + public static final int DOG_8041 = 8041; + public static final int KING_ROALD_8042 = 8042; + public static final int AEONISIG_RAISPHER_8043 = 8043; + public static final int SIR_AMIK_VARZE_8044 = 8044; + public static final int SIR_TIFFY_CASHIEN_8045 = 8045; + public static final int KING_LATHAS_8046 = 8046; + public static final int KING_ARTHUR_8047 = 8047; + public static final int BRUNDT_THE_CHIEFTAIN_8048 = 8048; + public static final int ONEIROMANCER_8049 = 8049; + public static final int DENULTH_8050 = 8050; + public static final int DUKE_HORACIO_8051 = 8051; + public static final int WISE_OLD_MAN_8052 = 8052; + public static final int JARDRIC_8053 = 8053; + public static final int ACHIETTIES_8054 = 8054; + public static final int BOB_8055 = 8055; + public static final int SPAWN_8056 = 8056; + public static final int ROBERT_THE_STRONG_8057 = 8057; + public static final int VORKATH_8058 = 8058; + public static final int VORKATH_8059 = 8059; + public static final int VORKATH_8060 = 8060; + public static final int VORKATH_8061 = 8061; + public static final int ZOMBIFIED_SPAWN = 8062; + public static final int ZOMBIFIED_SPAWN_8063 = 8063; + public static final int STONE_GUARDIAN = 8064; + public static final int STONE_GUARDIAN_8065 = 8065; + public static final int STONE_GUARDIAN_8066 = 8066; + public static final int ZOMBIE_8067 = 8067; + public static final int ZOMBIE_8068 = 8068; + public static final int ZOMBIE_8069 = 8069; + public static final int SKELETON_8070 = 8070; + public static final int SKELETON_8071 = 8071; + public static final int SKELETON_8072 = 8072; + public static final int GREEN_DRAGON_8073 = 8073; + public static final int BLUE_DRAGON_8074 = 8074; + public static final int RED_DRAGON_8075 = 8075; + public static final int GREEN_DRAGON_8076 = 8076; + public static final int BLUE_DRAGON_8077 = 8077; + public static final int RED_DRAGON_8078 = 8078; + public static final int RED_DRAGON_8079 = 8079; + public static final int IRON_DRAGON_8080 = 8080; + public static final int BRUTAL_GREEN_DRAGON_8081 = 8081; + public static final int GREEN_DRAGON_8082 = 8082; + public static final int BLUE_DRAGON_8083 = 8083; + public static final int BLACK_DRAGON_8084 = 8084; + public static final int BLACK_DRAGON_8085 = 8085; + public static final int STEEL_DRAGON_8086 = 8086; + public static final int BRUTAL_RED_DRAGON_8087 = 8087; + public static final int MITHRIL_DRAGON_8088 = 8088; + public static final int MITHRIL_DRAGON_8089 = 8089; + public static final int ADAMANT_DRAGON_8090 = 8090; + public static final int RUNE_DRAGON_8091 = 8091; + public static final int BRUTAL_BLACK_DRAGON_8092 = 8092; + public static final int BRUTAL_BLACK_DRAGON_8093 = 8093; + public static final int GALVEK = 8094; + public static final int GALVEK_8095 = 8095; + public static final int GALVEK_8096 = 8096; + public static final int GALVEK_8097 = 8097; + public static final int GALVEK_8098 = 8098; + public static final int COL00FFFFTSUNAMICOL = 8099; + public static final int DALLAS_JONES = 8100; + public static final int DALLAS_JONES_8101 = 8101; + public static final int DALLAS_JONES_8102 = 8102; + public static final int DALLAS_JONES_8103 = 8103; + public static final int DALLAS_JONES_8104 = 8104; + public static final int JARDRIC_8105 = 8105; + public static final int JARDRIC_8106 = 8106; + public static final int JARDRIC_8107 = 8107; + public static final int JARDRIC_8108 = 8108; + public static final int BOB_8111 = 8111; + public static final int BOB_8112 = 8112; + public static final int BOB_8113 = 8113; + public static final int BOB_8114 = 8114; + public static final int BOB_8115 = 8115; + public static final int NOT_BOB = 8116; + public static final int NOT_BOB_8117 = 8117; + public static final int NEITE_8118 = 8118; + public static final int UNFERTH_8119 = 8119; + public static final int DRAGONKIN_8120 = 8120; + public static final int CAMORRA = 8121; + public static final int TRISTAN = 8122; + public static final int AIVAS = 8123; + public static final int ROBERT_THE_STRONG_8124 = 8124; + public static final int DRAGONKIN_8125 = 8125; + public static final int CAMORRA_8126 = 8126; + public static final int TRISTAN_8127 = 8127; + public static final int AIVAS_8128 = 8128; + public static final int ROBERT_THE_STRONG_8129 = 8129; + public static final int ODYSSEUS_8130 = 8130; + public static final int TORFINN = 8131; + public static final int TORFINN_8132 = 8132; + public static final int TORFINN_8133 = 8133; + public static final int SARAH_8134 = 8134; + public static final int DRAGONKIN_8135 = 8135; + public static final int ZORGOTH = 8136; + public static final int SPIDER_8137 = 8137; + public static final int SPIDER_8138 = 8138; + public static final int SKELETON_8139 = 8139; + public static final int SKELETON_8140 = 8140; + public static final int COL00FFFFSTRANGE_EGGCOL = 8142; + public static final int COL00FFFFDRAGON_HEADCOL = 8143; + public static final int COL00FFFFDRAGON_HEADCOL_8144 = 8144; + public static final int BRUNDT_THE_CHIEFTAIN_8145 = 8145; + public static final int THORVALD_THE_WARRIOR_8146 = 8146; + public static final int PEER_THE_SEER_8147 = 8147; + public static final int SWENSEN_THE_NAVIGATOR_8148 = 8148; + public static final int WHITE_KNIGHT_8149 = 8149; + public static final int PALADIN_8150 = 8150; + public static final int KOSCHEI_THE_DEATHLESS_8151 = 8151; + public static final int KOSCHEI_THE_DEATHLESS_8152 = 8152; + public static final int BRUNDT_THE_CHIEFTAIN_8153 = 8153; + public static final int WISE_OLD_MAN_8154 = 8154; + public static final int JARDRIC_8155 = 8155; + public static final int ACHIETTIES_8156 = 8156; + public static final int SIR_TIFFY_CASHIEN_8157 = 8157; + public static final int ONEIROMANCER_8158 = 8158; + public static final int BOB_8159 = 8159; + public static final int SOLDIER_8160 = 8160; + public static final int BRUNDT_THE_CHIEFTAIN_8161 = 8161; + public static final int WISE_OLD_MAN_8162 = 8162; + public static final int ACHIETTIES_8164 = 8164; + public static final int SIR_TIFFY_CASHIEN_8165 = 8165; + public static final int ONEIROMANCER_8166 = 8166; + public static final int ZORGOTH_8167 = 8167; + public static final int SOLDIER_8168 = 8168; + public static final int BRUNDT_THE_CHIEFTAIN_8169 = 8169; + public static final int WISE_OLD_MAN_8170 = 8170; + public static final int JARDRIC_8171 = 8171; + public static final int ACHIETTIES_8172 = 8172; + public static final int SIR_TIFFY_CASHIEN_8173 = 8173; + public static final int ONEIROMANCER_8174 = 8174; + public static final int ZORGOTH_8175 = 8175; + public static final int ZORGOTH_8176 = 8176; + public static final int GALVEK_8177 = 8177; + public static final int GALVEK_8178 = 8178; + public static final int GALVEK_8179 = 8179; + public static final int AMELIA = 8180; + public static final int JONATHAN = 8181; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java index 72d6b111d7..0a373c3905 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java @@ -27,20 +27,14 @@ package net.runelite.client.plugins.fishing; import java.util.HashMap; import java.util.Map; import net.runelite.api.ItemID; -import static net.runelite.api.NpcID.FISHING_SPOT_1506; -import static net.runelite.api.NpcID.FISHING_SPOT_1508; import static net.runelite.api.NpcID.FISHING_SPOT_1510; import static net.runelite.api.NpcID.FISHING_SPOT_1511; -import static net.runelite.api.NpcID.FISHING_SPOT_1513; -import static net.runelite.api.NpcID.FISHING_SPOT_1515; import static net.runelite.api.NpcID.FISHING_SPOT_1518; import static net.runelite.api.NpcID.FISHING_SPOT_1519; import static net.runelite.api.NpcID.FISHING_SPOT_1520; import static net.runelite.api.NpcID.FISHING_SPOT_1521; import static net.runelite.api.NpcID.FISHING_SPOT_1522; import static net.runelite.api.NpcID.FISHING_SPOT_1525; -import static net.runelite.api.NpcID.FISHING_SPOT_1526; -import static net.runelite.api.NpcID.FISHING_SPOT_1527; import static net.runelite.api.NpcID.FISHING_SPOT_1528; import static net.runelite.api.NpcID.FISHING_SPOT_1530; import static net.runelite.api.NpcID.FISHING_SPOT_1542; @@ -49,18 +43,23 @@ import static net.runelite.api.NpcID.FISHING_SPOT_4316; import static net.runelite.api.NpcID.FISHING_SPOT_4710; import static net.runelite.api.NpcID.FISHING_SPOT_4712; import static net.runelite.api.NpcID.FISHING_SPOT_4713; -import static net.runelite.api.NpcID.FISHING_SPOT_6825; import static net.runelite.api.NpcID.FISHING_SPOT_7155; import static net.runelite.api.NpcID.FISHING_SPOT_7199; import static net.runelite.api.NpcID.FISHING_SPOT_7200; import static net.runelite.api.NpcID.FISHING_SPOT_7469; import static net.runelite.api.NpcID.FISHING_SPOT_7470; -import static net.runelite.api.NpcID.FISHING_SPOT_7676; import static net.runelite.api.NpcID.FISHING_SPOT_7730; import static net.runelite.api.NpcID.FISHING_SPOT_7731; import static net.runelite.api.NpcID.FISHING_SPOT_7732; import static net.runelite.api.NpcID.FISHING_SPOT_7733; -import static net.runelite.api.NpcID.FISHING_SPOT_7734; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1508; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1513; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1515; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1526; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1527; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_6825; +import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7676; public enum FishingSpot { @@ -80,20 +79,20 @@ public enum FishingSpot FISHING_SPOT_4316 ), SALMON("Salmon, Trout", ItemID.RAW_SALMON, - FISHING_SPOT_1506, FISHING_SPOT_1508, FISHING_SPOT_1513, - FISHING_SPOT_1515, FISHING_SPOT_1526, FISHING_SPOT_1527 + ROD_FISHING_SPOT, ROD_FISHING_SPOT_1508, ROD_FISHING_SPOT_1513, + ROD_FISHING_SPOT_1515, ROD_FISHING_SPOT_1526, ROD_FISHING_SPOT_1527 ), BARB_FISH("Sturgeon, Salmon, Trout", ItemID.LEAPING_STURGEON, FISHING_SPOT_1542 ), ANGLERFISH("Anglerfish", ItemID.RAW_ANGLERFISH, - FISHING_SPOT_6825 + ROD_FISHING_SPOT_6825 ), MINNOW("Minnow", ItemID.MINNOW, - FISHING_SPOT_7730, FISHING_SPOT_7731, FISHING_SPOT_7732, FISHING_SPOT_7733, FISHING_SPOT_7734 + FISHING_SPOT_7730, FISHING_SPOT_7731, FISHING_SPOT_7732, FISHING_SPOT_7733 ), INFERNAL_EEL("Infernal Eel", ItemID.INFERNAL_EEL, - FISHING_SPOT_7676 + ROD_FISHING_SPOT_7676 ), KARAMBWAN("Karambwan", ItemID.RAW_KARAMBWAN, FISHING_SPOT_4712, FISHING_SPOT_4713 @@ -102,7 +101,6 @@ public enum FishingSpot FISHING_SPOT_4710 ); - public static final int FLYING_FISH = FISHING_SPOT_7734; private static final Map fishingSpots = new HashMap<>(); private final String name;