From 11dfa403e41fe92c393371acb2a152da9b694cfd Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Mon, 12 Aug 2024 14:52:50 -0700 Subject: [PATCH] Rename PastId back to Past --- MultiversalDiplomacy/Adjudicate/PathFinder.cs | 8 ++++---- MultiversalDiplomacy/Model/Season.cs | 4 ++-- MultiversalDiplomacy/Model/World.cs | 10 +++++----- MultiversalDiplomacyTests/MovementAdjudicatorTest.cs | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/MultiversalDiplomacy/Adjudicate/PathFinder.cs b/MultiversalDiplomacy/Adjudicate/PathFinder.cs index bd5c415..47e85f1 100644 --- a/MultiversalDiplomacy/Adjudicate/PathFinder.cs +++ b/MultiversalDiplomacy/Adjudicate/PathFinder.cs @@ -114,7 +114,7 @@ public static class PathFinder List adjacents = []; // The immediate past and all immediate futures are adjacent. - if (season.PastId != null) adjacents.Add(world.GetSeason(season.PastId)); + if (season.Past != null) adjacents.Add(world.GetSeason(season.Past)); adjacents.AddRange(season.Futures); // Find all adjacent timelines by finding all timelines that branched off of this season's @@ -123,8 +123,8 @@ public static class PathFinder List adjacentTimelineRoots = []; Season? current; for (current = season; - current?.PastId != null && world.GetSeason(current.PastId).Timeline == current.Timeline; - current = world.GetSeason(current.PastId)) + current?.Past != null && world.GetSeason(current.Past).Timeline == current.Timeline; + current = world.GetSeason(current.Past)) { adjacentTimelineRoots.AddRange( current.Futures.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?.PastId != null && world.GetSeason(current.PastId) is Season past) + if (current?.Past != null && world.GetSeason(current.Past) is Season past) { IEnumerable cobranchRoots = past.Futures .Where(s => s.Timeline != current.Timeline && s.Timeline != past.Timeline); diff --git a/MultiversalDiplomacy/Model/Season.cs b/MultiversalDiplomacy/Model/Season.cs index 337edfb..e70e9dd 100644 --- a/MultiversalDiplomacy/Model/Season.cs +++ b/MultiversalDiplomacy/Model/Season.cs @@ -15,7 +15,7 @@ public class Season /// If this season is an alternate timeline root, the past is from the origin timeline. /// The initial season does not have a past. /// - public string? PastId { get; } + public string? Past { get; } /// /// The current turn, beginning at 0. Each season (spring and fall) is one turn. @@ -47,7 +47,7 @@ public class Season private Season(Season? past, int turn, string timeline, TimelineFactory factory) { - this.PastId = past?.ToString(); + this.Past = past?.ToString(); this.Turn = turn; this.Timeline = timeline; this.Timelines = factory; diff --git a/MultiversalDiplomacy/Model/World.cs b/MultiversalDiplomacy/Model/World.cs index 6d063fe..95ce678 100644 --- a/MultiversalDiplomacy/Model/World.cs +++ b/MultiversalDiplomacy/Model/World.cs @@ -245,10 +245,10 @@ public class World /// public Season GetTimelineRoot(Season season) { - if (season.PastId is null) { + if (season.Past is null) { return season; } - Season past = SeasonLookup[season.PastId]; + Season past = SeasonLookup[season.Past]; return season.Timeline == past.Timeline ? GetTimelineRoot(past) : season; @@ -270,9 +270,9 @@ public class World // if they both branched off of the same point. Season rootOne = GetTimelineRoot(one); Season rootTwo = GetTimelineRoot(two); - bool oneForked = rootOne.PastId != null && GetSeason(rootOne.PastId).Timeline == two.Timeline; - bool twoForked = rootTwo.PastId != null && GetSeason(rootTwo.PastId).Timeline == one.Timeline; - bool bothForked = rootOne.PastId == rootTwo.PastId; + 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; } diff --git a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs index 64c3341..871911c 100644 --- a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs +++ b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs @@ -171,7 +171,7 @@ public class MovementAdjudicatorTest // Confirm the future was created Assert.That(updated.Seasons.Count, Is.EqualTo(2)); Season future = updated.Seasons.Single(s => s != updated.RootSeason); - Assert.That(future.PastId, Is.EqualTo(updated.RootSeason.ToString())); + Assert.That(future.Past, Is.EqualTo(updated.RootSeason.ToString())); Assert.That(future.Futures, Is.Empty); Assert.That(future.Timeline, Is.EqualTo(updated.RootSeason.Timeline)); Assert.That(future.Turn, Is.EqualTo(Season.FIRST_TURN + 1)); @@ -200,7 +200,7 @@ public class MovementAdjudicatorTest // Confirm the future was created Season s2 = updated.GetSeason("a", 1); - Assert.That(s2.PastId, Is.EqualTo(s1.ToString())); + Assert.That(s2.Past, Is.EqualTo(s1.ToString())); Assert.That(s2.Futures, Is.Empty); Assert.That(s2.Timeline, Is.EqualTo(s1.Timeline)); Assert.That(s2.Turn, Is.EqualTo(s1.Turn + 1)); @@ -250,7 +250,7 @@ public class MovementAdjudicatorTest // Confirm the future was created Season s2 = updated.GetSeason(s1.Timeline, s1.Turn + 1); - Assert.That(s2.PastId, Is.EqualTo(s1.ToString())); + Assert.That(s2.Past, Is.EqualTo(s1.ToString())); Assert.That(s2.Futures, Is.Empty); Assert.That(s2.Timeline, Is.EqualTo(s1.Timeline)); Assert.That(s2.Turn, Is.EqualTo(s1.Turn + 1));