admin/hotdesking
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7-16-25 @ 3:27AM

Browse Source
This commit is contained in:
cojoedmo
2025-07-16 03:27:01 -04:00
parent 7c81e03613
commit c5795028f0
11 changed files with 102 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gameplay/Battle.cs
View File

@@ -85,21 +85,17 @@ public partial class Battle : Node
}
if (BODY == _player._actor._selectedBall)
{
<<<<<<< HEAD
_player._actor._selectedBall._potted = true;
_player._actor._selectedBall._placed = false;
=======
_player._actor._activeBall._potted = true;
_player._actor._activeBall._placed = false;
>>>>>>> 920c5c27fb732c902987b01dcc093e55b1552a9f
}
else
{
Panel pottedPanel = GetNode<Panel>("PottedPanel");
Sprite2D ballSprite = new Sprite2D();
AddChild(ballSprite);
ballSprite.Texture = BODY.GetNode<Sprite2D>("Image").Texture;
_potted.Add(ballSprite);
ballSprite.Position = new Vector2(50 * _potted.Count, 725);
ballSprite.Position = new Vector2(pottedPanel.Position.X + pottedPanel.Size.X / 2, pottedPanel.Position.Y + (50 * _potted.Count));
((Ball)BODY)._placed = false;
((Ball)BODY)._potted = true;
BODY.QueueFree();