From eb34621ce803a49a873a672bf5bdf8f960df55d6 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 1 Nov 2016 20:43:01 +0100 Subject: [PATCH] Use Explodes instead of WithBuildingExplosion in RA --- mods/ra/rules/civilian.yaml | 6 ------ mods/ra/rules/defaults.yaml | 9 +++++++-- mods/ra/rules/structures.yaml | 35 +++++++++------------------------ mods/ra/weapons/explosions.yaml | 22 +++++++++++++++++++-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index cb8f2da866..ddad7f75cf 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -106,8 +106,6 @@ HOSP: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 ProvidesPrerequisite@buildingname: GpsDot: String: Hospital @@ -330,8 +328,6 @@ MISS: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 ProvidesPrerequisite@buildingname: BIO: @@ -349,8 +345,6 @@ BIO: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 ProvidesPrerequisite@buildingname: GpsDot: String: Biohazard diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index f6347c96af..13b5c8d31e 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -494,8 +494,10 @@ DamagedSounds: kaboom1.aud DestroyedSounds: kaboom22.aud WithSpriteBody: - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct, large_napalm + Explodes: + Type: Footprint + Weapon: BuildingExplode + EmptyWeapon: BuildingExplode CaptureNotification: ShakeOnDeath: ProximityCaptor: @@ -546,6 +548,9 @@ -AcceptsSupplies: DrawLineToTarget: RenderRangeCircle: + Explodes: + Weapon: SmallBuildingExplode + EmptyWeapon: SmallBuildingExplode ^Wall: Inherits@1: ^ExistsInWorld diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index d485a486c2..b16ba50ff3 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -84,8 +84,9 @@ GAP: Amount: -60 MustBeDestroyed: RequiredForShortGame: false - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct + Explodes: + Weapon: SmallBuildingExplode + EmptyWeapon: SmallBuildingExplode SPEN: Inherits: ^Building @@ -434,8 +435,6 @@ TSLA: DetectCloaked: Range: 8c0 ProvidesPrerequisite@buildingname: - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct AGUN: Inherits: ^Defense @@ -482,8 +481,6 @@ AGUN: Amount: -50 DetectCloaked: Range: 6c0 - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct BodyOrientation: UseClassicFacingFudge: True @@ -566,8 +563,6 @@ PBOX: Amount: -15 DetectCloaked: Range: 6c0 - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct HBOX: Inherits: ^Defense @@ -614,8 +609,6 @@ HBOX: Power: Amount: -15 -MustBeDestroyed: - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct GUN: Inherits: ^Defense @@ -652,8 +645,6 @@ GUN: Amount: -40 DetectCloaked: Range: 7c0 - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct BodyOrientation: UseClassicFacingFudge: True @@ -692,8 +683,9 @@ FTUR: DetectCloaked: Range: 6c0 ProvidesPrerequisite@buildingname: - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct + Explodes: + Weapon: BuildingExplode + EmptyWeapon: BuildingExplode SAM: Inherits: ^Defense @@ -950,8 +942,6 @@ FACT: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 ProvidesPrerequisite@buildingname: PROC: @@ -1004,8 +994,6 @@ PROC: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 ProvidesPrerequisite@buildingname: SILO: @@ -1036,8 +1024,9 @@ SILO: -EmitInfantryOnSell: Power: Amount: -10 - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct + Explodes: + Weapon: SmallBuildingExplode + EmptyWeapon: SmallBuildingExplode HPAD: Inherits: ^Building @@ -1267,8 +1256,6 @@ POWR: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 APWR: Inherits: ^Building @@ -1308,8 +1295,6 @@ APWR: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - WithBuildingExplosion: - Delay: 1 STEK: Inherits: ^ScienceBuilding @@ -1448,8 +1433,6 @@ KENN: Power: Amount: -10 ProvidesPrerequisite@buildingname: - WithBuildingExplosion: - Sequences: building, building_napalm, large_explosion, self_destruct WithDecoration@primary: RequiresSelection: true Image: pips diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 16a35867ce..153aaf2bfc 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -212,12 +212,16 @@ UnitExplodeSmall: SmudgeType: Crater InvalidTargets: Structure, Wall, Trees -# Used to panic civilians which are emitted from a killed CivBuilding CivBuildingExplosion: - Warhead@1Dam: SpreadDamage + Warhead@1Dam: SpreadDamage # Used to panic civilians which are emitted from a killed CivBuilding Spread: 64 Damage: 1 Delay: 1 + Warhead@2Eff: CreateEffect + Explosions: building, building_napalm, large_explosion, self_destruct + Warhead@3Smu: LeaveSmudge + SmudgeType: Crater + InvalidTargets: Wall, Trees ArtilleryExplode: Warhead@1Dam: SpreadDamage @@ -245,6 +249,20 @@ V2Explode: Inherits: SCUD -Report: +BuildingExplode: + Warhead@1Eff: CreateEffect + Explosions: building, building_napalm, large_explosion, self_destruct, large_napalm + Warhead@2Smu: LeaveSmudge + SmudgeType: Crater + InvalidTargets: Wall, Trees + +SmallBuildingExplode: + Warhead@1Eff: CreateEffect + Explosions: building, building_napalm, large_explosion, self_destruct + Warhead@2Smu: LeaveSmudge + SmudgeType: Crater + InvalidTargets: Wall, Trees + BarrelExplode: Warhead@1Dam: SpreadDamage Spread: 426