7-29-25 @ 2:57am

This commit is contained in:
2025-07-29 02:57:11 -04:00
parent 41b5c34e70
commit 0638fc52ec
17 changed files with 314 additions and 347 deletions

View File

@@ -8,41 +8,43 @@ public partial class Battle : Node
public bool _current;
public Vector2 _startPosition = new Vector2(890, 340);
public Manager _player;
public Manager _computer;
public Manager _turn;
public List<Sprite2D> _potted = new();
public List<Ball> _balls = new();
public Table _table;
public static Battle _Create()
{
PackedScene scene = ResourceLoader.Load<PackedScene>("res://Gameplay/battle.tscn");
Battle newBattle = scene.Instantiate<Battle>();
// public static Battle _Create()
// {
// PackedScene scene = ResourceLoader.Load<PackedScene>("res://Gameplay/battle.tscn");
// Battle newBattle = scene.Instantiate<Battle>();
Manager newManager = Manager._Create();
newBattle._player = newManager;
newBattle.AddChild(newManager);
// Manager newPlayerManager = Manager._Create();
// newBattle._player = newPlayerManager;
// newBattle.AddChild(newPlayerManager);
Table newTable = Table._Create();
newTable.Position = Globals.Instance._screenCenter;
newBattle._table = newTable;
// Manager newComputerManager = Manager._Create();
// newBattle._player = newComputerManager;
// newBattle.AddChild(newComputerManager);
List<Area2D> pockets = newBattle._table.GetChildren()
.Where(n => n.GetName().ToString().ToLower().Contains("pocket"))
.Select(n => (Area2D)n)
.ToList<Area2D>();
for (int i = 0; i < pockets.Count; i++)
{
pockets[i].BodyEntered += newBattle.PotBall;
}
newBattle.AddChild(newTable);
return newBattle;
}
// Table newTable = Table._Create();
// newTable.Position = Globals.Instance._screenCenter;
// newBattle._table = newTable;
// List<Area2D> pockets = newBattle._table.GetChildren()
// .Where(n => n.GetName().ToString().ToLower().Contains("pocket"))
// .Select(n => (Area2D)n)
// .ToList<Area2D>();
// for (int i = 0; i < pockets.Count; i++)
// {
// pockets[i].BodyEntered += newBattle.PotBall;
// }
// newBattle.AddChild(newTable);
// return newBattle;
// }
public override void _Ready()
{
Start();
}
public override void _Process(double DELTA_)
@@ -100,31 +102,31 @@ public partial class Battle : Node
}
}
public void PotBall(Node2D BODY)
{
if (BODY is Ball)
{
Ball ball = (Ball)BODY;
if (ball.GetParentOrNull<Manager>() == _player)
{
_player.PotWorker(ball.GetParent<Worker>());
}
else
{
ball.Pot();
_balls.Remove(ball);
RemoveChild(ball);
ball.QueueFree();
}
}
}
// public void PotBall(Node2D BODY)
// {
// if (BODY is Ball)
// {
// Ball ball = (Ball)BODY;
// if (ball.GetParentOrNull<Manager>() == _player)
// {
// // _player.PotWorker(ball.GetParent<Worker>());
// }
// else
// {
// ball.Pot();
// _balls.Remove(ball);
// RemoveChild(ball);
// ball.QueueFree();
// }
// }
// }
public void Start()
{
_current = true;
GenerateBalls();
Globals.Instance._currentBattle = this;
_player.Start();
// _current = true;
// // GenerateBalls();
// Globals.Instance._currentBattle = this;
// _player.Start();
}
}