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/cnc/maps/IN-IslandDuel.oramap
+++ b/mods/cnc/maps/IN-IslandDuel.oramap
--- a/mods/cnc/maps/Instant_Karma.oramap
+++ b/mods/cnc/maps/Instant_Karma.oramap
--- a/mods/cnc/maps/Nullpeter.oramap
+++ b/mods/cnc/maps/Nullpeter.oramap
--- a/mods/cnc/maps/_lostsouls.oramap
+++ b/mods/cnc/maps/_lostsouls.oramap
--- a/mods/cnc/maps/aggressivetendencies.oramap
+++ b/mods/cnc/maps/aggressivetendencies.oramap
--- a/mods/cnc/maps/avocado.oramap
+++ b/mods/cnc/maps/avocado.oramap
--- a/mods/cnc/maps/break_of_day.oramap
+++ b/mods/cnc/maps/break_of_day.oramap
--- a/mods/cnc/maps/chokepoint.oramap
+++ b/mods/cnc/maps/chokepoint.oramap
--- a/mods/cnc/maps/chord_simple.oramap
+++ b/mods/cnc/maps/chord_simple.oramap
--- a/mods/cnc/maps/cnc64gdi01/map.yaml
+++ b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: cnc

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

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/cnc/maps/dead_in_motion_2.oramap
+++ b/mods/cnc/maps/dead_in_motion_2.oramap
--- a/mods/cnc/maps/deterring_democracy.oramap
+++ b/mods/cnc/maps/deterring_democracy.oramap
--- a/mods/cnc/maps/deterring_democracy_plus.oramap
+++ b/mods/cnc/maps/deterring_democracy_plus.oramap
--- a/mods/cnc/maps/eastwest3.oramap
+++ b/mods/cnc/maps/eastwest3.oramap
--- a/mods/cnc/maps/escalations.oramap
+++ b/mods/cnc/maps/escalations.oramap
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 10,5,45,52

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/cnc/maps/garden2.oramap
+++ b/mods/cnc/maps/garden2.oramap
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 35,39,27,23

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

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

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 1,25,45,37

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 7,24,51,36

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 5,11,50,38

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

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

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 8,21,49,39

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 8,13,51,47

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 15,1,47,61

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/cnc/maps/haos_ridges_cnc.oramap
+++ b/mods/cnc/maps/haos_ridges_cnc.oramap
--- a/mods/cnc/maps/hegemony_or_survival.oramap
+++ b/mods/cnc/maps/hegemony_or_survival.oramap
--- a/mods/cnc/maps/hegemony_or_survival_8p.oramap
+++ b/mods/cnc/maps/hegemony_or_survival_8p.oramap
--- a/mods/cnc/maps/into_the_river_below.oramap
+++ b/mods/cnc/maps/into_the_river_below.oramap
--- a/mods/cnc/maps/lessons_from_kosovo.oramap
+++ b/mods/cnc/maps/lessons_from_kosovo.oramap
--- a/mods/cnc/maps/llamas.oramap
+++ b/mods/cnc/maps/llamas.oramap
--- a/mods/cnc/maps/llamas2.oramap
+++ b/mods/cnc/maps/llamas2.oramap
--- a/mods/cnc/maps/manufacturing_consent.oramap
+++ b/mods/cnc/maps/manufacturing_consent.oramap
--- a/mods/cnc/maps/minus_two.oramap
+++ b/mods/cnc/maps/minus_two.oramap
--- a/mods/cnc/maps/morbid-aimless-poseidon-2.oramap
+++ b/mods/cnc/maps/morbid-aimless-poseidon-2.oramap
--- a/mods/cnc/maps/mtnukebait.oramap
+++ b/mods/cnc/maps/mtnukebait.oramap
--- a/mods/cnc/maps/necessary_illusions.oramap
+++ b/mods/cnc/maps/necessary_illusions.oramap
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 21,14,37,24

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 27,34,36,26

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 3,23,36,26

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 13,16,42,33

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 13,16,42,34

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 11,6,46,34

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 7,17,52,44

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 4,12,57,45

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 16,17,46,45

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 15,12,47,50

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

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

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 15,16,44,42

 Visibility: MissionSelector

-Type: Campaign
+Categories: Campaign

 LockPreview: True

--- a/mods/cnc/maps/pirates_and_emperors.oramap
+++ b/mods/cnc/maps/pirates_and_emperors.oramap
--- a/mods/cnc/maps/pressure_cnc.oramap
+++ b/mods/cnc/maps/pressure_cnc.oramap
--- a/mods/cnc/maps/profit_over_people.oramap
+++ b/mods/cnc/maps/profit_over_people.oramap
--- a/mods/cnc/maps/rogue_states.oramap
+++ b/mods/cnc/maps/rogue_states.oramap
--- a/mods/cnc/maps/rubicon.oramap
+++ b/mods/cnc/maps/rubicon.oramap
--- a/mods/cnc/maps/sandstorm.oramap
+++ b/mods/cnc/maps/sandstorm.oramap
--- a/mods/cnc/maps/sea_and_cake.oramap
+++ b/mods/cnc/maps/sea_and_cake.oramap
--- a/mods/cnc/maps/shellmap/map.yaml
+++ b/mods/cnc/maps/shellmap/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: cnc

@@ -14,7 +14,7 @@ Bounds: 8,1,80,45

 Visibility: Shellmap

-Type: Shellmap
+Categories: Shellmap

 Players:
 	PlayerReference@Nod:
--- a/mods/cnc/maps/the-hot-box/map.yaml
+++ b/mods/cnc/maps/the-hot-box/map.yaml
@@ -1,4 +1,4 @@
-MapFormat: 10
+MapFormat: 11

 RequiresMod: cnc

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

 Visibility: Lobby

-Type: Drop Zone
+Categories: Drop Zone

 Players:
 	PlayerReference@Neutral:
--- a/mods/cnc/maps/the_hourglass.oramap
+++ b/mods/cnc/maps/the_hourglass.oramap
--- a/mods/cnc/maps/thesentinel.oramap
+++ b/mods/cnc/maps/thesentinel.oramap
--- a/mods/cnc/maps/tiberium-oasis-cluster.oramap
+++ b/mods/cnc/maps/tiberium-oasis-cluster.oramap
--- a/mods/cnc/maps/treasure-island-2.oramap
+++ b/mods/cnc/maps/treasure-island-2.oramap
--- a/mods/cnc/maps/two-ponds.oramap
+++ b/mods/cnc/maps/two-ponds.oramap
--- a/mods/cnc/maps/vectorsofbattle.oramap
+++ b/mods/cnc/maps/vectorsofbattle.oramap
--- a/mods/cnc/maps/white_acres.oramap
+++ b/mods/cnc/maps/white_acres.oramap