Small misc changes

pipliz · Dec 2, 2017 · 4fe8b54 · 4fe8b54
1 parent 7eba2de
commit 4fe8b54
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 38 deletions.
diff --git a/gamedata/changelogs/0.4.5.txt b/gamedata/changelogs/0.4.5.txt
@@ -1,7 +1,11 @@
 0.4.5 (2017-12-01)
 
+-Hide the bow & bowstring recipes from the workbench job until you've researched the bronze anvil
+-Hide linseedoil, coated planks and adobe from the workbench job until you've researched flax farming
+-Changed black planks recipe to use charcoal instead of coal ore
+
 -Added a basic autosave for non-block data (players, jobs etc), every 5 minutes by default.
--Added a '/tps' command to get the ticks per second the server is running at (to see if it's lagging badly, gives avg fps over 10 seconds)
+-Added a '/tps' command to get the ticks per second the server is running at (to see if it's lagging badly, gives avg fps over 10 seconds - optimal is ~50)
 -Changed saving of JSON files to prevent file corruption if the game crashes during saving (similar to regions change a few patches back).
 -Fixed npc's sometimes deciding to stand at the side of a block that isn't the closest to them
 -Fixed an issue with water spreading (it would spread anyway even after you filled a water block)
@@ -20,4 +24,5 @@ Modding changes:
 -Added player.IDString, which is just a cached version of player.ID.ToString()
 -Made Colony.collection public
 -Changed JSONNode internals to use a sorted list instead of a dictionary
--Fixed a problem with using sortedList.AddOverride or setting through the indexer
+-Fixed a problem with using sortedList.AddOverride or setting through the indexer
+-Allow multiple [ModCallback] attributes on 1 method, though they'll all use the same providesfor/dependson
diff --git a/gamedata/mods/Pipliz/BaseResearch/src/Implementations/BronzeAnvil.cs b/gamedata/mods/Pipliz/BaseResearch/src/Implementations/BronzeAnvil.cs
@@ -19,6 +19,8 @@ public BronzeAnvil ()
 		public override void OnResearchComplete (ScienceManagerPlayer manager, EResearchCompletionReason reason)
 		{
 			RecipeStorage.GetPlayerStorage(manager.Player).SetRecipeAvailability("pipliz.crafter.bronzeanvil", true, "pipliz.crafter");
+			RecipeStorage.GetPlayerStorage(manager.Player).SetRecipeAvailability("pipliz.crafter.bow", true, "pipliz.crafter");
+			RecipeStorage.GetPlayerStorage(manager.Player).SetRecipeAvailability("pipliz.crafter.bowstring", true, "pipliz.crafter");
 			RecipePlayer.UnlockOptionalRecipe(manager.Player, "pipliz.player.bronzeanvil");
 		}
 	}

diff --git a/gamedata/mods/Pipliz/BaseResearch/src/Implementations/FlaxFarming.cs b/gamedata/mods/Pipliz/BaseResearch/src/Implementations/FlaxFarming.cs
@@ -17,6 +17,10 @@ public FlaxFarming ()
 
 		public override void OnResearchComplete (ScienceManagerPlayer manager, EResearchCompletionReason reason)
 		{
+			RecipeStorage.GetPlayerStorage(manager.Player).SetRecipeAvailability("pipliz.crafter.linseedoil", true, "pipliz.crafter");
+			RecipeStorage.GetPlayerStorage(manager.Player).SetRecipeAvailability("pipliz.crafter.coatedplanks", true, "pipliz.crafter");
+			RecipeStorage.GetPlayerStorage(manager.Player).SetRecipeAvailability("pipliz.crafter.adobe", true, "pipliz.crafter");
+
 			if (reason == EResearchCompletionReason.ProgressCompleted) {
 				Stockpile.GetStockPile(manager.Player).Add(BlockTypes.Builtin.BuiltinBlocks.FlaxStage1, 100);
 				if (manager.Player.IsConnected) {

diff --git a/gamedata/mods/Pipliz/BlockNPCs/gamedata/crafting.json b/gamedata/mods/Pipliz/BlockNPCs/gamedata/crafting.json
@@ -59,20 +59,6 @@
 		"defaultLimit" : 5,
 		"defaultPriority" : -100
 	},
-	{
-		"name" : "pipliz.crafter.bow",
-		"results":[{"type":"bow"}],
-		"requires":[{"type":"planks","amount":2},{"type":"bowstring"}],
-		"defaultLimit" : 3,
-		"defaultPriority" : 100
-	},
-	{
-		"name" : "pipliz.crafter.bowstring",
-		"results":[{"type":"bowstring"}],
-		"requires":[{"type":"flax","amount":2}],
-		"defaultLimit" : 3,
-		"defaultPriority" : 100
-	},
 	{
 		"name" : "pipliz.crafter.furnace",
 		"results":[{"type":"furnace"}],
@@ -115,27 +101,6 @@
 		"defaultLimit" : 1,
 		"defaultPriority" : -100
 	},
-	{
-		"name" : "pipliz.crafter.linseedoil",
-		"results":[{"type":"linseedoil","amount":3}],
-		"requires":[{"type":"flax","amount":3}],
-		"defaultLimit" : 3,
-		"defaultPriority" : -100
-	},
-	{
-		"name" : "pipliz.crafter.coatedplanks",
-		"results":[{"type":"coatedplanks","amount":3}],
-		"requires":[{"type":"linseedoil","amount":3},{"type":"planks","amount":3}],
-		"defaultLimit" : 3,
-		"defaultPriority" : -100
-	},
-	{
-		"name" : "pipliz.crafter.adobe",
-		"results":[{"type":"adobe"}],
-		"requires":[{"type":"linseedoil"},{"type":"dirt"}],
-		"defaultLimit" : 5,
-		"defaultPriority" : -100
-	},
 	{
 		"name" : "pipliz.crafter.plasterblock",
 		"results":[{"type":"plasterblock"}],
@@ -153,10 +118,26 @@
 	{
 		"name" : "pipliz.crafter.blackplanks",
 		"results":[{"type":"blackplanks"}],
-		"requires":[{"type":"planks"},{"type":"coalore"}],
+		"requires":[{"type":"planks"},{"type":"charcoal"}],
 		"defaultLimit" : 0,
 		"defaultPriority" : -100
 	},
+	{
+		"name" : "pipliz.crafter.bow",
+		"results":[{"type":"bow"}],
+		"requires":[{"type":"planks","amount":2},{"type":"bowstring"}],
+		"defaultLimit" : 3,
+		"defaultPriority" : 100,
+		"isOptional" : true
+	},
+	{
+		"name" : "pipliz.crafter.bowstring",
+		"results":[{"type":"bowstring"}],
+		"requires":[{"type":"flax","amount":2}],
+		"defaultLimit" : 3,
+		"defaultPriority" : 100,
+		"isOptional" : true
+	},
 	{
 		"name" : "pipliz.crafter.oven",
 		"results":[{"type":"oven"}],
@@ -189,6 +170,30 @@
 		"defaultPriority" : -100,
 		"isOptional" : true
 	},
+	{
+		"name" : "pipliz.crafter.linseedoil",
+		"results":[{"type":"linseedoil","amount":3}],
+		"requires":[{"type":"flax","amount":3}],
+		"defaultLimit" : 3,
+		"defaultPriority" : -100,
+		"isOptional" : true
+	},
+	{
+		"name" : "pipliz.crafter.coatedplanks",
+		"results":[{"type":"coatedplanks","amount":3}],
+		"requires":[{"type":"linseedoil","amount":3},{"type":"planks","amount":3}],
+		"defaultLimit" : 3,
+		"defaultPriority" : -100,
+		"isOptional" : true
+	},
+	{
+		"name" : "pipliz.crafter.adobe",
+		"results":[{"type":"adobe"}],
+		"requires":[{"type":"linseedoil"},{"type":"dirt"}],
+		"defaultLimit" : 5,
+		"defaultPriority" : -100,
+		"isOptional" : true
+	},
 	{
 		"name" : "pipliz.crafter.splittingstumptaiga",
 		"results":[{"type":"splittingstump"}],