From 52cb4505e12b8a40db29f0a545c2100068a82aca Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Mon, 18 Sep 2023 00:30:42 +0300
Subject: [PATCH] RMG schema now actually works

---
 config/schemas/template.json | 97 +++++++++++++++++++++++++++---------
 1 file changed, 74 insertions(+), 23 deletions(-)

diff --git a/config/schemas/template.json b/config/schemas/template.json
index 5e0e8934f..7bd9ca11c 100644
--- a/config/schemas/template.json
+++ b/config/schemas/template.json
@@ -8,16 +8,35 @@
 		"zone" : {
 			"type" : "object",
 			"required" : ["type", "monsters", "size"],
+			"additionalProperties" : false,
 			"properties" : {
-				"type" : {"$ref" : "#/definitions/type"},
-				"size" : {"$ref" : "#/definitions/size"},			
-				"playerTowns" : {"$ref" : "#/definitions/playerTowns"},				
-				"neuralTowns" : {"$ref" : "#/definitions/neuralTowns"},
-				"townsAreSameType" : {"$ref" : "#/definitions/townsAreSameType"},
-				"terrainTypes": {"$ref" : "#/definitions/terrains"},
-				"bannedTerrains": {"$ref" : "#/definitions/terrains"},
-				"monsters" : {"$ref" : "#/definitions/monsters"},
-				"bannedMonsters" : {"$ref" : "#/definitions/monsters"},
+				"type" : {
+					"type" : "string",
+					"enum" : ["playerStart", "cpuStart", "treasure", "junction"]
+				},
+				"size" : { "type" : "number", "minimum" : 1 },
+				"owner" : {},
+				"playerTowns" : {"$ref" : "#/definitions/towns"},
+				"neutralTowns" : {"$ref" : "#/definitions/towns"},
+				"matchTerrainToTown" : { "type" : "boolean"},
+				"minesLikeZone" : { "type" : "number" },
+				"terrainTypeLikeZone" : { "type" : "number" },
+				"treasureLikeZone" : { "type" : "number" },
+				
+				"terrainTypes": {"$ref" : "#/definitions/stringArray"},
+				"bannedTerrains": {"$ref" : "#/definitions/stringArray"},
+
+				"townsAreSameType" : { "type" : "boolean"},
+				"allowedMonsters" : {"$ref" : "#/definitions/stringArray"},
+				"bannedMonsters" : {"$ref" : "#/definitions/stringArray"},
+				"allowedTowns" : {"$ref" : "#/definitions/stringArray"},
+				"bannedTowns" : {"$ref" : "#/definitions/stringArray"},
+
+				"monsters" : {
+					"type" : "string",
+					"enum" : ["weak", "normal", "strong", "none"]
+				},
+
 				"mines" : {"$ref" : "#/definitions/mines"},
 				"treasure" : {
 					"type" : "array",
@@ -27,21 +46,39 @@
 							"min" : {"type" : "number", "minimum" : 0},
 							"max" : {"type" : "number", "minimum" : 0},
 							"density" : {"type" : "number", "minimum" : 1}
-						},					
-						"additionalProperties" : false						
+						},
+						"additionalProperties" : false
 					}
-				}				
-			}		
+				}
+			}
 		},
-		"type" : {
-			"type" : "string",
+
+		"towns" : {
+			"type" : "object",
 			"additionalProperties" : false,
-			"enum" : ["playerStart", "cpuStart", "treasure", "junction"]
+			"properties" : {
+				"towns" : { "type" : "number" },
+				"castles" : { "type" : "number" },
+				"townDensity" : { "type" : "number" },
+				"castleDensity" : { "type" : "number" }
+			}
 		},
-		"size" : {
-			"type" : "number",
-			"minimum" : 1,
-			"additionalProperties" : false
+		"stringArray" : {
+			"type" : "array",
+			"items" : { "type" : "string" }
+		},
+		"mines" : {
+			"type" : "object",
+			"additionalProperties" : false,
+			"properties" : {
+				"gold" :    { "type" : "number"},
+				"wood" :    { "type" : "number"},
+				"ore" :     { "type" : "number"},
+				"mercury" : { "type" : "number"},
+				"sulfur" :  { "type" : "number"},
+				"crystal" : { "type" : "number"},
+				"gems" :    { "type" : "number"}
+			}
 		},
 		"connection" :
 		{
@@ -74,16 +111,30 @@
 			"type" : "string"
 		}
 	},
+	
+	"additionalProperties" : false,
 	"properties" :
 	{
-		"required" : ["zones", "connections"],
-		"additionalProperties" : false,
+		"required" : ["zones", "connections", "minSize", "maxSize", "players"],
+		
+		"players" : {
+			"type": "string"
+		},
+		"cpu" : {
+			"type": "string"
+		},
+		"minSize" : {
+			"type": "string"
+		},
+		"maxSize" : {
+			"type": "string"
+		},
 		"description" : {
 			"type": "string"
 		},
 		"zones" : {
 			"type" : "object",
-			"additionalProperties" : {"$ref" : "#/definitions/zone"	}						
+			"additionalProperties" : {"$ref" : "#/definitions/zone"	}
 		},
 		"connections" : {
 			"type" : "array",