From ee935e9fa7bbb1678f0b548de3165ed9b22d0f04 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Sun, 17 Sep 2023 12:36:57 +0000 Subject: [PATCH] Fix JSON files --- .../rangeHighlights/rangeHighlightsGreen.json | 20 +++++++++---------- .../rangeHighlights/rangeHighlightsRed.json | 20 +++++++++---------- test/testdata/erm/list-manipulation.json | 2 +- test/testdata/erm/std.json | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsGreen.json b/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsGreen.json index a52f145a9..1c6b60d36 100644 --- a/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsGreen.json +++ b/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsGreen.json @@ -2,20 +2,20 @@ "basepath" : "battle/rangeHighlights/green/", "images" : [ - { "frame" : 00, "file" : "empty.png"}, // 000001 -> 00 empty frame + { "frame" : 0, "file" : "empty.png"}, // 000001 -> 00 empty frame // 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 - { "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" : 11, "file" : "topLeftHalfCorner.png"}, //110000 -> 48 bottomLeftHalfCorner { "frame" : 12, "file" : "topLeftHalfCorner.png"}, //100001 -> 33 topLeftHalfCorner diff --git a/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsRed.json b/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsRed.json index 15dac5b75..42350c073 100644 --- a/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsRed.json +++ b/Mods/vcmi/Sprites/battle/rangeHighlights/rangeHighlightsRed.json @@ -2,20 +2,20 @@ "basepath" : "battle/rangeHighlights/red/", "images" : [ - { "frame" : 00, "file" : "empty.png"}, // 000001 -> 00 empty frame + { "frame" : 0, "file" : "empty.png"}, // 000001 -> 00 empty frame // 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 - { "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" : 11, "file" : "topLeftHalfCorner.png"}, //110000 -> 48 bottomLeftHalfCorner { "frame" : 12, "file" : "topLeftHalfCorner.png"}, //100001 -> 33 topLeftHalfCorner diff --git a/test/testdata/erm/list-manipulation.json b/test/testdata/erm/list-manipulation.json index fc19ae42c..670224ead 100644 --- a/test/testdata/erm/list-manipulation.json +++ b/test/testdata/erm/list-manipulation.json @@ -5,7 +5,7 @@ "MDATA":{}, "Q":{}, "v":{ - "1":5 + "1":5, "2":5, "3":6 }, diff --git a/test/testdata/erm/std.json b/test/testdata/erm/std.json index efd95fad6..a504e39a2 100644 --- a/test/testdata/erm/std.json +++ b/test/testdata/erm/std.json @@ -5,7 +5,7 @@ "MDATA":{}, "Q":{}, "v":{ - "1":1 + "1":1, "2":40320 }, "z":{