From f6c54e07307de27e11c6fb064d439cf8ed1a74b2 Mon Sep 17 00:00:00 2001 From: Conor Edmonds Date: Fri, 26 Jun 2026 16:46:16 -0400 Subject: [PATCH] some formatting - note, i need to still fix attacks not starting / ending in the right spot, since an attack might be initiated from one cell then called while peg is at another cell --- Peg.cs | 8 ++++++-- PegController.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Peg.cs b/Peg.cs index 82795c6..1872c8c 100644 --- a/Peg.cs +++ b/Peg.cs @@ -40,12 +40,16 @@ public partial class Peg : HoverableNode public virtual bool CanAct() { - return _staminaRemaining > 0 && _address.Y <= _action._range && _action._usesRemaining > 0 && _staminaRemaining <= _action._cost; + return _staminaRemaining > 0 + && _address.Y <= _action._range + && _action._usesRemaining > 0 + && _staminaRemaining <= _action._cost; } public virtual bool CanMove() { - return _staminaRemaining > 0 && _address.Y > _pegController._playArea._map._firstOpenRow; + return _staminaRemaining > 0 + && _address.Y > _pegController._playArea._map._firstOpenRow; } public virtual void CounterAct(Commander COMMANDER) diff --git a/PegController.cs b/PegController.cs index 53892ab..042717d 100644 --- a/PegController.cs +++ b/PegController.cs @@ -79,7 +79,7 @@ public partial class PegController : TurnController _pegs.ForEach(e => e._path.Clear()); List remainingPegs = GetRemainingPegs(); - while (remainingPegs.Count > 0 && _actionLoop < 10) + while (remainingPegs.Count > 0) { for (int i = 0; i < remainingPegs.Count; i++) {