Merge pull request #6 from Ranakastrasz/master

Updated for 0.15
sirenfal-factorio · Apr 25, 2017 · 0bab0de · 0bab0de
2 parents b7963a2 + f8333ae
commit 0bab0de
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/Localized_Charging_1.0.0/info.json b/Localized_Charging_1.0.0/info.json
@@ -5,6 +5,6 @@
 	"title": "Localized_Charging",
 	"author": "Sirenfal",
 	"description": "A charging mod that will recharge batteries in vehicles and power armor when near a charging pole.",
-	"dependencies": ["base >= 0.14.0"],
-	"factorio_version": "0.14.0"
+	"dependencies": ["base >= 0.15.0"],
+	"factorio_version": "0.15.0"
 }
diff --git a/Localized_Charging_1.0.0/locale/en.cfg → Localized_Charging_1.0.0/locale/en/all.cfg b/Localized_Charging_1.0.0/locale/en.cfg → Localized_Charging_1.0.0/locale/en/all.cfg
@@ -1,16 +1,16 @@
-[entity-name]
-localized-charging-pole-1=Localized Charging Pole (2.5MW/s)
-localized-charging-pole-2=Localized Charging Pole (5MW/s)
-localized-charging-pole-3=Localized Charging Pole (10MW/s)
-localized-charging-pole-4=Localized Charging Pole (20MW/s)
-
-[vehicles]
-electric-locomotive=Electric Locomotive
-
-[technology-name]
-voltage-electric-trains=Electric Trains
-voltage-wireless-energy-distribution=Wireless Energy Distribution
-
-[technology-description]
-voltage-electric-trains=Higher powered trains that run off of electric batteries.
-voltage-wireless-energy-distribution=A powerful charging system that will charge nearby power armor and certain electric vehicles at between 2.5 and 20MW/s, depending on the charging pole used. It will use twice the amount charged because the charging is inefficient.
+[entity-name]
+localized-charging-pole-1=Localized Charging Pole (2.5MW/s)
+localized-charging-pole-2=Localized Charging Pole (5MW/s)
+localized-charging-pole-3=Localized Charging Pole (10MW/s)
+localized-charging-pole-4=Localized Charging Pole (20MW/s)
+
+[vehicles]
+electric-locomotive=Electric Locomotive
+
+[technology-name]
+voltage-electric-trains=Electric Trains
+voltage-wireless-energy-distribution=Wireless Energy Distribution
+
+[technology-description]
+voltage-electric-trains=Higher powered trains that run off of electric batteries.
+voltage-wireless-energy-distribution=A powerful charging system that will charge nearby power armor and certain electric vehicles at between 2.5 and 20MW/s, depending on the charging pole used. It will use twice the amount charged because the charging is inefficient.
diff --git a/Localized_Charging_1.0.0/prototypes/charger.lua b/Localized_Charging_1.0.0/prototypes/charger.lua
@@ -38,7 +38,7 @@ data:extend({
 		localised_name = {'entity-name.localized-charging-pole-1'},
 		collision_box = {{-0.65, -0.65}, {0.65, 0.65}},
 		flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "placeable-off-grid"},
-		max_health = 0,
+		max_health = 1, -- At least you made it invulnerable in the script.
 		corpse = "medium-remnants",
 		collision_mask = {},
 		energy_source =
@@ -66,7 +66,7 @@ data:extend({
 		localised_name = {'entity-name.localized-charging-pole-2'},
 		collision_box = {{-0.65, -0.65}, {0.65, 0.65}},
 		flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "placeable-off-grid"},
-		max_health = 0,
+		max_health = 1,
 		corpse = "medium-remnants",
 		collision_mask = {},
 		energy_source =
@@ -94,7 +94,7 @@ data:extend({
 		localised_name = {'entity-name.localized-charging-pole-3'},
 		collision_box = {{-0.65, -0.65}, {0.65, 0.65}},
 		flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "placeable-off-grid"},
-		max_health = 0,
+		max_health = 1,
 		corpse = "medium-remnants",
 		collision_mask = {},
 		energy_source =
@@ -122,7 +122,7 @@ data:extend({
 		localised_name = {'entity-name.localized-charging-pole-4'},
 		collision_box = {{-0.65, -0.65}, {0.65, 0.65}},
 		flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "placeable-off-grid"},
-		max_health = 0,
+		max_health = 1,
 		corpse = "medium-remnants",
 		collision_mask = {},
 		energy_source =

diff --git a/Localized_Charging_1.0.0/prototypes/items.lua b/Localized_Charging_1.0.0/prototypes/items.lua
@@ -48,7 +48,7 @@ data:extend({
 		place_result = "localized-charging-pole-4",
 		stack_size = 10
 	},
-	clone_existing_data(data.raw['item-with-entity-data']['diesel-locomotive'], {
+	clone_existing_data(data.raw['item-with-entity-data']['locomotive'], {
 		name = "electric-locomotive",
 		localised_name={'vehicles.electric-locomotive'},
 		icon = "__Localized_Charging__/graphics/icons/electric-locomotive.png",

diff --git a/Localized_Charging_1.0.0/prototypes/vehicles.lua b/Localized_Charging_1.0.0/prototypes/vehicles.lua
@@ -9,7 +9,7 @@ data:extend({
 		height = 10,
 		equipment_categories = {"armor"},
 	},
-	clone_existing_data(data.raw.locomotive['diesel-locomotive'], {
+	clone_existing_data(data.raw.locomotive['locomotive'], {
 		name='electric-locomotive',
 		localised_name={'vehicles.electric-locomotive'},
 		icon = "__Localized_Charging__/graphics/icons/electric-locomotive.png",