Merge pull request #39 from JohnTheCoolingFan/dev

1.1.21
JohnTheCoolingFan · Aug 26, 2020 · 26e28e8 · 26e28e8
2 parents 16f2b8c + ad0b25d
commit 26e28e8
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 6 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.21
+Date: 26.08.2020
+  Balancing:
+    - Replaced plutonium nuclear power dependency with plutonium processing in plutonium ammo and
+      plutonium atomic bomb technologies
+  Integration:
+    - Added Plutonium atomic artillery shell for Schall Artilllery
+---------------------------------------------------------------------------------------------------
 Version: 1.1.20
 Date: 26.08.2020
   Fixes:

diff --git a/data.lua b/data.lua
@@ -2,7 +2,7 @@ require("prototypes.item.items")
 require("prototypes.entity.entities")
 require("prototypes.entity.projectiles")
 require("prototypes.recipe.recipes")
-require("prototypes.technology.technologies")
+require("prototypes.technology.technology")
 require("prototypes.categories.fuel-category")
 require("prototypes.categories.recipe-category")
 

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "PlutoniumEnergy",
-    "version": "1.1.20",
+    "version": "1.1.21",
     "title": "Plutonium Energy",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",
@@ -9,6 +9,7 @@
         "base >= 1.0.0",
         "? AtomicArtillery",
         "? SchallUraniumProcessing",
+        "? SchallArtillery",
         "? bobplates",
         "? bobwarfare"
     ],

diff --git a/prototypes/entity/projectiles.lua b/prototypes/entity/projectiles.lua
@@ -93,6 +93,22 @@ elseif mods["AtomicArtillery"] then
 
 end
 
+if mods['SchallArtillery'] then
+    local sc_plutonium_aa_pj = util.table.deepcopy(data.raw['artillery-projectile']['Schall-atomic-artillery-projectile'])
+
+    sc_plutonium_aa_pj.name = 'Schall-plutonium-atomic-artillery-projectile'
+
+    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[1].repeat_count = 140
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[2].damage.amount = 560
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[3].action.repeat_count = 2800
+    sc_plutonium_aa_pj.action.action_delivery.target_effects[3].action.radius = 50
+    table.insert(projectiles, sc_plutonium_aa_pj)
+
+end
+
 data:extend(projectiles)
 
 data:extend({

diff --git a/prototypes/item/ammo.lua b/prototypes/item/ammo.lua
@@ -2,7 +2,7 @@ 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.icon = "__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png" -- TODO
     plutonium_atomic_artillery_shell.icons = nil
     plutonium_atomic_artillery_shell.icon_size = 64
     plutonium_atomic_artillery_shell.icon_mipmaps = 4
@@ -14,14 +14,31 @@ 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"
-    plutonium_atomic_artillery_shell.icon = "__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png"
+    plutonium_atomic_artillery_shell.icon = "__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png" -- TODO
     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})
+
 end
 
+if mods['SchallArtillery'] then
+    local sc_plutonium_aa_sh = util.table.deepcopy(data.raw['ammo']['Schall-atomic-artillery-shell'])
+
+    sc_plutonium_aa_sh.name = 'Schall-plutonium-atomic-artillery-shell'
+    sc_plutonium_aa_sh.localised_name = {'item-name.plutonium-atomic-artillery-shell'}
+    sc_plutonium_aa_sh.icons = nil
+    sc_plutonium_aa_sh.icon = '__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png'
+    sc_plutonium_aa_sh.icon_size = 64
+    sc_plutonium_aa_sh.icon_mipmaps = 4
+
+    sc_plutonium_aa_sh.projectile = 'Schall-plutonium-atomic-artillery-projectile'
+    data:extend({sc_plutonium_aa_sh})
+
+end
+
+
 data:extend({
     -- Ammo
     {

diff --git a/prototypes/recipe/ammo.lua b/prototypes/recipe/ammo.lua
@@ -37,6 +37,23 @@ elseif mods["AtomicArtillery"] then
 
 end
 
+if mods['SchallArtillery'] then
+    local sc_plutonium_aa_sh = util.table.deepcopy(data.raw['recipe']['Schall-atomic-artillery-shell'])
+
+    sc_plutonium_aa_sh.name = 'Schall-plutonium-atomic-artillery-shell'
+
+    sc_plutonium_aa_sh.ingredients = {
+        {'explosive-cannon-shell', 6},
+        {'radar', 1},
+        {'rocket-control-unit', 12},
+        {'explosives', 15},
+        {'PE-plutonium-239', 35}
+    }
+    sc_plutonium_aa_sh.result = 'Schall-plutonium-atomic-artillery-shell'
+    table.insert(ammo_recipes, sc_plutonium_aa_sh)
+
+end
+
 if ammo_recipes[1] then data:extend(ammo_recipes) end
 
 data:extend({

diff --git a/prototypes/technology/ammo.lua b/prototypes/technology/ammo.lua
@@ -18,7 +18,7 @@ data:extend({
                 recipe = "explosive-plutonium-cannon-shell"
             }
         },
-        prerequisites = {"plutonium-nuclear-power", "uranium-ammo"},
+        prerequisites = {"plutonium-processing", "uranium-ammo"},
         unit = {
             count = 1250,
             ingredients = {
@@ -43,7 +43,7 @@ data:extend({
                 recipe = "plutonium-atomic-bomb"
             }
         },
-        prerequisites = {"plutonium-nuclear-power", "atomic-bomb"},
+        prerequisites = {"plutonium-processing", "atomic-bomb"},
         unit = {
             count = 6000,
             ingredients = {
@@ -65,3 +65,6 @@ if mods['bobwarfare'] then
 elseif mods["AtomicArtillery"] then
     table.insert(data.raw["technology"]["plutonium-ammo"].effects, {type = "unlock-recipe", recipe = "plutonium-atomic-artillery-shell"})
 end
+if mods['SchallArtillery'] then
+    table.insert(data.raw['technology']['Schall-artillery-shell-2'].effects, {type = 'unlock-recipe', recipe = 'Schall-plutonium-atomic-artillery-shell'})
+end
diff --git a/prototypes/technology/technologies.lua → prototypes/technology/technology.lua b/prototypes/technology/technologies.lua → prototypes/technology/technology.lua