Skip to content

Commit 75dbded

Browse files
committed
Add west town magic container requirement checks to logic
1 parent 00867e0 commit 75dbded

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

RandomizerCore/Overworld/WestHyrule.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,29 @@ .. rom.LoadLocations(RomMap.WEST_TOWN_RUTO_TILE_LOCATION, 8, terrains, Continent
133133
//Towns
134134
locationAtRauru = GetLocationByMem(RomMap.WEST_TOWN_RAURO_TILE_LOCATION);
135135
locationAtRauru.Collectables = [Collectable.SHIELD_SPELL];
136+
locationAtRauru.CollectableRequirements = props.DisableMagicRecs ? Requirements.NONE : new Requirements([RequirementType.ONE_CONTAINER]);
136137

137138
locationAtRuto = GetLocationByMem(RomMap.WEST_TOWN_RUTO_TILE_LOCATION); //0x465e
138139
locationAtRuto.Collectables = [Collectable.JUMP_SPELL];
139-
locationAtRuto.CollectableRequirements = new Requirements([RequirementType.TROPHY]);
140+
locationAtRuto.CollectableRequirements = props.DisableMagicRecs ?
141+
new Requirements([RequirementType.TROPHY])
142+
: new Requirements([], [[RequirementType.TROPHY, RequirementType.TWO_CONTAINERS]]);
140143

141144
locationAtSariaNorth = GetLocationByMem(RomMap.WEST_TOWN_SARIA_NORTH_TILE_LOCATION); //0x00004660
142145
locationAtSariaNorth.Collectables = [Collectable.LIFE_SPELL];
143146
locationAtSariaNorth.ConnectionRequirements = new Requirements([RequirementType.FAIRY, RequirementType.BAGU_LETTER], [[RequirementType.JUMP, RequirementType.DASH]]);
144-
locationAtSariaNorth.CollectableRequirements = new Requirements([RequirementType.MIRROR]);
147+
locationAtSariaNorth.CollectableRequirements = props.DisableMagicRecs ?
148+
new Requirements([RequirementType.MIRROR])
149+
: new Requirements([], [[RequirementType.MIRROR, RequirementType.THREE_CONTAINERS]]);
145150

146151
locationAtSariaSouth = GetLocationByMem(RomMap.WEST_TOWN_SARIA_SOUTH_TILE_LOCATION); //0x0000465f
147152
locationAtSariaSouth.ConnectionRequirements = locationAtSariaNorth.ConnectionRequirements;
148153

149154
locationAtMido = GetLocationByMem(RomMap.WEST_TOWN_MIDO_TILE_LOCATION); //0x00004662
150155
locationAtMido.Collectables = [Collectable.FAIRY_SPELL];
151-
locationAtMido.CollectableRequirements = new Requirements([RequirementType.MEDICINE]);
156+
locationAtMido.CollectableRequirements = props.DisableMagicRecs ?
157+
new Requirements([RequirementType.MEDICINE])
158+
: new Requirements([], [[RequirementType.MEDICINE, RequirementType.FOUR_CONTAINERS]]);
152159

153160
//Palaces
154161
locationAtPalace1 = GetLocationByMem(RomMap.WEST_PALACE1_TILE_LOCATION);

0 commit comments

Comments
 (0)