diff options
Diffstat (limited to 'src/SMAPI')
| -rw-r--r-- | src/SMAPI/Framework/Models/ManifestDependency.cs | 1 | ||||
| -rw-r--r-- | src/SMAPI/Utilities/SDate.cs | 64 |
2 files changed, 38 insertions, 27 deletions
diff --git a/src/SMAPI/Framework/Models/ManifestDependency.cs b/src/SMAPI/Framework/Models/ManifestDependency.cs index 5646b335..97f0775a 100644 --- a/src/SMAPI/Framework/Models/ManifestDependency.cs +++ b/src/SMAPI/Framework/Models/ManifestDependency.cs @@ -15,6 +15,7 @@ namespace StardewModdingAPI.Framework.Models /// <summary>Whether the dependency must be installed to use the mod.</summary> public bool IsRequired { get; set; } + /********* ** Public methods *********/ diff --git a/src/SMAPI/Utilities/SDate.cs b/src/SMAPI/Utilities/SDate.cs index 126673eb..e589e9a4 100644 --- a/src/SMAPI/Utilities/SDate.cs +++ b/src/SMAPI/Utilities/SDate.cs @@ -35,6 +35,9 @@ namespace StardewModdingAPI.Utilities /// <summary>The day of week.</summary> public DayOfWeek DayOfWeek { get; } + /// <summary>The number of days since the game began (starting at 1 for the first day of spring in Y1).</summary> + public int DaysSinceStart { get; } + /********* ** Public methods @@ -67,7 +70,7 @@ namespace StardewModdingAPI.Utilities public SDate AddDays(int offset) { // get new hash code - int hashCode = this.GetHashCode() + offset; + int hashCode = this.DaysSinceStart + offset; if (hashCode < 1) throw new ArithmeticException($"Adding {offset} days to {this} would result in a date before 01 spring Y1."); @@ -95,12 +98,6 @@ namespace StardewModdingAPI.Utilities return $"{this.Day:00} {this.Season} Y{this.Year}"; } - /// <summary>This function will return the number of days since Year 1 Spring 0 for an arbitrary date</summary> - public static int TotalNumberOfDays(SDate date) - { - return (((date.Year - 1) * 112) + (date.GetSeasonIndex() * 28) + date.Day); - } - /**** ** IEquatable ****/ @@ -121,12 +118,7 @@ namespace StardewModdingAPI.Utilities /// <summary>Get a hash code which uniquely identifies a date.</summary> public override int GetHashCode() { - // return the number of days since 01 spring Y1 (inclusively) - int yearIndex = this.Year - 1; - return - yearIndex * this.DaysInSeason * this.SeasonsInYear - + this.GetSeasonIndex() * this.DaysInSeason - + this.Day; + return this.DaysSinceStart; } /**** @@ -138,7 +130,7 @@ namespace StardewModdingAPI.Utilities /// <returns>The equality of the dates</returns> public static bool operator ==(SDate date, SDate other) { - return date?.GetHashCode() == other?.GetHashCode(); + return date?.DaysSinceStart == other?.DaysSinceStart; } /// <summary>Get whether one date is not equal to another.</summary> @@ -146,7 +138,7 @@ namespace StardewModdingAPI.Utilities /// <param name="other">The other date to compare.</param> public static bool operator !=(SDate date, SDate other) { - return date?.GetHashCode() != other?.GetHashCode(); + return date?.DaysSinceStart != other?.DaysSinceStart; } /// <summary>Get whether one date is more than another.</summary> @@ -154,7 +146,7 @@ namespace StardewModdingAPI.Utilities /// <param name="other">The other date to compare.</param> public static bool operator >(SDate date, SDate other) { - return date?.GetHashCode() > other?.GetHashCode(); + return date?.DaysSinceStart > other?.DaysSinceStart; } /// <summary>Get whether one date is more than or equal to another.</summary> @@ -162,7 +154,7 @@ namespace StardewModdingAPI.Utilities /// <param name="other">The other date to compare.</param> public static bool operator >=(SDate date, SDate other) { - return date?.GetHashCode() >= other?.GetHashCode(); + return date?.DaysSinceStart >= other?.DaysSinceStart; } /// <summary>Get whether one date is less than or equal to another.</summary> @@ -170,7 +162,7 @@ namespace StardewModdingAPI.Utilities /// <param name="other">The other date to compare.</param> public static bool operator <=(SDate date, SDate other) { - return date?.GetHashCode() <= other?.GetHashCode(); + return date?.DaysSinceStart <= other?.DaysSinceStart; } /// <summary>Get whether one date is less than another.</summary> @@ -178,7 +170,7 @@ namespace StardewModdingAPI.Utilities /// <param name="other">The other date to compare.</param> public static bool operator <(SDate date, SDate other) { - return date?.GetHashCode() < other?.GetHashCode(); + return date?.DaysSinceStart < other?.DaysSinceStart; } @@ -209,7 +201,9 @@ namespace StardewModdingAPI.Utilities this.Day = day; this.Season = season; this.Year = year; - this.DayOfWeek = this.GetDayOfWeek(); + this.DayOfWeek = this.GetDayOfWeek(day); + this.DaysSinceStart = this.GetDaysSinceStart(day, season, year); + } /// <summary>Get whether a date represents 0 spring Y1, which is the date during the in-game intro.</summary> @@ -221,10 +215,11 @@ namespace StardewModdingAPI.Utilities return day == 0 && season == "spring" && year == 1; } - /// <summary>Get the day of week for the current date.</summary> - private DayOfWeek GetDayOfWeek() + /// <summary>Get the day of week for a given date.</summary> + /// <param name="day">The day of month.</param> + private DayOfWeek GetDayOfWeek(int day) { - switch (this.Day % 7) + switch (day % 7) { case 0: return DayOfWeek.Sunday; @@ -245,13 +240,28 @@ namespace StardewModdingAPI.Utilities } } - /// <summary>Get the current season index.</summary> + /// <summary>Get the number of days since the game began (starting at 1 for the first day of spring in Y1).</summary> + /// <param name="day">The day of month.</param> + /// <param name="season">The season name.</param> + /// <param name="year">The year.</param> + private int GetDaysSinceStart(int day, string season, int year) + { + // return the number of days since 01 spring Y1 (inclusively) + int yearIndex = year - 1; + return + yearIndex * this.DaysInSeason * this.SeasonsInYear + + this.GetSeasonIndex(season) * this.DaysInSeason + + day; + } + + /// <summary>Get a season index.</summary> + /// <param name="season">The season name.</param> /// <exception cref="InvalidOperationException">The current season wasn't recognised.</exception> - private int GetSeasonIndex() + private int GetSeasonIndex(string season) { - int index = Array.IndexOf(this.Seasons, this.Season); + int index = Array.IndexOf(this.Seasons, season); if (index == -1) - throw new InvalidOperationException($"The current season '{this.Season}' wasn't recognised."); + throw new InvalidOperationException($"The season '{season}' wasn't recognised."); return index; } } |