Skip to content

Commit dba983c

Browse files
QatavinKiwiHawk
andauthored
Warfare polish (#280)
* Slow down plasma drone cooldown * Update turrets.lua Remove plasma 5, slow down snipers, implement new plasma turret stats: slower fire, more energy per shot, high energy drain. * Remove plasma 5 * Remove plasma 5, update other plasma recipes * Update plasma turret recipes * Update turrets.lua Remove plasma 5, remove order, update other plasma techs * Add alien sci for plasma 4 * Add bob- * Remove plasma 5 * Update bobwarfare.cfg * Remove plasma 5 * Revise yellow ammo * Update projectiles.lua Adjusts projectile stats. Adds new section where stats will be further augmented if artifact materials are available. * Update ammo.lua Adjusts ammo stats. Further augments stats if artifact materials are available. * Update recipe-updates.lua Adds gold fallback option for orange alloy in electric ammo recipes. * Update technology-updates.lua Add gold fallback option for orange alloy in electric ammo recipes. * Switch orange alloy to requiring gold. * Switch orange alloy to using gold. * Remove processing unit from spidertron * Revise armor recipes * Update armor recipes * Shrink equipment grid sizes * Update armor recipes * Shrink equipment grids * Fixing tech names * Plasma drones requires plasma turrets so has to need blue science * Update changelog --------- Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
1 parent 7690a4b commit dba983c

File tree

19 files changed

+376
-290
lines changed

19 files changed

+376
-290
lines changed

bobplates/prototypes/recipe/alien-recipe.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ then
3333
enabled = false,
3434
ingredients = {
3535
{ type = "item", name = "alien-artifact-orange", amount = 1 },
36-
{ type = "item", name = "steel-plate", amount = 10 },
36+
{ type = "item", name = "bob-gold-plate", amount = 10 },
3737
},
3838
results = { { type = "item", name = "bob-alien-orange-alloy", amount = 10 } },
3939
crafting_machine_tint = {

bobplates/prototypes/technology-alien.lua

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ then
3333
},
3434
time = 30,
3535
},
36-
order = "e-f-a1",
3736
},
3837

3938
{
@@ -42,9 +41,9 @@ then
4241
icon = "__bobplates__/graphics/icons/technology/alien-orange-alloy.png",
4342
icon_size = 64,
4443
prerequisites = {
45-
"steel-processing",
4644
"military-science-pack",
4745
"chemical-science-pack",
46+
"bob-gold-processing",
4847
},
4948
effects = {
5049
{
@@ -62,7 +61,6 @@ then
6261
},
6362
time = 30,
6463
},
65-
order = "e-f-a2",
6664
},
6765

6866
{
@@ -91,7 +89,6 @@ then
9189
},
9290
time = 30,
9391
},
94-
order = "e-f-a3",
9592
},
9693

9794
{
@@ -120,7 +117,6 @@ then
120117
},
121118
time = 30,
122119
},
123-
order = "e-f-a4",
124120
},
125121

126122
{
@@ -149,7 +145,6 @@ then
149145
},
150146
time = 30,
151147
},
152-
order = "e-f-a5",
153148
},
154149

155150
{
@@ -178,7 +173,6 @@ then
178173
},
179174
time = 30,
180175
},
181-
order = "e-f-a6",
182176
},
183177
})
184178
end

bobwarfare/changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Date: ???
77
- Spread out the armor techs more evenly between tech tiers #180
88
- Changed combat robot and mech brains to use circuits rather than circuit components #184
99
- Update for Factorio 2.0 #189
10+
- Added significant power drain to plasma turrets #212
11+
- General rebalancing #280
1012
---------------------------------------------------------------------------------------------------
1113
Version: 1.2.1
1214
Date: 21. 02. 2024

bobwarfare/data-updates.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ if feature_flags["quality"] then
129129
"bob-plasma-turret-2",
130130
"bob-plasma-turret-3",
131131
"bob-plasma-turret-4",
132-
"bob-plasma-turret-5",
133132
"bob-artillery-turret-2",
134133
"bob-artillery-turret-3",
135134
"robot-brain-combat",

bobwarfare/locale/en/bobwarfare.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ bob-plasma-turret-1=Plasma turret MK1
251251
bob-plasma-turret-2=Plasma turret MK2
252252
bob-plasma-turret-3=Plasma turret MK3
253253
bob-plasma-turret-4=Plasma turret MK4
254-
bob-plasma-turret-5=Plasma turret MK5
255254

256255
bob-tank-2=Tank MK2
257256
bob-tank-3=Tank MK3

bobwarfare/locale/ru/bobwarfare.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ bob-plasma-turret-1=Плазменная турель MK1
251251
bob-plasma-turret-2=Плазменная турель MK2
252252
bob-plasma-turret-3=Плазменная турель MK3
253253
bob-plasma-turret-4=Плазменная турель MK4
254-
bob-plasma-turret-5=Плазменная турель MK5
255254

256255
bob-tank-2=Танк MK2
257256
bob-tank-3=Танк MK3

