From 98fe3e6d65d054e084fd9ed85b8926b770466140 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 12 Apr 2014 01:47:51 +0200 Subject: [PATCH 1/6] Minor explosion weapon sound fixes --- mods/ra/weapons.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index d0496da575..4903d84390 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1092,7 +1092,7 @@ MiniNuke: Concrete: 25% Delay: 5 InfDeath: 5 - ImpactSound: kaboom22 + ImpactSound: kaboom22.aud Warhead@areanuke2: Damage: 600 Spread: 3c0 @@ -1126,6 +1126,7 @@ UnitExplode: WaterExplosion: large_splash InfDeath: 4 ImpactSound: kaboom22.aud + WaterImpactSound: splash9.aud UnitExplodeSmall: Warhead: From 4245766b8d2c9d57a61d4586963a6c919ab4f5dc Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 12 Apr 2014 01:48:43 +0200 Subject: [PATCH 2/6] Adds Explode weapons for ships and submarines --- mods/ra/weapons.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 4903d84390..47026b4ef8 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1128,6 +1128,34 @@ UnitExplode: ImpactSound: kaboom22.aud WaterImpactSound: splash9.aud +UnitExplodeShip: + Warhead: + Damage: 50 + Spread: 426 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: building + WaterExplosion: building + InfDeath: 4 + ImpactSound: kaboom25.aud + WaterImpactSound: kaboom25.aud + +UnitExplodeSubmarine: + Warhead: + Damage: 50 + Spread: 426 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + WaterExplosion: large_splash + InfDeath: 4 + WaterImpactSound: splash9.aud + UnitExplodeSmall: Warhead: Damage: 40 From ae700bf6bf12084139ea518d18fbb55fce1ee1c6 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 12 Apr 2014 01:49:33 +0200 Subject: [PATCH 3/6] Adds visible explosions to ships and submarines --- mods/ra/rules/ships.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 982a533697..ac40c194a1 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -47,6 +47,9 @@ SS: CloakTypes: Underwater Range: 4 RenderDetectionCircle: + Explodes: + Weapon: UnitExplodeSubmarine + EmpyWeapon: UnitExplodeSubmarine MSUB: Inherits: ^Ship @@ -97,6 +100,9 @@ MSUB: CloakTypes: Underwater Range: 4 RenderDetectionCircle: + Explodes: + Weapon: UnitExplode + EmpyWeapon: UnitExplode DD: Inherits: ^Ship @@ -144,6 +150,9 @@ DD: CloakTypes: Underwater Range: 4 RenderDetectionCircle: + Explodes: + Weapon: UnitExplodeShip + EmpyWeapon: UnitExplodeShip CA: Inherits: ^Ship @@ -203,6 +212,9 @@ CA: Chronoshiftable: IronCurtainable: RepairableNear: + Explodes: + Weapon: UnitExplodeShip + EmpyWeapon: UnitExplodeShip LST: Inherits: ^Ship @@ -233,6 +245,9 @@ LST: PipCount: 5 IronCurtainable: RepairableNear: + Explodes: + Weapon: UnitExplodeShip + EmpyWeapon: UnitExplodeShip PT: Inherits: ^Ship @@ -281,4 +296,7 @@ PT: CloakTypes: Underwater Range: 4 RenderDetectionCircle: + Explodes: + Weapon: UnitExplodeShip + EmpyWeapon: UnitExplodeShip From 87fa857a6071afc21b9e1fc76ef278531495f2c3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 12 Apr 2014 01:52:46 +0200 Subject: [PATCH 4/6] Adds Explosions to all vehicles that didn't have one. --- mods/ra/rules/vehicles.yaml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index dbcda00a1a..79e4a5516f 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -26,7 +26,7 @@ V2RL: AutoTarget: Explodes: Weapon: SCUD - EmptyWeapon: + EmptyWeapon: UnitExplodeSmall 1TNK: Inherits: ^Tank @@ -284,6 +284,9 @@ HARV: HarvesterHuskModifier: FullHuskActor: HARV.FullHusk FullnessThreshold: 50 + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall MCV: Inherits: ^Vehicle @@ -323,6 +326,9 @@ MCV: BaseBuilding: LeavesHusk: HuskActor: MCV.Husk + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall JEEP: Inherits: ^Vehicle @@ -360,6 +366,9 @@ JEEP: Types: Infantry MaxWeight: 1 PipCount: 1 + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall APC: Inherits: ^Tank @@ -393,6 +402,9 @@ APC: Types: Infantry MaxWeight: 5 PipCount: 5 + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall MNLY.AP: Inherits: ^Tank @@ -426,6 +438,8 @@ MNLY.AP: Range: 5 CloakTypes: Mine RenderDetectionCircle: + Explodes: + Weapon: APMine MNLY.AT: Inherits: ^Tank @@ -459,6 +473,8 @@ MNLY.AT: Range: 5 CloakTypes: Mine RenderDetectionCircle: + Explodes: + Weapon: ATMine TRUK: Inherits: ^Vehicle @@ -484,6 +500,9 @@ TRUK: RenderUnit: SupplyTruck: Payload: 500 + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall MGG: Inherits: ^Vehicle @@ -588,6 +607,9 @@ TTNK: Selectable: Bounds: 28,28,0,0 AutoTarget: + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall FTRK: Inherits: ^Vehicle @@ -695,6 +717,9 @@ CTNK: LocalYaw: -100 AttackFrontal: PortableChrono: + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall QTNK: Inherits: ^Tank @@ -772,4 +797,7 @@ STNK: UncloakOnUnload: True DetectCloaked: Range: 6 + Explodes: + Weapon: UnitExplodeSmall + EmpyWeapon: UnitExplodeSmall From 5576e72b6562164f47b1eaaf34f7c2fd051fe2e8 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 12 Apr 2014 12:10:43 +0200 Subject: [PATCH 5/6] Fix stupid typo, use UnitExplodeSubmarine for MSUB. --- mods/ra/rules/ships.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index ac40c194a1..89f19e1caa 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -49,7 +49,7 @@ SS: RenderDetectionCircle: Explodes: Weapon: UnitExplodeSubmarine - EmpyWeapon: UnitExplodeSubmarine + EmptyWeapon: UnitExplodeSubmarine MSUB: Inherits: ^Ship @@ -101,8 +101,8 @@ MSUB: Range: 4 RenderDetectionCircle: Explodes: - Weapon: UnitExplode - EmpyWeapon: UnitExplode + Weapon: UnitExplodeSubmarine + EmptyWeapon: UnitExplodeSubmarine DD: Inherits: ^Ship @@ -152,7 +152,7 @@ DD: RenderDetectionCircle: Explodes: Weapon: UnitExplodeShip - EmpyWeapon: UnitExplodeShip + EmptyWeapon: UnitExplodeShip CA: Inherits: ^Ship @@ -214,7 +214,7 @@ CA: RepairableNear: Explodes: Weapon: UnitExplodeShip - EmpyWeapon: UnitExplodeShip + EmptyWeapon: UnitExplodeShip LST: Inherits: ^Ship @@ -247,7 +247,7 @@ LST: RepairableNear: Explodes: Weapon: UnitExplodeShip - EmpyWeapon: UnitExplodeShip + EmptyWeapon: UnitExplodeShip PT: Inherits: ^Ship @@ -298,5 +298,5 @@ PT: RenderDetectionCircle: Explodes: Weapon: UnitExplodeShip - EmpyWeapon: UnitExplodeShip + EmptyWeapon: UnitExplodeShip From fd0d97e55dd1ef7dc69f55cc07c9d5ec5f417f66 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 12 Apr 2014 12:50:43 +0200 Subject: [PATCH 6/6] Fix typos in vehicles.yaml --- mods/ra/rules/vehicles.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 79e4a5516f..1fd2618b08 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -286,7 +286,7 @@ HARV: FullnessThreshold: 50 Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall MCV: Inherits: ^Vehicle @@ -328,7 +328,7 @@ MCV: HuskActor: MCV.Husk Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall JEEP: Inherits: ^Vehicle @@ -368,7 +368,7 @@ JEEP: PipCount: 1 Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall APC: Inherits: ^Tank @@ -404,7 +404,7 @@ APC: PipCount: 5 Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall MNLY.AP: Inherits: ^Tank @@ -502,7 +502,7 @@ TRUK: Payload: 500 Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall MGG: Inherits: ^Vehicle @@ -609,7 +609,7 @@ TTNK: AutoTarget: Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall FTRK: Inherits: ^Vehicle @@ -719,7 +719,7 @@ CTNK: PortableChrono: Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall QTNK: Inherits: ^Tank @@ -799,5 +799,5 @@ STNK: Range: 6 Explodes: Weapon: UnitExplodeSmall - EmpyWeapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall