diff --git a/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs b/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs index af31d0ef4a..6eb5ab7dfd 100644 --- a/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs +++ b/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs @@ -84,7 +84,7 @@ namespace OpenRA.Mods.D2k.UtilityCommands { 360, Pair.New("light_inf", "Harkonnen") }, { 361, Pair.New("trooper", "Harkonnen") }, { 362, Pair.New("fremen", "Harkonnen") }, - { 363, Pair.New("sardaukar", "Harkonnen") }, + { 363, Pair.New("mpsardaukar", "Harkonnen") }, { 364, Pair.New("engineer", "Harkonnen") }, { 365, Pair.New("harvester", "Harkonnen") }, { 366, Pair.New("mcv", "Harkonnen") }, diff --git a/mods/d2k/maps/atreides-05/rules.yaml b/mods/d2k/maps/atreides-05/rules.yaml index 3b79033a3c..e44bd0c397 100644 --- a/mods/d2k/maps/atreides-05/rules.yaml +++ b/mods/d2k/maps/atreides-05/rules.yaml @@ -57,7 +57,7 @@ grenadier: Buildable: Prerequisites: ~disabled -sardaukar: +mpsardaukar: Buildable: Prerequisites: ~disabled diff --git a/mods/d2k/maps/harkonnen-05/rules.yaml b/mods/d2k/maps/harkonnen-05/rules.yaml index e751988bb1..bb267bdd62 100644 --- a/mods/d2k/maps/harkonnen-05/rules.yaml +++ b/mods/d2k/maps/harkonnen-05/rules.yaml @@ -54,7 +54,7 @@ siege_tank: Buildable: Prerequisites: ~disabled -sardaukar: +mpsardaukar: Buildable: Prerequisites: ~disabled diff --git a/mods/d2k/maps/harkonnen-06a/rules.yaml b/mods/d2k/maps/harkonnen-06a/rules.yaml index 7498f8ddda..1b1acffa1d 100644 --- a/mods/d2k/maps/harkonnen-06a/rules.yaml +++ b/mods/d2k/maps/harkonnen-06a/rules.yaml @@ -58,7 +58,7 @@ missile_tank: Buildable: Prerequisites: ~heavy.missile_tank, upgrade.heavy, research_centre -sardaukar: +mpsardaukar: Buildable: Prerequisites: ~disabled diff --git a/mods/d2k/maps/harkonnen-06b/rules.yaml b/mods/d2k/maps/harkonnen-06b/rules.yaml index 5958352444..41b64f017a 100644 --- a/mods/d2k/maps/harkonnen-06b/rules.yaml +++ b/mods/d2k/maps/harkonnen-06b/rules.yaml @@ -58,7 +58,7 @@ missile_tank: Buildable: Prerequisites: ~heavy.missile_tank, upgrade.heavy, research_centre -sardaukar: +mpsardaukar: Buildable: Prerequisites: ~disabled diff --git a/mods/d2k/maps/harkonnen-07/rules.yaml b/mods/d2k/maps/harkonnen-07/rules.yaml index 88878893ae..1127d00c7b 100644 --- a/mods/d2k/maps/harkonnen-07/rules.yaml +++ b/mods/d2k/maps/harkonnen-07/rules.yaml @@ -69,6 +69,10 @@ sardaukar: Buildable: Prerequisites: ~barracks, ~player.corrino +mpsardaukar: + Buildable: + Prerequisites: ~disabled + grenadier: Buildable: Prerequisites: ~disabled diff --git a/mods/d2k/maps/harkonnen-08/rules.yaml b/mods/d2k/maps/harkonnen-08/rules.yaml index 1f9b8a210d..2973e7723f 100644 --- a/mods/d2k/maps/harkonnen-08/rules.yaml +++ b/mods/d2k/maps/harkonnen-08/rules.yaml @@ -36,7 +36,7 @@ frigate: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete VTOL: true # The frigate would teleport to land otherwise -sardaukar: +mpsardaukar: Buildable: Prerequisites: ~disabled diff --git a/mods/d2k/maps/harkonnen-09a/rules.yaml b/mods/d2k/maps/harkonnen-09a/rules.yaml index 7958ff3765..a3299a8c39 100644 --- a/mods/d2k/maps/harkonnen-09a/rules.yaml +++ b/mods/d2k/maps/harkonnen-09a/rules.yaml @@ -37,14 +37,9 @@ frigate: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete VTOL: true # The frigate would teleport to land otherwise -palace: - ProvidesPrerequisite@sardaukar: - Prerequisite: palace.sardaukar - Factions: corrino - -sardaukar: +mpsardaukar: Buildable: - Prerequisites: barracks, ~palace.sardaukar + Prerequisites: ~disabled grenadier: Buildable: diff --git a/mods/d2k/maps/harkonnen-09b/rules.yaml b/mods/d2k/maps/harkonnen-09b/rules.yaml index be014e1370..9909af20fe 100644 --- a/mods/d2k/maps/harkonnen-09b/rules.yaml +++ b/mods/d2k/maps/harkonnen-09b/rules.yaml @@ -40,14 +40,9 @@ frigate: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete VTOL: true # The frigate would teleport to land otherwise -palace: - ProvidesPrerequisite@sardaukar: - Prerequisite: palace.sardaukar - Factions: corrino - -sardaukar: +mpsardaukar: Buildable: - Prerequisites: barracks, ~palace.sardaukar + Prerequisites: ~disabled grenadier: Buildable: diff --git a/mods/d2k/maps/shellmap/d2k-shellmap.lua b/mods/d2k/maps/shellmap/d2k-shellmap.lua index 666ef894cb..74ed47b4e0 100644 --- a/mods/d2k/maps/shellmap/d2k-shellmap.lua +++ b/mods/d2k/maps/shellmap/d2k-shellmap.lua @@ -38,7 +38,7 @@ AtreidesVehicleTypes = { "trike", "trike", "quad" } AtreidesTankTypes = { "combat_tank_a", "combat_tank_a", "combat_tank_a", "siege_tank" } AtreidesStarportTypes = { "trike.starport", "quad.starport", "siege_tank.starport", "missile_tank.starport", "combat_tank_a.starport" } -HarkonnenInfantryTypes = { "light_inf", "light_inf", "light_inf", "trooper", "trooper", "sardaukar" } +HarkonnenInfantryTypes = { "light_inf", "light_inf", "light_inf", "trooper", "trooper", "mpsardaukar" } HarkonnenVehicleTypes = { "trike", "quad", "quad" } HarkonnenTankTypes = { "combat_tank_h", "combat_tank_h", "combat_tank_h", "siege_tank" } HarkonnenStarportTypes = { "trike.starport", "quad.starport", "siege_tank.starport", "missile_tank.starport", "combat_tank_h.starport" } diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml index 8b019de56f..5d2ce840e8 100644 --- a/mods/d2k/maps/shellmap/map.yaml +++ b/mods/d2k/maps/shellmap/map.yaml @@ -656,7 +656,7 @@ Actors: SubCell: 3 Facing: 0 TurretFacing: 0 - har_sardaukar: sardaukar + har_sardaukar: mpsardaukar Owner: Harkonnen Location: 82,28 SubCell: 3 diff --git a/mods/d2k/maps/shellmap/rules.yaml b/mods/d2k/maps/shellmap/rules.yaml index 43d44d54a2..402728dfb1 100644 --- a/mods/d2k/maps/shellmap/rules.yaml +++ b/mods/d2k/maps/shellmap/rules.yaml @@ -61,6 +61,12 @@ grenadier: Cost: 0 sardaukar: + Buildable: + Prerequisites: ~player.corrino + Valued: + Cost: 0 + +mpsardaukar: Valued: Cost: 0 diff --git a/mods/d2k/rules/ai.yaml b/mods/d2k/rules/ai.yaml index 8aecbb7997..2cd3d8ca10 100644 --- a/mods/d2k/rules/ai.yaml +++ b/mods/d2k/rules/ai.yaml @@ -51,9 +51,9 @@ Player: carryall: 1% light_inf: 65% trooper: 40% - sardaukar: 20% - harvester: 1% + mpsardaukar: 20% grenadier: 20% + harvester: 1% trike.starport: 5% quad.starport: 7.5% siege_tank.starport: 5% @@ -172,7 +172,7 @@ Player: carryall: 1% light_inf: 65% trooper: 40% - sardaukar: 20% + mpsardaukar: 20% grenadier: 20% harvester: 1% trike.starport: 7.5% @@ -292,7 +292,7 @@ Player: carryall: 1% light_inf: 65% trooper: 40% - sardaukar: 20% + mpsardaukar: 20% grenadier: 20% harvester: 1% trike.starport: 5% diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index e4f964bea0..d2a6ad79b1 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -25,7 +25,7 @@ engineer: Inherits: ^Infantry Buildable: Queue: Infantry - BuildPaletteOrder: 50 + BuildPaletteOrder: 30 Prerequisites: upgrade.barracks, ~techlevel.medium BuildDuration: 108 BuildDurationModifier: 40 @@ -82,7 +82,7 @@ thumper: -RevealOnFire: Buildable: Queue: Infantry - BuildPaletteOrder: 60 + BuildPaletteOrder: 40 Prerequisites: upgrade.barracks, ~techlevel.high BuildDuration: 108 BuildDurationModifier: 40 @@ -129,7 +129,7 @@ fremen: Name: Fremen Buildable: Queue: Infantry - BuildPaletteOrder: 100 + BuildPaletteOrder: 80 Prerequisites: ~disabled Description: Elite infantry unit armed with assault rifles and rockets\n Strong vs Infantry, Vehicles\n Weak vs Artillery\n Special Ability: Invisibility Mobile: @@ -169,7 +169,7 @@ grenadier: Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry - BuildPaletteOrder: 80 + BuildPaletteOrder: 60 Prerequisites: ~barracks.atreides, upgrade.barracks, high_tech_factory, ~techlevel.medium BuildDuration: 81 ## Wasn't converted, copied from Sardauker who has same value in TibEd. BuildDurationModifier: 40 @@ -200,13 +200,13 @@ sardaukar: Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry - BuildPaletteOrder: 80 - Prerequisites: ~barracks.harkonnen, upgrade.barracks, high_tech_factory, ~techlevel.medium + BuildPaletteOrder: 50 + Prerequisites: ~palace.sardaukar, ~techlevel.high BuildDuration: 81 BuildDurationModifier: 40 - Description: Elite assault infantry\n Strong vs Infantry, Vehicles\n Weak vs Artillery + Description: Elite assault infantry of Corrino\n Strong vs Infantry, Vehicles\n Weak vs Artillery Valued: - Cost: 200 + Cost: 120 Tooltip: Name: Sardaukar Health: @@ -229,6 +229,23 @@ sardaukar: EmptyWeapon: SardDeath Chance: 100 +mpsardaukar: + Inherits: sardaukar + Buildable: + Queue: Infantry + BuildPaletteOrder: 70 + Prerequisites: ~barracks.harkonnen, upgrade.barracks, high_tech_factory, ~techlevel.medium + BuildDuration: 133 + Description: Elite assault infantry of Harkonnen\n Strong vs Infantry, Vehicles\n Weak vs Artillery + Valued: + Cost: 200 + Armament@PRIMARY: + Weapon: M_LMG_H + Armament@SECONDARY: + Weapon: M_HMG_H + RenderSprites: + Image: sardaukar + saboteur: Inherits: ^Infantry Buildable: @@ -266,7 +283,7 @@ nsfremen: Inherits: fremen Tooltip: Buildable: - BuildPaletteOrder: 105 + BuildPaletteOrder: 90 Prerequisites: ~disabled Description: Elite infantry unit armed with assault rifles and rockets\n Strong vs Infantry, Vehicles\n Weak vs Artillery RenderSprites: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 3987559925..ddc9361254 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -1086,6 +1086,9 @@ palace: ProvidesPrerequisite@saboteur: Prerequisite: palace.saboteur Factions: ordos + ProvidesPrerequisite@sardaukar: + Prerequisite: palace.sardaukar + Factions: corrino PrimaryBuilding: PrimaryCondition: primary RequiresCondition: atreides || ordos diff --git a/mods/d2k/weapons/smallguns.yaml b/mods/d2k/weapons/smallguns.yaml index f1c93c036b..43970db1df 100644 --- a/mods/d2k/weapons/smallguns.yaml +++ b/mods/d2k/weapons/smallguns.yaml @@ -35,6 +35,10 @@ M_LMG: Inherits: ^MG ReloadDelay: 40 +M_LMG_H: + Inherits: M_LMG + ReloadDelay: 50 + M_HMG: Inherits: ^MG ReloadDelay: 40 @@ -54,6 +58,10 @@ M_HMG: cy: 20 harvester: 50 +M_HMG_H: + Inherits: M_HMG + ReloadDelay: 50 + Fremen_L: Inherits: M_HMG Report: BAZOOK2.WAV