Merge pull request #4627 from Laserlicht/chronicles_config

avoid warnings if not installed chronicles

config/gameConfig.json

@@ -273,17 +273,8 @@
 				}
 			},
 			"chronicles" : { 
-				"supported" : true,
+				"supported" : false,
-				"iconIndex" : 2,
+				"iconIndex" : 2
-				
-				"portraits" : {
-					"portraitTarnumBarbarian" : 163,
-					"portraitTarnumKnight" : 164,
-					"portraitTarnumWizard" : 165,
-					"portraitTarnumRanger" : 166,
-					"portraitTarnumOverlord" : 167,
-					"portraitTarnumBeastmaster" : 168
-				}
 			},
 			"jsonVCMI" : { 
 				"supported" : true,

config/heroes/portraits.json

@@ -202,179 +202,5 @@
 		],
 		"skills" : [],
 		"specialty" : {}
-	},
-	"portraitTarnumBarbarian" :
-	{
-		"class" : "barbarian",
-		"special" : true,
-		"images": {
-			"large" : "HPL137",
-			"small" : "HPS137",
-			"specialtySmall" : "default",
-			"specialtyLarge" : "default"
-		},
-		"texts" : {
-			"name" : "",
-			"biography" : "",
-			"specialty" : {
-				"description" : "",
-				"tooltip" : "",
-				"name" : ""
-			}
-		},
-		"army" : [
-			{
-				"creature" : "goblin",
-				"min" : 1,
-				"max" : 1
-			}
-		],
-		"skills" : [],
-		"specialty" : {}
-	},
-	"portraitTarnumKnight" :
-	{
-		"class" : "knight",
-		"special" : true,
-		"images": {
-			"large" : "HPL138",
-			"small" : "HPS138",
-			"specialtySmall" : "default",
-			"specialtyLarge" : "default"
-		},
-		"texts" : {
-			"name" : "",
-			"biography" : "",
-			"specialty" : {
-				"description" : "",
-				"tooltip" : "",
-				"name" : ""
-			}
-		},
-		"army" : [
-			{
-				"creature" : "pikeman",
-				"min" : 1,
-				"max" : 1
-			}
-		],
-		"skills" : [],
-		"specialty" : {}
-	},
-	"portraitTarnumWizard" :
-	{
-		"class" : "wizard",
-		"special" : true,
-		"images": {
-			"large" : "HPL139",
-			"small" : "HPS139",
-			"specialtySmall" : "default",
-			"specialtyLarge" : "default"
-		},
-		"texts" : {
-			"name" : "",
-			"biography" : "",
-			"specialty" : {
-				"description" : "",
-				"tooltip" : "",
-				"name" : ""
-			}
-		},
-		"army" : [
-			{
-				"creature" : "enchanter",
-				"min" : 1,
-				"max" : 1
-			}
-		],
-		"skills" : [],
-		"specialty" : {}
-	},
-	"portraitTarnumRanger" :
-	{
-		"class" : "ranger",
-		"special" : true,
-		"images": {
-			"large" : "HPL140",
-			"small" : "HPS140",
-			"specialtySmall" : "default",
-			"specialtyLarge" : "default"
-		},
-		"texts" : {
-			"name" : "",
-			"biography" : "",
-			"specialty" : {
-				"description" : "",
-				"tooltip" : "",
-				"name" : ""
-			}
-		},
-		"army" : [
-			{
-				"creature" : "sharpshooter",
-				"min" : 1,
-				"max" : 1
-			}
-		],
-		"skills" : [],
-		"specialty" : {}
-	},
-	"portraitTarnumOverlord" :
-	{
-		"class" : "overlord",
-		"special" : true,
-		"images": {
-			"large" : "HPL141",
-			"small" : "HPS141",
-			"specialtySmall" : "default",
-			"specialtyLarge" : "default"
-		},
-		"texts" : {
-			"name" : "",
-			"biography" : "",
-			"specialty" : {
-				"description" : "",
-				"tooltip" : "",
-				"name" : ""
-			}
-		},
-		"army" : [
-			{
-				"creature" : "troglodyte",
-				"min" : 1,
-				"max" : 1
-			}
-		],
-		"skills" : [],
-		"specialty" : {}
-	},
-	"portraitTarnumBeastmaster" :
-	{
-		"class" : "beastmaster",
-		"special" : true,
-		"images": {
-			"large" : "HPL142",
-			"small" : "HPS142",
-			"specialtySmall" : "default",
-			"specialtyLarge" : "default"
-		},
-		"texts" : {
-			"name" : "",
-			"biography" : "",
-			"specialty" : {
-				"description" : "",
-				"tooltip" : "",
-				"name" : ""
-			}
-		},
-		"army" : [
-			{
-				"creature" : "gnoll",
-				"min" : 1,
-				"max" : 1
-			}
-		],
-		"skills" : [],
-		"specialty" : {}
 	}
 }

config/heroes/portraitsChronicles.json

