 2f7e532f4f
			
		
	
	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>
		
			
				
	
	
		
			143 lines
		
	
	
		
			6.0 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			143 lines
		
	
	
		
			6.0 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from BaseClasses import Region, Entrance, Location, MultiWorld, Item
 | |
| import typing
 | |
| 
 | |
| class AdvData(typing.NamedTuple):
 | |
|     id: int
 | |
|     region: str
 | |
| 
 | |
| class MinecraftAdvancement(Location): 
 | |
|     game: str = "Minecraft"
 | |
|     def __init__(self, player: int, name: str, address: int, parent):
 | |
|         super().__init__(player, name, address if address else None, parent)
 | |
|         self.event = True if address == 0 else False
 | |
| 
 | |
| advancement_table = {
 | |
|     "Who is Cutting Onions?": AdvData(42000, 'Overworld'),
 | |
|     "Oh Shiny": AdvData(42001, 'Overworld'),
 | |
|     "Suit Up": AdvData(42002, 'Overworld'),
 | |
|     "Very Very Frightening": AdvData(42003, 'Village'),
 | |
|     "Hot Stuff": AdvData(42004, 'Overworld'),
 | |
|     "Free the End": AdvData(42005, 'The End'),
 | |
|     "A Furious Cocktail": AdvData(42006, 'Nether Fortress'),
 | |
|     "Best Friends Forever": AdvData(42007, 'Overworld'),
 | |
|     "Bring Home the Beacon": AdvData(42008, 'Nether Fortress'),
 | |
|     "Not Today, Thank You": AdvData(42009, 'Overworld'),
 | |
|     "Isn't It Iron Pick": AdvData(42010, 'Overworld'),
 | |
|     "Local Brewery": AdvData(42011, 'Nether Fortress'),
 | |
|     "The Next Generation": AdvData(42012, 'The End'),
 | |
|     "Fishy Business": AdvData(42013, 'Overworld'),
 | |
|     "Hot Tourist Destinations": AdvData(42014, 'The Nether'),
 | |
|     "This Boat Has Legs": AdvData(42015, 'The Nether'),
 | |
|     "Sniper Duel": AdvData(42016, 'Overworld'),
 | |
|     "Nether": AdvData(42017, 'The Nether'),
 | |
|     "Great View From Up Here": AdvData(42018, 'End City'),
 | |
|     "How Did We Get Here?": AdvData(42019, 'Nether Fortress'),
 | |
|     "Bullseye": AdvData(42020, 'Overworld'),
 | |
|     "Spooky Scary Skeleton": AdvData(42021, 'Nether Fortress'),
 | |
|     "Two by Two": AdvData(42022, 'The Nether'),
 | |
|     "Stone Age": AdvData(42023, 'Overworld'),
 | |
|     "Two Birds, One Arrow": AdvData(42024, 'Overworld'),
 | |
|     "We Need to Go Deeper": AdvData(42025, 'The Nether'),
 | |
|     "Who's the Pillager Now?": AdvData(42026, 'Pillager Outpost'),
 | |
|     "Getting an Upgrade": AdvData(42027, 'Overworld'),
 | |
|     "Tactical Fishing": AdvData(42028, 'Overworld'),
 | |
|     "Zombie Doctor": AdvData(42029, 'Overworld'),
 | |
|     "The City at the End of the Game": AdvData(42030, 'End City'),
 | |
|     "Ice Bucket Challenge": AdvData(42031, 'Overworld'),
 | |
|     "Remote Getaway": AdvData(42032, 'The End'),
 | |
|     "Into Fire": AdvData(42033, 'Nether Fortress'),
 | |
|     "War Pigs": AdvData(42034, 'Bastion Remnant'),
 | |
|     "Take Aim": AdvData(42035, 'Overworld'),
 | |
|     "Total Beelocation": AdvData(42036, 'Overworld'),
 | |
|     "Arbalistic": AdvData(42037, 'Overworld'),    
 | |
|     "The End... Again...": AdvData(42038, 'The End'),
 | |
|     "Acquire Hardware": AdvData(42039, 'Overworld'),
 | |
|     "Not Quite \"Nine\" Lives": AdvData(42040, 'The Nether'),
 | |
|     "Cover Me With Diamonds": AdvData(42041, 'Overworld'),
 | |
|     "Sky's the Limit": AdvData(42042, 'End City'),
 | |
|     "Hired Help": AdvData(42043, 'Overworld'),
 | |
|     "Return to Sender": AdvData(42044, 'The Nether'),
 | |
|     "Sweet Dreams": AdvData(42045, 'Overworld'),
 | |
|     "You Need a Mint": AdvData(42046, 'The End'),
 | |
|     "Adventure": AdvData(42047, 'Overworld'),
 | |
|     "Monsters Hunted": AdvData(42048, 'Overworld'),
 | |
|     "Enchanter": AdvData(42049, 'Overworld'),
 | |
|     "Voluntary Exile": AdvData(42050, 'Pillager Outpost'),
 | |
|     "Eye Spy": AdvData(42051, 'Overworld'),
 | |
|     "The End": AdvData(42052, 'The End'),
 | |
|     "Serious Dedication": AdvData(42053, 'The Nether'),
 | |
|     "Postmortal": AdvData(42054, 'Village'),
 | |
|     "Monster Hunter": AdvData(42055, 'Overworld'),
 | |
|     "Adventuring Time": AdvData(42056, 'Overworld'),
 | |
|     "A Seedy Place": AdvData(42057, 'Overworld'),
 | |
|     "Those Were the Days": AdvData(42058, 'Bastion Remnant'),
 | |
|     "Hero of the Village": AdvData(42059, 'Village'),
 | |
|     "Hidden in the Depths": AdvData(42060, 'The Nether'),
 | |
|     "Beaconator": AdvData(42061, 'Nether Fortress'),
 | |
|     "Withering Heights": AdvData(42062, 'Nether Fortress'),
 | |
|     "A Balanced Diet": AdvData(42063, 'Village'),
 | |
|     "Subspace Bubble": AdvData(42064, 'The Nether'),
 | |
|     "Husbandry": AdvData(42065, 'Overworld'),
 | |
|     "Country Lode, Take Me Home": AdvData(42066, 'The Nether'),
 | |
|     "Bee Our Guest": AdvData(42067, 'Overworld'),
 | |
|     "What a Deal!": AdvData(42068, 'Village'),
 | |
|     "Uneasy Alliance": AdvData(42069, 'The Nether'),
 | |
|     "Diamonds!": AdvData(42070, 'Overworld'),
 | |
|     "A Terrible Fortress": AdvData(42071, 'Nether Fortress'),
 | |
|     "A Throwaway Joke": AdvData(42072, 'Overworld'),
 | |
|     "Minecraft": AdvData(42073, 'Overworld'),
 | |
|     "Sticky Situation": AdvData(42074, 'Overworld'),
 | |
|     "Ol' Betsy": AdvData(42075, 'Overworld'),
 | |
|     "Cover Me in Debris": AdvData(42076, 'The Nether'),
 | |
|     "The End?": AdvData(42077, 'The End'),
 | |
|     "The Parrots and the Bats": AdvData(42078, 'Overworld'),
 | |
|     "A Complete Catalogue": AdvData(42079, 'Village'), 
 | |
|     "Getting Wood": AdvData(42080, 'Overworld'),
 | |
|     "Time to Mine!": AdvData(42081, 'Overworld'),
 | |
|     "Hot Topic": AdvData(42082, 'Overworld'),
 | |
|     "Bake Bread": AdvData(42083, 'Overworld'),
 | |
|     "The Lie": AdvData(42084, 'Overworld'),
 | |
|     "On a Rail": AdvData(42085, 'Overworld'),
 | |
|     "Time to Strike!": AdvData(42086, 'Overworld'),
 | |
|     "Cow Tipper": AdvData(42087, 'Overworld'),
 | |
|     "When Pigs Fly": AdvData(42088, 'Overworld'),
 | |
|     "Overkill": AdvData(42089, 'Nether Fortress'),
 | |
|     "Librarian": AdvData(42090, 'Overworld'),
 | |
|     "Overpowered": AdvData(42091, 'Overworld'), 
 | |
| 
 | |
|     "Ender Dragon": AdvData(0, 'The End')
 | |
| }
 | |
