diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 974a513e5c..5aeb494a80 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -74,8 +74,6 @@ ChromeLayout: mods/ra/chrome/convertassets.yaml Weapons: - mods/d2k/weapons/defaults.yaml - mods/d2k/weapons/explosions.yaml mods/d2k/weapons.yaml Voices: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index b28089633b..7001a390c7 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -329,7 +329,7 @@ MISSILETANK: Armament: Weapon: 227mm LocalOffset: -213,128,171, -213,-256,171 - FireDelay: 15 + FireDelay: 15 AttackFrontal: AutoTarget: InitialStance: Defend diff --git a/mods/d2k/sequences/misc.yaml b/mods/d2k/sequences/misc.yaml index c927f7d2b4..8b193cf1a7 100644 --- a/mods/d2k/sequences/misc.yaml +++ b/mods/d2k/sequences/misc.yaml @@ -11,14 +11,14 @@ explosion: med_explosion: DATA.R8 Start: 3390 Length: 12 - napalm: DATA.R8 + tiny_explosion: DATA.R8 Start: 3390 Length: 12 nuke: DATA.R8 Start: 3965 Length: 14 Tick: 60 - napalm2: DATA.R8 + mini_explosion: DATA.R8 Start: 3403 Length: 15 Tick: 60 @@ -222,4 +222,4 @@ icon: Offset: -30,-24 deathhand: DATA.R8 Start: 4035 - Offset: -30,-24 \ No newline at end of file + Offset: -30,-24 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 1298e322c5..4abfddd4fb 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -10,7 +10,7 @@ LMG: ContrailUsePlayerColor: true Warhead: Spread: 3 - Versus: + Versus: Wood: 25% Light: 40% Heavy: 10% @@ -36,13 +36,13 @@ Bazooka: RangeLimit: 35 Warhead: Spread: 3 - Versus: + Versus: None: 10% Wood: 75% Light: 60% Heavy: 90% Concrete: 40% - Explosion: small_artillery + Explosion: small_explosion InfDeath: 4 SmudgeType: SandCrater, RockCrater Damage: 50 @@ -61,7 +61,7 @@ Sniper: Warhead: Damage: 60 Spread: 1 - Versus: + Versus: None: 100% Wood: 0% Light: 1% @@ -82,7 +82,7 @@ Vulcan: ContrailUsePlayerColor: true Warhead: Spread: 3 - Versus: + Versus: Wood: 0% Light: 60% Heavy: 10% @@ -107,7 +107,7 @@ Slung: Image: MISSILE Warhead: Spread: 6 - Versus: + Versus: None: 0% Wood: 75% Light: 40% @@ -133,7 +133,7 @@ HMG: ContrailUsePlayerColor: true Warhead: Spread: 3 - Versus: + Versus: Wood: 15% Light: 45% Heavy: 20% @@ -156,7 +156,7 @@ HMGo: ContrailUsePlayerColor: true Warhead: Spread: 3 - Versus: + Versus: Wood: 15% Light: 45% Heavy: 25% @@ -183,7 +183,7 @@ QuadRockets: RangeLimit: 40 Warhead: Spread: 3 - Versus: + Versus: None: 35% Wood: 45% Light: 100% @@ -206,7 +206,7 @@ TurretGun: Inaccuracy: 9 Warhead: Spread: 8 - Versus: + Versus: None: 50% Wood: 75% Light: 100% @@ -259,7 +259,7 @@ TowerMissile: Inaccuracy: 12 Warhead: Spread: 8 - Versus: + Versus: None: 50% Wood: 50% Light: 100% @@ -279,7 +279,7 @@ TowerMissile: Inaccuracy: 11 Warhead: Spread: 8 - Versus: + Versus: None: 50% Wood: 50% Light: 100% @@ -299,7 +299,7 @@ DevBullet: Image: doubleblast Warhead: Spread: 8 - Versus: + Versus: None: 100% Wood: 50% Light: 100% @@ -310,7 +310,7 @@ DevBullet: SmudgeType: SandCrater, RockCrater Damage: 100 -227mm: +227mm: ROF: 100 Range: 10 MinRange: 4 @@ -330,7 +330,7 @@ DevBullet: ContrailLength: 5 Warhead: Spread: 12 - Versus: + Versus: None: 20% Wood: 50% Light: 100% @@ -358,7 +358,7 @@ FakeMissile: ContrailUsePlayerColor : True Warhead: Spread: 3 - Versus: + Versus: None: 0% Wood: 0% Concrete: 0% @@ -381,7 +381,7 @@ FakeMissile: ContrailLength: 20 Warhead: Spread: 12 - Versus: + Versus: None: 100% Wood: 80% Light: 75% @@ -405,7 +405,7 @@ Sound: UsePlayerColor: true Warhead: Spread: 1 - Versus: + Versus: None: 60% Wood: 85% Light: 80% @@ -423,7 +423,7 @@ ChainGun: High: true Warhead: Spread: 3 - Versus: + Versus: Wood: 50% Light: 60% Heavy: 25% @@ -440,7 +440,7 @@ Heal: Speed: 100 Warhead: Spread: 5 - Versus: + Versus: Wood: 0% Light: 0% Heavy: 0% @@ -454,7 +454,7 @@ WormJaw: Report: WORM.WAV Warhead: Spread: 5 - Versus: + Versus: Wood: 0% Concrete: 0% Damage: 100 @@ -467,7 +467,7 @@ ParaBomb: Image: BOMBS Warhead: Spread: 6 - Versus: + Versus: None: 30% Wood: 75% Light: 75% @@ -484,14 +484,117 @@ Napalm: Image: BOMBS Warhead: Spread: 20 - Versus: + Versus: None: 20% Wood: 100% Light: 30% Heavy: 20% Concrete: 70% InfDeath: 4 - Explosion: napalm + Explosion: small_artillery ImpactSound: NAPALM1.WAV SmudgeType: Crater Damage: 300 + +Crush: + Warhead: + ImpactSound: CRUSH1.WAV + Damage: 100 + +Demolish: + Warhead: + ImpactSound: EXPLLG2.WAV + Explosion: building + +Atomic: + Warhead: + Damage: 1800 + Spread: 64 + Versus: + None: 100% + Wood: 100% + Light: 100% + Heavy: 50% + Concrete: 50% + Explosion: nuke + InfDeath: 5 + ImpactSound: EXPLLG2.WAV + +CrateNuke: + Warhead: + Damage: 800 + Spread: 50 + Versus: + None: 20% + Wood: 75% + Light: 25% + Heavy: 25% + Concrete: 50% + Explosion: nuke + InfDeath: 5 + ImpactSound: EXPLLG2.WAV + +CrateExplosion: + Warhead: + Damage: 400 + Spread: 10 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: building + InfDeath: 4 + ImpactSound: EXPLSML4.WAV + +UnitExplode: + Warhead: + Damage: 500 + Spread: 10 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: building + InfDeath: 4 + ImpactSound: EXPLMD1.WAV + +UnitExplodeSmall: + Warhead: + Damage: 60 + Spread: 10 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: self_destruct + InfDeath: 4 + ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV + +UnitExplodeTiny: + Warhead: + Damage: 30 + Spread: 7 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: med_explosion + InfDeath: 4 + ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV + +UnitExplodeScale: + Warhead: + Damage: 90 + Spread: 13 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: building + InfDeath: 4 + ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV \ No newline at end of file diff --git a/mods/d2k/weapons/defaults.yaml b/mods/d2k/weapons/defaults.yaml deleted file mode 100644 index 6ab421e003..0000000000 --- a/mods/d2k/weapons/defaults.yaml +++ /dev/null @@ -1,188 +0,0 @@ -# to do: explosion animations, spreads - - - -### Warheads - -W_Bullets: # Machine Guns - Report: MGUN2.WAV #machine gun burst sound - Warhead: - Spread: 3 - Versus: - None: 100% - Wood: 75% - Light: 40% - Heavy: 20% - Concrete: 10% - Explosion: piffs - InfDeath: 2 - -W_Bazooka: - Warhead: - Spread: 3 - Versus: - None: 8% - Wood: 45% - Light: 70% - Heavy: 100% - Concrete: 75% - InfDeath: 4 - Explosion: med_explosion - WaterExplosion: med_splash - ImpactSound: kaboom12.aud # TODO: fallback to RA - -W_HE: # Grenadier, siege tank - Warhead: - Spread: 12 - Versus: - None: 125% - Wood: 70% - Light: 30% - Heavy: 20% - Concrete: 100% - # vvv below taken from 155mm - InfDeath: 3 - Explosion: self_destruct - WaterExplosion: large_splash - ImpactSound: explsml2 - SmudgeType: SandCrater, RockCrater - -W_GT_AT: # Sardaukar & Fremen's longer range weapons - Warhead: - Spread: 3 - Versus: - None: 25% - Wood: 65% - Light: 100% - Heavy: 50% - Concrete: 100% - InfDeath: 4 - Explosion: med_explosion - WaterExplosion: med_splash - ImpactSound: kaboom12.aud # TODO: fallback to RA - SmudgeType: SandCrater, RockCrater - -W_AT: # Tank shells, gun turret - Warhead: - Spread: 3 - Versus: - None: 20% - Wood: 60% - Light: 100% - Heavy: 75% - Concrete: 50% - Explosion: med_explosion - ImpactSound: kaboom30.aud # TODO: fallback to RA - InfDeath: 4 - SmudgeType: SandCrater, RockCrater - -W_AT_Mis: # Rocket Launcher, tower missile - Warhead: - Spread: 8 - Versus: - None: 15% - Wood: 65% - Light: 90% - Heavy: 100% - Concrete: 75% - InfDeath: 4 - Explosion: large_explosion - WaterExplosion: med_splash - ImpactSound: explsml1.wav - SmudgeType: SandCrater, RockCrater - -W_Deviate: - Warhead: - Spread: 8 - Versus: - None: 20% - Wood: 20% - Light: 20% - Heavy: 20% - Concrete: 20% - Explosion: med_explosion - WaterExplosion: med_splash - -W_Sonic: - Warhead: - Spread: 6 - Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 60% - Concrete: 50% - Explosion: med_explosion - WaterExplosion: med_splash - -W_Plasma: - Warhead: - Spread: 3 - Versus: - None: 100% - Wood: 100% - Light: 60% - Heavy: 50% - Concrete: 100% - Explosion: med_explosion - WaterExplosion: med_splash - - - - -### Projectiles - -P_Bullets: #from M60mg - Projectile: Bullet - Speed: 100 - ContrailLength: 3 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true - -P_OneShot: #from Sniper - Report: RIFLE.AUD # TODO: fallback to RA - Projectile: Bullet - Speed: 150 - ContrailLength: 6 - TrailInterval: 1 - ContrailDelay: 0 - ContrailUsePlayerColor: true - -P_Bazooka: #From bazooka/1st (dragon?) - Projectile: Missile - Speed: 25 - Arm: 2 - High: true - Shadow: yes - Proximity: true - Trail: smokey - Inaccuracy: 3 - Image: DRAGON - ROT: 5 - RangeLimit: 35 - -P_Rocket: #From QuadRockets - Projectile: Missile - Arm: 0 - High: yes - Shadow: yes - Proximity: yes - Inaccuracy: 3 - Image: DRAGON - ROT: 10 - Trail: smokey - Speed: 40 - RangeLimit: 40 - -P_Missile: #From 227mm - Projectile: Bullet - Speed: 20 - Arm: 5 - High: yes - Shadow: yes - Inaccuracy: 55 - Angle: 0.2 - Image: MISSILE - ROT: 5 - ContrailLength: 5 \ No newline at end of file diff --git a/mods/d2k/weapons/explosions.yaml b/mods/d2k/weapons/explosions.yaml deleted file mode 100644 index 3d29ef49f7..0000000000 --- a/mods/d2k/weapons/explosions.yaml +++ /dev/null @@ -1,105 +0,0 @@ -Crush: - Warhead: - ImpactSound: CRUSH1.WAV - Damage: 100 - -Demolish: - Warhead: - ImpactSound: EXPLLG2.WAV - Explosion: building - -Atomic: - Warhead: - Damage: 1800 - Spread: 64 - Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 50% - Concrete: 50% - Explosion: nuke - InfDeath: 5 - ImpactSound: EXPLLG2.WAV - -CrateNuke: - Warhead: - Damage: 800 - Spread: 50 - Versus: - None: 20% - Wood: 75% - Light: 25% - Heavy: 25% - Concrete: 50% - Explosion: nuke - InfDeath: 5 - ImpactSound: EXPLLG2.WAV - -CrateExplosion: - Warhead: - Damage: 400 - Spread: 10 - Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Explosion: building - WaterExplosion: building - InfDeath: 4 - ImpactSound: EXPLSML4.WAV - -UnitExplode: - Warhead: - Damage: 500 - Spread: 10 - Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Explosion: building - WaterExplosion: large_splash - InfDeath: 4 - ImpactSound: EXPLMD1.WAV - -UnitExplodeSmall: - Warhead: - Damage: 60 - Spread: 10 - Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Explosion: self_destruct - InfDeath: 4 - ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV - -UnitExplodeTiny: - Warhead: - Damage: 30 - Spread: 7 - Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Explosion: med_explosion - InfDeath: 4 - ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV - -UnitExplodeScale: - Warhead: - Damage: 90 - Spread: 13 - Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Explosion: building - InfDeath: 4 - ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV - diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 38c6d6917f..1217cb43fd 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -157,7 +157,6 @@ SectionGroup /e "Mods" File /r "${SRCDIR}\mods\d2k\tilesets" File /r "${SRCDIR}\mods\d2k\sequences" File /r "${SRCDIR}\mods\d2k\uibits" - File /r "${SRCDIR}\mods\d2k\weapons" SectionEnd SectionGroupEnd