Merge pull request #55 from JohnTheCoolingFan/dev

1.2.5

changelog.txt

@@ -1,4 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.5
+Date: 18.02.2021
+  Major Features:
+    - Added a setting to enable/disable plutonium ammo.
+  Locale:
+    - Updated Russian locale for plutonium rounds magazine to match the original game translation
+  Fixes:
+    - Fixed compatibility with Bob's Metals, Chemicals and Intermidiates: Pu-238 now can be
+      produced.
+---------------------------------------------------------------------------------------------------
 Version: 1.2.4
 Date: 07.02.2021
   Fixes:

data-updates.lua

@@ -4,5 +4,5 @@ if mods['bobplates'] then
     -- Disable some recipes
     data.raw['technology']['plutonium-enrichment-process'].hidden = true
     data.raw['technology']['plutonium-atomic-bomb'].prerequisites = {'atomic-bomb'}
-    data.raw['technology']['plutonium-processing'].effects = {}
+    --data.raw['technology']['plutonium-processing'].effects = {} -- Broken. Why did I do this in the first place?
 end

data.lua

@@ -8,3 +8,4 @@ require("prototypes.categories.fuel-category")
 
 -- TODO: New screenshots, better overview
 -- TODO: better advanced reprocessing process (used-up fuel + acid [in chemical plant] = components)
+-- TODO: SchallRadioactiveWaste. Check if integration is already there and add if not.

info.json

@@ -1,6 +1,6 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/KPnETvMDYk",

locale/en/base.cfg

@@ -64,11 +64,13 @@ plutonium-enrichment-process=The process of creating high-energy isotopes from l
 PE-disable-MOX-reactor=Disable MOX reactor recipe
 PE-disable-U238-excess-neutron-capture-recipe=Disable Uranium-238 excess neutron capture recipe
 PE-SUP-advanced-nfr-uranium-concentrate=Use Uranium concentrate as product of advanced nuclear fuel reprocessing
+enable-plutonium-ammo=Enable plutonium ammo
 
 [mod-setting-description]
 PE-disable-MOX-reactor=Disables MOX reactor for compatibility with some mods.
 PE-disable-U238-excess-neutron-capture-recipe=Disable Uranium-238 excess neutron capture recipe. Some players want this recipe disabled for balancing reasons.
 PE-SUP-advanced-nfr-uranium-concentrate=When turned on and SchallUraniumProcessing mod is installed, advanced nuclear fuel reprocessing recipe will have Uranium concentrate as a product instead of uranium-238 (Depleted uranium in SchallUraniumProcessing).
+enable-plutonium-ammo=Enable ror disable plutonium rounds magazine and cannon shells.
 
 [mod-description]
 PlutoniumEnergy=Adds processing of plutonium, an excess product from nuclear reaction. Plutonium can be used to make ammo (even plutonium atomic bomb) and to generate power as MOX fuel.

locale/ru/base.cfg

@@ -17,7 +17,7 @@ used-up-MOX-fuel=Использованное MOX-топливо
 MOX-reactor=MOX реактор
 industrial-reactor=Промышленный реактор
 plutonium-atomic-artillery-shell=Плутониевый Атомный Артиллерийский Снаряд
-plutonium-rounds-magazine=Плутониевые патроны
+plutonium-rounds-magazine=Магазин с плутониевыми патронами
 plutonium-cannon-shell=Плутониевый крупнокалиберный снаряд
 explosive-plutonium-cannon-shell=Разрывной плутониевый крупнокалиберный снаряд
 plutonium-atomic-bomb=Плутониевая атомная бомба
@@ -64,11 +64,13 @@ plutonium-enrichment-process=Позволяет создавать высоко
 PE-disable-MOX-reactor=Отключить рецепт MOX реактора
 PE-disable-U238-excess-neutron-capture-recipe=Отключить рецепт захвата избыточных нейтронов Урана-238
 PE-SUP-advanced-nfr-uranium-concentrate=Использовать концентрат урана в качестве продукта продвинутой переработки отработанного ядерного топлива
+enable-plutonium-ammo=Включить плутониевые патроны
 
 [mod-setting-description]
 PE-disable-MOX-reactor=Отключает рецепт MOX реактора для совместимости с некоторыми модами.
 PE-disable-U238-excess-neutron-capture-recipe=Отключает рецепт захвата избыточных нейтронов Урана-238. Некоторые игроки хотят его отключить ради баланса.
 PE-SUP-advanced-nfr-uranium-concentrate=Когда включено и установлен мод SchallUraniumProcessing, продвинутая переработка отработанного ядерного топлива будет выдавать урановый концентрат вместо урана-238 (Обеднённый уран в SchallUraniumProcessing)
