From 5f31c0844a56df063630b18265fd4c4974d3d2c8 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:16:46 +0300 Subject: [PATCH 01/17] Changed technology dependencies --- prototypes/technology/ammo.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prototypes/technology/ammo.lua b/prototypes/technology/ammo.lua index 200185d..63d1d03 100644 --- 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 = { From d45928f623422e5dfae536a72eba5a604ee03077 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:17:55 +0300 Subject: [PATCH 02/17] Naming --- data.lua | 2 +- prototypes/technology/{technologies.lua => technology.lua} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename prototypes/technology/{technologies.lua => technology.lua} (100%) diff --git a/data.lua b/data.lua index 12ddc45..0510152 100644 --- 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/prototypes/technology/technologies.lua b/prototypes/technology/technology.lua similarity index 100% rename from prototypes/technology/technologies.lua rename to prototypes/technology/technology.lua From 26f649925032504f15f1b8c6872ced4601cbc49f Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:20:00 +0300 Subject: [PATCH 03/17] Updated changelog --- changelog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.txt b/changelog.txt index 171581e..92239ad 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +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 +--------------------------------------------------------------------------------------------------- Version: 1.1.20 Date: 26.08.2020 Fixes: From 06603014bef2ea1b6591a054bf1c4df78657c16e Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:20:12 +0300 Subject: [PATCH 04/17] 1.1.21 --- info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.json b/info.json index c9c2651..b4ce636 100644 --- 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", From dee15c3dd1d47ae82d27a70bdb20e188ae2c4f1a Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:35:52 +0300 Subject: [PATCH 05/17] Schall Artillery atomic artillery proj. --- prototypes/entity/projectiles.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/prototypes/entity/projectiles.lua b/prototypes/entity/projectiles.lua index 7895042..0094338 100644 --- a/prototypes/entity/projectiles.lua +++ b/prototypes/entity/projectiles.lua @@ -93,6 +93,21 @@ elseif mods["AtomicArtillery"] then end +if mods['SchallArtillery'] then + local sc_plutonium_aa_pj = util.table.deepcopy(data.raw['artillery-projectile']['Schall-atomic-artillery-projetcile']) + + 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" + + plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[1].repeat_count = 140 + plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[2].damage.amount = 560 + plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].action.repeat_count = 2800 + plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].action.radius = 50 + +end + data:extend(projectiles) data:extend({ From f120bd4dcdbec96adcef219f8d00a935cfbfc5f3 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:36:29 +0300 Subject: [PATCH 06/17] table.insert() --- prototypes/entity/projectiles.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/prototypes/entity/projectiles.lua b/prototypes/entity/projectiles.lua index 0094338..9a13238 100644 --- a/prototypes/entity/projectiles.lua +++ b/prototypes/entity/projectiles.lua @@ -105,6 +105,7 @@ if mods['SchallArtillery'] then plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[2].damage.amount = 560 plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].action.repeat_count = 2800 plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].action.radius = 50 + table.insert(projectiles, sc_plutonium_aa_pj) end From f770145e0166176cae18226c719d4f1bbbbe1a6c Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:43:30 +0300 Subject: [PATCH 07/17] Schall artillery atomic artillery shell --- prototypes/item/ammo.lua | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/prototypes/item/ammo.lua b/prototypes/item/ammo.lua index 757edeb..46b6a60 100644 --- 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,30 @@ 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.icon = '__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png' + sc_plutonium_aa_sh.icon_size = 64 + sc_plutonium_aa_sh.icons = nil + 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 { From d9db05310959dcca955d549c78d12e950e788fd3 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:47:34 +0300 Subject: [PATCH 08/17] Schall artillery atomic artillery shell --- prototypes/recipe/ammo.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/prototypes/recipe/ammo.lua b/prototypes/recipe/ammo.lua index e1a46b7..4ab27d5 100644 --- a/prototypes/recipe/ammo.lua +++ b/prototypes/recipe/ammo.lua @@ -37,6 +37,20 @@ 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-atomic-artillery-shell' + if ammo_recipes[1] then data:extend(ammo_recipes) end data:extend({ From c7231095aa35e8ae7522d1770627413d2e63e1b4 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:48:23 +0300 Subject: [PATCH 09/17] Lost a few lines --- prototypes/recipe/ammo.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prototypes/recipe/ammo.lua b/prototypes/recipe/ammo.lua index 4ab27d5..7433db8 100644 --- a/prototypes/recipe/ammo.lua +++ b/prototypes/recipe/ammo.lua @@ -50,6 +50,9 @@ if mods['SchallArtillery'] then {'PE-plutonium-239', 35} } sc_plutonium_aa_sh.result = 'Schall-atomic-artillery-shell' + table.insert(ammo_recipes, sc_plutonium_aa_sh) + +end if ammo_recipes[1] then data:extend(ammo_recipes) end From 70eb4ee1361d70d1bd78fd5b510ab56057d1f1e3 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:50:10 +0300 Subject: [PATCH 10/17] Schall plutonium atomic artillery shell tech --- prototypes/technology/ammo.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prototypes/technology/ammo.lua b/prototypes/technology/ammo.lua index 63d1d03..334e01e 100644 --- a/prototypes/technology/ammo.lua +++ b/prototypes/technology/ammo.lua @@ -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 From 8c32929ca1a6eacf7ab91fc521edfce6ae2eead7 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:53:16 +0300 Subject: [PATCH 11/17] SchallArtillery optional dependency --- info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/info.json b/info.json index b4ce636..31771bc 100644 --- a/info.json +++ b/info.json @@ -9,6 +9,7 @@ "base >= 1.0.0", "? AtomicArtillery", "? SchallUraniumProcessing", + "? SchallArtillery", "? bobplates", "? bobwarfare" ], From c3b5c740c0cc067a59716df60afbd7fd8d4d5e1d Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:53:53 +0300 Subject: [PATCH 12/17] Fixed typo --- prototypes/item/ammo.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototypes/item/ammo.lua b/prototypes/item/ammo.lua index 46b6a60..55146cd 100644 --- a/prototypes/item/ammo.lua +++ b/prototypes/item/ammo.lua @@ -24,7 +24,7 @@ elseif mods["AtomicArtillery"] then end if mods['SchallArtillery'] then - local sc_plutonium_aa_sh = util.table.deepcopy(data/raw['ammo']['Schall-atomic-artillery-shell']) + 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.icon = '__PlutoniumEnergy__/graphics/icons/plutonium-atomic-artillery-shell.png' From 2fd842c3e4489fd89acdf9296583a75627eb3f57 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:55:19 +0300 Subject: [PATCH 13/17] Oops wrong var... --- prototypes/entity/projectiles.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/prototypes/entity/projectiles.lua b/prototypes/entity/projectiles.lua index 9a13238..a66de69 100644 --- a/prototypes/entity/projectiles.lua +++ b/prototypes/entity/projectiles.lua @@ -94,17 +94,17 @@ elseif mods["AtomicArtillery"] then end if mods['SchallArtillery'] then - local sc_plutonium_aa_pj = util.table.deepcopy(data.raw['artillery-projectile']['Schall-atomic-artillery-projetcile']) + 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" - plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[1].repeat_count = 140 - plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[2].damage.amount = 560 - plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].action.repeat_count = 2800 - plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[3].action.radius = 50 + 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 From b1fcc7f29267977ce6654c218522398babedac97 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:57:05 +0300 Subject: [PATCH 14/17] Moved line --- prototypes/item/ammo.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototypes/item/ammo.lua b/prototypes/item/ammo.lua index 55146cd..9cb3552 100644 --- a/prototypes/item/ammo.lua +++ b/prototypes/item/ammo.lua @@ -27,9 +27,9 @@ 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.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.icons = nil sc_plutonium_aa_sh.icon_mipmaps = 4 sc_plutonium_aa_sh.projectile = 'Schall-plutonium-atomic-artillery-projectile' From 9deed5c7a2638239f4c56f1f85f102f468bbc2d8 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 17:58:28 +0300 Subject: [PATCH 15/17] Wrong recipe result --- prototypes/recipe/ammo.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prototypes/recipe/ammo.lua b/prototypes/recipe/ammo.lua index 7433db8..2a439d3 100644 --- a/prototypes/recipe/ammo.lua +++ b/prototypes/recipe/ammo.lua @@ -49,7 +49,7 @@ if mods['SchallArtillery'] then {'explosives', 15}, {'PE-plutonium-239', 35} } - sc_plutonium_aa_sh.result = 'Schall-atomic-artillery-shell' + sc_plutonium_aa_sh.result = 'Schall-plutonium-atomic-artillery-shell' table.insert(ammo_recipes, sc_plutonium_aa_sh) end From e4e94145aeb6b26220c7bd711ecc87ddb6380bc9 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 18:02:01 +0300 Subject: [PATCH 16/17] Localised name (Sc. Pu AA shell) --- prototypes/item/ammo.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/prototypes/item/ammo.lua b/prototypes/item/ammo.lua index 9cb3552..c9a863a 100644 --- a/prototypes/item/ammo.lua +++ b/prototypes/item/ammo.lua @@ -27,6 +27,7 @@ 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 From ad0b25d2714ba7249fc002751b8ee524b44ee8fa Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Wed, 26 Aug 2020 18:04:34 +0300 Subject: [PATCH 17/17] Updated changelog --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index 92239ad..698e781 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,8 @@ 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