diff --git a/SDVModTest/Properties/AssemblyInfo.cs b/SDVModTest/Properties/AssemblyInfo.cs index a2906b0..e1885b6 100644 --- a/SDVModTest/Properties/AssemblyInfo.cs +++ b/SDVModTest/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.20.0")] -[assembly: AssemblyFileVersion("1.7.20.0")] +[assembly: AssemblyVersion("1.7.23.0")] +[assembly: AssemblyFileVersion("1.7.23.0")] diff --git a/SDVModTest/UIElements/LocationOfTownsfolk.cs b/SDVModTest/UIElements/LocationOfTownsfolk.cs index 69eacfa..40bd0fd 100644 --- a/SDVModTest/UIElements/LocationOfTownsfolk.cs +++ b/SDVModTest/UIElements/LocationOfTownsfolk.cs @@ -57,6 +57,7 @@ namespace UIInfoSuite.UIElements { "Sewer", new KeyValuePair(380, 596) }, { "WizardHouse", new KeyValuePair(196, 352) }, { "Trailer", new KeyValuePair(780, 360) }, + { "pamHouseUpgrade", new KeyValuePair(780, 360) }, { "Forest", new KeyValuePair(80, 272) }, { "Woods", new KeyValuePair(100, 272) }, { "WitchSwamp", new KeyValuePair(0, 0) }, diff --git a/SDVModTest/UIElements/ShowBirthdayIcon.cs b/SDVModTest/UIElements/ShowBirthdayIcon.cs index 0554a87..33f08d7 100644 --- a/SDVModTest/UIElements/ShowBirthdayIcon.cs +++ b/SDVModTest/UIElements/ShowBirthdayIcon.cs @@ -137,7 +137,8 @@ namespace UIInfoSuite.UIElements private void OnRenderedHud(object sender, RenderedHudEventArgs e) { // draw hover text - if (_birthdayNPC != null && _birthdayIcon.containsPoint(Game1.getMouseX(), Game1.getMouseY())) + if (_birthdayNPC != null && + (_birthdayIcon?.containsPoint(Game1.getMouseX(), Game1.getMouseY()) ?? false)) { String hoverText = String.Format("{0}'s Birthday", _birthdayNPC.Name); IClickableMenu.drawHoverText( diff --git a/SDVModTest/UIElements/ShowTravelingMerchant.cs b/SDVModTest/UIElements/ShowTravelingMerchant.cs index fae3899..13fcdb4 100644 --- a/SDVModTest/UIElements/ShowTravelingMerchant.cs +++ b/SDVModTest/UIElements/ShowTravelingMerchant.cs @@ -23,9 +23,9 @@ namespace UIInfoSuite.UIElements if (showTravelingMerchant) { UpdateTravelingMerchant(); - _helper.Events.Display.RenderingHud -= OnRenderingHud; - _helper.Events.Display.RenderedHud -= OnRenderedHud; - _helper.Events.GameLoop.DayStarted -= OnDayStarted; + _helper.Events.Display.RenderingHud += OnRenderingHud; + _helper.Events.Display.RenderedHud += OnRenderedHud; + _helper.Events.GameLoop.DayStarted += OnDayStarted; } } diff --git a/SDVModTest/manifest.json b/SDVModTest/manifest.json index a514cb2..97a53b6 100644 --- a/SDVModTest/manifest.json +++ b/SDVModTest/manifest.json @@ -1,7 +1,7 @@ { "Name": "UI Info Suite", "Author": "Cdaragorn", - "Version": "1.7.20", + "Version": "1.7.23", "Description": "Adds a lot of useful information to the user interface. This is based on Demiacle's excellent UIModSuite.", "UniqueID": "Cdaragorn.UiInfoSuite", "EntryDll": "UIInfoSuite.dll",