| 
 | |
| exclusion_table = {
 | |
|     "hard": {
 | |
|         "Very Very Frightening": "50 XP",
 | |
|         "Two by Two": "100 XP",
 | |
|         "Two Birds, One Arrow": "50 XP",
 | |
|         "Arbalistic": "100 XP",
 | |
|         "Beaconator": "50 XP",
 | |
|         "A Balanced Diet": "100 XP",
 | |
|         "Uneasy Alliance": "100 XP",
 | |
|         "Cover Me in Debris": "100 XP",
 | |
|         "A Complete Catalogue": "50 XP", 
 | |
|         "Overpowered": "50 XP"
 | |
|     }, 
 | |
|     "insane": {
 | |
|         "How Did We Get Here?": "500 XP",
 | |
|         "Adventuring Time": "500 XP"
 | |
|     },
 | |
|     "postgame": {
 | |
|         "The Next Generation": "50 XP",
 | |
|         "The End... Again...": "50 XP",
 | |
|         "You Need a Mint": "50 XP", 
 | |
|         "Monsters Hunted": "100 XP"
 | |
|     }
 | |
| }
 | |
| 
 | |
| 
 | |
| events_table = {
 | |
|     "Ender Dragon": "Victory"
 | |
| }
 | |
| 
 | |
| 
 | |
| lookup_id_to_name: typing.Dict[int, str] = {loc_data.id: loc_name for loc_name, loc_data in advancement_table.items() if loc_data.id}
 |