Skip to content

PoP 2008: Polish 2 #21

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
GMPranav merged 4 commits into from
Apr 14, 2025
Merged

PoP 2008: Polish 2 #21

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
508db49
Fix typo in a comment
saulm314 Apr 9, 2025
5326cfe
Increase seed get range from 3 to 5
saulm314 Apr 13, 2025
9467285
Remove "08" suffix from Reservoir split
saulm314 Apr 13, 2025
b08ea1a
Fix Collapsing Bridge false splits
saulm314 Apr 13, 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
8 changes: 4 additions & 4 deletions pop_2008.asl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ startup
"Collapsing Bridge",
"specialEvents",
"",
new Func<bool>(() => vars.inPosWithRangeCurrent(-310.25f, -241f, -30f, 2))
new Func<bool>(() => vars.inPosWithRangeCurrent(-310.25f, -241.0f, -30.2f, 0.2f))
)},
{"PreDad1", Tuple.Create(
"Tree of Life",
Expand Down Expand Up @@ -313,7 +313,7 @@ startup
"",
new Func<bool>(() => vars.splitSeed(-88.5f, 538.5f, 44.5f))
)},
{"Reservoir08", Tuple.Create(
{"Reservoir", Tuple.Create(
"Reservoir",
"anyStandard",
"",
Expand Down Expand Up @@ -526,7 +526,7 @@ init
// Checks if x,y,z co-ordinates are in a certain range and if a seed has just been picked
vars.splitSeed = (Func<float, float, float, bool>)((xTarg, yTarg, zTarg) => {
return
vars.inPosWithRangeCurrent(xTarg, yTarg, zTarg, 3) &&
vars.inPosWithRangeCurrent(xTarg, yTarg, zTarg, 5) &&
vars.seedGet;
});

Expand Down Expand Up @@ -569,7 +569,7 @@ init
!vars.inPosWithRangeCurrent(args.Item1, args.Item2, args.Item3, args.Item4);
});

// Checks if spawned in Canyon after new game[]
// Checks if spawned in Canyon after new game
vars.resetNew = (Func<IDictionary<string, object>, bool>)((_old) => {
return
!vars.inPosWithRangeOld(args.Item1, args.Item2, args.Item3, args.Item4, _old) &&
Expand Down
Loading