Simplify weapon yaml definitions

OpenRA · Feb 18, 2023 · 022b9c3 · 022b9c3
1 parent d854cb2
commit 022b9c3
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 48 deletions.
diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml
@@ -593,13 +593,9 @@ MSAM:
 	Turreted:
 		TurnSpeed: 512
 		Offset: -256,0,128
-	Armament@PRIMARY:
+	Armament:
 		Weapon: 227mm
 		LocalOffset: 213,128,0, 213,-128,0
-	Armament@SECONDARY:
-		Name: secondary
-		Weapon: 227mm
-		LocalOffset: 213,-128,0, 213,128,0
 	AttackFrontal:
 		TargetFrozenActors: True
 		ForceFireIgnoresActors: True

diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml
@@ -146,7 +146,7 @@ MammothMissiles:
 	Range: 11c0
 	MinRange: 3c0
 	Burst: 4
-	BurstDelays: 4
+	BurstDelays: 0, 4, 0
 	Report: rocket1.aud
 	ValidTargets: Ground, Water
 	TargetActorCenter: true

diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
@@ -164,15 +164,9 @@ YAK:
 	RevealsShroud@GAPGEN:
 		Range: 9c0
 		Type: GroundPosition
-	Armament@PRIMARY:
-		Weapon: ChainGun.Yak
-		LocalOffset: 256,-213,0
-		MuzzleSequence: muzzle
-		PauseOnCondition: !ammo
-	Armament@SECONDARY:
-		Name: secondary
+	Armament:
 		Weapon: ChainGun.Yak
-		LocalOffset: 256,213,0
+		LocalOffset: 256,-213,0, 256,213,0
 		MuzzleSequence: muzzle
 		PauseOnCondition: !ammo
 	AttackAircraft:
@@ -383,17 +377,11 @@ HIND:
 	RevealsShroud@GAPGEN:
 		Range: 8c0
 		Type: GroundPosition
-	Armament@PRIMARY:
+	Armament:
 		Weapon: ChainGun
 		LocalOffset: 85,-213,-85, 85,213,-85
 		MuzzleSequence: muzzle
 		PauseOnCondition: !ammo
-	Armament@SECONDARY:
-		Name: secondary
-		Weapon: ChainGun
-		LocalOffset: 85,213,-85, 85,-213,-85
-		MuzzleSequence: muzzle
-		PauseOnCondition: !ammo
 	AttackAircraft:
 		FacingTolerance: 80
 		PersistentTargeting: false
@@ -507,17 +495,11 @@ MH60:
 	RevealsShroud@GAPGEN:
 		Range: 8c0
 		Type: GroundPosition
-	Armament@PRIMARY:
+	Armament:
 		Weapon: ChainGun
 		LocalOffset: 85,-213,-85, 85,213,-85
 		MuzzleSequence: muzzle
 		PauseOnCondition: !ammo
-	Armament@SECONDARY:
-		Name: secondary
-		Weapon: ChainGun
-		LocalOffset: 85,213,-85, 85,-213,-85
-		MuzzleSequence: muzzle
-		PauseOnCondition: !ammo
 	AttackAircraft:
 		FacingTolerance: 80
 		PersistentTargeting: false

diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
@@ -428,9 +428,6 @@ E7:
 	Armament@PRIMARY:
 		Weapon: Colt45
 		LocalOffset: 0,0,0, 0,0,0
-	Armament@SECONDARY:
-		Weapon: Colt45
-		LocalOffset: 0,0,0, 0,0,0
 	Armament@GARRISONED:
 		Name: garrisoned
 		Weapon: Colt45

diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml
@@ -770,7 +770,7 @@ DTRK:
 		DamageSource: Killer
 	AttackFrontal:
 		FacingTolerance: 512
-	Armament@PRIMARY:
+	Armament:
 		Weapon: DemoTruckTargeting
 	GrantConditionOnAttack:
 		Condition: triggered
@@ -811,14 +811,10 @@ CTNK:
 		RevealGeneratedShroud: False
 	RevealsShroud@GAPGEN:
 		Range: 4c0
-	Armament@PRIMARY:
-		Weapon: APTusk
-		LocalOffset: -160,-276,232
-		LocalYaw: 60
-	Armament@SECONDARY:
+	Armament:
 		Weapon: APTusk
-		LocalOffset: -160,276,232
-		LocalYaw: -60
+		LocalOffset: -160,-276,232, -160,276,232
+		LocalYaw: 60, -60
 	AttackFrontal:
 		FacingTolerance: 0
 	PortableChrono:

diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml
@@ -211,6 +211,8 @@ APTusk:
 	Inherits: ^AntiGroundMissile
 	ReloadDelay: 60
 	Range: 6c0
+	Burst: 2
+	BurstDelays: 0
 	Projectile: Missile
 		Speed: 298
 		TrailImage: smokey
@@ -220,6 +222,7 @@ APTusk:
 APTusk.stnk:
 	Inherits: APTusk
 	ReloadDelay: 100
+	Burst: 1
 
 TorpTube:
 	ReloadDelay: 100

diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml
@@ -217,6 +217,8 @@ Vulcan:
 
 ChainGun:
 	Inherits: ^HeavyMG
+	Burst: 2
+	BurstDelays: 0
 	ReloadDelay: 10
 	Range: 5c0
 	MinRange: 0c768
@@ -228,6 +230,8 @@ ChainGun:
 
 ChainGun.Yak:
 	Inherits: ^HeavyMG
+	Burst: 2
+	BurstDelays: 0
 	ReloadDelay: 3
 	Range: 5c0
 	MinRange: 3c0
@@ -332,5 +336,5 @@ Colt45:
 	ReloadDelay: 7
 	Range: 7c0
 	Warhead@1Dam: SpreadDamage
-		Damage: 5000
+		Damage: 10000
 
diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml
@@ -94,13 +94,7 @@ GACTWR:
 	Armament@VULCPRIMARY:
 		RequiresCondition: tower.vulcan
 		Weapon: VulcanTower
-		LocalOffset: 588,120,1358
-		MuzzleSequence: muzzle
-	Armament@VULCSECONDARY:
-		RequiresCondition: tower.vulcan
-		Name: secondary
-		Weapon: VulcanTower
-		LocalOffset: 588,-120,1358
+		LocalOffset: 588,120,1358, 588,-120,1358
 		MuzzleSequence: muzzle
 	Armament@ROCKET:
 		RequiresCondition: tower.rocket

diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml
@@ -20,7 +20,7 @@ E3:
 		HP: 10000
 	Mobile:
 		Speed: 56
-	Armament@PRIMARY:
+	Armament:
 		Weapon: Bazooka
 		LocalOffset: 356,0,967
 	TakeCover:

diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml
@@ -62,6 +62,8 @@ VulcanTower:
 	Inherits: ^MG
 	ReloadDelay: 26
 	Range: 6c0
+	Burst: 2
+	BurstDelays: 0
 	Report: chaingn1.aud
 	Warhead@1Dam: SpreadDamage
 		Damage: 1800