StardewValley
/
Ui-Info-Suite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed missing travelling merchant icon. Fixed possible race condition in birthday icon.

This commit is contained in:
cdaragorn 2019-01-09 13:26:53 -07:00
parent b785ecae04
commit 07bc66a2e6
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDVModTest/Properties/AssemblyInfo.cs
View File

@ -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")]

1
SDVModTest/UIElements/LocationOfTownsfolk.cs
View File

@ -57,6 +57,7 @@ namespace UIInfoSuite.UIElements
{ "Sewer", new KeyValuePair<int, int>(380, 596) },
{ "WizardHouse", new KeyValuePair<int, int>(196, 352) },
{ "Trailer", new KeyValuePair<int, int>(780, 360) },
{ "pamHouseUpgrade", new KeyValuePair<int, int>(780, 360) },
{ "Forest", new KeyValuePair<int, int>(80, 272) },
{ "Woods", new KeyValuePair<int, int>(100, 272) },
{ "WitchSwamp", new KeyValuePair<int, int>(0, 0) },

3
SDVModTest/UIElements/ShowBirthdayIcon.cs
View File

@ -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(

6
SDVModTest/UIElements/ShowTravelingMerchant.cs
View File

@ -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;
}
}

2
SDVModTest/manifest.json
View File

@ -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",