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/ra/maps/Sahara.oramap
+++ b/mods/ra/maps/Sahara.oramap
--- a/mods/ra/maps/a-path-beyond.oramap
+++ b/mods/ra/maps/a-path-beyond.oramap
--- a/mods/ra/maps/alaska-anarchy-redux.oramap
+++ b/mods/ra/maps/alaska-anarchy-redux.oramap
--- a/mods/ra/maps/all-connected.oramap
+++ b/mods/ra/maps/all-connected.oramap
--- a/mods/ra/maps/allies-01/map.yaml
+++ b/mods/ra/maps/allies-01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 49,45,30,36

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 43,44,50,42

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 35,48,72,36

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 46,31,75,75

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/allies-05a/map.yaml
+++ b/mods/ra/maps/allies-05a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 12,48,60,64

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/arctic-triangle-affair.oramap
+++ b/mods/ra/maps/arctic-triangle-affair.oramap
--- a/mods/ra/maps/asymmetric-battle.oramap
+++ b/mods/ra/maps/asymmetric-battle.oramap
--- a/mods/ra/maps/bad-neighbors.oramap
+++ b/mods/ra/maps/bad-neighbors.oramap
--- a/mods/ra/maps/barracuda.oramap
+++ b/mods/ra/maps/barracuda.oramap
--- a/mods/ra/maps/behind-the-veil.oramap
+++ b/mods/ra/maps/behind-the-veil.oramap
--- a/mods/ra/maps/blitzkrieg.oramap
+++ b/mods/ra/maps/blitzkrieg.oramap
--- a/mods/ra/maps/bloody-delta.oramap
+++ b/mods/ra/maps/bloody-delta.oramap
--- a/mods/ra/maps/bombardment-islands.oramap
+++ b/mods/ra/maps/bombardment-islands.oramap
--- a/mods/ra/maps/bomber-john/map.yaml
+++ b/mods/ra/maps/bomber-john/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Minigame
+Categories: Minigame

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/breaking-point.oramap
+++ b/mods/ra/maps/breaking-point.oramap
--- a/mods/ra/maps/burlesca/map.yaml
+++ b/mods/ra/maps/burlesca/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/calm-before-storm.oramap
+++ b/mods/ra/maps/calm-before-storm.oramap
--- a/mods/ra/maps/center-of-attention-redux-2/map.yaml
+++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 15,10,105,114

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/central-conflict.oramap
+++ b/mods/ra/maps/central-conflict.oramap
--- a/mods/ra/maps/chaos-canyon.oramap
+++ b/mods/ra/maps/chaos-canyon.oramap
--- a/mods/ra/maps/chokepoint.oramap
+++ b/mods/ra/maps/chokepoint.oramap
--- a/mods/ra/maps/coastal-influence.oramap
+++ b/mods/ra/maps/coastal-influence.oramap
--- a/mods/ra/maps/cold-front.oramap
+++ b/mods/ra/maps/cold-front.oramap
--- a/mods/ra/maps/contact.oramap
+++ b/mods/ra/maps/contact.oramap
--- a/mods/ra/maps/desert-shellmap/map.yaml
+++ b/mods/ra/maps/desert-shellmap/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 1,1,126,126

 Visibility: Shellmap

-Type: Shellmap
+Categories: Shellmap

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/doubles.oramap
+++ b/mods/ra/maps/doubles.oramap
--- a/mods/ra/maps/doughnut.oramap
+++ b/mods/ra/maps/doughnut.oramap
--- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
+++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Drop Zone
+Categories: Drop Zone

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Drop Zone
+Categories: Drop Zone

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

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Drop Zone
+Categories: Drop Zone

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/east-vs-west.oramap
+++ b/mods/ra/maps/east-vs-west.oramap
--- a/mods/ra/maps/encounter.oramap
+++ b/mods/ra/maps/encounter.oramap
--- a/mods/ra/maps/engagement.oramap
+++ b/mods/ra/maps/engagement.oramap
--- a/mods/ra/maps/equal-opportunity.oramap
+++ b/mods/ra/maps/equal-opportunity.oramap
--- a/mods/ra/maps/first-come-first-served.oramap
+++ b/mods/ra/maps/first-come-first-served.oramap
--- a/mods/ra/maps/forest-path.oramap
+++ b/mods/ra/maps/forest-path.oramap
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Minigame
+Categories: Minigame

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/ghost-town.oramap
+++ b/mods/ra/maps/ghost-town.oramap
--- a/mods/ra/maps/haos-ridges.oramap
+++ b/mods/ra/maps/haos-ridges.oramap
--- a/mods/ra/maps/high-and-low-extended.oramap
+++ b/mods/ra/maps/high-and-low-extended.oramap
--- a/mods/ra/maps/high-and-low.oramap
+++ b/mods/ra/maps/high-and-low.oramap
--- a/mods/ra/maps/intervention/map.yaml
+++ b/mods/ra/maps/intervention/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: MissionSelector

-Type: Mission
+Categories: Mission

 LockPreview: True

