StardewValley
/
Stardew_Valley_Mods
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue where player's portrait would render on quest board.

This commit is contained in:
Joshua Navarro 2018-12-06 15:06:26 -08:00
parent edf7d3f801
commit b69882cf20
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
GeneralMods/HappyBirthday/HappyBirthday.cs
View File

@ -76,6 +76,11 @@ namespace Omegasis.HappyBirthday
/// </summary> /// </summary>
public GiftManager giftManager; public GiftManager giftManager;
/// <summary>
/// Checks if the current billboard is the daily quest screen or not.
/// </summary>
bool isDailyQuestBoard;
/********* /*********
** Public methods ** Public methods
*********/ *********/
@ -92,6 +97,7 @@ namespace Omegasis.HappyBirthday
SaveEvents.BeforeSave += this.SaveEvents_BeforeSave; SaveEvents.BeforeSave += this.SaveEvents_BeforeSave;
ControlEvents.KeyPressed += this.ControlEvents_KeyPressed; ControlEvents.KeyPressed += this.ControlEvents_KeyPressed;
MenuEvents.MenuChanged += MenuEvents_MenuChanged; MenuEvents.MenuChanged += MenuEvents_MenuChanged;
MenuEvents.MenuClosed += MenuEvents_MenuClosed;
GraphicsEvents.OnPostRenderGuiEvent += GraphicsEvents_OnPostRenderGuiEvent; GraphicsEvents.OnPostRenderGuiEvent += GraphicsEvents_OnPostRenderGuiEvent;
StardewModdingAPI.Events.GraphicsEvents.OnPostRenderHudEvent += GraphicsEvents_OnPostRenderHudEvent; ; StardewModdingAPI.Events.GraphicsEvents.OnPostRenderHudEvent += GraphicsEvents_OnPostRenderHudEvent; ;
@ -101,9 +107,15 @@ namespace Omegasis.HappyBirthday
messages = new BirthdayMessages(); messages = new BirthdayMessages();
giftManager = new GiftManager(); giftManager = new GiftManager();
isDailyQuestBoard = false;
} }
private void MenuEvents_MenuClosed(object sender, EventArgsClickableMenuClosed e)
{
this.isDailyQuestBoard = false;
}
/// <summary> /// <summary>
/// Used to properly display hovertext for all events happening on a calendar day. /// Used to properly display hovertext for all events happening on a calendar day.
@ -118,11 +130,15 @@ namespace Omegasis.HappyBirthday
if (PlayerData.BirthdaySeason.ToLower() != Game1.currentSeason.ToLower()) return; if (PlayerData.BirthdaySeason.ToLower() != Game1.currentSeason.ToLower()) return;
if (Game1.activeClickableMenu is Billboard) if (Game1.activeClickableMenu is Billboard)
{ {
if (isDailyQuestBoard) return;
if ((Game1.activeClickableMenu as Billboard).calendarDays == null) return;
int index = PlayerData.BirthdayDay; int index = PlayerData.BirthdayDay;
//Game1.player.FarmerRenderer.drawMiniPortrat(Game1.spriteBatch, new Vector2(Game1.activeClickableMenu.xPositionOnScreen + 152 + (index - 1) % 7 * 32 * 4, Game1.activeClickableMenu.yPositionOnScreen + 230 + (index - 1) / 7 * 32 * 4), 1f, 4f, 2, Game1.player); //Game1.player.FarmerRenderer.drawMiniPortrat(Game1.spriteBatch, new Vector2(Game1.activeClickableMenu.xPositionOnScreen + 152 + (index - 1) % 7 * 32 * 4, Game1.activeClickableMenu.yPositionOnScreen + 230 + (index - 1) / 7 * 32 * 4), 1f, 4f, 2, Game1.player);
string hoverText = ""; string hoverText = "";
List<string> texts = new List<string>(); List<string> texts = new List<string>();
foreach (var clicky in (Game1.activeClickableMenu as Billboard).calendarDays) foreach (var clicky in (Game1.activeClickableMenu as Billboard).calendarDays)
{ {
if (clicky.containsPoint(Game1.getMouseX(), Game1.getMouseY())) if (clicky.containsPoint(Game1.getMouseX(), Game1.getMouseY()))
@ -173,6 +189,7 @@ namespace Omegasis.HappyBirthday
if (PlayerData.BirthdaySeason.ToLower() != Game1.currentSeason.ToLower()) return; if (PlayerData.BirthdaySeason.ToLower() != Game1.currentSeason.ToLower()) return;
if (Game1.activeClickableMenu is Billboard) if (Game1.activeClickableMenu is Billboard)
{ {
if (isDailyQuestBoard) return;
int index = PlayerData.BirthdayDay; int index = PlayerData.BirthdayDay;
Game1.player.FarmerRenderer.drawMiniPortrat(Game1.spriteBatch, new Vector2(Game1.activeClickableMenu.xPositionOnScreen + 152 + (index - 1) % 7 * 32 * 4, Game1.activeClickableMenu.yPositionOnScreen + 230 + (index - 1) / 7 * 32 * 4), 0.5f, 4f, 2, Game1.player); Game1.player.FarmerRenderer.drawMiniPortrat(Game1.spriteBatch, new Vector2(Game1.activeClickableMenu.xPositionOnScreen + 152 + (index - 1) % 7 * 32 * 4, Game1.activeClickableMenu.yPositionOnScreen + 230 + (index - 1) / 7 * 32 * 4), 0.5f, 4f, 2, Game1.player);
} }
@ -185,9 +202,17 @@ namespace Omegasis.HappyBirthday
/// <param name="e"></param> /// <param name="e"></param>
public void MenuEvents_MenuChanged(object sender, EventArgsClickableMenuChanged e) public void MenuEvents_MenuChanged(object sender, EventArgsClickableMenuChanged e)
{ {
if (Game1.activeClickableMenu == null) return; if (Game1.activeClickableMenu == null)
{
isDailyQuestBoard = false;
return;
}
if(Game1.activeClickableMenu is Billboard) if(Game1.activeClickableMenu is Billboard)
{ {
isDailyQuestBoard = ModHelper.Reflection.GetField<bool>((Game1.activeClickableMenu as Billboard), "dailyQuestBoard", true).GetValue();
if (isDailyQuestBoard) return;
Texture2D text = new Texture2D(Game1.graphics.GraphicsDevice,1,1); Texture2D text = new Texture2D(Game1.graphics.GraphicsDevice,1,1);
Color[] col = new Color[1]; Color[] col = new Color[1];
col[0] = new Color(0, 0, 0, 1); col[0] = new Color(0, 0, 0, 1);