From f8333ae1062194fa9752231982e5e43ad799d23a Mon Sep 17 00:00:00 2001 From: Ranakastrasz Date: Mon, 24 Apr 2017 22:08:27 -0400 Subject: [PATCH] Updated for 0.15 Also moved localizations into correct folder. Not sure if factorio changed how it handles them or what, but it was all missing keys. --- Localized_Charging_1.0.0/info.json | 4 +-- .../locale/{en.cfg => en/all.cfg} | 32 +++++++++---------- .../prototypes/charger.lua | 8 ++--- Localized_Charging_1.0.0/prototypes/items.lua | 2 +- .../prototypes/vehicles.lua | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) rename Localized_Charging_1.0.0/locale/{en.cfg => en/all.cfg} (98%) diff --git a/Localized_Charging_1.0.0/info.json b/Localized_Charging_1.0.0/info.json index 00b7b8e..3aa4f98 100644 --- 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 b/Localized_Charging_1.0.0/locale/en/all.cfg similarity index 98% rename from Localized_Charging_1.0.0/locale/en.cfg rename to Localized_Charging_1.0.0/locale/en/all.cfg index d0ab71f..475e278 100644 --- a/Localized_Charging_1.0.0/locale/en.cfg +++ b/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 index 662c620..aab3a34 100644 --- 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 index 28e2074..83c4d30 100644 --- 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 index e7c73c2..36f3303 100644 --- 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",