From 08f8dc0067fd4f3fbd8153691fe894920482ec69 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 4 Nov 2015 13:39:24 +0100 Subject: [PATCH 1/3] Move Length: * to Defaults on exlosion: --- mods/ra/sequences/misc.yaml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 64e3d2ac88..a1bdb1f454 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -13,46 +13,29 @@ powerdown: idle: explosion: + Defaults: + Length: * piff: piff - Length: * piffs: piffpiff - Length: * water_piff: wpiff - Length: * water_piffs: wpifpif - Length: * small_explosion: veh-hit3 - Length: * med_explosion: veh-hit2 - Length: * small_explosion_air: flak - Length: * med_explosion_air: veh-hit1 - Length: * large_splash: h2o_exp1 - Length: * napalm: napalm2 - Length: * nuke: atomsfx - Length: * med_splash: h2o_exp2 - Length: * self_destruct: art-exp1 - Length: * artillery_explosion: art-exp1 - Length: * building: fball1 - Length: * Offset: 0,-9 small_splash: h2o_exp3 - Length: * large_explosion: frag1 - Length: * Offset: -2,0 small_napalm: napalm1 - Length: * corpse: corpse1 - Length: * Tick: 1600 UseTilesetExtension: true TilesetOverrides: From e238c583d5947d33d9bef4fce03ced9dc64d5a66 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 14 Nov 2015 00:10:33 +0100 Subject: [PATCH 2/3] Add more variations to building explosions --- mods/ra/rules/defaults.yaml | 1 + mods/ra/rules/structures.yaml | 18 ++++++++++++++++++ mods/ra/sequences/misc.yaml | 1 + 3 files changed, 20 insertions(+) diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 0484dd29b4..797fe67b44 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -410,6 +410,7 @@ DestroyedSounds: kaboom22.aud WithSpriteBody: WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct, large_napalm CaptureNotification: ShakeOnDeath: ProximityCaptor: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index fdae74fbfa..f51b8566e2 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -86,6 +86,8 @@ GAP: Amount: -60 MustBeDestroyed: RequiredForShortGame: false + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct SPEN: Inherits: ^Building @@ -414,6 +416,8 @@ TSLA: DetectCloaked: Range: 8c0 ProvidesPrerequisite@buildingname: + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct AGUN: Inherits: ^Defense @@ -461,6 +465,8 @@ AGUN: Amount: -50 DetectCloaked: Range: 6c0 + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct DOME: Inherits: ^Building @@ -539,6 +545,8 @@ PBOX: Amount: -15 DetectCloaked: Range: 6c0 + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct HBOX: Inherits: ^Defense @@ -585,6 +593,8 @@ HBOX: Power: Amount: -15 -MustBeDestroyed: + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct GUN: Inherits: ^Defense @@ -621,6 +631,8 @@ GUN: Amount: -40 DetectCloaked: Range: 7c0 + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct FTUR: Inherits: ^Defense @@ -657,6 +669,8 @@ FTUR: DetectCloaked: Range: 6c0 ProvidesPrerequisite@buildingname: + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct SAM: Inherits: ^Defense @@ -989,6 +1003,8 @@ SILO: -EmitInfantryOnSell: Power: Amount: -10 + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct HPAD: Inherits: ^Building @@ -1373,6 +1389,8 @@ KENN: Power: Amount: -10 ProvidesPrerequisite@buildingname: + WithBuildingExplosion: + Sequences: building, napalm, large_explosion, self_destruct TENT: Inherits: ^Building diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index a1bdb1f454..883524a969 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -35,6 +35,7 @@ explosion: large_explosion: frag1 Offset: -2,0 small_napalm: napalm1 + large_napalm: napalm3 corpse: corpse1 Tick: 1600 UseTilesetExtension: true From a1fd16f6c95842503e74d5cf8f29c184308eb299 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 14 Nov 2015 00:41:30 +0100 Subject: [PATCH 3/3] Add a flipped napalm explosion for buildings --- mods/ra/rules/defaults.yaml | 2 +- mods/ra/rules/structures.yaml | 18 +++++++++--------- mods/ra/sequences/misc.yaml | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 797fe67b44..b089d00bc1 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -410,7 +410,7 @@ DestroyedSounds: kaboom22.aud WithSpriteBody: WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct, large_napalm + Sequences: building, building_napalm, large_explosion, self_destruct, large_napalm CaptureNotification: ShakeOnDeath: ProximityCaptor: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index f51b8566e2..53a6ac9c53 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -87,7 +87,7 @@ GAP: MustBeDestroyed: RequiredForShortGame: false WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct SPEN: Inherits: ^Building @@ -417,7 +417,7 @@ TSLA: Range: 8c0 ProvidesPrerequisite@buildingname: WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct AGUN: Inherits: ^Defense @@ -466,7 +466,7 @@ AGUN: DetectCloaked: Range: 6c0 WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct DOME: Inherits: ^Building @@ -546,7 +546,7 @@ PBOX: DetectCloaked: Range: 6c0 WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct HBOX: Inherits: ^Defense @@ -594,7 +594,7 @@ HBOX: Amount: -15 -MustBeDestroyed: WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct GUN: Inherits: ^Defense @@ -632,7 +632,7 @@ GUN: DetectCloaked: Range: 7c0 WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct FTUR: Inherits: ^Defense @@ -670,7 +670,7 @@ FTUR: Range: 6c0 ProvidesPrerequisite@buildingname: WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct SAM: Inherits: ^Defense @@ -1004,7 +1004,7 @@ SILO: Power: Amount: -10 WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct HPAD: Inherits: ^Building @@ -1390,7 +1390,7 @@ KENN: Amount: -10 ProvidesPrerequisite@buildingname: WithBuildingExplosion: - Sequences: building, napalm, large_explosion, self_destruct + Sequences: building, building_napalm, large_explosion, self_destruct TENT: Inherits: ^Building diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 883524a969..fa64748390 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -25,6 +25,8 @@ explosion: med_explosion_air: veh-hit1 large_splash: h2o_exp1 napalm: napalm2 + building_napalm: napalm2 + FlipX: true nuke: atomsfx med_splash: h2o_exp2 self_destruct: art-exp1