Rename forgotten location
This commit is contained in:
		
							parent
							
								
									17cd963665
								
							
						
					
					
						commit
						24b0c4a132
					
				| 
						 | 
					@ -124,7 +124,7 @@ def fill_dungeons_restrictive(world, shuffled_locations):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dungeon_music_addresses = {'Eastern Palace - Prize': [0x1559A],
 | 
					dungeon_music_addresses = {'Eastern Palace - Prize': [0x1559A],
 | 
				
			||||||
                           'Desert Palace - Prize': [0x1559B, 0x1559C, 0x1559D, 0x1559E],
 | 
					                           'Desert Palace - Prize': [0x1559B, 0x1559C, 0x1559D, 0x1559E],
 | 
				
			||||||
                           'Moldorm - Pendant': [0x155C5, 0x1107A, 0x10B8C],
 | 
					                           'Tower of Hera - Prize': [0x155C5, 0x1107A, 0x10B8C],
 | 
				
			||||||
                           'Palace of Darkness - Prize': [0x155B8],
 | 
					                           'Palace of Darkness - Prize': [0x155B8],
 | 
				
			||||||
                           'Swamp Palace - Prize': [0x155B7],
 | 
					                           'Swamp Palace - Prize': [0x155B7],
 | 
				
			||||||
                           'Thieves Town - Prize': [0x155C6],
 | 
					                           'Thieves Town - Prize': [0x155C6],
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								Main.py
								
								
								
								
							
							
						
						
									
										2
									
								
								Main.py
								
								
								
								
							| 
						 | 
					@ -193,7 +193,7 @@ def generate_itempool(world):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # distribute crystals
 | 
					    # distribute crystals
 | 
				
			||||||
    crystals = ItemFactory(['Red Pendant', 'Blue Pendant', 'Green Pendant', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 7', 'Crystal 5', 'Crystal 6'])
 | 
					    crystals = ItemFactory(['Red Pendant', 'Blue Pendant', 'Green Pendant', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 7', 'Crystal 5', 'Crystal 6'])
 | 
				
			||||||
    crystal_locations = [world.get_location('Turtle Rock - Prize'), world.get_location('Eastern Palace - Prize'), world.get_location('Desert Palace - Prize'), world.get_location('Moldorm - Pendant'), world.get_location('Palace of Darkness - Prize'),
 | 
					    crystal_locations = [world.get_location('Turtle Rock - Prize'), world.get_location('Eastern Palace - Prize'), world.get_location('Desert Palace - Prize'), world.get_location('Tower of Hera - Prize'), world.get_location('Palace of Darkness - Prize'),
 | 
				
			||||||
                         world.get_location('Thieves Town - Prize'), world.get_location('Skull Woods - Prize'), world.get_location('Swamp Palace - Prize'), world.get_location('Ice Palace - Prize'),
 | 
					                         world.get_location('Thieves Town - Prize'), world.get_location('Skull Woods - Prize'), world.get_location('Swamp Palace - Prize'), world.get_location('Ice Palace - Prize'),
 | 
				
			||||||
                         world.get_location('Misery Mire - Prize')]
 | 
					                         world.get_location('Misery Mire - Prize')]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -109,7 +109,7 @@ Tower of Hera - Big Key Chest: Big Key (Tower of Hera)
 | 
				
			||||||
Tower of Hera - Compass Chest: Nothing
 | 
					Tower of Hera - Compass Chest: Nothing
 | 
				
			||||||
Tower of Hera - Big Chest: Moon Pearl
 | 
					Tower of Hera - Big Chest: Moon Pearl
 | 
				
			||||||
Moldorm - Heart Container: Nothing
 | 
					Moldorm - Heart Container: Nothing
 | 
				
			||||||
Moldorm - Pendant: Red Pendant
 | 
					Tower of Hera - Prize: Red Pendant
 | 
				
			||||||
Pyramid: Nothing
 | 
					Pyramid: Nothing
 | 
				
			||||||
Catfish: Quake
 | 
					Catfish: Quake
 | 
				
			||||||
Stumpy: Shovel
 | 
					Stumpy: Shovel
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -129,7 +129,7 @@ def create_regions(world):
 | 
				
			||||||
        create_region('Spectacle Rock', ['Spectacle Rock'], ['Spectacle Rock Drop']),
 | 
					        create_region('Spectacle Rock', ['Spectacle Rock'], ['Spectacle Rock Drop']),
 | 
				
			||||||
        create_region('Tower of Hera (Bottom)', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
 | 
					        create_region('Tower of Hera (Bottom)', ['Tower of Hera - Basement Cage', 'Tower of Hera - Map Chest'], ['Tower of Hera Small Key Door', 'Tower of Hera Big Key Door', 'Tower of Hera Exit']),
 | 
				
			||||||
        create_region('Tower of Hera (Basement)', ['Tower of Hera - Big Key Chest']),
 | 
					        create_region('Tower of Hera (Basement)', ['Tower of Hera - Big Key Chest']),
 | 
				
			||||||
        create_region('Tower of Hera (Top)', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Moldorm - Heart Container', 'Moldorm - Pendant']),
 | 
					        create_region('Tower of Hera (Top)', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Moldorm - Heart Container', 'Tower of Hera - Prize']),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        create_region('East Dark World', ['Pyramid', 'Catfish'], ['Pyramid Fairy', 'South Dark World Bridge', 'West Dark World Gap', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 'Dark Lake Hylia Teleporter',
 | 
					        create_region('East Dark World', ['Pyramid', 'Catfish'], ['Pyramid Fairy', 'South Dark World Bridge', 'West Dark World Gap', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 'Dark Lake Hylia Teleporter',
 | 
				
			||||||
                                                                                   'Hyrule Castle Ledge Mirror Spot', 'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint', 'Dark World Potion Shop', 'Pyramid Hole']),
 | 
					                                                                                   'Hyrule Castle Ledge Mirror Spot', 'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint', 'Dark World Potion Shop', 'Pyramid Hole']),
 | 
				
			||||||
| 
						 | 
					@ -502,7 +502,7 @@ location_table = {'Mushroom': (0x180013, False, 'in the woods'),
 | 
				
			||||||
                  'Agahnim 2': (None, False, 'from my wizardry form'),
 | 
					                  'Agahnim 2': (None, False, 'from my wizardry form'),
 | 
				
			||||||
                  'Eastern Palace - Prize': ([0x1209D, 0x53EF8, 0x53EF9, 0x180052, 0x18007C, 0xC6FE], True, 'Eastern Palace'),
 | 
					                  'Eastern Palace - Prize': ([0x1209D, 0x53EF8, 0x53EF9, 0x180052, 0x18007C, 0xC6FE], True, 'Eastern Palace'),
 | 
				
			||||||
                  'Desert Palace - Prize': ([0x1209E, 0x53F1C, 0x53F1D, 0x180053, 0x180078, 0xC6FF], True, 'Desert Palace'),
 | 
					                  'Desert Palace - Prize': ([0x1209E, 0x53F1C, 0x53F1D, 0x180053, 0x180078, 0xC6FF], True, 'Desert Palace'),
 | 
				
			||||||
                  'Moldorm - Pendant': ([0x120A5, 0x53F0A, 0x53F0B, 0x18005A, 0x18007A, 0xC706], True, 'Tower of Hera'),
 | 
					                  'Tower of Hera - Prize': ([0x120A5, 0x53F0A, 0x53F0B, 0x18005A, 0x18007A, 0xC706], True, 'Tower of Hera'),
 | 
				
			||||||
                  'Palace of Darkness - Prize': ([0x120A1, 0x53F00, 0x53F01, 0x180056, 0x18007D, 0xC702], True, 'Palace of Darkness'),
 | 
					                  'Palace of Darkness - Prize': ([0x120A1, 0x53F00, 0x53F01, 0x180056, 0x18007D, 0xC702], True, 'Palace of Darkness'),
 | 
				
			||||||
                  'Swamp Palace - Prize': ([0x120A0, 0x53F6C, 0x53F6D, 0x180055, 0x180071, 0xC701], True, 'Swamp Palace'),
 | 
					                  'Swamp Palace - Prize': ([0x120A0, 0x53F6C, 0x53F6D, 0x180055, 0x180071, 0xC701], True, 'Swamp Palace'),
 | 
				
			||||||
                  'Thieves Town - Prize': ([0x120A6, 0x53F36, 0x53F37, 0x18005B, 0x180077, 0xC707], True, 'Thieves\' Town'),
 | 
					                  'Thieves Town - Prize': ([0x120A6, 0x53F36, 0x53F37, 0x18005B, 0x180077, 0xC707], True, 'Thieves\' Town'),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								Rules.py
								
								
								
								
							
							
						
						
									
										2
									
								
								Rules.py
								
								
								
								
							| 
						 | 
					@ -213,7 +213,7 @@ def global_rules(world):
 | 
				
			||||||
    set_rule(world.get_location('Tower of Hera - Big Chest'), lambda state: state.has('Big Key (Tower of Hera)'))
 | 
					    set_rule(world.get_location('Tower of Hera - Big Chest'), lambda state: state.has('Big Key (Tower of Hera)'))
 | 
				
			||||||
    set_rule(world.get_location('Tower of Hera - Big Key Chest'), lambda state: state.has_fire_source())
 | 
					    set_rule(world.get_location('Tower of Hera - Big Key Chest'), lambda state: state.has_fire_source())
 | 
				
			||||||
    set_rule(world.get_location('Moldorm - Heart Container'), lambda state: state.has_blunt_weapon())
 | 
					    set_rule(world.get_location('Moldorm - Heart Container'), lambda state: state.has_blunt_weapon())
 | 
				
			||||||
    set_rule(world.get_location('Moldorm - Pendant'), lambda state: state.has_blunt_weapon())
 | 
					    set_rule(world.get_location('Tower of Hera - Prize'), lambda state: state.has_blunt_weapon())
 | 
				
			||||||
    for location in ['Moldorm - Heart Container', 'Tower of Hera - Big Chest', 'Tower of Hera - Compass Chest']:
 | 
					    for location in ['Moldorm - Heart Container', 'Tower of Hera - Big Chest', 'Tower of Hera - Compass Chest']:
 | 
				
			||||||
        forbid_item(world.get_location(location), 'Big Key (Tower of Hera)')
 | 
					        forbid_item(world.get_location(location), 'Big Key (Tower of Hera)')
 | 
				
			||||||
    for location in ['Tower of Hera - Big Key Chest']:
 | 
					    for location in ['Tower of Hera - Big Key Chest']:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue