- CoFR: Troubleshooting an NRE.. After some examination, fixed the me…

…nu code being wonky. - CoFR: More troubleshooting with the TV..
Sakorona · Jul 27, 2017 · 620ebe8 · 620ebe8
1 parent 165e547
commit 620ebe8
Show file tree

Hide file tree

Showing 9 changed files with 200 additions and 98 deletions.
diff --git a/ClimatesOfFerngillRebuild/ClimatesOfFerngillRebuild.cs b/ClimatesOfFerngillRebuild/ClimatesOfFerngillRebuild.cs
@@ -5,7 +5,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 
-using CustomTV;
 using TwilightCore;
 using TwilightCore.StardewValley;
 using TwilightCore.PRNG;
@@ -17,6 +16,9 @@
 using StardewValley.Locations;
 using StardewValley.Menus;
 using StardewValley.Objects;
+using SFarmer = StardewValley.Farmer;
+
+using CustomTV;
 
 namespace ClimatesOfFerngillRebuild
 {
@@ -94,35 +96,40 @@ public override void Entry(IModHelper helper)
             WeatherCntrl = new CustomWeather();
             DebugOutput = new StringBuilder();
             OurMoon = new SDVMoon(Dice);
+            OurIcons = new Sprites.Icons(Helper.Content);
 
             if (WeatherOpt.Verbose) Monitor.Log($"Loading climate type: {WeatherOpt.ClimateType} from file", LogLevel.Trace);
 
             string path = Path.Combine("data", "Weather", WeatherOpt.ClimateType + ".json");
             GameClimate = helper.ReadJsonFile<FerngillClimate>(path);
 
-
             CurrentWeather = new WeatherConditions();
 
             //subscribe to events
             TimeEvents.AfterDayStarted += HandleNewDay;
             SaveEvents.BeforeSave += OnEndOfDay;
-
+            SaveEvents.AfterLoad += SaveEvents_AfterLoad;
             TimeEvents.TimeOfDayChanged += TenMinuteUpdate;
             GameEvents.UpdateTick += CheckForChanges;
             SaveEvents.AfterReturnToTitle += ResetMod;
             GraphicsEvents.OnPostRenderEvent += DrawObjects;
-            SaveEvents.AfterSave += InitMod;
 
             ControlEvents.KeyPressed += (sender, e) => this.ReceiveKeyPress(e.KeyPressed, this.WeatherOpt.Keyboard);
             MenuEvents.MenuClosed += (sender, e) => this.ReceiveMenuClosed(e.PriorMenu);
-
+         
             //console commands
             helper.ConsoleCommands
                   .Add("weather_settommorowweather", helper.Translation.Get("console-text.desc_tmrweather"), TmrwWeatherChangeFromConsole)
                   .Add("weather_setweather", helper.Translation.Get("console-text.desc_setweather"), WeatherChangeFromConsole)
                   .Add("debug_changecondt", "Changes conditions. Debug function.", DebugChgCondition);
         }
 
+        private void SaveEvents_AfterLoad(object sender, EventArgs e)
+        {
+            //TV command
+            CustomTVMod.changeAction("weather", HandleWeather);
+        }
+
         /// <summary>
         /// This function handles the end of the day.
         /// </summary>
@@ -133,10 +140,22 @@ private void OnEndOfDay(object sender, EventArgs e)
             OurMoon.HandleMoonAtSleep(Game1.getFarm(), Helper.Translation);
         }
 
-        private void InitMod(object sender, EventArgs e)
+        /// <summary>
+        /// This function handles the TV interception, putting up the sprite and outputting the text.
+        /// </summary>
+        /// <param name="tv">The TV being intercepted</param>
+        /// <param name="sprite">The sprite being used</param>
+        /// <param name="who">The Farmer being intercepted for</param>
+        /// <param name="answer">The string being answered with</param>
+        public void HandleWeather(TV tv, TemporaryAnimatedSprite sprite, StardewValley.Farmer who, string answer)
         {
-            OurIcons = new Sprites.Icons(Helper.Content);
-            CustomTVMod.changeAction("weather", HandleWeather); //replace weather
+            TemporaryAnimatedSprite WeatherCaster = new TemporaryAnimatedSprite(
+                Game1.mouseCursors, new Rectangle(497, 305, 42, 28), 9999f, 1, 999999,
+                tv.getScreenPosition(), false, false,
+                (float)((double)(tv.boundingBox.Bottom - 1) / 10000.0 + 9.99999974737875E-06),
+                0.0f, Color.White, tv.getScreenSizeModifier(), 0.0f, 0.0f, 0.0f, false);
+
+            CustomTVMod.showProgram(WeatherCaster, Game1.parseText(GetWeatherForecast()), CustomTVMod.endProgram);
         }
 
         /// <summary>
