From 6d24006a7fe2de58d9d134bb3b7f09f77f918ebf Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 02:03:22 +0200 Subject: [PATCH 01/12] Changed d2k infantry HP to their original values --- mods/d2k/rules/infantry.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index c3ceeba11e..c061b37f4f 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -9,7 +9,7 @@ light_inf: Name: Light Infantry Description: General-purpose infantry\n Strong vs Infantry\n Weak vs Vehicles, Artillery Health: - HP: 50 + HP: 600 Mobile: Speed: 53 Armament: @@ -32,7 +32,7 @@ engineer: Name: Engineer Description: Infiltrates and captures enemy structures\n Strong vs Buildings\n Weak vs Everything Health: - HP: 25 + HP: 500 Mobile: Speed: 53 Passenger: @@ -60,7 +60,7 @@ trooper: Name: Trooper Description: Anti-tank/Anti-aircraft infantry\n Strong vs Tanks, Aircraft\n Weak vs Infantry, Artillery Health: - HP: 45 + HP: 700 Mobile: Speed: 42 Armament: @@ -84,7 +84,7 @@ medic: Name: Medic Description: Heals nearby infantry\n Strong vs Nothing\n Weak vs Everything Health: - HP: 60 + HP: 375 Mobile: Speed: 42 AutoHeal: @@ -117,10 +117,10 @@ fremen: Mobile: Speed: 53 Health: - HP: 70 - Passenger: + HP: 700 RevealsShroud: Range: 7c0 + Passenger: AutoTarget: ScanRadius: 7 Armament@PRIMARY: @@ -152,7 +152,7 @@ grenadier: Name: Grenadier Description: Infantry armed with grenades. \n Strong vs Buildings, Infantry\n Weak vs Vehicles Health: - HP: 50 + HP: 600 Mobile: Speed: 53 Armament: @@ -181,7 +181,7 @@ sardaukar: Name: Sardaukar Description: Elite assault infantry\n Strong vs Infantry, Vehicles\n Weak vs Artillery Health: - HP: 100 + HP: 1000 Mobile: Speed: 42 RevealsShroud: @@ -210,7 +210,7 @@ saboteur: Name: Saboteur Description: Sneaky infantry, armed with explosives\n Strong vs Buildings\n Weak vs Everything\n Special Ability: destroy buildings Health: - HP: 100 + HP: 400 Mobile: Speed: 64 RevealsShroud: From 98137c514e30a61c0e5cde5c9c0005ca1689a882 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 02:06:32 +0200 Subject: [PATCH 02/12] Changed d2k structure HP and armor types to their original values --- mods/d2k/rules/structures.yaml | 64 +++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index cdc6a51342..c9bc3854f3 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -49,9 +49,9 @@ construction_yard: Selectable: Bounds: 96,64 Health: - HP: 1000 + HP: 3000 Armor: - Type: Concrete + Type: cy RevealsShroud: Range: 10c0 Production: @@ -94,9 +94,9 @@ wind_trap: Dimensions: 2,2 Bib: Health: - HP: 400 + HP: 3000 Armor: - Type: Wood + Type: building RevealsShroud: Range: 4c0 RenderSprites: @@ -129,9 +129,9 @@ barracks: Dimensions: 2,2 Bib: Health: - HP: 800 + HP: 3200 Armor: - Type: Wood + Type: wood RevealsShroud: Range: 5c0 RallyPoint: @@ -185,9 +185,9 @@ refinery: Dimensions: 3,2 Bib: Health: - HP: 900 + HP: 3000 Armor: - Type: Wood + Type: building RevealsShroud: Range: 6c0 Refinery: @@ -236,9 +236,9 @@ silo: Adjacent: 4 -GivesBuildableArea: Health: - HP: 300 + HP: 1500 Armor: - Type: Wood + Type: wall RevealsShroud: Range: 4c0 RenderSprites: @@ -276,9 +276,9 @@ light_factory: Dimensions: 3,2 Bib: Health: - HP: 750 + HP: 3300 Armor: - Type: Wood + Type: light RevealsShroud: Range: 4c0 RenderSprites: @@ -333,9 +333,9 @@ heavy_factory: Dimensions: 3,3 Bib: Health: - HP: 1500 + HP: 3500 Armor: - Type: Wood + Type: wood RevealsShroud: Range: 4c0 RallyPoint: @@ -396,9 +396,9 @@ outpost: Dimensions: 3,2 Bib: Health: - HP: 1000 + HP: 3500 Armor: - Type: Wood + Type: light RevealsShroud: Range: 10c0 ProvidesRadar: @@ -434,9 +434,9 @@ starport: Selectable: Bounds: 96,64 Health: - HP: 1000 + HP: 3500 Armor: - Type: Wood + Type: building RevealsShroud: Range: 7c0 RallyPoint: @@ -499,9 +499,9 @@ wall: Adjacent: 7 TerrainTypes: Rock, Concrete Health: - HP: 300 + HP: 2000 Armor: - Type: Concrete + Type: none Crushable: CrushClasses: Concretewall BlocksProjectiles: @@ -542,9 +542,9 @@ medium_gun_turret: Bounds: 32,32 Priority: 3 Health: - HP: 400 + HP: 2700 Armor: - Type: Concrete + Type: heavy RevealsShroud: Range: 8c0 BodyOrientation: @@ -584,9 +584,9 @@ large_gun_turret: Bounds: 32,32 Priority: 3 Health: - HP: 400 + HP: 3000 Armor: - Type: Concrete + Type: concrete RevealsShroud: Range: 10c0 BodyOrientation: @@ -622,9 +622,9 @@ repair_pad: Footprint: =x= =x= === Dimensions: 3,3 Health: - HP: 500 + HP: 3000 Armor: - Type: Concrete + Type: building RevealsShroud: Range: 5c0 Selectable: @@ -672,9 +672,9 @@ high_tech_factory: Dimensions: 3,3 Bib: Health: - HP: 1500 + HP: 3500 Armor: - Type: Wood + Type: wood RevealsShroud: Range: 4c0 RenderSprites: @@ -722,9 +722,9 @@ research_centre: Dimensions: 3,3 Bib: Health: - HP: 1000 + HP: 2500 Armor: - Type: Wood + Type: wood RevealsShroud: Range: 4c0 RenderSprites: @@ -759,9 +759,9 @@ palace: Bib: HasMinibib: True Health: - HP: 2000 + HP: 4000 Armor: - Type: Wood + Type: wood RevealsShroud: Range: 8c0 RenderSprites: From 472191c6342b851a1d29a7f3594e73d530884afd Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 02:08:45 +0200 Subject: [PATCH 03/12] Changed d2k vehicle HP and armor types to their original values --- mods/d2k/rules/vehicles.yaml | 48 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index a18ce8e412..a6b9233524 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -13,9 +13,9 @@ mcv: Class: mcv Priority: 3 Health: - HP: 800 + HP: 4500 Armor: - Type: Light + Type: light Mobile: Speed: 64 Crushes: crate, infantry @@ -64,9 +64,9 @@ harvester: SearchFromProcRadius: 24 SearchFromOrderRadius: 12 Health: - HP: 1000 + HP: 4500 Armor: - Type: Heavy + Type: harvester Mobile: Speed: 64 Crushes: crate, infantry @@ -99,9 +99,9 @@ trike: Selectable: Class: trike Health: - HP: 100 + HP: 900 Armor: - Type: Light + Type: wood Mobile: ROT: 10 Speed: 128 @@ -132,9 +132,9 @@ quad: Name: Missile Quad Description: Missile Scout\n Strong vs Vehicles\n Weak vs Infantry Health: - HP: 125 + HP: 1100 Armor: - Type: Light + Type: light Mobile: ROT: 8 Speed: 96 @@ -165,9 +165,9 @@ siege_tank: Name: Siege Tank Description: Siege Artillery\n Strong vs Infantry, Buildings\n Weak vs Tanks, Aircraft Health: - HP: 120 + HP: 1200 Armor: - Type: Heavy + Type: light Mobile: Speed: 53 ROT: 3 @@ -213,9 +213,9 @@ missile_tank: Speed: 64 ROT: 5 Health: - HP: 90 + HP: 1300 Armor: - Type: Light + Type: wood RevealsShroud: Range: 9c0 Armament: @@ -247,9 +247,9 @@ sonic_tank: Name: Sonic Tank Description: Fires sonic shocks\n Strong vs Infantry, Vehicles\n Weak vs Artillery, Aircraft Health: - HP: 130 + HP: 3000 Armor: - Type: Light + Type: light Mobile: ROT: 3 Speed: 74 @@ -280,9 +280,9 @@ devastator: Name: Devastator Description: Super Heavy Tank\n Strong vs Tanks\n Weak vs Artillery, Aircraft Health: - HP: 650 + HP: 5000 Armor: - Type: Heavy + Type: heavy Mobile: ROT: 3 Speed: 42 @@ -319,9 +319,9 @@ raider: Name: Raider Trike Description: Improved Scout\n Strong vs Infantry, Light Vehicles Health: - HP: 110 + HP: 1000 Armor: - Type: Light + Type: wood Mobile: ROT: 10 Speed: 149 @@ -375,9 +375,9 @@ deviator: ROT: 3 Speed: 64 Health: - HP: 125 + HP: 1100 Armor: - Type: Light + Type: wood RevealsShroud: Range: 5c0 Armament: @@ -405,9 +405,9 @@ deviator: Name: Combat Tank Description: Main Battle Tank\n Strong vs Tanks\n Weak vs Infantry, Aircraft\n \n Atreides: +Range\n Harkonnen: +Health\n Ordos: +Speed Health: - HP: 350 + HP: 2100 Armor: - Type: Heavy + Type: heavy Mobile: Speed: 64 ROT: 6 @@ -458,7 +458,7 @@ combat_tank_h: RevealsShroud: Range: 7c0 Health: - HP: 440 + HP: 2700 SpawnActorOnDeath: Actor: combat_tank_h.husk @@ -474,6 +474,8 @@ combat_tank_o: Speed: 96 ROT: 8 Crushes: crate, infantry + Health: + HP: 1800 SpawnActorOnDeath: Actor: combat_tank_o.husk From 4d850815770308179f561be04666357c61512a94 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 14:48:43 +0200 Subject: [PATCH 04/12] D2k weapon changes to reload, burst and range --- mods/d2k/weapons.yaml | 100 ++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 57 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index fd32279ddc..7a2156e6ef 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -1,6 +1,6 @@ LMG: - ReloadDelay: 20 - Range: 5c0 + ReloadDelay: 30 + Range: 2c512 Report: MGUN2.WAV Projectile: Bullet Speed: 1c256 @@ -21,10 +21,9 @@ LMG: Explosion: piffs Bazooka: - ReloadDelay: 50 - Range: 5c0 - MinRange: 0c512 - Report: BAZOOK1.WAV + ReloadDelay: 40 + Range: 3c0 + Report: ROCKET1.WAV ValidTargets: Ground Projectile: Missile Speed: 160 @@ -54,8 +53,8 @@ Bazooka: ImpactSound: EXPLSML1.WAV Fremen_S: - ReloadDelay: 100 - Range: 8c512 + ReloadDelay: 40 + Range: 2c512 Report: FREMODD1.WAV ValidTargets: Ground, Infantry InvalidTargets: Vehicle, Structure, Wall @@ -72,9 +71,9 @@ Fremen_S: DamageTypes: Prone50Percent, TriggerProne, BulletDeath M_LMG: - ReloadDelay: 30 - Range: 5c768 - Report: VULCAN.AUD + ReloadDelay: 40 + Range: 2c512 + Report: MGUN2.WAV InvalidTargets: Structure Projectile: Bullet Speed: 1c256 @@ -94,9 +93,8 @@ M_LMG: Explosion: piffs M_HMG: - ReloadDelay: 10 - Range: 5c0 - MinRange: 1c0 + ReloadDelay: 40 + Range: 3c512 Report: 20MMGUN1.WAV Projectile: Bullet Speed: 1c256 @@ -114,9 +112,9 @@ M_HMG: Explosion: piffs Fremen_L: - ReloadDelay: 60 + ReloadDelay: 40 Delay: 5 - Range: 5c512 + Range: 3c512 Report: BAZOOK2.WAV InvalidTargets: Infantry Projectile: Bullet @@ -141,10 +139,8 @@ Fremen_L: ImpactSound: EXPLLG5.WAV HMG: - ReloadDelay: 30 - Range: 5c0 - Burst: 2 - BurstDelay: 5 + ReloadDelay: 20 + Range: 3c0 Report: 20MMGUN1.WAV Projectile: Bullet Speed: 1c256 @@ -165,10 +161,8 @@ HMG: Explosion: piffs HMGo: - ReloadDelay: 30 - Range: 5c0 - Burst: 2 - BurstDelay: 5 + ReloadDelay: 18 + Range: 3c0 Report: 20MMGUN1.WAV Projectile: Bullet Speed: 1c256 @@ -189,10 +183,8 @@ HMGo: Explosion: piffs Rocket: - ReloadDelay: 40 - Burst: 2 - BurstDelay: 25 - Range: 7c0 + ReloadDelay: 30 + Range: 3c512 Report: ROCKET1.WAV ValidTargets: Ground, Air Projectile: Missile @@ -224,7 +216,7 @@ Rocket: 110mm_Gun: ReloadDelay: 35 - Range: 7c0 + Range: 5c0 Report: TURRET1.WAV Projectile: Bullet Speed: 704 @@ -248,13 +240,11 @@ Rocket: ImpactSound: EXPLSML4.WAV TowerMissile: - ReloadDelay: 35 - Range: 7c768 + ReloadDelay: 60 + Range: 5c512 MinRange: 1c0 Report: ROCKET1.WAV ValidTargets: Ground, Air - Burst: 2 - BurstDelay: 15 Projectile: Bullet Blockable: false Shadow: yes @@ -283,7 +273,7 @@ TowerMissile: 80mm_A: ReloadDelay: 50 - Range: 5c768 + Range: 4c0 Report: MEDTANK1.WAV Projectile: Bullet Speed: 640 @@ -305,8 +295,8 @@ TowerMissile: ImpactSound: EXPLSML4.WAV 80mm_H: - ReloadDelay: 50 - Range: 7c0 + ReloadDelay: 55 + Range: 4c0 Report: MEDTANK1.WAV Projectile: Bullet Speed: 704 @@ -328,8 +318,8 @@ TowerMissile: ImpactSound: EXPLSML4.WAV 80mm_O: - ReloadDelay: 50 - Range: 5c768 + ReloadDelay: 45 + Range: 4c0 Report: MEDTANK1.WAV Projectile: Bullet Speed: 704 @@ -351,8 +341,8 @@ TowerMissile: ImpactSound: EXPLSML4.WAV DevBullet: - ReloadDelay: 50 - Range: 5c0 + ReloadDelay: 75 + Range: 4c0 Report: TANKHVY1.WAV Projectile: Bullet Speed: 640 @@ -373,11 +363,8 @@ DevBullet: Explosion: shockwave 227mm: - ReloadDelay: 100 - Range: 10c0 - MinRange: 4c0 - Burst: 4 - BurstDelay: 15 + ReloadDelay: 115 + Range: 6c0 Report: MISSLE1.WAV ValidTargets: Ground Projectile: Bullet @@ -407,8 +394,8 @@ DevBullet: ImpactSound: EXPLMD3.WAV DeviatorMissile: - ReloadDelay: 120 - Range: 8c0 + ReloadDelay: 160 + Range: 5c0 Report: MISSLE1.WAV InvalidTargets: Infantry, Structure Projectile: Bullet @@ -439,9 +426,8 @@ DeviatorMissile: Duration: 750 155mm: - ReloadDelay: 75 - Range: 8c0 - MinRange: 2c0 + ReloadDelay: 80 + Range: 5c512 Report: MORTAR1.WAV Projectile: Bullet Speed: 256 @@ -468,8 +454,8 @@ DeviatorMissile: ImpactSound: EXPLLG3.WAV Sound: - ReloadDelay: 100 - Range: 8c512 + ReloadDelay: 90 + Range: 5c0 Report: SONIC1.WAV Projectile: LaserZap BeamWidth: 2 @@ -500,15 +486,17 @@ Heal: WormJaw: ReloadDelay: 10 - Range: 3c0 InvalidTargets: Structure + Range: 1c512 Warhead@1Dam: SpreadDamage Spread: 160 Damage: 100 InvalidTargets: Structure OrniBomb: - ReloadDelay: 2 + ReloadDelay: 25 + Burst: 5 + BurstDelay: 3 Range: 3c0 Projectile: GravityBomb Image: BOMBS @@ -635,9 +623,8 @@ UnitExplodeLarge: ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV grenade: - ReloadDelay: 60 + ReloadDelay: 50 Range: 4c0 - Report: Projectile: Bullet Speed: 204 Blockable: false @@ -667,7 +654,6 @@ Weathering: Shrapnel: ReloadDelay: 60 Range: 4c0 - Report: Projectile: Bullet Speed: 50, 125 Blockable: false From 0ce36b66484309b4401ede8ed3011a9b570aaced Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 14:53:54 +0200 Subject: [PATCH 05/12] D2k weapon projectile changes speed, trails, rate of turn, projectile type etc. --- mods/d2k/weapons.yaml | 97 ++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 62 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 7a2156e6ef..7d8d139aef 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -4,10 +4,6 @@ LMG: Report: MGUN2.WAV Projectile: Bullet Speed: 1c256 - ContrailLength: 3 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true Warhead@1Dam: SpreadDamage Spread: 96 Damage: 15 @@ -26,12 +22,11 @@ Bazooka: Report: ROCKET1.WAV ValidTargets: Ground Projectile: Missile - Speed: 160 - Arm: 2 - Inaccuracy: 96 + Speed: 281 + Inaccuracy: 64 Image: RPG - RateOfTurn: 5 - Trail: bazooka_trail + RateOfTurn: 1 + Trail: bazooka_trail2 TrailPalette: effect75alpha TrailInterval: 1 RangeLimit: 35 @@ -59,11 +54,7 @@ Fremen_S: ValidTargets: Ground, Infantry InvalidTargets: Vehicle, Structure, Wall Projectile: Bullet - Speed: 1c896 - ContrailLength: 6 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true + Speed: 1c256 Warhead@1Dam: SpreadDamage Spread: 32 Damage: 60 @@ -77,10 +68,6 @@ M_LMG: InvalidTargets: Structure Projectile: Bullet Speed: 1c256 - ContrailLength: 3 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true Warhead@1Dam: SpreadDamage Spread: 96 Damage: 30 @@ -98,7 +85,6 @@ M_HMG: Report: 20MMGUN1.WAV Projectile: Bullet Speed: 1c256 - Blockable: false Warhead@1Dam: SpreadDamage Spread: 96 Damage: 20 @@ -118,12 +104,7 @@ Fremen_L: Report: BAZOOK2.WAV InvalidTargets: Infantry Projectile: Bullet - Speed: 320 - Blockable: false - Shadow: yes - Angle: 88 - Inaccuracy: 384 - Image: MISSILE + Speed: 1c256 Warhead@1Dam: SpreadDamage Spread: 192 Damage: 30 @@ -144,10 +125,6 @@ HMG: Report: 20MMGUN1.WAV Projectile: Bullet Speed: 1c256 - ContrailLength: 3 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true Warhead@1Dam: SpreadDamage Spread: 96 Damage: 30 @@ -166,10 +143,6 @@ HMGo: Report: 20MMGUN1.WAV Projectile: Bullet Speed: 1c256 - ContrailLength: 3 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true Warhead@1Dam: SpreadDamage Spread: 96 Damage: 40 @@ -188,14 +161,13 @@ Rocket: Report: ROCKET1.WAV ValidTargets: Ground, Air Projectile: Missile - Arm: 0 - Inaccuracy: 96 + Inaccuracy: 64 Image: RPG - RateOfTurn: 10 + RateOfTurn: 0 Trail: bazooka_trail2 TrailPalette: effect75alpha TrailInterval: 1 - Speed: 256 + Speed: 343 RangeLimit: 40 Warhead@1Dam: SpreadDamage Spread: 96 @@ -219,10 +191,10 @@ Rocket: Range: 5c0 Report: TURRET1.WAV Projectile: Bullet - Speed: 704 + Speed: 875 Blockable: false Shadow: no - Inaccuracy: 288 + Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage Spread: 256 @@ -245,15 +217,15 @@ TowerMissile: MinRange: 1c0 Report: ROCKET1.WAV ValidTargets: Ground, Air - Projectile: Bullet + Projectile: Missile Blockable: false Shadow: yes + RateOfTurn: 1 Inaccuracy: 384 Image: MISSILE2 Trail: large_trail TrailInterval: 1 - Speed: 298 - Angle: 90 + Speed: 320 Warhead@1Dam: SpreadDamage Spread: 384 Damage: 50 @@ -276,8 +248,8 @@ TowerMissile: Range: 4c0 Report: MEDTANK1.WAV Projectile: Bullet - Speed: 640 - Inaccuracy: 384 + Speed: 562 + Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage Spread: 256 @@ -299,8 +271,8 @@ TowerMissile: Range: 4c0 Report: MEDTANK1.WAV Projectile: Bullet - Speed: 704 - Inaccuracy: 352 + Speed: 562 + Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage Spread: 256 @@ -322,8 +294,8 @@ TowerMissile: Range: 4c0 Report: MEDTANK1.WAV Projectile: Bullet - Speed: 704 - Inaccuracy: 352 + Speed: 562 + Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage Spread: 256 @@ -345,7 +317,8 @@ DevBullet: Range: 4c0 Report: TANKHVY1.WAV Projectile: Bullet - Speed: 640 + Speed: 281 + Blockable: true Image: doubleblastbullet Warhead@1Dam: SpreadDamage Spread: 256 @@ -367,12 +340,12 @@ DevBullet: Range: 6c0 Report: MISSLE1.WAV ValidTargets: Ground - Projectile: Bullet - Speed: 320 + Projectile: Missile + Speed: 281 + RateOfTurn: 3 Blockable: false Shadow: yes - Inaccuracy: 1c416 - Angle: 90 + Inaccuracy: 96 Image: MISSILE2 Trail: large_trail TrailInterval: 1 @@ -398,12 +371,12 @@ DeviatorMissile: Range: 5c0 Report: MISSLE1.WAV InvalidTargets: Infantry, Structure - Projectile: Bullet - Speed: 384 + Projectile: Missile + Speed: 281 Blockable: false Shadow: yes - Angle: 90 - Inaccuracy: 1c96 + RateofTurn: 1 + Inaccuracy: 256 Image: MISSILE Trail: deviator_trail TrailPalette: deviatorgas @@ -430,11 +403,11 @@ DeviatorMissile: Range: 5c512 Report: MORTAR1.WAV Projectile: Bullet - Speed: 256 + Speed: 192 Blockable: false Shadow: yes Angle: 62 - Inaccuracy: 1c256 + Inaccuracy: 768 ContrailLength: 20 Image: 155mm Warhead@1Dam: SpreadDamage @@ -458,8 +431,7 @@ Sound: Range: 5c0 Report: SONIC1.WAV Projectile: LaserZap - BeamWidth: 2 - HitAnim: laserfire + BeamWidth: 10 BeamDuration: 8 UsePlayerColor: true Warhead@1Dam: SpreadDamage @@ -626,11 +598,12 @@ grenade: ReloadDelay: 50 Range: 4c0 Projectile: Bullet - Speed: 204 + Speed: 256 Blockable: false Angle: 62 Inaccuracy: 416 Image: BOMBS + Shadow: true Warhead@1Dam: SpreadDamage Spread: 192 Damage: 60 From 03413b98758ecef10052be51a7629333a3fb7c78 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 15:01:43 +0200 Subject: [PATCH 06/12] D2k weapon warhead changes --- mods/d2k/sequences/misc.yaml | 5 + mods/d2k/weapons.yaml | 581 ++++++++++++++++++++++------------- 2 files changed, 374 insertions(+), 212 deletions(-) diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index 193568d2d5..bb25bd1213 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -45,6 +45,11 @@ explosion: 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 Length: 6 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 7d8d139aef..7c3eecbaca 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -5,13 +5,20 @@ LMG: Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 15 + Spread: 48 + Falloff: 100, 100, 65, 30, 0 + Damage: 125 Versus: - Wood: 25 - Light: 40 - Heavy: 10 - Concrete: 20 + none: 100 + wall: 10 + building: 25 + wood: 75 + light: 40 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosion: piffs @@ -31,15 +38,21 @@ Bazooka: TrailInterval: 1 RangeLimit: 35 Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 50 + Spread: 250 + Falloff: 100, 95, 70, 50, 25, 5, 0 + Damage: 300 ValidTargets: Ground Versus: - None: 10 - Wood: 75 - Light: 60 - Heavy: 90 - Concrete: 40 + none: 8 + wall: 75 + building: 40 + wood: 45 + light: 70 + heavy: 100 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater @@ -56,10 +69,24 @@ Fremen_S: Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage - Spread: 32 - Damage: 60 - ValidTargets: Infantry + Spread: 48 + Falloff: 100, 100, 65, 30, 0 + Damage: 125 + Versus: + none: 100 + wall: 10 + building: 25 + wood: 75 + light: 40 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath + Warhead@2Eff: CreateEffect + Explosion: small_explosion + ImpactSound: EXPLSML2.WAV M_LMG: ReloadDelay: 40 @@ -69,12 +96,21 @@ M_LMG: Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 30 - InvalidTargets: Structure + Spread: 48 + Falloff: 100, 100, 65, 30, 0 + Damage: 125 + ValidTargets: Ground Versus: - Light: 60 - Heavy: 10 + none: 100 + wall: 10 + building: 25 + wood: 75 + light: 40 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosion: piffs @@ -86,13 +122,20 @@ M_HMG: Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 20 + Spread: 48 + Falloff: 100, 100, 65, 30, 0 + Damage: 250 Versus: - Wood: 50 - Light: 60 - Heavy: 25 - Concrete: 25 + none: 25 + wall: 100 + building: 50 + wood: 65 + light: 100 + heavy: 50 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosion: piffs @@ -106,18 +149,24 @@ Fremen_L: Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage - Spread: 192 - Damage: 30 - InvalidTargets: Infantry + Spread: 64 + Falloff: 100, 100, 65, 30, 0 + Damage: 250 + ValidTargets: Ground Versus: - Wood: 75 - Light: 40 - Heavy: 90 - Concrete: 50 + none: 25 + wall: 100 + building: 50 + wood: 65 + light: 100 + heavy: 50 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosion: small_explosion - ImpactSound: EXPLLG5.WAV HMG: ReloadDelay: 20 @@ -127,12 +176,19 @@ HMG: Speed: 1c256 Warhead@1Dam: SpreadDamage Spread: 96 - Damage: 30 + Falloff: 100, 100, 65, 30, 0 + Damage: 180 Versus: - Wood: 15 - Light: 45 - Heavy: 20 - Concrete: 20 + none: 100 + wall: 10 + building: 25 + wood: 75 + light: 40 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosion: piffs @@ -145,12 +201,19 @@ HMGo: Speed: 1c256 Warhead@1Dam: SpreadDamage Spread: 96 - Damage: 40 + Falloff: 100, 100, 65, 30, 0 + Damage: 180 Versus: - Wood: 15 - Light: 45 - Heavy: 25 - Concrete: 20 + none: 100 + wall: 10 + building: 25 + wood: 75 + light: 40 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosion: piffs @@ -170,20 +233,27 @@ Rocket: Speed: 343 RangeLimit: 40 Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 25 + Spread: 250 + Falloff: 100, 95, 70, 50, 25, 5, 0 + Damage: 250 ValidTargets: Ground, Air Versus: - None: 35 - Wood: 45 - Light: 100 - Heavy: 100 - Concrete: 35 + none: 25 + wall: 100 + building: 50 + wood: 65 + light: 100 + heavy: 50 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosion: rocket_explosion + ExplosionPalette: effect75alpha ImpactSound: EXPLSML1.WAV 110mm_Gun: @@ -197,13 +267,20 @@ Rocket: Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage - Spread: 256 - Damage: 55 + Spread: 160 + Falloff: 100, 100, 85, 50, 0 + Damage: 290 Versus: - None: 50 - Wood: 75 - Light: 100 - Concrete: 65 + none: 20 + wall: 50 + building: 50 + wood: 60 + light: 100 + heavy: 75 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater @@ -227,21 +304,27 @@ TowerMissile: TrailInterval: 1 Speed: 320 Warhead@1Dam: SpreadDamage - Spread: 384 - Damage: 50 + Spread: 280 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 480 ValidTargets: Ground, Air Versus: - None: 50 - Wood: 45 - Light: 100 - Heavy: 50 - Concrete: 35 + none: 15 + wall: 75 + building: 60 + wood: 65 + light: 90 + heavy: 100 + concrete: 100 + invulnerable: 0 + cy: 30 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion - ImpactSound: EXPLMD1.WAV + Explosion: med_explosion + ImpactSound: EXPLSML4.WAV 80mm_A: ReloadDelay: 50 @@ -252,19 +335,25 @@ TowerMissile: Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage - Spread: 256 - Damage: 40 + Spread: 180 + Falloff: 100, 100, 85, 50, 15, 0 + Damage: 270 Versus: - None: 50 - Wood: 50 - Light: 100 - Concrete: 50 + none: 20 + wall: 50 + building: 50 + wood: 60 + light: 100 + heavy: 75 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosion: small_napalm - ImpactSound: EXPLSML4.WAV 80mm_H: ReloadDelay: 55 @@ -275,19 +364,25 @@ TowerMissile: Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage - Spread: 256 - Damage: 40 + Spread: 180 + Falloff: 100, 100, 85, 50, 15, 0 + Damage: 270 Versus: - None: 50 - Wood: 50 - Light: 100 - Concrete: 50 + none: 20 + wall: 50 + building: 50 + wood: 60 + light: 100 + heavy: 75 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosion: small_napalm - ImpactSound: EXPLSML4.WAV 80mm_O: ReloadDelay: 45 @@ -298,19 +393,25 @@ TowerMissile: Inaccuracy: 380 Image: 120mm Warhead@1Dam: SpreadDamage - Spread: 256 - Damage: 40 + Spread: 180 + Falloff: 100, 100, 85, 50, 15, 0 + Damage: 270 Versus: - None: 50 - Wood: 50 - Light: 100 - Concrete: 50 + none: 20 + wall: 50 + building: 50 + wood: 60 + light: 100 + heavy: 75 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosion: small_napalm - ImpactSound: EXPLSML4.WAV DevBullet: ReloadDelay: 75 @@ -321,19 +422,26 @@ DevBullet: Blockable: true Image: doubleblastbullet Warhead@1Dam: SpreadDamage - Spread: 256 - Damage: 100 + Spread: 192 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 650 Versus: - None: 100 - Wood: 50 - Light: 100 - Heavy: 100 - Concrete: 80 + none: 50 + wall: 100 + building: 75 + wood: 60 + light: 100 + heavy: 100 + concrete: 100 + invulnerable: 0 + cy: 40 + harvester: 100 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosion: shockwave + ImpactSound: EXPLMD1.WAV 227mm: ReloadDelay: 115 @@ -350,21 +458,27 @@ DevBullet: Trail: large_trail TrailInterval: 1 Warhead@1Dam: SpreadDamage - Spread: 384 - Damage: 60 - ValidTargets: Ground + Spread: 280 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 600 + ValidTargets: Ground, Air Versus: - None: 20 - Wood: 50 - Light: 100 - Heavy: 50 - Concrete: 80 + none: 15 + wall: 75 + building: 60 + wood: 65 + light: 90 + heavy: 100 + concrete: 100 + invulnerable: 0 + cy: 30 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: mini_explosion - ImpactSound: EXPLMD3.WAV + Explosion: med_explosion + ImpactSound: EXPLSML4.WAV DeviatorMissile: ReloadDelay: 160 @@ -383,9 +497,21 @@ DeviatorMissile: TrailUsePlayerPalette: true TrailInterval: 1 Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 10 InvalidTargets: Infantry, Structure + Spread: 280 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 5 + Versus: + none: 20 + wall: 20 + building: 20 + wood: 20 + light: 20 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 10 + harvester: 20 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater @@ -393,9 +519,9 @@ DeviatorMissile: Explosion: deviator ExplosionPalette: deviatorgas UsePlayerPalette: true - ImpactSound: EXPLSML2.WAV + ImpactSound: EXPLSML1.WAV Warhead@4OwnerChange: ChangeOwner - Range: 1c0 + Range: 256 Duration: 750 155mm: @@ -411,19 +537,25 @@ DeviatorMissile: ContrailLength: 20 Image: 155mm Warhead@1Dam: SpreadDamage - Spread: 384 - Damage: 100 + Spread: 280 + Falloff: 100, 100, 85, 65, 40, 25, 0 + Damage: 450 Versus: - None: 100 - Wood: 80 - Light: 75 - Heavy: 50 - Concrete: 100 + none: 125 + wall: 100 + building: 100 + wood: 70 + light: 30 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: large_explosion + Explosion: small_artillery ImpactSound: EXPLLG3.WAV Sound: @@ -435,14 +567,24 @@ Sound: BeamDuration: 8 UsePlayerColor: true Warhead@1Dam: SpreadDamage - Spread: 32 - Damage: 150 + Spread: 96 + Falloff: 100, 100, 100, 50, 25, 0 + Damage: 500 #80 D2k but damages through all in path Versus: - None: 60 - Wood: 85 - Light: 80 - Concrete: 75 + none: 100 + wall: 50 + building: 60 + wood: 100 + light: 100 + heavy: 60 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SoundDeath + Warhead@3Eff: CreateEffect + ImpactSound: SONIC3.WAV + Delay: 10 Heal: ReloadDelay: 160 @@ -453,7 +595,8 @@ Heal: Speed: 1c256 Warhead@1Dam: SpreadDamage Spread: 160 - Damage: -50 + Falloff: 100, 100, 0 + Damage: -200 ValidTargets: Infantry WormJaw: @@ -461,9 +604,10 @@ WormJaw: InvalidTargets: Structure Range: 1c512 Warhead@1Dam: SpreadDamage - Spread: 160 - Damage: 100 InvalidTargets: Structure + Spread: 768 + Falloff: 100, 100, 0 + Damage: 10000 OrniBomb: ReloadDelay: 25 @@ -473,15 +617,20 @@ OrniBomb: Projectile: GravityBomb Image: BOMBS Warhead@1Dam: SpreadDamage - Spread: 640 - Damage: 30 - Falloff: 1000, 368, 135, 50, 18, 7, 0 + Spread: 276 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 400 Versus: - None: 20 - Wood: 100 - Light: 30 - Heavy: 20 - Concrete: 70 + none: 90 + wall: 50 + building: 75 + wood: 60 + light: 60 + heavy: 60 + concrete: 100 + invulnerable: 0 + cy: 25 + harvester: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: Crater @@ -505,15 +654,20 @@ Demolish: Atomic: Warhead@1Dam: SpreadDamage - Spread: 2c0 - Damage: 180 - Falloff: 1000, 368, 135, 50, 18, 7, 0 + Spread: 1c0 + Falloff: 200, 120, 80, 60, 40, 20, 10, 0 + Damage: 2700 ##225 in vanilla but of course is a cluster bomb instead, so damage spread out Versus: - None: 100 - Wood: 100 - Light: 100 - Heavy: 50 - Concrete: 50 + none: 90 + wall: 50 + building: 75 + wood: 60 + light: 60 + heavy: 60 + concrete: 100 + invulnerable: 0 + cy: 25 + harvester: 60 DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect Explosion: nuke @@ -521,15 +675,19 @@ Atomic: CrateNuke: Warhead@1Dam: SpreadDamage - Spread: 1c576 - Damage: 80 - Falloff: 1000, 368, 135, 50, 18, 7, 0 + Spread: 320 + Damage: 500 Versus: - None: 20 - Wood: 75 - Light: 25 - Heavy: 25 - Concrete: 50 + none: 90 + wall: 50 + building: 75 + wood: 60 + light: 60 + heavy: 60 + concrete: 100 + invulnerable: 0 + cy: 25 + harvester: 60 AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect @@ -538,60 +696,39 @@ CrateNuke: CrateExplosion: Warhead@1Dam: SpreadDamage - Spread: 320 - Damage: 40 - Falloff: 1000, 368, 135, 50, 18, 7, 0 + Spread: 276 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 200 Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 + none: 90 + wall: 5 + building: 65 + wood: 50 + light: 40 + heavy: 30 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: building + Explosion: artillery ImpactSound: EXPLSML4.WAV UnitExplodeSmall: - Warhead@1Dam: SpreadDamage - Spread: 224 - Damage: 30 - Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV - -UnitExplodeMed: - Warhead@1Dam: SpreadDamage - Spread: 320 - Damage: 60 - Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Eff: CreateEffect - Explosion: self_destruct + Warhead@1Eff: CreateEffect + Explosion: building ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV +UnitExplodeMed: + Warhead@1Eff: CreateEffect + Explosion: self_destruct + ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV + UnitExplodeLarge: - Warhead@1Dam: SpreadDamage - Spread: 416 - Damage: 90 - Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Eff: CreateEffect - Explosion: building + Warhead@1Eff: CreateEffect + Explosion: artillery ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV grenade: @@ -605,13 +742,20 @@ grenade: Image: BOMBS Shadow: true Warhead@1Dam: SpreadDamage - Spread: 192 - Damage: 60 + Spread: 200 + Falloff: 100, 100, 100, 95, 60, 0 + Damage: 150 Versus: - None: 50 - Wood: 100 - Light: 25 - Heavy: 5 + none: 125 + wall: 100 + building: 100 + wood: 70 + light: 30 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater @@ -622,7 +766,7 @@ grenade: Weathering: ReloadDelay: 100 Warhead@1Dam: SpreadDamage - Damage: 5 + Damage: 10 Shrapnel: ReloadDelay: 60 @@ -636,10 +780,16 @@ Shrapnel: Spread: 192 Damage: 60 Versus: - None: 50 - Wood: 100 - Light: 25 - Heavy: 5 + none: 50 + wall: 50 + building: 65 + wood: 100 + light: 25 + heavy: 5 + concrete: 50 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater @@ -649,13 +799,20 @@ Shrapnel: SpiceExplosion: Warhead@1Dam: SpreadDamage - Spread: 9 - Damage: 10 + Spread: 480 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 75 Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 + none: 90 + wall: 5 + building: 65 + wood: 50 + light: 40 + heavy: 30 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Res: CreateResource AddsResourceType: Spice From ab5a07fa5cffbcd7b8616665565dd2b50c52add3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 15:08:15 +0200 Subject: [PATCH 07/12] D2k weapon targeting validity changes --- mods/d2k/weapons.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 7c3eecbaca..cb08d15eda 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -64,8 +64,6 @@ Fremen_S: ReloadDelay: 40 Range: 2c512 Report: FREMODD1.WAV - ValidTargets: Ground, Infantry - InvalidTargets: Vehicle, Structure, Wall Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage @@ -92,7 +90,7 @@ M_LMG: ReloadDelay: 40 Range: 2c512 Report: MGUN2.WAV - InvalidTargets: Structure + ValidTargets: Ground Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage @@ -145,7 +143,7 @@ Fremen_L: Delay: 5 Range: 3c512 Report: BAZOOK2.WAV - InvalidTargets: Infantry + ValidTargets: Ground Projectile: Bullet Speed: 1c256 Warhead@1Dam: SpreadDamage @@ -447,7 +445,7 @@ DevBullet: ReloadDelay: 115 Range: 6c0 Report: MISSLE1.WAV - ValidTargets: Ground + ValidTargets: Ground, Air Projectile: Missile Speed: 281 RateOfTurn: 3 From ad9bc30c7e684563158c341030c8e736c1a8d252 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 15:08:44 +0200 Subject: [PATCH 08/12] D2k added Grenadier and Sardaukar explosions --- mods/d2k/rules/infantry.yaml | 8 +++++-- mods/d2k/weapons.yaml | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index c061b37f4f..80e3f525ea 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -164,8 +164,8 @@ grenadier: AttackSequence: throw IdleSequences: idle Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall + Weapon: GrenDeath + EmptyWeapon: GrenDeath AttractsWorms: Intensity: 180 @@ -197,6 +197,10 @@ sardaukar: Intensity: 180 Voiced: VoiceSet: GenericVoice + Explodes: + Weapon: SardDeath + EmptyWeapon: SardDeath + Chance: 100 saboteur: Inherits: ^Infantry diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index cb08d15eda..6c5583f674 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -766,6 +766,52 @@ Weathering: Warhead@1Dam: SpreadDamage Damage: 10 +GrenDeath: + Warhead@1Dam: SpreadDamage + Spread: 280 + Falloff: 100, 100, 100, 95, 60, 0 + Damage: 150 + Versus: + none: 125 + wall: 100 + building: 100 + wood: 70 + light: 30 + heavy: 20 + concrete: 100 + invulnerable: 0 + cy: 20 + harvester: 25 + DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath + Warhead@2Smu: LeaveSmudge + SmudgeType: SandCrater, RockCrater + Warhead@3Eff: CreateEffect + Explosion: building + ImpactSound: EXPLSML4.WAV + +SardDeath: + Warhead@1Dam: SpreadDamage + Spread: 280 + Falloff: 100, 100, 100, 95, 60, 25, 0 + Damage: 300 + Versus: + none: 15 + wall: 75 + building: 60 + wood: 65 + light: 90 + heavy: 100 + concrete: 100 + invulnerable: 0 + cy: 30 + harvester: 50 + DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath + Warhead@2Smu: LeaveSmudge + SmudgeType: SandCrater, RockCrater + Warhead@3Eff: CreateEffect + Explosion: small_napalm + ImpactSound: EXPLSML2.WAV + Shrapnel: ReloadDelay: 60 Range: 4c0 From ec277be9b6af4b95e4d0796b2b2f6eca83e7343b Mon Sep 17 00:00:00 2001 From: reaperrr Date: Mon, 14 Sep 2015 01:16:57 +0200 Subject: [PATCH 09/12] Missile tank weapon renamed --- mods/d2k/rules/vehicles.yaml | 2 +- mods/d2k/weapons.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index a6b9233524..1bf4ee7771 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -219,7 +219,7 @@ missile_tank: RevealsShroud: Range: 9c0 Armament: - Weapon: 227mm + Weapon: mtank_pri LocalOffset: -213,128,171, -213,-256,171 FireDelay: 15 AttackFrontal: diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 6c5583f674..b75217f15b 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -441,7 +441,7 @@ DevBullet: Explosion: shockwave ImpactSound: EXPLMD1.WAV -227mm: +mtank_pri: ReloadDelay: 115 Range: 6c0 Report: MISSLE1.WAV From 8e737d09c147e37d83240c44e15b0b27df3c31d5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 16 Sep 2015 00:34:58 +0200 Subject: [PATCH 10/12] Temporary work-around for D2k deviator missile The lint check doesn't handle player palettes properly yet. --- OpenRA.Mods.Common/Effects/Missile.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Effects/Missile.cs b/OpenRA.Mods.Common/Effects/Missile.cs index 456201b9ac..13032336dd 100644 --- a/OpenRA.Mods.Common/Effects/Missile.cs +++ b/OpenRA.Mods.Common/Effects/Missile.cs @@ -59,7 +59,8 @@ namespace OpenRA.Mods.Common.Effects [Desc("Interval in ticks between each spawned Trail animation.")] public readonly int TrailInterval = 2; - [PaletteReference] public readonly string TrailPalette = "effect"; + // TODO: Re-add PaletteReference as soon as it handles player palettes + public readonly string TrailPalette = "effect"; public readonly bool TrailUsePlayerPalette = false; public readonly int ContrailLength = 0; From 654c66ddd06ce01f438361d8e981c9a8775f0c19 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 16 Sep 2015 02:52:57 +0200 Subject: [PATCH 11/12] Split Trike and Raider muzzle flash to its own weapon Allows to show 3 muzzle flashes while only playing report, explosion effect and applying damage once --- mods/d2k/rules/vehicles.yaml | 10 ++++++++-- mods/d2k/weapons.yaml | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 1bf4ee7771..4a2872217a 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -108,9 +108,12 @@ trike: RevealsShroud: Range: 7c0 WithMuzzleFlash: - Armament: + Armament@damage: Weapon: HMG LocalOffset: -416,0,0 + Armament@muzzle: + Weapon: HMG_muzzle + LocalOffset: -416,0,0 MuzzleSequence: muzzle AttackFrontal: AutoTarget: @@ -328,9 +331,12 @@ raider: RevealsShroud: Range: 7c0 WithMuzzleFlash: - Armament: + Armament@damage: Weapon: HMGo LocalOffset: 170,0,0 + Armament@muzzle: + Weapon: HMGo_muzzle + LocalOffset: 170,0,0 MuzzleSequence: muzzle AttackFrontal: AutoTarget: diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index b75217f15b..8bb17fa2a3 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -216,6 +216,18 @@ HMGo: Warhead@2Eff: CreateEffect Explosion: piffs +HMG_muzzle: + ReloadDelay: 16 + Range: 3c0 + Burst: 3 + BurstDelay: 2 + +HMGo_muzzle: + ReloadDelay: 14 + Range: 3c0 + Burst: 3 + BurstDelay: 2 + Rocket: ReloadDelay: 30 Range: 3c512 From e36e4f97bb3e7e0b5eeff8cfce43c350ec41d6dd Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 19 Sep 2015 16:38:17 +0200 Subject: [PATCH 12/12] Fix Grenadier projectile --- mods/d2k/bits/xmas/grenade.shp | Bin 0 -> 88 bytes mods/d2k/sequences/misc.yaml | 5 +++++ mods/d2k/weapons.yaml | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 mods/d2k/bits/xmas/grenade.shp diff --git a/mods/d2k/bits/xmas/grenade.shp b/mods/d2k/bits/xmas/grenade.shp new file mode 100644 index 0000000000000000000000000000000000000000..ab850bf904feb055473382920c514c1a694bbbac GIT binary patch literal 88 zcmZQ!00AZ-1OYn+h6WJr3Z=cFbP$w|07)W&#?pVx4D1ap?4|7N4IpM?DUbu?H2?rV Cj|-Uq literal 0 HcmV?d00001 diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index bb25bd1213..ee07d7f6ce 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -266,6 +266,11 @@ bombs: Start: 3280 Length: 4 +grenade: + idle: grenade.shp # frames 3618-3621 from patch 1.06 DATA.R8 + Length: 4 + Tick: 80 + shrapnel: idle: DATA.R8 Start: 3290 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 8bb17fa2a3..5df61ce710 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -747,9 +747,9 @@ grenade: Projectile: Bullet Speed: 256 Blockable: false - Angle: 62 + Angle: 75 Inaccuracy: 416 - Image: BOMBS + Image: grenade Shadow: true Warhead@1Dam: SpreadDamage Spread: 200