Simplify weapon yaml definitions

2023-02-17 21:57:50 +02:00
parent 4dec79a5fb
commit d77fd5c13e
10 changed files with 23 additions and 49 deletions
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -91,16 +91,10 @@ GACTWR:
 		RequiresCondition: !build-incomplete && tower.sam
 		Recoils: false
 		Sequence: turret-sam
-	Armament@VULCPRIMARY:
+	Armament@VULCAN:
 		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
--- 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:
--- 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