MultiversalDiplomacy/Adjudicate/Decision/MovementDecisions.cs

@@ -60,9 +60,9 @@ public class MovementDecisions
             {
                 case MoveOrder move:
                     AdvanceTimeline.Ensure(
-                        world.Seasons[move.Season],
-                        () => new(world.Seasons[move.Season], world.OrderHistory[move.Season].Orders));
-                    AdvanceTimeline[world.Seasons[move.Season]].Orders.Add(move);
+                        move.Season,
+                        () => new(move.Season, world.OrderHistory[move.Season.Designation].Orders));
+                    AdvanceTimeline[move.Season].Orders.Add(move);
                     break;
 
                 case SupportHoldOrder supportHold:
@@ -91,25 +91,23 @@ public class MovementDecisions
             .Distinct()
             .ToList();
 
-        (Province province, Season season) UnitPoint(Unit unit)
+        (Province province, Season season) Point(Unit unit)
             => (world.Map.GetLocation(unit.Location).Province, unit.Season);
-        (Province province, Season season) MovePoint(MoveOrder move)
-            => (move.Province, world.Seasons[move.Season]);
 
         // Create a hold strength decision with an associated order for every province with a unit.
         foreach (UnitOrder order in relevantOrders)
         {
-            HoldStrength[UnitPoint(order.Unit)] = new(UnitPoint(order.Unit), order);
+            HoldStrength[Point(order.Unit)] = new(Point(order.Unit), order);
         }
 
         bool IsIncoming(UnitOrder me, MoveOrder other)
             => me != other
-            && world.Seasons[other.Season] == me.Unit.Season
+            && other.Season == me.Unit.Season
             && other.Province == world.Map.GetLocation(me.Unit).Province;
 
         bool AreOpposing(MoveOrder one, MoveOrder two)
-            => one.Season == two.Unit.Season.Designation
-            && two.Season == one.Unit.Season.Designation
+            => one.Season == two.Unit.Season
+            && two.Season == one.Unit.Season
             && one.Province == world.Map.GetLocation(two.Unit).Province
             && two.Province == world.Map.GetLocation(one.Unit).Province;
 
@@ -150,7 +148,7 @@ public class MovementDecisions
                 DoesMove[move] = new(move, opposingMove, competing);
 
                 // Ensure a hold strength decision exists for the destination.
-                HoldStrength.Ensure(MovePoint(move), () => new(MovePoint(move)));
+                HoldStrength.Ensure(move.Point, () => new(move.Point));
             }
             else if (order is SupportOrder support)
             {
@@ -158,11 +156,11 @@ public class MovementDecisions
                 GivesSupport[support] = new(support, incoming);
 
                 // Ensure a hold strength decision exists for the target's province.
-                HoldStrength.Ensure(UnitPoint(support.Target), () => new(UnitPoint(support.Target)));
+                HoldStrength.Ensure(Point(support.Target), () => new(Point(support.Target)));
 
                 if (support is SupportHoldOrder supportHold)
                 {
-                    HoldStrength[UnitPoint(support.Target)].Supports.Add(supportHold);
+                    HoldStrength[Point(support.Target)].Supports.Add(supportHold);
                 }
                 else if (support is SupportMoveOrder supportMove)
                 {

MultiversalDiplomacy/Adjudicate/MovementPhaseAdjudicator.cs

@@ -77,7 +77,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
 
         // Trivial check: a unit cannot move to where it already is.
         AdjudicatorHelpers.InvalidateIfNotMatching(
-            order => !(order.Location.Designation == order.Unit.Location && order.Season == order.Unit.Season.Designation),
+            order => !(order.Location.Designation == order.Unit.Location && order.Season == order.Unit.Season),
             ValidationReason.DestinationMatchesOrigin,
             ref moveOrders,
             ref validationResults);
@@ -92,9 +92,9 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
                 // Map adjacency
                 world.Map.GetLocation(order.Unit).Adjacents.Contains(order.Location)
                 // Turn adjacency
-                && Math.Abs(order.Unit.Season.Turn - world.Seasons[order.Season].Turn) <= 1
+                && Math.Abs(order.Unit.Season.Turn - order.Season.Turn) <= 1
                 // Timeline adjacency
-                && world.InAdjacentTimeline(order.Unit.Season, world.Seasons[order.Season]));
+                && world.InAdjacentTimeline(order.Unit.Season, order.Season));
         List<MoveOrder> adjacentMoveOrders = moveOrdersByAdjacency[true].ToList();
         List<MoveOrder> nonAdjacentMoveOrders = moveOrdersByAdjacency[false].ToList();
 
