Merge pull request #5353 from pchote/map-validation

Disable maps with invalid rules
2014-05-22 09:55:06 +02:00
parent 6081a4f16b 69e87b0057
commit e80eb7e0ee
13 changed files with 180 additions and 34 deletions
--- a/mods/cnc/chrome/lobby-mappreview.yaml
+++ b/mods/cnc/chrome/lobby-mappreview.yaml
@@ -38,6 +38,41 @@ Container@LOBBY_MAP_PREVIEW:
 					Height: 25
 					Font: Tiny
 					Align: Center
+		Container@MAP_INVALID:
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			Children:
+				Background@MAP_BG:
+					Width: PARENT_RIGHT
+					Height: 194
+					Background: panel-gray
+					Children:
+						MapPreview@MAP_PREVIEW:
+							X: 1
+							Y: 1
+							Width: PARENT_RIGHT-2
+							Height: PARENT_BOTTOM-2
+							TooltipContainer: TOOLTIP_CONTAINER
+				Label@MAP_TITLE:
+					Y: 197
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+				Label@MAP_STATUS_A:
+					Y: 212
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Tiny
+					Align: Center
+					Text: This map is not compatible
+				Label@MAP_STATUS_B:
+					Y: 225
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Tiny
+					Align: Center
+					Text: with this version of OpenRA
 		Container@MAP_DOWNLOADABLE:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -13,8 +13,8 @@ Folders:
 	~^Content/cnc

 MapFolders:
-	./mods/cnc/maps
-	~^maps/cnc
+	./mods/cnc/maps: System
+	~^maps/cnc: User

 Packages:
 	bluetib.mix
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -17,8 +17,8 @@ Folders:
 	~^Content/d2k/Music

 MapFolders:
-	./mods/d2k/maps
-	~^maps/d2k
+	./mods/d2k/maps: System
+	~^maps/d2k: User

 Packages:
 	SOUND.RS
--- a/mods/modchooser/mod.yaml
+++ b/mods/modchooser/mod.yaml
@@ -47,5 +47,4 @@ Fonts:
 	TinyBold:
 		Font:FreeSansBold.ttf
 		Size:10
-Packages:
 LobbyDefaults:
--- a/mods/ra/chrome/lobby-mappreview.yaml
+++ b/mods/ra/chrome/lobby-mappreview.yaml
@@ -38,6 +38,41 @@ Container@LOBBY_MAP_PREVIEW:
 					Height: 25
 					Font: Tiny
 					Align: Center
+		Container@MAP_INVALID:
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			Children:
+				Background@MAP_BG:
+					Width: PARENT_RIGHT
+					Height: 214
+					Background: dialog3
+					Children:
+						MapPreview@MAP_PREVIEW:
+							X: 1
+							Y: 1
+							Width: PARENT_RIGHT-2
+							Height: PARENT_BOTTOM-2
+							TooltipContainer: TOOLTIP_CONTAINER
+				Label@MAP_TITLE:
+					Y: 215
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+				Label@MAP_STATUS_A:
+					Y:232
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Tiny
+					Align: Center
+					Text: This map is not compatible
+				Label@MAP_STATUS_B:
+					Y:245
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Tiny
+					Align: Center
+					Text: with this version of OpenRA
 		Container@MAP_DOWNLOADABLE:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -13,8 +13,8 @@ Folders:
 	~^Content/ra

 MapFolders:
-	./mods/ra/maps
-	~^maps/ra
+	./mods/ra/maps: System
+	~^maps/ra: User

 Packages:
 	~main.mix
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -15,8 +15,8 @@ Folders:
 	./mods/ra/uibits

 MapFolders:
-	./mods/ts/maps
-	~^maps/ts
+	./mods/ts/maps: System
+	~^maps/ts: User

 Packages:
 # Tiberian Sun