diff --git a/lihzahrd/bestiary/bestiary.py b/lihzahrd/bestiary/bestiary.py index 0959908..b083d70 100755 --- a/lihzahrd/bestiary/bestiary.py +++ b/lihzahrd/bestiary/bestiary.py @@ -1,24 +1,19 @@ -import typing +from typing import Dict, List +from ..enums import EntityType class Bestiary: """A bestiary entry.""" - __slots__ = "npc_chats_count", "npc_chats_data", "npc_kill_count", "npc_kill_data", "npc_sighting_count", "npc_sighting_data" + __slots__ = "chats", "kills", "sightings" def __init__(self, - npc_chats_count: int, - npc_chats_data: typing.Dict[str, int], - npc_kill_count: int, - npc_kill_data: typing.List[str], - npc_sighting_count: int, - npc_sighting_data: typing.List[str], ): - self.npc_chats_count: int = npc_chats_count - self.npc_chats_data: typing.Dict[str, int] = npc_chats_data - self.npc_kill_count: int = npc_kill_count - self.npc_kill_data: typing.List[str] = npc_kill_data - self.npc_sighting_count: int = npc_sighting_count - self.npc_sighting_data: typing.List[str] = npc_sighting_data + chats: List[EntityType], + kills: Dict[EntityType, int], + sightings: List[EntityType]): + self.chats: List[EntityType] = chats + self.kills: Dict[EntityType, int] = kills + self.sightings: List[EntityType] = sightings def __repr__(self): - return f"" + return f"" diff --git a/lihzahrd/enums/entitytype.py b/lihzahrd/enums/entitytype.py index 7beba7b..86c2e7d 100644 --- a/lihzahrd/enums/entitytype.py +++ b/lihzahrd/enums/entitytype.py @@ -2,736 +2,733 @@ import enum class EntityType(enum.IntEnum): - """An enumeration of all entity types. - - From https://github.com/tModLoader/tModLoader/wiki/Vanilla-NPC-IDs .""" - BIG_HORNET_STINGY = -65 - LITTLE_HORNET_STINGY = -64 - BIG_HORNET_SPIKEY = -63 - LITTLE_HORNET_SPIKEY = -62 - BIG_HORNET_LEAFY = -61 - LITTLE_HORNET_LEAFY = -60 - BIG_HORNET_HONEY = -59 - LITTLE_HORNET_HONEY = -58 - BIG_HORNET_FATTY = -57 - LITTLE_HORNET_FATTY = -56 - BIG_RAIN_ZOMBIE = -55 - SMALL_RAIN_ZOMBIE = -54 - BIG_PANTLESS_SKELETON = -53 - SMALL_PANTLESS_SKELETON = -52 - BIG_MISASSEMBLED_SKELETON = -51 - SMALL_MISASSEMBLED_SKELETON = -50 - BIG_HEADACHE_SKELETON = -49 - SMALL_HEADACHE_SKELETON = -48 - BIG_SKELETON = -47 - SMALL_SKELETON = -46 - BIG_FEMALE_ZOMBIE = -45 - SMALL_FEMALE_ZOMBIE = -44 - DEMON_EYE2 = -43 - PURPLE_EYE2 = -42 - GREEN_EYE2 = -41 - DIALATED_EYE2 = -40 - SLEEPY_EYE2 = -39 - CATARACT_EYE2 = -38 - BIG_TWIGGY_ZOMBIE = -37 - SMALL_TWIGGY_ZOMBIE = -36 - BIG_SWAMP_ZOMBIE = -35 - SMALL_SWAMP_ZOMBIE = -34 - BIG_SLIMED_ZOMBIE = -33 - SMALL_SLIMED_ZOMBIE = -32 - BIG_PINCUSHION_ZOMBIE = -31 - SMALL_PINCUSHION_ZOMBIE = -30 - BIG_BALD_ZOMBIE = -29 - SMALL_BALD_ZOMBIE = -28 - BIG_ZOMBIE = -27 - SMALL_ZOMBIE = -26 - BIG_CRIMSLIME = -25 - LITTLE_CRIMSLIME = -24 - BIG_CRIMERA = -23 - LITTLE_CRIMERA = -22 - GIANT_MOSS_HORNET = -21 - BIG_MOSS_HORNET = -20 - LITTLE_MOSS_HORNET = -19 - TINY_MOSS_HORNET = -18 - BIG_STINGER = -17 - LITTLE_STINGER = -16 - HEAVY_SKELETON = -15 - BIG_BONED = -14 - SHORT_BONES = -13 - BIG_EATER = -12 - LITTLE_EATER = -11 - JUNGLE_SLIME = -10 - YELLOW_SLIME = -9 - RED_SLIME = -8 - PURPLE_SLIME = -7 - BLACK_SLIME = -6 - BABY_SLIME = -5 - PINKY = -4 - GREEN_SLIME = -3 - SLIMER2 = -2 - SLIMELING = -1 - BLUE_SLIME = 1 - DEMON_EYE = 2 - ZOMBIE = 3 - EYEOF_CTHULHU = 4 - SERVANTOF_CTHULHU = 5 - EATEROF_SOULS = 6 - DEVOURER_HEAD = 7 - DEVOURER_BODY = 8 - DEVOURER_TAIL = 9 - GIANT_WORM_HEAD = 10 - GIANT_WORM_BODY = 11 - GIANT_WORM_TAIL = 12 - EATEROF_WORLDS_HEAD = 13 - EATEROF_WORLDS_BODY = 14 - EATEROF_WORLDS_TAIL = 15 - MOTHER_SLIME = 16 - MERCHANT = 17 - NURSE = 18 - ARMS_DEALER = 19 - DRYAD = 20 - SKELETON = 21 - GUIDE = 22 - METEOR_HEAD = 23 - FIRE_IMP = 24 - BURNING_SPHERE = 25 - GOBLIN_PEON = 26 - GOBLIN_THIEF = 27 - GOBLIN_WARRIOR = 28 - GOBLIN_SORCERER = 29 - CHAOS_BALL = 30 - ANGRY_BONES = 31 - DARK_CASTER = 32 - WATER_SPHERE = 33 - CURSED_SKULL = 34 - SKELETRON_HEAD = 35 - SKELETRON_HAND = 36 - OLD_MAN = 37 - DEMOLITIONIST = 38 - BONE_SERPENT_HEAD = 39 - BONE_SERPENT_BODY = 40 - BONE_SERPENT_TAIL = 41 - HORNET = 42 - MAN_EATER = 43 - UNDEAD_MINER = 44 - TIM = 45 - BUNNY = 46 - CORRUPT_BUNNY = 47 - HARPY = 48 - CAVE_BAT = 49 - KING_SLIME = 50 - JUNGLE_BAT = 51 - DOCTOR_BONES = 52 - THE_GROOM = 53 - CLOTHIER = 54 - GOLDFISH = 55 - SNATCHER = 56 - CORRUPT_GOLDFISH = 57 - PIRANHA = 58 - LAVA_SLIME = 59 - HELLBAT = 60 - VULTURE = 61 - DEMON = 62 - BLUE_JELLYFISH = 63 - PINK_JELLYFISH = 64 - SHARK = 65 - VOODOO_DEMON = 66 - CRAB = 67 - DUNGEON_GUARDIAN = 68 - ANTLION = 69 - SPIKE_BALL = 70 - DUNGEON_SLIME = 71 - BLAZING_WHEEL = 72 - GOBLIN_SCOUT = 73 - BIRD = 74 - PIXIE = 75 - NONE2 = 76 - ARMORED_SKELETON = 77 - MUMMY = 78 - DARK_MUMMY = 79 - LIGHT_MUMMY = 80 - CORRUPT_SLIME = 81 - WRAITH = 82 - CURSED_HAMMER = 83 - ENCHANTED_SWORD = 84 - MIMIC = 85 - UNICORN = 86 - WYVERN_HEAD = 87 - WYVERN_LEGS = 88 - WYVERN_BODY = 89 - WYVERN_BODY2 = 90 - WYVERN_BODY3 = 91 - WYVERN_TAIL = 92 - GIANT_BAT = 93 - CORRUPTOR = 94 - DIGGER_HEAD = 95 - DIGGER_BODY = 96 - DIGGER_TAIL = 97 - SEEKER_HEAD = 98 - SEEKER_BODY = 99 - SEEKER_TAIL = 100 - CLINGER = 101 - ANGLER_FISH = 102 - GREEN_JELLYFISH = 103 - WEREWOLF = 104 - BOUND_GOBLIN = 105 - BOUND_WIZARD = 106 - GOBLIN_TINKERER = 107 - WIZARD = 108 - CLOWN = 109 - SKELETON_ARCHER = 110 - GOBLIN_ARCHER = 111 - VILE_SPIT = 112 - WALLOF_FLESH = 113 - WALLOF_FLESH_EYE = 114 - THE_HUNGRY = 115 - THE_HUNGRY_II = 116 - LEECH_HEAD = 117 - LEECH_BODY = 118 - LEECH_TAIL = 119 - CHAOS_ELEMENTAL = 120 - SLIMER = 121 - GASTROPOD = 122 - BOUND_MECHANIC = 123 - MECHANIC = 124 - RETINAZER = 125 - SPAZMATISM = 126 - SKELETRON_PRIME = 127 - PRIME_CANNON = 128 - PRIME_SAW = 129 - PRIME_VICE = 130 - PRIME_LASER = 131 - BALD_ZOMBIE = 132 - WANDERING_EYE = 133 - THE_DESTROYER = 134 - THE_DESTROYER_BODY = 135 - THE_DESTROYER_TAIL = 136 - ILLUMINANT_BAT = 137 - ILLUMINANT_SLIME = 138 - PROBE = 139 - POSSESSED_ARMOR = 140 - TOXIC_SLUDGE = 141 - SANTA_CLAUS = 142 - SNOWMAN_GANGSTA = 143 - MISTER_STABBY = 144 - SNOW_BALLA = 145 - NONE3 = 146 - ICE_SLIME = 147 - PENGUIN = 148 - PENGUIN_BLACK = 149 - ICE_BAT = 150 - LAVABAT = 151 - GIANT_FLYING_FOX = 152 - GIANT_TORTOISE = 153 - ICE_TORTOISE = 154 - WOLF = 155 - RED_DEVIL = 156 - ARAPAIMA = 157 - VAMPIRE_BAT = 158 - VAMPIRE = 159 - TRUFFLE = 160 - ZOMBIE_ESKIMO = 161 - FRANKENSTEIN = 162 - BLACK_RECLUSE = 163 - WALL_CREEPER = 164 - WALL_CREEPER_WALL = 165 - SWAMP_THING = 166 - UNDEAD_VIKING = 167 - CORRUPT_PENGUIN = 168 - ICE_ELEMENTAL = 169 - PIGRON_CORRUPTION = 170 - PIGRON_HALLOW = 171 - RUNE_WIZARD = 172 - CRIMERA = 173 - HERPLING = 174 - ANGRY_TRAPPER = 175 - MOSS_HORNET = 176 - DERPLING = 177 - STEAMPUNKER = 178 - CRIMSON_AXE = 179 - PIGRON_CRIMSON = 180 - FACE_MONSTER = 181 - FLOATY_GROSS = 182 - CRIMSLIME = 183 - SPIKED_ICE_SLIME = 184 - SNOW_FLINX = 185 - PINCUSHION_ZOMBIE = 186 - SLIMED_ZOMBIE = 187 - SWAMP_ZOMBIE = 188 - TWIGGY_ZOMBIE = 189 - CATARACT_EYE = 190 - SLEEPY_EYE = 191 - DIALATED_EYE = 192 - GREEN_EYE = 193 - PURPLE_EYE = 194 - LOST_GIRL = 195 - NYMPH = 196 - ARMORED_VIKING = 197 - LIHZAHRD = 198 - LIHZAHRD_CRAWLER = 199 - FEMALE_ZOMBIE = 200 - HEADACHE_SKELETON = 201 - MISASSEMBLED_SKELETON = 202 - PANTLESS_SKELETON = 203 - SPIKED_JUNGLE_SLIME = 204 - MOTH = 205 - ICY_MERMAN = 206 - DYE_TRADER = 207 - PARTY_GIRL = 208 - CYBORG = 209 - BEE = 210 - BEE_SMALL = 211 - PIRATE_DECKHAND = 212 - PIRATE_CORSAIR = 213 - PIRATE_DEADEYE = 214 - PIRATE_CROSSBOWER = 215 - PIRATE_CAPTAIN = 216 - COCHINEAL_BEETLE = 217 - CYAN_BEETLE = 218 - LAC_BEETLE = 219 - SEA_SNAIL = 220 - SQUID = 221 - QUEEN_BEE = 222 - ZOMBIE_RAINCOAT = 223 - FLYING_FISH = 224 - UMBRELLA_SLIME = 225 - FLYING_SNAKE = 226 - PAINTER = 227 - WITCH_DOCTOR = 228 - PIRATE = 229 - GOLDFISH_WALKER = 230 - HORNET_FATTY = 231 - HORNET_HONEY = 232 - HORNET_LEAFY = 233 - HORNET_SPIKEY = 234 - HORNET_STINGY = 235 - JUNGLE_CREEPER = 236 - JUNGLE_CREEPER_WALL = 237 - BLACK_RECLUSE_WALL = 238 - BLOOD_CRAWLER = 239 - BLOOD_CRAWLER_WALL = 240 - BLOOD_FEEDER = 241 - BLOOD_JELLY = 242 - ICE_GOLEM = 243 - RAINBOW_SLIME = 244 - GOLEM = 245 - GOLEM_HEAD = 246 - GOLEM_FIST_LEFT = 247 - GOLEM_FIST_RIGHT = 248 - GOLEM_HEAD_FREE = 249 - ANGRY_NIMBUS = 250 - EYEZOR = 251 - PARROT = 252 - REAPER = 253 - ZOMBIE_MUSHROOM = 254 - ZOMBIE_MUSHROOM_HAT = 255 - FUNGO_FISH = 256 - ANOMURA_FUNGUS = 257 - MUSHI_LADYBUG = 258 - FUNGI_BULB = 259 - GIANT_FUNGI_BULB = 260 - FUNGI_SPORE = 261 - PLANTERA = 262 - PLANTERAS_HOOK = 263 - PLANTERAS_TENTACLE = 264 - SPORE = 265 - BRAINOF_CTHULHU = 266 - CREEPER = 267 - ICHOR_STICKER = 268 - RUSTY_ARMORED_BONES_AXE = 269 - RUSTY_ARMORED_BONES_FLAIL = 270 - RUSTY_ARMORED_BONES_SWORD = 271 - RUSTY_ARMORED_BONES_SWORD_NO_ARMOR = 272 - BLUE_ARMORED_BONES = 273 - BLUE_ARMORED_BONES_MACE = 274 - BLUE_ARMORED_BONES_NO_PANTS = 275 - BLUE_ARMORED_BONES_SWORD = 276 - HELL_ARMORED_BONES = 277 - HELL_ARMORED_BONES_SPIKE_SHIELD = 278 - HELL_ARMORED_BONES_MACE = 279 - HELL_ARMORED_BONES_SWORD = 280 - RAGGED_CASTER = 281 - RAGGED_CASTER_OPEN_COAT = 282 - NECROMANCER = 283 - NECROMANCER_ARMORED = 284 - DIABOLIST_RED = 285 - DIABOLIST_WHITE = 286 - BONE_LEE = 287 - DUNGEON_SPIRIT = 288 - GIANT_CURSED_SKULL = 289 - PALADIN = 290 - SKELETON_SNIPER = 291 - TACTICAL_SKELETON = 292 - SKELETON_COMMANDO = 293 - ANGRY_BONES_BIG = 294 - ANGRY_BONES_BIG_MUSCLE = 295 - ANGRY_BONES_BIG_HELMET = 296 - BIRD_BLUE = 297 - BIRD_RED = 298 - SQUIRREL = 299 - MOUSE = 300 - RAVEN = 301 - SLIME_MASKED = 302 - BUNNY_SLIMED = 303 - HOPPIN_JACK = 304 - SCARECROW1 = 305 - SCARECROW2 = 306 - SCARECROW3 = 307 - SCARECROW4 = 308 - SCARECROW5 = 309 - SCARECROW6 = 310 - SCARECROW7 = 311 - SCARECROW8 = 312 - SCARECROW9 = 313 - SCARECROW10 = 314 - HEADLESS_HORSEMAN = 315 - GHOST = 316 - DEMON_EYE_OWL = 317 - DEMON_EYE_SPACESHIP = 318 - ZOMBIE_DOCTOR = 319 - ZOMBIE_SUPERMAN = 320 - ZOMBIE_PIXIE = 321 - SKELETON_TOP_HAT = 322 - SKELETON_ASTONAUT = 323 - SKELETON_ALIEN = 324 - MOURNING_WOOD = 325 - SPLINTERLING = 326 - PUMPKING = 327 - PUMPKING_BLADE = 328 - HELLHOUND = 329 - POLTERGEIST = 330 - ZOMBIE_XMAS = 331 - ZOMBIE_SWEATER = 332 - SLIME_RIBBON_WHITE = 333 - SLIME_RIBBON_YELLOW = 334 - SLIME_RIBBON_GREEN = 335 - SLIME_RIBBON_RED = 336 - BUNNY_XMAS = 337 - ZOMBIE_ELF = 338 - ZOMBIE_ELF_BEARD = 339 - ZOMBIE_ELF_GIRL = 340 - PRESENT_MIMIC = 341 - GINGERBREAD_MAN = 342 - YETI = 343 - EVERSCREAM = 344 - ICE_QUEEN = 345 - SANTA_NK1 = 346 - ELF_COPTER = 347 - NUTCRACKER = 348 - NUTCRACKER_SPINNING = 349 - ELF_ARCHER = 350 - KRAMPUS = 351 - FLOCKO = 352 - STYLIST = 353 - WEBBED_STYLIST = 354 - FIREFLY = 355 - BUTTERFLY = 356 - WORM = 357 - LIGHTNING_BUG = 358 - SNAIL = 359 - GLOWING_SNAIL = 360 - FROG = 361 - DUCK = 362 - DUCK2 = 363 - DUCK_WHITE = 364 - DUCK_WHITE2 = 365 - SCORPION_BLACK = 366 - SCORPION = 367 - TRAVELLING_MERCHANT = 368 - ANGLER = 369 - DUKE_FISHRON = 370 - DETONATING_BUBBLE = 371 - SHARKRON = 372 - SHARKRON2 = 373 - TRUFFLE_WORM = 374 - TRUFFLE_WORM_DIGGER = 375 - SLEEPING_ANGLER = 376 - GRASSHOPPER = 377 - CHATTERING_TEETH_BOMB = 378 - CULTIST_ARCHER_BLUE = 379 - CULTIST_ARCHER_WHITE = 380 - BRAIN_SCRAMBLER = 381 - RAY_GUNNER = 382 - MARTIAN_OFFICER = 383 - FORCE_BUBBLE = 384 - GRAY_GRUNT = 385 - MARTIAN_ENGINEER = 386 - MARTIAN_TURRET = 387 - MARTIAN_DRONE = 388 - GIGA_ZAPPER = 389 - SCUTLIX_RIDER = 390 - SCUTLIX = 391 - MARTIAN_SAUCER = 392 - MARTIAN_SAUCER_TURRET = 393 - MARTIAN_SAUCER_CANNON = 394 - MARTIAN_SAUCER_CORE = 395 - MOON_LORD_HEAD = 396 - MOON_LORD_HAND = 397 - MOON_LORD_CORE = 398 - MARTIAN_PROBE = 399 - MOON_LORD_FREE_EYE = 400 - MOON_LORD_LEECH_BLOB = 401 - STARDUST_WORM_HEAD = 402 - STARDUST_WORM_BODY = 403 - STARDUST_WORM_TAIL = 404 - STARDUST_CELL_BIG = 405 - STARDUST_CELL_SMALL = 406 - STARDUST_JELLYFISH_BIG = 407 - STARDUST_JELLYFISH_SMALL = 408 - STARDUST_SPIDER_BIG = 409 - STARDUST_SPIDER_SMALL = 410 - STARDUST_SOLDIER = 411 - SOLAR_CRAWLTIPEDE_HEAD = 412 - SOLAR_CRAWLTIPEDE_BODY = 413 - SOLAR_CRAWLTIPEDE_TAIL = 414 - SOLAR_DRAKOMIRE = 415 - SOLAR_DRAKOMIRE_RIDER = 416 - SOLAR_SROLLER = 417 - SOLAR_CORITE = 418 - SOLAR_SOLENIAN = 419 - NEBULA_BRAIN = 420 - NEBULA_HEADCRAB = 421 - NEBULA_BEAST = 423 - NEBULA_SOLDIER = 424 - VORTEX_RIFLEMAN = 425 - VORTEX_HORNET_QUEEN = 426 - VORTEX_HORNET = 427 - VORTEX_LARVA = 428 - VORTEX_SOLDIER = 429 - ARMED_ZOMBIE = 430 - ARMED_ZOMBIE_ESKIMO = 431 - ARMED_ZOMBIE_PINCUSSION = 432 - ARMED_ZOMBIE_SLIMED = 433 - ARMED_ZOMBIE_SWAMP = 434 - ARMED_ZOMBIE_TWIGGY = 435 - ARMED_ZOMBIE_CENX = 436 - CULTIST_TABLET = 437 - CULTIST_DEVOTE = 438 - CULTIST_BOSS = 439 - CULTIST_BOSS_CLONE = 440 - GOLD_BIRD = 442 - GOLD_BUNNY = 443 - GOLD_BUTTERFLY = 444 - GOLD_FROG = 445 - GOLD_GRASSHOPPER = 446 - GOLD_MOUSE = 447 - GOLD_WORM = 448 - BONE_THROWING_SKELETON = 449 - BONE_THROWING_SKELETON2 = 450 - BONE_THROWING_SKELETON3 = 451 - BONE_THROWING_SKELETON4 = 452 - SKELETON_MERCHANT = 453 - CULTIST_DRAGON_HEAD = 454 - CULTIST_DRAGON_BODY1 = 455 - CULTIST_DRAGON_BODY2 = 456 - CULTIST_DRAGON_BODY3 = 457 - CULTIST_DRAGON_BODY4 = 458 - CULTIST_DRAGON_TAIL = 459 - BUTCHER = 460 - CREATURE_FROM_THE_DEEP = 461 - FRITZ = 462 - NAILHEAD = 463 - CRIMSON_BUNNY = 464 - CRIMSON_GOLDFISH = 465 - PSYCHO = 466 - DEADLY_SPHERE = 467 - DR_MAN_FLY = 468 - THE_POSSESSED = 469 - CRIMSON_PENGUIN = 470 - GOBLIN_SUMMONER = 471 - SHADOW_FLAME_APPARITION = 472 - BIG_MIMIC_CORRUPTION = 473 - BIG_MIMIC_CRIMSON = 474 - BIG_MIMIC_HALLOW = 475 - BIG_MIMIC_JUNGLE = 476 - MOTHRON = 477 - MOTHRON_EGG = 478 - MOTHRON_SPAWN = 479 - MEDUSA = 480 - GREEK_SKELETON = 481 - GRANITE_GOLEM = 482 - GRANITE_FLYER = 483 - ENCHANTED_NIGHTCRAWLER = 484 - GRUBBY = 485 - SLUGGY = 486 - BUGGY = 487 - TARGET_DUMMY = 488 - BLOOD_ZOMBIE = 489 - DRIPPLER = 490 - PIRATE_SHIP = 491 - PIRATE_SHIP_CANNON = 492 - LUNAR_TOWER_STARDUST = 493 - CRAWDAD = 494 - CRAWDAD2 = 495 - GIANT_SHELLY = 496 - GIANT_SHELLY2 = 497 - SALAMANDER = 498 - SALAMANDER2 = 499 - SALAMANDER3 = 500 - SALAMANDER4 = 501 - SALAMANDER5 = 502 - SALAMANDER6 = 503 - SALAMANDER7 = 504 - SALAMANDER8 = 505 - SALAMANDER9 = 506 - LUNAR_TOWER_NEBULA = 507 - LUNAR_TOWER_VORTEX = 422 - TAX_COLLECTOR = 441 - WALKING_ANTLION = 508 - FLYING_ANTLION = 509 - DUNE_SPLICER_HEAD = 510 - DUNE_SPLICER_BODY = 511 - DUNE_SPLICER_TAIL = 512 - TOMB_CRAWLER_HEAD = 513 - TOMB_CRAWLER_BODY = 514 - TOMB_CRAWLER_TAIL = 515 - SOLAR_FLARE = 516 - LUNAR_TOWER_SOLAR = 517 - SOLAR_SPEARMAN = 518 - SOLAR_GOOP = 519 - MARTIAN_WALKER = 520 - ANCIENT_CULTIST_SQUIDHEAD = 521 - ANCIENT_LIGHT = 522 - ANCIENT_DOOM = 523 - DESERT_GHOUL = 524 - DESERT_GHOUL_CORRUPTION = 525 - DESERT_GHOUL_CRIMSON = 526 - DESERT_GHOUL_HALLOW = 527 - DESERT_LAMIA_LIGHT = 528 - DESERT_LAMIA_DARK = 529 - DESERT_SCORPION_WALK = 530 - DESERT_SCORPION_WALL = 531 - DESERT_BEAST = 532 - DESERT_DJINN = 533 - DEMON_TAX_COLLECTOR = 534 - SLIME_SPIKED = 535 - THE_BRIDE = 536 - SAND_SLIME = 537 - SQUIRREL_RED = 538 - SQUIRREL_GOLD = 539 - PARTY_BUNNY = 540 - SAND_ELEMENTAL = 541 - SAND_SHARK = 542 - SANDSHARK_CORRUPT = 543 - SANDSHARK_CRIMSON = 544 - SANDSHARK_HALLOW = 545 - TUMBLEWEED = 546 - DD2ATTACKER_TEST = 547 - DD2ETERNIA_CRYSTAL = 548 - DD2LANE_PORTAL = 549 - DD2BARTENDER = 550 - DD2BETSY = 551 - DD2GOBLIN_T1 = 552 - DD2GOBLIN_T2 = 553 - DD2GOBLIN_T3 = 554 - DD2GOBLIN_BOMBER_T1 = 555 - DD2GOBLIN_BOMBER_T2 = 556 - DD2GOBLIN_BOMBER_T3 = 557 - DD2WYVERN_T1 = 558 - DD2WYVERN_T2 = 559 - DD2WYVERN_T3 = 560 - DD2JAVELINST_T1 = 561 - DD2JAVELINST_T2 = 562 - DD2JAVELINST_T3 = 563 - DD2DARK_MAGE_T1 = 564 - DD2DARK_MAGE_T3 = 565 - DD2SKELETON_T1 = 566 - DD2SKELETON_T3 = 567 - DD2WITHER_BEAST_T2 = 568 - DD2WITHER_BEAST_T3 = 569 - DD2DRAKIN_T2 = 570 - DD2DRAKIN_T3 = 571 - DD2KOBOLD_WALKER_T2 = 572 - DD2KOBOLD_WALKER_T3 = 573 - DD2KOBOLD_FLYER_T2 = 574 - DD2KOBOLD_FLYER_T3 = 575 - DD2OGRE_T2 = 576 - DD2OGRE_T3 = 577 - DD2LIGHTNING_BUG_T3 = 578 - BARTENDER_UNCONSCIOUS = 579 - - # 1.4 entities, adapted from: https://terraria.gamepedia.com/NPC_IDs - LARVAE_ANTLION = 582 - FAIRY_CRITTER_PINK = 583 - FAIRY_CRITTER_GREEN = 584 - FAIRY_CRITTER_BLUE = 585 - ZOMBIE_MERMAN = 586 - EYEBALL_FLYINGFISH = 587 - GOLFER = 588 - GOLFER_RESCUE = 589 - TORCH_ZOMBIE = 590 - ARMED_TORCH_ZOMBIE = 591 - GOLD_GOLD_FISH = 592 - GOLD_GOLD_FISHWALKER = 593 - WINDY_BALLOON = 594 - BLACK_DRAGONFLY = 595 - BLUE_DRAGONFLY = 596 - GREEN_DRAGONFLY = 597 - ORANGE_DRAGONFLY = 598 - RED_DRAGONFLY = 599 - YELLOW_DRAGONFLY = 600 - GOLD_DRAGONFLY = 601 - SEAGULL = 602 - SEAGULL2 = 603 - LADY_BUG = 604 - GOLD_LADYBUG = 605 - MAGGOT = 606 - PUPFISH = 607 - GREBE = 608 - GREBE2 = 609 - RAT = 610 - OWL = 611 - WATER_STRIDER = 612 - GOLD_WATER_STRIDER = 613 - EXPLOSIVE_BUNNY = 614 - DOLPHIN = 615 - TURTLE = 616 - TURTLE_JUNGLE = 617 - BLOOD_NAUTILUS = 618 - BLOOD_SQUID = 619 - GOBLIN_SHARK = 620 - BLOOD_EEL_HEAD = 621 - BLOOD_EEL_BODY = 622 - BLOOD_EEL_TAIL = 623 - GNOME = 624 - SEA_TURTLE = 625 - SEA_HORSE = 626 - GOLD_SEAHORSE = 627 - DANDELION = 628 - ICE_MIMIC = 629 - BLOOD_MUMMY = 630 - ROCK_GOLEM = 631 - MAGGOT_ZOMBIE = 632 - BESTIARY_GIRL = 633 - SPORE_BAT = 634 - SPORE_SKELETON = 635 - HALLOW_BOSS = 636 - TOWN_CAT = 637 - TOWN_DOG = 638 - GEM_SQUIRREL_AMETHYST = 639 - GEM_SQUIRREL_TOPAZ = 640 - GEM_SQUIRREL_SAPPHIRE = 641 - GEM_SQUIRREL_EMERALD = 642 - GEM_SQUIRREL_RUBY = 643 - GEM_SQUIRREL_DIAMOND = 644 - GEM_SQUIRREL_AMBER = 645 - GEM_BUNNY_AMETHYST = 646 - GEM_BUNNY_TOPAZ = 647 - GEM_BUNNY_SAPPHIRE = 648 - GEM_BUNNY_EMERALD = 649 - GEM_BUNNY_RUBY = 650 - GEM_BUNNY_DIAMOND = 651 - GEM_BUNNY_AMBER = 652 - HELL_BUTTERFLY = 653 - LAVA_FLY = 654 - MAGMA_SNAIL = 655 - TOWN_BUNNY = 656 - QUEEN_SLIME_BOSS = 657 - QUEEN_SLIME_MINION_BLUE = 658 - QUEEN_SLIME_MINION_PINK = 659 - QUEEN_SLIME_MINION_PURPLE = 660 - EMPRESS_BUTTERFLY = 661 - PIRATE_GHOST = 662 + """An enumeration of all Terraria entities.""" + # https://terraria.gamepedia.com/NPC_IDs + # Obtained from this wiki page with the following regex and adding BestiaryGirl = 633 manually + # ^([0-9-]+)\s+[A-Za-z0-9()\s.,\-']+?\.(?:png|gif)\s+([A-Za-z0-9]+)$ + BigHornetStingy = -65 + LittleHornetStingy = -64 + BigHornetSpikey = -63 + LittleHornetSpikey = -62 + BigHornetLeafy = -61 + LittleHornetLeafy = -60 + BigHornetHoney = -59 + LittleHornetHoney = -58 + BigHornetFatty = -57 + LittleHornetFatty = -56 + BigRainZombie = -55 + SmallRainZombie = -54 + BigPantlessSkeleton = -53 + SmallPantlessSkeleton = -52 + BigMisassembledSkeleton = -51 + SmallMisassembledSkeleton = -50 + BigHeadacheSkeleton = -49 + SmallHeadacheSkeleton = -48 + BigSkeleton = -47 + SmallSkeleton = -46 + BigFemaleZombie = -45 + SmallFemaleZombie = -44 + DemonEye2 = -43 + PurpleEye2 = -42 + GreenEye2 = -41 + DialatedEye2 = -40 + SleepyEye2 = -39 + CataractEye2 = -38 + BigTwiggyZombie = -37 + SmallTwiggyZombie = -36 + BigSwampZombie = -35 + SmallSwampZombie = -34 + BigSlimedZombie = -33 + SmallSlimedZombie = -32 + BigPincushionZombie = -31 + SmallPincushionZombie = -30 + BigBaldZombie = -29 + SmallBaldZombie = -28 + BigZombie = -27 + SmallZombie = -26 + BigCrimslime = -25 + LittleCrimslime = -24 + BigCrimera = -23 + LittleCrimera = -22 + GiantMossHornet = -21 + BigMossHornet = -20 + LittleMossHornet = -19 + TinyMossHornet = -18 + BigStinger = -17 + LittleStinger = -16 + HeavySkeleton = -15 + BigBoned = -14 + ShortBones = -13 + BigEater = -12 + LittleEater = -11 + JungleSlime = -10 + YellowSlime = -9 + RedSlime = -8 + PurpleSlime = -7 + BlackSlime = -6 + BabySlime = -5 + Pinky = -4 + GreenSlime = -3 + Slimer2 = -2 + Slimeling = -1 + BlueSlime = 1 + DemonEye = 2 + Zombie = 3 + EyeofCthulhu = 4 + ServantofCthulhu = 5 + EaterofSouls = 6 + DevourerHead = 7 + DevourerBody = 8 + DevourerTail = 9 + GiantWormHead = 10 + GiantWormBody = 11 + GiantWormTail = 12 + EaterofWorldsHead = 13 + EaterofWorldsBody = 14 + EaterofWorldsTail = 15 + MotherSlime = 16 + Merchant = 17 + Nurse = 18 + ArmsDealer = 19 + Dryad = 20 + Skeleton = 21 + Guide = 22 + MeteorHead = 23 + FireImp = 24 + BurningSphere = 25 + GoblinPeon = 26 + GoblinThief = 27 + GoblinWarrior = 28 + GoblinSorcerer = 29 + ChaosBall = 30 + AngryBones = 31 + DarkCaster = 32 + WaterSphere = 33 + CursedSkull = 34 + SkeletronHead = 35 + SkeletronHand = 36 + OldMan = 37 + Demolitionist = 38 + BoneSerpentHead = 39 + BoneSerpentBody = 40 + BoneSerpentTail = 41 + Hornet = 42 + ManEater = 43 + UndeadMiner = 44 + Tim = 45 + Bunny = 46 + CorruptBunny = 47 + Harpy = 48 + CaveBat = 49 + KingSlime = 50 + JungleBat = 51 + DoctorBones = 52 + TheGroom = 53 + Clothier = 54 + Goldfish = 55 + Snatcher = 56 + CorruptGoldfish = 57 + Piranha = 58 + LavaSlime = 59 + Hellbat = 60 + Vulture = 61 + Demon = 62 + BlueJellyfish = 63 + PinkJellyfish = 64 + Shark = 65 + VoodooDemon = 66 + Crab = 67 + DungeonGuardian = 68 + Antlion = 69 + SpikeBall = 70 + DungeonSlime = 71 + BlazingWheel = 72 + GoblinScout = 73 + Bird = 74 + Pixie = 75 + ArmoredSkeleton = 77 + Mummy = 78 + DarkMummy = 79 + LightMummy = 80 + CorruptSlime = 81 + Wraith = 82 + CursedHammer = 83 + EnchantedSword = 84 + Mimic = 85 + Unicorn = 86 + WyvernHead = 87 + WyvernLegs = 88 + WyvernBody = 89 + WyvernBody2 = 90 + WyvernBody3 = 91 + WyvernTail = 92 + GiantBat = 93 + Corruptor = 94 + DiggerHead = 95 + DiggerBody = 96 + DiggerTail = 97 + SeekerHead = 98 + SeekerBody = 99 + SeekerTail = 100 + Clinger = 101 + AnglerFish = 102 + GreenJellyfish = 103 + Werewolf = 104 + BoundGoblin = 105 + BoundWizard = 106 + GoblinTinkerer = 107 + Wizard = 108 + Clown = 109 + SkeletonArcher = 110 + GoblinArcher = 111 + VileSpit = 112 + WallofFlesh = 113 + WallofFleshEye = 114 + TheHungry = 115 + TheHungryII = 116 + LeechHead = 117 + LeechBody = 118 + LeechTail = 119 + ChaosElemental = 120 + Slimer = 121 + Gastropod = 122 + BoundMechanic = 123 + Mechanic = 124 + Retinazer = 125 + Spazmatism = 126 + SkeletronPrime = 127 + PrimeCannon = 128 + PrimeSaw = 129 + PrimeVice = 130 + PrimeLaser = 131 + BaldZombie = 132 + WanderingEye = 133 + TheDestroyer = 134 + TheDestroyerBody = 135 + TheDestroyerTail = 136 + IlluminantBat = 137 + IlluminantSlime = 138 + Probe = 139 + PossessedArmor = 140 + ToxicSludge = 141 + SantaClaus = 142 + SnowmanGangsta = 143 + MisterStabby = 144 + SnowBalla = 145 + IceSlime = 147 + Penguin = 148 + PenguinBlack = 149 + IceBat = 150 + Lavabat = 151 + GiantFlyingFox = 152 + GiantTortoise = 153 + IceTortoise = 154 + Wolf = 155 + RedDevil = 156 + Arapaima = 157 + VampireBat = 158 + Vampire = 159 + Truffle = 160 + ZombieEskimo = 161 + Frankenstein = 162 + BlackRecluse = 163 + WallCreeper = 164 + WallCreeperWall = 165 + SwampThing = 166 + UndeadViking = 167 + CorruptPenguin = 168 + IceElemental = 169 + PigronCorruption = 170 + PigronHallow = 171 + RuneWizard = 172 + Crimera = 173 + Herpling = 174 + AngryTrapper = 175 + MossHornet = 176 + Derpling = 177 + Steampunker = 178 + CrimsonAxe = 179 + PigronCrimson = 180 + FaceMonster = 181 + FloatyGross = 182 + Crimslime = 183 + SpikedIceSlime = 184 + SnowFlinx = 185 + PincushionZombie = 186 + SlimedZombie = 187 + SwampZombie = 188 + TwiggyZombie = 189 + CataractEye = 190 + SleepyEye = 191 + DialatedEye = 192 + GreenEye = 193 + PurpleEye = 194 + LostGirl = 195 + Nymph = 196 + ArmoredViking = 197 + Lihzahrd = 198 + LihzahrdCrawler = 199 + FemaleZombie = 200 + HeadacheSkeleton = 201 + MisassembledSkeleton = 202 + PantlessSkeleton = 203 + SpikedJungleSlime = 204 + Moth = 205 + IcyMerman = 206 + DyeTrader = 207 + PartyGirl = 208 + Cyborg = 209 + Bee = 210 + BeeSmall = 211 + PirateDeckhand = 212 + PirateCorsair = 213 + PirateDeadeye = 214 + PirateCrossbower = 215 + PirateCaptain = 216 + CochinealBeetle = 217 + CyanBeetle = 218 + LacBeetle = 219 + SeaSnail = 220 + Squid = 221 + QueenBee = 222 + ZombieRaincoat = 223 + FlyingFish = 224 + UmbrellaSlime = 225 + FlyingSnake = 226 + Painter = 227 + WitchDoctor = 228 + Pirate = 229 + GoldfishWalker = 230 + HornetFatty = 231 + HornetHoney = 232 + HornetLeafy = 233 + HornetSpikey = 234 + HornetStingy = 235 + JungleCreeper = 236 + JungleCreeperWall = 237 + BlackRecluseWall = 238 + BloodCrawler = 239 + BloodCrawlerWall = 240 + BloodFeeder = 241 + BloodJelly = 242 + IceGolem = 243 + RainbowSlime = 244 + Golem = 245 + GolemHead = 246 + GolemFistLeft = 247 + GolemFistRight = 248 + GolemHeadFree = 249 + AngryNimbus = 250 + Eyezor = 251 + Parrot = 252 + Reaper = 253 + ZombieMushroom = 254 + ZombieMushroomHat = 255 + FungoFish = 256 + AnomuraFungus = 257 + MushiLadybug = 258 + FungiBulb = 259 + GiantFungiBulb = 260 + FungiSpore = 261 + Plantera = 262 + PlanterasHook = 263 + PlanterasTentacle = 264 + Spore = 265 + BrainofCthulhu = 266 + Creeper = 267 + IchorSticker = 268 + RustyArmoredBonesAxe = 269 + RustyArmoredBonesFlail = 270 + RustyArmoredBonesSword = 271 + RustyArmoredBonesSwordNoArmor = 272 + BlueArmoredBones = 273 + BlueArmoredBonesMace = 274 + BlueArmoredBonesNoPants = 275 + BlueArmoredBonesSword = 276 + HellArmoredBones = 277 + HellArmoredBonesSpikeShield = 278 + HellArmoredBonesMace = 279 + HellArmoredBonesSword = 280 + RaggedCaster = 281 + RaggedCasterOpenCoat = 282 + Necromancer = 283 + NecromancerArmored = 284 + DiabolistRed = 285 + DiabolistWhite = 286 + BoneLee = 287 + DungeonSpirit = 288 + GiantCursedSkull = 289 + Paladin = 290 + SkeletonSniper = 291 + TacticalSkeleton = 292 + SkeletonCommando = 293 + AngryBonesBig = 294 + AngryBonesBigMuscle = 295 + AngryBonesBigHelmet = 296 + BirdBlue = 297 + BirdRed = 298 + Squirrel = 299 + Mouse = 300 + Raven = 301 + SlimeMasked = 302 + BunnySlimed = 303 + HoppinJack = 304 + Scarecrow1 = 305 + Scarecrow2 = 306 + Scarecrow3 = 307 + Scarecrow4 = 308 + Scarecrow5 = 309 + Scarecrow6 = 310 + Scarecrow7 = 311 + Scarecrow8 = 312 + Scarecrow9 = 313 + Scarecrow10 = 314 + HeadlessHorseman = 315 + Ghost = 316 + DemonEyeOwl = 317 + DemonEyeSpaceship = 318 + ZombieDoctor = 319 + ZombieSuperman = 320 + ZombiePixie = 321 + SkeletonTopHat = 322 + SkeletonAstonaut = 323 + SkeletonAlien = 324 + MourningWood = 325 + Splinterling = 326 + Pumpking = 327 + PumpkingBlade = 328 + Hellhound = 329 + Poltergeist = 330 + ZombieXmas = 331 + ZombieSweater = 332 + SlimeRibbonWhite = 333 + SlimeRibbonYellow = 334 + SlimeRibbonGreen = 335 + SlimeRibbonRed = 336 + BunnyXmas = 337 + ZombieElf = 338 + ZombieElfBeard = 339 + ZombieElfGirl = 340 + PresentMimic = 341 + GingerbreadMan = 342 + Yeti = 343 + Everscream = 344 + IceQueen = 345 + SantaNK1 = 346 + ElfCopter = 347 + Nutcracker = 348 + NutcrackerSpinning = 349 + ElfArcher = 350 + Krampus = 351 + Flocko = 352 + Stylist = 353 + WebbedStylist = 354 + Firefly = 355 + Butterfly = 356 + Worm = 357 + LightningBug = 358 + Snail = 359 + GlowingSnail = 360 + Frog = 361 + Duck = 362 + Duck2 = 363 + DuckWhite = 364 + DuckWhite2 = 365 + ScorpionBlack = 366 + Scorpion = 367 + TravellingMerchant = 368 + Angler = 369 + DukeFishron = 370 + DetonatingBubble = 371 + Sharkron = 372 + Sharkron2 = 373 + TruffleWorm = 374 + TruffleWormDigger = 375 + SleepingAngler = 376 + Grasshopper = 377 + ChatteringTeethBomb = 378 + CultistArcherBlue = 379 + CultistArcherWhite = 380 + BrainScrambler = 381 + RayGunner = 382 + MartianOfficer = 383 + ForceBubble = 384 + GrayGrunt = 385 + MartianEngineer = 386 + MartianTurret = 387 + MartianDrone = 388 + GigaZapper = 389 + ScutlixRider = 390 + Scutlix = 391 + MartianSaucer = 392 + MartianSaucerTurret = 393 + MartianSaucerCannon = 394 + MartianSaucerCore = 395 + MoonLordHead = 396 + MoonLordHand = 397 + MoonLordCore = 398 + MartianProbe = 399 + MoonLordFreeEye = 400 + MoonLordLeechBlob = 401 + StardustWormHead = 402 + StardustWormBody = 403 + StardustWormTail = 404 + StardustCellBig = 405 + StardustCellSmall = 406 + StardustJellyfishBig = 407 + StardustSpiderBig = 409 + StardustSpiderSmall = 410 + StardustSoldier = 411 + SolarCrawltipedeHead = 412 + SolarCrawltipedeBody = 413 + SolarCrawltipedeTail = 414 + SolarDrakomire = 415 + SolarDrakomireRider = 416 + SolarSroller = 417 + SolarCorite = 418 + SolarSolenian = 419 + NebulaBrain = 420 + NebulaHeadcrab = 421 + LunarTowerVortex = 422 + NebulaBeast = 423 + NebulaSoldier = 424 + VortexRifleman = 425 + VortexHornetQueen = 426 + VortexHornet = 427 + VortexLarva = 428 + VortexSoldier = 429 + ArmedZombie = 430 + ArmedZombieEskimo = 431 + ArmedZombiePincussion = 432 + ArmedZombieSlimed = 433 + ArmedZombieSwamp = 434 + ArmedZombieTwiggy = 435 + ArmedZombieCenx = 436 + CultistTablet = 437 + CultistDevote = 438 + CultistBoss = 439 + CultistBossClone = 440 + TaxCollector = 441 + GoldBird = 442 + GoldBunny = 443 + GoldButterfly = 444 + GoldFrog = 445 + GoldGrasshopper = 446 + GoldMouse = 447 + GoldWorm = 448 + BoneThrowingSkeleton = 449 + BoneThrowingSkeleton2 = 450 + BoneThrowingSkeleton3 = 451 + BoneThrowingSkeleton4 = 452 + SkeletonMerchant = 453 + CultistDragonHead = 454 + CultistDragonBody1 = 455 + CultistDragonBody2 = 456 + CultistDragonBody3 = 457 + CultistDragonBody4 = 458 + CultistDragonTail = 459 + Butcher = 460 + CreatureFromTheDeep = 461 + Fritz = 462 + Nailhead = 463 + CrimsonBunny = 464 + CrimsonGoldfish = 465 + Psycho = 466 + DeadlySphere = 467 + DrManFly = 468 + ThePossessed = 469 + CrimsonPenguin = 470 + GoblinSummoner = 471 + ShadowFlameApparition = 472 + BigMimicCorruption = 473 + BigMimicCrimson = 474 + BigMimicHallow = 475 + BigMimicJungle = 476 + Mothron = 477 + MothronEgg = 478 + MothronSpawn = 479 + Medusa = 480 + GreekSkeleton = 481 + GraniteGolem = 482 + GraniteFlyer = 483 + EnchantedNightcrawler = 484 + Grubby = 485 + Sluggy = 486 + Buggy = 487 + TargetDummy = 488 + BloodZombie = 489 + Drippler = 490 + PirateShip = 491 + PirateShipCannon = 492 + LunarTowerStardust = 493 + Crawdad = 494 + Crawdad2 = 495 + GiantShelly = 496 + GiantShelly2 = 497 + Salamander = 498 + Salamander2 = 499 + Salamander3 = 500 + Salamander4 = 501 + Salamander5 = 502 + Salamander6 = 503 + Salamander7 = 504 + Salamander8 = 505 + Salamander9 = 506 + LunarTowerNebula = 507 + GiantWalkingAntlion = 508 + GiantFlyingAntlion = 509 + DuneSplicerHead = 510 + DuneSplicerBody = 511 + DuneSplicerTail = 512 + TombCrawlerHead = 513 + TombCrawlerBody = 514 + TombCrawlerTail = 515 + SolarFlare = 516 + LunarTowerSolar = 517 + SolarSpearman = 518 + SolarGoop = 519 + MartianWalker = 520 + AncientCultistSquidhead = 521 + AncientLight = 522 + AncientDoom = 523 + DesertGhoul = 524 + DesertGhoulCorruption = 525 + DesertGhoulCrimson = 526 + DesertGhoulHallow = 527 + DesertLamiaLight = 528 + DesertLamiaDark = 529 + DesertScorpionWalk = 530 + DesertScorpionWall = 531 + DesertBeast = 532 + DesertDjinn = 533 + DemonTaxCollector = 534 + SlimeSpiked = 535 + TheBride = 536 + SandSlime = 537 + SquirrelRed = 538 + SquirrelGold = 539 + PartyBunny = 540 + SandElemental = 541 + SandShark = 542 + SandsharkCorrupt = 543 + SandsharkCrimson = 544 + SandsharkHallow = 545 + Tumbleweed = 546 + DD2EterniaCrystal = 548 + DD2LanePortal = 549 + DD2Bartender = 550 + DD2Betsy = 551 + DD2GoblinT1 = 552 + DD2GoblinT2 = 553 + DD2GoblinT3 = 554 + DD2GoblinBomberT1 = 555 + DD2GoblinBomberT2 = 556 + DD2GoblinBomberT3 = 557 + DD2WyvernT1 = 558 + DD2WyvernT2 = 559 + DD2WyvernT3 = 560 + DD2JavelinstT1 = 561 + DD2JavelinstT2 = 562 + DD2JavelinstT3 = 563 + DD2DarkMageT1 = 564 + DD2DarkMageT3 = 565 + DD2SkeletonT1 = 566 + DD2SkeletonT3 = 567 + DD2WitherBeastT2 = 568 + DD2WitherBeastT3 = 569 + DD2DrakinT2 = 570 + DD2DrakinT3 = 571 + DD2KoboldWalkerT2 = 572 + DD2KoboldWalkerT3 = 573 + DD2KoboldFlyerT2 = 574 + DD2KoboldFlyerT3 = 575 + DD2OgreT2 = 576 + DD2OgreT3 = 577 + DD2LightningBugT3 = 578 + BartenderUnconscious = 579 + WalkingAntlion = 580 + FlyingAntlion = 581 + LarvaeAntlion = 582 + FairyCritterPink = 583 + FairyCritterGreen = 584 + FairyCritterBlue = 585 + ZombieMerman = 586 + EyeballFlyingFish = 587 + Golfer = 588 + GolferRescue = 589 + TorchZombie = 590 + ArmedTorchZombie = 591 + GoldGoldfish = 592 + GoldGoldfishWalker = 593 + WindyBalloon = 594 + BlackDragonfly = 595 + BlueDragonfly = 596 + GreenDragonfly = 597 + OrangeDragonfly = 598 + RedDragonfly = 599 + YellowDragonfly = 600 + GoldDragonfly = 601 + Seagull = 602 + Seagull2 = 603 + LadyBug = 604 + GoldLadyBug = 605 + Maggot = 606 + Pupfish = 607 + Grebe = 608 + Grebe2 = 609 + Rat = 610 + Owl = 611 + WaterStrider = 612 + GoldWaterStrider = 613 + ExplosiveBunny = 614 + Dolphin = 615 + Turtle = 616 + TurtleJungle = 617 + BloodNautilus = 618 + BloodSquid = 619 + GoblinShark = 620 + BloodEelHead = 621 + BloodEelBody = 622 + BloodEelTail = 623 + Gnome = 624 + SeaTurtle = 625 + Seahorse = 626 + GoldSeahorse = 627 + Dandelion = 628 + IceMimic = 629 + BloodMummy = 630 + RockGolem = 631 + MaggotZombie = 632 + BestiaryGirl = 633 + SporeBat = 634 + SporeSkeleton = 635 + HallowBoss = 636 + TownCat = 637 + TownDog = 638 + GemSquirrelAmethyst = 639 + GemSquirrelTopaz = 640 + GemSquirrelSapphire = 641 + GemSquirrelEmerald = 642 + GemSquirrelRuby = 643 + GemSquirrelDiamond = 644 + GemSquirrelAmber = 645 + GemBunnyAmethyst = 646 + GemBunnyTopaz = 647 + GemBunnySapphire = 648 + GemBunnyEmerald = 649 + GemBunnyRuby = 650 + GemBunnyDiamond = 651 + GemBunnyAmber = 652 + HellButterfly = 653 + Lavafly = 654 + MagmaSnail = 655 + TownBunny = 656 + QueenSlimeBoss = 657 + QueenSlimeMinionBlue = 658 + QueenSlimeMinionPink = 659 + QueenSlimeMinionPurple = 660 + EmpressButterfly = 661 + PirateGhost = 662 def __repr__(self): - return f"{self.__class__.__name__}.{self.name}" + return f"{self.__class__.__name__}.{self.name}" \ No newline at end of file diff --git a/lihzahrd/enums/itemtype.py b/lihzahrd/enums/itemtype.py index 773334c..03d6cbf 100644 --- a/lihzahrd/enums/itemtype.py +++ b/lihzahrd/enums/itemtype.py @@ -5098,7 +5098,5 @@ class ItemType(enum.IntEnum): CARTON_OF_MILK = 5041 COFFEE = 5042 - COUNT = 5043 - def __repr__(self): return f"{self.__class__.__name__}.{self.name}" diff --git a/lihzahrd/world.py b/lihzahrd/world.py index 43a9ce5..124ddb8 100644 --- a/lihzahrd/world.py +++ b/lihzahrd/world.py @@ -856,22 +856,16 @@ class World: unknown_town_manager_data = f.read_until(pointers.bestiary) - bestiary_kill_count = f.int4() - bestiary_kill_data = {} - for _ in range(bestiary_kill_count): - beast = f.string() - beast_count = f.int4() - bestiary_kill_data[beast] = beast_count - bestiary_sighting_count = f.int4() - bestiary_sighting_data = [f.string() for _ in range(bestiary_sighting_count)] - bestiary_chat_count = f.int4() - bestiary_chat_data = [f.string() for _ in range(bestiary_chat_count)] - bestiary = Bestiary(bestiary_chat_count, - bestiary_chat_data, - bestiary_kill_count, - bestiary_kill_data, - bestiary_sighting_count, - bestiary_sighting_data) + bestiary_kills = {} + for _ in range(f.int4()): + entity = EntityType[f.string()] + kills = f.int4() + bestiary_kills[entity] = kills + + bestiary_sightings = [EntityType[f.string()] for _ in range(f.int4())] + bestiary_chats = [EntityType[f.string()] for _ in range(f.int4())] + + bestiary = Bestiary(chats=bestiary_chats, kills=bestiary_kills, sightings=bestiary_sightings) unknown_bestiary_data = f.read_until(pointers.journey_powers)