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

The beta of Stardew Symphony is complete! WOOO!

This commit is contained in:
2018-06-01 14:43:47 -07:00
parent 70885979ed
commit f7ffec1799
4 changed files with 107 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using StardewValley;
using StardewValley.Locations;
using StardustCore.Animations;
using StardustCore.UIUtilities;
using StardustCore.UIUtilities.MenuComponents;
@ -459,7 +460,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
}
}
//Song selection mode.
//Festival selection mode.
if (this.drawMode == DrawMode.FestivalSelection)
{
this.fancyButtons.Clear();
@ -478,12 +479,14 @@ namespace StardewSymphonyRemastered.Framework.Menus
}
}
//Song selection mode.
//Menu selection mode.
if (this.drawMode == DrawMode.MenuSelection)
{
this.fancyButtons.Clear();
//Vector4 placement = new Vector4((Game1.viewport.Width / 3), (Game1.viewport.Height / 4) + 128, this.width, this.height / 2);
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .9f);
for (int i = 0; i < SongSpecifics.menus.Count; i++)
{
@ -497,7 +500,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
}
}
//Song selection mode.
//Event selection mode.
if (this.drawMode == DrawMode.EventSelection)
{
this.fancyButtons.Clear();
@ -747,15 +750,56 @@ namespace StardewSymphonyRemastered.Framework.Menus
}
//Song selection mode.
//Location selection mode.
if (this.drawMode == DrawMode.LocationSelection)
{
this.fancyButtons.Clear();
int numOfEmptyCabin = 1;
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .9f);
for (int i = 0; i < SongSpecifics.locations.Count; i++)
{
string locName = SongSpecifics.locations.ElementAt(i);
if (locName.Contains("Cabin"))
{
try
{
GameLocation loc = Game1.getLocationFromName(locName);
Farmer farmer = (loc as Cabin).getFarmhand().Value;
if (farmer != null)
{
string displayName = farmer.Name + "'s Cabin";
if (farmer.Name == "")
{
displayName = "Empty Cabin " + (numOfEmptyCabin);
numOfEmptyCabin++;
}
Texture2DExtended texture2 = StardewSymphony.textureManager.getTexture("HouseIcon");
float scale2 = 1.00f / ((float)texture2.texture.Width / 64f);
Rectangle srcRect2 = new Rectangle(0, 0, texture2.texture.Width, texture2.texture.Height);
this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture2, displayName, srcRect2, scale2, new Animation(srcRect2), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
continue;
}
if (farmer == null)
{
string displayName = "Empty Cabin "+(numOfEmptyCabin);
numOfEmptyCabin++;
Texture2DExtended texture2 = StardewSymphony.textureManager.getTexture("HouseIcon");
float scale2 = 1.00f / ((float)texture2.texture.Width / 64f);
Rectangle srcRect2 = new Rectangle(0, 0, texture2.texture.Width, texture2.texture.Height);
this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture2, displayName, srcRect2, scale2, new Animation(srcRect2), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
continue;
}
}
catch(Exception err)
{
}
}
//Allow 8 songs to be displayed per page.
Texture2DExtended texture = StardewSymphony.textureManager.getTexture("HouseIcon");
float scale = 1.00f / ((float)texture.texture.Width / 64f);
@ -1119,7 +1163,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
{
if (button == null) continue;
Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 384);
if (button.name == "SunnyIcon" || button.name == "RainyIcon" || button.name == "SnowyIcon" || button.name == "WeatherDebrisIcon" || button.name == "StormyIcon" || button.name == "WeatherFestivalIcon" || button.name == "WeddingIcon")
if (button.name == "SunnyIcon" || button.name == "RainyIcon" || button.name == "SnowIcon" || button.name == "WeatherDebrisIcon" || button.name == "StormIcon" || button.name == "WeatherFestivalIcon" || button.name == "WeddingIcon")
{
this.currentlySelectedWeather = button.clone(position);
this.drawMode = DrawMode.TimeSelection;
@ -1391,6 +1435,12 @@ namespace StardewSymphonyRemastered.Framework.Menus
/// <param name="b"></param>
public override void draw(SpriteBatch b)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f - 96, 4 * 100 + 50, this.height + 32);
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f - 96, 5 * 100, this.height + 32);
if (this.drawMode == DrawMode.AlbumSelection)
{
this.drawDialogueBoxBackground();
@ -1402,8 +1452,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.AlbumFancySelection)
{
Vector4 placement = new Vector4(Game1.viewport.Width/4-50, Game1.viewport.Height/4, 8 * 100, 128*2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 0)));
Vector4 placement3 = new Vector4(Game1.viewport.Width/4-50, Game1.viewport.Height/4, 8 * 100, 128*2);
this.drawDialogueBoxBackground((int)placement3.X, (int)placement3.Y, (int)placement3.Z, (int)placement3.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 0)));
foreach(var v in fancyButtons)
{
@ -1417,11 +1467,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.SongSelectionMode)
{
Vector4 placement = new Vector4(this.width*.1f, this.height*.05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height*.95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
int amountToShow = 6;
@ -1464,14 +1510,9 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.DifferentSelectionTypesMode)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
this.currentMusicPackAlbum.draw(b);
this.currentSelectedSong.draw(b);
@ -1489,11 +1530,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.WeatherSelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
@ -1515,13 +1552,10 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.TimeSelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
this.currentMusicPackAlbum.draw(b);
this.currentSelectedSong.draw(b);
@ -1542,11 +1576,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.LocationSelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
int amountToShow = 6;
@ -1595,11 +1625,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.DaySelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
@ -1625,13 +1651,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.NothingElseToDisplay)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
this.currentMusicPackAlbum.draw(b);
this.currentSelectedSong.draw(b);
@ -1655,11 +1676,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.EventSelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
int amountToShow = 6;
@ -1711,11 +1728,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.MenuSelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
int amountToShow = 6;
@ -1767,11 +1780,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.FestivalSelection)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
int amountToShow = 6;
@ -1823,13 +1832,9 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.SelectedEvent)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
this.currentMusicPackAlbum.draw(b);
this.currentSelectedSong.draw(b);
@ -1855,13 +1860,9 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.SelectedFestival)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
this.currentMusicPackAlbum.draw(b);
this.currentSelectedSong.draw(b);
@ -1887,13 +1888,9 @@ namespace StardewSymphonyRemastered.Framework.Menus
if (this.drawMode == DrawMode.SelectedMenu)
{
Vector4 placement = new Vector4(this.width * .1f, this.height * .05f, 4 * 100, 128 * 2);
this.drawDialogueBoxBackground((int)placement.X, (int)placement.Y, (int)placement.Z, (int)placement.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .95f);
this.drawDialogueBoxBackground((int)placement2.X, (int)placement2.Y, (int)placement2.Z, (int)placement2.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 255)));
//make 3rd dialogue box option;
this.currentMusicPackAlbum.draw(b);
this.currentSelectedSong.draw(b);

