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

Nightfishing AssetEditor, Night owl update, and more bug fixes for Stardust

This commit is contained in:
2018-08-08 10:44:44 -07:00
parent 1888ad5fa7
commit 32b3e9e625
7 changed files with 121 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralMods/NightOwl/Framework/ModConfig.cs
View File

@ -23,5 +23,11 @@
/// <summary>Whether to keep stamina as-is after the player collapses.</summary>
public bool KeepStaminaAfterCollapse { get; set; } = true;
/// <summary>
/// Whether or not to use the internal NightFish asset editor. When false, it will just use the Fish.xnb file.
/// </summary>
public bool UseInternalNightFishAssetEditor { get; set; } = true;
}
}

91
GeneralMods/NightOwl/Framework/NightFishing.cs Normal file
View File

@ -0,0 +1,91 @@
using StardewModdingAPI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Omegasis.NightOwl.Framework
{
class NightFishing : IAssetEditor
{
public bool CanEdit<T>(IAssetInfo asset)
{
return asset.AssetNameEquals(@"Data\Fish");
}
public void Edit<T>(IAssetData asset)
{
Dictionary<int,string> nightFish=new Dictionary<int, string> // (T)(object) is a trick to cast anything to T if we know it's compatible
{
[128] = "Pufferfish/80/floater/1/36/1200 1600/summer/sunny/690 .4 685 .1/4/.3/.5/0",
[129] = "Anchovy/30/dart/1/16/600 3000/spring fall/both/682 .2/1/.25/.3/0",
[130] = "Tuna/70/smooth/12/60/600 1900/summer winter/both/689 .35 681 .1/3/.15/.55/0",
[131] = "Sardine/30/dart/1/12/600 1900/spring summer fall winter/both/683 .3/1/.65/.1/0",
[132] = "Bream/35/smooth/12/30/1800 3000/spring summer fall winter/both/684 .35/1/.45/.1/0",
[136] = "Largemouth Bass/50/mixed/11/30/600 1900/spring summer fall winter/both/685 .35/3/.4/.2/0",
[137] = "Smallmouth Bass/28/mixed/12/24/600 3000/spring fall/both/682 .2/1/.45/.1/0",
[138] = "Rainbow Trout/45/mixed/10/25/600 1900/summer/sunny/684 .35/2/.35/.3/0",
[139] = "Salmon/50/mixed/24/65/600 1900/fall/both/684 .35/3/.4/.2/0",
[140] = "Walleye/45/smooth/10/40/1200 3000/fall winter/rainy/680 .35/2/.4/.15/0",
[141] = "Perch/35/dart/10/24/600 3000/winter/both/683 .2/1/.45/.1/0",
[142] = "Carp/15/mixed/15/50/600 3000/spring summer fall/both/682 .2/1/.45/.1/0",
[143] = "Catfish/75/mixed/12/72/600 2400/spring fall winter/rainy/689 .4 680 .1/4/.4/.1/0",
[144] = "Pike/60/dart/15/60/600 3000/summer winter/both/690 .3 681 .1/3/.4/.15/0",
[145] = "Sunfish/30/mixed/5/15/600 1900/spring summer/sunny/683 .2/1/.45/.1/0",
[146] = "Red Mullet/55/smooth/8/22/600 1900/summer winter/both/680 .25/2/.4/.15/0",
[147] = "Herring/25/dart/8/20/600 3000/spring winter/both/685 .2/1/.45/.1/0",
[148] = "Eel/70/smooth/12/80/1600 3000/spring fall/rainy/689 .35 680 .1/3/.55/.1/0",
[149] = "Octopus/95/sinker/12/48/600 1300/summer/both/688 .6 684 .1/5/.1/.08/0",
[150] = "Red Snapper/40/mixed/8/25/600 1900/summer fall winter/rainy/682 .25/2/.45/.1/0",
[151] = "Squid/75/sinker/12/48/1800 3000/winter/both/690 .35 680 .1/3/.35/.3/0",
[152] = "Seaweed/5/floater/5/30/600 3000/spring summer fall winter/both/-1/0/.3/0/0",
[153] = "Green Algae/5/floater/5/30/600 3000/spring summer fall winter/both/-1/0/.3/0/0",
[154] = "Sea Cucumber/40/sinker/3/20/600 1900/fall winter/both/683 .2 689 .4/3/.25/.25/0",
[155] = "Super Cucumber/80/sinker/12/36/1800 3000/summer winter/both/683 .2 689 .4/4/.1/.25/0",
[156] = "Ghostfish/50/mixed/10/35/600 3000/spring summer fall winter/both/684 .35/2/.3/.3/0",
[157] = "White Algae/5/floater/5/30/600 3000/spring summer fall winter/both/-1/0/.3/0/0",
[158] = "Stonefish/65/sinker/15/15/600 3000/spring summer fall winter/both/689 .2/2/.1/.1/3",
[159] = "Crimsonfish/95/mixed/20/20/600 2000/winter/both/690 .15/4/.1/.1/5",
[160] = "Angler/85/smooth/18/18/600 3000/spring summer fall winter/both/690 .1/4/.05/.1/3",
[161] = "Ice Pip/85/dart/8/8/600 3000/spring summer fall winter/both/682 .1/2/.05/.1/5",
[162] = "Lava Eel/90/mixed/32/32/600 3000/spring summer fall winter/both/684 .1/2/.05/.1/7",
[163] = "Legend/110/mixed/50/50/600 2000/spring summer fall winter/rainy/688 .05/5/0/.1/10",
[164] = "Sandfish/65/mixed/8/24/600 2000/spring summer fall winter/both/682 .2/1/.65/.1/0",
[165] = "Scorpion Carp/90/dart/12/32/600 2000/spring summer fall winter/both/683 .4/2/.15/.1/4",
[372] = "Clam/trap/.15/681 .35/ocean/1/5",
[682] = "Mutant Carp/80/dart/36/36/600 3000/spring summer fall winter/both/688 .1/5/0/.02/0",
[698] = "Sturgeon/78/mixed/12/60/600 1900/summer winter/both/689 .35 682 .1/3/.35/.2/0",
[699] = "Tiger Trout/60/dart/10/20/600 1900/spring summer fall winter/both/688 .45 685 .2/3/.2/.1/0",
[700] = "Bullhead/46/smooth/12/30/600 3000/spring summer fall winter/both/681 .25/2/.35/.2/0",
[701] = "Tilapia/50/mixed/11/30/600 1400/summer fall/both/683 .35/3/.4/.2/0",
[702] = "Chub/35/dart/12/24/600 3000/spring summer fall winter/both/684 .35/1/.45/.1/0",
[704] = "Dorado/78/mixed/24/32/600 1900/summer/both/689 .35 681 .1/3/.15/.1/0",
[705] = "Albacore/60/mixed/20/40/600 1100 1800 3000/fall winter/both/685 .35/3/.3/.15/0",
[706] = "Shad/45/smooth/20/48/900 3000/spring summer fall/rainy/684 .35/2/.35/.2/0",
[707] = "Lingcod/85/mixed/30/50/600 3000/winter/both/690 .4 685 .2/3/.3/.05/0",
[708] = "Halibut/50/sinker/10/33/600 1100 1900 3000/spring summer winter/both/681 .35/3/.4/.2/0",
[715] = "Lobster/trap/.05/688 .45 689 .35 690 .35/ocean/2/20",
[716] = "Crayfish/trap/.35/682 .4/freshwater/1/8",
[717] = "Crab/trap/.1/684 .45/ocean/1/20",
[718] = "Cockle/trap/.3/680 .2/ocean/1/5",
[719] = "Mussel/trap/.35/683 .15/ocean/1/5",
[720] = "Shrimp/trap/.2/681 .35/ocean/1/3",
[721] = "Snail/trap/.25/680 .35/freshwater/1/5",
[722] = "Periwinkle/trap/.55/681 .35/freshwater/1/3",
[723] = "Oyster/trap/.15/682 .35/ocean/1/5",
[734] = "Woodskip/50/mixed/11/30/600 3000/spring summer fall winter/both/685 .35/3/.2/.1/0",
[775] = "Glacierfish/100/mixed/27/27/600 2000/winter/sunny/688 .1/5/0/.02/7",
[795] = "Void Salmon/80/mixed/24/65/600 3000/spring summer fall winter/both/685 .35/2/.33/.1/0",
[796] = "Slimejack/55/dart/8/25/600 3000/spring summer fall winter/both/685 .35/3/.4/.1/0",
[798] = "Midnight Squid/55/sinker/8/25/600 3000/spring summer fall winter/both/685 .35/3/.4/.1/0",
[799] = "Spook Fish/60/dart/8/25/600 3000/spring summer fall winter/both/685 .35/3/.4/.1/0",
[800] = "Blobfish/75/floater/8/25/600 3000/spring summer fall winter/both/685 .35/3/.4/.1/0",
};
foreach (KeyValuePair<int, string> pair in nightFish) {
asset.AsDictionary<int, string>().Set(pair.Key, pair.Value);
}
}
}
}

