Skip to content

Commit 7a004de

Browse files
authored
LttP: remove glitch triforce setting (#3174)
1 parent 8021ec7 commit 7a004de

File tree

5 files changed

+1
-5
lines changed

5 files changed

+1
-5
lines changed

BaseClasses.py

-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ def __init__(self, players: int):
133133
self.random = ThreadBarrierProxy(random.Random())
134134
self.players = players
135135
self.player_types = {player: NetUtils.SlotType.player for player in self.player_ids}
136-
self.glitch_triforce = False
137136
self.algorithm = 'balanced'
138137
self.groups = {}
139138
self.regions = self.RegionManager(players)

Generate.py

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ def main(args=None, callback=ERmain):
147147
erargs = parse_arguments(['--multi', str(args.multi)])
148148
erargs.seed = seed
149149
erargs.plando_options = args.plando
150-
erargs.glitch_triforce = options.generator.glitch_triforce_room
151150
erargs.spoiler = args.spoiler
152151
erargs.race = args.race
153152
erargs.outputname = seed_name

Main.py

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
4343
multiworld.player_name = args.name.copy()
4444
multiworld.sprite = args.sprite.copy()
4545
multiworld.sprite_pool = args.sprite_pool.copy()
46-
multiworld.glitch_triforce = args.glitch_triforce # This is enabled/disabled globally, no per player option.
4746

4847
multiworld.set_options(args)
4948
multiworld.set_item_links()

settings.py

-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ class Race(IntEnum):
671671
weights_file_path: WeightsFilePath = WeightsFilePath("weights.yaml")
672672
meta_file_path: MetaFilePath = MetaFilePath("meta.yaml")
673673
spoiler: Spoiler = Spoiler(3)
674-
glitch_triforce_room: GlitchTriforceRoom = GlitchTriforceRoom(1) # why is this here?
675674
race: Race = Race(0)
676675
plando_options: PlandoOptions = PlandoOptions("bosses, connections, texts")
677676

worlds/alttp/Rom.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ def get_reveal_bytes(itemName):
16161616
rom.write_byte(0xEFD95, digging_game_rng)
16171617
rom.write_byte(0x1800A3, 0x01) # enable correct world setting behaviour after agahnim kills
16181618
rom.write_byte(0x1800A4, 0x01 if world.glitches_required[player] != 'no_logic' else 0x00) # enable POD EG fix
1619-
rom.write_byte(0x186383, 0x01 if world.glitch_triforce or world.glitches_required[
1619+
rom.write_byte(0x186383, 0x01 if world.glitches_required[
16201620
player] == 'no_logic' else 0x00) # disable glitching to Triforce from Ganons Room
16211621
rom.write_byte(0x180042, 0x01 if world.save_and_quit_from_boss else 0x00) # Allow Save and Quit after boss kill
16221622

0 commit comments

Comments
 (0)