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

Changed Item hover information to just add its own window instead of trying to redraw everything the game already draws for you.

This commit is contained in:
Cdaragorn 2017-07-20 20:47:19 -06:00
parent f64b7c6982
commit 2ebade76be
7 changed files with 192 additions and 150 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.2.6.0")]
[assembly: AssemblyFileVersion("1.2.6.0")]
[assembly: AssemblyVersion("1.2.7.0")]
[assembly: AssemblyFileVersion("1.2.7.0")]

39
SDVModTest/Tools.cs
View File

@ -3,6 +3,7 @@ using StardewValley.Menus;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@ -63,5 +64,43 @@ namespace UIInfoSuite
return truePrice;
}
public static Item GetHoveredItem()
{
Item hoverItem = null;
for (int i = 0; i < Game1.onScreenMenus.Count; ++i)
{
Toolbar onScreenMenu = Game1.onScreenMenus[i] as Toolbar;
if (onScreenMenu != null)
{
FieldInfo hoverItemField = typeof(Toolbar).GetField("hoverItem", BindingFlags.Instance | BindingFlags.NonPublic);
hoverItem = hoverItemField.GetValue(onScreenMenu) as Item;
//hoverItemField.SetValue(onScreenMenu, null);
}
}
if (Game1.activeClickableMenu is GameMenu)
{
List<IClickableMenu> menuList = typeof(GameMenu).GetField("pages", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(Game1.activeClickableMenu) as List<IClickableMenu>;
foreach (var menu in menuList)
{
if (menu is InventoryPage)
{
FieldInfo hoveredItemField = typeof(InventoryPage).GetField("hoveredItem", BindingFlags.Instance | BindingFlags.NonPublic);
hoverItem = hoveredItemField.GetValue(menu) as Item;
//typeof(InventoryPage).GetField("hoverText", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(menu, "");
}
}
}
if (Game1.activeClickableMenu is ItemGrabMenu)
{
hoverItem = (Game1.activeClickableMenu as MenuWithInventory).hoveredItem;
//(Game1.activeClickableMenu as MenuWithInventory).hoveredItem = null;
}
return hoverItem;
}
}
}

4
SDVModTest/UI Info Suite.csproj
View File

@ -200,11 +200,11 @@
<Copy SourceFiles="$(TargetDir)\$(TargetName).dll.mdb" DestinationFolder="$(ModPath)" Condition="Exists('$(TargetDir)\$(TargetName).dll.mdb')" />
<Copy SourceFiles="$(ProjectDir)manifest.json" DestinationFolder="$(ModPath)" />
</Target>
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.2\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.1.6.2\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>

12
SDVModTest/UIElements/ShowCalendarAndBillboardOnGameMenuButton.cs
View File

