From a9f1f371d8225ff327a98f74982fb20caa5188a6 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 20 Nov 2016 18:04:31 +0100 Subject: [PATCH 1/5] Move TD Vulcan up for more consistent order --- mods/cnc/weapons/smallcaliber.yaml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml index b99200bd91..2b5f667d88 100644 --- a/mods/cnc/weapons/smallcaliber.yaml +++ b/mods/cnc/weapons/smallcaliber.yaml @@ -33,6 +33,18 @@ Sniper: HighV: Inherits: ^HeavyMG +Vulcan: + Inherits: ^HeavyMG + ReloadDelay: 2 + Report: gun5.aud + Warhead@1Dam: SpreadDamage + Spread: 426 + Damage: 100 + Versus: + Wood: 25 + Light: 100 + Heavy: 35 + HeliAGGun: Inherits: ^HeavyMG ReloadDelay: 20 @@ -101,19 +113,6 @@ MachineGun: Warhead@2Eff: CreateEffect Explosions: piffs -Vulcan: - Inherits: ^HeavyMG - ReloadDelay: 2 - Report: gun5.aud - Warhead@1Dam: SpreadDamage - Spread: 426 - Damage: 100 - Versus: - None: 100 - Wood: 25 - Light: 100 - Heavy: 35 - APCGun: ReloadDelay: 18 Range: 5c0 From a8ca251e2506a8aa2643e7a105df916132ef4ccc Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 20 Nov 2016 18:46:21 +0100 Subject: [PATCH 2/5] Move TD Grenade to largecaliber.yaml This is more about making maintenance a little easier than logic. The file might get renamed to 'ballistic.yaml' at some point, though. --- mods/cnc/weapons/largecaliber.yaml | 23 +++++++++++++++++++++++ mods/cnc/weapons/other.yaml | 26 -------------------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/largecaliber.yaml index cfa0377898..5f2f5b0669 100644 --- a/mods/cnc/weapons/largecaliber.yaml +++ b/mods/cnc/weapons/largecaliber.yaml @@ -81,3 +81,26 @@ ArtilleryShell: Warhead@3Eff: CreateEffect Explosions: poof ImpactSounds: xplosml2.aud + +Grenade: + Inherits: ^BallisticWeapon + ReloadDelay: 50 + Range: 4c0 + Report: toss1.aud + Projectile: Bullet + Speed: 140 + Blockable: false + LaunchAngle: 62 + Inaccuracy: 813 + Image: BOMB + Warhead@1Dam: SpreadDamage + Spread: 341 + Damage: 50 + Versus: + None: 100 + Wood: 50 + Light: 80 + Heavy: 35 + DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath + Warhead@3Eff: CreateEffect + Explosions: small_poof diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index f0cb391bea..2e09b1caef 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -65,32 +65,6 @@ Chemspray: Explosions: chemball ImpactSounds: xplos.aud -Grenade: - ReloadDelay: 50 - Range: 4c0 - Report: toss1.aud - Projectile: Bullet - Speed: 140 - Blockable: false - LaunchAngle: 62 - Inaccuracy: 813 - Image: BOMB - Warhead@1Dam: SpreadDamage - Spread: 341 - Damage: 50 - Versus: - None: 100 - Wood: 50 - Light: 80 - Heavy: 35 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Smu: LeaveSmudge - SmudgeType: Crater - InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep - Warhead@3Eff: CreateEffect - Explosions: small_poof - ImpactSounds: xplos.aud - Napalm: Inherits: ^FlameWeapon ReloadDelay: 4 From 7496bfff7c65bf76fd98437482acdb9df0b697d6 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 20 Nov 2016 18:47:00 +0100 Subject: [PATCH 3/5] Move TD TiberiumExplosion to explosions.yaml --- mods/cnc/weapons/explosions.yaml | 14 ++++++++++++++ mods/cnc/weapons/other.yaml | 17 ----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/mods/cnc/weapons/explosions.yaml b/mods/cnc/weapons/explosions.yaml index a780b9baf2..e3165297e8 100644 --- a/mods/cnc/weapons/explosions.yaml +++ b/mods/cnc/weapons/explosions.yaml @@ -99,3 +99,17 @@ Napalm.Crate: ImpactSounds: flamer2.aud Warhead@3Smu: LeaveSmudge SmudgeType: Scorch + +TiberiumExplosion: + Inherits: ^DamagingExplosionHE + Warhead@1Dam: SpreadDamage + Spread: 9 + Damage: 10 + DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath + Warhead@2Eff: CreateEffect + Explosions: chemball + ImpactSounds: xplosml2.aud + -Warhead@3Smu: LeaveSmudge + Warhead@4Res: CreateResource + AddsResourceType: Tiberium + Size: 1,1 diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index 2e09b1caef..5850402295 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -100,23 +100,6 @@ Laser: SmudgeType: Scorch InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep -TiberiumExplosion: - Warhead@1Dam: SpreadDamage - Spread: 9 - Damage: 10 - Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Res: CreateResource - AddsResourceType: Tiberium - Size: 1,1 - Warhead@3Eff: CreateEffect - Explosions: chemball - ImpactSounds: xplosml2.aud - ^DinoWeapon: ReloadDelay: 30 Range: 1c0 From 5f6a350d41166c60340572a540bba9a67f065cf9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 20 Nov 2016 18:47:30 +0100 Subject: [PATCH 4/5] Make TD Chemspray inherit ^FlameWeapon Results in a small reduction of yaml lines and makes it easier to make across-the-board changes in the future. --- mods/cnc/weapons/other.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index 5850402295..db090317b4 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -44,23 +44,20 @@ BigFlamer: Explosions: med_napalm Chemspray: + Inherits: ^FlameWeapon ReloadDelay: 65 Range: 3c0 - Report: flamer2.aud - Projectile: Bullet - Speed: 1c682 + InvalidTargets: Warhead@1Dam: SpreadDamage Spread: 256 Damage: 80 + InvalidTargets: Versus: None: 70 Wood: 35 Light: 75 Heavy: 75 DamageTypes: Prone50Percent, TriggerProne, TiberiumDeath - Warhead@2Smu: LeaveSmudge - SmudgeType: Scorch - InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep Warhead@3Eff: CreateEffect Explosions: chemball ImpactSounds: xplos.aud From 276082935374d0eba52ed0ee66254a413dd796a3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 25 Jan 2017 18:57:58 +0100 Subject: [PATCH 5/5] Rename TD largecaliber.yaml to ballistics.yaml Mostly because Grenade was added to it. --- mods/cnc/mod.yaml | 2 +- mods/cnc/weapons/{largecaliber.yaml => ballistics.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename mods/cnc/weapons/{largecaliber.yaml => ballistics.yaml} (100%) diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 718da2cbc9..8564297371 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -74,7 +74,7 @@ TileSets: Weapons: cnc|weapons/explosions.yaml - cnc|weapons/largecaliber.yaml + cnc|weapons/ballistics.yaml cnc|weapons/missiles.yaml cnc|weapons/other.yaml cnc|weapons/smallcaliber.yaml diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/ballistics.yaml similarity index 100% rename from mods/cnc/weapons/largecaliber.yaml rename to mods/cnc/weapons/ballistics.yaml