Update D2K FactionImages

Default is now Ordos, as there are 3 ordos subfactions and 2 for others.
Fremen now uses Atreides Structures as in original, rather than
Harkonnen

mods/d2k/rules/misc.yaml

@@ -224,11 +224,12 @@ upgrade.conyard:
 	Valued:
 		Cost: 1000
 	RenderSprites:
-		Image: conyard.harkonnen
+		Image: conyard.ordos
 		FactionImages:
 			atreides: conyard.atreides
-			ordos: conyard.ordos
+			fremen: conyard.atreides
-			corrino: conyard.corrino
+			harkonnen: conyard.harkonnen
+			corrino: conyard.harkonnen
 	ProvidesPrerequisite@upgradename:
 
 upgrade.barracks:
@@ -247,12 +248,12 @@ upgrade.barracks:
 	Valued:
 		Cost: 500
 	RenderSprites:
-		Image: barracks.harkonnen
+		Image: barracks.ordos
 		FactionImages:
 			atreides: barracks.atreides
-			ordos: barracks.ordos
+			fremen: barracks.atreides
-			mercenary: barracks.ordos
+			harkonnen: barracks.harkonnen
-			smuggler: barracks.ordos
+			corrino: barracks.harkonnen
 	ProvidesPrerequisite@upgradename:
 
 upgrade.light:
@@ -271,12 +272,12 @@ upgrade.light:
 	Valued:
 		Cost: 400
 	RenderSprites:
-		Image: light.harkonnen
+		Image: light.ordos
 		FactionImages:
 			atreides: light.atreides
-			ordos: light.ordos
+			fremen: light.atreides
-			mercenary: light.ordos
+			harkonnen: light.harkonnen
-			smuggler: light.ordos
+			corrino: light.harkonnen
 	ProvidesPrerequisite@upgradename:
 
 upgrade.heavy:
@@ -295,12 +296,13 @@ upgrade.heavy:
 	Valued:
 		Cost: 800
 	RenderSprites:
-		Image: heavy.harkonnen
+		Image: heavy.ordos
 		FactionImages:
 			atreides: heavy.atreides
-			ordos: heavy.ordos
+			fremen: heavy.atreides
+			harkonnen: heavy.harkonnen
+			corrino: heavy.harkonnen
 			mercenary: heavy.mercenary
-			smuggler: heavy.ordos
 	ProvidesPrerequisite@upgradename:
 
 upgrade.hightech:

mods/d2k/rules/structures.yaml

@@ -91,12 +91,12 @@ construction_yard:
 	Power:
 		Amount: 20
 	RenderSprites:
-		Image: conyard.harkonnen
+		Image: conyard.ordos
 		FactionImages:
 			atreides: conyard.atreides
-			ordos: conyard.ordos
+			fremen: conyard.atreides
-			smuggler: conyard.ordos
+			harkonnen: conyard.harkonnen
-			mercenary: conyard.ordos
+			corrino: conyard.harkonnen
 	WithBuildingPlacedOverlay:
 		Palette: d2k
 	PrimaryBuilding:
@@ -151,12 +151,12 @@ wind_trap:
 	RevealsShroud:
 		Range: 3c768
 	RenderSprites:
-		Image: power.harkonnen
+		Image: power.ordos
 		FactionImages:
 			atreides: power.atreides
-			ordos: power.ordos
+			fremen: power.atreides
-			smuggler: power.ordos
+			harkonnen: power.harkonnen
-			mercenary: power.ordos
+			corrino: power.harkonnen
 	WithIdleOverlay@ZAPS:
 		Sequence: idle-zaps
 	Power:
@@ -221,12 +221,12 @@ barracks:
 	Power:
 		Amount: -30
 	RenderSprites:
-		Image: barracks.harkonnen
+		Image: barracks.ordos
 		FactionImages:
 			atreides: barracks.atreides
-			ordos: barracks.ordos
+			fremen: barracks.atreides
-			smuggler: barracks.ordos
+			harkonnen: barracks.harkonnen
-			mercenary: barracks.ordos
+			corrino: barracks.harkonnen
 	ProvidesPrerequisite@buildingname:
 	GrantConditionOnPrerequisite:
 		Prerequisites: upgrade.barracks
@@ -297,12 +297,12 @@ refinery:
 		DeliveringActor: carryall.reinforce
 		Facing: 160
 	RenderSprites:
-		Image: refinery.harkonnen
+		Image: refinery.ordos
 		FactionImages:
 			atreides: refinery.atreides
-			ordos: refinery.ordos
+			fremen: refinery.atreides
-			smuggler: refinery.ordos
+			harkonnen: refinery.harkonnen
-			mercenary: refinery.ordos
+			corrino: refinery.harkonnen
 	WithDockedOverlay@SMOKE:
 		Sequence: smoke
 	Power:
@@ -336,12 +336,12 @@ silo:
 	RevealsShroud:
 		Range: 2c768
 	RenderSprites:
