Fixed SDust dynamic warning, and a glitch with the music menu when selecting an album.

This commit is contained in:
2018-06-07 13:58:52 -07:00
parent f2ed5c3acb
commit 5b0de7f736
5 changed files with 13 additions and 11 deletions

View File

@ -1061,6 +1061,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
} }
} }
this.selectAlbum(ok); this.selectAlbum(ok);
return;
} }
if (this.drawMode == DrawMode.SongSelectionMode) if (this.drawMode == DrawMode.SongSelectionMode)

View File

@ -15,21 +15,16 @@ namespace StardewSymphonyRemastered
{ {
/// <summary> /// <summary>
/// BIG WIP. Don't use this at all because it does nothing right now.
/// TODO: /// TODO:
/// 3.Finish making menu
/// 5.Release /// 5.Release
/// 6.Make videos documenting how to make this mod work.
/// 7.Make way to generate new music packs.
/// ///
/// ///
/// Add mod config to have silent rain option. /// Add mod config to have silent rain option.
/// Add in song delay function.
/// Add in shuffle song button that just selects music but probably plays a different song. same as musicManager.selectmusic(getConditionalString); /// Add in shuffle song button that just selects music but probably plays a different song. same as musicManager.selectmusic(getConditionalString);
/// /// Add in a save button to save settings in the menu.
/// ///
/// Notes: /// Notes:
/// All mods must add events/locations/festivals/menu information to this mod during the Entry function of their mod because once the game does it's first update tick, that's when all of the packs are initialized with all of their music. /// All mods must add events/locations/festivals/menu information to this mod during the Entry function of their mod because once the player is loaded that's when all of the packs are initialized with all of their music.
/// </summary> /// </summary>
public class StardewSymphony : Mod public class StardewSymphony : Mod
{ {

View File

@ -3,7 +3,7 @@
"Author": "Alpha_Omegasis", "Author": "Alpha_Omegasis",
"Version": "2.0.0", "Version": "2.0.0",
"Description": "Adding more music to the game one beep at a time. Now with streaming!", "Description": "Adding more music to the game one beep at a time. Now with streaming!",
"UniqueID": "Omegasis.StardewSymphony", "UniqueID": "Omegasis.StardewSymphonyRemastered",
"EntryDll": "StardewSymphonyRemastered.dll", "EntryDll": "StardewSymphonyRemastered.dll",
"MinimumApiVersion": "2.0", "MinimumApiVersion": "2.0",
"UpdateKeys": [ "Nexus:425" ], "UpdateKeys": [ "Nexus:425" ],

View File

@ -1516,6 +1516,11 @@ namespace StardustCore
*/ */
} }
/// <summary>
/// Adds an item to this item's internal inventory if it can. Otherwise drop it on the ground as item debris.
/// </summary>
/// <param name="I"></param>
/// <returns></returns>
public virtual bool addItemToInventoryElseDrop(Item I) public virtual bool addItemToInventoryElseDrop(Item I)
{ {

View File

@ -403,7 +403,8 @@ namespace StardustCore.Serialization
// Log.AsyncC(data); // Log.AsyncC(data);
try try
{ {
dynamic obj = JObject.Parse(data); JObject obj2 = JObject.Parse(data);
CoreObject obj = (CoreObject)obj2.ToObject(typeof(CoreObject));
// Log.AsyncC(obj.thisType); // Log.AsyncC(obj.thisType);
@ -549,8 +550,8 @@ namespace StardustCore.Serialization
// Log.AsyncC(data); // Log.AsyncC(data);
try try
{ {
dynamic obj = JObject.Parse(data); JObject obj2 = JObject.Parse(data);
CoreObject obj =(CoreObject)obj2.ToObject(typeof(CoreObject));
// Log.AsyncC(obj.thisType); // Log.AsyncC(obj.thisType);