@@ -157,7 +176,7 @@ public string GetWeatherForecast()
 
             if (Game1.timeOfDay < 1800) //don't display today's weather 
             {
-                tvText = Helper.Translation.Get("tv.desc-today", new
+                tvText += Helper.Translation.Get("tv.desc-today", new
                 {
                     temperature = CurrentWeather.GetTemperatureString(WeatherOpt.ShowBothScales, Helper.Translation),
                     weathercondition = CurrentWeather.GetDescText(CurrentWeather.TodayWeather, SDate.Now(), Dice, Helper.Translation)
@@ -167,31 +186,13 @@ public string GetWeatherForecast()
             //Tomorrow weather
             tvText += tvText = Helper.Translation.Get("tv.desc-tomorrow", new
             {
-                temperature = CurrentWeather.GetTemperatureString(WeatherOpt.ShowBothScales, Helper.Translation),
-                weathercondition = CurrentWeather.GetDescText(CurrentWeather.TodayWeather, SDate.Now(), Dice, Helper.Translation)
+                temperature = CurrentWeather.GetTomorrowTemperatureString(WeatherOpt.ShowBothScales, Helper.Translation),
+                weathercondition = CurrentWeather.GetDescText(CurrentWeather.TomorrowWeather, SDate.Now().AddDays(1), Dice, Helper.Translation)
             });
 
             return tvText;
         }
 
-        /// <summary>
-        /// This function handles the TV interception, putting up the sprite and outputting the text.
-        /// </summary>
-        /// <param name="tv">The TV being intercepted</param>
-        /// <param name="sprite">The sprite being used</param>
-        /// <param name="who">The Farmer being intercepted for</param>
-        /// <param name="answer">The string being answered with</param>
-        public void HandleWeather(TV tv, TemporaryAnimatedSprite sprite, StardewValley.Farmer who, string answer)
-        {
-            TemporaryAnimatedSprite WeatherCaster = new TemporaryAnimatedSprite(
-                Game1.mouseCursors, new Rectangle(497, 305, 42, 28), 9999f, 1, 999999,
-                tv.getScreenPosition(), false, false,
-                (float)((double)(tv.boundingBox.Bottom - 1) / 10000.0 + 9.99999974737875E-06),
-                0.0f, Color.White, tv.getScreenSizeModifier(), 0.0f, 0.0f, 0.0f, false);
-
-            CustomTVMod.showProgram(WeatherCaster, Game1.parseText(GetWeatherForecast()), CustomTVMod.endProgram);
-        }
-
         /// <summary>
         /// This checks for things every second.
         /// </summary>
@@ -285,11 +286,12 @@ private void UpdateWeatherOnNewDay()
             CurrentWeather.GetTodayWeather();
 
             if (CurrentWeather.TomorrowTemps == null)
-                CurrentWeather.TodayTemps = GameClimate.GetTemperatures(SDate.Now(), Dice, DebugOutput);
+                CurrentWeather.SetTodayTemps(GameClimate.GetTemperatures(SDate.Now(), Dice, DebugOutput));
             else
-                CurrentWeather.TodayTemps = new RangePair(CurrentWeather.TomorrowTemps);
+                CurrentWeather.SetTodayTemps(CurrentWeather.TomorrowTemps);
+
+            CurrentWeather.SetTmrwTemps(GameClimate.GetTemperatures(SDate.Now().AddDays(1), Dice, DebugOutput));
 
-            CurrentWeather.TomorrowTemps = GameClimate.GetTemperatures(SDate.Now().AddDays(1), Dice, DebugOutput);
             if (WeatherOpt.Verbose)
                 Monitor.Log($"Updated the temperature for tommorow and today. Setting weather for today... ", LogLevel.Trace);
 
@@ -299,7 +301,7 @@ private void UpdateWeatherOnNewDay()
                 if (WeatherOpt.Verbose)
                     Monitor.Log("It is a wedding or festival today. Not attempting to run special weather or fog.");
 
-                if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
+                //if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
                 return;
             }
 
@@ -360,6 +362,9 @@ private void UpdateWeatherOnNewDay()
             //             Dry Lightning - occurs in weather_clear in any season if temps are >24C.
             //             Thundersnow  - as Blizzard, but really rare.
 
+            if (WeatherOpt.Verbose)
+                Monitor.Log("Testing for special weathers - first, blizzard and thundrsnow");
+
             if (CurrentWeather.TodayWeather == Game1.weather_snow)
             {
                 double blizRoll = Dice.NextDoublePositive();
@@ -386,6 +391,9 @@ private void UpdateWeatherOnNewDay()
                 }
             }
 
+            if (WeatherOpt.Verbose)
+                Monitor.Log("Testing for special weathers - dry lightning.");
+
             if (CurrentWeather.TodayWeather == Game1.weather_sunny)
             {
                 double oddsRoll = Dice.NextDoublePositive();
@@ -405,7 +413,7 @@ private void UpdateWeatherOnNewDay()
                 if (WeatherOpt.Verbose)
                     Monitor.Log($"Festival tomorrow. Aborting processing.", LogLevel.Trace);
 
-                if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
+                //if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
                 return;
             }
 
@@ -423,10 +431,13 @@ private void UpdateWeatherOnNewDay()
                 if (WeatherOpt.Verbose)
                     Monitor.Log($"The game will force tomorrow. Aborting processing.", LogLevel.Trace);
 
-                if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
+                //if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
                 return;
             }
 
