Merge pull request #38 from JohnTheCoolingFan/dev

1.1.20

Author: JohnTheCoolingFan

changelog.txt

@@ -1,4 +1,17 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.20
+Date: 26.08.2020
+  Fixes:
+    - Fixed error on load when Atomic Artillery, PE and Bob's Warfare are enabled
+  Integration:
+    - Plutonium Atomic Artillery shell is now available with Bob's Warfare mod.
+  Balancing:
+    - Plutonium atomic bomb:
+      Removed processing unit from recipe
+      Removed Pu-238 from recipe
+      Pu-239 10x -> 35x
+      Added x10 Rocket control unit
+---------------------------------------------------------------------------------------------------
 Version: 1.1.19
 Date: 25.08.2020
   Fixes:

info.json

@@ -1,6 +1,6 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.1.19",
+    "version": "1.1.20",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",
@@ -9,7 +9,8 @@
         "base >= 1.0.0",
         "? AtomicArtillery",
         "? SchallUraniumProcessing",
-        "? bobplates"
+        "? bobplates",
+        "? bobwarfare"
     ],
     "description": "Adds processing of plutonium, excess product from nuclear reaction. Plutonium can be used to create ammo (even plutonium atomic bomb) and to create energy as MOX fuel.",
     "factorio_version": "1.0"

prototypes/entity/projectiles.lua

@@ -48,7 +48,29 @@ plutonium_atomic_rocket.action.action_delivery.target_effects[18].action.radius
 table.insert(projectiles, plutonium_atomic_rocket)
 
 
-if mods["AtomicArtillery"] then
+if mods['bobwarfare'] then
+    local plutonium_atomic_artillery_projectile = util.table.deepcopy(data.raw["artillery-projectile"]["atomic-artillery-projectile"])
+
+    plutonium_atomic_artillery_projectile.name = "plutonium-atomic-artillery-projectile"
+
+    plutonium_atomic_artillery_projectile.picture.filename = "__PlutoniumEnergy__/graphics/entity/plutonium-artillery-projectile/hr-plutonium-atomic-shell.png"
+    plutonium_atomic_artillery_projectile.chart_picture.filename = "__PlutoniumEnergy__/graphics/entity/plutonium-artillery-projectile/plutonium-atomic-artillery-shoot-map-visualization.png"
+
+    plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[1].repeat_count = 140
+    plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].damage.amount = 560
+    plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[6].radius = 10
+    plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[7].action.repeat_count = 2800
+    plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[7].action.radius = 50
+    --plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[7].action.action_delivery.projectile = "plutonium-atomic-artillery-wave"
+    table.insert(projectiles, plutonium_atomic_artillery_projectile)
+
+
+    --[[local plutonium_atomic_artillery_wave = util.table.deepcopy(data.raw["projectile"]["atomic-artillery-wave"])
+    plutonium_atomic_artillery_wave.name = "plutonium-atomic-artillery-wave"
+    plutonium_atomic_artillery_wave.action[2].action_delivery.target_effects.damage.amount = 5600
+    table.insert(projectiles, plutonium_atomic_artillery_wave)]]
+
+elseif mods["AtomicArtillery"] then
     local plutonium_atomic_artillery_projectile = util.table.deepcopy(data.raw["artillery-projectile"]["atomic-artillery-projectile"])
 
     plutonium_atomic_artillery_projectile.name = "plutonium-atomic-artillery-projectile"
@@ -68,6 +90,7 @@ if mods["AtomicArtillery"] then
     plutonium_atomic_artillery_wave.name = "plutonium-atomic-artillery-wave"
     plutonium_atomic_artillery_wave.action[2].action_delivery.target_effects.damage.amount = 5600
     table.insert(projectiles, plutonium_atomic_artillery_wave)
+
 end
 
 data:extend(projectiles)

prototypes/item/ammo.lua

