Skip to content
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

Jump to bottom

Fix Menu Close Fidget Logic #45

Merged
merged 2 commits into from
Oct 12, 2024
Merged

Fix Menu Close Fidget Logic #45

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
c53a891
remove cave MenuCloseTypes & only do fidget rands when not holding a …
Lincoln-LM Sep 29, 2024
b0ee239
capitalize comment
Lincoln-LM Sep 29, 2024
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
2 changes: 0 additions & 2 deletions SWSH_OWRNG_Generator.Core/Enums/MenuClose.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ public enum MenuCloseType
{
Regular,
HoldingDirection,
CaveRegular,
CaveHoldingDirection
}
}
16 changes: 4 additions & 12 deletions SWSH_OWRNG_Generator.Core/MenuClose/Generator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,11 @@ public static ref Xoroshiro128Plus Advance(ref Xoroshiro128Plus rng, uint NPCs,
{
rng.NextInt(91);
}
rng.Next();
rng.NextInt(60);
if (Mode == (byte)MenuCloseType.HoldingDirection)
if (Mode != (byte)MenuCloseType.HoldingDirection)
{
rng.NextInt(360);
}
else if (Mode == (byte)MenuCloseType.CaveRegular)
{
// Not implemented
}
else if (Mode == (byte)MenuCloseType.CaveHoldingDirection)
{
// Not implemented
// These rng calls are not correct in all weathers as player fidget logic can change based on weather
rng.Next();
rng.NextInt(60);
}
return ref rng;
}
Expand Down