diff --git a/MultiversalDiplomacy/Adjudicate/Decision/AttackStrength.cs b/MultiversalDiplomacy/Adjudicate/Decision/AttackStrength.cs index ca9dc9d..5a74d2b 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/AttackStrength.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/AttackStrength.cs @@ -8,6 +8,9 @@ public class AttackStrength : NumericAdjudicationDecision public List Supports { get; } public MoveOrder? OpposingMove { get; } + public override string ToString() + => $"AttackStrength({Order})"; + public AttackStrength(MoveOrder order, IEnumerable supports, MoveOrder? opposingMove = null) { this.Order = order; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/BinaryAdjudicationDecision.cs b/MultiversalDiplomacy/Adjudicate/Decision/BinaryAdjudicationDecision.cs index 476a04d..65e6084 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/BinaryAdjudicationDecision.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/BinaryAdjudicationDecision.cs @@ -6,11 +6,6 @@ public abstract class BinaryAdjudicationDecision : AdjudicationDecision public override bool Resolved => this.Outcome != null; - public override string ToString() - { - return $"{this.GetType().Name}={this.Outcome}"; - } - public bool Update(bool outcome) { if (this.Outcome == null) diff --git a/MultiversalDiplomacy/Adjudicate/Decision/DefendStrength.cs b/MultiversalDiplomacy/Adjudicate/Decision/DefendStrength.cs index b51532f..1cd0fa7 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/DefendStrength.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/DefendStrength.cs @@ -7,6 +7,9 @@ public class DefendStrength : NumericAdjudicationDecision public MoveOrder Order { get; } public List Supports { get; } + public override string ToString() + => $"DefendStrength({Order})"; + public DefendStrength(MoveOrder order, IEnumerable supports) { this.Order = order; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/DoesMove.cs b/MultiversalDiplomacy/Adjudicate/Decision/DoesMove.cs index c093871..6100897 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/DoesMove.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/DoesMove.cs @@ -8,6 +8,9 @@ public class DoesMove : BinaryAdjudicationDecision public MoveOrder? OpposingMove { get; } public List Competing { get; } + public override string ToString() + => $"DoesMove({Order})"; + public DoesMove(MoveOrder order, MoveOrder? opposingMove, IEnumerable competing) { this.Order = order; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/GivesSupport.cs b/MultiversalDiplomacy/Adjudicate/Decision/GivesSupport.cs index d0095f5..3d8a2bd 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/GivesSupport.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/GivesSupport.cs @@ -7,6 +7,9 @@ public class GivesSupport : BinaryAdjudicationDecision public SupportOrder Order { get; } public List Cuts { get; } + public override string ToString() + => $"GivesSupport({Order})"; + public GivesSupport(SupportOrder order, IEnumerable cuts) { this.Order = order; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/HasPath.cs b/MultiversalDiplomacy/Adjudicate/Decision/HasPath.cs index 71f49fe..471a9cb 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/HasPath.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/HasPath.cs @@ -6,6 +6,9 @@ public class HasPath : BinaryAdjudicationDecision { public MoveOrder Order { get; } + public override string ToString() + => $"HasPath({Order})"; + public HasPath(MoveOrder order) { this.Order = order; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/HoldStrength.cs b/MultiversalDiplomacy/Adjudicate/Decision/HoldStrength.cs index 39c0628..8412d24 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/HoldStrength.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/HoldStrength.cs @@ -10,6 +10,11 @@ public class HoldStrength : NumericAdjudicationDecision public UnitOrder? Order { get; } public List Supports { get; } + public override string ToString() + => Order is null + ? $"HoldStrength({Province.Abbreviations[0]})" + : $"HoldStrength({Order.Unit})"; + public HoldStrength(Province province, Season season, UnitOrder? order = null) { this.Province = province; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/IsDislodged.cs b/MultiversalDiplomacy/Adjudicate/Decision/IsDislodged.cs index f5cdf62..4e92e0e 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/IsDislodged.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/IsDislodged.cs @@ -7,6 +7,9 @@ public class IsDislodged : BinaryAdjudicationDecision public UnitOrder Order { get; } public List Incoming { get; } + public override string ToString() + => $"IsDislodged({Order.Unit})"; + public IsDislodged(UnitOrder order, IEnumerable incoming) { this.Order = order; diff --git a/MultiversalDiplomacy/Adjudicate/Decision/PreventStrength.cs b/MultiversalDiplomacy/Adjudicate/Decision/PreventStrength.cs index 4a5ed2e..ee045b9 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/PreventStrength.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/PreventStrength.cs @@ -8,6 +8,9 @@ public class PreventStrength : NumericAdjudicationDecision public List Supports { get; } public MoveOrder? OpposingMove { get; } + public override string ToString() + => $"PreventStrength({Order})"; + public PreventStrength(MoveOrder order, IEnumerable supports, MoveOrder? opposingMove = null) { this.Order = order;