diff --git a/mods/cnc/maps/bialystok.oramap b/mods/cnc/maps/bialystok.oramap new file mode 100644 index 0000000000..4c4b2e2db5 Binary files /dev/null and b/mods/cnc/maps/bialystok.oramap differ diff --git a/mods/cnc/maps/bifurcation.oramap b/mods/cnc/maps/bifurcation.oramap deleted file mode 100644 index 006bfaae7a..0000000000 Binary files a/mods/cnc/maps/bifurcation.oramap and /dev/null differ diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml index 621d9446fb..1b5b7c3b18 100644 --- a/mods/cnc/rules/system.yaml +++ b/mods/cnc/rules/system.yaml @@ -188,7 +188,7 @@ Player: arty: 20% ftnk: 5% stnk: 40% - mlrs: 10% + mlrs: 5% heli: 10% jeep: 20% apc: 10% diff --git a/mods/d2k/bits/bigboom.shp b/mods/d2k/bits/bigboom.shp new file mode 100644 index 0000000000..40c6085d5c Binary files /dev/null and b/mods/d2k/bits/bigboom.shp differ diff --git a/mods/d2k/bits/deathhandmissile.shp b/mods/d2k/bits/deathhandmissile.shp new file mode 100644 index 0000000000..213742236f Binary files /dev/null and b/mods/d2k/bits/deathhandmissile.shp differ diff --git a/mods/d2k/bits/doubleblast.shp b/mods/d2k/bits/doubleblast.shp new file mode 100644 index 0000000000..02743187fc Binary files /dev/null and b/mods/d2k/bits/doubleblast.shp differ diff --git a/mods/d2k/bits/doubleblastmuzzle.shp b/mods/d2k/bits/doubleblastmuzzle.shp new file mode 100644 index 0000000000..90934c190d Binary files /dev/null and b/mods/d2k/bits/doubleblastmuzzle.shp differ diff --git a/mods/d2k/bits/raidersicon.shp b/mods/d2k/bits/raidersicon.shp new file mode 100644 index 0000000000..01a888fc6c Binary files /dev/null and b/mods/d2k/bits/raidersicon.shp differ diff --git a/mods/d2k/bits/shockwave.shp b/mods/d2k/bits/shockwave.shp new file mode 100644 index 0000000000..7527644668 Binary files /dev/null and b/mods/d2k/bits/shockwave.shp differ diff --git a/mods/d2k/bits/temperat.pal b/mods/d2k/bits/temperat.pal new file mode 100644 index 0000000000..bb63fcdd50 Binary files /dev/null and b/mods/d2k/bits/temperat.pal differ diff --git a/mods/d2k/maps/black_mesa.oramap b/mods/d2k/maps/black_mesa.oramap new file mode 100644 index 0000000000..22b6b89884 Binary files /dev/null and b/mods/d2k/maps/black_mesa.oramap differ diff --git a/mods/d2k/maps/black_mesa_large.oramap b/mods/d2k/maps/black_mesa_large.oramap new file mode 100644 index 0000000000..51b30f0b00 Binary files /dev/null and b/mods/d2k/maps/black_mesa_large.oramap differ diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index dbd26c8d27..5358a37b2c 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -10,6 +10,7 @@ Folders: ./mods/d2k/bits ./mods/d2k/uibits ./mods/ra/uibits + ~^/Content/ra ~^/Content/d2k ~^/Content/d2k/GAMESFX ~^/Content/d2k/Music @@ -17,6 +18,7 @@ Folders: ~^/Content/d2k/SHPs Packages: + conquer.mix Rules: mods/d2k/rules/system.yaml diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index 6e099fa369..b6b3dba55b 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -231,8 +231,10 @@ FREMEN: Range: 7 AutoTarget: ScanRadius: 7 - Armament: + Armament@PRIMARY: Weapon: Sniper + Armament@SECONDARY: + Weapon: Slung AttackFrontal: RenderInfantryProne: -RenderInfantry: diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 5924eca2f5..f11c1130df 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -180,6 +180,7 @@ TargetableBuilding: TargetTypes: Ground, C4 Building: + RequiresBaseProvider: true Dimensions: 1,1 Footprint: x TerrainTypes: Rock, Concrete diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 1c96be5a91..ef13bde7d2 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -163,7 +163,7 @@ STEALTHTRIKE: Tooltip: Name: Stealth Raider Trike Description: Invisible Raider Trike\n Strong vs Infantry, Light Vehicles - Icon: raidericon + Icon: raidersicon Health: HP: 110 Mobile: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 14f82644c3..e611fa8a80 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -29,6 +29,9 @@ ProductionBar: ProvidesCustomPrerequisite: Prerequisite: Conyard + BaseProvider: + Cooldown: 25 + Range: 30 ^POWER: Inherits: ^Building diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index f796511edb..6e364cc7a8 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -299,7 +299,7 @@ World: AllowModifiers: false PaletteFromFile@effect: Name: effect - Filename: d2k.pal + Filename: temperat.pal ShadowIndex: 4 PaletteFromFile@colorpicker: Name: colorpicker diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index a8d209b494..3827c80c1f 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -76,7 +76,7 @@ HARVESTER: Armor: Type: Heavy Mobile: - Speed: 7 + Speed: 6 Crushes: crate, infantry RenderUnit: Image: HARVESTER diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index db4f492f15..46b9bd7e56 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -1,3 +1,53 @@ +explosion: + piff: minipiff + Start: 0 + Length: * + piffs: minipiff + Start: 0 + Length: * + small_explosion: veh-hit3 + Start: 0 + Length: * + med_explosion: frag1 + Start: 0 + Length: * + large_explosion: bigboom + Start: 0 + Length: * + small_artillery: veh-hit2 + Start: 0 + Length: * + artillery: art-exp1 + Start: 0 + Length: * + self_destruct: art-exp1 + Start: 0 + Length: * + small_building: veh-hit1 + Start: 0 + Length: * + building: fball1 + Start: 0 + Length: * + small_napalm: napalm1 + Start: 0 + Length: * + napalm: napalm2 + Start: 0 + Length: * + napalm2: napalm2 + Start: 0 + Length: * + Tick: 60 + shockwave: shockwave + Start: 0 + Length: * + Tick: 30 + nuke: atomsfx + Start: 0 + Length: * + Tick: 60 + 90mm: idle: Start: 0 @@ -874,6 +924,10 @@ devast: idle: Start: 0 Facings: 32 + muzzle: doubleblastmuzzle + Start: 0 + Length: 1 + Facings: 32 conyardo: idle: @@ -1098,43 +1152,6 @@ rpg: Start: 0 Facings: 32 -explosion: - piff: minipiff - Start: 0 - Length: * - piffs: minipiff - Start: 0 - Length: * - small_explosion: miniboom - Start: 0 - Length: * - med_explosion: mediboom - Start: 0 - Length: * - napalm: mediboom2 - Start: 0 - Length: * - nuke: mushroomcloud - Start: 0 - Length: * - Tick: 60 - napalm2: mediboom2 - Start: 0 - Length: * - Tick: 60 - self_destruct: bigboom - Start: 0 - Length: * - building: bigboom2 - Start: 0 - Length: * - large_explosion: largeboom - Start: 0 - Length: * - small_napalm: miniboom2 - Start: 0 - Length: * - crate: idle: crates Start: 0 @@ -1239,7 +1256,7 @@ plates: Length: 6 fire: - 1: fire + 1: fire2 Start: 0 Length: * 2: fire2 @@ -1331,4 +1348,9 @@ waypoint: sietch: idle: - Start: 0 \ No newline at end of file + Start: 0 + +doubleblast: + idle: + Start: 0 + Facings: 16 \ No newline at end of file diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index cf541ac78c..2b497b30d5 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -42,7 +42,7 @@ Bazooka: Light: 60% Heavy: 90% Concrete: 40% - Explosion: med_explosion + Explosion: small_artillery InfDeath: 4 SmudgeType: SandCrater, RockCrater Damage: 50 @@ -190,7 +190,7 @@ QuadRockets: Heavy: 100% Concrete: 35% InfDeath: 4 - Explosion: med_explosion + Explosion: small_artillery ImpactSound: EXPLSML2 SmudgeType: SandCrater, RockCrater Damage: 25 @@ -244,7 +244,7 @@ TowerMissile: Heavy: 50% Concrete: 35% InfDeath: 3 - Explosion: small_explosion + Explosion: artillery ImpactSound: EXPLSML2 SmudgeType: SandCrater, RockCrater Damage: 50 @@ -264,7 +264,7 @@ TowerMissile: Wood: 50% Light: 80% Concrete: 50% - Explosion: med_explosion + Explosion: small_artillery ImpactSound: kaboom30 InfDeath: 4 SmudgeType: SandCrater, RockCrater @@ -285,34 +285,31 @@ TowerMissile: Wood: 50% Light: 80% Concrete: 50% - Explosion: med_explosion + Explosion: small_artillery ImpactSound: kaboom30 InfDeath: 4 SmudgeType: SandCrater, RockCrater Damage: 40 DevBullet: - ROF: 70 + ROF: 50 Range: 5 Report: TANKHVY1 - Burst: 2 - BurstDelay: 10 - Projectile: LaserZap - BeamRadius: 1 - BeamDuration: 8 - UsePlayerColor: true + Projectile: Bullet + Speed: 50 + Image: doubleblast Warhead: - Spread: 6 + Spread: 8 Versus: None: 100% Wood: 50% Light: 100% Heavy: 100% - Concrete: 50% - Explosion: large_explosion + Concrete: 80% + Explosion: shockwave InfDeath: 4 SmudgeType: SandCrater, RockCrater - Damage: 65 + Damage: 100 227mm: ROF: 100 @@ -341,7 +338,7 @@ DevBullet: Heavy: 80% Concrete: 80% InfDeath: 4 - Explosion: med_explosion + Explosion: artillery ImpactSound: EXPLSML2 SmudgeType: SandCrater, RockCrater Damage: 60 @@ -367,7 +364,7 @@ FakeMissile: Light: 0% Heavy: 0% Concrete: 0% - Explosion: med_explosion + Explosion: large_explosion SmudgeType: SandCrater, RockCrater Damage: 0 ImpactSound: EXPLSML2 @@ -392,7 +389,7 @@ FakeMissile: Light: 50% Heavy: 25% Concrete: 80% - Explosion: self_destruct + Explosion: large_explosion WaterExplosion: large_splash ImpactSound: explsml2 InfDeath: 3 @@ -400,7 +397,7 @@ FakeMissile: Damage: 100 Sound: - ROF: 85 + ROF: 100 Range: 8.5 Report: SONIC1 Projectile: LaserZap @@ -412,10 +409,10 @@ Sound: Versus: None: 60% Wood: 85% - Light: 90% + Light: 80% Concrete: 75% InfDeath: 6 - Damage: 90 + Damage: 150 ChainGun: ROF: 10 diff --git a/mods/d2k/weapons/explosions.yaml b/mods/d2k/weapons/explosions.yaml index 9a684614e6..3f32a35673 100644 --- a/mods/d2k/weapons/explosions.yaml +++ b/mods/d2k/weapons/explosions.yaml @@ -86,7 +86,7 @@ UnitExplodeTiny: Wood: 75% Light: 60% Heavy: 25% - Explosion: large_explosion + Explosion: med_explosion InfDeath: 4 ImpactSound: EXPLMD2, EXPLSML1, EXPLSML2, EXPLSML3