From e75e6ce6144b873c87faace19c582744b249008d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 28 Dec 2016 23:54:18 +0100 Subject: [PATCH 1/3] Move nuke explosions to end of RA explosions.yaml --- mods/ra/weapons/explosions.yaml | 244 ++++++++++++++++---------------- 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 73b61ee24a..756d166120 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -38,128 +38,6 @@ CrateExplosion: SmudgeType: Crater InvalidTargets: Structure, Wall, Trees -CrateNuke: - ValidTargets: Ground, Trees, Water, Air - Warhead@1Dam_impact: SpreadDamage - Spread: 1c0 - Damage: 100 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - ValidTargets: Ground, Trees, Water, Air - Versus: - Concrete: 25 - AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@2Res_impact: DestroyResource - Warhead@3Eff_impact: CreateEffect - Explosions: nuke - ImpactSounds: kaboom1.aud - Warhead@4Dam_areanuke: SpreadDamage - Spread: 1c0 - Damage: 60 - Falloff: 1000, 600, 400, 250, 150, 100, 0 - Delay: 4 - ValidTargets: Ground, Water, Air - Versus: - Concrete: 25 - AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@5Dam_areanuke: SpreadDamage - Spread: 1c0 - Damage: 120 - Falloff: 1000, 600, 400, 250, 150, 100, 0 - Delay: 4 - ValidTargets: Trees - DamageTypes: Incendiary - Warhead@6Res_areanuke: DestroyResource - Size: 5,4 - Delay: 4 - Warhead@7Smu_areanuke: LeaveSmudge - SmudgeType: Scorch - InvalidTargets: Vehicle, Tank, Structure, Wall, Trees - Size: 5,4 - Delay: 4 - Warhead@8Eff_areanuke: CreateEffect - ImpactSounds: kaboom22.aud - Delay: 4 - -MiniNuke: - ValidTargets: Ground, Trees, Water, Underwater, Air - Warhead@1Dam_impact: SpreadDamage - Spread: 1c0 - Damage: 150 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - ValidTargets: Ground, Trees, Water, Air - Versus: - Concrete: 25 - AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@2Res_impact: DestroyResource - Size: 1 - Warhead@3Eff_impact: CreateEffect - Explosions: nuke - ImpactSounds: kaboom1.aud - Warhead@4Dam_areanuke1: SpreadDamage - Spread: 2c0 - Damage: 60 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Delay: 5 - ValidTargets: Ground, Trees, Water, Underwater, Air - Versus: - Concrete: 25 - AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@5Res_areanuke1: DestroyResource - Size: 2 - Delay: 5 - Warhead@6Eff_areanuke1: CreateEffect - ImpactSounds: kaboom22.aud - Delay: 5 - Warhead@7Dam_areanuke2: SpreadDamage - Spread: 3c0 - Damage: 60 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Delay: 10 - ValidTargets: Ground, Water, Underwater, Air - Versus: - Concrete: 25 - AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@8Dam_areanuke2: SpreadDamage - Spread: 3c0 - Damage: 120 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Delay: 10 - ValidTargets: Trees - DamageTypes: Incendiary - Warhead@9Res_areanuke2: DestroyResource - Size: 3 - Delay: 10 - Warhead@10Dam_areanuke3: SpreadDamage - Spread: 4c0 - Damage: 60 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Delay: 15 - ValidTargets: Ground, Water, Underwater - Versus: - Concrete: 25 - AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@11Dam_areanuke3: SpreadDamage - Spread: 4c0 - Damage: 180 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Delay: 15 - ValidTargets: Trees - DamageTypes: Incendiary - Warhead@12Res_areanuke3: DestroyResource - Size: 4 - Delay: 15 - Warhead@13Smu_areanuke3: LeaveSmudge - SmudgeType: Scorch - InvalidTargets: Vehicle, Tank, Structure, Wall, Trees - Size: 4 - Delay: 15 - UnitExplode: Warhead@1Dam: SpreadDamage Spread: 426 @@ -349,3 +227,125 @@ OreExplosion: Warhead@3Eff: CreateEffect Explosions: med_explosion ImpactSounds: kaboom25.aud + +CrateNuke: + ValidTargets: Ground, Trees, Water, Air + Warhead@1Dam_impact: SpreadDamage + Spread: 1c0 + Damage: 100 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + ValidTargets: Ground, Trees, Water, Air + Versus: + Concrete: 25 + AffectsParent: true + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary + Warhead@2Res_impact: DestroyResource + Warhead@3Eff_impact: CreateEffect + Explosions: nuke + ImpactSounds: kaboom1.aud + Warhead@4Dam_areanuke: SpreadDamage + Spread: 1c0 + Damage: 60 + Falloff: 1000, 600, 400, 250, 150, 100, 0 + Delay: 4 + ValidTargets: Ground, Water, Air + Versus: + Concrete: 25 + AffectsParent: true + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary + Warhead@5Dam_areanuke: SpreadDamage + Spread: 1c0 + Damage: 120 + Falloff: 1000, 600, 400, 250, 150, 100, 0 + Delay: 4 + ValidTargets: Trees + DamageTypes: Incendiary + Warhead@6Res_areanuke: DestroyResource + Size: 5,4 + Delay: 4 + Warhead@7Smu_areanuke: LeaveSmudge + SmudgeType: Scorch + InvalidTargets: Vehicle, Tank, Structure, Wall, Trees + Size: 5,4 + Delay: 4 + Warhead@8Eff_areanuke: CreateEffect + ImpactSounds: kaboom22.aud + Delay: 4 + +MiniNuke: + ValidTargets: Ground, Trees, Water, Underwater, Air + Warhead@1Dam_impact: SpreadDamage + Spread: 1c0 + Damage: 150 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + ValidTargets: Ground, Trees, Water, Air + Versus: + Concrete: 25 + AffectsParent: true + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary + Warhead@2Res_impact: DestroyResource + Size: 1 + Warhead@3Eff_impact: CreateEffect + Explosions: nuke + ImpactSounds: kaboom1.aud + Warhead@4Dam_areanuke1: SpreadDamage + Spread: 2c0 + Damage: 60 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + Delay: 5 + ValidTargets: Ground, Trees, Water, Underwater, Air + Versus: + Concrete: 25 + AffectsParent: true + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary + Warhead@5Res_areanuke1: DestroyResource + Size: 2 + Delay: 5 + Warhead@6Eff_areanuke1: CreateEffect + ImpactSounds: kaboom22.aud + Delay: 5 + Warhead@7Dam_areanuke2: SpreadDamage + Spread: 3c0 + Damage: 60 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + Delay: 10 + ValidTargets: Ground, Water, Underwater, Air + Versus: + Concrete: 25 + AffectsParent: true + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary + Warhead@8Dam_areanuke2: SpreadDamage + Spread: 3c0 + Damage: 120 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + Delay: 10 + ValidTargets: Trees + DamageTypes: Incendiary + Warhead@9Res_areanuke2: DestroyResource + Size: 3 + Delay: 10 + Warhead@10Dam_areanuke3: SpreadDamage + Spread: 4c0 + Damage: 60 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + Delay: 15 + ValidTargets: Ground, Water, Underwater + Versus: + Concrete: 25 + AffectsParent: true + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary + Warhead@11Dam_areanuke3: SpreadDamage + Spread: 4c0 + Damage: 180 + Falloff: 1000, 368, 135, 50, 18, 7, 0 + Delay: 15 + ValidTargets: Trees + DamageTypes: Incendiary + Warhead@12Res_areanuke3: DestroyResource + Size: 4 + Delay: 15 + Warhead@13Smu_areanuke3: LeaveSmudge + SmudgeType: Scorch + InvalidTargets: Vehicle, Tank, Structure, Wall, Trees + Size: 4 + Delay: 15 From 12b9c97f0b4824d22aceb33aee780b16ce20508e Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Dec 2016 00:11:37 +0100 Subject: [PATCH 2/3] Rename and in a few cases move around warheads in RA explosions.yaml To make inheriting easier down the road. --- mods/ra/weapons/explosions.yaml | 74 ++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 756d166120..5ca4b75507 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -12,12 +12,12 @@ CrateNapalm: Concrete: 50 AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@2Smu: LeaveSmudge - SmudgeType: Scorch - InvalidTargets: Structure, Wall, Trees - Warhead@3Eff: CreateEffect + Warhead@2Eff: CreateEffect Explosions: napalm ImpactSounds: firebl3.aud + Warhead@Smu: LeaveSmudge + SmudgeType: Scorch + InvalidTargets: Structure, Wall, Trees CrateExplosion: Warhead@1Dam: SpreadDamage @@ -34,7 +34,7 @@ CrateExplosion: Warhead@2Eff: CreateEffect Explosions: self_destruct ImpactSounds: kaboom15.aud - Warhead@3Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Structure, Wall, Trees @@ -57,7 +57,7 @@ UnitExplode: Explosions: large_splash ImpactSounds: splash9.aud ValidImpactTypes: Water - Warhead@4Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Structure, Wall, Trees @@ -107,7 +107,7 @@ UnitExplodeSmall: Explosions: large_splash ImpactSounds: splash9.aud ValidImpactTypes: Water - Warhead@4Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Structure, Wall, Trees @@ -118,7 +118,7 @@ CivBuildingExplosion: Delay: 1 Warhead@2Eff: CreateEffect Explosions: building, building_napalm, large_explosion, self_destruct - Warhead@3Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Wall, Trees @@ -140,7 +140,7 @@ ArtilleryExplode: Explosions: large_splash ImpactSounds: splash9.aud ValidImpactTypes: Water - Warhead@4Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Structure, Wall, Trees @@ -149,16 +149,16 @@ V2Explode: -Report: BuildingExplode: - Warhead@1Eff: CreateEffect + Warhead@2Eff: CreateEffect Explosions: building, building_napalm, large_explosion, self_destruct, large_napalm - Warhead@2Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Wall, Trees SmallBuildingExplode: - Warhead@1Eff: CreateEffect + Warhead@2Eff: CreateEffect Explosions: building, building_napalm, large_explosion, self_destruct - Warhead@2Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Wall, Trees @@ -176,14 +176,14 @@ BarrelExplode: Heavy: 25 Concrete: 10 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, Incendiary - Warhead@2Smu: LeaveSmudge - SmudgeType: Scorch - Size: 2 - Delay: 5 - Warhead@3Eff: CreateEffect + Warhead@2Eff: CreateEffect Explosions: napalm ImpactSounds: firebl3.aud Delay: 5 + Warhead@Smu: LeaveSmudge + SmudgeType: Scorch + Size: 2 + Delay: 5 ATMine: Warhead@1Dam: SpreadDamage @@ -194,7 +194,7 @@ ATMine: Warhead@2Eff: CreateEffect Explosions: large_explosion ImpactSounds: mineblo1.aud - Warhead@3Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Crater InvalidTargets: Structure, Wall, Trees @@ -207,7 +207,7 @@ APMine: Warhead@2Eff: CreateEffect Explosions: napalm ImpactSounds: mine1.aud - Warhead@3Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: Scorch InvalidTargets: Structure, Wall, Trees @@ -221,10 +221,10 @@ OreExplosion: Light: 60 Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Res: CreateResource + Warhead@3Res: CreateResource AddsResourceType: Ore Size: 1,1 - Warhead@3Eff: CreateEffect + Warhead@2Eff: CreateEffect Explosions: med_explosion ImpactSounds: kaboom25.aud @@ -243,34 +243,34 @@ CrateNuke: Warhead@3Eff_impact: CreateEffect Explosions: nuke ImpactSounds: kaboom1.aud - Warhead@4Dam_areanuke: SpreadDamage + Warhead@4Dam_areanuke1: SpreadDamage Spread: 1c0 Damage: 60 Falloff: 1000, 600, 400, 250, 150, 100, 0 - Delay: 4 + Delay: 5 ValidTargets: Ground, Water, Air Versus: Concrete: 25 AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary - Warhead@5Dam_areanuke: SpreadDamage + Warhead@5Res_areanuke1: DestroyResource + Size: 4 + Delay: 5 + Warhead@6Eff_areanuke1: CreateEffect + ImpactSounds: kaboom22.aud + Delay: 5 + Warhead@6Smu_areanuke1: LeaveSmudge + SmudgeType: Scorch + InvalidTargets: Vehicle, Tank, Structure, Wall, Trees + Size: 4 + Delay: 5 + Warhead@TREEKILL: SpreadDamage Spread: 1c0 Damage: 120 Falloff: 1000, 600, 400, 250, 150, 100, 0 - Delay: 4 + Delay: 5 ValidTargets: Trees DamageTypes: Incendiary - Warhead@6Res_areanuke: DestroyResource - Size: 5,4 - Delay: 4 - Warhead@7Smu_areanuke: LeaveSmudge - SmudgeType: Scorch - InvalidTargets: Vehicle, Tank, Structure, Wall, Trees - Size: 5,4 - Delay: 4 - Warhead@8Eff_areanuke: CreateEffect - ImpactSounds: kaboom22.aud - Delay: 4 MiniNuke: ValidTargets: Ground, Trees, Water, Underwater, Air From 6fe223ba0e0d881806f9890384580d05f68df864 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Dec 2016 00:15:30 +0100 Subject: [PATCH 3/3] Streamline cosmetic RA building explosions --- mods/ra/weapons/explosions.yaml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 5ca4b75507..963d406e20 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -111,17 +111,6 @@ UnitExplodeSmall: SmudgeType: Crater InvalidTargets: Structure, Wall, Trees -CivBuildingExplosion: - 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@Smu: LeaveSmudge - SmudgeType: Crater - InvalidTargets: Wall, Trees - ArtilleryExplode: Warhead@1Dam: SpreadDamage Spread: 426 @@ -156,11 +145,16 @@ BuildingExplode: InvalidTargets: Wall, Trees SmallBuildingExplode: + Inherits: BuildingExplode Warhead@2Eff: CreateEffect Explosions: building, building_napalm, large_explosion, self_destruct - Warhead@Smu: LeaveSmudge - SmudgeType: Crater - InvalidTargets: Wall, Trees + +CivBuildingExplosion: + Inherits: SmallBuildingExplode + Warhead@1Dam: SpreadDamage # Used to panic civilians which are emitted from a killed CivBuilding + Spread: 64 + Damage: 1 + Delay: 1 BarrelExplode: Warhead@1Dam: SpreadDamage