7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04am7-15-25@3:04amMerge branch 'main' of https://git.cojoedmo.com/admin/hotdesking

Gameplay/Actor.cs

@@ -45,6 +45,7 @@ public partial class Actor : Node
 	{
 		if (_ballBag.Count > 0)
 		{
+<<<<<<< HEAD
 			if (_heldBall == null)
 			{
 				_heldBall = _ballBag[0];
@@ -78,6 +79,15 @@ public partial class Actor : Node
 				{
 					_heldBall = _ballBag[ballIndex - (ballIndex > _ballBag.Count ? 1 : 0)];
 				}
+=======
+			_activeCue.HideCue();
+			Vector2 mousePosition = GetViewport().GetMousePosition();
+			GetNode<Marker2D>("StartPosition").Position = mousePosition;
+			if (Input.IsActionJustReleased("left_click"))
+			{
+				_activeBall.Place(GetNode<Marker2D>("StartPosition").Position);
+				GD.Print(_activeBall.Position);
+>>>>>>> 920c5c27fb732c902987b01dcc093e55b1552a9f
 			}
 		}
 		else

Gameplay/Ball.cs

@@ -46,6 +46,7 @@ public partial class Ball : RigidBody2D
 		}
 		else if (LinearVelocity.Length() >= _moveThreshold)
 		{
+			GD.Print(Position);
 			if (!_moving)
 			{
 				_moving = true;

Gameplay/Battle.cs

@@ -85,8 +85,13 @@ 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
 		{

Gameplay/actor.tscn

@@ -4,3 +4,5 @@
 
 [node name="Actor" type="Node"]
 script = ExtResource("1_hr3hk")
+
+[node name="StartPosition" type="Marker2D" parent="."]