Skip to content

Commit 30bbaf9

Browse files
authored
Revert "Naval warfare pt4 + wall buffs" (#3812)
Reverts #3738 I'm not fit to adjust the guns in such a way that they'd feel 'fair' against the old HP of walls but this buff to plastitanium/shuttle walls also affects the xenoborg walls in a major way. It becomes practically impossible to balance xenoborg walls if we move forward with plastitanium walls being this tough, so I think this needs to go back to the drawing board and rebalance the new guns to be less destructive, rather than just buffing plastitanium and shuttle walls.
2 parents ba76144 + e5ee1e4 commit 30bbaf9

27 files changed

Lines changed: 578 additions & 1559 deletions

File tree

-118 KB
Binary file not shown.

Resources/Audio/_Starlight/Weapons/attributions.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,4 @@
1616
- files: ["leviathan_fire.ogg"]
1717
license: "CC-BY-SA-3.0"
1818
copyright: "Taken from Aurora.3."
19-
source: "https://github.com/Aurorastation/Aurora.3/blob/master/sound/weapons/gunshot/ship_weapons/leviathan_fire.ogg"
20-
21-
- files: ["120mm_mortar.ogg"]
22-
license: "CC-BY-SA-3.0"
23-
copyright: "Taken from Aurora.3"
24-
source: "https://github.com/Aurorastation/Aurora.3/blob/master/sound/weapons/gunshot/ship_weapons/120mm_mortar.ogg"
19+
source: "https://github.com/Aurorastation/Aurora.3/blob/master/sound/weapons/gunshot/ship_weapons/leviathan_fire.ogg"

Resources/Prototypes/Entities/Structures/Walls/walls.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -541,12 +541,11 @@
541541
name: plastitanium wall
542542
suffix: ""
543543
components:
544-
# Starlight start - plastitanium HP buffed 2x
545544
- type: Destructible
546545
thresholds:
547546
- trigger:
548547
!type:DamageTrigger
549-
damage: 2000
548+
damage: 1000
550549
behaviors:
551550
- !type:SpawnEntitiesBehavior
552551
spawn:
@@ -555,7 +554,6 @@
555554
max: 1
556555
- !type:DoActsBehavior
557556
acts: [ "Destruction" ]
558-
# Starlight end
559557
# Starlight start - destructible walls are edible
560558
- type: Tag
561559
tags:
@@ -600,12 +598,11 @@
600598
- type: Icon
601599
sprite: Structures/Walls/plastitanium_diagonal.rsi
602600
state: state0
603-
# Starlight start - plastitanium HP buffed 2x
604601
- type: Destructible
605602
thresholds:
606603
- trigger:
607604
!type:DamageTrigger
608-
damage: 2000
605+
damage: 1000
609606
behaviors:
610607
- !type:SpawnEntitiesBehavior
611608
spawn:
@@ -617,7 +614,6 @@
617614
- !type:PlaySoundBehavior
618615
sound:
619616
collection: MetalSlam
620-
# Starlight end
621617
# Starlight start - destructible walls are edible
622618
- type: Tag
623619
tags:
@@ -921,12 +917,11 @@
921917
- type: Damageable
922918
damageContainer: StructuralInorganic
923919
damageModifierSet: StructuralMetallicStrong
924-
# Starlight start - shuttle wall HP buffed 1.5x
925920
- type: Destructible
926921
thresholds:
927922
- trigger:
928923
!type:DamageTrigger
929-
damage: 900
924+
damage: 600
930925
behaviors:
931926
- !type:DoActsBehavior
932927
acts: [ "Destruction" ]
@@ -935,7 +930,7 @@
935930
collection: MetalSlam
936931
- trigger:
937932
!type:DamageTrigger
938-
damage: 450
933+
damage: 300
939934
behaviors:
940935
- !type:ChangeConstructionNodeBehavior
941936
node: girder
@@ -944,7 +939,6 @@
944939
collection: MetalSlam
945940
- !type:DoActsBehavior
946941
acts: ["Destruction"]
947-
# Starlight end
948942
- type: Construction
949943
graph: Girder
950944
node: diagonalshuttleWall
@@ -961,12 +955,11 @@
961955
- type: Damageable
962956
damageContainer: StructuralInorganic
963957
damageModifierSet: StructuralMetallicStrong
964-
# Starlight start - shuttle wall HP buffed 1.5x
965958
- type: Destructible
966959
thresholds:
967960
- trigger:
968961
!type:DamageTrigger
969-
damage: 900
962+
damage: 600
970963
behaviors:
971964
- !type:DoActsBehavior
972965
acts: ["Destruction"]
@@ -975,7 +968,7 @@
975968
collection: MetalSlam
976969
- trigger:
977970
!type:DamageTrigger
978-
damage: 600
971+
damage: 400
979972
behaviors:
980973
- !type:PlaySoundBehavior
981974
sound:
@@ -984,7 +977,6 @@
984977
node: girder
985978
- !type:DoActsBehavior
986979
acts: ["Destruction"]
987-
# Starlight end
988980
- type: StaticPrice
989981
price: 250
990982
- type: RadiationBlocker
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# Starlight 50mm Rocket Ammunition
2+
3+
# Starlight override of the base 60mm rocket projectile with radar blip.
4+
- type: entity
5+
parent: BulletWeakRocket
6+
id: Bullet50mmRocketStarlight
7+
categories: [ HideSpawnMenu ]
8+
components:
9+
- type: RadarBlip
10+
color: "#44FFAA"
11+
scale: 1
12+
shape: Circle
13+
requireInSpace: true
14+
- type: PDTarget
15+
16+
# 50mm Rocket Cartridge
17+
- type: entity
18+
parent: [BaseItem, BaseMajorContraband]
19+
id: Cartridge50mmRocket
20+
name: 50mm rocket
21+
description: A 50mm rocket cartridge designed for the ADMP-27 VESPERA shuttle cannon system. Smaller and lighter than standard RPG rounds but still packs a punch.
22+
components:
23+
- type: Tag
24+
tags:
25+
- Cartridge50mmRocket
26+
- type: Item
27+
size: Small
28+
- type: CartridgeAmmo
29+
proto: Bullet50mmRocketStarlight
30+
deleteOnSpawn: true
31+
- type: Sprite
32+
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
33+
state: rpg
34+
- type: StaticPrice
35+
price: 15
36+
37+
# 30-Round Magazine for 60mm Rockets
38+
- type: entity
39+
parent: BaseMagazineGrenade
40+
id: Magazine50mmRocket
41+
name: 50mm rocket magazine
42+
description: A high-capacity 26-round magazine loaded with 60mm rockets for the ADMP-27 VESPERA shuttle cannon system.
43+
components:
44+
- type: Tag
45+
tags:
46+
- Magazine50mmRocket
47+
- type: BallisticAmmoProvider
48+
mayTransfer: true
49+
whitelist:
50+
tags:
51+
- Cartridge50mmRocket
52+
proto: Cartridge50mmRocket
53+
capacity: 26
54+
soundRack:
55+
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
56+
params:
57+
variation: 0.05
58+
soundInsert:
59+
path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
60+
params:
61+
variation: 0.05
62+
- type: Item
63+
size: Huge
64+
- type: Sprite
65+
sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi
66+
layers:
67+
- state: base
68+
map: ["enum.GunVisualLayers.Base"]
69+
- state: mag-4
70+
map: ["enum.GunVisualLayers.Mag"]
71+
- type: MagazineVisuals
72+
magState: mag
73+
steps: 5
74+
zeroVisible: false
75+
- type: StaticPrice
76+
price: 600
77+
78+
- type: entity
79+
parent: Magazine60mmRocket
80+
id: Magazine50mmRocketEmpty
81+
name: 50mm rocket magazine (empty)
82+
suffix: empty
83+
components:
84+
- type: BallisticAmmoProvider
85+
mayTransfer: true
86+
whitelist:
87+
tags:
88+
- Cartridge50mmRocket
89+
capacity: 26
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
# Starlight EMP Rocket Ammunition
2+
3+
# EMP rocket projectile - delivers an electromagnetic pulse on impact, no explosive damage.
4+
- type: entity
5+
parent: BaseBulletTrigger
6+
id: Bullet60mmRocketEMP
7+
name: EMP rocket
8+
categories: [ HideSpawnMenu ]
9+
components:
10+
- type: Sprite
11+
sprite: _Starlight/Objects/Weapons/Guns/Projectiles/emp_rocket_projectile.rsi
12+
layers:
13+
- state: frag-emp
14+
- type: EmpOnTrigger
15+
range: 4.0
16+
energyConsumption: 20000
17+
disableDuration: 5.0
18+
- type: SpawnOnTrigger
19+
proto: EmpRocketImpactEffect
20+
- type: DeleteOnTrigger
21+
- type: PointLight
22+
radius: 3.0
23+
color: "#2244FF"
24+
energy: 0.6
25+
- type: RadarBlip
26+
color: "#4488FF"
27+
scale: 1.2
28+
shape: Circle
29+
requireInSpace: true
30+
- type: Ammo
31+
muzzleFlash: null
32+
- type: PDTarget
33+
34+
# Visual effect spawned at impact point when the EMP rocket detonates.
35+
- type: entity
36+
id: EmpRocketImpactEffect
37+
categories: [ HideSpawnMenu ]
38+
components:
39+
- type: Sprite
40+
sprite: _Starlight/Objects/Weapons/Guns/Projectiles/emp_rocket_projectile.rsi
41+
layers:
42+
- state: ball-emp-unlit
43+
shader: unshaded
44+
- type: PointLight
45+
radius: 6.0
46+
color: "#2255FF"
47+
energy: 3.0
48+
netsync: false
49+
- type: LightFade
50+
duration: 0.6
51+
- type: TimedDespawn
52+
lifetime: 0.6
53+
54+
# EMP Rocket Cartridge - fits the RPG-7 launcher (uses CartridgeRocket tag)
55+
- type: entity
56+
parent: [BaseItem, BaseMajorContraband]
57+
id: CartridgeRocketEMP
58+
name: EMP rocket grenade
59+
description: A PG-7 EMP warhead designed for the RPG-7 launcher. Delivers a focused electromagnetic pulse on impact, disrupting electronics and power systems without causing structural damage. Does not explode.
60+
components:
61+
- type: Tag
62+
tags:
63+
- CartridgeRocket
64+
- type: Item
65+
size: Small
66+
- type: CartridgeAmmo
67+
proto: Bullet60mmRocketEMP
68+
deleteOnSpawn: true
69+
- type: Sprite
70+
sprite: _Starlight/Objects/Weapons/Guns/Projectiles/emp_rocket_projectile.rsi
71+
state: frag-emp
72+
- type: StaticPrice
73+
price: 30
74+
75+
# EMP Grenade Round - fits the SSG-TARNYX and any grenade-tag launcher
76+
- type: entity
77+
parent: [BaseItem, BaseMajorContraband]
78+
id: GrenadeEMPTarnyx
79+
name: EMP artillery grenade
80+
description: A large EMP grenade cartridge designed for the SSG-TARNYX cannon. Releases a powerful electromagnetic pulse on impact, disrupting ship electronics across a wide area. Does not cause structural damage.
81+
components:
82+
- type: Tag
83+
tags:
84+
- Grenade
85+
- type: Item
86+
size: Normal
87+
- type: CartridgeAmmo
88+
proto: BulletGrenadeEMPTarnyx
89+
deleteOnSpawn: true
90+
- type: Sprite
91+
sprite: _Starlight/Objects/Weapons/Guns/Projectiles/emp_rocket_projectile.rsi
92+
layers:
93+
- state: frag-emp
94+
map: ["enum.AmmoVisualLayers.Base"]
95+
- type: Appearance
96+
- type: StaticPrice
97+
price: 50
98+
99+
# Projectile for GrenadeEMPTarnyx - has a blue radar blip
100+
- type: entity
101+
parent: BaseBulletTrigger
102+
id: BulletGrenadeEMPTarnyx
103+
name: EMP artillery shell
104+
categories: [ HideSpawnMenu ]
105+
components:
106+
- type: Sprite
107+
sprite: _Starlight/Objects/Weapons/Guns/Projectiles/emp_rocket_projectile.rsi
108+
layers:
109+
- state: frag-emp
110+
- type: EmpOnTrigger
111+
range: 5.0
112+
energyConsumption: 25000
113+
disableDuration: 6.0
114+
- type: SpawnOnTrigger
115+
proto: EmpRocketImpactEffect
116+
- type: DeleteOnTrigger
117+
- type: PointLight
118+
radius: 3.5
119+
color: "#2244FF"
120+
energy: 0.6
121+
- type: RadarBlip
122+
color: "#4488FF"
123+
scale: 1.2
124+
shape: Circle
125+
requireInSpace: true
126+
- type: Ammo
127+
muzzleFlash: null

Resources/Prototypes/_Starlight/Entities/Objects/Power/powercells.yml

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -239,37 +239,4 @@
239239
autoRechargePauseTime: 5
240240
- type: MechSpeedModifier
241241
sprintModifier: 1.5
242-
walkModifier: 1
243-
244-
- type: entity
245-
id: PowerCageOmega
246-
parent: BasePowerCage
247-
name: omega-capacity power cage
248-
description: An extremely high-capacity power cage engineered for the most power-hungry shuttle weapon systems. Three times the capacity of a high-capacity cage, and three times the price. Noticeably heavier than standard cages.
249-
components:
250-
- type: Tag
251-
tags:
252-
- PowerCage
253-
- PowerCageOmega
254-
- type: Sprite
255-
sprite: Objects/Power/power_cages.rsi
256-
layers:
257-
- map: [ "enum.PowerCellVisualLayers.Base" ]
258-
state: high
259-
- map: [ "enum.PowerCellVisualLayers.Unshaded" ]
260-
state: o2
261-
shader: unshaded
262-
color: "#FF8800"
263-
- type: Battery
264-
maxCharge: 18600
265-
startingCharge: 18600
266-
- type: StaticPrice
267-
price: 9000
268-
269-
- type: entity
270-
id: PowerCageOmegaEmpty
271-
parent: PowerCageOmega
272-
suffix: Empty
273-
components:
274-
- type: Battery
275-
startingCharge: 0
242+
walkModifier: 1

0 commit comments

Comments
 (0)