+            if (WeatherOpt.Verbose)
+                Monitor.Log("Setting weather for tomorrow");
+
             //now set tomorrow's weather
             var OddsForTheDay = GameClimate.GetClimateForDate(SDate.Now().AddDays(1));
 
@@ -444,6 +455,9 @@ private void UpdateWeatherOnNewDay()
                 Monitor.Log("The weather has failed to process in some manner. Falling back to [sunny]", LogLevel.Info);
             }
 
+            if (WeatherOpt.Verbose)
+                Monitor.Log($"Weather result is {Result}");
+
             //now parse the result.
             if (Result == "rain")
             {
@@ -485,13 +499,6 @@ private void UpdateWeatherOnNewDay()
                     Game1.weatherForTomorrow = Game1.weather_snow;
                 }
 
-                if (WeatherOpt.Verbose)
-                    Monitor.Log($"We've set the weather for Tomorrow. It is: {Game1.weatherForTomorrow}");  
-
-                //set trackers
-                EndWeather = Game1.weatherForTomorrow;
-
-                if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
             }
 
             if (Result == "debris")
@@ -503,6 +510,14 @@ private void UpdateWeatherOnNewDay()
             {
                 Game1.weatherForTomorrow = Game1.weather_sunny;
             }
+
+            if (WeatherOpt.Verbose)
+                Monitor.Log($"We've set the weather for Tomorrow. It is: {Game1.weatherForTomorrow}");
+
+            //set trackers
+            EndWeather = Game1.weatherForTomorrow;
+
+            //if (WeatherOpt.Verbose) Monitor.Log(DebugOutput.ToString());
         }
 
         private bool CheckForForceDay(SDate Target)

diff --git a/ClimatesOfFerngillRebuild/README.md b/ClimatesOfFerngillRebuild/README.md
@@ -1,6 +1,6 @@
 # Climates of Ferngill (Rebuild) You Can (Not) Have Weather
 
-Current Version (26 July 2017): v0.8 alpha
+Current Version (26 July 2017): v1.0 alpha
 
 ## Overview
 
@@ -11,14 +11,17 @@ This mod does the following:
 - Changes the rain totem to occasionally spawm storms as well.
 - Adds a moon overhead, which will act on the world
 - Adds a weather menu option, which will display information about the weather
-- The weather channel on the TV is also overriden
+- Changes the text for the TV weather channel
 
 ##Known Issues
 - When foggy, swinging a tool or blade will cause the fog to blink.
 
 ##To Do
 - Stamina drain for storms and blizzards not implemented
-- Frost and Heatwaves are not yet implemented 
+- Frost and Heatwaves are not yet implemented
+
+## Wishlist
+- Readd an item to remove the stamina drain. (Pending on SMAPI 2.0+)
 
 ##Requirements