Merge pull request #10898 from pchote/map-format-eleven

Add support for multiple map categories.
2016-03-27 18:16:51 +03:00
parent 74d3f87a4c 3d499f34c6
commit c74ecd0794
191 changed files with 249 additions and 197 deletions
--- a/mods/d2k/maps/atreides-01a/map.yaml
+++ b/mods/d2k/maps/atreides-01a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 2,2,28,24

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/d2k/maps/atreides-01b/map.yaml
+++ b/mods/d2k/maps/atreides-01b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 2,2,28,24

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/d2k/maps/atreides-02a/map.yaml
+++ b/mods/d2k/maps/atreides-02a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 2,2,48,48

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/d2k/maps/atreides-02b/map.yaml
+++ b/mods/d2k/maps/atreides-02b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 2,2,48,48

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/d2k/maps/atreides-03a/map.yaml
+++ b/mods/d2k/maps/atreides-03a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 2,2,64,64

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/d2k/maps/battle-for-dune.oramap
+++ b/mods/d2k/maps/battle-for-dune.oramap
--- a/mods/d2k/maps/death-depths.oramap
+++ b/mods/d2k/maps/death-depths.oramap
--- a/mods/d2k/maps/desert-twister.oramap
+++ b/mods/d2k/maps/desert-twister.oramap
--- a/mods/d2k/maps/eyesofthedesert.oramap
+++ b/mods/d2k/maps/eyesofthedesert.oramap
--- a/mods/d2k/maps/imperial-basin.oramap
+++ b/mods/d2k/maps/imperial-basin.oramap
--- a/mods/d2k/maps/kanly.oramap
+++ b/mods/d2k/maps/kanly.oramap
--- a/mods/d2k/maps/mount-idaho/map.yaml
+++ b/mods/d2k/maps/mount-idaho/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 8,8,64,64

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/d2k/maps/oasis-conquest/map.yaml
+++ b/mods/d2k/maps/oasis-conquest/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 16,16,96,96

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/d2k/maps/pasty-mesa/map.yaml
+++ b/mods/d2k/maps/pasty-mesa/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 4,4,48,48

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/d2k/maps/shellmap/map.yaml
+++ b/mods/d2k/maps/shellmap/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: d2k

@@ -14,7 +14,7 @@ Bounds: 16,16,80,80

 Visibility: Shellmap

-Type: Shellmap
+Categories: Shellmap

 Players:
 	PlayerReference@Neutral:
--- a/mods/d2k/maps/the-duell.oramap
+++ b/mods/d2k/maps/the-duell.oramap
--- a/mods/d2k/maps/tucks-sietch.oramap
+++ b/mods/d2k/maps/tucks-sietch.oramap
--- a/mods/d2k/maps/venac-ditch.oramap
+++ b/mods/d2k/maps/venac-ditch.oramap
--- a/mods/d2k/maps/vladimirs-folly.oramap
+++ b/mods/d2k/maps/vladimirs-folly.oramap