Skip to content

Commit 9732059

Browse files
Berserker66qwint
authored andcommitted
LttP/Core: more ripping and tearing (ArchipelagoMW#3160)
1 parent 31174be commit 9732059

19 files changed

+385
-666
lines changed

BaseClasses.py

+1-44
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ def __getattr__(self, name: str) -> Any:
5151
class MultiWorld():
5252
debug_types = False
5353
player_name: Dict[int, str]
54-
difficulty_requirements: dict
55-
required_medallions: dict
56-
dark_room_logic: Dict[int, str]
57-
restrict_dungeon_item_on_boss: Dict[int, bool]
5854
plando_texts: List[Dict[str, str]]
5955
plando_items: List[List[Dict[str, Any]]]
6056
plando_connections: List
@@ -164,49 +160,10 @@ def __init__(self, players: int):
164160
for player in range(1, players + 1):
165161
def set_player_attr(attr, val):
166162
self.__dict__.setdefault(attr, {})[player] = val
167-
168-
set_player_attr('shuffle', "vanilla")
169-
set_player_attr('logic', "noglitches")
170-
set_player_attr('mode', 'open')
171-
set_player_attr('difficulty', 'normal')
172-
set_player_attr('item_functionality', 'normal')
173-
set_player_attr('timer', False)
174-
set_player_attr('goal', 'ganon')
175-
set_player_attr('required_medallions', ['Ether', 'Quake'])
176-
set_player_attr('swamp_patch_required', False)
177-
set_player_attr('powder_patch_required', False)
178-
set_player_attr('ganon_at_pyramid', True)
179-
set_player_attr('ganonstower_vanilla', True)
180-
set_player_attr('can_access_trock_eyebridge', None)
181-
set_player_attr('can_access_trock_front', None)
182-
set_player_attr('can_access_trock_big_chest', None)
183-
set_player_attr('can_access_trock_middle', None)
184-
set_player_attr('fix_fake_world', True)
185-
set_player_attr('difficulty_requirements', None)
186-
set_player_attr('boss_shuffle', 'none')
187-
set_player_attr('enemy_health', 'default')
188-
set_player_attr('enemy_damage', 'default')
189-
set_player_attr('beemizer_total_chance', 0)
190-
set_player_attr('beemizer_trap_chance', 0)
191-
set_player_attr('escape_assist', [])
192-
set_player_attr('treasure_hunt_icon', 'Triforce Piece')
193-
set_player_attr('treasure_hunt_count', 0)
194-
set_player_attr('clock_mode', False)
195-
set_player_attr('countdown_start_time', 10)
196-
set_player_attr('red_clock_time', -2)
197-
set_player_attr('blue_clock_time', 2)
198-
set_player_attr('green_clock_time', 4)
199-
set_player_attr('can_take_damage', True)
200-
set_player_attr('triforce_pieces_available', 30)
201-
set_player_attr('triforce_pieces_required', 20)
202-
set_player_attr('shop_shuffle', 'off')
203-
set_player_attr('shuffle_prizes', "g")
204-
set_player_attr('sprite_pool', [])
205-
set_player_attr('dark_room_logic', "lamp")
206163
set_player_attr('plando_items', [])
207164
set_player_attr('plando_texts', {})
208165
set_player_attr('plando_connections', [])
209-
set_player_attr('game', "A Link to the Past")
166+
set_player_attr('game', "Archipelago")
210167
set_player_attr('completion_condition', lambda state: True)
211168
self.worlds = {}
212169
self.per_slot_randoms = Utils.DeprecateDict("Using per_slot_randoms is now deprecated. Please use the "

Main.py

+1-25
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,13 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
3636
logger = logging.getLogger()
3737
multiworld.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
3838
multiworld.plando_options = args.plando_options
39-
40-
multiworld.shuffle = args.shuffle.copy()
41-
multiworld.logic = args.logic.copy()
42-
multiworld.mode = args.mode.copy()
43-
multiworld.difficulty = args.difficulty.copy()
44-
multiworld.item_functionality = args.item_functionality.copy()
45-
multiworld.timer = args.timer.copy()
46-
multiworld.goal = args.goal.copy()
47-
multiworld.boss_shuffle = args.shufflebosses.copy()
48-
multiworld.enemy_health = args.enemy_health.copy()
49-
multiworld.enemy_damage = args.enemy_damage.copy()
50-
multiworld.beemizer_total_chance = args.beemizer_total_chance.copy()
51-
multiworld.beemizer_trap_chance = args.beemizer_trap_chance.copy()
52-
multiworld.countdown_start_time = args.countdown_start_time.copy()
53-
multiworld.red_clock_time = args.red_clock_time.copy()
54-
multiworld.blue_clock_time = args.blue_clock_time.copy()
55-
multiworld.green_clock_time = args.green_clock_time.copy()
56-
multiworld.dungeon_counters = args.dungeon_counters.copy()
57-
multiworld.triforce_pieces_available = args.triforce_pieces_available.copy()
58-
multiworld.triforce_pieces_required = args.triforce_pieces_required.copy()
59-
multiworld.shop_shuffle = args.shop_shuffle.copy()
60-
multiworld.shuffle_prizes = args.shuffle_prizes.copy()
61-
multiworld.sprite_pool = args.sprite_pool.copy()
62-
multiworld.dark_room_logic = args.dark_room_logic.copy()
6339
multiworld.plando_items = args.plando_items.copy()
6440
multiworld.plando_texts = args.plando_texts.copy()
6541
multiworld.plando_connections = args.plando_connections.copy()
66-
multiworld.required_medallions = args.required_medallions.copy()
6742
multiworld.game = args.game.copy()
6843
multiworld.player_name = args.name.copy()
6944
multiworld.sprite = args.sprite.copy()
45+
multiworld.sprite_pool = args.sprite_pool.copy()
7046
multiworld.glitch_triforce = args.glitch_triforce # This is enabled/disabled globally, no per player option.
7147

7248
multiworld.set_options(args)

0 commit comments

Comments
 (0)