Skip to content

Commit

Permalink
Merge pull request #19 from Rooby-Roo/animal-well
Browse files Browse the repository at this point in the history 
Fleshing out locations.py + organization of items, locations, item_names.py, location_names.py
  • Loading branch information
@ScipioWright
ScipioWright authored May 25, 2024
2 parents f542d2c + b06c1b7 commit 4839027
Show file tree
Hide file tree
Showing 5 changed files with 321 additions and 160 deletions.
144 changes: 75 additions & 69 deletions worlds/animal-well/items.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,88 +32,94 @@ class AnimalWellItemData(NamedTuple):

iname.m_disc: AnimalWellItemData(ItemClassification.progression, 1, "Toys"),
iname.fanny_pack: AnimalWellItemData(ItemClassification.useful, 1, "Toys"),

iname.match: AnimalWellItemData(ItemClassification.progression, 9, "Toys"),

iname.e_medal: AnimalWellItemData(ItemClassification.progression, 1, "Keys"),
iname.s_medal: AnimalWellItemData(ItemClassification.progression, 1, "Keys"),
iname.k_shard: AnimalWellItemData(ItemClassification.progression, 3, "Keys"),
iname.key: AnimalWellItemData(ItemClassification.progression, 6, "Keys"),
iname.house_key: AnimalWellItemData(ItemClassification.progression, 1, "Keys"),
iname.office_key: AnimalWellItemData(ItemClassification.progression, 1, "Keys"),

iname.e_medal: AnimalWellItemData(ItemClassification.progression, 1, "Keys"),
iname.s_medal: AnimalWellItemData(ItemClassification.progression, 1, "Keys"),
iname.k_shard: AnimalWellItemData(ItemClassification.progression, 3, "Keys"),

iname.blue_flame: AnimalWellItemData(ItemClassification.progression, 1, "Flames"),
iname.green_flame: AnimalWellItemData(ItemClassification.progression, 1, "Flames"),
iname.violet_flame: AnimalWellItemData(ItemClassification.progression, 1, "Flames"),
iname.pink_flame: AnimalWellItemData(ItemClassification.progression, 1, "Flames"),

# todo: reorder this so it's the same order as locations.py

"Clover Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Gorgeous Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Magic Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Great Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Normal Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Mystic Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Razzle Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Dazzle Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Future Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Virtual Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Travel Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Rust Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Jade Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Sweet Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Desert Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Planet Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Laissez-faire Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Chaos Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Shadow Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Swan Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Evil Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Depraved Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Sour Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Upside Down Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Forbidden Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Plant Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Raw Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Reference Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Brown Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Goodnight Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Fire Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Transcendental Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Rain Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Holiday Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Truth Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Post Modern Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Bubble Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Dream Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Scarlet Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Golden Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Iridescent Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Ice Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Pickled Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Big Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Vanity Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Sweet Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Chocolate Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Value Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Red Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Orange Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Universal Basic Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Zen Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Ancient Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Moon Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Galaxy Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Sunset Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Promise Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Brick Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Neon Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Sapphire Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Ruby Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Obsidian Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Crystal Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
"Egg As A Service": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),

"65th Egg": AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_reference: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_brown: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_raw: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_pickled: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_big: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_swan: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_forbidden: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_shadow: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_vanity: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_service: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),

iname.egg_depraved: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_chaos: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_upside_down: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_evil: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_sweet: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_chocolate: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_value: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_plant: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_red: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_orange: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_sour: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_post_modern: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),

iname.egg_universal: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_lf: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_zen: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_future: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_friendship: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_truth: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_transcendental: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_ancient: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_magic: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_mystic: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_holiday: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_rain: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_razzle: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_dazzle: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),

iname.egg_virtual: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_normal: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_great: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_gorgeous: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_planet: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_moon: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_galaxy: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_sunset: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_goodnight: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_dream: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_travel: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_promise: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_ice: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_fire: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),

iname.egg_bubble: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_desert: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_clover: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_brick: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_neon: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_iridescent: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_rust: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_scarlet: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_sapphire: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_ruby: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_jade: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_obsidian: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_crystal: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
iname.egg_golden: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),

iname.egg_65: AnimalWellItemData(ItemClassification.progression_skip_balancing, 1, "Eggs"),
}

item_name_to_id: Dict[str, int] = {name: item_base_id + data.item_id_offset for name, data in item_table.items()}
Expand Down
Loading

0 comments on commit 4839027

Please sign in to comment.