Sync with version from mod portal

changelog.txt

@@ -1,4 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.14.6
+Date: 26.02.2019
+  Changes:
+    - Added thumbnail.png
+---------------------------------------------------------------------------------------------------
+Version: 0.14.5
+Date: 26.02.2019
+  Changes:
+    - Updated to Factorio 0.17
+---------------------------------------------------------------------------------------------------
 Version: 0.14.2 - 0.14.4
 Date: 22.10.2018 - 23.10.2018
   Fixes:

info.json

@@ -1,11 +1,11 @@
 {
 "name": "RandomFactorioThings",
-"version": "0.14.4",
+"version": "0.14.6",
 "title": "Random Factorio Things",
 "author": "JohnTheCoolingFan",
 "contact": "ivan8215145640@gmail.com",
 "homepage": "",
-"dependencies": ["base >= 0.16.0", "?DeadlockLoaders", "?DeadlockStacking", "?DeadlockCrating"],
+"dependencies": ["base >= 0.17.0", "?DeadlockLoaders", "?DeadlockStacking", "?DeadlockCrating"],
 "description": "A lot of new and useful things.",
-"factorio_version": "0.16"
+"factorio_version": "0.17"
 }

prototypes/entity/entities.lua

@@ -10,24 +10,9 @@ local nuclear_transport_belt = util.table.deepcopy(data.raw["transport-belt"]["e
 	nuclear_transport_belt.minable.result = "nuclear-transport-belt"
 	nuclear_transport_belt.max_health = 170
 	nuclear_transport_belt.speed = 0.125
-	nuclear_transport_belt.animations.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.animations.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.belt_horizontal.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.belt_horizontal.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.belt_vertical.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.belt_vertical.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.ending_top.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.ending_top.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.ending_bottom.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.ending_bottom.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.ending_side.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.ending_side.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.starting_top.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.starting_top.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.starting_bottom.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.starting_bottom.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_transport_belt.starting_side.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_transport_belt.starting_side.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
+	nuclear_transport_belt.next_upgrade = nil
+	nuclear_transport_belt.belt_animation_set.animation_set.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
+	nuclear_transport_belt.belt_animation_set.animation_set.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
 table.insert(belt_entities, nuclear_transport_belt)
 
 local nuclear_underground_belt = util.table.deepcopy(data.raw["underground-belt"]["express-underground-belt"])
@@ -36,49 +21,24 @@ local nuclear_underground_belt = util.table.deepcopy(data.raw["underground-belt"
 	nuclear_underground_belt.minable.result = "nuclear-underground-belt"
 	nuclear_underground_belt.max_distance = 11
 	nuclear_underground_belt.speed = 0.125
-	nuclear_underground_belt.belt_horizontal.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.belt_horizontal.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.belt_vertical.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.belt_vertical.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.ending_top.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.ending_top.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.ending_bottom.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.ending_bottom.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.ending_side.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.ending_side.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.starting_top.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.starting_top.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.starting_bottom.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.starting_bottom.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_underground_belt.starting_side.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_underground_belt.starting_side.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
+	nuclear_underground_belt.next_upgrade = nil
 	nuclear_underground_belt.structure.direction_in.sheet.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png"
 	nuclear_underground_belt.structure.direction_in.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png"
 	nuclear_underground_belt.structure.direction_out.sheet.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png"
 	nuclear_underground_belt.structure.direction_out.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png"
+	nuclear_underground_belt.structure.direction_in_side_loading.sheet.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png"
+	nuclear_underground_belt.structure.direction_in_side_loading.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png"
+	nuclear_underground_belt.structure.direction_in_side_loading.sheet.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png"
+	nuclear_underground_belt.structure.direction_in_side_loading.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png"
 table.insert(belt_entities, nuclear_underground_belt)
 
 local nuclear_splitter = util.table.deepcopy(data.raw["splitter"]["express-splitter"])
 	nuclear_splitter.name = "nuclear-splitter"
 	nuclear_splitter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-splitter.png"
 	nuclear_splitter.minable.result = "nuclear-splitter"
 	nuclear_splitter.speed = 0.125
-	nuclear_splitter.belt_horizontal.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.belt_horizontal.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.belt_vertical.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.belt_vertical.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.ending_top.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.ending_top.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.ending_bottom.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.ending_bottom.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.ending_side.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.ending_side.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.starting_top.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.starting_top.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.starting_bottom.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.starting_bottom.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
-	nuclear_splitter.starting_side.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png"
-	nuclear_splitter.starting_side.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png"
+	nuclear_splitter.next_upgrade = nil
+	nuclear_splitter.belt_animation_set = nuclear_transport_belt.belt_animation_set
 	nuclear_splitter.structure.north.filename = "__RandomFactorioThings__/graphics/entity/nuclear-splitter/nuclear-splitter-north.png"
 	nuclear_splitter.structure.north.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-splitter/hr-nuclear-splitter-north.png"
 	nuclear_splitter.structure.east.filename = "__RandomFactorioThings__/graphics/entity/nuclear-splitter/nuclear-splitter-east.png"
@@ -90,6 +50,9 @@ local nuclear_splitter = util.table.deepcopy(data.raw["splitter"]["express-split
 table.insert(belt_entities, nuclear_splitter)
 
 data:extend(belt_entities)
+data.raw["transport-belt"]["express-transport-belt"].next_upgrade = "nuclear-transport-belt"
+data.raw["underground-belt"]["express-underground-belt"].next_upgrade = "nuclear-underground-belt"
+data.raw["splitter"]["express-splitter"].next_upgrade = "nuclear-splitter"
 
 local entities = {}
 
@@ -236,7 +199,6 @@ data:extend({
 			emissions = 0.03 / 3.5
 		},
 		energy_usage = "500kW",
-		ingredient_count = 10,
 		module_specification =
 		{
 			module_slots = 6
@@ -608,7 +570,6 @@ data:extend({
       emissions = 0.04 / 2.5
     },
     energy_usage = "300kW",
-    ingredient_count = 2,
     module_specification =
     {
       module_slots = 2
@@ -980,7 +941,6 @@ data:extend({
       emissions = 0.04 / 2.5
     },
     energy_usage = "300kW",
-    ingredient_count = 2,
     module_specification =
     {
       module_slots = 3

prototypes/entity/inserters.lua

@@ -18,8 +18,8 @@ data:extend({
     },
     collision_box = {{-0.15, -0.15}, {0.15, 0.15}},
     selection_box = {{-0.4, -0.35}, {0.4, 0.45}},
-    energy_per_movement = 15000,
-    energy_per_rotation = 15000,
+    energy_per_movement = "15kJ",
+    energy_per_rotation = "15kJ",
     energy_source =
     {
       type = "electric",

prototypes/item/item.lua

@@ -104,7 +104,7 @@ data:extend({
 		name = "nuclear-transport-belt",
 		icon = "__RandomFactorioThings__/graphics/icons/nuclear-transport-belt.png",
 		icon_size = 32,
-		flags = {"goes-to-quickbar"},
+		flags = {},
 		subgroup = "belt",
 		order = "a[transport-belt]-d[nuclear-transport-belt]",
 		place_result = "nuclear-transport-belt",
@@ -115,7 +115,7 @@ data:extend({
 		name = "nuclear-underground-belt",
 		icon = "__RandomFactorioThings__/graphics/icons/nuclear-underground-belt.png",
 		icon_size = 32,
-		flags = {"goes-to-quickbar"},
+		flags = {},
 		subgroup = "belt",
 		order = "b[underground-belt]-d[nuclear-underground-belt]",
 		place_result = "nuclear-underground-belt",
@@ -126,36 +126,10 @@ data:extend({
 		name = "nuclear-splitter",
 		icon = "__RandomFactorioThings__/graphics/icons/nuclear-splitter.png",
 		icon_size = 32,
-		flags = {"goes-to-quickbar"},
+		flags = {},
 		subgroup = "belt",
 		order = "c[splitter]-d[nuclear-splitter]",
 		place_result = "nuclear-splitter",
 		stack_size = 50
-	},
-	{
-		type = "mining-tool",
-		name = "nuclear-axe",
-		localised_description = {"item-description.mining-tool"},
-		icon = "__RandomFactorioThings__/graphics/icons/nuclear-axe.png",
-		icon_size = 32,
-		flags = {"goes-to-main-inventory"},
-		action =
-		{
-			type="direct",
-			action_delivery =
-			{
-				type = "instant",
-				target_effects =
-				{
-					type = "damage",
-					damage = { amount = 12 , type = "physical"}
-				}
-			}
-		},
-		durability = 5000,
-		subgroup = "tool",
-		order = "a[mining]-c[nuclear-axe]",
-		speed = 10,
-		stack_size = 20
 	}
   })