Skip to content

Commit

Permalink
Merge pull request #41 from JohnTheCoolingFan/dev
Browse files Browse the repository at this point in the history 
1.1.24
  • Loading branch information
@JohnTheCoolingFan
JohnTheCoolingFan authored Sep 29, 2020
2 parents d614ca0 + d3423a6 commit e7eecc0
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 10 deletions.
10 changes: 10 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
---------------------------------------------------------------------------------------------------
Version: 1.1.24
Date: 29.09.2020
Fixes:
- Fixed Error on load with AtomicArtillery 0.2.0
---------------------------------------------------------------------------------------------------
Version: 1.1.23
Date: 24.09.2020
Fixes:
- Fixed error on load with SchallArtillery 1.0.0
---------------------------------------------------------------------------------------------------
Version: 1.1.22
Date: 27.08.2020
Fixes:
Expand Down
Binary file added graphics/icons/WIP-plutonium-atomic-artillery-shell.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions info.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "PlutoniumEnergy",
"version": "1.1.22",
"version": "1.1.24",
"title": "Plutonium Energy",
"author": "JohnTheCoolingFan",
"contact": "https://discord.gg/grHVhE2",
"homepage": "https://discord.gg/grHVhE2",
"dependencies": [
"base >= 1.0.0",
"? AtomicArtillery",
"? AtomicArtillery >= 0.2.0",
"? SchallUraniumProcessing",
"? SchallArtillery",
"? SchallArtillery >= 1.0.0",
"? bobplates",
"? bobwarfare",
"? AtomicRocketScreenBurn"
Expand Down
73 changes: 66 additions & 7 deletions prototypes/entity/projectiles.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@ plutonium_atomic_rocket.action.action_delivery.target_effects[15+index_offset].a
plutonium_atomic_rocket.action.action_delivery.target_effects[15+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[16+index_offset].action.repeat_count = 1400 -- 1000 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[16+index_offset].action.radius = 11 -- 8 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[16+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[16+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4 --TODO
plutonium_atomic_rocket.action.action_delivery.target_effects[17+index_offset].action.repeat_count = 420 -- 300 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[17+index_offset].action.radius = 36 -- 26 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[17+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[18+index_offset].action.repeat_count = 14 -- 10 * 1.4
plutonium_atomic_rocket.action.action_delivery.target_effects[18+index_offset].action.radius = 11 -- 8 * 1.4
table.insert(projectiles, plutonium_atomic_rocket)

index_offset = 0

if mods['bobwarfare'] then
local plutonium_atomic_artillery_projectile = util.table.deepcopy(data.raw["artillery-projectile"]["atomic-artillery-projectile"])
Expand Down Expand Up @@ -84,11 +85,46 @@ elseif mods["AtomicArtillery"] then
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 = 2100
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.repeat_count = 5600
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.radius = 70
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.action_delivery.projectile = "plutonium-atomic-artillery-wave"
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[5].action.action_delivery.projectile = "plutonium-atomic-artillery-wave"]]
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[1].radius = 17 -- math.ceil(12 * 1.4)
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[2].radius = 13 -- 9 * 1.4 = 12.6
local index_offset = 0
if plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[4] and plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[4].effect and plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[4].effect == 'screen-burn'then
index_offset = 0
else
index_offset = -1
end
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[7+index_offset].damage.amount = 560 -- 400 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[10+index_offset].radius = 20 -- 14 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[11+index_offset].spawn_min_radius = 16.5 -- Rough numbers
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[11+index_offset].spawn_max_radius = 17.5
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[11+index_offset].spawn_min = 45
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[11+index_offset].spawn_max = 60
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[12+index_offset].action.repeat_count = 1400 -- 1000 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[12+index_offset].action.radius = 10 -- 7 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[12+index_offset].action.action_delivery.starting_speed = 0.5*0.8 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[13+index_offset].action.repeat_count = 1400 -- 1000 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[13+index_offset].action.radius = 50 -- 35 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[13+index_offset].action.action_delivery.starting_speed = 0.5*0.7 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[14+index_offset].action.repeat_count = 1400 -- 1000 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[14+index_offset].action.radius = 36 -- 26 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[14+index_offset].action.action_delivery.starting_speed = 0.5*0.7 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[15+index_offset].action.repeat_count = 980 -- 700 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[15+index_offset].action.radius = 6 -- 4 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[15+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[16+index_offset].action.repeat_count = 1400 -- 1000 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[16+index_offset].action.radius = 11 -- 8 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[16+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4 --TODO
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[17+index_offset].action.repeat_count = 420 -- 300 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[17+index_offset].action.radius = 36 -- 26 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[17+index_offset].action.action_delivery.starting_speed = 0.5*0.65 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[18+index_offset].action.repeat_count = 14 -- 10 * 1.4
plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[18+index_offset].action.radius = 11 -- 8 * 1.4
table.insert(projectiles, plutonium_atomic_artillery_projectile)


Expand All @@ -99,18 +135,41 @@ elseif mods["AtomicArtillery"] then

end

if mods['SchallArtillery'] then
if mods['SchallArtillery'] then --TODO
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
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

table.insert(projectiles, sc_plutonium_aa_pj)

end
Expand Down

0 comments on commit e7eecc0

Please sign in to comment.