From 3fb1ec91b8c82a45cf2f5df60fc354cd5f8fc8cf Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 22 Sep 2015 23:16:35 +0200 Subject: [PATCH 1/6] Tweak d2k armament offsets of some actors --- mods/d2k/rules/infantry.yaml | 4 ++-- mods/d2k/rules/vehicles.yaml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 80e3f525ea..0ffba70f92 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -65,7 +65,7 @@ trooper: Speed: 42 Armament: Weapon: Bazooka - LocalOffset: 0,0,555 + LocalOffset: 128,0,256 AttackFrontal: WithInfantryBody: AttackSequence: shoot @@ -156,8 +156,8 @@ grenadier: Mobile: Speed: 53 Armament: - LocalOffset: 0,0,555 Weapon: grenade + LocalOffset: 0,0,320 FireDelay: 15 AttackFrontal: WithInfantryBody: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 38f92308f8..b12206c9cd 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -223,8 +223,7 @@ missile_tank: Range: 9c0 Armament: Weapon: mtank_pri - LocalOffset: -213,128,171, -213,-256,171 - FireDelay: 15 + LocalOffset: -128,128,171, -128,-128,171 AttackFrontal: AutoTarget: InitialStance: Defend @@ -260,7 +259,7 @@ sonic_tank: Range: 6c0 Armament: Weapon: Sound - LocalOffset: 640,0,427 + LocalOffset: 600,0,427 AttackFrontal: AutoTarget: Explodes: From 03508c7bda700556305b892b273d8e97ef35f6f9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 22 Sep 2015 23:19:33 +0200 Subject: [PATCH 2/6] Fix d2k bazooka explosion to match original. --- mods/d2k/weapons.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 5df61ce710..854e5cbe96 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -57,7 +57,7 @@ Bazooka: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion + Explosion: tiny_explosion ImpactSound: EXPLSML1.WAV Fremen_S: From 63344aafcba2f8c4469426f8726b6d3584af3466 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 22 Sep 2015 23:25:02 +0200 Subject: [PATCH 3/6] Remove duplicate d2k explosion sequences, increase explosion tick, fix deviator explosion offset --- mods/d2k/sequences/misc.yaml | 19 +++---------------- mods/d2k/weapons.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index ee07d7f6ce..91b8d517af 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -1,13 +1,13 @@ explosion: Defaults: BlendMode: Additive + Tick: 80 piff: DATA.R8 Start: 3626 Length: 5 piffs: DATA.R8 Start: 3429 Length: 4 - Tick: 80 small_explosion: DATA.R8 Start: 3403 Length: 15 @@ -17,15 +17,9 @@ explosion: tiny_explosion: DATA.R8 Start: 3386 Length: 4 - Tick: 80 nuke: DATA.R8 Start: 3965 Length: 14 - Tick: 60 - mini_explosion: DATA.R8 - Start: 3403 - Length: 15 - Tick: 60 self_destruct: DATA.R8 Start: 3433 Length: 15 @@ -35,20 +29,12 @@ explosion: large_explosion: DATA.R8 Start: 3988 Length: 22 - artillery: DATA.R8 - Start: 3988 - Length: 22 - small_artillery: DATA.R8 - Start: 3390 - Length: 12 - Tick: 60 small_napalm: DATA.R8 Start: 3421 Length: 8 rocket_explosion: DATA.R8 Start: 3381 Length: 5 - Tick: 80 BlendMode: Alpha shockwave: DATA.R8 Start: 3687 @@ -58,7 +44,8 @@ explosion: Start: 3512 Length: 23 BlendMode: Alpha - Tick: 80 + Offset: 12, -10 + Tick: 120 corpse: DATA.R8 Start: 430 Length: 12 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 854e5cbe96..48ed20fe85 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -565,7 +565,7 @@ DeviatorMissile: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_artillery + Explosion: med_explosion ImpactSound: EXPLLG3.WAV Sound: @@ -645,7 +645,7 @@ OrniBomb: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery + Explosion: large_explosion ImpactSound: NAPALM1.WAV Crush: @@ -723,7 +723,7 @@ CrateExplosion: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: artillery + Explosion: large_explosion ImpactSound: EXPLSML4.WAV UnitExplodeSmall: @@ -738,7 +738,7 @@ UnitExplodeMed: UnitExplodeLarge: Warhead@1Eff: CreateEffect - Explosion: artillery + Explosion: large_explosion ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV grenade: From 1b39936e80341248a441e08ee4052f18b2f4f473 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 24 Sep 2015 14:19:36 +0200 Subject: [PATCH 4/6] Use both firing offsets for missile tank and missile tower Remove missile tank FireDelay. Fix Report of missile tank weapon. Fix and explosion animation of both missile weapons and use less audible explosion sound (had no sound at all in the original). --- mods/d2k/rules/vehicles.yaml | 2 +- mods/d2k/weapons.yaml | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index b12206c9cd..8f6a94b0cd 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -207,7 +207,7 @@ missile_tank: Cost: 1000 Tooltip: Name: Missile Tank - Description: Rocket Artillery\n Strong vs Vehicles, Buildings\n Weak vs Infantry, Aircraft + Description: Rocket Artillery\n Strong vs Vehicles, Buildings, Aircraft\n Weak vs Infantry Buildable: Queue: Armor Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre, ~techlevel.high diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 48ed20fe85..20d1be53c7 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -300,13 +300,15 @@ Rocket: TowerMissile: ReloadDelay: 60 + Burst: 2 + BurstDelay: 60 Range: 5c512 MinRange: 1c0 Report: ROCKET1.WAV ValidTargets: Ground, Air Projectile: Missile Blockable: false - Shadow: yes + Shadow: true RateOfTurn: 1 Inaccuracy: 384 Image: MISSILE2 @@ -333,8 +335,8 @@ TowerMissile: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLSML4.WAV + Explosion: small_explosion + ImpactSound: EXPLSML1.WAV 80mm_A: ReloadDelay: 50 @@ -455,8 +457,10 @@ DevBullet: mtank_pri: ReloadDelay: 115 + Burst: 2 + BurstDelay: 115 Range: 6c0 - Report: MISSLE1.WAV + Report: ROCKET1.WAV ValidTargets: Ground, Air Projectile: Missile Speed: 281 @@ -487,8 +491,8 @@ mtank_pri: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLSML4.WAV + Explosion: small_explosion + ImpactSound: EXPLSML1.WAV DeviatorMissile: ReloadDelay: 160 From 3ce18834ed1ae88a4d3cd95a8b4076fa1bc2d022 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 24 Sep 2015 14:20:03 +0200 Subject: [PATCH 5/6] Fix siege tank weapon explosion sound --- mods/d2k/weapons.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 20d1be53c7..2a0569a060 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -570,7 +570,7 @@ DeviatorMissile: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosion: med_explosion - ImpactSound: EXPLLG3.WAV + ImpactSound: EXPLMD2.WAV Sound: ReloadDelay: 90 From e8f18d2c3febe73a1a1c09ec76a059996a2b2bd3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 24 Sep 2015 14:20:29 +0200 Subject: [PATCH 6/6] Remove incorrect anti-air capability from quad rocket --- mods/d2k/weapons.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 2a0569a060..2be3edc573 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -232,7 +232,7 @@ Rocket: ReloadDelay: 30 Range: 3c512 Report: ROCKET1.WAV - ValidTargets: Ground, Air + ValidTargets: Ground Projectile: Missile Inaccuracy: 64 Image: RPG @@ -246,7 +246,7 @@ Rocket: Spread: 250 Falloff: 100, 95, 70, 50, 25, 5, 0 Damage: 250 - ValidTargets: Ground, Air + ValidTargets: Ground Versus: none: 25 wall: 100