@@ -1,4 +1,16 @@
-if mods["AtomicArtillery"] then
+if mods['bobwarfare'] then
+    local plutonium_atomic_artillery_shell = util.table.deepcopy(data.raw["ammo"]["atomic-artillery-shell"])
+
+    plutonium_atomic_artillery_shell.name = "plutonium-atomic-artillery-shell"
+    plutonium_atomic_artillery_shell.icon = "__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png"
+    plutonium_atomic_artillery_shell.icons = nil
+    plutonium_atomic_artillery_shell.icon_size = 64
+    plutonium_atomic_artillery_shell.icon_mipmaps = 4
+
+    plutonium_atomic_artillery_shell.projectile = "plutonium-atomic-artillery-projectile"
+    data:extend({plutonium_atomic_artillery_shell})
+
+elseif mods["AtomicArtillery"] then
     local plutonium_atomic_artillery_shell = util.table.deepcopy(data.raw["ammo"]["atomic-artillery-shell"])
 
     plutonium_atomic_artillery_shell.name = "plutonium-atomic-artillery-shell"
@@ -7,7 +19,6 @@ if mods["AtomicArtillery"] then
     plutonium_atomic_artillery_shell.icon_mipmaps = 4
 
     plutonium_atomic_artillery_shell.projectile = "plutonium-atomic-artillery-projectile"
-    plutonium_atomic_artillery_shell.ammo_type.action.action_delivery.starting_speed = 1.1
     data:extend({plutonium_atomic_artillery_shell})
 end
 

prototypes/recipe/ammo.lua

@@ -1,6 +1,27 @@
 local ammo_recipes = {}
 
-if mods["AtomicArtillery"] then
+if mods['bobwarfare'] then
+    local plutonium_atomic_artillery_shell = util.table.deepcopy(data.raw["recipe"]["atomic-artillery-shell"])
+
+    plutonium_atomic_artillery_shell.name = "plutonium-atomic-artillery-shell"
+
+    plutonium_atomic_artillery_shell.normal.ingredients = {
+        {"steel-plate", 8},
+        {"plastic-bar", 8},
+        {"explosives", 30},
+        {"PE-plutonium-239", 30}
+    }
+    plutonium_atomic_artillery_shell.expensive.ingredients = {
+        {"steel-plate", 16},
+        {"plastic-bar", 16},
+        {"explosives", 30},
+        {"PE-plutonium-239", 30}
+    }
+    plutonium_atomic_artillery_shell.normal.result = "plutonium-atomic-artillery-shell"
+    plutonium_atomic_artillery_shell.expensive.result = "plutonium-atomic-artillery-shell"
+    table.insert(ammo_recipes, plutonium_atomic_artillery_shell)
+
+elseif mods["AtomicArtillery"] then
     local plutonium_atomic_artillery_shell = util.table.deepcopy(data.raw["recipe"]["atomic-artillery-shell"])
 
     plutonium_atomic_artillery_shell.name = "plutonium-atomic-artillery-shell"
@@ -13,6 +34,7 @@ if mods["AtomicArtillery"] then
     }
     plutonium_atomic_artillery_shell.result = "plutonium-atomic-artillery-shell"
     table.insert(ammo_recipes, plutonium_atomic_artillery_shell)
+
 end
 
 if ammo_recipes[1] then data:extend(ammo_recipes) end
@@ -36,10 +58,9 @@ data:extend({
         enabled = false,
         energy_required = 50,
         ingredients = {
-            {"processing-unit", 20},
+            {"rocket-control-unit", 10},
             {"explosives", 10},
-            {"PE-plutonium-238", 15},
-            {"PE-plutonium-239", 10}
+            {"PE-plutonium-239", 35}
         },
         result = "plutonium-atomic-bomb"
     },

prototypes/technology/ammo.lua

@@ -60,6 +60,8 @@ data:extend({
     }
 })
 
-if mods["AtomicArtillery"] then
+if mods['bobwarfare'] then
+    table.insert(data.raw['technology']['bob-atomic-artillery-shell'].effects, {type = 'unlock-recipe', recipe = 'plutonium-atomic-artillery-shell'})
+elseif mods["AtomicArtillery"] then
     table.insert(data.raw["technology"]["plutonium-ammo"].effects, {type = "unlock-recipe", recipe = "plutonium-atomic-artillery-shell"})
 end