From d4ec8461e85c849933f8c7572dda3f5789a0ba5a Mon Sep 17 00:00:00 2001 From: cdaragorn Date: Sun, 15 Jul 2018 10:50:29 -0600 Subject: [PATCH 1/2] Improved experience bar. Fixed calendar bug. --- SDVModTest/Options/ModOptionsPageHandler.cs | 5 +- SDVModTest/Properties/AssemblyInfo.cs | 4 +- SDVModTest/UI Info Suite.csproj | 6 +- SDVModTest/UIElements/ExperienceBar.cs | 459 ++++++++++-------- ...howCalendarAndBillboardOnGameMenuButton.cs | 4 +- .../UIElements/ShowCropAndBarrelTime.cs | 26 +- .../UIElements/ShowToolUpgradeStatus.cs | 10 +- SDVModTest/manifest.json | 2 +- SDVModTest/packages.config | 2 +- 9 files changed, 300 insertions(+), 218 deletions(-) diff --git a/SDVModTest/Options/ModOptionsPageHandler.cs b/SDVModTest/Options/ModOptionsPageHandler.cs index 009f42e..eacc5df 100644 --- a/SDVModTest/Options/ModOptionsPageHandler.cs +++ b/SDVModTest/Options/ModOptionsPageHandler.cs @@ -99,6 +99,7 @@ namespace UIInfoSuite.Options } + public void Dispose() { foreach (var item in _elementsToDispose) @@ -147,9 +148,7 @@ namespace UIInfoSuite.Options private void SetActiveClickableMenuToModOptionsPage() { - GameMenu menu = Game1.activeClickableMenu as GameMenu; - - if (menu != null) + if (Game1.activeClickableMenu is GameMenu menu) menu.currentTab = _modOptionsTabPageNumber; } diff --git a/SDVModTest/Properties/AssemblyInfo.cs b/SDVModTest/Properties/AssemblyInfo.cs index b8e4f3f..7a5a582 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.7.0")] -[assembly: AssemblyFileVersion("1.7.7.0")] +[assembly: AssemblyVersion("1.7.12.0")] +[assembly: AssemblyFileVersion("1.7.12.0")] diff --git a/SDVModTest/UI Info Suite.csproj b/SDVModTest/UI Info Suite.csproj index 8c60b9d..8a91358 100644 --- a/SDVModTest/UI Info Suite.csproj +++ b/SDVModTest/UI Info Suite.csproj @@ -151,7 +151,7 @@ - + @@ -163,11 +163,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/SDVModTest/UIElements/ExperienceBar.cs b/SDVModTest/UIElements/ExperienceBar.cs index f7982eb..ed1119b 100644 --- a/SDVModTest/UIElements/ExperienceBar.cs +++ b/SDVModTest/UIElements/ExperienceBar.cs @@ -22,8 +22,9 @@ namespace UIInfoSuite.UIElements class ExperienceBar : IDisposable { private const int MaxBarWidth = 175; - private int _currentLevelIndex = 4; - private float _currentExperience = 0; + + //private float _currentExperience = 0; + private int[] _currentExperience = new int[5]; private readonly List _experiencePointDisplays = new List(); private GameLocation _currentLocation = new GameLocation(); private readonly TimeSpan _levelUpPauseTime = TimeSpan.FromSeconds(2); @@ -92,6 +93,8 @@ namespace UIInfoSuite.UIElements public void ToggleShowExperienceGain(bool showExperienceGain) { + for (int i = 0; i < _currentExperience.Length; ++i) + _currentExperience[i] = Game1.player.experiencePoints[i]; _showExperienceGain = showExperienceGain; } @@ -172,216 +175,181 @@ namespace UIInfoSuite.UIElements { Item currentItem = Game1.player.CurrentItem; Rectangle rectangle1 = new Rectangle(10, 428, 10, 10); - int experienceLevel; + int experienceLevel = 0; + int currentLevelIndex = -1; + int experienceRequiredToLevel = -1; + int experienceFromPreviousLevels = -1; + int experienceEarnedThisLevel = -1; - if (currentItem is FishingRod) + + + for (int i = 0; i < _currentExperience.Length; ++i) { - _experienceFillColor = new Color(17, 84, 252, 0.63f); - _currentLevelIndex = 1; - rectangle1.X = 20; - experienceLevel = Game1.player.fishingLevel.Value; + if (_currentExperience[i] != Game1.player.experiencePoints[i]) + { + currentLevelIndex = i; + break; + } } - else if (currentItem is Pickaxe) + + if (currentLevelIndex > -1) { - _experienceFillColor = new Color(145, 104, 63, 0.63f); - _currentLevelIndex = 3; - rectangle1.X = 30; - experienceLevel = Game1.player.miningLevel.Value; - } - else if (currentItem is MeleeWeapon && - currentItem.Name != "Scythe") - { - _experienceFillColor = new Color(204, 0, 3, 0.63f); - _currentLevelIndex = 4; - rectangle1.X = 120; - experienceLevel = Game1.player.combatLevel.Value; - } - else if (Game1.currentLocation is Farm && - !(currentItem is Axe)) - { - _experienceFillColor = new Color(255, 251, 35, 0.38f); - _currentLevelIndex = 0; - rectangle1.X = 10; - experienceLevel = Game1.player.farmingLevel.Value; + switch ((EventArgsLevelUp.LevelType)currentLevelIndex) + { + case EventArgsLevelUp.LevelType.Combat: + { + _experienceFillColor = new Color(204, 0, 3, 0.63f); + rectangle1.X = 120; + experienceLevel = Game1.player.combatLevel.Value; + break; + } + + case EventArgsLevelUp.LevelType.Farming: + { + _experienceFillColor = new Color(255, 251, 35, 0.38f); + rectangle1.X = 10; + experienceLevel = Game1.player.farmingLevel.Value; + break; + } + + case EventArgsLevelUp.LevelType.Fishing: + { + _experienceFillColor = new Color(17, 84, 252, 0.63f); + rectangle1.X = 20; + experienceLevel = Game1.player.fishingLevel.Value; + break; + } + + case EventArgsLevelUp.LevelType.Foraging: + { + _experienceFillColor = new Color(0, 234, 0, 0.63f); + rectangle1.X = 60; + experienceLevel = Game1.player.foragingLevel.Value; + break; + } + + case EventArgsLevelUp.LevelType.Mining: + { + _experienceFillColor = new Color(145, 104, 63, 0.63f); + rectangle1.X = 30; + experienceLevel = Game1.player.miningLevel.Value; + break; + } + } + + experienceRequiredToLevel = GetExperienceRequiredToLevel(experienceLevel); + experienceFromPreviousLevels = GetExperienceRequiredToLevel(experienceLevel - 1); + experienceEarnedThisLevel = Game1.player.experiencePoints[currentLevelIndex] - experienceFromPreviousLevels; + int experiencePreviouslyEarnedThisLevel = _currentExperience[currentLevelIndex] - experienceFromPreviousLevels; + _currentExperience[currentLevelIndex] = Game1.player.experiencePoints[currentLevelIndex]; + + ShowExperienceBar(); + if (_showExperienceGain) + { + _experiencePointDisplays.Add( + new ExperiencePointDisplay( + experienceEarnedThisLevel - experiencePreviouslyEarnedThisLevel, + Game1.player.getLocalPosition(Game1.viewport))); + } + + } else { - _experienceFillColor = new Color(0, 234, 0, 0.63f); - _currentLevelIndex = 2; - rectangle1.X = 60; - experienceLevel = Game1.player.foragingLevel.Value; - } + if (currentItem is FishingRod) + { + _experienceFillColor = new Color(17, 84, 252, 0.63f); + currentLevelIndex = 1; + rectangle1.X = 20; + experienceLevel = Game1.player.fishingLevel.Value; + } + else if (currentItem is Pickaxe) + { + _experienceFillColor = new Color(145, 104, 63, 0.63f); + currentLevelIndex = 3; + rectangle1.X = 30; + experienceLevel = Game1.player.miningLevel.Value; + } + else if (currentItem is MeleeWeapon && + currentItem.Name != "Scythe") + { + _experienceFillColor = new Color(204, 0, 3, 0.63f); + currentLevelIndex = 4; + rectangle1.X = 120; + experienceLevel = Game1.player.combatLevel.Value; + } + else if (Game1.currentLocation is Farm && + !(currentItem is Axe)) + { + _experienceFillColor = new Color(255, 251, 35, 0.38f); + currentLevelIndex = 0; + rectangle1.X = 10; + experienceLevel = Game1.player.farmingLevel.Value; + } + else + { + _experienceFillColor = new Color(0, 234, 0, 0.63f); + currentLevelIndex = 2; + rectangle1.X = 60; + experienceLevel = Game1.player.foragingLevel.Value; + } - if (experienceLevel <= 9) - { - int experienceRequiredToLevel = GetExperienceRequiredToLevel(experienceLevel); - int experienceFromPreviousLevels = GetExperienceRequiredToLevel(experienceLevel - 1); - int experienceEarnedThisLevel = Game1.player.experiencePoints[_currentLevelIndex] - experienceFromPreviousLevels; + experienceRequiredToLevel = GetExperienceRequiredToLevel(experienceLevel); + experienceFromPreviousLevels = GetExperienceRequiredToLevel(experienceLevel - 1); + experienceEarnedThisLevel = Game1.player.experiencePoints[currentLevelIndex] - experienceFromPreviousLevels; if (_previousItem != currentItem) - { ShowExperienceBar(); - } - else if (_currentExperience != experienceEarnedThisLevel) + } + + _previousItem = currentItem; + + if (_shouldDrawLevelUp) + { + Vector2 playerLocalPosition = Game1.player.getLocalPosition(Game1.viewport); + Game1.spriteBatch.Draw( + Game1.mouseCursors, + new Vector2( + playerLocalPosition.X - 74, + playerLocalPosition.Y - 130), + _levelUpIconRectangle, + _iconColor, + 0, + Vector2.Zero, + Game1.pixelZoom, + SpriteEffects.None, + 0.85f); + + Game1.drawWithBorder( + _helper.SafeGetString( + LanguageKeys.LevelUp), + Color.DarkSlateGray, + Color.PaleTurquoise, + new Vector2( + playerLocalPosition.X - 28, + playerLocalPosition.Y - 130)); + } + + for (int i = _experiencePointDisplays.Count - 1; i >= 0; --i) + { + if (_experiencePointDisplays[i].IsInvisible) { - ShowExperienceBar(); - if (experienceEarnedThisLevel - _currentExperience > 0 && - _showExperienceGain) - { - _experiencePointDisplays.Add( - new ExperiencePointDisplay( - experienceEarnedThisLevel - _currentExperience, - Game1.player.getLocalPosition(Game1.viewport))); - } + _experiencePointDisplays.RemoveAt(i); } - - _previousItem = currentItem; - _currentExperience = experienceEarnedThisLevel; - - if (_shouldDrawLevelUp) + else { - Vector2 playerLocalPosition = Game1.player.getLocalPosition(Game1.viewport); - Game1.spriteBatch.Draw( - Game1.mouseCursors, - new Vector2( - playerLocalPosition.X - 74, - playerLocalPosition.Y - 130), - _levelUpIconRectangle, - _iconColor, - 0, - Vector2.Zero, - Game1.pixelZoom, - SpriteEffects.None, - 0.85f); - - Game1.drawWithBorder( - _helper.SafeGetString( - LanguageKeys.LevelUp), - Color.DarkSlateGray, - Color.PaleTurquoise, - new Vector2( - playerLocalPosition.X - 28, - playerLocalPosition.Y - 130)); + _experiencePointDisplays[i].Draw(); } + } - for (int i = _experiencePointDisplays.Count - 1; i >= 0; --i) - { - if (_experiencePointDisplays[i].IsInvisible) - { - _experiencePointDisplays.RemoveAt(i); - } - else - { - _experiencePointDisplays[i].Draw(); - } - } + if (_experienceBarShouldBeVisible && + _showExperienceBar) + { + int experienceDifferenceBetweenLevels = experienceRequiredToLevel - experienceFromPreviousLevels; + int barWidth = (int)((double)experienceEarnedThisLevel / experienceDifferenceBetweenLevels * MaxBarWidth); - if (_experienceBarShouldBeVisible && - _showExperienceBar) - { - int barWidth = (int)(_currentExperience / (experienceRequiredToLevel - experienceFromPreviousLevels) * MaxBarWidth); - float leftSide = Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Left; + DrawExperienceBar(barWidth, experienceEarnedThisLevel, experienceDifferenceBetweenLevels, experienceLevel, rectangle1); - if (Game1.isOutdoorMapSmallerThanViewport()) - { - int num3 = Game1.currentLocation.map.Layers[0].LayerWidth * Game1.tileSize; - leftSide += (Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Right - num3) / 2; - } - - Game1.drawDialogueBox( - (int)leftSide, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 160, - 240, - 160, - false, - true); - - Game1.spriteBatch.Draw( - Game1.staminaRect, - new Rectangle( - (int)leftSide + 32, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 63, - barWidth, - 31), - _experienceFillColor); - - Game1.spriteBatch.Draw( - Game1.staminaRect, - new Rectangle( - (int)leftSide + 32, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 63, - Math.Min(4, barWidth), - 31), - _experienceFillColor); - - Game1.spriteBatch.Draw( - Game1.staminaRect, - new Rectangle( - (int)leftSide + 32, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 63, - barWidth, - 4), - _experienceFillColor); - - Game1.spriteBatch.Draw( - Game1.staminaRect, - new Rectangle( - (int)leftSide + 32, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 36, - barWidth, - 4), - _experienceFillColor); - - ClickableTextureComponent textureComponent = - new ClickableTextureComponent( - "", - new Rectangle( - (int)leftSide - 36, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 80, - 260, - 100), - "", - "", - Game1.mouseCursors, - new Rectangle(0, 0, 0, 0), - Game1.pixelZoom); - - if (textureComponent.containsPoint(Game1.getMouseX(), Game1.getMouseY())) - { - Game1.drawWithBorder( - _currentExperience + "/" + (experienceRequiredToLevel - experienceFromPreviousLevels), - Color.Black, - Color.Black, - new Vector2( - leftSide + 33, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 70)); - } - else - { - Game1.spriteBatch.Draw( - Game1.mouseCursors, - new Vector2( - leftSide + 54, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 62), - rectangle1, - _iconColor, - 0, - Vector2.Zero, - 2.9f, - SpriteEffects.None, - 0.85f); - - Game1.drawWithBorder( - experienceLevel.ToString(), - Color.Black * 0.6f, - Color.Black, - new Vector2( - leftSide + 33, - Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 70)); - } - - - } } } @@ -421,5 +389,108 @@ namespace UIInfoSuite.UIElements _experienceBarShouldBeVisible = true; } + private void DrawExperienceBar(int barWidth, int experienceGainedThisLevel, int experienceRequiredForNextLevel, int currentLevel, Rectangle iconPosition) + { + float leftSide = Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Left; + + if (Game1.isOutdoorMapSmallerThanViewport()) + { + int num3 = Game1.currentLocation.map.Layers[0].LayerWidth * Game1.tileSize; + leftSide += (Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Right - num3) / 2; + } + + Game1.drawDialogueBox( + (int)leftSide, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 160, + 240, + 160, + false, + true); + + Game1.spriteBatch.Draw( + Game1.staminaRect, + new Rectangle( + (int)leftSide + 32, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 63, + barWidth, + 31), + _experienceFillColor); + + Game1.spriteBatch.Draw( + Game1.staminaRect, + new Rectangle( + (int)leftSide + 32, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 63, + Math.Min(4, barWidth), + 31), + _experienceFillColor); + + Game1.spriteBatch.Draw( + Game1.staminaRect, + new Rectangle( + (int)leftSide + 32, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 63, + barWidth, + 4), + _experienceFillColor); + + Game1.spriteBatch.Draw( + Game1.staminaRect, + new Rectangle( + (int)leftSide + 32, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 36, + barWidth, + 4), + _experienceFillColor); + + ClickableTextureComponent textureComponent = + new ClickableTextureComponent( + "", + new Rectangle( + (int)leftSide - 36, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 80, + 260, + 100), + "", + "", + Game1.mouseCursors, + new Rectangle(0, 0, 0, 0), + Game1.pixelZoom); + + if (textureComponent.containsPoint(Game1.getMouseX(), Game1.getMouseY())) + { + Game1.drawWithBorder( + experienceGainedThisLevel + "/" + experienceRequiredForNextLevel, + Color.Black, + Color.Black, + new Vector2( + leftSide + 33, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 70)); + } + else + { + Game1.spriteBatch.Draw( + Game1.mouseCursors, + new Vector2( + leftSide + 54, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 62), + iconPosition, + _iconColor, + 0, + Vector2.Zero, + 2.9f, + SpriteEffects.None, + 0.85f); + + Game1.drawWithBorder( + currentLevel.ToString(), + Color.Black * 0.6f, + Color.Black, + new Vector2( + leftSide + 33, + Game1.graphics.GraphicsDevice.Viewport.TitleSafeArea.Bottom - 70)); + } + } + } } diff --git a/SDVModTest/UIElements/ShowCalendarAndBillboardOnGameMenuButton.cs b/SDVModTest/UIElements/ShowCalendarAndBillboardOnGameMenuButton.cs index d9a09ca..42b125a 100644 --- a/SDVModTest/UIElements/ShowCalendarAndBillboardOnGameMenuButton.cs +++ b/SDVModTest/UIElements/ShowCalendarAndBillboardOnGameMenuButton.cs @@ -60,7 +60,9 @@ namespace UIInfoSuite.UIElements List menuList = typeof(GameMenu).GetField("pages", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(Game1.activeClickableMenu) as List; if (menuList[0] is InventoryPage inventory) - _heldItem = typeof(InventoryPage).GetField("heldItem", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(inventory) as Item; + { + _heldItem = Game1.player.CursorSlotItem; + } } } diff --git a/SDVModTest/UIElements/ShowCropAndBarrelTime.cs b/SDVModTest/UIElements/ShowCropAndBarrelTime.cs index 05297f9..6790388 100644 --- a/SDVModTest/UIElements/ShowCropAndBarrelTime.cs +++ b/SDVModTest/UIElements/ShowCropAndBarrelTime.cs @@ -66,7 +66,15 @@ namespace UIInfoSuite.UIElements if (Game1.currentLocation.terrainFeatures == null || !Game1.currentLocation.terrainFeatures.TryGetValue(Game1.currentCursorTile, out _terrain)) { - _terrain = null; + if (_currentTile is IndoorPot pot && + pot.hoeDirt.Value != null) + { + _terrain = pot.hoeDirt.Value; + } + else + { + _terrain = null; + } } } else @@ -139,11 +147,11 @@ namespace UIInfoSuite.UIElements _currentTile.Name != "Heater") { StringBuilder hoverText = new StringBuilder(); + hoverText.AppendLine(_currentTile.heldObject.Value.DisplayName); if (_currentTile is Cask) { Cask currentCask = _currentTile as Cask; - hoverText.Append((int)(currentCask.daysToMature.Value / currentCask.agingRate.Value)) .Append(" " + _helper.SafeGetString( LanguageKeys.DaysToMature)); @@ -226,16 +234,18 @@ namespace UIInfoSuite.UIElements else if (_terrain is FruitTree) { FruitTree tree = _terrain as FruitTree; - + var text = new StardewValley.Object(new Debris(tree.indexOfFruit.Value, Vector2.Zero, Vector2.Zero).chunkType.Value, 1).DisplayName; if (tree.daysUntilMature.Value > 0) { - IClickableMenu.drawHoverText( - Game1.spriteBatch, - tree.daysUntilMature.Value + " " + + text += Environment.NewLine + tree.daysUntilMature.Value + " " + _helper.SafeGetString( - LanguageKeys.DaysToMature), - Game1.smallFont); + LanguageKeys.DaysToMature); + } + IClickableMenu.drawHoverText( + Game1.spriteBatch, + text, + Game1.smallFont); } } } diff --git a/SDVModTest/UIElements/ShowToolUpgradeStatus.cs b/SDVModTest/UIElements/ShowToolUpgradeStatus.cs index 0dd74b5..91f2b37 100644 --- a/SDVModTest/UIElements/ShowToolUpgradeStatus.cs +++ b/SDVModTest/UIElements/ShowToolUpgradeStatus.cs @@ -42,15 +42,15 @@ namespace UIInfoSuite.UIElements private void CheckForMidDayChanges(object sender, EventArgs e) { - if (_toolBeingUpgraded != Game1.player.toolBeingUpgraded) + if (_toolBeingUpgraded != Game1.player.toolBeingUpgraded.Value) DayChanged(null, null); } private void DayChanged(object sender, EventArgs e) { - if (Game1.player.toolBeingUpgraded != null) + if (Game1.player.toolBeingUpgraded.Value != null) { - _toolBeingUpgraded = Game1.player.toolBeingUpgraded; + _toolBeingUpgraded = Game1.player.toolBeingUpgraded.Value; _toolTexturePosition = new Rectangle(); if (_toolBeingUpgraded is StardewValley.Tools.WateringCan) @@ -86,10 +86,10 @@ namespace UIInfoSuite.UIElements _toolTexturePosition.X -= 333; } - if (Game1.player.daysLeftForToolUpgrade > 0) + if (Game1.player.daysLeftForToolUpgrade.Value > 0) { _hoverText = String.Format(_helper.SafeGetString(LanguageKeys.DaysUntilToolIsUpgraded), - Game1.player.daysLeftForToolUpgrade, _toolBeingUpgraded.DisplayName); + Game1.player.daysLeftForToolUpgrade.Value, _toolBeingUpgraded.DisplayName); } else { diff --git a/SDVModTest/manifest.json b/SDVModTest/manifest.json index 2881d1c..9680cf0 100644 --- a/SDVModTest/manifest.json +++ b/SDVModTest/manifest.json @@ -1,7 +1,7 @@ { "Name": "UI Info Suite", "Author": "Cdaragorn", - "Version": "1.7.7", + "Version": "1.7.12", "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", diff --git a/SDVModTest/packages.config b/SDVModTest/packages.config index b2f1aa2..de3eba5 100644 --- a/SDVModTest/packages.config +++ b/SDVModTest/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file From c92c20b6b62f1cb4bdc23ce54b44c2a7957e394e Mon Sep 17 00:00:00 2001 From: cdaragorn Date: Sun, 15 Jul 2018 10:54:47 -0600 Subject: [PATCH 2/2] Fixed dutch language file bug. --- SDVModTest/Properties/AssemblyInfo.cs | 4 ++-- SDVModTest/i18n/de.json | 2 +- SDVModTest/manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SDVModTest/Properties/AssemblyInfo.cs b/SDVModTest/Properties/AssemblyInfo.cs index 7a5a582..b403437 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.12.0")] -[assembly: AssemblyFileVersion("1.7.12.0")] +[assembly: AssemblyVersion("1.7.13.0")] +[assembly: AssemblyFileVersion("1.7.13.0")] diff --git a/SDVModTest/i18n/de.json b/SDVModTest/i18n/de.json index 13be106..e3fb864 100644 --- a/SDVModTest/i18n/de.json +++ b/SDVModTest/i18n/de.json @@ -14,7 +14,7 @@ "ReadyToHarvest" : "Bereit zum Ernten!", "TodaysRecipe" : "Heutiges Rezept: ", "TravelingMerchantIsInTown" : "Reisehändler ist in der Stadt!", - "DaysUntilToolIsUpgraded" : "{0} dagen totdat {2} klaar is met upgraden", + "DaysUntilToolIsUpgraded" : "{0} dagen totdat {1} klaar is met upgraden", "ToolIsFinishedBeingUpgraded" : "{0} is klaar!", "ShowLuckIcon" : "Symbol \"Glück zeigen\"", "ShowLevelUpAnimation" : "Zeige Level-up-Animation", diff --git a/SDVModTest/manifest.json b/SDVModTest/manifest.json index 9680cf0..b1d3a38 100644 --- a/SDVModTest/manifest.json +++ b/SDVModTest/manifest.json @@ -1,7 +1,7 @@ { "Name": "UI Info Suite", "Author": "Cdaragorn", - "Version": "1.7.12", + "Version": "1.7.13", "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",