+enable-plutonium-ammo=Включить или выключить магазин с плутониевыми патронами и плутониевые крупнокалиберные снаряды.
 
 [mod-description]
 PlutoniumEnergy=Добавляет произодство и переработку плутония, побочного продукта ядерной реакции. Плутоний можно использовать для производства боеприпасов (в том числе и мощной атомной бомбы) и для выработки энергии в качестве MOX топлива.

prototypes/item/ammo.lua

@@ -39,103 +39,107 @@ if mods['SchallArtillery'] then
 end
 
 
-data:extend({
-    -- Ammo
-    {
-        type = "ammo",
-        name = "plutonium-rounds-magazine",
-        icon = "__PlutoniumEnergy__/graphics/icons/plutonium-rounds-magazine.png",
-        icon_size = 64,
-        icon_mipmaps = 4,
-        flags = {},
-        ammo_type = {
-            category = "bullet",
-            action = {
-                type = "direct",
-                action_delivery = {
-                    type = "instant",
-                    source_effects = {
-                        type = "create-explosion",
-                        entity_name = "explosion-gunshot"
-                    },
-                    target_effects = {
-                        {
-                            type = "create-entity",
-                            entity_name = "explosion-hit"
+if settings.startup['enable-plutonium-ammo'].value then
+    data:extend({
+        -- Ammo
+        {
+            type = "ammo",
+            name = "plutonium-rounds-magazine",
+            icon = "__PlutoniumEnergy__/graphics/icons/plutonium-rounds-magazine.png",
+            icon_size = 64,
+            icon_mipmaps = 4,
+            flags = {},
+            ammo_type = {
+                category = "bullet",
+                action = {
+                    type = "direct",
+                    action_delivery = {
+                        type = "instant",
+                        source_effects = {
+                            type = "create-explosion",
+                            entity_name = "explosion-gunshot"
                         },
-                        {
-                            type = "damage",
-                            damage = {amount = 36, type = "physical"}
+                        target_effects = {
+                            {
+                                type = "create-entity",
+                                entity_name = "explosion-hit"
+                            },
+                            {
+                                type = "damage",
+                                damage = {amount = 36, type = "physical"}
+                            }
                         }
                     }
                 }
-            }
+            },
+            magazine_size = 10,
+            subgroup = "ammo",
+            order = "a[basic-clips]-d[plutonium-rounds-magazine]",
+            stack_size = 200
         },
-        magazine_size = 10,
-        subgroup = "ammo",
-        order = "a[basic-clips]-d[plutonium-rounds-magazine]",
-        stack_size = 200
-    },
-    {
-        type = "ammo",
-        name = "plutonium-cannon-shell",
-        icon = "__PlutoniumEnergy__/graphics/icons/plutonium-cannon-shell.png",
-        icon_size = 64,
-        icon_mipmaps = 4,
-        flags = {},
-        ammo_type = {
-            category = "cannon-shell",
-            target_type = "direction",
-            action = {
-                type = "direct",
-                action_delivery = {
-                    type = "projectile",
-                    projectile = "plutonium-cannon-projectile",
-                    starting_speed = 1,
-                    direction_deviation = 0.1,
-                    range_deviation = 0.1,
-                    max_range = 35,
-                    source_effects = {
-                        type = "create-explosion",
-                        entity_name = "explosion-gunshot"
+        {
+            type = "ammo",
+            name = "plutonium-cannon-shell",
+            icon = "__PlutoniumEnergy__/graphics/icons/plutonium-cannon-shell.png",
+            icon_size = 64,
+            icon_mipmaps = 4,
+            flags = {},
+            ammo_type = {
+                category = "cannon-shell",
+                target_type = "direction",
+                action = {
+                    type = "direct",
+                    action_delivery = {
+                        type = "projectile",
+                        projectile = "plutonium-cannon-projectile",
+                        starting_speed = 1,
+                        direction_deviation = 0.1,
+                        range_deviation = 0.1,
+                        max_range = 35,
+                        source_effects = {
+                            type = "create-explosion",
+                            entity_name = "explosion-gunshot"
+                        }
                     }
                 }
-            }
+            },
+            subgroup = "ammo",
+            order = "d[explosive-cannon-shell]-c[yplutonium]",
+            stack_size = 200
         },
-        subgroup = "ammo",
-        order = "d[explosive-cannon-shell]-c[yplutonium]",
-        stack_size = 200
-    },
-    {
-        type = "ammo",
-        name = "explosive-plutonium-cannon-shell",
-        icon = "__PlutoniumEnergy__/graphics/icons/explosive-plutonium-cannon-shell.png",
-        icon_size = 64,
-        icon_mipmaps = 4,
-        flags = {},
-        ammo_type = {
-            category = "cannon-shell",
-            target_type = "direction",
-            action = {
-                type = "direct",
-                action_delivery = {
-                    type = "projectile",
-                    projectile = "explosive-plutonium-cannon-projectile",
-                    starting_speed = 1,
-                    direction_deviation = 0.1,
-                    range_deviation = 0.1,
-                    max_range = 35,
-                    source_effects = {
-                        type = "create-explosion",
-                        entity_name = "explosion-gunshot"
+        {
+            type = "ammo",
+            name = "explosive-plutonium-cannon-shell",
+            icon = "__PlutoniumEnergy__/graphics/icons/explosive-plutonium-cannon-shell.png",
+            icon_size = 64,
+            icon_mipmaps = 4,
+            flags = {},
+            ammo_type = {
+                category = "cannon-shell",
+                target_type = "direction",
+                action = {
+                    type = "direct",
+                    action_delivery = {
+                        type = "projectile",
+                        projectile = "explosive-plutonium-cannon-projectile",
+                        starting_speed = 1,
+                        direction_deviation = 0.1,
+                        range_deviation = 0.1,
+                        max_range = 35,
+                        source_effects = {
+                            type = "create-explosion",
+                            entity_name = "explosion-gunshot"
+                        }
                     }
                 }
-            }
-        },
-        subgroup = "ammo",
-        order = "d[explosive-cannon-shell]-c[zplutonium]",
-        stack_size = 200
-    },
+            },
+            subgroup = "ammo",
+            order = "d[explosive-cannon-shell]-c[zplutonium]",
+            stack_size = 200
+        }
+    })
+end
+data:extend({
     {
         type = "ammo",
         name = "plutonium-atomic-bomb",

prototypes/recipe/ammo.lua

@@ -56,19 +56,46 @@ end
 
 if ammo_recipes[1] then data:extend(ammo_recipes) end
 
-data:extend({
-    -- Ammo
-    {
-        type = "recipe",
-        name = "plutonium-rounds-magazine",
-        enabled = false,
-        energy_required = 10,
-        ingredients = {
-            {"piercing-rounds-magazine", 1},
-            {"plutonium-238", 1}
+if settings.startup['enable-plutonium-ammo'].value then
+    data:extend({
+        -- Ammo
+        {
+            type = "recipe",
+            name = "plutonium-rounds-magazine",
+            enabled = false,
+            energy_required = 10,
+            ingredients = {
+                {"piercing-rounds-magazine", 1},
+                {"plutonium-238", 1}
+            },
+            result = "plutonium-rounds-magazine"
         },
-        result = "plutonium-rounds-magazine"
-    },
+        {
+            type = "recipe",
+            name = "plutonium-cannon-shell",
+            enabled = false,
+            energy_required = 10,
+            ingredients = {
+                {"cannon-shell", 1},
+                {"plutonium-238", 1}
+            },
+            result = "plutonium-cannon-shell"
+        },
+        {
+            type = "recipe",
+            name = "explosive-plutonium-cannon-shell",
+            enabled = false,
+            energy_required = 10,
+            ingredients = {
+                {"explosive-cannon-shell", 1},
+                {"plutonium-238", 1}
+            },
+            result = "explosive-plutonium-cannon-shell"
+        }
+    })
+end
+
+data:extend({
     {
         type = "recipe",
         name = "plutonium-atomic-bomb",
@@ -80,27 +107,5 @@ data:extend({
             {"plutonium-239", 35}
         },
         result = "plutonium-atomic-bomb"
-    },
-    {
-        type = "recipe",
-        name = "plutonium-cannon-shell",
-        enabled = false,
-        energy_required = 10,
-        ingredients = {
-            {"cannon-shell", 1},
-            {"plutonium-238", 1}
-        },
-        result = "plutonium-cannon-shell"
-    },
-    {
-        type = "recipe",
-        name = "explosive-plutonium-cannon-shell",
-        enabled = false,
-        energy_required = 10,
-        ingredients = {
-            {"explosive-cannon-shell", 1},
-            {"plutonium-238", 1}
-        },
-        result = "explosive-plutonium-cannon-shell"
     }
 })