Skip to content

Starting stray fixes #201

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

Merged
Tacoman369 merged 4 commits into from
Aug 21, 2026
Merged

Starting stray fixes #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
716cd1f
Start With Strays Fix
Tacoman369 Aug 21, 2026
e436231
Update Z3DR
Tacoman369 Aug 21, 2026
4b9c3b1
Second Fix
Tacoman369 Aug 21, 2026
f1fc225
Merge branch 'main' into StartingStrayFixes
Tacoman369 Aug 21, 2026
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
16 changes: 12 additions & 4 deletions source/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,10 +911,18 @@ namespace Settings {
ctx.startingSwampTokens = StartingSwampToken.Value<u8>();
ctx.startingOceanTokens = StartingOceanToken.Value<u8>();
//Stray Fairies
ctx.startingWoodfallStrays = StartingWoodfallStrays.Value<u8>();
ctx.startingSnowheadStrays = StartingSnowheadStrays.Value<u8>();
ctx.startingGreatBayStrays = StartingGreatBayStrays.Value<u8>();
ctx.startingStoneTowerStrays = StartingStoneTowerStrays.Value<u8>();
if (StrayFairysanity.Value<u8>() == 1/*Start With*/) {
ctx.startingWoodfallStrays = 15;
ctx.startingSnowheadStrays = 15;
ctx.startingGreatBayStrays = 15;
ctx.startingStoneTowerStrays = 15;
}
else { /*Do whatever the starting values are*/
ctx.startingWoodfallStrays = StartingWoodfallStrays.Value<u8>();
ctx.startingSnowheadStrays = StartingSnowheadStrays.Value<u8>();
ctx.startingGreatBayStrays = StartingGreatBayStrays.Value<u8>();
ctx.startingStoneTowerStrays = StartingStoneTowerStrays.Value<u8>();
}
//Masks
ctx.startingDekuMask = StartingDekuMask.Value<u8>();
ctx.startingGoronMask = StartingGoronMask.Value<u8>();
Expand Down
10 changes: 6 additions & 4 deletions source/starting_inventory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ void GenerateStartingInventory() {
AddItemToInventory(GBT_STRAY_FAIRY, 15);
AddItemToInventory(ST_STRAY_FAIRY, 15);
}
else {
AddItemToInventory(WF_STRAY_FAIRY, StartingWoodfallStrays.Value<u8>());
AddItemToInventory(SH_STRAY_FAIRY, StartingSnowheadStrays.Value<u8>());
AddItemToInventory(GBT_STRAY_FAIRY, StartingGreatBayStrays.Value<u8>());
AddItemToInventory(ST_STRAY_FAIRY, StartingStoneTowerStrays.Value<u8>());
}

//Starting Inventory Menu
//Values are associated so that the count of items matches the index of
Expand Down Expand Up @@ -113,10 +119,6 @@ void GenerateStartingInventory() {
AddItemToInventory(TWINMOLDS_REMAINS, StartingTwinmoldRemains.Value<u8>());
AddItemToInventory(SWAMP_SKULLTULA_TOKEN, StartingSwampToken.Value<u8>());
AddItemToInventory(OCEANSIDE_SKULLTULA_TOKEN, StartingOceanToken.Value<u8>());
AddItemToInventory(WF_STRAY_FAIRY, StartingWoodfallStrays.Value<u8>());
AddItemToInventory(SH_STRAY_FAIRY, StartingSnowheadStrays.Value<u8>());
AddItemToInventory(GBT_STRAY_FAIRY, StartingGreatBayStrays.Value<u8>());
AddItemToInventory(ST_STRAY_FAIRY, StartingStoneTowerStrays.Value<u8>());

AddItemToInventory(DEKU_MASK, StartingDekuMask.Value<u8>());
AddItemToInventory(GORON_MASK, StartingGoronMask.Value<u8>());
Expand Down