5
GeneralMods/NightOwl/NightOwl.cs
View File

@ -95,8 +95,13 @@ namespace Omegasis.NightOwl
/// <param name="helper">Provides simplified APIs for writing mods.</param>
public override void Entry(IModHelper helper)
{
this.Config = helper.ReadConfig<ModConfig>();
if (Config.UseInternalNightFishAssetEditor)
{
this.Helper.Content.AssetEditors.Add(new NightFishing());
}
TimeEvents.TimeOfDayChanged += this.TimeEvents_TimeOfDayChanged;
TimeEvents.AfterDayStarted += this.TimeEvents_AfterDayStarted;
SaveEvents.AfterLoad += this.SaveEvents_AfterLoad;

1
GeneralMods/NightOwl/NightOwl.csproj
View File

@ -76,6 +76,7 @@
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Framework\ModConfig.cs" />
<Compile Include="Framework\NightFishing.cs" />
<Compile Include="NightOwl.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

13
GeneralMods/StardustCore/ModCore.cs
View File

@ -179,21 +179,13 @@ namespace StardustCore
private void ControlEvents_KeyPressed(object sender, StardewModdingAPI.Events.EventArgsKeyPressed e)
{
if (e.KeyPressed == Keys.V)
{
CoreObject tile1 = new CoreObject(new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test1.png")), 3, Vector2.Zero, 9);
tile1.description = "Hello";
tile1.Name = "test";
tile1.displayName = "test";
Game1.player.addItemToInventory(tile1);
}
}
private void SaveEvents_AfterLoad(object sender, EventArgs e)
{
SerializationManager.restoreAllModObjects(SerializationManager.trackedObjectList);
List<KeyValuePair<Vector2, MultiTileComponent>> objs = new List<KeyValuePair<Vector2, MultiTileComponent>>();
//List<KeyValuePair<Vector2, MultiTileComponent>> objs = new List<KeyValuePair<Vector2, MultiTileComponent>>();
/*
MultiTileComponent tile1 = new MultiTileComponent(0,"Tileobj1","A basic tile obj",new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test1.png")));
MultiTileComponent tile2 = new MultiTileComponent(0,"Tileobj2", "A basic tile obj", new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test2.png")));
@ -206,13 +198,14 @@ namespace StardustCore
*/
// Game1.player.addItemToInventory(collection);
CoreObject tile1 = new CoreObject(new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test1.png")),3, Vector2.Zero,9);
tile1.description = "Hello";
tile1.Name = "test";
tile1.displayName = "test";
Game1.player.addItemToInventory(tile1);
}

9
GeneralMods/StardustCore/NetCode/ModdedClient.cs
View File

@ -148,14 +148,7 @@ namespace StardustCore.NetCode
while ((long)dataMsg.LengthBits - dataMsg.Position >= 8L)
{
message.Read(reader);
try
{
this.processIncomingMessage(message);
}
catch(Exception err)
{
}
this.processIncomingMessage(message);
}
}
}

23
GeneralMods/StardustCore/NetCode/NetCoreObject.cs
View File

@ -95,11 +95,15 @@ namespace StardustCore.NetCode
drawPosition = new NetVector2();
drawPosition.Read(reader, version);
Value.drawPosition = drawPosition.Value;
/*
NetBool isNull = new NetBool();
isNull.Read(reader, version);
if (isNull.Value) return;
animationManager = new NetAnimationManager();
animationManager.Read(reader, version);
Value.animationManager = animationManager.Value;
*/
}
@ -127,13 +131,14 @@ namespace StardustCore.NetCode
drawPosition = new NetVector2(Value.drawPosition);
drawPosition.Write(writer);
/*
if (Value.animationManager != null)
{
animationManager = new NetAnimationManager(Value.animationManager);
animationManager.Write(writer);
}
*/
NetBool isNull = new NetBool(Value.animationManager == null);
isNull.Write(writer);
if (isNull.Value == true) return;
animationManager = new NetAnimationManager(Value.animationManager);
animationManager.Write(writer);
}
}
}