Skip to content

Pocket games update 20251101 #42

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
merged 2 commits into from
Nov 1, 2025
Merged

Pocket games update 20251101 #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
451f4c7
9Ball をテーブルに戻す場合に、別のボールがあると隙間ができる
Oct 31, 2025
3ee454f
10Ballをフットスポットに戻す場合に位置がずれる
Nov 1, 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
47 changes: 37 additions & 10 deletions Modules/BilliardsModule/UdonScripts/BilliardsModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,7 @@ public void _TriggerSimulationEnded(bool forceScratch, bool forceRun = false)
otherPocketedLocal = otherPocketedLocal & ~(0x2U);
#endif
ballsP[1] = initialPositions[1][1]; //初始点
moveBallInDirUntilNotTouching(1, Vector3.right * .051f);
moveBallXUntilNotTouching(1);
}
if (is8Sink && colorTurnLocal) BreakFinish = true;
else BreakFinish = false;
Expand Down Expand Up @@ -2928,12 +2928,6 @@ public void _TriggerSimulationEnded(bool forceScratch, bool forceRun = false)
isOpponentSink = false;
}

if (is8Sink && (pushOut || (isOnBreakShot && !winCondition && deferLossCondition)))
{
moveBallInDirUntilNotTouching(9, Vector3.right * .051f);
deferLossCondition = false;
}

if (isOnBreakShot && isAnyPocketSink)
{
isObjectiveSink = true;
Expand Down Expand Up @@ -3087,9 +3081,9 @@ public void _TriggerSimulationEnded(bool forceScratch, bool forceRun = false)
targetPocketedLocal = targetPocketedLocal & ~(gameBallMask);
otherPocketedLocal = otherPocketedLocal & ~(gameBallMask);
#endif
ballsP[gameBallId] = initialPositions[gameModeLocal][gameBallId];
ballsP[gameBallId] = initialPositions[gameModeLocal][is9Ball ? gameBallId : 2];
//keep moving ball down the table until it's not touching any other balls
moveBallInDirUntilNotTouching(gameBallId, Vector3.right * .051f);
moveBallXUntilNotTouching(gameBallId);
}
#else
// Win condition: Pocket 9 ball ( and do not foul )
Expand All @@ -3103,7 +3097,7 @@ public void _TriggerSimulationEnded(bool forceScratch, bool forceRun = false)
ballsPocketedLocal = ballsPocketedLocal & ~(0x200u);
ballsP[9] = initialPositions[1][9];
//keep moving ball down the table until it's not touching any other balls
moveBallInDirUntilNotTouching(9, Vector3.right * .051f);
moveBallXUntilNotTouching(9);
}
#endif
#if EIJIS_CALLSHOT
Expand Down Expand Up @@ -3663,6 +3657,39 @@ private void moveBallInDirUntilNotTouching(int Ball, Vector3 Dir)
ballsP[Ball] += Dir;
}
}
private void moveBallXUntilNotTouching(int Ball)
{
float ballDiameter = k_BALL_RADIUS * 2f;
float k_BALL_DSQR = ballDiameter * ballDiameter;
float threshold = 0.0001f;
int adjustCount = 0;

//keep moving ball down the table until it's not touching any other balls
int touchingBall = -1;
int prevTouchingBall = -1;
while ((touchingBall = CheckIfBallTouchingBall(Ball)) > -1)
{
if (prevTouchingBall == touchingBall)
{
adjustCount++;
}
else
{
adjustCount = 0;
}

float distanceZ_DSQR = ballsP[touchingBall].z * ballsP[touchingBall].z;
float adjustX = Mathf.Sqrt(k_BALL_DSQR - distanceZ_DSQR);
ballsP[Ball] = new Vector3
(
ballsP[touchingBall].x + adjustX + (threshold * adjustCount),
ballsP[Ball].y,
ballsP[Ball].z
);

prevTouchingBall = touchingBall;
}
}
private int CheckIfBallTouchingBall(int Input)
{
float ballDiameter = k_BALL_RADIUS * 2f;
Expand Down