--- a/mods/ra/maps/island-hoppers.oramap
+++ b/mods/ra/maps/island-hoppers.oramap
--- a/mods/ra/maps/keep-off-the-grass-2.oramap
+++ b/mods/ra/maps/keep-off-the-grass-2.oramap
--- a/mods/ra/maps/koth-hopes-anchor/map.yaml
+++ b/mods/ra/maps/koth-hopes-anchor/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 2,2,110,124

 Visibility: Lobby

-Type: KotH
+Categories: KotH

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/mad-science.oramap
+++ b/mods/ra/maps/mad-science.oramap
--- a/mods/ra/maps/man-to-man.oramap
+++ b/mods/ra/maps/man-to-man.oramap
--- a/mods/ra/maps/marooned-2.oramap
+++ b/mods/ra/maps/marooned-2.oramap
--- a/mods/ra/maps/mass-confliction.oramap
+++ b/mods/ra/maps/mass-confliction.oramap
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 19,16,87,88

 Visibility: MissionSelector

-Type: Mission
+Categories: Mission

 LockPreview: True

--- a/mods/ra/maps/north-by-northwest.oramap
+++ b/mods/ra/maps/north-by-northwest.oramap
--- a/mods/ra/maps/ore-lord.oramap
+++ b/mods/ra/maps/ore-lord.oramap
--- a/mods/ra/maps/pearly-wastelands.oramap
+++ b/mods/ra/maps/pearly-wastelands.oramap
--- a/mods/ra/maps/poland-raid/map.yaml
+++ b/mods/ra/maps/poland-raid/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/pressure.oramap
+++ b/mods/ra/maps/pressure.oramap
--- a/mods/ra/maps/puddles-redux.oramap
+++ b/mods/ra/maps/puddles-redux.oramap
--- a/mods/ra/maps/raraku.oramap
+++ b/mods/ra/maps/raraku.oramap
--- a/mods/ra/maps/regeneration-basin.oramap
+++ b/mods/ra/maps/regeneration-basin.oramap
--- a/mods/ra/maps/ring-of-fire.oramap
+++ b/mods/ra/maps/ring-of-fire.oramap
--- a/mods/ra/maps/seaside-2.oramap
+++ b/mods/ra/maps/seaside-2.oramap
--- a/mods/ra/maps/sidestep.oramap
+++ b/mods/ra/maps/sidestep.oramap
--- a/mods/ra/maps/singles.oramap
+++ b/mods/ra/maps/singles.oramap
--- a/mods/ra/maps/snow
+++ b/mods/ra/maps/snow
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Conquest
+Categories: Conquest

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/snowy-island.oramap
+++ b/mods/ra/maps/snowy-island.oramap
--- a/mods/ra/maps/soviet-01/map.yaml
+++ b/mods/ra/maps/soviet-01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 32,47,32,38

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 36,38,50,40

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 36,52,54,35

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 24,22,70,49

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/soviet-04a/map.yaml
+++ b/mods/ra/maps/soviet-04a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 38,45,72,46

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/soviet-04b/map.yaml
+++ b/mods/ra/maps/soviet-04b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 28,45,91,49

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/soviet-05/map.yaml
+++ b/mods/ra/maps/soviet-05/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 20,42,90,50

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/soviet-06a/map.yaml
+++ b/mods/ra/maps/soviet-06a/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 5,1,93,53

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/soviet-06b/map.yaml
+++ b/mods/ra/maps/soviet-06b/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 18,10,81,58

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/soviet-07/map.yaml
+++ b/mods/ra/maps/soviet-07/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 40,43,70,45

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/ra/maps/styrian-mountains.oramap
+++ b/mods/ra/maps/styrian-mountains.oramap
--- a/mods/ra/maps/suffrage.oramap
+++ b/mods/ra/maps/suffrage.oramap
--- a/mods/ra/maps/survival01/map.yaml
+++ b/mods/ra/maps/survival01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

@@ -14,7 +14,7 @@ Bounds: 4,4,88,56

 Visibility: MissionSelector

-Type: Mission
+Categories: Mission

 LockPreview: True

--- a/mods/ra/maps/survival02/map.yaml
+++ b/mods/ra/maps/survival02/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: MissionSelector

-Type: Mission
+Categories: Mission

 LockPreview: True

--- a/mods/ra/maps/synergy.oramap
+++ b/mods/ra/maps/synergy.oramap
--- a/mods/ra/maps/tabula-rasa.oramap
+++ b/mods/ra/maps/tabula-rasa.oramap
--- a/mods/ra/maps/tainted-peak.oramap
+++ b/mods/ra/maps/tainted-peak.oramap
--- a/mods/ra/maps/temperal.oramap
+++ b/mods/ra/maps/temperal.oramap
--- a/mods/ra/maps/tournament-island.oramap
+++ b/mods/ra/maps/tournament-island.oramap
--- a/mods/ra/maps/training-camp/map.yaml
+++ b/mods/ra/maps/training-camp/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: ra

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

 Visibility: Lobby

-Type: Minigame
+Categories: Minigame

 Players:
 	PlayerReference@Neutral:
--- a/mods/ra/maps/vegetation.oramap
+++ b/mods/ra/maps/vegetation.oramap