26
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
View File

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using StardewSymphonyRemastered;
using StardewValley;
using System.IO;
using System.Timers;
namespace StardewSymphonyRemastered.Framework
{
@ -28,6 +29,8 @@ namespace StardewSymphonyRemastered.Framework
Random packSelector;
Random songSelector;
Timer timer;
bool lastSongWasLocationSpecific;
/// <summary>
/// Constructor.
@ -62,6 +65,27 @@ namespace StardewSymphonyRemastered.Framework
}
}
public void updateTimer()
{
if (this.currentMusicPack.isPlaying()) return;
else
{
Random r = new Random(Game1.random.Next());
int val = r.Next(StardewSymphony.Config.MinimumDelayBetweenSongsInMilliseconds, StardewSymphony.Config.MaximumDelayBetweenSongsInMilliseconds + 1);
timer = new Timer(val);
timer.Elapsed += onTimerFinished;
timer.Enabled = true;
}
}
public void onTimerFinished(System.Object source, ElapsedEventArgs e)
{
timer.Enabled = false;
selectMusic(SongSpecifics.getCurrentConditionalString());
}
/// <summary>
/// Plays the song from the currently loaded music pack.
/// </summary>
@ -307,6 +331,7 @@ namespace StardewSymphonyRemastered.Framework
return;
}
}
if (StardewSymphony.Config.EnableDebugLog)
StardewSymphony.ModMonitor.Log(subKey, StardewModdingAPI.LogLevel.Alert);
listOfValidMusicPacks = getListOfApplicableMusicPacks(subKey);
if (listOfValidMusicPacks.Count == 0)
@ -333,6 +358,7 @@ namespace StardewSymphonyRemastered.Framework
}
}
if (subKey == "") break;
if(StardewSymphony.Config.EnableDebugLog)
StardewSymphony.ModMonitor.Log(subKey, StardewModdingAPI.LogLevel.Alert);
listOfValidMusicPacks = getListOfApplicableMusicPacks(subKey);
if (listOfValidMusicPacks.Count == 0)

5
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
View File

@ -1,4 +1,5 @@
using StardewValley;
using StardewValley.Locations;
using System;
using System.Collections.Generic;
using System.Linq;
@ -12,7 +13,7 @@ namespace StardewSymphonyRemastered.Framework
/// </summary>
public class SongSpecifics
{
public Dictionary<string, List<Song>> listOfSongsWithTriggers; //triggerName, <songs>. Seasonal music
public SortedDictionary<string, List<Song>> listOfSongsWithTriggers; //triggerName, <songs>. Seasonal music
public List<Song> listOfSongsWithoutTriggers;
@ -75,7 +76,7 @@ namespace StardewSymphonyRemastered.Framework
};
listOfSongsWithTriggers = new Dictionary<string, List<Song>>();
listOfSongsWithTriggers = new SortedDictionary<string, List<Song>>();
this.listOfSongsWithoutTriggers = new List<Song>();
this.eventSongs = new List<Song>();
this.festivalSongs = new List<Song>();

16
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
View File

@ -85,6 +85,7 @@ namespace StardewSymphonyRemastered
StardewModdingAPI.Events.MenuEvents.MenuClosed += MenuEvents_MenuClosed;
StardewModdingAPI.Events.GameEvents.FirstUpdateTick += GameEvents_FirstUpdateTick;
StardewModdingAPI.Events.GameEvents.OneSecondTick += GameEvents_OneSecondTick;
musicManager = new MusicManager();
@ -112,6 +113,15 @@ namespace StardewSymphonyRemastered
initializeMusicPacks();
}
private void GameEvents_OneSecondTick(object sender, EventArgs e)
{
if (musicManager == null) return;
else
{
musicManager.updateTimer();
}
}
/// <summary>
/// Raised when the player changes locations. This should determine the next song to play.
/// </summary>
@ -160,6 +170,12 @@ namespace StardewSymphonyRemastered
{
musicPack.Value.readFromJson();
}
SongSpecifics.menus.Sort();
SongSpecifics.locations.Sort();
SongSpecifics.festivals.Sort();
SongSpecifics.events.Sort();
musicManager.selectMusic(SongSpecifics.getCurrentConditionalString());
}