Merge pull request #5861 from Laserlicht/valida

fixed mage guild validation

Mods/vcmi/Content/config/german.json

@@ -352,7 +352,7 @@
 	"vcmi.adventureOptions.mapScrollSpeed6.help" : "Geschwindigkeit des Kartenbildlaufs auf sofort einstellen",
 	"vcmi.adventureOptions.hideBackground.hover" : "Hintergrund ausblenden",
 	"vcmi.adventureOptions.hideBackground.help" : "{Hintergrund ausblenden}\n\nDie Abenteuerkarte im Hintergrund ausblenden und stattdessen eine Textur anzeigen.",
-	"vcmi.adventureOptions.minimapShowHeroes.hover" : "Helden auf der Minimap anzeigen",
+	"vcmi.adventureOptions.minimapShowHeroes.hover" : "Helden auf Minimap anz.",
 	"vcmi.adventureOptions.minimapShowHeroes.help" : "{Helden auf der Minimap anzeigen}\n\nZusätzliches Symbol für alle Helden auf der Minimap anzeigen, damit sie auf großen Karten besser zu sehen sind",
 
 	"vcmi.battleOptions.queueSizeLabel.hover" : "Reihenfolge der Kreaturen anzeigen",

config/schemas/faction.json

@@ -166,32 +166,47 @@
 					"format" : "imageFile"
 				},
 				"guildWindow" : {
-					"type" : "array",
-					"description" : "Image with small view on town from mage guild (each array element for different mage guild level; if one element only this will be always selected)",
-					"minItems" : 1,
-					"items" : { 
-						"type" : "string",
-						"format" : "imageFile"
-					}
+					"anyOf" : [
+						{
+							"type" : "array",
+							"description" : "Image with small view on town from mage guild (each array element for different mage guild level; if one element only this will be always selected)",
+							"minItems" : 1,
+							"items" : { 
+								"type" : "string",
+								"format" : "imageFile"
+							}
+						},
+						{
+							"type" : "string",
+							"description" : "Image with small view on town from mage guild",
+							"format" : "imageFile"
+						}
+					]
 				},
 				"guildBackground" : {
-					"type" : "array",
-					"description" : "Image with background of mage guild (each array element for different mage guild level; if one element only this will be always selected)",
-					"minItems" : 1,
-					"items" : { 
-						"type" : "string",
-						"format" : "imageFile"
-					}
-				},
-				"guildWindowPosition" : { 
-					"type" : "array",
-					"items" : {
-						"type" : "object",
-						"additionalProperties" : false,
-						"properties" : {
-							"x" :     { "type" : "number", "description" : "X coordinate on screen" },
-							"y" :     { "type" : "number", "description" : "Y coordinate on screen" }
+					"anyOf" : [
+						{
+							"type" : "array",
+							"description" : "Image with background of mage guild (each array element for different mage guild level; if one element only this will be always selected)",
+							"minItems" : 1,
+							"items" : { 
+								"type" : "string",
+								"format" : "imageFile"
+							}
+						},
+						{
+							"type" : "string",
+							"description" : "Image with background of mage guild",
+							"format" : "imageFile"
 						}
+					]
+				},
+				"guildWindowPosition" : {
+					"type" : "object",
+					"additionalProperties" : false,
+					"properties" : {
+						"x" :     { "type" : "number", "description" : "X coordinate on screen" },
+						"y" :     { "type" : "number", "description" : "Y coordinate on screen" }
 					}
 				},
 				"guildSpellPositions" : {
@@ -199,15 +214,12 @@
 					"description" : "Positions of spells in mage guild",
 					"items" : { 
 						"type" : "array",
-						"items" : { 
-							"type" : "array",
-							"items" : {
-								"type" : "object",
-								"additionalProperties" : false,
-								"properties" : {
-									"x" :     { "type" : "number", "description" : "X coordinate on screen" },
-									"y" :     { "type" : "number", "description" : "Y coordinate on screen" }
-								}
+						"items" : {
+							"type" : "object",
+							"additionalProperties" : false,
+							"properties" : {
+								"x" :     { "type" : "number", "description" : "X coordinate on screen" },
+								"y" :     { "type" : "number", "description" : "Y coordinate on screen" }
 							}
 						}
 					}