From 65e40194240f6f856b91d600253560941250d8ff Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Thu, 30 Nov 2017 13:45:56 +0300 Subject: [PATCH] Update some prerequisites to include subfactions too --- mods/d2k/maps/atreides-05/rules.yaml | 4 ---- mods/d2k/maps/harkonnen-05/rules.yaml | 2 +- mods/d2k/maps/harkonnen-06a/rules.yaml | 2 +- mods/d2k/maps/harkonnen-06b/rules.yaml | 2 +- mods/d2k/maps/ordos-04/rules.yaml | 8 ------- mods/d2k/rules/starport.yaml | 6 ++--- mods/d2k/rules/structures.yaml | 33 +++++++++++++++++++++----- mods/d2k/rules/vehicles.yaml | 12 +++++----- 8 files changed, 39 insertions(+), 30 deletions(-) diff --git a/mods/d2k/maps/atreides-05/rules.yaml b/mods/d2k/maps/atreides-05/rules.yaml index f99e9d4d91..3b79033a3c 100644 --- a/mods/d2k/maps/atreides-05/rules.yaml +++ b/mods/d2k/maps/atreides-05/rules.yaml @@ -76,7 +76,3 @@ siege_tank: missile_tank: Buildable: Prerequisites: upgrade.heavy, research_centre - -combat_tank_o.starport: - Buildable: - Prerequisites: starport diff --git a/mods/d2k/maps/harkonnen-05/rules.yaml b/mods/d2k/maps/harkonnen-05/rules.yaml index 0ff1f584a3..e751988bb1 100644 --- a/mods/d2k/maps/harkonnen-05/rules.yaml +++ b/mods/d2k/maps/harkonnen-05/rules.yaml @@ -48,7 +48,7 @@ research_centre: missile_tank: Buildable: - Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre + Prerequisites: ~heavy.missile_tank, upgrade.heavy, research_centre siege_tank: Buildable: diff --git a/mods/d2k/maps/harkonnen-06a/rules.yaml b/mods/d2k/maps/harkonnen-06a/rules.yaml index 69c7d9c37d..7498f8ddda 100644 --- a/mods/d2k/maps/harkonnen-06a/rules.yaml +++ b/mods/d2k/maps/harkonnen-06a/rules.yaml @@ -56,7 +56,7 @@ starport: missile_tank: Buildable: - Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre + Prerequisites: ~heavy.missile_tank, upgrade.heavy, research_centre sardaukar: Buildable: diff --git a/mods/d2k/maps/harkonnen-06b/rules.yaml b/mods/d2k/maps/harkonnen-06b/rules.yaml index 77279f792b..5958352444 100644 --- a/mods/d2k/maps/harkonnen-06b/rules.yaml +++ b/mods/d2k/maps/harkonnen-06b/rules.yaml @@ -56,7 +56,7 @@ starport: missile_tank: Buildable: - Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre + Prerequisites: ~heavy.missile_tank, upgrade.heavy, research_centre sardaukar: Buildable: diff --git a/mods/d2k/maps/ordos-04/rules.yaml b/mods/d2k/maps/ordos-04/rules.yaml index bdbfd80341..446cc1ba12 100644 --- a/mods/d2k/maps/ordos-04/rules.yaml +++ b/mods/d2k/maps/ordos-04/rules.yaml @@ -54,14 +54,6 @@ engineer: Buildable: Prerequisites: upgrade.barracks -light_factory: - ProvidesPrerequisite@ordos: - Factions: ordos, smuggler - -heavy_factory: - ProvidesPrerequisite@ordos: - Factions: ordos, smuggler - repair_pad: Buildable: Prerequisites: heavy_factory, upgrade.heavy diff --git a/mods/d2k/rules/starport.yaml b/mods/d2k/rules/starport.yaml index 0f652a6b45..f3a0399bdc 100644 --- a/mods/d2k/rules/starport.yaml +++ b/mods/d2k/rules/starport.yaml @@ -61,7 +61,7 @@ missile_tank.starport: combat_tank_a.starport: Inherits: combat_tank_a Buildable: - Prerequisites: ~starport.atreides + Prerequisites: ~starport.atreides_combat Queue: Starport Valued: Cost: 875 @@ -71,7 +71,7 @@ combat_tank_a.starport: combat_tank_h.starport: Inherits: combat_tank_h Buildable: - Prerequisites: ~starport.harkonnen + Prerequisites: ~starport.harkonnen_combat Queue: Starport Valued: Cost: 875 @@ -81,7 +81,7 @@ combat_tank_h.starport: combat_tank_o.starport: Inherits: combat_tank_o Buildable: - Prerequisites: ~starport.ordos + Prerequisites: ~starport.ordos_combat Queue: Starport Valued: Cost: 875 diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index b5fc62e297..39e2433077 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -417,9 +417,12 @@ light_factory: ProvidesPrerequisite@harkonnen: Prerequisite: light.harkonnen Factions: harkonnen - ProvidesPrerequisite@trikes: - Prerequisite: light.regulartrikes - Factions: atreides, harkonnen + ProvidesPrerequisite@trike: + Prerequisite: light.trike + Factions: atreides, fremen, harkonnen, corrino + ProvidesPrerequisite@raider: + Prerequisite: light.raider + Factions: ordos, smuggler, mercenary ProvidesPrerequisite@buildingname: WithProductionOverlay@WELDING: Sequence: production-welding @@ -498,9 +501,18 @@ heavy_factory: ProvidesPrerequisite@harkonnen: Prerequisite: heavy.harkonnen Factions: harkonnen - ProvidesPrerequisite@missiletank: - Prerequisite: heavy.missiletank - Factions: atreides, harkonnen + ProvidesPrerequisite@atreides_combat: + Prerequisite: heavy.atreides_combat + Factions: atreides, fremen + ProvidesPrerequisite@ordos_combat: + Prerequisite: heavy.ordos_combat + Factions: ordos, smuggler, mercenary + ProvidesPrerequisite@harkonnen_combat: + Prerequisite: heavy.harkonnen_combat + Factions: harkonnen, corrino + ProvidesPrerequisite@missile_tank: + Prerequisite: heavy.missile_tank + Factions: atreides, fremen, harkonnen, corrino RenderSprites: Image: heavy.ordos FactionImages: @@ -649,6 +661,15 @@ starport: ProvidesPrerequisite@harkonnen: Prerequisite: starport.harkonnen Factions: harkonnen + ProvidesPrerequisite@atreides_combat: + Prerequisite: starport.atreides_combat + Factions: atreides, fremen + ProvidesPrerequisite@ordos_combat: + Prerequisite: starport.ordos_combat + Factions: ordos, smuggler, mercenary + ProvidesPrerequisite@harkonnen_combat: + Prerequisite: starport.harkonnen_combat + Factions: harkonnen, corrino Power: Amount: -150 ProvidesPrerequisite@buildingname: diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 04ed307d54..a29243ede5 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -105,7 +105,7 @@ trike: Buildable: Queue: Vehicle BuildPaletteOrder: 10 - Prerequisites: ~light.regulartrikes + Prerequisites: ~light.trike BuildDuration: 194 BuildDurationModifier: 40 Description: Fast scout\n Strong vs Infantry\n Weak vs Tanks @@ -231,7 +231,7 @@ missile_tank: Name: Missile Tank Buildable: Queue: Armor - Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre, ~techlevel.high + Prerequisites: ~heavy.missile_tank, upgrade.heavy, research_centre, ~techlevel.high BuildPaletteOrder: 60 BuildDuration: 441 BuildDurationModifier: 40 @@ -374,7 +374,7 @@ raider: Buildable: Queue: Vehicle BuildPaletteOrder: 10 - Prerequisites: ~light.ordos + Prerequisites: ~light.raider BuildDuration: 194 BuildDurationModifier: 40 Description: Improved Scout\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks @@ -516,7 +516,7 @@ deviator: combat_tank_a: Inherits: ^combat_tank Buildable: - Prerequisites: ~heavy.atreides + Prerequisites: ~heavy.atreides_combat Armament: Weapon: 80mm_A SpawnActorOnDeath: @@ -525,7 +525,7 @@ combat_tank_a: combat_tank_h: Inherits: ^combat_tank Buildable: - Prerequisites: ~heavy.harkonnen + Prerequisites: ~heavy.harkonnen_combat Armament: Weapon: 80mm_H Mobile: @@ -538,7 +538,7 @@ combat_tank_h: combat_tank_o: Inherits: ^combat_tank Buildable: - Prerequisites: ~heavy.ordos + Prerequisites: ~heavy.ordos_combat Turreted: TurnSpeed: 5 Armament: