Merge pull request #3020 from pchote/shroud-sanity

Refactor per-player shrouds.
2013-04-12 01:53:31 -07:00
parent 4e33f26859 400ad49de0
commit b649b4b7bb
45 changed files with 364 additions and 340 deletions
--- a/mods/cnc-classic/rules/system.yaml
+++ b/mods/cnc-classic/rules/system.yaml
@@ -95,6 +95,7 @@ Player:
 	DebugResourceOre:
 	DebugResourceOreCapacity:
 	Shroud:
+		Fog: false
 	BaseAttackNotifier:
 	PlayerStatistics:

@@ -159,7 +160,6 @@ World:
 		B: 0
 		A: 180
 	ShroudPalette:
-	FogPalette:
 	Country@gdi:
 		Name: GDI
 		Race: gdi
@@ -204,7 +204,6 @@ World:
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -257,8 +257,11 @@ World:
 		G: 0
 		B: 0
 		A: 180
-	ShroudPalette:
-	FogPalette:
+	ShroudPalette@shroud:
+		Type: Shroud
+	ShroudPalette@fog:
+		Name: fog
+		Type: Fog
 	Country@gdi:
 		Name: GDI
 		Race: gdi
@@ -306,8 +309,6 @@ World:
 	MPStartLocations:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
-	Fog:
 	CrateSpawner:
 		Minimum: 1
 		Maximum: 6
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -340,8 +340,11 @@ World:
 		G: 0
 		B: 0
 		A: 180
-	ShroudPalette:
-	FogPalette:
+	ShroudPalette@shroud:
+		Type: Shroud
+	ShroudPalette@fog:
+		Name: fog
+		Type: Fog
 	Country@Atreides:
 		Name: Atreides
 		Race: atreides
@@ -388,8 +391,6 @@ World:
 		Faction: ordos
 	SpatialBins:
 		BinSize: 4
-	Shroud:
-	Fog:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
--- a/mods/ra-classic/rules/system.yaml
+++ b/mods/ra-classic/rules/system.yaml
@@ -122,6 +122,7 @@ Player:
 	DebugResourceOreCapacity:
 	GpsWatcher:
 	Shroud:
+		Fog: false
 	BaseAttackNotifier:
 	PlayerStatistics:

@@ -193,7 +194,6 @@ World:
 		B: 0
 		A: 180
 	ShroudPalette:
-	FogPalette:
 	Country@0:
 		Name: Allies
 		Race: allies
@@ -236,7 +236,6 @@ World:
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -574,8 +574,11 @@ World:
 		G: 0
 		B: 0
 		A: 180
-	ShroudPalette:
-	FogPalette:
+	ShroudPalette@shroud:
+		Type: Shroud
+	ShroudPalette@fog:
+		Name: fog
+		Type: Fog
 	Country@0:
 		Name: Allies
 		Race: allies
@@ -621,8 +624,6 @@ World:
 	SpawnMPUnits:
 	SpatialBins:
 		BinSize: 4
-	Shroud:
-	Fog:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState: