mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 12:11:33 -06:00
2f7e532f4f
Squash merge, original Commits: * Minecraft locations, items, and generation without logic * added id lookup for minecraft * typing import fix in minecraft/Items.py * fix 2 * implementing Minecraft options and hard/postgame advancement exclusion * first logic pass (75/80) * logic pass 2 and proper completion conditions * added insane difficulty pool, modified method of excluding item pools for easier extension * bump network_data_package version * minecraft testing framework * switch Ancient Debris to Netherite Scrap to avoid advancement triggering on receiving that item * Testing now functions, split tests up by advancement pane, added some story tests * Newer testing framework: every advancement gets its own function, for ease of testing * fixed logic for The End... Again... * changed option names to "include_hard_advancements" etc. * village/pillager-related advancements now require can_adventure: weapon + food * a few minecraft tests * rename "Flint & Steel" to "Flint and Steel" for parity with in-game name * additional MC tests * more tests, mostly nether-related tests * more tests, removed anvil path for Two Birds One Arrow * include Minecraft slot data, and a world seed for each Minecraft player slot * Added new items: ender pearls, lapis, porkchops * All remaining Minecraft tests * formatting of Minecraft tests and logic for better readability * require Wither kill for Monsters Hunted * properly removed 8 Emeralds item from item pool * enchanting required for wither; fishing rod required for water breathing; water breathing required for elder guardian kill * Added 12 new advancements (ported from old achievement system) * renamed "On a Rail" for consistency with modern advancements * tests for the new advancements * moved slot_data generation for minecraft into worlds/minecraft/__init__.py, added logic_version to slot_data * output minecraft options in the spoiler log * modified advancement goal values for new advancements * make non-native Minecraft items appear as Shovel in ALttP, and unknown-game items as Power Stars * fixed glowstone block logic for Not Quite Nine Lives * setup for shuffling MC structures: building ER world and shuffling regions/entrances * ensured Nether Fortresses can't be placed in the End * finished logic for structure randomization * fixed nonnative items always showing up as Hammers in ALttP shops * output minecraft structure info in the spoiler * generate .apmc file for communication with MC client * fixed structure rando always using the same seed * move stuff to worlds/minecraft/Regions.py * make output apmc file have consistent name with other files * added minecraft bottle macro; fixed tests imports * generalizing MC region generation * restructured structure shuffling in preparation for structure plando * only output structure rando info in spoiler if they are shuffled * Force structure rando to always be off, for the stable release * added Minecraft options to player settings * formally added combat_difficulty as an option * Added Ender Dragon into playthrough, cleaned up goal map * Added new difficulties: Easy, Normal, Hard combat * moved .apmc generation time to prevent outputs on failed generation * updated tests for new combat logic * Fixed bug causing generation to fail; removed Nether Fortress event since it should no longer be needed with the fix * moved all MC-specific functions into gen_minecraft * renamed "logic_version" to "client_version" * bug fixes properly flagged event locations/items with id None moved generation back to Main.py to fix mysterious generation failures * moved link_minecraft_regions into minecraft init, left create_regions in Main for caching * added seed_name, player_name, client_version to apmc file * reenabled structure shuffle * added entrance tests for minecraft Co-authored-by: achuang <alexander.w.chuang@gmail.com>
39 lines
1.6 KiB
Python
39 lines
1.6 KiB
Python
import enum
|
|
|
|
__all__ = {"lookup_any_item_id_to_name",
|
|
"lookup_any_location_id_to_name",
|
|
"network_data_package",
|
|
"Games"}
|
|
|
|
from .alttp.Items import lookup_id_to_name as alttp
|
|
from .hk.Items import lookup_id_to_name as hk
|
|
from .factorio import Technologies
|
|
from .minecraft.Items import lookup_id_to_name as mc
|
|
|
|
lookup_any_item_id_to_name = {**alttp, **hk, **Technologies.lookup_id_to_name, **mc}
|
|
assert len(alttp) + len(hk) + len(Technologies.lookup_id_to_name) + len(mc) == len(lookup_any_item_id_to_name)
|
|
lookup_any_item_name_to_id = {name: id for id, name in lookup_any_item_id_to_name.items()}
|
|
|
|
from .alttp import Regions
|
|
from .hk import Locations
|
|
from .minecraft import Locations as Advancements
|
|
|
|
lookup_any_location_id_to_name = {**Regions.lookup_id_to_name, **Locations.lookup_id_to_name,
|
|
**Technologies.lookup_id_to_name, **Advancements.lookup_id_to_name}
|
|
assert len(Regions.lookup_id_to_name) + len(Locations.lookup_id_to_name) + \
|
|
len(Technologies.lookup_id_to_name) + len(Advancements.lookup_id_to_name) == \
|
|
len(lookup_any_location_id_to_name)
|
|
lookup_any_location_name_to_id = {name: id for id, name in lookup_any_location_id_to_name.items()}
|
|
|
|
network_data_package = {"lookup_any_location_id_to_name": lookup_any_location_id_to_name,
|
|
"lookup_any_item_id_to_name": lookup_any_item_id_to_name,
|
|
"version": 5}
|
|
|
|
|
|
@enum.unique
|
|
class Games(str, enum.Enum):
|
|
HK = "Hollow Knight"
|
|
LTTP = "A Link to the Past"
|
|
Factorio = "Factorio"
|
|
Minecraft = "Minecraft"
|