bobwarfare/prototypes/entity/drone.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ data:extend({
420420

421421
attack_parameters = {
422422
type = "projectile",
423-
cooldown = 200,
423+
cooldown = 800,
424424
damage_modifier = 15,
425425
lead_target_for_projectile_speed = 1,
426426
projectile_center = { 0, -0.5 * 1.5 },

bobwarfare/prototypes/entity/projectiles.lua

Lines changed: 66 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ data:extend({
4343
type = "instant",
4444
target_effects = {
4545
type = "damage",
46-
damage = { amount = 12, type = "bob-pierce" },
46+
damage = { amount = 14, type = "bob-pierce" },
4747
},
4848
},
4949
},
@@ -71,7 +71,7 @@ data:extend({
7171
type = "instant",
7272
target_effects = {
7373
type = "damage",
74-
damage = { amount = 12, type = "electric" },
74+
damage = { amount = 14, type = "electric" },
7575
},
7676
},
7777
},
@@ -112,7 +112,7 @@ data:extend({
112112
target_effects = {
113113
{
114114
type = "damage",
115-
damage = { amount = 12, type = "explosion" },
115+
damage = { amount = 10, type = "explosion" },
116116
},
117117
},
118118
},
@@ -164,11 +164,7 @@ data:extend({
164164
target_effects = {
165165
{
166166
type = "damage",
167-
damage = { amount = 12, type = "fire" },
168-
},
169-
{
170-
type = "create-sticker",
171-
sticker = "fire-sticker",
167+
damage = { amount = 10, type = "fire" },
172168
},
173169
},
174170
},
@@ -220,7 +216,7 @@ data:extend({
220216
target_effects = {
221217
{
222218
type = "damage",
223-
damage = { amount = 12, type = "acid" },
219+
damage = { amount = 10, type = "acid" },
224220
},
225221
},
226222
},
@@ -272,11 +268,7 @@ data:extend({
272268
target_effects = {
273269
{
274270
type = "damage",
275-
damage = { amount = 12, type = "poison" },
276-
},
277-
{
278-
type = "create-sticker",
279-
sticker = "poison-sticker",
271+
damage = { amount = 10, type = "poison" },
280272
},
281273
},
282274
},
@@ -319,7 +311,7 @@ data:extend({
319311
type = "instant",
320312
target_effects = {
321313
type = "damage",
322-
damage = { amount = 16, type = "physical" },
314+
damage = { amount = 25, type = "physical" },
323315
},
324316
},
325317
},
@@ -416,7 +408,7 @@ data:extend({
416408
},
417409
{
418410
type = "damage",
419-
damage = { amount = 240, type = "bob-pierce" },
411+
damage = { amount = 360, type = "bob-pierce" },
420412
},
421413
{
422414
type = "create-entity",
@@ -476,7 +468,7 @@ data:extend({
476468
},
477469
{
478470
type = "damage",
479-
damage = { amount = 240, type = "electric" },
471+
damage = { amount = 360, type = "electric" },
480472
},
481473
{
482474
type = "create-entity",
@@ -544,7 +536,7 @@ data:extend({
544536
target_effects = {
545537
{
546538
type = "damage",
547-
damage = { amount = 180, type = "explosion" },
539+
damage = { amount = 240, type = "explosion" },
548540
},
549541
},
550542
},
@@ -614,17 +606,18 @@ data:extend({
614606
type = "nested-result",
615607
action = {
616608
type = "area",
617-
radius = 6.5,
609+
radius = 4.5,
618610
action_delivery = {
619611
type = "instant",
620612
target_effects = {
621613
{
622614
type = "damage",
623-
damage = { amount = 180, type = "fire" },
615+
damage = { amount = 140, type = "fire" },
624616
},
625617
{
626618
type = "create-sticker",
627619
sticker = "fire-sticker",
620+
show_in_tooltip = true
628621
},
629622
},
630623
},
@@ -694,17 +687,18 @@ data:extend({
694687
type = "nested-result",
695688
action = {
696689
type = "area",
697-
radius = 6.5,
690+
radius = 4.5,
698691
action_delivery = {
699692
type = "instant",
700693
target_effects = {
701694
{
702695
type = "damage",
703-
damage = { amount = 180, type = "poison" },
696+
damage = { amount = 200, type = "poison" },
704697
},
705698
{
706699
type = "create-sticker",
707700
sticker = "poison-sticker",
701+
show_in_tooltip = true
708702
},
709703
},
710704
},
@@ -770,13 +764,18 @@ data:extend({
770764
type = "nested-result",
771765
action = {
772766
type = "area",
773-
radius = 6.5,
767+
radius = 4.5,
774768
action_delivery = {
775769
type = "instant",
776770
target_effects = {
777771
{
778772
type = "damage",
779-
damage = { amount = 180, type = "acid" },
773+
damage = { amount = 160, type = "acid" },
774+
},
775+
{
776+
type = "create-sticker",
777+
sticker = "slowdown-sticker",
778+
show_in_tooltip = true
780779
},
781780
},
782781
},
@@ -1588,7 +1587,7 @@ data:extend({
15881587
target_effects = {
15891588
{
15901589
type = "damage",
1591-
damage = { amount = 25, type = "plasma" },
1590+
damage = { amount = 15, type = "plasma" },
15921591
},
15931592
{
15941593
type = "create-sticker",
@@ -1649,6 +1648,7 @@ data:extend({
16491648
{
16501649
type = "create-sticker",
16511650
sticker = "plasma-sticker",
1651+
show_in_tooltip = true
16521652
},
16531653
},
16541654
},
@@ -1690,3 +1690,44 @@ data:extend({
16901690
hidden = true,
16911691
},
16921692
})
1693+
1694+
if
1695+
data.raw.item["alien-orange-alloy"]
1696+
and data.raw.item["alien-blue-alloy"]
1697+
and data.raw.fluid["alien-explosive"]
1698+
and data.raw.fluid["alien-acid"]
1699+
and data.raw.fluid["alien-fire"]
1700+
and data.raw.fluid["alien-poison"]
1701+
then
1702+
data.raw.projectile["better-shotgun-projectile"].action.action_delivery.target_effects.damage.amount = 16
1703+
data.raw.projectile["shotgun-uranium-projectile"].action.action_delivery.target_effects.damage.amount = 24
1704+
data.raw.projectile["shotgun-ap-projectile"].action.action_delivery.target_effects.damage.amount = 27
1705+
data.raw.projectile["shotgun-electric-projectile"].action.action_delivery.target_effects.damage.amount = 27
1706+
data.raw.ammo["shotgun-acid-shell"].ammo_type.action.repeat_count = 15
1707+
data.raw.projectile["shotgun-acid-projectile"].action.action_delivery.target_effects[1].action.action_delivery.target_effects[1].damage.amount = 22
1708+
data.raw.ammo["shotgun-explosive-shell"].ammo_type.action.repeat_count = 15
1709+
data.raw.projectile["shotgun-explosive-projectile"].action.action_delivery.target_effects[2].action.action_delivery.target_effects[1].damage.amount = 22
1710+
data.raw.ammo["shotgun-flame-shell"].ammo_type.action.repeat_count = 15
1711+
data.raw.projectile["shotgun-flame-projectile"].action.action_delivery.target_effects[1].action.action_delivery.target_effects[1].damage.amount = 22
1712+
data.raw.ammo["shotgun-poison-shell"].ammo_type.action.repeat_count = 15
1713+
data.raw.projectile["shotgun-poison-projectile"].action.action_delivery.target_effects[1].action.action_delivery.target_effects[1].damage.amount = 22
1714+
data.raw.ammo["shotgun-plasma-shell"].ammo_type.action.repeat_count = 15
1715+
data.raw.ammo["shotgun-plasma-shell"].ammo_type.action.repeat_count = 20
1716+
data.raw.projectile["shotgun-plasma-projectile"].action.action_delivery.target_effects[1].action.action_delivery.target_effects[1].damage.amount = 30
1717+
1718+
data.raw.projectile["bob-piercing-rocket"].action.action_delivery.target_effects[2].damage.amount = 160
1719+
data.raw.projectile["bob-piercing-rocket"].action.action_delivery.target_effects[3].damage.amount = 880
1720+
data.raw.projectile["bob-electric-rocket"].action.action_delivery.target_effects[2].damage.amount = 160
1721+
data.raw.projectile["bob-electric-rocket"].action.action_delivery.target_effects[3].damage.amount = 540
1722+
table.insert(data.raw.projectile["bob-electric-rocket"].action.action_delivery.target_effects, {type = "create-sticker", sticker = "stun-sticker", show_in_tooltip = true})
1723+
data.raw.projectile["bob-explosive-rocket"].action.action_delivery.target_effects[2].damage.amount = 400
1724+
data.raw.projectile["bob-explosive-rocket"].action.action_delivery.target_effects[3].action.action_delivery.target_effects[1].damage.amount = 300
1725+
data.raw.projectile["bob-flame-rocket"].action.action_delivery.target_effects[4].action.action_delivery.target_effects[1].damage.amount = 200
1726+
data.raw.projectile["bob-poison-rocket"].action.action_delivery.target_effects[2].damage.amount = 160
1727+
data.raw.projectile["bob-poison-rocket"].action.action_delivery.target_effects[4].action.action_delivery.target_effects[1].damage.amount = 300
1728+
data.raw.projectile["bob-acid-rocket"].action.action_delivery.target_effects[2].damage.amount = 160
1729+
data.raw.projectile["bob-acid-rocket"].action.action_delivery.target_effects[3].action.action_delivery.target_effects[1].damage.amount = 300
1730+
data.raw.projectile["bob-plasma-rocket"].action.action_delivery.target_effects[2].damage.amount = 450
1731+
data.raw.projectile["bob-plasma-rocket"].action.action_delivery.target_effects[3].action.action_delivery.target_effects[1].damage.amount = 450
1732+
data.raw.projectile["bob-plasma-rocket"].action.action_delivery.target_effects[3].action.action_delivery.target_effects[2].show_in_tooltip = true
1733+
end

0 commit comments

Comments
 (0)