Merge pull request #51 from JohnTheCoolingFan/dev

1.2.2

README.md

@@ -15,6 +15,7 @@ And with energy generation part comes along destructive part. This mod also adds
 *   German / Deutsch (de) by [Shallfalke](https://mods.factorio.com/user/Schallfalke)
 *   Traditional Chinese / 正體中文 (zh-TW) by [Shallfalke](https://mods.factorio.com/user/Schallfalke)
 *   Simplified Chinese / 简体中文 (zh-CN) by [Shallfalke](https://mods.factorio.com/user/Schallfalke)
+*   Polish / Polski (pl) orifinally by Guru [TSM]#8528, updated by [TheNextJake](https://github.com/JohnTheCoolingFan/PlutoniumEnergy/commit/4ef7d64d2df110ac6eecc9e2320bfe089bab6c7f)
 
 #### Join my [Discord server](https://discord.gg/grHVhE2) to get latest news about my mods and just to talk with each other. It's mainly Russian, but everyone is welcome.
 [![Discord server](https://discordapp.com/api/guilds/370167294439063564/widget.png?style=banner2)](https://discord.gg/grHVhE2)

changelog.txt

@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.2
+Date: 11.01.2021
+  Locale:
+    - Updated Polish localisation (by TheNextJake)
+    - Updated German localisation (using Google Translate)
+  Fixes:
+    - Fixed integration with SchallArtillery
+---------------------------------------------------------------------------------------------------
 Version: 1.2.1
 Date: 11.01.2021
   Integration:

info.json

@@ -1,6 +1,6 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",

locale/de/base.cfg

@@ -41,13 +41,15 @@ SUP-plutonium-239-alpha-decay=Alphazerfall von Plutonium-239
 uranium-238-excess-neutron-capture=Neutroneneinfang und Betazerfälle von Uran-238
 SUP-uranium-238-excess-neutron-capture=Neutroneneinfang und Betazerfälle von Abgereichertes Uran
 MOX-fuel-reprocessing=Wiederaufbereitung von MOX-Brennstoff
+plutonium-enrichment-process=Plutonium-Anreicherungsprozess
 
 [technology-name]
 plutonium-nuclear-power=Plutonium-Kernenergie
 MOX-fuel-reprocessing=Wiederaufbereitung von MOX-Brennstoff
 plutonium-ammo=Waffenplutonium
 plutonium-atomic-bomb=Plutoniumbombe
 plutonium-processing=Plutoniumverarbeitung
+plutonium-enrichment-process=Plutonium-Anreicherungsprozess
 
 [technology-description]
 plutonium-processing=Verarbeitung von Plutonium, das in der Natur nicht vorkommt, aber im Kernreaktor erzeugt werden kann.

prototypes/entity/projectiles.lua

@@ -114,32 +114,32 @@ if mods['SchallArtillery'] then
     sc_plutonium_aa_pj.picture.filename = "__PlutoniumEnergy__/graphics/entity/plutonium-artillery-projectile/hr-plutonium-atomic-shell.png"
     sc_plutonium_aa_pj.chart_picture.filename = "__PlutoniumEnergy__/graphics/entity/plutonium-artillery-projectile/plutonium-atomic-artillery-shoot-map-visualization.png"
 
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[7+index_offset].damage.amount = 560                   -- 400 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[10+index_offset].radius = 20                          -- 14 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[11+index_offset].spawn_min_radius = 16.5              -- Rough numbers
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[11+index_offset].spawn_max_radius = 17.5
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[11+index_offset].spawn_min = 45
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[11+index_offset].spawn_max = 60
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[12+index_offset].action.repeat_count = 1400           -- 1000 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[12+index_offset].action.radius = 10                   -- 7 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[12+index_offset].action.action_delivery.starting_speed = 0.5*0.8 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[13+index_offset].action.repeat_count = 1400           -- 1000 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[13+index_offset].action.radius = 50                   -- 35 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[13+index_offset].action.action_delivery.starting_speed = 0.5*0.7 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[14+index_offset].action.repeat_count = 1400           -- 1000 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[14+index_offset].action.radius = 36                   -- 26 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[14+index_offset].action.action_delivery.starting_speed = 0.5*0.7 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[15+index_offset].action.repeat_count = 980            -- 700 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[15+index_offset].action.radius = 6                    -- 4 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[15+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[16+index_offset].action.repeat_count = 1400           -- 1000 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[16+index_offset].action.radius = 11                   -- 8 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[16+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[17+index_offset].action.repeat_count = 420            -- 300 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[17+index_offset].action.radius = 36                   -- 26 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[17+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[18+index_offset].action.repeat_count = 14             -- 10 * 1.4
-    sc_plutonium_aa_pj.action.action_delivery.target_effects[18+index_offset].action.radius = 11                   -- 8 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[7].damage.amount = 560                   -- 400 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[10].radius = 20                          -- 14 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[11].spawn_min_radius = 16.5              -- Rough numbers
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[11].spawn_max_radius = 17.5
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[11].spawn_min = 45
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[11].spawn_max = 60
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[12].action.repeat_count = 1400           -- 1000 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[12].action.radius = 10                   -- 7 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[12].action.action_delivery.starting_speed = 0.5*0.8 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[13].action.repeat_count = 1400           -- 1000 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[13].action.radius = 50                   -- 35 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[13].action.action_delivery.starting_speed = 0.5*0.7 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[14].action.repeat_count = 1400           -- 1000 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[14].action.radius = 36                   -- 26 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[14].action.action_delivery.starting_speed = 0.5*0.7 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[15].action.repeat_count = 980            -- 700 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[15].action.radius = 6                    -- 4 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[15].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[16].action.repeat_count = 1400           -- 1000 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[16].action.radius = 11                   -- 8 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[16].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[17].action.repeat_count = 420            -- 300 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[17].action.radius = 36                   -- 26 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[17].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[18].action.repeat_count = 14             -- 10 * 1.4
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[18].action.radius = 11                   -- 8 * 1.4
 
     table.insert(projectiles, sc_plutonium_aa_pj)