From 727ef749826e783568cc0c2e09dd8c02da00c945 Mon Sep 17 00:00:00 2001
From: Gallyus <5572280+francinum@users.noreply.github.com>
Date: Tue, 6 Jul 2021 11:37:00 -0400
Subject: [PATCH] Sync golden and sage map config

---
 config/Sage/maps.txt | 24 ++++++++++++++++++------
 config/maps.txt      | 30 +++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/config/Sage/maps.txt b/config/Sage/maps.txt
index f292a5148a..b86f7eb077 100644
--- a/config/Sage/maps.txt
+++ b/config/Sage/maps.txt
@@ -10,11 +10,14 @@ Format:
 	default (The last map with this defined will get all votes of players who have not explicitly voted for a map)
 	voteweight [number] (How much to count each player vote as, defaults to 1, setting to 0.5 counts each vote as half a vote, 2 as double, etc, Setting to 0 disables the map but allows players to still pick it)
 	disabled (disables the map)
+	votable (allow the map to be selected in a called map vote)
 endmap
 
 
+#Active Rotation
+
 map corgstation
-	maxplayers 100
+	minplayers 15
 	votable
 endmap
 
@@ -24,8 +27,7 @@ map boxstation
 endmap
 
 map metastation
-	minplayers 15
-	maxplayers 100
+	default
 	votable
 endmap
 
@@ -39,6 +41,7 @@ map deltastation
 	votable
 endmap
 
+<<<<<<< HEAD
 map donutstation
 	minplayers 60
 	maxplayers 120
@@ -46,13 +49,22 @@ map donutstation
 endmap
 
 map runtimestation
+=======
+#Does not support fastmos
+
+map kilostation
+	maxplayers 60
+	votable
+>>>>>>> f18affee20 (Sync golden and sage map config (#4728))
 	disabled
 endmap
 
-map multiz_debug
+#Debug Maps, you probably don't want these enabled.
+
+map runtimestation
 	disabled
 endmap
 
-map kilostation
-	maxplayers 60
+map multiz_debug
+	disabled
 endmap
diff --git a/config/maps.txt b/config/maps.txt
index 8fd61c74a5..2738f56ad8 100644
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -10,10 +10,14 @@ Format:
 	default (The last map with this defined will get all votes of players who have not explicitly voted for a map)
 	voteweight [number] (How much to count each player vote as, defaults to 1, setting to 0.5 counts each vote as half a vote, 2 as double, etc, Setting to 0 disables the map but allows players to still pick it)
 	disabled (disables the map)
+	votable (allow the map to be selected in a called map vote)
 endmap
 
+
+#Active Rotation
+
 map corgstation
-	maxplayers 100
+	minplayers 15
 	votable
 endmap
 
@@ -23,21 +27,21 @@ map boxstation
 endmap
 
 map metastation
-	maxplayers 100
+	default
 	votable
 endmap
 
 map pubbystation
-	minplayers 50
-	maxplayers 100
+	maxplayers 50
 	votable
 endmap
 
 map deltastation
-	minplayers 50
+	minplayers 40
 	votable
 endmap
 
+<<<<<<< HEAD
 map donutstation
 	minplayers 80
 	maxplayers 120
@@ -45,14 +49,22 @@ map donutstation
 endmap
 
 map runtimestation
+=======
+#Does not support fastmos
+
+map kilostation
+	maxplayers 60
+	votable
+>>>>>>> f18affee20 (Sync golden and sage map config (#4728))
 	disabled
 endmap
 
-map multiz_debug
+#Debug Maps, you probably don't want these enabled.
+
+map runtimestation
 	disabled
 endmap
 
-map kilostation
-    maxplayers 60
-	votable
+map multiz_debug
+	disabled
 endmap