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/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