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

fix issues when player exits to title

This commit is contained in:
Jesse Plamondon-Willard 2017-08-05 23:00:37 -04:00
parent f5069f8ca5
commit cec352336c
7 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralMods/BuildEndurance/BuildEndurance.cs
View File

@ -114,6 +114,12 @@ namespace Omegasis.BuildEndurance
/// <param name="e">The event data.</param>
private void SaveEvents_AfterLoad(object sender, EventArgs e)
{
// reset state
this.WasExhausted = false;
this.WasCollapsed = false;
this.HasRecentToolExp = false;
this.WasEating = false;
// load player data
this.MigrateLegacyData();
this.PlayerData = this.Helper.ReadJsonFile<PlayerData>(this.DataFilePath) ?? new PlayerData();

1
GeneralMods/BuildEndurance/README.md
View File

@ -38,4 +38,5 @@ Edit `config.json` to configure the mod settings.
* Updated for SMAPI 2.0.
* Switched to standard JSON config & data files.
* Fixed issue where saves with the same name would overwrite each other's endurance level data.
* Fixed minor bugs when you load a save after exiting to title.
* Internal refactoring.

11
GeneralMods/BuildHealth/BuildHealth.cs
View File

@ -116,6 +116,12 @@ namespace Omegasis.BuildHealth
/// <param name="e">The event data.</param>
private void SaveEvents_AfterLoaded(object sender, EventArgs e)
{
// reset state
this.HasRecentToolExp = false;
this.WasEating = false;
this.LastHealth = Game1.player.health;
this.WasCollapsed = false;
// load player data
this.MigrateLegacyData();
this.PlayerData = this.Helper.ReadJsonFile<PlayerData>(this.DataFilePath) ?? new PlayerData();
@ -135,12 +141,9 @@ namespace Omegasis.BuildHealth
this.PlayerData.ClearModEffects = false;
}
// else apply health
// else apply health bonus
else
{
Game1.player.maxHealth = this.PlayerData.BaseHealthBonus + this.PlayerData.CurrentLevelHealthBonus + this.PlayerData.OriginalMaxHealth;
this.LastHealth = Game1.player.health;
}
}
/// <summary>The method invoked just before the game saves.</summary>

1
GeneralMods/BuildHealth/ReadMe.md
View File

@ -39,4 +39,5 @@ Edit `config.json` to configure the mod settings.
* Updated for SMAPI 2.0.
* Switched to standard JSON config & data files.
* Fixed issue where saves with the same name would overwrite each other's endurance level data.
* Fixed minor bugs when you load a save after exiting to title.
* Internal refactoring.

10
GeneralMods/CustomShopsRedux/CustomShopsRedux.cs
View File

@ -38,9 +38,6 @@ namespace Omegasis.CustomShopsRedux
/// <summary>The prices for the items to list.</summary>
private readonly Dictionary<Item, int[]> ListPrices = new Dictionary<Item, int[]>();
/// <summary>The configured shop options.</summary>
private readonly List<string> Options = new List<string>();
/// <summary>The folder path containing shop data files.</summary>
private string DataPath => Path.Combine(this.Helper.DirectoryPath, "Custom_Shops");
@ -87,16 +84,17 @@ namespace Omegasis.CustomShopsRedux
}
// parse options
List<string> options = new List<string>();
foreach (FileInfo file in files)
this.Options.Add(file.Name);
if (!this.Options.Any())
options.Add(file.Name);
if (!options.Any())
{
this.Monitor.Log("No shop .txt information is found. You should create one.", LogLevel.Error);
return;
}
// load menu
Game1.activeClickableMenu = new ChooseFromListMenu(this.Options, this.OnChoiceSelected);
Game1.activeClickableMenu = new ChooseFromListMenu(options, this.OnChoiceSelected);
}
/// <summary>The method called when the player chooses an option from the file list.</summary>

10
GeneralMods/HappyBirthday/HappyBirthday.cs
View File

@ -62,9 +62,6 @@ namespace Omegasis.HappyBirthday
SaveEvents.AfterLoad += this.SaveEvents_AfterLoad;
SaveEvents.BeforeSave += this.SaveEvents_BeforeSave;
ControlEvents.KeyPressed += this.ControlEvents_KeyPressed;
this.VillagerQueue = new List<string>();
this.PossibleBirthdayGifts = new List<Item>();
}
@ -94,6 +91,13 @@ namespace Omegasis.HappyBirthday
/// <param name="e">The event data.</param>
private void SaveEvents_AfterLoad(object sender, EventArgs e)
{
// reset state
this.VillagerQueue = new List<string>();
this.PossibleBirthdayGifts = new List<Item>();
this.BirthdayGiftToReceive = null;
this.CheckedForBirthday = false;
// load settings
this.MigrateLegacyData();
this.PlayerData = this.Helper.ReadJsonFile<PlayerData>(this.DataFilePath) ?? new PlayerData();
//this.SeenEvent = false;

8
GeneralMods/SaveAnywhere/SaveAnywhere.cs
View File

@ -21,11 +21,12 @@ namespace Omegasis.SaveAnywhere
/// <summary>Provides methods for reading and writing the config file.</summary>
private ConfigUtilities ConfigUtilities;
/// <summary>The parsed schedules by NPC name.</summary>
private readonly IDictionary<string, string> NpcSchedules = new Dictionary<string, string>();
/// <summary>Whether villager schedules should be reset now.</summary>
private bool ShouldResetSchedules;
/// <summary>The parsed schedules by NPC name.</summary>
private readonly IDictionary<string, string> NpcSchedules = new Dictionary<string, string>();
/*********
@ -52,6 +53,9 @@ namespace Omegasis.SaveAnywhere
/// <param name="e">The event data.</param>
private void SaveEvents_AfterLoad(object sender, EventArgs e)
{
// reset state
this.ShouldResetSchedules = false;
// load config
this.ConfigUtilities.LoadConfig();
this.ConfigUtilities.WriteConfig();