From 2036ed55d715fcad762faa00b0fce2fd01bd4f79 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 21:07:31 +0100 Subject: [PATCH 1/6] Remove air-only explosions from TS missiles The original didn't differentiate, and the audiovisual contrast is also a bit too strong (and the air explosion sound was a bit annoying). --- mods/ts/weapons/missiles.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index 69024553e3..ac3b4fab42 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -35,16 +35,12 @@ Warhead@2Eff: CreateEffect Explosions: small_clsn ImpactSounds: expnew12.aud - InvalidImpactTypes: Water, Air, AirHit + InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud ValidImpactTypes: Water - Warhead@4EffAir: CreateEffect - ValidImpactTypes: Air, AirHit - Explosions: tiny_twlt - ImpactSounds: expnew05.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater InvalidTargets: Vehicle, Building, Wall @@ -93,7 +89,6 @@ MammothTusk: ExplosionPalette: player ImpactSounds: ssplash3.aud ValidImpactTypes: Water - -Warhead@4EffAir: -Warhead@5Smu: BikeMissile: @@ -155,5 +150,4 @@ RedEye2: Explosions: large_grey_explosion ImpactSounds: expnew13.aud -Warhead@3EffWater: - -Warhead@4EffAir: -Warhead@5Smu: From bbff2b3fd40523948fc00c79c58d2ac9af36ee6d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 21:10:00 +0100 Subject: [PATCH 2/6] Remove unnecessary smudge warhead removals The smudge WH code now exits early when exploding above ground, so this is no longer necessary. Also renamed the default smudge WH identifier since the number is (currently) no longer correct and not necessary, either. --- mods/ts/weapons/missiles.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index ac3b4fab42..7f48228940 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -41,7 +41,7 @@ ExplosionPalette: player ImpactSounds: ssplash3.aud ValidImpactTypes: Water - Warhead@5Smu: LeaveSmudge + Warhead@Smu: LeaveSmudge SmudgeType: SmallCrater InvalidTargets: Vehicle, Building, Wall @@ -89,7 +89,6 @@ MammothTusk: ExplosionPalette: player ImpactSounds: ssplash3.aud ValidImpactTypes: Water - -Warhead@5Smu: BikeMissile: Inherits: ^DefaultMissile @@ -150,4 +149,3 @@ RedEye2: Explosions: large_grey_explosion ImpactSounds: expnew13.aud -Warhead@3EffWater: - -Warhead@5Smu: From a41cfc50a8d874570b721ff1566c6ddfcc7f9d0f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 21:11:05 +0100 Subject: [PATCH 3/6] Enable water splash for TS AA missile On the unlikely off chance that the missile might fall into water. --- mods/ts/weapons/missiles.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index 7f48228940..33896290c5 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -148,4 +148,3 @@ RedEye2: Warhead@2Eff: CreateEffect Explosions: large_grey_explosion ImpactSounds: expnew13.aud - -Warhead@3EffWater: From 68e45f7c6768bb715ae04dd18c2e99edb78c3efe Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 21:25:49 +0100 Subject: [PATCH 4/6] Rename TS largeguns.yaml to ballisticweapons.yaml --- mods/ts/mod.yaml | 2 +- mods/ts/weapons/{largeguns.yaml => ballisticweapons.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename mods/ts/weapons/{largeguns.yaml => ballisticweapons.yaml} (100%) diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index ad09963222..2f0b2d1542 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -89,7 +89,7 @@ Weapons: ts|weapons/energyweapons.yaml ts|weapons/explosions.yaml ts|weapons/healweapons.yaml - ts|weapons/largeguns.yaml + ts|weapons/ballisticweapons.yaml ts|weapons/missiles.yaml ts|weapons/otherweapons.yaml ts|weapons/smallguns.yaml diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/ballisticweapons.yaml similarity index 100% rename from mods/ts/weapons/largeguns.yaml rename to mods/ts/weapons/ballisticweapons.yaml From 489fb91f261b2a2a259510875e7ca0bd97cea5d6 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 21:31:20 +0100 Subject: [PATCH 5/6] Remove TS bombsandgrenades.yaml and move its weapons elsewhere Grenade and RPGTower weapon to ballisticweapons.yaml, Bomb to otherweapons.yaml --- mods/ts/mod.yaml | 3 +- mods/ts/weapons/ballisticweapons.yaml | 68 +++++++++++++++++ mods/ts/weapons/bombsandgrenades.yaml | 101 -------------------------- mods/ts/weapons/otherweapons.yaml | 34 +++++++++ 4 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 mods/ts/weapons/bombsandgrenades.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 2f0b2d1542..2703ec353e 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -85,11 +85,10 @@ Rules: ts|rules/bridges.yaml Weapons: - ts|weapons/bombsandgrenades.yaml + ts|weapons/ballisticweapons.yaml ts|weapons/energyweapons.yaml ts|weapons/explosions.yaml ts|weapons/healweapons.yaml - ts|weapons/ballisticweapons.yaml ts|weapons/missiles.yaml ts|weapons/otherweapons.yaml ts|weapons/smallguns.yaml diff --git a/mods/ts/weapons/ballisticweapons.yaml b/mods/ts/weapons/ballisticweapons.yaml index 4952792ca3..c2431047f6 100644 --- a/mods/ts/weapons/ballisticweapons.yaml +++ b/mods/ts/weapons/ballisticweapons.yaml @@ -130,3 +130,71 @@ Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater InvalidTargets: Vehicle, Building, Wall + +Grenade: + ReloadDelay: 60 + Range: 4c512 + Projectile: Bullet + Speed: 160 + Blockable: true + Shadow: true + LaunchAngle: 60 + Inaccuracy: 0 + Image: DISCUS + BounceCount: 2 + Warhead@1Dam: SpreadDamage + Spread: 192 + Damage: 40 + Versus: + None: 100 + Wood: 85 + Light: 70 + Heavy: 35 + Concrete: 28 + DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath + Warhead@2Eff: CreateEffect + Explosions: large_grey_explosion + ImpactSounds: expnew13.aud + InvalidImpactTypes: Water + Warhead@3EffWater: CreateEffect + Explosions: small_watersplash + ExplosionPalette: player + ImpactSounds: ssplash3.aud + ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater + InvalidTargets: Vehicle, Building, Wall + +RPGTower: + ReloadDelay: 80 + Range: 8c0 + Report: glnch4.aud + Projectile: Bullet + Speed: 384 + Blockable: false + Shadow: true + LaunchAngle: 62 + Image: canister + Palette: player + Warhead@1Dam: SpreadDamage + Spread: 128 + Damage: 110 + Versus: + None: 30 + Wood: 75 + Light: 90 + Heavy: 100 + Concrete: 70 + DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath + Warhead@2Eff: CreateEffect + Explosions: large_clsn + ImpactSounds: expnew14.aud + InvalidImpactTypes: Water + Warhead@3EffWater: CreateEffect + Explosions: small_watersplash + ExplosionPalette: player + ImpactSounds: ssplash2.aud + ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater + InvalidTargets: Vehicle, Building, Wall diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml deleted file mode 100644 index af18d215de..0000000000 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ /dev/null @@ -1,101 +0,0 @@ -Grenade: - ReloadDelay: 60 - Range: 4c512 - Projectile: Bullet - Speed: 160 - Blockable: true - Shadow: true - LaunchAngle: 60 - Inaccuracy: 0 - Image: DISCUS - BounceCount: 2 - Warhead@1Dam: SpreadDamage - Spread: 192 - Damage: 40 - Versus: - None: 100 - Wood: 85 - Light: 70 - Heavy: 35 - Concrete: 28 - DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath - Warhead@2Eff: CreateEffect - Explosions: large_grey_explosion - ImpactSounds: expnew13.aud - InvalidImpactTypes: Water - Warhead@3EffWater: CreateEffect - Explosions: small_watersplash - ExplosionPalette: player - ImpactSounds: ssplash3.aud - ValidImpactTypes: Water - Warhead@4Smu: LeaveSmudge - SmudgeType: MediumCrater - InvalidTargets: Vehicle, Building, Wall - -Bomb: - ReloadDelay: 60 - Burst: 5 - BurstDelay: 5 - Range: 2c0 - Projectile: GravityBomb - Speed: 170 - Image: 120mm - Shadow: true - Palette: ra - Warhead@1Dam: SpreadDamage - Spread: 298 - Damage: 160 - Versus: - None: 200 - Wood: 90 - Light: 75 - Heavy: 32 - Concrete: 100 - DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath - Warhead@2Eff: CreateEffect - Explosions: large_explosion - ExplosionPalette: effectalpha75 - ImpactSounds: expnew09.aud - InvalidImpactTypes: Water - Warhead@3EffWater: CreateEffect - Explosions: small_watersplash - ExplosionPalette: player - ImpactSounds: ssplash3.aud - ValidImpactTypes: Water - Warhead@4Smu: LeaveSmudge - SmudgeType: MediumCrater - InvalidTargets: Vehicle, Building, Wall - -RPGTower: - ReloadDelay: 80 - Range: 8c0 - Report: glnch4.aud - Projectile: Bullet - Speed: 384 - Blockable: false - Shadow: true - LaunchAngle: 62 - Image: canister - Palette: player - Warhead@1Dam: SpreadDamage - Spread: 128 - Damage: 110 - Versus: - None: 30 - Wood: 75 - Light: 90 - Heavy: 100 - Concrete: 70 - DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath - Warhead@2Eff: CreateEffect - Explosions: large_clsn - ImpactSounds: expnew14.aud - InvalidImpactTypes: Water - Warhead@3EffWater: CreateEffect - Explosions: small_watersplash - ExplosionPalette: player - ImpactSounds: ssplash2.aud - ValidImpactTypes: Water - Warhead@4Smu: LeaveSmudge - SmudgeType: MediumCrater - InvalidTargets: Vehicle, Building, Wall diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index bed9e5adfc..ce92133034 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -22,6 +22,40 @@ FireballLauncher: SmudgeType: SmallScorch InvalidTargets: Vehicle, Building, Wall +Bomb: + ReloadDelay: 60 + Burst: 5 + BurstDelay: 5 + Range: 2c0 + Projectile: GravityBomb + Speed: 170 + Image: 120mm + Shadow: true + Palette: ra + Warhead@1Dam: SpreadDamage + Spread: 298 + Damage: 160 + Versus: + None: 200 + Wood: 90 + Light: 75 + Heavy: 32 + Concrete: 100 + DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath + Warhead@2Eff: CreateEffect + Explosions: large_explosion + ExplosionPalette: effectalpha75 + ImpactSounds: expnew09.aud + InvalidImpactTypes: Water + Warhead@3EffWater: CreateEffect + Explosions: small_watersplash + ExplosionPalette: player + ImpactSounds: ssplash3.aud + ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater + InvalidTargets: Vehicle, Building, Wall + FiendShard: ReloadDelay: 30 Burst: 3 From d435cbc0c2cd343c8525adfd8f8efaa49a704cfe Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 11 Jan 2017 21:46:41 +0100 Subject: [PATCH 6/6] Fix Ion Cannon targeting to allow shooting at water --- mods/ts/weapons/superweapons.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index f85b9a7802..e47b17da34 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -56,19 +56,19 @@ SuicideBomb: Warhead@2Res: DestroyResource IonCannon: - ValidTargets: Ground, Air + ValidTargets: Ground, Water, Air Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 100 Falloff: 1000, 368, 135, 50, 18, 7, 0 - ValidTargets: Ground, Air + ValidTargets: Ground, Water, Air DamageTypes: Prone100Percent, TriggerProne, EnergyDeath Warhead@2Dam_area: SpreadDamage Spread: 1c0 Damage: 250 Falloff: 100, 50, 25, 0 Delay: 3 - ValidTargets: Ground, Air + ValidTargets: Ground, Water, Air DamageTypes: Prone50Percent, TriggerProne, EnergyDeath Warhead@3Smu_area: LeaveSmudge SmudgeType: SmallScorch