Skip to content

Fix issue with FoW and PoW entrances not being reachable #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

Fix issue with FoW and PoW entrances not being reachable #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7558e57
Fix issue with FoW and PoW entrances not being reachable
Catobat Nov 29, 2025
5a813b8
Remove accidental extra shield from item pool
Catobat Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion RandomizerCore/Randomizer/Shuffler/ShufflerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,8 @@ protected IList<Location> GetUnreachableLocations()
{
var itemLocations = Locations.Where(location =>
location.Type is not LocationType.Helper and not LocationType.DungeonConstraint and not LocationType.OverworldConstraint
and not LocationType.Music and not LocationType.Untyped and not LocationType.Inaccessible).ToList();
and not LocationType.Music and not LocationType.Untyped and not LocationType.Inaccessible
&& (!location.Contents.HasValue || location.Contents.Value.Type != ItemType.Entrance)).ToList();
var inaccessibleLocations = itemLocations.Where(location => !location.IsAccessible());
return inaccessibleLocations.ToList();
}
Expand Down
11 changes: 8 additions & 3 deletions RandomizerCore/Resources/default.logic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,10 +1764,12 @@
!define - DUNGEONENTRANCE - :NoSpoiler; Unshuffled
!define - ENTERDWS - Helpers.AccessDeepwood
!define - ENTERCOF - Helpers.AccessCoF
!define - FOW_ENTRANCE_ALT_RULE - Helpers.Hundo
!define - FOW_DUNGEONENTRANCE - :NoSpoiler; Unshuffled
!define - ENTERFOW - Helpers.AccessFortress
!define - ENTERTOD - Helpers.AccessDroplets
!define - ENTERRC - Helpers.AccessCrypt
!define - POW_ENTRANCE_ALT_RULE - Helpers.Hundo
!define - POW_DUNGEONENTRANCE - :NoSpoiler; Unshuffled
!define - ENTERPOW - Helpers.AccessPalace
!define - DHC_MAIN_DUNGEONENTRANCE - :NoSpoiler; Unshuffled
Expand Down Expand Up @@ -2004,8 +2006,10 @@
!endif
!ifdef - RUINS_ACCESS
Items.Entrance.0x03; DungeonEntrance;
!define - FOW_ENTRANCE_ALT_RULE - Helpers.Hundo
!define - FOW_DUNGEONENTRANCE - :DHCValid; DungeonEntrance
!else
!define - FOW_ENTRANCE_ALT_RULE - Helpers.BeatVaati
!ifndef - ELEMENTS_TIED_TO_DUNGEONS
!define - FOW_DUNGEONENTRANCE - :NoSpoiler:NoElement; DungeonEntrance
Items.Entrance.0x03; DungeonEntrance;
Expand Down Expand Up @@ -2036,8 +2040,10 @@
!endif
!ifdef - UWT_ACCESS
Items.Entrance.0x05; DungeonEntrance;
!define - POW_ENTRANCE_ALT_RULE - Helpers.Hundo
!define - POW_DUNGEONENTRANCE - :DHCValid; DungeonEntrance
!else
!define - POW_ENTRANCE_ALT_RULE - Helpers.BeatVaati
!ifndef - ELEMENTS_TIED_TO_DUNGEONS
!define - POW_DUNGEONENTRANCE - :NoSpoiler:NoElement; DungeonEntrance
Items.Entrance.0x05; DungeonEntrance;
Expand Down Expand Up @@ -2594,7 +2600,6 @@
!eventdefine - arbitraryShields
!define - SHIELD - Items.Shield
!define - MIRROR - Items.MirrorShield
Items.Shield; Major;
!ifndef - START_NORMAL_SHIELD
Items.Shield; Major;
!else
Expand Down Expand Up @@ -8614,7 +8619,7 @@ Ruins_NearFoWFusion_Chest `FOW_OUTSIDE`; `GOLDREDFUSION`; 0x0FE0AE;

AccessFortress; Helper; ; Helpers.AccessRuins, Helpers.HasSword;

Fortress_Entrance `FOW_DUNGEONENTRANCE`; DumFoWENT:Define:FirstByte, DumFoWENT2:Define:SecondByte; (|Helpers.AccessFortress, Helpers.BeatVaati); Items.Entrance.0x03
Fortress_Entrance `FOW_DUNGEONENTRANCE`; DumFoWENT:Define:FirstByte, DumFoWENT2:Define:SecondByte; (|Helpers.AccessFortress, `FOW_ENTRANCE_ALT_RULE`); Items.Entrance.0x03

# Royal Valley
AccessValley; Helper; ; (|Helpers.CanSplit3, Helpers.CanSplit4), (|Helpers.OverworldBlocks, Helpers.CapeExtension);
Expand Down Expand Up @@ -8712,7 +8717,7 @@ WindTribe_4F_RightChest `POW_OUTSIDE`; `PALACEOUTSIDECHEST`; 0x30-0x03-0x01;

AccessPalace; Helper; ; Helpers.AccessWindTribe;

Palace_Entrance `POW_DUNGEONENTRANCE`; DumPoWENT:Define:FirstByte, DumPoWENT2:Define:SecondByte; (|Helpers.AccessPalace, Helpers.BeatVaati); Items.Entrance.0x06
Palace_Entrance `POW_DUNGEONENTRANCE`; DumPoWENT:Define:FirstByte, DumPoWENT2:Define:SecondByte; (|Helpers.AccessPalace, `POW_ENTRANCE_ALT_RULE`); Items.Entrance.0x06

# Deepwood locations
Deepwood_2F_Chest `DWS_INSIDE`; Dungeon; 0x48-0x17-0x01; (|(&`ENTERDWS`, Helpers.DeepwoodWeb), Helpers.Hundo); Items.Rupee20
Expand Down