diff --git a/MultiversalDiplomacy/Model/World.cs b/MultiversalDiplomacy/Model/World.cs index 95ce678..53f4c82 100644 --- a/MultiversalDiplomacy/Model/World.cs +++ b/MultiversalDiplomacy/Model/World.cs @@ -37,7 +37,7 @@ public class World /// /// The first season of the game. /// - public Season RootSeason => GetSeason("a", 0); + public Season RootSeason => GetSeason("a0"); /// /// All units in the multiverse. @@ -227,13 +227,7 @@ public class World /// Get a season by coordinate. Throws if the season is not found. /// public Season GetSeason(string timeline, int turn) - { - Season? foundSeason = this.Seasons.SingleOrDefault( - s => s!.Turn == turn && s.Timeline == timeline, - null) - ?? throw new KeyNotFoundException($"Season {timeline}@{turn} not found"); - return foundSeason; - } + => GetSeason($"{timeline}{turn}"); public Season GetSeason(string designation) => SeasonLookup[designation]; diff --git a/MultiversalDiplomacyTests/MDATC_A.cs b/MultiversalDiplomacyTests/MDATC_A.cs index 0c95464..8b1b70b 100644 --- a/MultiversalDiplomacyTests/MDATC_A.cs +++ b/MultiversalDiplomacyTests/MDATC_A.cs @@ -42,7 +42,7 @@ public class TimeTravelTest "Failed to fork timeline when unit moved in"); // Confirm that there is a unit in Tyr b1 originating from Mun a1 - Season fork = world.GetSeason("b", 1); + Season fork = world.GetSeason("b1"); Unit originalUnit = world.GetUnitAt("Mun", s0.Coord); Unit aMun0 = world.GetUnitAt("Mun", s1.Coord); Unit aTyr = world.GetUnitAt("Tyr", fork.Coord); @@ -91,7 +91,7 @@ public class TimeTravelTest // Confirm that an alternate future is created. World world = setup.UpdateWorld(); - Season fork = world.GetSeason("b", 1); + Season fork = world.GetSeason("b1"); Unit tyr1 = world.GetUnitAt("Tyr", fork.Coord); Assert.That( tyr1.Past, diff --git a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs index 871911c..2c35dd1 100644 --- a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs +++ b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs @@ -199,7 +199,7 @@ public class MovementAdjudicatorTest World updated = setup.UpdateWorld(); // Confirm the future was created - Season s2 = updated.GetSeason("a", 1); + Season s2 = updated.GetSeason("a1"); Assert.That(s2.Past, Is.EqualTo(s1.ToString())); Assert.That(s2.Futures, Is.Empty); Assert.That(s2.Timeline, Is.EqualTo(s1.Timeline));