fix: wither skulls not craftable with withering souls

fixes #2564
DarkPacks · May 22, 2018 · 1557668 · 1557668
1 parent 84df97b
commit 1557668
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/config/mputils/changelog.txt b/src/config/mputils/changelog.txt
@@ -57,6 +57,7 @@ Bug Fixes:
 * Fixed missed recipes in ExPlant with it's uranium (#2539)
 * Fixed Blood Magic bound tools being able to break in some situations
 * Hopefully fix the spawn rate for Imps (#1910)
+* Fixed Wither Skulls not craftable with withering souls (#2564)
 
 Enhancements:
 * Add dying recipes for the Twilight Forest Castle Doors

diff --git a/src/scripts/recipes/shaped_recipe_master.zs b/src/scripts/recipes/shaped_recipe_master.zs
@@ -220,7 +220,7 @@ recipes.removeShaped(<quantumstorage:quantum_bag>, [
 	[<ore:wool>, <ore:wool>, <ore:wool>]
 ]);
 
-
+recipes.removeShaped(<minecraft:skull:1> * 3);
 
 
 

diff --git a/src/scripts/staging/item_and_recipes/03_three/recipes.add.shaped.zs b/src/scripts/staging/item_and_recipes/03_three/recipes.add.shaped.zs
@@ -1367,6 +1367,15 @@ var shapedRecipes as IIngredient[][][][IItemStack] = {
 			[<industrialforegoing:conveyor:*>, <ore:dyeLightGray>, <industrialforegoing:conveyor:*>],
 			[<industrialforegoing:conveyor:*>, <industrialforegoing:conveyor:*>, <industrialforegoing:conveyor:*>]
 		]
+	],
+
+	//Withering Souls to Skulls fix
+	<minecraft:skull:1> * 3 : [
+		[
+			[<mysticalagradditions:stuff:1>, <mysticalagradditions:stuff:1>, null],
+			[<mysticalagradditions:stuff:1>, null, null],
+			[null, null, null]
+		]
 	]
 
 };

diff --git a/src/scripts/staging/item_and_recipes/05_five/items.zs b/src/scripts/staging/item_and_recipes/05_five/items.zs
@@ -2045,6 +2045,8 @@ for item in stage5Items {
 //Leave this to allow Dragon Scales to be used in Stage 4
 mods.ItemStages.removeItemStage(<mysticalagradditions:stuff:3>);
 mods.ItemStages.addItemStage(STAGES.four, <mysticalagradditions:stuff:3>);
+mods.ItemStages.removeItemStage(<mysticalagradditions:stuff:1>);
+mods.ItemStages.addItemStage(STAGES.three, <mysticalagradditions:stuff:1>);
 
 //TODO: Handle better
 //Set soulstone to stage 3
Original file line number	Diff line number	Diff line change
Expand Up		@@ -220,7 +220,7 @@ recipes.removeShaped(<quantumstorage:quantum_bag>, [
		[<ore:wool>, <ore:wool>, <ore:wool>]
		]);


		recipes.removeShaped(<minecraft:skull:1> * 3);



Expand Down