From 87d5a17a18d24f18b6f3928f7763a4675133b5f1 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 22:13:09 +0100 Subject: [PATCH 01/10] Fix explosion sound, speed and angle of D2k grenade --- mods/d2k/weapons/other.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index cc0fdebaa1..082e963c3d 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -164,9 +164,9 @@ grenade: ReloadDelay: 50 Range: 4c0 Projectile: Bullet - Speed: 256 + Speed: 160 Blockable: false - LaunchAngle: 75 + LaunchAngle: 128 Inaccuracy: 416 Image: grenade Shadow: true @@ -188,7 +188,7 @@ grenade: InvalidTargets: Vehicle, Structure Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSounds: EXPLLG5.WAV + ImpactSounds: EXPLMD2.WAV GrenDeath: Warhead@1Dam: SpreadDamage From 84dedd4237da9725aaf36da20c3fbc5ac8ce4df9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 22:25:26 +0100 Subject: [PATCH 02/10] Only play explosion sound for Missile Tank and Tower in D2k But not on Bazooka and Quad's Rocket. --- mods/d2k/weapons/missiles.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml index 91bc1416de..3daaccee66 100644 --- a/mods/d2k/weapons/missiles.yaml +++ b/mods/d2k/weapons/missiles.yaml @@ -30,7 +30,6 @@ InvalidTargets: Vehicle, Structure Warhead@3Eff: CreateEffect Explosions: tiny_explosion - ImpactSounds: EXPLSML1.WAV ^Missile: Inherits: ^Rocket @@ -63,6 +62,7 @@ harvester: 50 Warhead@3Eff: CreateEffect Explosions: small_explosion + ImpactSounds: EXPLSML1.WAV Bazooka: Inherits: ^Rocket @@ -146,6 +146,7 @@ DeviatorMissile: Explosions: deviator ExplosionPalette: deviatorgas UsePlayerPalette: true + -ImpactSounds: Warhead@4OwnerChange: ChangeOwner Range: 512 Duration: 375 From c4fc8f55bce23c0d89f44b43d4d3f658d4408942 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 22:26:04 +0100 Subject: [PATCH 03/10] Make D2k large missile speeds consistent --- mods/d2k/weapons/missiles.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml index 3daaccee66..890ce77cfa 100644 --- a/mods/d2k/weapons/missiles.yaml +++ b/mods/d2k/weapons/missiles.yaml @@ -46,7 +46,7 @@ VerticalRateOfTurn: 10 Image: MISSILE2 TrailImage: large_trail - Speed: 320 + Speed: 288 Warhead@1Dam: SpreadDamage Spread: 256 Damage: 480 @@ -110,7 +110,6 @@ mtank_pri: Range: 6c0 ValidTargets: Ground, Air Projectile: Missile - Speed: 281 Inaccuracy: 96 RangeLimit: 7c204 Warhead@1Dam: SpreadDamage @@ -123,7 +122,6 @@ DeviatorMissile: Range: 5c0 Report: MISSLE1.WAV Projectile: Missile - Speed: 281 RangeLimit: 6c0 Image: MISSILE TrailImage: deviator_trail From 03a5e7ff4ecec1761bd77b14cd557159aa15746c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 22:28:55 +0100 Subject: [PATCH 04/10] Make Quad Rocket speed a multiple of 32 --- mods/d2k/weapons/missiles.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml index 890ce77cfa..327d600964 100644 --- a/mods/d2k/weapons/missiles.yaml +++ b/mods/d2k/weapons/missiles.yaml @@ -72,7 +72,7 @@ Rocket: ReloadDelay: 30 Range: 3c512 Projectile: Bullet - Speed: 343 + Speed: 352 Warhead@1Dam: SpreadDamage Spread: 160 Damage: 250 From 6745cf402dcbc2e62f4c5d29e9f74ffc07e4b8d4 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 22:50:29 +0100 Subject: [PATCH 05/10] Remove explosion sound from Fremen weapon --- mods/d2k/weapons/smallguns.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/d2k/weapons/smallguns.yaml b/mods/d2k/weapons/smallguns.yaml index f2cfdae662..32efbd0665 100644 --- a/mods/d2k/weapons/smallguns.yaml +++ b/mods/d2k/weapons/smallguns.yaml @@ -29,7 +29,6 @@ Fremen_S: Report: FREMODD1.WAV Warhead@2Eff: CreateEffect Explosions: small_explosion - ImpactSounds: EXPLSML2.WAV M_LMG: Inherits: ^MG From 9b34aa4d6bf21f274223b9d6a76ec73350763967 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 23:13:50 +0100 Subject: [PATCH 06/10] Set up D2k wall explosion --- mods/d2k/rules/structures.yaml | 6 +++--- mods/d2k/sequences/misc.yaml | 5 +++++ mods/d2k/weapons/other.yaml | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 95ce9899d3..d5b5eb8a9d 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -610,9 +610,6 @@ wall: BuildDuration: 54 BuildDurationModifier: 40 Description: Stop units and blocks enemy fire. - SoundOnDamageTransition: - DamagedSounds: - DestroyedSounds: EXPLSML4.WAV Valued: Cost: 20 CustomSellValue: @@ -649,6 +646,9 @@ wall: Sellable: SellSounds: CHUNG.WAV Guardable: + Explodes: + Weapon: WallExplode + EmptyWeapon: WallExplode ThrowsShrapnel: Weapons: Debris, Debris3 Pieces: 2, 2 diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index c1d1b7074d..ae50eb5b1c 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -52,6 +52,11 @@ explosion: Start: 430 Length: 12 Tick: 1600 + wall_explosion: DATA.R8 + Start: 4130 + Length: 8 + Tick: 120 + BlendMode: Alpha large_trail: idle: DATA.R8 diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index 082e963c3d..4a389eaa9a 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -160,6 +160,11 @@ BuildingExplode: Warhead@1Eff: CreateEffect Explosions: building, self_destruct, large_explosion +WallExplode: + Warhead@1Eff: CreateEffect + Explosions: wall_explosion + ImpactSounds: EXPLHG1.WAV + grenade: ReloadDelay: 50 Range: 4c0 From de6d45f9e546b4ccf7386df0031af61a8965146c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 14 Feb 2017 00:54:41 +0100 Subject: [PATCH 07/10] Fix BlendMode of previously unused D2k trails --- mods/d2k/sequences/misc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index ae50eb5b1c..4e12bcd779 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -71,6 +71,7 @@ small_trail: Start: 3988 Length: 4 Tick: 80 + BlendMode: Additive ZOffset: 1023 small_trail2: @@ -78,6 +79,7 @@ small_trail2: Start: 3793 Length: 4 Tick: 80 + BlendMode: Additive ZOffset: 1023 bazooka_trail: From 6cd6cedd2c4fd5788c1b44caebfb2edcefd9c3a0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 14 Feb 2017 01:51:39 +0100 Subject: [PATCH 08/10] Tweak D2k debris - Enabled shadow - reduced maximum speed - considerably increased 'launch angle' - increased bounce count to 3 and toned down BounceRangeModifier - reduced TrailInterval to 1 for Debris2 - removed explosion sounds to a) match original and b) make them less annoying - fixed debris explosion animations to match original - used different trail anim for Debris2 and Debris3 --- mods/d2k/weapons/debris.yaml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mods/d2k/weapons/debris.yaml b/mods/d2k/weapons/debris.yaml index 17d23ccd32..c6b584b423 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -2,13 +2,14 @@ Debris: ReloadDelay: 60 Range: 2c768 Projectile: Bullet - Speed: 32, 96 + Speed: 32, 64 Blockable: false - LaunchAngle: 30, 90 + LaunchAngle: 128, 192 Inaccuracy: 1c256 Image: shrapnel - BounceCount: 2 - BounceRangeModifier: 10 + Shadow: true + BounceCount: 3 + BounceRangeModifier: 20 Warhead@1Dam: SpreadDamage Spread: 320 Falloff: 100, 60, 30, 15, 0 @@ -29,16 +30,15 @@ Debris: SmudgeType: SandCrater InvalidTargets: Vehicle, Structure Warhead@3Eff: CreateEffect - Explosions: small_explosion - ImpactSounds: EXPLLG5.WAV + Explosions: tiny_explosion Debris2: Inherits: Debris Projectile: Bullet Image: shrapnel2 - TrailImage: bazooka_trail + TrailImage: small_trail TrailPalette: effect75alpha - TrailInterval: 2 + TrailInterval: 1 Warhead@1Dam: SpreadDamage Damage: 250 Versus: @@ -54,15 +54,13 @@ Debris2: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@3Eff: CreateEffect - Explosions: med_explosion - ImpactSounds: EXPLLG5.WAV + Explosions: small_napalm Debris3: Inherits: Debris2 Projectile: Bullet Image: shrapnel3 - TrailImage: large_trail - TrailInterval: 1 + TrailImage: small_trail2 Warhead@1Dam: SpreadDamage Damage: 150 @@ -71,6 +69,3 @@ Debris4: Projectile: Bullet Image: shrapnel4 TrailImage: large_trail - TrailInterval: 1 - Warhead@3Eff: CreateEffect - Explosions: large_explosion From 8dd66b41c26b1a6e479d473f56ec216a608591e9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 14 Feb 2017 01:53:54 +0100 Subject: [PATCH 09/10] Fix D2k Wall debris count and types Two debris, of which one is large, matches the original. Also made max range match weapon range. --- mods/d2k/rules/structures.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index d5b5eb8a9d..97a34641e3 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -650,9 +650,9 @@ wall: Weapon: WallExplode EmptyWeapon: WallExplode ThrowsShrapnel: - Weapons: Debris, Debris3 - Pieces: 2, 2 - Range: 2c0, 4c0 + Weapons: Debris2, Debris3 + Pieces: 1, 1 + Range: 1c512, 2c768 medium_gun_turret: Inherits: ^Defense From 2dcd920af5f9fe9b267d9f33f14cf9ec0b454235 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 14 Feb 2017 01:55:12 +0100 Subject: [PATCH 10/10] Fix D2k wall armor type TibEd said 'none', but that can't be true, as in the original anti-tank weapons are far more effective versus walls than machine guns, so I decided to just use the wall armor type. --- mods/d2k/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 97a34641e3..9ea9ccbeac 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -627,7 +627,7 @@ wall: TopLeft: -512, -512 BottomRight: 512, 512 Armor: - Type: none + Type: wall RevealsShroud: Range: 2c768 Crushable: