Simplify Player and Symmetry options.

Player now specifies the total player count,
and the Symmetry options adjust to show only
valid options.

mods/cnc/rules/map-generators.yaml

@@ -71,6 +71,8 @@
 						ForestObstacles: Trees
 						UnplayableObstacles: Obstructions
 						CivilianBuildingsObstacles: CivilianBuildings
+						Mirror: None
+						Rotations: 1
 			MultiChoiceOption@hidden_tileset_overrides:
 				Choice@common:
 					Tileset: DESERT,SNOW,TEMPERAT
@@ -169,14 +171,14 @@
 						Mountains: 1000
 						Roughness: 850
 						MinimumTerrainContourSpacing: 5
-			MultiIntegerChoiceOption@Rotations:
-				Label: label-cnc-map-generator-option-rotations
-				Parameter: Rotations
+			MultiIntegerChoiceOption@Players:
+				Label: label-cnc-map-generator-option-players
+				Parameter: Players
 				Choices: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
 				Default: 2
 				Priority: 1
-			MultiChoiceOption@Mirror:
-				Label: label-cnc-map-generator-option-mirror
+			MultiChoiceOption@Symmetry:
+				Label: label-cnc-map-generator-option-symmetry
 				Default: None
 				Priority: 1
 				Choice@None:
@@ -184,21 +186,60 @@
 					Settings:
 						Mirror: None
 				Choice@LeftMatchesRight:
-					Label: label-cnc-map-generator-choice-mirror-left-matches-right
+					Label: label-cnc-map-generator-choice-symmetry-mirror-horizontal
+					Players: 2, 4, 6, 8, 10, 12, 14, 16
 					Settings:
 						Mirror: LeftMatchesRight
 				Choice@TopLeftMatchesBottomRight:
-					Label: label-cnc-map-generator-choice-mirror-top-left-matches-bottom-right
+					Label: label-cnc-map-generator-choice-symmetry-mirror-diagonal-tl
+					Players: 2, 4, 6, 8, 10, 12, 14, 16
 					Settings:
 						Mirror: TopLeftMatchesBottomRight
 				Choice@TopMatchesBottom:
-					Label: label-cnc-map-generator-choice-mirror-top-matches-bottom
+					Label: label-cnc-map-generator-choice-symmetry-mirror-vertical
+					Players: 2, 4, 6, 8, 10, 12, 14, 16
 					Settings:
 						Mirror: TopMatchesBottom
 				Choice@TopRightMatchesBottomLeft:
-					Label: label-cnc-map-generator-choice-mirror-top-right-matches-bottom-left
+					Label: label-cnc-map-generator-choice-symmetry-mirror-diagonal-tr
+					Players: 2, 4, 6, 8, 10, 12, 14, 16
 					Settings:
 						Mirror: TopRightMatchesBottomLeft
+				Choice@2Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-2-rotations
+					Players: 2, 4, 6, 8, 10, 12, 14, 16
+					Settings:
+						Rotations: 2
+				Choice@3Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-3-rotations
+					Players: 3, 6, 9, 12, 15
+					Settings:
+						Rotations: 3
+				Choice@4Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-4-rotations
+					Players: 4, 8, 12, 16
+					Settings:
+						Rotations: 4
+				Choice@5Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-5-rotations
+					Players: 5, 10, 15
+					Settings:
+						Rotations: 5
+				Choice@6Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-6-rotations
+					Players: 6, 12
+					Settings:
+						Rotations: 6
+				Choice@7Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-7-rotations
+					Players: 7, 14
+					Settings:
+						Rotations: 7
+				Choice@8Rotations:
+					Label: label-cnc-map-generator-choice-symmetry-mirror-8-rotations
+					Players: 8, 16
+					Settings:
+						Rotations: 8
 			MultiChoiceOption@Shape:
 				Label: label-cnc-map-generator-option-shape
 				Default: Square
@@ -216,12 +257,6 @@
 					Tileset: DESERT
 					Settings:
 						ExternalCircularBias: -1
-			MultiIntegerChoiceOption@Players:
-				Label: label-cnc-map-generator-option-players
-				Parameter: Players
-				Choices: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-				Default: 1
-				Priority: 1
 			MultiChoiceOption@Resources:
 				Label: label-cnc-map-generator-option-resources
 				Default: Medium