Jelajahi Sumber

Rename "cpu" parameter to correct "humans"

Tomasz Zieliński 2 tahun lalu
induk
melakukan
ec0bf05163

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/hdmod/coldshadowsFantasy.json

@@ -2,7 +2,7 @@
 	"Coldshadow's Fantasy":
 	{
 		"minSize" : "xl+u", "maxSize" : "g+u",
-		"players" : "4-8", "cpu" : "3-6",
+		"players" : "4-8", "humans" : "3-6",
 		"zones":
 		{
 			"1":

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/hdmodUnused/midnightMix.JSON

@@ -5117,7 +5117,7 @@
 	"Midnight Mix 34" :
 	{
 		"minSize" : "l", "maxSize" : "xl+u",
-		"players" : "6", "cpu" : "2",
+		"players" : "6", "humans" : "2",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/heroes3/meetingInMuzgob.JSON

@@ -2,7 +2,7 @@
 	"Meeting in Muzgob" :
 	{
 		"minSize" : "l", "maxSize" : "xl+u",
-		"players" : "2-6", "cpu" : "2",
+		"players" : "2-6", "humans" : "2",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON

@@ -2,7 +2,7 @@
 	"Newcomers" :
 	{
 		"minSize" : "m+u", "maxSize" : "xl+u",
-		"players" : "2-3", "cpu" : "1",
+		"players" : "2-3", "humans" : "1",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON

@@ -2,7 +2,7 @@
 	"South of Hell" :
 	{
 		"minSize" : "m+u", "maxSize" : "l+u",
-		"players" : "2", "cpu" : "1",
+		"players" : "2", "humans" : "1",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/heroes3/worldsAtWar.JSON

@@ -2,7 +2,7 @@
 	"Worlds at War" :
 	{
 		"minSize" : "m+u", "maxSize" : "xl+u",
-		"players" : "2", "cpu" : "3",
+		"players" : "2", "humans" : "3",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/heroes3unused/gauntlet.JSON

@@ -2,7 +2,7 @@
 	"Gauntlet" :
 	{
 		"minSize" : "m+u", "maxSize" : "xl+u",
-		"players" : "1", "cpu" : "5",
+		"players" : "1", "humans" : "5",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON

@@ -2,7 +2,7 @@
 	"2SM0k" :
 	{
 		"minSize" : "s", "maxSize" : "m+u",
-		"players" : "2", "cpu" : "6",
+		"players" : "2", "humans" : "6",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON

@@ -3,7 +3,7 @@
 	{
 		"minSize" : "s", "maxSize" : "m+u",
 		"players" : "2",
-		"cpu": "1-2",
+		"humans": "1-2",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON

@@ -2,7 +2,7 @@
 	"3SB0b" :
 	{
 		"minSize" : "s", "maxSize" : "m+u",
-		"players" : "2", "cpu" : "1",
+		"players" : "2", "humans" : "1",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON

@@ -2,7 +2,7 @@
 	"3SB0c" :
 	{
 		"minSize" : "s+u", "maxSize" : "m+u",
-		"players" : "2", "cpu" : "1",
+		"players" : "2", "humans" : "1",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON

@@ -2,7 +2,7 @@
 	"5SB0a" :
 	{
 		"minSize" : "s", "maxSize" : "m+u",
-		"players" : "2-3", "cpu" : "2",
+		"players" : "2-3", "humans" : "2",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON

@@ -2,7 +2,7 @@
 	"5SB0b" :
 	{
 		"minSize" : "s", "maxSize" : "m+u",
-		"players" : "2-3", "cpu" : "2",
+		"players" : "2-3", "humans" : "2",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON

@@ -2,7 +2,7 @@
 	"7SB0b" :
 	{
 		"minSize" : "s", "maxSize" : "l",
-		"players" : "2-6", "cpu" : "1",
+		"players" : "2-6", "humans" : "1",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON

@@ -2,7 +2,7 @@
 	"7SB0c" :
 	{
 		"minSize" : "s+u", "maxSize" : "l",
-		"players" : "2-7", "cpu" : "2-6",
+		"players" : "2-7", "humans" : "2-6",
 		"zones" :
 		{
 			"1" :

+ 1 - 1
config/schemas/template.json

@@ -119,7 +119,7 @@
 			"description" : "Number of players that will be present on map (human or AI)",
 			"type": "string"
 		},
-		"cpu" : {
+		"humans" : {
 			"description" : "Optional, number of AI-only players",
 			"type": "string"
 		},

+ 1 - 1
lib/rmg/CRmgTemplate.cpp

@@ -691,7 +691,7 @@ void CRmgTemplate::serializeJson(JsonSerializeFormat & handler)
 	serializeSize(handler, minSize, "minSize");
 	serializeSize(handler, maxSize, "maxSize");
 	serializePlayers(handler, players, "players");
-	serializePlayers(handler, humanPlayers, "cpu"); // TODO: Rename this parameter
+	serializePlayers(handler, humanPlayers, "humans"); // TODO: Rename this parameter
 
 	{
 		auto connectionsData = handler.enterArray("connections");