瀏覽代碼

Merge pull request #2857 from Alexander-Wilms/fix-json

Fix JSON files
Ivan Savenko 2 年之前
父節點
當前提交
7c91de2115

+ 10 - 10
Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsGreen.json

@@ -2,20 +2,20 @@
 	"basepath" : "battle/rangeHighlights/green/",
 	"basepath" : "battle/rangeHighlights/green/",
 	"images" :
 	"images" :
 	[
 	[
-		{ "frame" : 00, "file" : "empty.png"},						// 000001 -> 00 empty frame
+		{ "frame" :  0, "file" : "empty.png"},						// 000001 -> 00 empty frame
 			
 			
 		// load single edges
 		// load single edges
-		{ "frame" : 01, "file" : "topLeft.png"},                    //000001 -> 01 topLeft
-		{ "frame" : 02, "file" : "topLeft.png"},                    //000010 -> 02 topRight
-		{ "frame" : 03, "file" : "left.png"},                       //000100 -> 04 right
-		{ "frame" : 04, "file" : "topLeft.png"},                    //001000 -> 08 bottomRight
-		{ "frame" : 05, "file" : "topLeft.png"},                    //010000 -> 16 bottomLeft
-		{ "frame" : 06, "file" : "left.png"},                       //100000 -> 32 left
+		{ "frame" :  1, "file" : "topLeft.png"},                    //000001 -> 01 topLeft
+		{ "frame" :  2, "file" : "topLeft.png"},                    //000010 -> 02 topRight
+		{ "frame" :  3, "file" : "left.png"},                       //000100 -> 04 right
+		{ "frame" :  4, "file" : "topLeft.png"},                    //001000 -> 08 bottomRight
+		{ "frame" :  5, "file" : "topLeft.png"},                    //010000 -> 16 bottomLeft
+		{ "frame" :  6, "file" : "left.png"},                       //100000 -> 32 left
 		
 		
 		// load double edges
 		// load double edges
-		{ "frame" : 07, "file" : "top.png"},                        //000011 -> 03 top
-		{ "frame" : 08, "file" : "top.png"},                        //011000 -> 24 bottom
-		{ "frame" : 09, "file" : "topLeftHalfCorner.png"},          //000110 -> 06 topRightHalfCorner
+		{ "frame" :  7, "file" : "top.png"},                        //000011 -> 03 top
+		{ "frame" :  8, "file" : "top.png"},                        //011000 -> 24 bottom
+		{ "frame" :  9, "file" : "topLeftHalfCorner.png"},          //000110 -> 06 topRightHalfCorner
 		{ "frame" : 10, "file" : "topLeftHalfCorner.png"},          //001100 -> 12 bottomRightHalfCorner
 		{ "frame" : 10, "file" : "topLeftHalfCorner.png"},          //001100 -> 12 bottomRightHalfCorner
 		{ "frame" : 11, "file" : "topLeftHalfCorner.png"},          //110000 -> 48 bottomLeftHalfCorner
 		{ "frame" : 11, "file" : "topLeftHalfCorner.png"},          //110000 -> 48 bottomLeftHalfCorner
 		{ "frame" : 12, "file" : "topLeftHalfCorner.png"},          //100001 -> 33 topLeftHalfCorner
 		{ "frame" : 12, "file" : "topLeftHalfCorner.png"},          //100001 -> 33 topLeftHalfCorner

+ 10 - 10
Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsRed.json

@@ -2,20 +2,20 @@
 	"basepath" : "battle/rangeHighlights/red/",
 	"basepath" : "battle/rangeHighlights/red/",
 	"images" :
 	"images" :
 	[
 	[
-		{ "frame" : 00, "file" : "empty.png"},						// 000001 -> 00 empty frame
+		{ "frame" :  0, "file" : "empty.png"},						// 000001 -> 00 empty frame
 			
 			
 		// load single edges
 		// load single edges
-		{ "frame" : 01, "file" : "topLeft.png"},                    //000001 -> 01 topLeft
-		{ "frame" : 02, "file" : "topLeft.png"},                    //000010 -> 02 topRight
-		{ "frame" : 03, "file" : "left.png"},                       //000100 -> 04 right
-		{ "frame" : 04, "file" : "topLeft.png"},                    //001000 -> 08 bottomRight
-		{ "frame" : 05, "file" : "topLeft.png"},                    //010000 -> 16 bottomLeft
-		{ "frame" : 06, "file" : "left.png"},                       //100000 -> 32 left
+		{ "frame" :  1, "file" : "topLeft.png"},                    //000001 -> 01 topLeft
+		{ "frame" :  2, "file" : "topLeft.png"},                    //000010 -> 02 topRight
+		{ "frame" :  3, "file" : "left.png"},                       //000100 -> 04 right
+		{ "frame" :  4, "file" : "topLeft.png"},                    //001000 -> 08 bottomRight
+		{ "frame" :  5, "file" : "topLeft.png"},                    //010000 -> 16 bottomLeft
+		{ "frame" :  6, "file" : "left.png"},                       //100000 -> 32 left
 		
 		
 		// load double edges
 		// load double edges
-		{ "frame" : 07, "file" : "top.png"},                        //000011 -> 03 top
-		{ "frame" : 08, "file" : "top.png"},                        //011000 -> 24 bottom
-		{ "frame" : 09, "file" : "topLeftHalfCorner.png"},          //000110 -> 06 topRightHalfCorner
+		{ "frame" :  7, "file" : "top.png"},                        //000011 -> 03 top
+		{ "frame" :  8, "file" : "top.png"},                        //011000 -> 24 bottom
+		{ "frame" :  9, "file" : "topLeftHalfCorner.png"},          //000110 -> 06 topRightHalfCorner
 		{ "frame" : 10, "file" : "topLeftHalfCorner.png"},          //001100 -> 12 bottomRightHalfCorner
 		{ "frame" : 10, "file" : "topLeftHalfCorner.png"},          //001100 -> 12 bottomRightHalfCorner
 		{ "frame" : 11, "file" : "topLeftHalfCorner.png"},          //110000 -> 48 bottomLeftHalfCorner
 		{ "frame" : 11, "file" : "topLeftHalfCorner.png"},          //110000 -> 48 bottomLeftHalfCorner
 		{ "frame" : 12, "file" : "topLeftHalfCorner.png"},          //100001 -> 33 topLeftHalfCorner
 		{ "frame" : 12, "file" : "topLeftHalfCorner.png"},          //100001 -> 33 topLeftHalfCorner

+ 1 - 1
test/testdata/erm/list-manipulation.json

@@ -5,7 +5,7 @@
 		"MDATA":{},
 		"MDATA":{},
 		"Q":{},
 		"Q":{},
 		"v":{
 		"v":{
-			"1":5
+			"1":5,
 			"2":5,
 			"2":5,
 			"3":6
 			"3":6
 		},
 		},

+ 1 - 1
test/testdata/erm/std.json

@@ -5,7 +5,7 @@
 		"MDATA":{},
 		"MDATA":{},
 		"Q":{},
 		"Q":{},
 		"v":{
 		"v":{
-			"1":1
+			"1":1,
 			"2":40320
 			"2":40320
 		},
 		},
 		"z":{
 		"z":{