@ -29,6 +29,8 @@ namespace UIInfoSuite.UIElements
private readonly IDictionary<String, String> _options;
private readonly IModHelper _helper;
private Item _hoverItem = null;
public ShowCalendarAndBillboardOnGameMenuButton(IDictionary<String, String> options,
IModHelper helper)
{
@ -42,6 +44,7 @@ namespace UIInfoSuite.UIElements
GraphicsEvents.OnPreRenderGuiEvent -= RemoveDefaultTooltips;
ControlEvents.MouseChanged -= OnBillboardIconClick;
ControlEvents.ControllerButtonPressed -= OnBillboardIconPressed;
GraphicsEvents.OnPreRenderEvent -= GetHoverItem;
if (showCalendarAndBillboard)
{
@ -49,9 +52,15 @@ namespace UIInfoSuite.UIElements
GraphicsEvents.OnPreRenderGuiEvent += RemoveDefaultTooltips;
ControlEvents.MouseChanged += OnBillboardIconClick;
ControlEvents.ControllerButtonPressed += OnBillboardIconPressed;
GraphicsEvents.OnPreRenderEvent += GetHoverItem;
}
}
private void GetHoverItem(object sender, EventArgs e)
{
_hoverItem = Tools.GetHoveredItem();
}
private void OnBillboardIconPressed(object sender, EventArgsControllerButtonPressed e)
{
if (e.ButtonPressed == Buttons.A)
@ -96,7 +105,8 @@ namespace UIInfoSuite.UIElements
private void RenderButtons(object sender, EventArgs e)
{
if (Game1.activeClickableMenu is GameMenu &&
if (_hoverItem == null &&
Game1.activeClickableMenu is GameMenu &&
(Game1.activeClickableMenu as GameMenu).currentTab == 0)
{
_showBillboardButton.bounds.X = Game1.activeClickableMenu.xPositionOnScreen + Game1.activeClickableMenu.width - 160;

215
SDVModTest/UIElements/ShowItemHoverInformation.cs
View File

@ -59,36 +59,7 @@ namespace UIInfoSuite.UIElements
private void GetHoverItem(object sender, EventArgs e)
{
for (int i = 0; i < Game1.onScreenMenus.Count; ++i)
{
Toolbar onScreenMenu = Game1.onScreenMenus[i] as Toolbar;
if (onScreenMenu != null)
{
FieldInfo hoverItemField = typeof(Toolbar).GetField("hoverItem", BindingFlags.Instance | BindingFlags.NonPublic);
_hoverItem = hoverItemField.GetValue(onScreenMenu) as Item;
hoverItemField.SetValue(onScreenMenu, null);
}
}
if (Game1.activeClickableMenu is GameMenu)
{
List<IClickableMenu> menuList = typeof(GameMenu).GetField("pages", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(Game1.activeClickableMenu) as List<IClickableMenu>;
foreach (var menu in menuList)
{
if (menu is InventoryPage)
{
FieldInfo hoveredItemField = typeof(InventoryPage).GetField("hoveredItem", BindingFlags.Instance | BindingFlags.NonPublic);
_hoverItem = hoveredItemField.GetValue(menu) as Item;
typeof(InventoryPage).GetField("hoverText", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(menu, "");
}
}
}
if (Game1.activeClickableMenu is ItemGrabMenu)
{
_hoverItem = (Game1.activeClickableMenu as MenuWithInventory).hoveredItem;
(Game1.activeClickableMenu as MenuWithInventory).hoveredItem = null;
}
_hoverItem = Tools.GetHoveredItem();
}
private void DrawAdvancedTooltipForToolbar(object sender, EventArgs e)
@ -155,69 +126,99 @@ namespace UIInfoSuite.UIElements
{
if (_hoverItem != null)
{
String text = string.Empty;
String extra = string.Empty;
//String text = string.Empty;
//String extra = string.Empty;
int truePrice = Tools.GetTruePrice(_hoverItem);
int itemPrice = truePrice / 2;
int itemPrice = 0;
int stackPrice = 0;
if (truePrice > 0 &&
_hoverItem.Name != "Scythe")
{
int width = (int)Game1.smallFont.MeasureString(" ").Length();
int numberOfSpaces = 46 / ((int)Game1.smallFont.MeasureString(" ").Length()) + 1;
StringBuilder spaces = new StringBuilder();
for (int i = 0; i < numberOfSpaces; ++i)
{
spaces.Append(" ");
}
text = "\n" + spaces.ToString() + (truePrice / 2);
itemPrice = truePrice / 2;
//int width = (int)Game1.smallFont.MeasureString(" ").Length();
//int numberOfSpaces = 46 / ((int)Game1.smallFont.MeasureString(" ").Length()) + 1;
//StringBuilder spaces = new StringBuilder();
//for (int i = 0; i < numberOfSpaces; ++i)
//{
// spaces.Append(" ");
//}
//text = "\n" + spaces.ToString() + (truePrice / 2);
if (_hoverItem.getStack() > 1)
{
stackPrice = (truePrice / 2 * _hoverItem.getStack());
text += " (" + (truePrice / 2 * _hoverItem.getStack()) + ")";
stackPrice = (itemPrice * _hoverItem.getStack());
//text += " (" + (truePrice / 2 * _hoverItem.getStack()) + ")";
}
}
int cropPrice = 0;
bool flag = false;
//bool flag = false;
if (_hoverItem is StardewValley.Object &&
(_hoverItem as StardewValley.Object).type == "Seeds" &&
text != string.Empty &&
itemPrice > 0 &&
(_hoverItem.Name != "Mixed Seeds" ||
_hoverItem.Name != "Winter Seeds"))
{
StardewValley.Object itemObject = new StardewValley.Object(new Debris(new Crop(_hoverItem.parentSheetIndex, 0, 0).indexOfHarvest, Game1.player.position, Game1.player.position).chunkType, 1);
extra += " " + itemObject.Price;
//extra += " " + itemObject.Price;
cropPrice = itemObject.Price;
flag = true;
//flag = true;
}
String hoverTile = _hoverItem.DisplayName + text + extra;
String description = _hoverItem.getDescription();
Vector2 vector2 = DrawTooltip(Game1.spriteBatch, _hoverItem.getDescription(), hoverTile, _hoverItem);
vector2.X += 30;
vector2.Y -= 10;
//String hoverTile = _hoverItem.DisplayName + text + extra;
//String description = _hoverItem.getDescription();
//Vector2 vector2 = DrawTooltip(Game1.spriteBatch, _hoverItem.getDescription(), hoverTile, _hoverItem);
//vector2.X += 30;
//vector2.Y -= 10;
String requiredBundleName = null;
if (text != "")
foreach (var requiredBundle in _prunedRequiredBundles)
{
if (requiredBundle.Value.Contains(_hoverItem.parentSheetIndex) &&
!_hoverItem.Name.Contains("arecrow"))
{
requiredBundleName = requiredBundle.Key;
break;
}
}
int largestTextWidth = 0;
int stackTextWidth = (int)(Game1.smallFont.MeasureString(stackPrice.ToString()).Length());
int itemTextWidth = (int)(Game1.smallFont.MeasureString(itemPrice.ToString()).Length());
largestTextWidth = (stackTextWidth > itemTextWidth) ? stackTextWidth : itemTextWidth;
int windowWidth = largestTextWidth + 90;
int windowWidth = Math.Max(largestTextWidth + 90, String.IsNullOrEmpty(requiredBundleName) ? 100 : 300);
Vector2 windowPos = new Vector2(Game1.getMouseX() - windowWidth - 25, Game1.getMouseY() + 20);
int windowHeight = 65;
int windowHeight = 75;
if (stackPrice > 0)
windowHeight += 60;
windowHeight += 40;
if (cropPrice > 0)
windowHeight += 60;
windowHeight += 40;
int windowY = Game1.getMouseY() + 20;
windowY = Game1.viewport.Height - windowHeight - windowY < 0 ? Game1.viewport.Height - windowHeight : windowY;
int windowX = Game1.getMouseX() - windowWidth - 25;
if (Game1.getMouseX() > Game1.viewport.Width - 300)
{
windowX = Game1.viewport.Width - windowWidth - 350;
}
else if (windowX < 0)
{
windowX = Game1.getMouseX() + 350;
}
Vector2 windowPos = new Vector2(windowX, windowY);
Vector2 currentDrawPos = new Vector2(windowPos.X + 30, windowPos.Y + 40);
if (itemPrice > 0)
{
IClickableMenu.drawTextureBox(
Game1.spriteBatch,
@ -229,12 +230,9 @@ namespace UIInfoSuite.UIElements
windowHeight,
Color.White);
windowPos.X += 30;
windowPos.Y += 30;
Game1.spriteBatch.Draw(
Game1.debrisSpriteSheet,
new Vector2(windowPos.X, windowPos.Y + 4),
new Vector2(currentDrawPos.X, currentDrawPos.Y + 4),
Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 8, 16, 16),
Color.White,
0,
@ -243,37 +241,25 @@ namespace UIInfoSuite.UIElements
SpriteEffects.None,
0.95f);
//batch.DrawString(
// Game1.dialogueFont,
// boldTitleText,
// new Vector2(xPos + Game1.tileSize / 4, yPos + Game1.tileSize / 4 + 4) + new Vector2(0, 2),
// Game1.textShadowColor);
//batch.DrawString(
// Game1.dialogueFont,
// boldTitleText,
// new Vector2(xPos + Game1.tileSize / 4, yPos + Game1.tileSize / 4 + 4),
// Game1.textColor);
Game1.spriteBatch.DrawString(
Game1.dialogueFont,
Game1.smallFont,
itemPrice.ToString(),
new Vector2(windowPos.X + 20, windowPos.Y - 20 + 2),
new Vector2(currentDrawPos.X + 20, currentDrawPos.Y - 10 + 2),
Game1.textShadowColor);
Game1.spriteBatch.DrawString(
Game1.dialogueFont,
Game1.smallFont,
itemPrice.ToString(),
new Vector2(windowPos.X + 20, windowPos.Y - 20),
new Vector2(currentDrawPos.X + 20, currentDrawPos.Y - 10),
Game1.textColor);
windowPos.Y += 50;
currentDrawPos.Y += 40;
if (stackPrice > 0)
{
Game1.spriteBatch.Draw(
Game1.debrisSpriteSheet,
new Vector2(windowPos.X, windowPos.Y),
new Vector2(currentDrawPos.X, currentDrawPos.Y),
Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 8, 16, 16),
Color.White,
0,
@ -284,7 +270,7 @@ namespace UIInfoSuite.UIElements
Game1.spriteBatch.Draw(
Game1.debrisSpriteSheet,
new Vector2(windowPos.X, windowPos.Y + 10),
new Vector2(currentDrawPos.X, currentDrawPos.Y + 10),
Game1.getSourceRectForStandardTileSheet(Game1.debrisSpriteSheet, 8, 16, 16),
Color.White,
0,
@ -294,18 +280,18 @@ namespace UIInfoSuite.UIElements
0.95f);
Game1.spriteBatch.DrawString(
Game1.dialogueFont,
Game1.smallFont,
stackPrice.ToString(),
new Vector2(windowPos.X + 20, windowPos.Y - 20 + 2),
new Vector2(currentDrawPos.X + 20, currentDrawPos.Y - 10 + 2),
Game1.textShadowColor);
Game1.spriteBatch.DrawString(
Game1.dialogueFont,
Game1.smallFont,
stackPrice.ToString(),
new Vector2(windowPos.X + 20, windowPos.Y - 20),
new Vector2(currentDrawPos.X + 20, currentDrawPos.Y - 10),
Game1.textColor);
windowPos.Y += 50;
currentDrawPos.Y += 40;
}
//Game1.spriteBatch.Draw(
@ -319,38 +305,47 @@ namespace UIInfoSuite.UIElements
// SpriteEffects.None,
// 0.95f);
if (flag)
if (cropPrice > 0)
{
//Game1.spriteBatch.Draw(
// Game1.mouseCursors, new Vector2(vector2.X + Game1.dialogueFont.MeasureString(text).X - 10.0f, vector2.Y - 20f),
// new Rectangle(60, 428, 10, 10),
// Color.White,
// 0.0f,
// Vector2.Zero,
// Game1.pixelZoom,
// SpriteEffects.None,
// 0.85f);
Game1.spriteBatch.Draw(
Game1.mouseCursors, new Vector2(vector2.X + Game1.dialogueFont.MeasureString(text).X - 10.0f, vector2.Y - 20f),
Game1.mouseCursors,
new Vector2(currentDrawPos.X - 15, currentDrawPos.Y - 10),
new Rectangle(60, 428, 10, 10),
Color.White,
0.0f,
Vector2.Zero,
Game1.pixelZoom,
Game1.pixelZoom * 0.75f,
SpriteEffects.None,
0.85f);
Game1.spriteBatch.Draw(
Game1.mouseCursors,
new Vector2(windowPos.X, windowPos.Y),
new Rectangle(60, 428, 10, 10),
Color.White,
0.0f,
new Vector2(8, 8),
Game1.pixelZoom,
SpriteEffects.None,
0.85f);
Game1.spriteBatch.DrawString(
Game1.smallFont,
cropPrice.ToString(),
new Vector2(currentDrawPos.X + 20, currentDrawPos.Y - 10 + 2),
Game1.textShadowColor);
Game1.spriteBatch.DrawString(
Game1.smallFont,
cropPrice.ToString(),
new Vector2(currentDrawPos.X + 20, currentDrawPos.Y - 10),
Game1.textColor);
}
}
foreach (var requiredBundle in _prunedRequiredBundles)
if (!String.IsNullOrEmpty(requiredBundleName))
{
if (requiredBundle.Value.Contains(_hoverItem.parentSheetIndex) &&
!_hoverItem.Name.Contains("arecrow"))
{
int num1 = (int)vector2.X - 64;
int num2 = (int)vector2.Y - 110;
int num1 = (int)windowPos.X - 30;
int num2 = (int)windowPos.Y - 10;
int num3 = num1 + 52;
int y3 = num2 - 2;
int num4 = 288;
@ -370,7 +365,7 @@ namespace UIInfoSuite.UIElements
Game1.spriteBatch.DrawString(
Game1.dialogueFont,
requiredBundle.Key,
requiredBundleName,
new Vector2(num1 + 72, num2),
Color.White);
@ -378,10 +373,8 @@ namespace UIInfoSuite.UIElements
_bundleIcon.bounds.Y = num2;
_bundleIcon.scale = 3;
_bundleIcon.draw(Game1.spriteBatch);
break;
}
}
RestoreMenuState();
//RestoreMenuState();
}
}

4
SDVModTest/manifest.json
View File

@ -4,10 +4,10 @@
"Version": {
"MajorVersion": 1,
"MinorVersion": 2,
"PatchVersion": 6,
"PatchVersion": 7,
"Build": null
},
"Description": "Adds a host of useful information to the user interface. This is based on Demiacle's excellent UIModSuite.",
"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"
}

2
SDVModTest/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="1.6.0" targetFramework="net452" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="1.6.2" targetFramework="net452" />
</packages>