From 0b224d3cad53efa15c2c7635af8c81e0d07c3d7b Mon Sep 17 00:00:00 2001 From: "N.N" Date: Thu, 21 Jul 2022 15:14:49 +0200 Subject: [PATCH] Align D2k weapons to better match original Based on #20021 . Changes are inline with #17972 Revert "Align D2k weapons to better match original" This reverts commit d46e72e951cf839a17bd1b93d7626ffd41e61977. Revert "Align D2k weapons to better match original" This reverts commit d46e72e951cf839a17bd1b93d7626ffd41e61977. fix Ornithopter is not targetable Make Ornithopter targetable by ani-air units. Align D2k weapons to better match original Based on #20021 . Changes are inline with #17972 --- mods/d2k/rules/aircraft.yaml | 2 -- mods/d2k/weapons/largeguns.yaml | 16 ++++++---------- mods/d2k/weapons/smallguns.yaml | 5 ++--- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 7a030b32149f..ac0b19bf3e70 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -118,8 +118,6 @@ ornithopter: TurnSpeed: 8 Repulsable: False CruiseAltitude: 1920 - Targetable: - TargetTypes: Air AmmoPool: Ammo: 5 Tooltip: diff --git a/mods/d2k/weapons/largeguns.yaml b/mods/d2k/weapons/largeguns.yaml index 201e423475bd..43d37d3dfd0c 100644 --- a/mods/d2k/weapons/largeguns.yaml +++ b/mods/d2k/weapons/largeguns.yaml @@ -4,15 +4,15 @@ Report: MEDTANK1.WAV Projectile: Bullet Speed: 562 - Inaccuracy: 135 + Inaccuracy: 128 InaccuracyType: PerCellIncrement Image: 120mm Warhead@1Dam: SpreadDamage Damage: 2700 - Spread: 756 + Spread: 512 Falloff: 100, 0 Versus: - none: 30 + none: 20 wall: 50 building: 50 wood: 60 @@ -66,7 +66,7 @@ DevBullet: Damage: 6500 Spread: 1c0 Versus: - none: 65 + none: 50 wall: 100 building: 75 wood: 60 @@ -94,7 +94,7 @@ DevBullet: Image: 155mm Warhead@1Dam: SpreadDamage Damage: 4500 - Spread: 2c0 + Spread: 1c0 Versus: none: 125 wall: 100 @@ -105,11 +105,7 @@ DevBullet: invulnerable: 0 cy: 20 harvester: 25 - DamageTypes: Prone50Percent, ExplosionDeath - Warhead@proneeffect: TargetDamage - DamageTypes: TriggerProne - Damage: 1 - Spread: 1c512 + DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@4Concrete: DamagesConcrete Damage: 5625 Warhead@3Eff: CreateEffect diff --git a/mods/d2k/weapons/smallguns.yaml b/mods/d2k/weapons/smallguns.yaml index 2bcef29ad8b4..b3ae2814405e 100644 --- a/mods/d2k/weapons/smallguns.yaml +++ b/mods/d2k/weapons/smallguns.yaml @@ -3,19 +3,18 @@ Range: 2c512 Report: MGUN2.WAV Projectile: InstantHit - Inaccuracy: 135 + Inaccuracy: 128 InaccuracyType: PerCellIncrement Warhead@1Dam: SpreadDamage Damage: 1250 Spread: 480 Falloff: 100, 0 Versus: - none: 110 wall: 10 building: 25 wood: 75 light: 40 - heavy: 18 + heavy: 20 invulnerable: 0 cy: 20 harvester: 25