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

symphony menu is coming along.

This commit is contained in:
2018-03-20 16:45:07 -07:00
parent 67c110f282
commit ed899b49d9
13 changed files with 106 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GeneralMods/FarmersMarketStall/Framework/Menus/MarketStallMenu.cs
View File

@ -17,7 +17,7 @@ namespace FarmersMarketStall.Framework.Menus
public static IClickableMenu openMenu(MarketStall marketStall)
{
return null;
throw new NotImplementedException("This menu isn't implemented because the author is busy/lazy. Please encorage Omegasis to finish it!",null);
//return new StardewValley.Menus.InventoryMenu((int)(Game1.viewport.Width*.25f),(int)(Game1.viewport.Height*.25f),true,marketStall.stock);
}

BIN
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MusicNote.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 B

8
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/MusicPackInformation.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Omegas's Music Data Example",
"author": "Omegasis",
"description": "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!",
"versionInfo": "1.0.0 CoolExample",
"pathToMusicPackIcon": "Icon",
"Icon": null
}

1
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/readme.txt Normal file
View File

@ -0,0 +1 @@
Place the .wav song files in the Songs folder, modify the MusicPackInformation.json as desired, and then run!

8
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/MusicPackInformation.json Normal file
View File

@ -0,0 +1,8 @@
{
"name": "Omegas's Music Data Example",
"author": "Omegasis",
"description": "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!",
"versionInfo": "1.0.0 CoolExample",
"pathToMusicPackIcon": "Icon.png",
"Icon": null
}

3
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/readme.txt Normal file
View File

@ -0,0 +1,3 @@
Place the Wave Bank.xwb file and Sound Bank.xsb file you created in XACT in a similar directory in Content/Music/XACT/SoundPackName.
Modify MusicPackInformation.json as desire!
Run the mod!

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

@ -23,7 +23,27 @@ namespace StardewSymphonyRemastered.Framework.Menus
this.texturedStrings = new List<StardustCore.UIUtilities.SpriteFonts.Components.TexturedString>();
this.texturedStrings.Add(StardustCore.UIUtilities.SpriteFonts.SpriteFont.vanillaFont.ParseString("Hello", new Microsoft.Xna.Framework.Vector2(100, 100),StardustCore.IlluminateFramework.Colors.invertColor(StardustCore.IlluminateFramework.LightColorsList.Blue)));
this.buttons = new List<StardustCore.UIUtilities.MenuComponents.Button>();
this.buttons.Add(new Button("myButton", new Rectangle(100, 100, 64, 64), StardewSymphony.textureManager.getTexture("MusicNote").Copy(StardewSymphony.ModHelper), "mynote", new Rectangle(0, 0, 16, 16), 4f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White,new ButtonFunctionality(new DelegatePairing(hello,null),null,null),false)); //A button that does nothing on the left click.
//this.buttons.Add(new Button("myButton", new Rectangle(100, 100, 64, 64), StardewSymphony.textureManager.getTexture("MusicNote").Copy(StardewSymphony.ModHelper), "mynote", new Rectangle(0, 0, 16, 16), 4f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White,new ButtonFunctionality(new DelegatePairing(hello,null),null,null),false)); //A button that does nothing on the left click.
int numOfButtons = 0;
int rows = 0;
foreach(var v in StardewSymphony.musicManager.musicPacks)
{
this.buttons.Add(new Button(v.Key, new Rectangle(100+(numOfButtons*100), 100+(rows*100), 64, 64), StardewSymphony.textureManager.getTexture("MusicNote").Copy(StardewSymphony.ModHelper), "", new Rectangle(0, 0, 16, 16), 4f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White, new ButtonFunctionality(new DelegatePairing(displayMusicPack, new List<object>
{
(object)v
}
),null, new DelegatePairing(null,new List<object>(){
(object)v
}
)), false));
numOfButtons++;
if (numOfButtons > 8)
{
numOfButtons = 0;
rows++;
}
}
}
public override void receiveRightClick(int x, int y, bool playSound = true)
@ -38,7 +58,13 @@ namespace StardewSymphonyRemastered.Framework.Menus
{
foreach(var v in this.buttons)
{
if (v.containsPoint(x, y)) v.onHover();
if (v.containsPoint(x, y))
{
var pair = (KeyValuePair<string, MusicPack>)v.buttonFunctionality.hover.paramaters[0];
v.hoverText = pair.Key;
v.onHover();
StardewSymphony.ModMonitor.Log(pair.Key);
}
}
}
@ -77,6 +103,15 @@ namespace StardewSymphonyRemastered.Framework.Menus
{
StardewSymphony.ModMonitor.Log("Hello");
}
public void displayMusicPack(List<object> param)
{
var info=(KeyValuePair<string, MusicPack>)param[0];
StardewSymphony.ModMonitor.Log(info.ToString());
StardewSymphony.musicManager.playRandomSongFromPack(info.Key);
//info.Value.playRandomSong();
}
#endregion
}
}

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