@@ -0,0 +1,176 @@
+{
+	"portraitTarnumBarbarian" : // 163
+	{
+		"class" : "barbarian",
+		"special" : true,
+		"images": {
+			"large" : "HPL137",
+			"small" : "HPS137",
+			"specialtySmall" : "default",
+			"specialtyLarge" : "default"
+		},
+		"texts" : {
+			"name" : "",
+			"biography" : "",
+			"specialty" : {
+				"description" : "",
+				"tooltip" : "",
+				"name" : ""
+			}
+		},
+		"army" : [
+			{
+				"creature" : "goblin",
+				"min" : 1,
+				"max" : 1
+			}
+		],
+		"skills" : [],
+		"specialty" : {}
+	},
+	"portraitTarnumKnight" : // 164
+	{
+		"class" : "knight",
+		"special" : true,
+		"images": {
+			"large" : "HPL138",
+			"small" : "HPS138",
+			"specialtySmall" : "default",
+			"specialtyLarge" : "default"
+		},
+		"texts" : {
+			"name" : "",
+			"biography" : "",
+			"specialty" : {
+				"description" : "",
+				"tooltip" : "",
+				"name" : ""
+			}
+		},
+		"army" : [
+			{
+				"creature" : "pikeman",
+				"min" : 1,
+				"max" : 1
+			}
+		],
+		"skills" : [],
+		"specialty" : {}
+	},
+	"portraitTarnumWizard" : // 165
+	{
+		"class" : "wizard",
+		"special" : true,
+		"images": {
+			"large" : "HPL139",
+			"small" : "HPS139",
+			"specialtySmall" : "default",
+			"specialtyLarge" : "default"
+		},
+		"texts" : {
+			"name" : "",
+			"biography" : "",
+			"specialty" : {
+				"description" : "",
+				"tooltip" : "",
+				"name" : ""
+			}
+		},
+		"army" : [
+			{
+				"creature" : "enchanter",
+				"min" : 1,
+				"max" : 1
+			}
+		],
+		"skills" : [],
+		"specialty" : {}
+	},
+	"portraitTarnumRanger" : // 166
+	{
+		"class" : "ranger",
+		"special" : true,
+		"images": {
+			"large" : "HPL140",
+			"small" : "HPS140",
+			"specialtySmall" : "default",
+			"specialtyLarge" : "default"
+		},
+		"texts" : {
+			"name" : "",
+			"biography" : "",
+			"specialty" : {
+				"description" : "",
+				"tooltip" : "",
+				"name" : ""
+			}
+		},
+		"army" : [
+			{
+				"creature" : "sharpshooter",
+				"min" : 1,
+				"max" : 1
+			}
+		],
+		"skills" : [],
+		"specialty" : {}
+	},
+	"portraitTarnumOverlord" : // 167
+	{
+		"class" : "overlord",
+		"special" : true,
+		"images": {
+			"large" : "HPL141",
+			"small" : "HPS141",
+			"specialtySmall" : "default",
+			"specialtyLarge" : "default"
+		},
+		"texts" : {
+			"name" : "",
+			"biography" : "",
+			"specialty" : {
+				"description" : "",
+				"tooltip" : "",
+				"name" : ""
+			}
+		},
+		"army" : [
+			{
+				"creature" : "troglodyte",
+				"min" : 1,
+				"max" : 1
+			}
+		],
+		"skills" : [],
+		"specialty" : {}
+	},
+	"portraitTarnumBeastmaster" : // 168
+	{
+		"class" : "beastmaster",
+		"special" : true,
+		"images": {
+			"large" : "HPL142",
+			"small" : "HPS142",
+			"specialtySmall" : "default",
+			"specialtyLarge" : "default"
+		},
+		"texts" : {
+			"name" : "",
+			"biography" : "",
+			"specialty" : {
+				"description" : "",
+				"tooltip" : "",
+				"name" : ""
+			}
+		},
+		"army" : [
+			{
+				"creature" : "gnoll",
+				"min" : 1,
+				"max" : 1
+			}
+		],
+		"skills" : [],
+		"specialty" : {}
+	}
+}

launcher/modManager/chroniclesextractor.cpp

@@ -106,6 +106,18 @@ void ChroniclesExtractor::createBaseMod() const
 		{ "author", "3DO" },
 		{ "version", "1.0" },
 		{ "contact", "vcmi.eu" },
+		{ "heroes", QJsonArray({"config/heroes/portraitsChronicles.json"}) },
+		{ "settings", QJsonObject({{"mapFormat", QJsonObject({{"chronicles", QJsonObject({{
+			{"supported", true},
+			{"portraits", QJsonObject({
+				{"portraitTarnumBarbarian", 163},
+				{"portraitTarnumKnight", 164},
+				{"portraitTarnumWizard", 165},
+				{"portraitTarnumRanger", 166},
+				{"portraitTarnumOverlord", 167},
+				{"portraitTarnumBeastmaster", 168},
+			})},
+		}})}})}})},
 	};
 
 	QFile jsonFile(dir.filePath("mod.json"));