From 9fe429aeb8b0bac0e17cf067626cb6eb4717e7a8 Mon Sep 17 00:00:00 2001 From: psydev Date: Sat, 16 Mar 2013 21:48:55 -0700 Subject: [PATCH 1/8] infantry anims: running ticks corrected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I guess nobody noticed, but in CNC and RA, the legs of infantry move way too fast. It should be ~100 Tick.  --- mods/cnc/sequences/infantry.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mods/cnc/sequences/infantry.yaml b/mods/cnc/sequences/infantry.yaml index 8691e6d16b..9291ea3664 100644 --- a/mods/cnc/sequences/infantry.yaml +++ b/mods/cnc/sequences/infantry.yaml @@ -25,6 +25,7 @@ e1: Start: 16 Length: 6 Facings: 8 + Tick: 100 shoot: Start: 64 Length: 8 @@ -37,6 +38,7 @@ e1: Start: 144 Length: 4 Facings: 8 + Tick: 100 # stand -> prone transition liedown: Start: 128 @@ -119,6 +121,7 @@ e2: Start: 16 Length: 6 Facings: 8 + Tick: 100 shoot: Start: 64 Length: 20 @@ -141,6 +144,7 @@ e2: Start: 240 Length: 4 Facings: 8 + Tick: 100 prone-shoot: Start: 288 Length: 12 @@ -204,6 +208,7 @@ e3: Start: 16 Length: 6 Facings: 8 + Tick: 100 shoot: Start: 64 Length: 8 @@ -226,6 +231,7 @@ e3: Start: 144 Length: 4 Facings: 8 + Tick: 100 prone-shoot: Start: 192 Length: 10 @@ -289,6 +295,7 @@ e4: Start: 16 Length: 6 Facings: 8 + Tick: 100 shoot: Start: 64 Length: 16 @@ -311,6 +318,7 @@ e4: Start: 208 Length: 4 Facings: 8 + Tick: 100 prone-shoot: Start: 256 Length: 16 @@ -377,6 +385,7 @@ e5: Start: 16 Length: 6 Facings: 8 + Tick: 100 shoot: Start: 64 Length: 16 @@ -399,6 +408,7 @@ e5: Start: 208 Length: 4 Facings: 8 + Tick: 100 prone-shoot: Start: 256 Length: 16 @@ -465,6 +475,7 @@ e6: Start: 16 Length: 6 Facings: 8 + Tick: 100 # stand -> prone transition liedown: Start: 66 @@ -483,6 +494,7 @@ e6: Start: 82 Length: 4 Facings: 8 + Tick: 100 idle1: Start: 114 Length: 6 @@ -541,6 +553,7 @@ rmbo: Start: 16 Length: 6 Facings: 8 + Tick: 100 shoot: Start: 64 Length: 4 @@ -563,6 +576,7 @@ rmbo: Start: 112 Length: 4 Facings: 8 + Tick: 100 prone-shoot: Start: 160 Length: 4 @@ -617,4 +631,4 @@ rmbo: die-crushed: e1rot Start: 16 Length: 4 - Tick: 1600 \ No newline at end of file + Tick: 1600 From b8b258c6f9b1573ab75249f540cfcd4da9565400 Mon Sep 17 00:00:00 2001 From: psydev Date: Sat, 16 Mar 2013 21:56:35 -0700 Subject: [PATCH 2/8] construction yard does crane animation slower when building other buildings, construction yard crane should go slower, at ~100 tick. --- mods/cnc/sequences/structures.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml index 651805546d..501e0893ff 100644 --- a/mods/cnc/sequences/structures.yaml +++ b/mods/cnc/sequences/structures.yaml @@ -2,6 +2,7 @@ fact: build: Start: 4 Length: 20 + Tick: 100 idle: Start: 0 Length: 4 @@ -13,6 +14,7 @@ fact: damaged-build: Start: 28 Length: 20 + Tick: 100 dead: Start: 48 make: factmake From 451c453442401412273fddd9a1e75d026f834dbe Mon Sep 17 00:00:00 2001 From: psydev Date: Sat, 16 Mar 2013 22:17:30 -0700 Subject: [PATCH 3/8] added unit explosions for flametank, helis added unit explosions for flametank, helis and flamethrower e4 changed GrenadierExplode and UnitExplodeSmall a bit --- mods/cnc/weapons.yaml | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index 9485f4428a..a4fd47fbd6 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -1,3 +1,32 @@ + + +FlametankExplode: + Warhead: + Damage: 100 + Spread: 24 + Explosion: big_napalm + InfDeath: 5 + ImpactSound: xplobig6 + +HeliExplode: + Warhead: + Explosion: small_building + InfDeath: 4 + ImpactSound: xplos + +FlamethrowerExplode: + Warhead: + Damage: 10 + Spread: 9 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: small_napalm + InfDeath: 5 + ImpactSound: flamer2 + UnitExplode: Warhead: Damage: 500 @@ -20,7 +49,7 @@ UnitExplodeSmall: Wood: 75% Light: 60% Heavy: 25% - Explosion: 8 + Explosion: big_frag InfDeath: 4 ImpactSound: xplobig4 @@ -33,9 +62,9 @@ GrenadierExplode: Wood: 75% Light: 60% Heavy: 25% - Explosion: 8 + Explosion: poof InfDeath: 3 - ImpactSound: xplos + ImpactSound: xplosml2 Atomic: Warhead@impact: From acf779ace3bcc545cfb4c5206094613a300e4280 Mon Sep 17 00:00:00 2001 From: psydev Date: Sat, 16 Mar 2013 22:20:42 -0700 Subject: [PATCH 4/8] Flame Tank gets FlametankExplode when it dies Flame Tank gets FlametankExplode when it dies (big explosion that hurts nearby units) --- mods/cnc/rules/vehicles.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 14d9ed4014..8460c76f32 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -178,8 +178,8 @@ FTNK: AutoTarget: WithMuzzleFlash: Explodes: - Weapon: BigFlamer - EmptyWeapon: BigFlamer + Weapon: FlametankExplode + EmptyWeapon: FlametankExplode LeavesHusk: HuskActor: FTNK.Husk From 5ac47b49cebfe80a45931582e5600601581f1545 Mon Sep 17 00:00:00 2001 From: psydev Date: Sat, 16 Mar 2013 22:23:06 -0700 Subject: [PATCH 5/8] Helicopters do HeliExplode when they die Helicopters give off a nice explosion before falling to the ground. --- mods/cnc/rules/defaults.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 0156098506..f7d4b53413 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -90,6 +90,9 @@ DrawLineToTarget: ActorLostNotification: Notification: unitlost.aud + Explodes: + Weapon: HeliExplode + EmptyWeapon: HeliExplode ^Infantry: AppearsOnRadar: From 5381b1fbac9115683965e8b7fb3c2da7a17d7c14 Mon Sep 17 00:00:00 2001 From: psydev Date: Sun, 17 Mar 2013 01:30:36 -0700 Subject: [PATCH 6/8] added explosion for helicopters crashing on ground --- mods/cnc/weapons.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index a4fd47fbd6..7a9fab5eb6 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -1,5 +1,4 @@ - FlametankExplode: Warhead: Damage: 100 @@ -8,6 +7,14 @@ FlametankExplode: InfDeath: 5 ImpactSound: xplobig6 +HeliCrash: + Warhead: + Damage: 40 + Spread: 10 + Explosion: poof + InfDeath: 4 + ImpactSound: xplos + HeliExplode: Warhead: Explosion: small_building From 604854f22d6e2ce226bc45162e22ece07efbe521 Mon Sep 17 00:00:00 2001 From: psydev Date: Sun, 17 Mar 2013 01:35:51 -0700 Subject: [PATCH 7/8] added helicopter explosions; a10 hp boost Helicopters get explosions, when they fall from the sky, and then when they collide with the ground (and do damage). A-10 HP raised from a very small 60 to 150. --- mods/cnc/rules/aircraft.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 4c71c76de2..aa4bf9e50e 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -38,7 +38,11 @@ TRAN: MaxWeight: 10 PipCount: 10 FallsToEarth: - + Explosion: HeliCrash + Explodes: + Weapon: HeliExplode + EmptyWeapon: HeliExplode + HELI: Inherits: ^Helicopter Valued: @@ -84,7 +88,11 @@ HELI: WithMuzzleFlash: WithShadow: FallsToEarth: + Explosion: HeliCrash AutoTarget: + Explodes: + Weapon: HeliExplode + EmptyWeapon: HeliExplode ORCA: Inherits: ^Helicopter @@ -128,7 +136,11 @@ ORCA: RenderUnit: WithShadow: FallsToEarth: + Explosion: HeliCrash AutoTarget: + Explodes: + Weapon: HeliExplode + EmptyWeapon: HeliExplode C17: ParaDrop: @@ -164,7 +176,7 @@ A10: ROT: 4 Speed: 40 Health: - HP: 60 + HP: 150 Armor: Type: Heavy RevealsShroud: From ff983157a63fdb52399716c2ec3cba2f09559071 Mon Sep 17 00:00:00 2001 From: psydev Date: Sun, 17 Mar 2013 01:57:52 -0700 Subject: [PATCH 8/8] removed FlamethrowerExplode for now Removed FlamethrowerExplode for now, until it is certain what the damage stats should be and the probability of exploding. --- mods/cnc/weapons.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index 7a9fab5eb6..74d267117e 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -1,4 +1,3 @@ - FlametankExplode: Warhead: Damage: 100 @@ -21,19 +20,6 @@ HeliExplode: InfDeath: 4 ImpactSound: xplos -FlamethrowerExplode: - Warhead: - Damage: 10 - Spread: 9 - Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Explosion: small_napalm - InfDeath: 5 - ImpactSound: flamer2 - UnitExplode: Warhead: Damage: 500