@@ -334,10 +334,10 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         foreach (DoesMove doesMove in moves.Values)
         {
             logger.Log(2, "{0} = {1}", doesMove, doesMove.Outcome?.ToString() ?? "?");
-            Season moveSeason = world.Seasons[doesMove.Order.Season];
-            if (doesMove.Outcome == true && createdFutures.TryGetValue(moveSeason, out Season? future))
+            Season moveSeason = doesMove.Order.Season;
+            if (doesMove.Outcome == true && createdFutures.ContainsKey(moveSeason))
             {
-                Unit next = doesMove.Order.Unit.Next(doesMove.Order.Location.Designation, future);
+                Unit next = doesMove.Order.Unit.Next(doesMove.Order.Location.Designation, createdFutures[moveSeason]);
                 logger.Log(3, "Advancing unit to {0}", next);
                 createdUnits.Add(next);
             }
@@ -387,14 +387,14 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         Dictionary<string, OrderHistory> newHistory = [];
         foreach (UnitOrder unitOrder in decisions.OfType<IsDislodged>().Select(d => d.Order))
         {
-            newHistory.Ensure(unitOrder.Unit.Season.Designation, () => new([], [], []));
+            newHistory.Ensure(unitOrder.Unit.Season.Designation, () => new());
             OrderHistory history = newHistory[unitOrder.Unit.Season.Designation];
             // TODO does this add every order to every season??
             history.Orders.Add(unitOrder);
-            history.IsDislodgedOutcomes[unitOrder.Unit.Designation] = dislodges[unitOrder.Unit].Outcome == true;
+            history.IsDislodgedOutcomes[unitOrder.Unit] = dislodges[unitOrder.Unit].Outcome == true;
             if (unitOrder is MoveOrder moveOrder)
             {
-                history.DoesMoveOutcomes[moveOrder.Unit.Designation] = moves[moveOrder].Outcome == true;
+                history.DoesMoveOutcomes[moveOrder] = moves[moveOrder].Outcome == true;
             }
         }
 
@@ -416,7 +416,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         // TODO provide more structured information about order outcomes
 
         World updated = world.Update(
-            seasons: world.Seasons.Values.Concat(createdFutures.Values),
+            seasons: world.Seasons.Concat(createdFutures.Values),
             units: world.Units.Concat(createdUnits),
             retreats: retreats,
             orders: updatedHistory);
@@ -493,8 +493,8 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         // The season target of a new (i.e. not previously adjudicated) and successful move always advances.
         IEnumerable<MoveOrder> newIncomingMoves = decision.Orders
             .OfType<MoveOrder>()
-            .Where(order => order.Season == decision.Season.Designation
-                && !world.OrderHistory[order.Season].DoesMoveOutcomes.ContainsKey(order.Unit.Designation));
+            .Where(order => order.Season == decision.Season
+                && !world.OrderHistory[order.Season.Designation].DoesMoveOutcomes.ContainsKey(order));
         foreach (MoveOrder moveOrder in newIncomingMoves)
         {
             DoesMove doesMove = decisions.DoesMove[moveOrder];
@@ -518,7 +518,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
             // TODO these aren't timeline-specific
             IsDislodged dislodged = decisions.IsDislodged[order.Unit];
             progress |= ResolveDecision(dislodged, world, decisions, depth + 1);
-            if (history.IsDislodgedOutcomes.TryGetValue(order.Unit.Designation, out bool previous)
+            if (history.IsDislodgedOutcomes.TryGetValue(order.Unit, out bool previous)
                 && dislodged.Resolved
                 && dislodged.Outcome != previous)
             {
@@ -535,7 +535,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
             {
                 DoesMove moves = decisions.DoesMove[moveOrder];
                 progress |= ResolveDecision(moves, world, decisions, depth + 1);
-                if (history.DoesMoveOutcomes.TryGetValue(moveOrder.Unit.Designation, out bool previousMove)
+                if (history.DoesMoveOutcomes.TryGetValue(moveOrder, out bool previousMove)
                     && moves.Resolved
                     && moves.Outcome != previousMove)
                 if (moves.Resolved && moves.Outcome != previousMove)
@@ -635,9 +635,9 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         if (// Map adjacency
             world.Map.GetLocation(decision.Order.Unit).Adjacents.Contains(decision.Order.Location)
             // Turn adjacency
-            && Math.Abs(decision.Order.Unit.Season.Turn - world.Seasons[decision.Order.Season].Turn) <= 1
+            && Math.Abs(decision.Order.Unit.Season.Turn - decision.Order.Season.Turn) <= 1
             // Timeline adjacency
-            && world.InAdjacentTimeline(decision.Order.Unit.Season, world.Seasons[decision.Order.Season]))
+            && world.InAdjacentTimeline(decision.Order.Unit.Season, decision.Order.Season))
         {
             bool update = LoggedUpdate(decision, true, depth, "Adjacent move");
             return progress | update;
@@ -774,7 +774,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         // If there is a head to head battle, a unit at the destination that isn't moving away, or
         // a unit at the destination that will fail to move away, then the attacking unit will have
         // to dislodge it.
-        UnitOrder? destOrder = decisions.HoldStrength[(decision.Order.Province, world.Seasons[decision.Order.Season])].Order;
+        UnitOrder? destOrder = decisions.HoldStrength[decision.Order.Point].Order;
         DoesMove? destMoveAway = destOrder is MoveOrder moveAway
             ? decisions.DoesMove[moveAway]
             : null;
@@ -953,7 +953,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator
         // strength.
         NumericAdjudicationDecision defense = decision.OpposingMove != null
             ? decisions.DefendStrength[decision.OpposingMove]
-            : decisions.HoldStrength[(decision.Order.Province, world.Seasons[decision.Order.Season])];
+            : decisions.HoldStrength[decision.Order.Point];
         progress |= ResolveDecision(defense, world, decisions, depth + 1);
 
         // If the attack doesn't beat the defense, resolve the move to false.

MultiversalDiplomacy/Adjudicate/PathFinder.cs

@@ -18,7 +18,7 @@ public static class PathFinder
     /// Determines if a convoy path exists for a move order.
     /// </summary>
     public static bool ConvoyPathExists(World world, MoveOrder order)
-        => ConvoyPathExists(world, order.Unit, order.Location, world.Seasons[order.Season]);
+        => ConvoyPathExists(world, order.Unit, order.Location, order.Season);
 
     private static bool ConvoyPathExists(
         World world,
@@ -114,7 +114,7 @@ public static class PathFinder
         List<Season> adjacents = [];
 
         // The immediate past and all immediate futures are adjacent.
-        if (season.Past != null) adjacents.Add(world.Seasons[season.Past]);
+        if (season.Past != null) adjacents.Add(world.GetSeason(season.Past));
         adjacents.AddRange(world.GetFutures(season));
 
         // Find all adjacent timelines by finding all timelines that branched off of this season's
@@ -123,8 +123,8 @@ public static class PathFinder
         List<Season> adjacentTimelineRoots = [];
         Season? current;
         for (current = season;
-            current?.Past != null && world.Seasons[current.Past].Timeline == current.Timeline;
-            current = world.Seasons[current.Past])
+            current?.Past != null && world.GetSeason(current.Past).Timeline == current.Timeline;
+            current = world.GetSeason(current.Past))
         {
             adjacentTimelineRoots.AddRange(
                 world.GetFutures(current).Where(s => s.Timeline != current.Timeline));
@@ -135,7 +135,7 @@ public static class PathFinder
         // then current is the branch timeline's root season (current.past.timeline !=
         // current.timeline). There are co-branches if this season is in a branched timeline, since
         // the first timeline by definition cannot have co-branches.
-        if (current?.Past != null && world.Seasons[current.Past] is Season past)
+        if (current?.Past != null && world.GetSeason(current.Past) is Season past)
         {
             IEnumerable<Season> cobranchRoots = world
                 .GetFutures(past)

MultiversalDiplomacy/Model/ModelExtensions.cs

@@ -24,6 +24,6 @@ public static class ModelExtensions
     public static World ContinueOrFork(this World world, Season season, out Season future)
     {
         future = world.ContinueOrFork(season);
-        return world.Update(seasons: world.Seasons.Values.Append(future));
+        return world.Update(seasons: world.Seasons.Append(future));
     }
 }

MultiversalDiplomacy/Model/OrderHistory.cs

@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Collections.ObjectModel;
 
 using MultiversalDiplomacy.Orders;
 
@@ -6,23 +6,20 @@ namespace MultiversalDiplomacy.Model;
 
 public class OrderHistory
 {
-    public List<UnitOrder> Orders { get; }
+    public List<UnitOrder> Orders;
 
-    /// <summary>
-    /// Map from unit designation to dislodge outcome.
-    /// </summary>
-    public Dictionary<string, bool> IsDislodgedOutcomes { get; }
+    public Dictionary<Unit, bool> IsDislodgedOutcomes;
 
-    /// <summary>
-    /// Map from designation of the ordered unit to move outcome.
-    /// </summary>
-    public Dictionary<string, bool> DoesMoveOutcomes { get; }
+    public Dictionary<MoveOrder, bool> DoesMoveOutcomes;
+
+    public OrderHistory()
+        : this([], [], [])
+    {}
 
-    [JsonConstructor]
     public OrderHistory(
         List<UnitOrder> orders,
-        Dictionary<string, bool> isDislodgedOutcomes,
-        Dictionary<string, bool> doesMoveOutcomes)
+        Dictionary<Unit, bool> isDislodgedOutcomes,
+        Dictionary<MoveOrder, bool> doesMoveOutcomes)
     {
         this.Orders = new(orders);
         this.IsDislodgedOutcomes = new(isDislodgedOutcomes);

MultiversalDiplomacy/Model/UnitType.cs

@@ -1,11 +1,8 @@
-using System.Text.Json.Serialization;
-
 namespace MultiversalDiplomacy.Model;
 
 /// <summary>
 /// The type of a unit.
 /// </summary>
-[JsonConverter(typeof(JsonStringEnumConverter<UnitType>))]
 public enum UnitType
 {
     /// <summary>

MultiversalDiplomacy/Model/World.cs

@@ -39,16 +39,22 @@ public class World
     [JsonIgnore]
     public IReadOnlyCollection<Power> Powers => this.Map.Powers;
 
+    /// <summary>
+    /// The state of the multiverse.
+    /// </summary>
+    public List<Season> Seasons { get; }
+
     /// <summary>
     /// Lookup for seasons by designation.
     /// </summary>
-    public Dictionary<string, Season> Seasons { get; }
+    [JsonIgnore]
+    public Dictionary<string, Season> SeasonLookup { get; }
 
     /// <summary>
     /// The first season of the game.
     /// </summary>
     [JsonIgnore]
-    public Season RootSeason => Seasons["a0"];
+    public Season RootSeason => GetSeason("a0");
 
     /// <summary>
     /// All units in the multiverse.
@@ -78,7 +84,7 @@ public class World
     [JsonConstructor]
     public World(
         MapType mapType,
-        Dictionary<string, Season> seasons,
+        List<Season> seasons,
         List<Unit> units,
         List<RetreatingUnit> retreatingUnits,
         Dictionary<string, OrderHistory> orderHistory,
@@ -93,6 +99,7 @@ public class World
         this.Timelines = timelines;
         this.Options = options;
 
+        this.SeasonLookup = new(Seasons.ToDictionary(season => $"{season.Timeline}{season.Turn}"));
     }
 
     /// <summary>
@@ -100,7 +107,7 @@ public class World
     /// </summary>
     private World(
         Map map,
-        Dictionary<string, Season> seasons,
+        List<Season> seasons,
         List<Unit> units,
         List<RetreatingUnit> retreatingUnits,
         Dictionary<string, OrderHistory> orderHistory,
@@ -114,6 +121,8 @@ public class World
         this.OrderHistory = orderHistory;
         this.Timelines = timelines;
         this.Options = options;
+
+        this.SeasonLookup = new(Seasons.ToDictionary(season => $"{season.Timeline}{season.Turn}"));
     }
 
     /// <summary>
@@ -121,7 +130,7 @@ public class World
     /// </summary>
     private World(
         World previous,
-        Dictionary<string, Season>? seasons = null,
+        List<Season>? seasons = null,
         List<Unit>? units = null,
         List<RetreatingUnit>? retreatingUnits = null,
         Dictionary<string, OrderHistory>? orderHistory = null,
@@ -143,10 +152,9 @@ public class World
     public static World WithMap(Map map)
     {
         TimelineFactory timelines = new();
-        Season a0 = new(past: null, Season.FIRST_TURN, timelines.NextTimeline());
         return new World(
             map,
-            new() { {a0.Designation, a0} },
+            new([new(past: null, Season.FIRST_TURN, timelines.NextTimeline())]),
             new([]),
             new([]),
             new(new Dictionary<string, OrderHistory>()),
@@ -169,7 +177,7 @@ public class World
             previous: this,
             seasons: seasons == null
                 ? this.Seasons
-                : new(seasons.ToDictionary(season => season.Designation)),
+                : new(seasons.ToList()),
             units: units == null
                 ? this.Units
                 : new(units.ToList()),
@@ -256,7 +264,13 @@ public class World
     /// Get a season by coordinate. Throws if the season is not found.
     /// </summary>
     public Season GetSeason(string timeline, int turn)
-        => Seasons[$"{timeline}{turn}"];
+        => GetSeason($"{timeline}{turn}");
+
+    /// <summary>
+    /// Get a season by designation.
+    /// </summary>
+    public Season GetSeason(string designation)
+        => SeasonLookup[designation];
 
     /// <summary>
     /// Get all seasons that are immediate futures of a season.
@@ -264,7 +278,7 @@ public class World
     /// <param name="present">A season designation.</param>
     /// <returns>The immediate futures of the designated season.</returns>
     public IEnumerable<Season> GetFutures(string present)
-        => Seasons.Values.Where(future => future.Past == present);
+        => Seasons.Where(future => future.Past == present);
 
     /// <summary>
     /// Get all seasons that are immediate futures of a season.
@@ -283,7 +297,7 @@ public class World
         if (season.Past is null) {
             return season;
         }
-        Season past = Seasons[season.Past];
+        Season past = SeasonLookup[season.Past];
         return season.Timeline == past.Timeline
             ? GetTimelineRoot(past)
             : season;
@@ -305,8 +319,8 @@ public class World
         // if they both branched off of the same point.
         Season rootOne = GetTimelineRoot(one);
         Season rootTwo = GetTimelineRoot(two);
-        bool oneForked = rootOne.Past != null && Seasons[rootOne.Past].Timeline == two.Timeline;
-        bool twoForked = rootTwo.Past != null && Seasons[rootTwo.Past].Timeline == one.Timeline;
+        bool oneForked = rootOne.Past != null && GetSeason(rootOne.Past).Timeline == two.Timeline;
+        bool twoForked = rootTwo.Past != null && GetSeason(rootTwo.Past).Timeline == one.Timeline;
         bool bothForked = rootOne.Past == rootTwo.Past;
         return oneForked || twoForked || bothForked;
     }

MultiversalDiplomacy/Orders/MoveOrder.cs

@@ -9,9 +9,8 @@ public class MoveOrder : UnitOrder
 {
     /// <summary>
     /// The destination season to which the unit should move.
-    /// TODO replace this with timeline and turn individually so ToString can do the proper format
     /// </summary>
-    public string Season { get; }
+    public Season Season { get; }
 
     /// <summary>
     /// The destination location to which the unit should move.
@@ -23,7 +22,12 @@ public class MoveOrder : UnitOrder
     /// </summary>
     public Province Province => this.Location.Province;
 
-    public MoveOrder(Power power, Unit unit, string season, Location location)
+    /// <summary>
+    /// The destination's spatiotemporal location as a province-season tuple.
+    /// </summary>
+    public (Province province, Season season) Point => (this.Province, this.Season);
+
+    public MoveOrder(Power power, Unit unit, Season season, Location location)
         : base (power, unit)
     {
         this.Season = season;
@@ -32,7 +36,7 @@ public class MoveOrder : UnitOrder
 
     public override string ToString()
     {
-        return $"{this.Unit} -> {this.Season} {this.Province}";
+        return $"{this.Unit} -> {(this.Province, this.Season).ToShort()}";
     }
 
     /// <summary>

MultiversalDiplomacy/Orders/Order.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 using MultiversalDiplomacy.Model;
 
 namespace MultiversalDiplomacy.Orders;
@@ -7,16 +5,6 @@ namespace MultiversalDiplomacy.Orders;
 /// <summary>
 /// A submitted action by a power.
 /// </summary>
-[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
-[JsonDerivedType(typeof(BuildOrder), typeDiscriminator: "move")]
-[JsonDerivedType(typeof(ConvoyOrder), typeDiscriminator: "convoy")]
-[JsonDerivedType(typeof(DisbandOrder), typeDiscriminator: "disband")]
-[JsonDerivedType(typeof(HoldOrder), typeDiscriminator: "hold")]
-[JsonDerivedType(typeof(MoveOrder), typeDiscriminator: "move")]
-[JsonDerivedType(typeof(RetreatOrder), typeDiscriminator: "retreat")]
-[JsonDerivedType(typeof(SupportHoldOrder), typeDiscriminator: "supportHold")]
-[JsonDerivedType(typeof(SupportMoveOrder), typeDiscriminator: "supportMove")]
-[JsonDerivedType(typeof(SustainOrder), typeDiscriminator: "sustain")]
 public abstract class Order
 {
     /// <summary>

MultiversalDiplomacy/Orders/SupportMoveOrder.cs

@@ -41,6 +41,6 @@ public class SupportMoveOrder : SupportOrder
 
     public bool IsSupportFor(MoveOrder move)
         => this.Target == move.Unit
-        && this.Season.Designation == move.Season
+        && this.Season == move.Season
         && this.Location == move.Location;
 }

MultiversalDiplomacy/Orders/UnitOrder.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Serialization;
-
 using MultiversalDiplomacy.Model;
 
 namespace MultiversalDiplomacy.Orders;
@@ -7,14 +5,6 @@ namespace MultiversalDiplomacy.Orders;
 /// <summary>
 /// An order given to a specific unit.
 /// </summary>
-[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
-[JsonDerivedType(typeof(ConvoyOrder), typeDiscriminator: "convoy")]
-[JsonDerivedType(typeof(DisbandOrder), typeDiscriminator: "disband")]
-[JsonDerivedType(typeof(HoldOrder), typeDiscriminator: "hold")]
-[JsonDerivedType(typeof(MoveOrder), typeDiscriminator: "move")]
-[JsonDerivedType(typeof(RetreatOrder), typeDiscriminator: "retreat")]
-[JsonDerivedType(typeof(SupportHoldOrder), typeDiscriminator: "supportHold")]
-[JsonDerivedType(typeof(SupportMoveOrder), typeDiscriminator: "supportMove")]
 public abstract class UnitOrder : Order
 {
     /// <summary>

MultiversalDiplomacyTests/MDATC_A.cs

@@ -33,16 +33,16 @@ public class TimeTravelTest
 
         // Confirm that there are now four seasons: three in the main timeline and one in a fork.
         Assert.That(
-            world.Seasons.Values.Where(s => s.Timeline == s0.Timeline).Count(),
+            world.Seasons.Where(s => s.Timeline == s0.Timeline).Count(),
             Is.EqualTo(3),
             "Failed to advance main timeline after last unit left");
         Assert.That(
-            world.Seasons.Values.Where(s => s.Timeline != s0.Timeline).Count(),
+            world.Seasons.Where(s => s.Timeline != s0.Timeline).Count(),
             Is.EqualTo(1),
             "Failed to fork timeline when unit moved in");
 
         // Confirm that there is a unit in Tyr b1 originating from Mun a1
-        Season fork = world.Seasons["b1"];
+        Season fork = world.GetSeason("b1");
         Unit originalUnit = world.GetUnitAt("Mun", s0);
         Unit aMun0 = world.GetUnitAt("Mun", s1);
         Unit aTyr = world.GetUnitAt("Tyr", fork);
@@ -91,7 +91,7 @@ public class TimeTravelTest
 
         // Confirm that an alternate future is created.
         World world = setup.UpdateWorld();
-        Season fork = world.Seasons["b1"];
+        Season fork = world.GetSeason("b1");
         Unit tyr1 = world.GetUnitAt("Tyr", fork);
         Assert.That(
             tyr1.Past,

MultiversalDiplomacyTests/MovementAdjudicatorTest.cs

@@ -169,8 +169,8 @@ public class MovementAdjudicatorTest
         World updated = setup.UpdateWorld();
 
         // Confirm the future was created
-        Assert.That(updated.Seasons.Values.Count, Is.EqualTo(2));
-        Season future = updated.Seasons.Values.Single(s => s != updated.RootSeason);
+        Assert.That(updated.Seasons.Count, Is.EqualTo(2));
+        Season future = updated.Seasons.Single(s => s != updated.RootSeason);
         Assert.That(future.Past, Is.EqualTo(updated.RootSeason.ToString()));
         Assert.That(updated.GetFutures(future), Is.Empty);
         Assert.That(future.Timeline, Is.EqualTo(updated.RootSeason.Timeline));
@@ -199,7 +199,7 @@ public class MovementAdjudicatorTest
         World updated = setup.UpdateWorld();
 
         // Confirm the future was created
-        Season s2 = updated.Seasons["a1"];
+        Season s2 = updated.GetSeason("a1");
         Assert.That(s2.Past, Is.EqualTo(s1.ToString()));
         Assert.That(updated.GetFutures(s2), Is.Empty);
         Assert.That(s2.Timeline, Is.EqualTo(s1.Timeline));

MultiversalDiplomacyTests/SeasonTests.cs

@@ -10,7 +10,7 @@ public class SeasonTests
     public void TimelineForking()
     {
         World world = World.WithMap(Map.Test);
-        Season a0 = world.Seasons["a0"];
+        Season a0 = world.GetSeason("a0");
         world = world
             .ContinueOrFork(a0, out Season a1)
             .ContinueOrFork(a1, out Season a2)
@@ -21,7 +21,7 @@ public class SeasonTests
             .ContinueOrFork(a2, out Season d3);
 
         Assert.That(
-            world.Seasons.Values.Select(season => season.ToString()),
+            world.Seasons.Select(season => season.ToString()),
             Is.EquivalentTo(new List<string> { "a0", "a1", "a2", "a3", "b2", "b3", "c2", "d3" }),
             "Unexpected seasons");
 

MultiversalDiplomacyTests/SerializationTest.cs

@@ -1,7 +1,6 @@
 using System.Text.Json;
 
 using MultiversalDiplomacy.Adjudicate;
-using MultiversalDiplomacy.Adjudicate.Decision;
 using MultiversalDiplomacy.Model;
 
 using NUnit.Framework;
@@ -65,44 +64,30 @@ public class SerializationTest
         Assert.That(tyr0, Is.NotDislodged);
         setup.UpdateWorld();
 
-        Assert.That(setup.World.OrderHistory["a0"].Orders.Count, Is.GreaterThan(0), "Missing orders");
-        Assert.That(setup.World.OrderHistory["a0"].DoesMoveOutcomes.Count, Is.GreaterThan(0), "Missing moves");
-        Assert.That(setup.World.OrderHistory["a0"].IsDislodgedOutcomes.Count, Is.GreaterThan(0), "Missing dislodges");
-
         // Serialize and deserialize the world
         string serialized = JsonSerializer.Serialize(setup.World, Options);
+        // Console.WriteLine(serialized);
         World reserialized = JsonSerializer.Deserialize<World>(serialized, Options)
             ?? throw new AssertionException("Failed to reserialize world");
 
-        Assert.Multiple(() => {
-            Assert.That(reserialized.OrderHistory["a0"].Orders.Count, Is.GreaterThan(0), "Missing orders");
-            Assert.That(reserialized.OrderHistory["a0"].DoesMoveOutcomes.Count, Is.GreaterThan(0), "Missing moves");
-            Assert.That(reserialized.OrderHistory["a0"].IsDislodgedOutcomes.Count, Is.GreaterThan(0), "Missing dislodges");
-        });
-
-        Assert.Ignore();
-
         // Resume the test case
         setup = new(reserialized, MovementPhaseAdjudicator.Instance);
         setup[("a", 1)]
             ["Germany"]
-                .Army("Mun").Supports.Army("Mun", season: reserialized.Seasons["a0"]).MoveTo("Tyr").GetReference(out var mun1)
+                .Army("Mun").Supports.Army("Mun", season: reserialized.GetSeason("a0")).MoveTo("Tyr").GetReference(out var mun1)
             ["Austria"]
                 .Army("Tyr").Holds();
 
         setup.ValidateOrders();
         Assert.That(mun1, Is.Valid);
-        var adjudications = setup.AdjudicateOrders();
+        setup.AdjudicateOrders();
         Assert.That(mun1, Is.NotCut);
-        Console.WriteLine(string.Join(", ", adjudications.Select(a => a.ToString())));
-        DoesMove mun0move = adjudications.OfType<DoesMove>().Single(move => move.Order.Unit.Designation == mun0.Order.Unit.Designation);
-        Assert.That(mun0move.Outcome, Is.True);
-        IsDislodged tyr0dislodge = adjudications.OfType<IsDislodged>().Single(dis => dis.Order.Unit.Designation == tyr0.Order.Unit.Designation);
-        Assert.That(tyr0dislodge, Is.True);
+        Assert.That(mun0, Is.Victorious);
+        Assert.That(tyr0, Is.Dislodged);
 
         // Confirm that an alternate future is created.
         World world = setup.UpdateWorld();
-        Season fork = world.Seasons["b1"];
+        Season fork = world.GetSeason("b1");
         Unit tyr1 = world.GetUnitAt("Tyr", fork);
         Assert.That(
             tyr1.Past,

MultiversalDiplomacyTests/TestCaseBuilder.cs

@@ -419,7 +419,7 @@ public class TestCaseBuilder
             MoveOrder moveOrder = new MoveOrder(
                 this.PowerContext.Power,
                 this.Unit,
-                destSeason.Designation,
+                destSeason,
                 destination);
             this.Builder.OrderList.Add(moveOrder);
             return new OrderDefinedContext<MoveOrder>(this, moveOrder);