From d3e8ffceb212dc7f33e9aa909867f968d0bd29bc Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 03:46:32 +0200 Subject: [PATCH 1/6] D2k weapon renamings --- mods/d2k/rules/aircraft.yaml | 2 +- mods/d2k/rules/defaults.yaml | 2 +- mods/d2k/rules/infantry.yaml | 10 +++---- mods/d2k/rules/structures.yaml | 2 +- mods/d2k/rules/vehicles.yaml | 54 ++++++++++++++++++---------------- mods/d2k/weapons.yaml | 24 +++++++-------- 6 files changed, 48 insertions(+), 46 deletions(-) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index f2de72efea..25e5da03db 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -140,7 +140,7 @@ orni.bomber: Inherits: ^Plane AttackBomber: Armament: - Weapon: Napalm + Weapon: OrniBomb Health: HP: 100 Armor: diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 77d52e24db..156f77e20d 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -147,7 +147,7 @@ FallsToEarth: Spins: False Moves: True - Explosion: UnitExplodeScale + Explosion: UnitExplodeLarge ^TowerHusk: Health: diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index de132a1421..3b25e05b74 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -124,9 +124,9 @@ fremen: AutoTarget: ScanRadius: 7 Armament@PRIMARY: - Weapon: Sniper + Weapon: Fremen_S Armament@SECONDARY: - Weapon: Slung + Weapon: Fremen_L AttackFrontal: WithInfantryBody: AttackSequence: shoot @@ -155,8 +155,8 @@ grenadier: Mobile: Speed: 53 Armament: - Weapon: Grenade LocalOffset: 0,0,555 + Weapon: grenade FireDelay: 15 AttackFrontal: WithInfantryBody: @@ -188,9 +188,9 @@ sardaukar: WithInfantryBody: AttackSequence: shoot Armament@PRIMARY: - Weapon: Vulcan + Weapon: M_LMG Armament@SECONDARY: - Weapon: Slung + Weapon: FREMEN_L AttackFrontal: AttractsWorms: Intensity: 180 diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 176945a465..2bb5fda9a6 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -554,7 +554,7 @@ guntower: ROT: 6 InitialFacing: 128 Armament: - Weapon: TurretGun + Weapon: 110mm_Gun LocalOffset: 512,0,432 MuzzleSequence: muzzle DetectCloaked: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index cf33f68a2c..f3d2f56bc3 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -25,8 +25,8 @@ mcv: RequiredForShortGame: true BaseBuilding: Explodes: - Weapon: UnitExplodeScale - EmptyWeapon: UnitExplodeScale + Weapon: UnitExplodeLarge + EmptyWeapon: UnitExplodeLarge Transforms: Facing: 16 IntoActor: conyard @@ -73,8 +73,8 @@ harvester: RevealsShroud: Range: 4c0 Explodes: - Weapon: SpiceExplosion - EmptyWeapon: UnitExplodeScale + Weapon: UnitExplodeLarge + EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: Actor: Harvester.Husk WithHarvestOverlay: @@ -115,8 +115,8 @@ trike: AttackFrontal: AutoTarget: Explodes: - Weapon: UnitExplodeTiny - EmptyWeapon: UnitExplodeTiny + Weapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall AttractsWorms: Intensity: 420 @@ -141,13 +141,13 @@ quad: RevealsShroud: Range: 8c0 Armament: - Weapon: QuadRockets + Weapon: Rocket LocalOffset: 128,64,64, 128,-64,64 AttackFrontal: AutoTarget: Explodes: - Weapon: UnitExplodeTiny - EmptyWeapon: UnitExplodeTiny + Weapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall Selectable: Class: quad AttractsWorms: @@ -187,8 +187,8 @@ siegetank: WithMuzzleFlash: WithTurret: Explodes: - Weapon: UnitExplodeScale - EmptyWeapon: UnitExplodeScale + Weapon: UnitExplodeMed + EmptyWeapon: UnitExplodeMed AutoTarget: InitialStance: Defend Selectable: @@ -228,8 +228,8 @@ missiletank: AutoTarget: InitialStance: Defend Explodes: - Weapon: UnitExplodeScale - EmptyWeapon: UnitExplodeScale + Weapon: UnitExplodeMed + EmptyWeapon: UnitExplodeMed Selectable: Class: missiletank SpawnActorOnDeath: @@ -263,8 +263,8 @@ sonictank: AttackFrontal: AutoTarget: Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall + Weapon: UnitExplodeLarge + EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: Actor: sonictank.husk AttractsWorms: @@ -300,8 +300,8 @@ devast: IgnoreOffset: true AutoTarget: Explodes: - Weapon: UnitExplodeScale - EmptyWeapon: UnitExplodeScale + Weapon: UnitExplodeLarge + EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: Actor: devast.husk AttractsWorms: @@ -337,8 +337,8 @@ raider: AttackFrontal: AutoTarget: Explodes: - Weapon: UnitExplodeTiny - EmptyWeapon: UnitExplodeTiny + Weapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall AttractsWorms: Intensity: 420 @@ -382,14 +382,14 @@ deviatortank: RevealsShroud: Range: 5c0 Armament: - Weapon: NerveGasMissile + Weapon: DeviatorMissile LocalOffset: -299,0,85 AttackFrontal: AutoTarget: InitialStance: Defend Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall + Weapon: UnitExplodeLarge + EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: Actor: deviatortank.husk AttractsWorms: @@ -419,7 +419,7 @@ deviatortank: ROT: 6 RealignDelay: 0 Armament: - Weapon: 90mm + Weapon: 80mm_A Recoil: 128 RecoilRecovery: 32 LocalOffset: 256,0,0 @@ -429,8 +429,8 @@ deviatortank: WithTurret: AutoTarget: Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall + Weapon: UnitExplodeMed + EmptyWeapon: UnitExplodeMed Selectable: Class: combat AttractsWorms: @@ -441,7 +441,7 @@ combata: Buildable: Prerequisites: ~heavy.atreides Armament: - Weapon: 90mma + Weapon: 80mm_A SpawnActorOnDeath: Actor: combata.husk @@ -449,6 +449,8 @@ combath: Inherits: ^combat Buildable: Prerequisites: ~heavy.harkonnen + Armament: + Weapon: 80mm_H Mobile: Speed: 53 ROT: 4 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index ff42a4d70e..6ecbb8a5b5 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -53,7 +53,7 @@ Bazooka: Explosion: small_explosion ImpactSound: EXPLSML1.WAV -Sniper: +Fremen_S: ReloadDelay: 100 Range: 8c512 Report: FREMODD1.WAV @@ -71,7 +71,7 @@ Sniper: ValidTargets: Infantry DamageTypes: Prone50Percent, TriggerProne, BulletDeath -Vulcan: +M_LMG: ReloadDelay: 30 Range: 5c768 Report: VULCAN.AUD @@ -93,7 +93,7 @@ Vulcan: Warhead@2Eff: CreateEffect Explosion: piffs -Slung: +Fremen_L: ReloadDelay: 60 Delay: 5 Range: 5c512 @@ -168,7 +168,7 @@ HMGo: Warhead@2Eff: CreateEffect Explosion: piffs -QuadRockets: +Rocket: ReloadDelay: 40 Burst: 2 BurstDelay: 25 @@ -202,7 +202,7 @@ QuadRockets: Explosion: med_explosion ImpactSound: EXPLSML1.WAV -TurretGun: +110mm_Gun: ReloadDelay: 35 Range: 7c0 Report: TURRET1.WAV @@ -261,7 +261,7 @@ TowerMissile: Explosion: small_explosion ImpactSound: EXPLMD1.WAV -90mm: +80mm_A: ReloadDelay: 50 Range: 5c768 Report: MEDTANK1.WAV @@ -284,7 +284,7 @@ TowerMissile: Explosion: small_napalm ImpactSound: EXPLSML4.WAV -90mma: +80mm_H: ReloadDelay: 50 Range: 7c0 Report: MEDTANK1.WAV @@ -363,7 +363,7 @@ DevBullet: Explosion: mini_explosion ImpactSound: EXPLMD3.WAV -NerveGasMissile: +DeviatorMissile: ReloadDelay: 120 Range: 8c0 Report: MISSLE1.WAV @@ -506,7 +506,7 @@ ParaBomb: Explosion: self_destruct ImpactSound: EXPLLG3.WAV -Napalm: +OrniBomb: ReloadDelay: 2 Range: 3c0 Projectile: GravityBomb @@ -620,7 +620,7 @@ UnitExplodeSmall: Explosion: self_destruct ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV -UnitExplodeTiny: +UnitExplodeMed: Warhead@1Dam: SpreadDamage Spread: 224 Damage: 30 @@ -634,7 +634,7 @@ UnitExplodeTiny: Explosion: med_explosion ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV -UnitExplodeScale: +UnitExplodeLarge: Warhead@1Dam: SpreadDamage Spread: 416 Damage: 90 @@ -648,7 +648,7 @@ UnitExplodeScale: Explosion: building ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV -Grenade: +grenade: ReloadDelay: 60 Range: 4c0 Report: From fe2491dd506783d8be3d40c8dd52f7d357267c53 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 04:12:29 +0200 Subject: [PATCH 2/6] Add 80mm_O cannon for Ordos tank To reduce conflicts with upcoming stats changes. --- mods/d2k/rules/vehicles.yaml | 2 ++ mods/d2k/weapons.yaml | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index f3d2f56bc3..e9cbec4226 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -469,6 +469,8 @@ combato: Prerequisites: ~heavy.ordos Turreted: ROT: 8 + Armament: + Weapon: 80mm_O Mobile: Speed: 96 ROT: 8 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 6ecbb8a5b5..42a5f5fb34 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -307,6 +307,29 @@ TowerMissile: Explosion: small_napalm ImpactSound: EXPLSML4.WAV +80mm_O: + ReloadDelay: 50 + Range: 5c768 + Report: MEDTANK1.WAV + Projectile: Bullet + Speed: 704 + Inaccuracy: 352 + Image: 120mm + Warhead@1Dam: SpreadDamage + Spread: 256 + Damage: 40 + Versus: + None: 50 + Wood: 50 + Light: 100 + Concrete: 50 + DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath + Warhead@2Smu: LeaveSmudge + SmudgeType: SandCrater, RockCrater + Warhead@3Eff: CreateEffect + Explosion: small_napalm + ImpactSound: EXPLSML4.WAV + DevBullet: ReloadDelay: 50 Range: 5c0 From b9377c49a9656cb6953dce6664b087f911d0fb2a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 04:20:17 +0200 Subject: [PATCH 3/6] D2k - remove unused ParaBomb --- mods/d2k/weapons.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 42a5f5fb34..ce72096ce1 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -507,28 +507,6 @@ WormJaw: Damage: 100 InvalidTargets: Structure -ParaBomb: - ReloadDelay: 10 - Range: 4c512 - Report: - Projectile: GravityBomb - Image: BOMBS - Warhead@1Dam: SpreadDamage - Spread: 192 - Damage: 50 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Versus: - None: 30 - Wood: 75 - Light: 75 - Concrete: 50 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Smu: LeaveSmudge - SmudgeType: Crater - Warhead@3Eff: CreateEffect - Explosion: self_destruct - ImpactSound: EXPLLG3.WAV - OrniBomb: ReloadDelay: 2 Range: 3c0 From 3b2d69df187523deb649bad646a2be2edbc57a1c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 04:25:12 +0200 Subject: [PATCH 4/6] D2k - change position and name of ChainGun To reduce conflicts with stats changes --- mods/d2k/rules/aircraft.yaml | 2 +- mods/d2k/rules/infantry.yaml | 2 +- mods/d2k/weapons.yaml | 40 ++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 25e5da03db..6f1a71670a 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -108,7 +108,7 @@ orni: Range: 10c0 Type: CenterPosition Armament: - Weapon: ChainGun + Weapon: M_HMG LocalOffset: 85,-213,-85 AttackHeli: FacingTolerance: 20 diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 3b25e05b74..94269e32d2 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -190,7 +190,7 @@ sardaukar: Armament@PRIMARY: Weapon: M_LMG Armament@SECONDARY: - Weapon: FREMEN_L + Weapon: M_HMG AttackFrontal: AttractsWorms: Intensity: 180 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index ce72096ce1..7102035894 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -93,6 +93,26 @@ M_LMG: Warhead@2Eff: CreateEffect Explosion: piffs +M_HMG: + ReloadDelay: 10 + Range: 5c0 + MinRange: 1c0 + Report: 20MMGUN1.WAV + Projectile: Bullet + Speed: 1c256 + Blockable: false + Warhead@1Dam: SpreadDamage + Spread: 96 + Damage: 20 + Versus: + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 + DamageTypes: Prone50Percent, TriggerProne, BulletDeath + Warhead@2Eff: CreateEffect + Explosion: piffs + Fremen_L: ReloadDelay: 60 Delay: 5 @@ -466,26 +486,6 @@ Sound: Concrete: 75 DamageTypes: Prone50Percent, TriggerProne, SoundDeath -ChainGun: - ReloadDelay: 10 - Range: 5c0 - MinRange: 1c0 - Report: 20MMGUN1.WAV - Projectile: Bullet - Speed: 1c256 - Blockable: false - Warhead@1Dam: SpreadDamage - Spread: 96 - Damage: 20 - Versus: - Wood: 50 - Light: 60 - Heavy: 25 - Concrete: 25 - DamageTypes: Prone50Percent, TriggerProne, BulletDeath - Warhead@2Eff: CreateEffect - Explosion: piffs - Heal: ReloadDelay: 160 Range: 4c0 From a321b41c72c4e4a69616aa47bf6866bf383cda39 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 04:41:19 +0200 Subject: [PATCH 5/6] D2k - remove unused UnitExplode --- mods/d2k/weapons.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 7102035894..9dcd42a71e 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -592,21 +592,6 @@ CrateExplosion: Explosion: building ImpactSound: EXPLSML4.WAV -UnitExplode: - Warhead@1Dam: SpreadDamage - Spread: 320 - Damage: 50 - Falloff: 1000, 368, 135, 50, 18, 7, 0 - Versus: - None: 90 - Wood: 75 - Light: 60 - Heavy: 25 - DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath - Warhead@2Eff: CreateEffect - Explosion: building - ImpactSound: EXPLMD1.WAV - UnitExplodeSmall: Warhead@1Dam: SpreadDamage Spread: 320 From 5e6d30c3f53029428a3c6f35411b72a619941a93 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 6 Sep 2015 04:51:30 +0200 Subject: [PATCH 6/6] D2k - switch stats of UnitExplodeSmall and UnitExplodeMed to match name --- mods/d2k/weapons.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 9dcd42a71e..fd32279ddc 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -593,20 +593,6 @@ CrateExplosion: ImpactSound: EXPLSML4.WAV UnitExplodeSmall: - 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 - ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV - -UnitExplodeMed: Warhead@1Dam: SpreadDamage Spread: 224 Damage: 30 @@ -620,6 +606,20 @@ UnitExplodeMed: 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 + ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV + UnitExplodeLarge: Warhead@1Dam: SpreadDamage Spread: 416