-		Image: silo.harkonnen
+		Image: silo.ordos
 		FactionImages:
 			atreides: silo.atreides
-			ordos: silo.ordos
+			fremen: silo.atreides
-			smuggler: silo.ordos
+			harkonnen: silo.harkonnen
-			mercenary: silo.ordos
+			corrino: silo.harkonnen
 	WithSpriteBody:
 	WithSiloAnimation:
 	StoresResources:
@@ -392,12 +392,12 @@ light_factory:
 	RevealsShroud:
 		Range: 4c768
 	RenderSprites:
-		Image: light.harkonnen
+		Image: light.ordos
 		FactionImages:
 			atreides: light.atreides
-			ordos: light.ordos
+			fremen: light.atreides
-			smuggler: light.ordos
+			harkonnen: light.harkonnen
-			mercenary: light.ordos
+			corrino: light.harkonnen
 	RallyPoint:
 		Offset: 2,2
 	Exit@1:
@@ -502,12 +502,13 @@ heavy_factory:
 		Prerequisite: heavy.missiletank
 		Factions: atreides, harkonnen
 	RenderSprites:
-		Image: heavy.harkonnen
+		Image: heavy.ordos
 		FactionImages:
 			atreides: heavy.atreides
-			ordos: heavy.ordos
+			fremen: heavy.atreides
+			harkonnen: heavy.harkonnen
+			corrino: heavy.harkonnen
 			mercenary: heavy.mercenary
-			smuggler: heavy.ordos
 	WithProductionOverlay@WELDING:
 		Sequence: production-welding
 	WithIdleOverlay@TOP:
@@ -566,12 +567,12 @@ outpost:
 	ProvidesRadar:
 		RequiresCondition: !disabled
 	RenderSprites:
-		Image: outpost.harkonnen
+		Image: outpost.ordos
 		FactionImages:
 			atreides: outpost.atreides
-			ordos: outpost.ordos
+			fremen: outpost.atreides
-			smuggler: outpost.ordos
+			harkonnen: outpost.harkonnen
-			mercenary: outpost.ordos
+			corrino: outpost.harkonnen
 	WithIdleOverlay@DISH:
 		Sequence: idle-dish
 		PauseOnCondition: disabled
@@ -627,12 +628,13 @@ starport:
 		Produces: Starport
 		ActorType: frigate
 	RenderSprites:
-		Image: starport.harkonnen
+		Image: starport.ordos
 		FactionImages:
 			atreides: starport.atreides
-			ordos: starport.ordos
+			fremen: starport.atreides
+			harkonnen: starport.harkonnen
+			corrino: starport.harkonnen
 			smuggler: starport.smuggler
-			mercenary: starport.ordos
 	WithDeliveryOverlay:
 		Palette: starportlights
 	ProductionBar:
@@ -847,12 +849,12 @@ repair_pad:
 	RallyPoint:
 		Offset: 1,3
 	RenderSprites:
-		Image: repair_pad.harkonnen
+		Image: repair_pad.ordos
 		FactionImages:
 			atreides: repair_pad.atreides
-			ordos: repair_pad.ordos
+			fremen: repair_pad.atreides
-			smuggler: repair_pad.ordos
+			harkonnen: repair_pad.harkonnen
-			mercenary: repair_pad.ordos
+			corrino: repair_pad.harkonnen
 	WithRepairOverlay:
 		Palette: effect75alpha
 	Power:
@@ -901,12 +903,12 @@ high_tech_factory:
 	RevealsShroud:
 		Range: 4c768
 	RenderSprites:
-		Image: hightech.harkonnen
+		Image: hightech.ordos
 		FactionImages:
 			atreides: hightech.atreides
-			ordos: hightech.ordos
+			fremen: hightech.atreides
-			smuggler: hightech.ordos
+			harkonnen: hightech.harkonnen
-			mercenary: hightech.ordos
+			corrino: hightech.harkonnen
 	ProvidesPrerequisite@upgrade:
 		Prerequisite: hightech.atreides
 		Factions: atreides
@@ -976,12 +978,12 @@ research_centre:
 	RevealsShroud:
 		Range: 4c768
 	RenderSprites:
-		Image: research.harkonnen
+		Image: research.ordos
 		FactionImages:
 			atreides: research.atreides
-			ordos: research.ordos
+			fremen: research.atreides
-			smuggler: research.ordos
+			harkonnen: research.harkonnen
-			mercenary: research.ordos
+			corrino: research.harkonnen
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
 	Power:
@@ -1028,13 +1030,12 @@ palace:
 	RevealsShroud:
 		Range: 4c768
 	RenderSprites:
-		Image: palace.harkonnen
+		Image: palace.ordos
 		FactionImages:
 			atreides: palace.atreides
-			ordos: palace.ordos
+			fremen: palace.atreides
+			harkonnen: palace.harkonnen
 			corrino: palace.corrino
-			smuggler: palace.ordos
-			mercenary: palace.ordos
 	Power:
 		Amount: -200
 	ProvidesPrerequisite@nuke: