From 559bd61f45a2a3360130f72118e88c9e38f6debe Mon Sep 17 00:00:00 2001
From: judos <judos@gmx.ch>
Date: Wed, 3 May 2017 01:02:37 +0200
Subject: [PATCH] first step toward 0.15 release

---
 linkHardCrafting.bat                         |  1 +
 source/info.json                             |  6 +++---
 source/prototypes/dirt-tile.lua              | 12 ++++++------
 source/prototypes/easier-but-more-trains.lua |  2 +-
 source/prototypes/harder-coal.lua            |  1 +
 5 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 linkHardCrafting.bat

diff --git a/linkHardCrafting.bat b/linkHardCrafting.bat
new file mode 100644
index 0000000..c59363f
--- /dev/null
+++ b/linkHardCrafting.bat
@@ -0,0 +1 @@
+mklink /j "mods/hardCrafting_0.5.2" "D:\modding\factorio\hardCrafting\source"
\ No newline at end of file
diff --git a/source/info.json b/source/info.json
index a2a086b..d3d3acd 100644
--- a/source/info.json
+++ b/source/info.json
@@ -1,10 +1,10 @@
 {
 	"name": "hardCrafting",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"title": "Hard crafting",
 	"author": "judos",
 	"description": "Modifies vanilla crafting and smelting to be much trickier, you will need better planning and more clever setup",
-	"dependencies": ["base >= 0.14.0", "? fluid-barrel >= 1.0.0", "? marathon >= 0.5.4", "? angelsinfiniteores >= 0.1.2", "? SmartTrains"],
+	"dependencies": ["base >= 0.15.0", "? fluid-barrel >= 1.0.0", "? marathon >= 0.5.4", "? angelsinfiniteores >= 0.1.2", "? SmartTrains"],
 	"homepage": "https://github.com/judos/hardCrafting",
-	"factorio_version": "0.14"
+	"factorio_version": "0.15"
 }
diff --git a/source/prototypes/dirt-tile.lua b/source/prototypes/dirt-tile.lua
index cf8d1c7..27364d7 100644
--- a/source/prototypes/dirt-tile.lua
+++ b/source/prototypes/dirt-tile.lua
@@ -19,24 +19,24 @@ data:extend({
 			{
 				{
 					picture = "__hardCrafting__/graphics/terrain/dirt/dirt1.png",
-					count = 22,
+					count = 16,
 					size = 1,
-					weights = {0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045, 0.005, 0.005, 0.005, 0.005, 0.003, 0.005 }
+					weights = {0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 } -- , 0.005, 0.005, 0.005, 0.005, 0.003, 0.005
 				},
 				{
 					picture = "__hardCrafting__/graphics/terrain/dirt/dirt2.png",
-					count = 30,
+					count = 16,
 					size = 2,
 					probability = 1,
-					weights = {0.070, 0.070, 0.025, 0.070, 0.070, 0.070, 0.007, 0.025, 0.070, 0.050, 0.015, 0.026, 0.030, 0.005, 0.070, 0.027, 0.022, 0.032, 0.020, 0.020, 0.030, 0.005, 0.010, 0.002, 0.013, 0.007, 0.007, 0.010, 0.030, 0.030 }
+					weights = {0.070, 0.070, 0.025, 0.070, 0.070, 0.070, 0.007, 0.025, 0.070, 0.050, 0.015, 0.026, 0.030, 0.005, 0.070, 0.027 } --, 0.022, 0.032, 0.020, 0.020, 0.030, 0.005, 0.010, 0.002, 0.013, 0.007, 0.007, 0.010, 0.030, 0.030 }
 				},
 				{
 					picture = "__hardCrafting__/graphics/terrain/dirt/dirt4.png",
-					count = 21,
+					count = 16,
 					line_length = 11,
 					size = 4,
 					probability = 1,
-					weights = {0.070, 0.070, 0.070, 0.070, 0.070, 0.070, 0.015, 0.070, 0.070, 0.070, 0.015, 0.050, 0.070, 0.070, 0.065, 0.070, 0.070, 0.050, 0.050, 0.050, 0.050 }
+					weights = {0.070, 0.070, 0.070, 0.070, 0.070, 0.070, 0.015, 0.070, 0.070, 0.070, 0.015, 0.050, 0.070, 0.070, 0.065, 0.070 } --, 0.070, 0.050, 0.050, 0.050, 0.050 }
 				}
 			},
 			inner_corner =
diff --git a/source/prototypes/easier-but-more-trains.lua b/source/prototypes/easier-but-more-trains.lua
index 6d7750f..75c4f29 100644
--- a/source/prototypes/easier-but-more-trains.lua
+++ b/source/prototypes/easier-but-more-trains.lua
@@ -1,5 +1,5 @@
 -- Half the cost of diesel-locomotive
-for _,materialCost in pairs(data.raw["recipe"]["diesel-locomotive"].ingredients) do
+for _,materialCost in pairs(data.raw["recipe"]["locomotive"].ingredients) do
 	if materialCost["amount"] then
 		materialCost["amount"] = math.ceil(materialCost["amount"] / 2)
 	elseif materialCost[2] then
diff --git a/source/prototypes/harder-coal.lua b/source/prototypes/harder-coal.lua
index 0c33e1b..d3d1f4d 100644
--- a/source/prototypes/harder-coal.lua
+++ b/source/prototypes/harder-coal.lua
@@ -20,6 +20,7 @@ fuelValueCoal = tonumber(fuelValueCoal:sub(1,fuelValueCoal:len()-2))
 local fuelValueCoalDust = (fuelValueCoal+ timeToPulverizeCoal*powerPulverizer) / 5 * 1.2
 fuelValueCoalDust = round(fuelValueCoalDust,1)
 data.raw["item"]["coal-dust"].fuel_value = tostring(fuelValueCoalDust).."MJ"
+data.raw["item"]["coal-dust"].fuel_category = "chemical"
 
 -- Recipes: --
 --       item Name     category   subgroup     time   							 ingredients     products		order