Skip to content

Recombining circles doesn't work #3234

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Recombining circles doesn't work #3234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8518018
Fixed NaN issue with server-csharp with gravity recombine
JasonAtClockwork Sep 8, 2025
d2cf620
Merge branch 'master' into jlarabie/blackholio-recombine
JasonAtClockwork Sep 8, 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
6 changes: 4 additions & 2 deletions demo/Blackholio/server-csharp/Lib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public static void MoveAllPlayers(ReducerContext ctx, MoveAllPlayersTimer timer)
var gravity_multiplier =
1f - time_before_recombining / SPLIT_GRAV_PULL_BEFORE_RECOMBINE_SEC;
var vec = diff.Normalized
* MathF.Sqrt(radius_sum - distance_sqr)
* (radius_sum - MathF.Sqrt(distance_sqr))
* gravity_multiplier
* 0.05f
/ count;
Expand Down Expand Up @@ -483,9 +483,11 @@ public static void PlayerSplit(ReducerContext ctx)
}
}

var duration = new TimeDuration { Microseconds = (long)(SPLIT_RECOMBINE_DELAY_SEC * 1_000_000) };
var trigger_at = ctx.Timestamp + duration;
ctx.Db.circle_recombine_timer.Insert(new CircleRecombineTimer
{
scheduled_at = new ScheduleAt.Time(DateTimeOffset.Now.Add(TimeSpan.FromSeconds(SPLIT_RECOMBINE_DELAY_SEC))),
scheduled_at = new ScheduleAt.Time(trigger_at),
player_id = player.player_id,
});

Expand Down
Loading