Merge pull request #6 from Pathoschild/update-code

lambui · web-flow · commit 20b74fac92fa · 2019-02-04T22:07:44.000-08:00
Update for 2.0.4 release
diff --git a/OmniFarm/OmniFarm.cs b/OmniFarm/OmniFarm.cs
@@ -100,13 +100,10 @@ private void OnDayStarted(object sender, EventArgs e)
                         if (Game1.IsWinter == false)
                             foreach (Vector2 tile in Config.getGrassLocations())
                             {
-                                TerrainFeature check;
-                                if (ourFarm.terrainFeatures.TryGetValue(tile, out check))
+                                if (ourFarm.terrainFeatures.TryGetValue(tile, out TerrainFeature check))
                                 {
-                                    if (check is Grass)
-                                    {
-                                        ((Grass)check).numberOfWeeds.Value = Config.GrassGrowth_1forsparse_4forFull;
-                                    }
+                                    if (check is Grass grass)
+                                        grass.numberOfWeeds.Value = Config.GrassGrowth_1forsparse_4forFull;
                                 }
                                 else
                                     ourFarm.terrainFeatures.Add(tile, new Grass(Grass.springGrass, Config.GrassGrowth_1forsparse_4forFull));
@@ -158,7 +155,7 @@ private void OnDayStarted(object sender, EventArgs e)
                                 }
                             }
 
-                            //if ore doesnt spawn then calculate gem spawn
+                            //if ore doesn't spawn then calculate gem spawn
                             //1% to spawn gem
                             if (randomGen.NextDouble() < Config.gemChance)
                             {
diff --git a/OmniFarm/Properties/AssemblyInfo.cs b/OmniFarm/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
 ﻿using System.Reflection;
 
 [assembly: AssemblyTitle("OmniFarm")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyVersion("2.0.2.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyVersion("2.0.4")]
+[assembly: AssemblyFileVersion("2.0.4")]
diff --git a/OmniFarm/manifest.json b/OmniFarm/manifest.json
@@ -1,10 +1,10 @@
 ﻿{
   "Name": "Omnifarm",
   "Author": "PhthaloBlue",
-  "Version": "2.0.3",
+  "Version": "2.0.4",
   "Description": "Combat map replacement.",
   "UniqueID": "PhthaloBlue.Omnifarm",
   "EntryDll": "OmniFarm.dll",
   "MinimumApiVersion": "2.10.1",
-  "UpdateKeys": ["GitHub:lambui/StardewValleyMod_OmniFarm"]
+  "UpdateKeys": [ "GitHub:lambui/StardewValleyMod_OmniFarm" ]
 }

Original file line number	Diff line number	Diff line change
`@@ -100,13 +100,10 @@ private void OnDayStarted(object sender, EventArgs e)`
`100`	`100`	`if (Game1.IsWinter == false)`
`101`	`101`	`foreach (Vector2 tile in Config.getGrassLocations())`
`102`	`102`	`{`
`103`		`- TerrainFeature check;`
`104`		`- if (ourFarm.terrainFeatures.TryGetValue(tile, out check))`
	`103`	`+ if (ourFarm.terrainFeatures.TryGetValue(tile, out TerrainFeature check))`
`105`	`104`	`{`
`106`		`- if (check is Grass)`
`107`		`- {`
`108`		`- ((Grass)check).numberOfWeeds.Value = Config.GrassGrowth_1forsparse_4forFull;`
`109`		`- }`
	`105`	`+ if (check is Grass grass)`
	`106`	`+ grass.numberOfWeeds.Value = Config.GrassGrowth_1forsparse_4forFull;`
`110`	`107`	`}`
`111`	`108`	`else`
`112`	`109`	`ourFarm.terrainFeatures.Add(tile, new Grass(Grass.springGrass, Config.GrassGrowth_1forsparse_4forFull));`
`@@ -158,7 +155,7 @@ private void OnDayStarted(object sender, EventArgs e)`
`158`	`155`	`}`
`159`	`156`	`}`
`160`	`157`
`161`		`- //if ore doesnt spawn then calculate gem spawn`
	`158`	`+ //if ore doesn't spawn then calculate gem spawn`
`162`	`159`	`//1% to spawn gem`
`163`	`160`	`if (randomGen.NextDouble() < Config.gemChance)`
`164`	`161`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"Name": "Omnifarm",`
`3`	`3`	`"Author": "PhthaloBlue",`
`4`		`- "Version": "2.0.3",`
	`4`	`+ "Version": "2.0.4",`
`5`	`5`	`"Description": "Combat map replacement.",`
`6`	`6`	`"UniqueID": "PhthaloBlue.Omnifarm",`
`7`	`7`	`"EntryDll": "OmniFarm.dll",`
`8`	`8`	`"MinimumApiVersion": "2.10.1",`
`9`		`- "UpdateKeys": ["GitHub:lambui/StardewValleyMod_OmniFarm"]`
	`9`	`+ "UpdateKeys": [ "GitHub:lambui/StardewValleyMod_OmniFarm" ]`
`10`	`10`	`}`