From d77fd5c13eb85b837ceb113d9dff956a51da568a Mon Sep 17 00:00:00 2001 From: Gustas <37534529+PunkPun@users.noreply.github.com> Date: Fri, 17 Feb 2023 21:57:50 +0200 Subject: [PATCH] Simplify weapon yaml definitions --- mods/cnc/rules/vehicles.yaml | 6 +----- mods/cnc/weapons/missiles.yaml | 2 +- mods/ra/rules/aircraft.yaml | 26 ++++---------------------- mods/ra/rules/infantry.yaml | 3 --- mods/ra/rules/vehicles.yaml | 12 ++++-------- mods/ra/weapons/missiles.yaml | 3 +++ mods/ra/weapons/smallcaliber.yaml | 6 +++++- mods/ts/rules/gdi-support.yaml | 10 ++-------- mods/ts/rules/nod-infantry.yaml | 2 +- mods/ts/weapons/smallguns.yaml | 2 ++ 10 files changed, 23 insertions(+), 49 deletions(-) diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index cb189a451b..2c66ad3478 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -594,13 +594,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 index c120dab394..2829bbdb58 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -147,7 +147,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 index 778ef8e610..d34e4c517f 100644 --- 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: + Armament: Weapon: ChainGun.Yak - LocalOffset: 256,-213,0 - MuzzleSequence: muzzle - PauseOnCondition: !ammo - Armament@SECONDARY: - Name: secondary - 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 index 5310be8b45..07333c84f6 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -427,9 +427,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 index 3427020d8c..ff2cf7ef78 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -771,7 +771,7 @@ DTRK: DamageSource: Killer AttackFrontal: FacingTolerance: 512 - Armament@PRIMARY: + Armament: Weapon: DemoTruckTargeting GrantConditionOnAttack: Condition: triggered @@ -812,14 +812,10 @@ CTNK: RevealGeneratedShroud: False RevealsShroud@GAPGEN: Range: 4c0 - Armament@PRIMARY: + Armament: Weapon: APTusk - LocalOffset: -160,-276,232 - LocalYaw: 60 - Armament@SECONDARY: - 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 index fe47138aef..b0979c75aa 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -209,6 +209,8 @@ APTusk: Inherits: ^AntiGroundMissile ReloadDelay: 60 Range: 6c0 + Burst: 2 + BurstDelays: 0 Projectile: Missile Speed: 298 TrailImage: smokey @@ -218,6 +220,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 index b706d81b1c..22192fb1d3 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -210,6 +210,8 @@ Vulcan: ChainGun: Inherits: ^HeavyMG + Burst: 2 + BurstDelays: 0 ReloadDelay: 10 Range: 5c0 MinRange: 0c768 @@ -221,6 +223,8 @@ ChainGun: ChainGun.Yak: Inherits: ^HeavyMG + Burst: 2 + BurstDelays: 0 ReloadDelay: 3 Range: 5c0 MinRange: 3c0 @@ -325,5 +329,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 index 730fa609d7..83323ebe4b 100644 --- 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 diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 96b23680b5..2af2d04651 100644 --- 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 index 44dc3b96b1..dc19c36812 100644 --- 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