@ -354,5 +354,13 @@ namespace StardewSymphonyRemastered.Framework
pack.Value.songInformation.initializeSeasonalMusic();
}
}
public void playRandomSongFromPack(string musicPackName)
{
this.musicPacks.TryGetValue(musicPackName, out MusicPack musicPack);
if (this.currentMusicPack != null) this.currentMusicPack.stopSong();
musicPack.playRandomSong();
this.currentMusicPack = musicPack;
}
}
}

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

@ -59,6 +59,11 @@ namespace StardewSymphonyRemastered.Framework
}
public virtual void playRandomSong()
{
}
public virtual void writeToJson()
{

14
GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs
View File

@ -64,13 +64,18 @@ namespace StardewSymphonyRemastered.Framework
listofSongs.Add(song);
}
this.songInformation.listOfSongsWithoutTriggers = listofSongs;
this.songInformation.listOfSongsWithoutTriggers = listofSongs;
}
public override void playRandomSong()
{
Random r = new Random();
int value = r.Next(0,this.songInformation.listOfSongsWithoutTriggers.Count);
Song s = this.songInformation.listOfSongsWithoutTriggers.ElementAt(value);
this.swapSong(s.name);
}
/// <summary>
/// Get the cue from the list of songs.
/// </summary>
@ -143,6 +148,7 @@ namespace StardewSymphonyRemastered.Framework
/// </summary>
public override void stopSong()
{
if(Game1.currentSong!=null) Game1.currentSong.Stop(AudioStopOptions.Immediate);
if (this.currentCue == null) return;
else
{

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

@ -67,6 +67,8 @@ namespace StardewSymphonyRemastered
WavMusicDirectory = Path.Combine(MusicPath, "Wav");
XACTMusicDirectory = Path.Combine(MusicPath, "XACT");
TemplateMusicDirectory = Path.Combine(MusicPath, "Templates");
textureManager = new TextureManager();
this.createDirectories();
this.createBlankXACTTemplate();

20
GeneralMods/StardustCore/UIUtilities/MenuComponents/Button.cs
View File

@ -95,9 +95,23 @@ namespace StardustCore.UIUtilities.MenuComponents
Utility.drawWithShadow(b, this.texture, new Vector2((float)this.bounds.X + (float)(this.sourceRect.Width / 2) * this.baseScale, (float)this.bounds.Y + (float)(this.sourceRect.Height / 2) * this.baseScale), this.sourceRect, this.textureColor, 0.0f, new Vector2((float)(this.sourceRect.Width / 2), (float)(this.sourceRect.Height / 2)), this.scale, false, layerDepth, -1, -1, 0.35f);
else
b.Draw(this.texture, new Vector2((float)this.bounds.X + (float)(this.sourceRect.Width / 2) * this.baseScale, (float)this.bounds.Y + (float)(this.sourceRect.Height / 2) * this.baseScale), new Rectangle?(this.sourceRect), this.textureColor, 0.0f, new Vector2((float)(this.sourceRect.Width / 2), (float)(this.sourceRect.Height / 2)), this.scale, SpriteEffects.None, layerDepth);
if (string.IsNullOrEmpty(this.label))
return;
b.DrawString(Game1.smallFont, this.label, new Vector2((float)(this.bounds.X + this.bounds.Width), (float)this.bounds.Y + ((float)(this.bounds.Height / 2) - Game1.smallFont.MeasureString(this.label).Y / 2f)), this.textColor);
if (string.IsNullOrEmpty(this.label)) {
}
else {
b.DrawString(Game1.smallFont, this.label, new Vector2((float)(this.bounds.X + this.bounds.Width), (float)this.bounds.Y + ((float)(this.bounds.Height / 2) - Game1.smallFont.MeasureString(this.label).Y / 2f)), this.textColor);
}
if (this.hoverText=="")
{
}
else
{
StardustCore.ModCore.ModMonitor.Log("HOVER???");
b.DrawString(Game1.smallFont, this.hoverText, new Vector2((float)(this.bounds.X + this.bounds.Width), (float)this.bounds.Y + ((float)(this.bounds.Height / 2) - Game1.smallFont.MeasureString(this.label).Y / 2f)), this.textColor);
}
}
/// <summary>

8
GeneralMods/StardustCore/UIUtilities/MenuComponents/Delegates/DelegatePairing.cs
View File

@ -14,7 +14,7 @@ namespace StardustCore.UIUtilities.MenuComponents.Delegates
public DelegatePairing(Delegates.paramaterDelegate buttonDelegate,List<object> Paramaters)
{
this.click = buttonDelegate;
if (this.paramaters == null)
if (Paramaters == null)
{
this.paramaters = new List<object>();
}
@ -26,7 +26,11 @@ namespace StardustCore.UIUtilities.MenuComponents.Delegates
public void run()
{
this.click.Invoke(this.paramaters);
if (this.click != null)
{
this.click.Invoke(this.paramaters);
}
else return;
}
}
}