[xna] Updated example skeletons for 4.0.27+ format changes of previous csharp commit 7ef2fc9.

spine-xna/example/data/coin-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "upF+oMt2JRY",
-	"spine": "4.0.05-beta",
+	"hash": "svidebPqqeg",
+	"spine": "4.0.27-beta",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,
@@ -63,7 +63,7 @@
 	"animation": {
 		"slots": {
 			"coin-front-shine": {
-				"twoColor": [
+				"rgba2": [
 					{ "light": "7d7d7dff", "dark": "000000" },
 					{ "time": 0.2667, "light": "000000ff", "dark": "7e7e7e" },
 					{ "time": 0.664, "light": "000000ff", "dark": "000000" },
@@ -80,7 +80,7 @@
 				]
 			},
 			"coin-front-texture": {
-				"color": [
+				"rgba": [
 					{ "color": "858585ff" },
 					{ "time": 0.4, "color": "ffffffff" },
 					{
@@ -120,23 +120,23 @@
 				],
 				"scale": [
 					{
-						"curve": [ 0.164, 1, 0.484, 0.09, 0.164, 1, 0.484, 1 ]
+						"curve": [ 0.164, 1, 0.484, 0.091, 0.164, 1, 0.484, 1 ]
 					},
 					{ "time": 0.664, "x": 0, "curve": "stepped" },
 					{
 						"time": 0.6696,
 						"x": 0.003,
-						"curve": [ 0.786, 0.15, 1.167, 1, 0.786, 1, 1.167, 1 ]
+						"curve": [ 0.786, 0.153, 1.167, 1, 0.786, 1, 1.167, 1 ]
 					},
 					{
 						"time": 1.3333,
-						"curve": [ 1.442, 0.99, 1.858, 0.1, 1.442, 1, 1.858, 1 ]
+						"curve": [ 1.442, 0.992, 1.858, 0.098, 1.442, 1, 1.858, 1 ]
 					},
 					{ "time": 1.9982, "x": 0.003, "curve": "stepped" },
 					{
 						"time": 2.0022,
 						"x": 0.003,
-						"curve": [ 2.123, 0.15, 2.501, 1, 2.123, 1, 2.501, 1 ]
+						"curve": [ 2.123, 0.151, 2.501, 1, 2.123, 1, 2.501, 1 ]
 					},
 					{ "time": 2.6667 }
 				]
@@ -157,54 +157,54 @@
 				],
 				"scale": [
 					{
-						"curve": [ 0.085, 1, 0.207, 0.79, 0.085, 1, 0.207, 1 ]
+						"curve": [ 0.085, 1, 0.207, 0.789, 0.085, 1, 0.207, 1 ]
 					},
 					{
 						"time": 0.3333,
 						"x": 0.555,
-						"curve": [ 0.449, 0.35, 0.567, 0.12, 0.449, 1, 0.567, 1 ]
+						"curve": [ 0.449, 0.347, 0.567, 0.122, 0.449, 1, 0.567, 1 ]
 					},
 					{ "time": 0.664, "x": 0.014, "curve": "stepped" },
 					{
 						"time": 0.6696,
 						"x": -0.028,
-						"curve": [ 0.723, -0.13, 0.865, -0.37, 0.723, 1, 0.865, 1 ]
+						"curve": [ 0.723, -0.126, 0.865, -0.367, 0.723, 1, 0.865, 1 ]
 					},
 					{
 						"time": 1,
 						"x": -0.609,
-						"curve": [ 1.053, -0.78, 1.29, -1, 1.053, 1, 1.29, 1 ]
+						"curve": [ 1.053, -0.778, 1.29, -0.997, 1.053, 1, 1.29, 1 ]
 					},
 					{ "time": 1.3318, "x": -1, "curve": "stepped" },
 					{
 						"time": 1.3333,
-						"curve": [ 1.384, 1, 1.439, 0.94, 1.384, 1, 1.439, 1 ]
+						"curve": [ 1.384, 0.997, 1.439, 0.94, 1.384, 1, 1.439, 1 ]
 					},
 					{
 						"time": 1.5,
 						"x": 0.852,
-						"curve": [ 1.564, 0.75, 1.703, 0.51, 1.564, 1, 1.703, 1 ]
+						"curve": [ 1.564, 0.748, 1.703, 0.509, 1.564, 1, 1.703, 1 ]
 					},
 					{
 						"time": 1.8,
 						"x": 0.315,
-						"curve": [ 1.873, 0.13, 1.987, 0.01, 1.873, 1, 1.987, 1 ]
+						"curve": [ 1.873, 0.13, 1.987, 0.015, 1.873, 1, 1.987, 1 ]
 					},
 					{ "time": 1.9982, "x": 0.014, "curve": "stepped" },
 					{
 						"time": 2.0022,
 						"x": -0.028,
-						"curve": [ 2.039, -0.07, 2.123, -0.24, 2.039, 1, 2.123, 1 ]
+						"curve": [ 2.039, -0.072, 2.123, -0.239, 2.039, 1, 2.123, 1 ]
 					},
 					{
 						"time": 2.2018,
 						"x": -0.365,
-						"curve": [ 2.269, -0.51, 2.337, -0.63, 2.269, 1, 2.337, 1 ]
+						"curve": [ 2.269, -0.513, 2.337, -0.635, 2.269, 1, 2.337, 1 ]
 					},
 					{
 						"time": 2.4,
 						"x": -0.731,
-						"curve": [ 2.503, -0.87, 2.596, -0.96, 2.503, 1, 2.596, 1 ]
+						"curve": [ 2.503, -0.871, 2.596, -0.961, 2.503, 1, 2.596, 1 ]
 					},
 					{
 						"time": 2.6592,

spine-xna/example/data/mix-and-match-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "nE4g85mprlE",
-	"spine": "4.0.05-beta",
+	"hash": "EedJfu7UJ/I",
+	"spine": "4.0.27-beta",
 	"x": -240.58,
 	"y": -3.38,
 	"width": 410.36,
@@ -838,30 +838,36 @@
 		"order": 12,
 		"bones": [ "eye-back-iris" ],
 		"target": "eye-back-pupil",
-		"rotateMix": 0,
-		"translateMix": 0.4,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": 0.4,
+		"mixY": 0.4,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "eye-front-pupil",
 		"order": 11,
 		"bones": [ "eye-front-iris" ],
 		"target": "eye-front-pupil",
-		"rotateMix": 0,
-		"translateMix": 0.4,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": 0.4,
+		"mixY": 0.4,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "eye-transform",
 		"order": 7,
 		"bones": [ "features-control" ],
 		"target": "head-control",
-		"rotateMix": 0,
-		"translateMix": 0.2,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": 0.2,
+		"mixY": 0.2,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "hair-side-back",
@@ -871,10 +877,12 @@
 		"rotation": -62.21,
 		"x": 132.47,
 		"y": 46.72,
-		"rotateMix": 0,
-		"translateMix": 0.05,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": 0.05,
+		"mixY": 0.05,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "hair-side-front-control",
@@ -884,10 +892,12 @@
 		"rotation": -80.89,
 		"x": -102.78,
 		"y": 27.17,
-		"rotateMix": 0,
-		"translateMix": 0.15,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": 0.15,
+		"mixY": 0.15,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "hat-control",
@@ -899,10 +909,12 @@
 		"x": -78.91,
 		"y": 123.01,
 		"shearY": -36,
-		"rotateMix": 0,
-		"translateMix": 0.6,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": 0.6,
+		"mixY": 0.6,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "head-control",
@@ -910,10 +922,12 @@
 		"bones": [ "head-back-control" ],
 		"target": "head-control",
 		"x": -88.92,
-		"rotateMix": 0,
-		"translateMix": -1,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0,
+		"mixX": -1,
+		"mixY": -1,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "leg-down-back",
@@ -923,8 +937,9 @@
 		"target": "leg-down-back",
 		"x": 132.85,
 		"y": 58.02,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "leg-down-back-up",
@@ -934,8 +949,9 @@
 		"target": "leg-down-back",
 		"x": 17.25,
 		"y": 41.79,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "leg-down-down",
@@ -945,8 +961,9 @@
 		"target": "leg-down",
 		"x": 147.87,
 		"y": -60.85,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "leg-down-front",
@@ -956,8 +973,9 @@
 		"target": "leg-down",
 		"x": 23.51,
 		"y": -48.52,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "leg-up",
@@ -967,8 +985,9 @@
 		"target": "leg-up",
 		"x": 130.03,
 		"y": -50.13,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "leg-up-back",
@@ -978,8 +997,9 @@
 		"target": "leg-up-back",
 		"x": 129.36,
 		"y": 40.42,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "shoulder-back",
@@ -989,10 +1009,12 @@
 		"rotation": 180,
 		"x": -14.41,
 		"y": -46.12,
-		"rotateMix": 0.18,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0.18,
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "shoulder-front",
@@ -1002,10 +1024,12 @@
 		"rotation": 90,
 		"x": -24.78,
 		"y": 29.54,
-		"rotateMix": 0.186,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixRotate": 0.186,
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "skirt-rotation-back",
@@ -1017,9 +1041,11 @@
 		"x": 148.43,
 		"y": -0.72,
 		"shearY": -36,
-		"translateMix": 0.7,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0.7,
+		"mixY": 0.7,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "skirt-rotation-front",
@@ -1031,9 +1057,11 @@
 		"x": 141.99,
 		"y": 2.23,
 		"shearY": -36,
-		"translateMix": 0.7,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0.7,
+		"mixY": 0.7,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	}
 ],
 "path": [
@@ -6017,10 +6045,10 @@
 		},
 		"transform": {
 			"leg-down-back": [
-				{ "rotateMix": 0.269, "translateMix": 0.234, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0.269, "mixX": 0.234, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-down-down": [
-				{ "rotateMix": 0.394, "translateMix": 0.177, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0.394, "mixX": 0.177, "mixScaleX": 0, "mixShearY": 0 }
 			]
 		}
 	},
@@ -6917,29 +6945,29 @@
 		},
 		"transform": {
 			"leg-down-back": [
-				{ "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.1333, "rotateMix": 0, "translateMix": 0.026, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
-				{ "time": 1.1667, "rotateMix": 0, "translateMix": 0.026, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 1.2667, "rotateMix": 0.1905, "translateMix": 0.2115, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 1.5333, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
-				{ "time": 2.0667, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 2.1, "rotateMix": 0.217, "translateMix": 0.078, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 2.4667, "scaleMix": 0, "shearMix": 0 }
+				{ "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.1333, "mixRotate": 0, "mixX": 0.026, "mixScaleX": 0, "mixShearY": 0, "curve": "stepped" },
+				{ "time": 1.1667, "mixRotate": 0, "mixX": 0.026, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 1.2667, "mixRotate": 0.1905, "mixX": 0.2115, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 1.5333, "mixScaleX": 0, "mixShearY": 0, "curve": "stepped" },
+				{ "time": 2.0667, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 2.1, "mixRotate": 0.217, "mixX": 0.078, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 2.4667, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-down-down": [
-				{ "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.0667, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.3333, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
-				{ "time": 1.0667, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 1.3667, "translateMix": 0.774, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 2.7667, "scaleMix": 0, "shearMix": 0 }
+				{ "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.0667, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.3333, "mixScaleX": 0, "mixShearY": 0, "curve": "stepped" },
+				{ "time": 1.0667, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 1.3667, "mixX": 0.774, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 2.7667, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-down-front": [
-				{ "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.2333, "translateMix": 0.609, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.3667, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
-				{ "time": 2.1, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 2.5, "scaleMix": 0, "shearMix": 0 }
+				{ "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.2333, "mixX": 0.609, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.3667, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0, "curve": "stepped" },
+				{ "time": 2.1, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 2.5, "mixScaleX": 0, "mixShearY": 0 }
 			]
 		}
 	},
@@ -7970,30 +7998,30 @@
 		},
 		"transform": {
 			"leg-down-back": [
-				{ "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
-				{ "time": 0.1, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.3333, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.5667, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0, "curve": "stepped" },
+				{ "time": 0.1, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.3333, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.5667, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-down-back-up": [
-				{ "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
-				{ "time": 0.1, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.3333, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.5667, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0, "curve": "stepped" },
+				{ "time": 0.1, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.3333, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.5667, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-down-down": [
-				{ "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-down-front": [
-				{ "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-up": [
-				{ "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
 			],
 			"leg-up-back": [
-				{ "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.3333, "scaleMix": 0, "shearMix": 0 },
-				{ "time": 0.5667, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+				{ "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.3333, "mixScaleX": 0, "mixShearY": 0 },
+				{ "time": 0.5667, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
 			]
 		}
 	}

spine-xna/example/data/tank-pro.json

@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "C8ZQzuFlwMI",
-	"spine": "4.0.05-beta",
+	"hash": "3P3VgYJ8Bxk",
+	"spine": "4.0.27-beta",
 	"x": -5852.65,
 	"y": -348.5,
 	"width": 7202.61,
@@ -888,9 +888,11 @@
 		"bones": [ "wheel-big2" ],
 		"target": "wheel-big1",
 		"rotation": 65.6,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "wheel-mid1-transform",
@@ -898,9 +900,11 @@
 		"bones": [ "wheel-mid2", "wheel-mid4" ],
 		"target": "wheel-mid1",
 		"rotation": 93,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "wheel-mid2-transform",
@@ -908,9 +912,11 @@
 		"bones": [ "wheel-mid3", "wheel-mid5" ],
 		"target": "wheel-mid1",
 		"rotation": -89,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "wheel-mid3-transform",
@@ -918,9 +924,11 @@
 		"bones": [ "wheel-mid6" ],
 		"target": "wheel-mid1",
 		"rotation": -152.6,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "wheel-small1-transform",
@@ -928,9 +936,11 @@
 		"bones": [ "wheel-small2" ],
 		"target": "wheel-small1",
 		"rotation": 87,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	},
 	{
 		"name": "wheel-small2-transform",
@@ -938,9 +948,11 @@
 		"bones": [ "wheel-small3" ],
 		"target": "wheel-small1",
 		"rotation": 54.9,
-		"translateMix": 0,
-		"scaleMix": 0,
-		"shearMix": 0
+		"mixX": 0,
+		"mixY": 0,
+		"mixScaleX": 0,
+		"mixScaleY": 0,
+		"mixShearY": 0
 	}
 ],
 "path": [
@@ -3424,7 +3436,7 @@
 				]
 			},
 			"smoke-glow": {
-				"color": [
+				"rgba": [
 					{ "time": 0.1333, "color": "ffffffff" },
 					{ "time": 0.1667, "color": "ffbc8af4" },
 					{ "time": 0.2, "color": "fc8e8e90" },
@@ -3436,7 +3448,7 @@
 				]
 			},
 			"smoke-puff1-bg": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
@@ -3447,7 +3459,7 @@
 				]
 			},
 			"smoke-puff1-bg2": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3458,7 +3470,7 @@
 				]
 			},
 			"smoke-puff1-bg3": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3469,7 +3481,7 @@
 				]
 			},
 			"smoke-puff1-bg4": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
@@ -3480,7 +3492,7 @@
 				]
 			},
 			"smoke-puff1-bg5": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
@@ -3491,7 +3503,7 @@
 				]
 			},
 			"smoke-puff1-bg6": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3502,7 +3514,7 @@
 				]
 			},
 			"smoke-puff1-bg7": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3513,7 +3525,7 @@
 				]
 			},
 			"smoke-puff1-bg8": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f" },
@@ -3524,7 +3536,7 @@
 				]
 			},
 			"smoke-puff1-bg9": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
@@ -3535,7 +3547,7 @@
 				]
 			},
 			"smoke-puff1-bg10": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.5333, "light": "ffd50cff", "dark": "604b3f" },
@@ -3546,7 +3558,7 @@
 				]
 			},
 			"smoke-puff1-bg11": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7667, "light": "ffd50c00", "dark": "604b3f" }
@@ -3556,7 +3568,7 @@
 				]
 			},
 			"smoke-puff1-bg12": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8667, "light": "ffd50c00", "dark": "604a3f" }
@@ -3566,7 +3578,7 @@
 				]
 			},
 			"smoke-puff1-bg13": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3667, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
@@ -3576,7 +3588,7 @@
 				]
 			},
 			"smoke-puff1-bg14": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.4333, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1.0667, "light": "ffd50c00", "dark": "604b3f" }
@@ -3586,7 +3598,7 @@
 				]
 			},
 			"smoke-puff1-bg15": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.8333, "light": "ffd50c00", "dark": "604b3f" }
@@ -3596,7 +3608,7 @@
 				]
 			},
 			"smoke-puff1-bg16": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
@@ -3606,7 +3618,7 @@
 				]
 			},
 			"smoke-puff1-bg17": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.2333, "light": "ffd50cff", "dark": "534035" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4, "light": "ffd50cff", "dark": "604b3f" },
@@ -3617,7 +3629,7 @@
 				]
 			},
 			"smoke-puff1-bg18": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
@@ -3628,7 +3640,7 @@
 				]
 			},
 			"smoke-puff1-bg20": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3639,7 +3651,7 @@
 				]
 			},
 			"smoke-puff1-bg21": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3647,7 +3659,7 @@
 				]
 			},
 			"smoke-puff1-bg22": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
@@ -3655,7 +3667,7 @@
 				]
 			},
 			"smoke-puff1-bg23": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffd50cff", "dark": "3b2c23" },
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.5, "light": "ffd50cff", "dark": "604b3f" },
@@ -3666,7 +3678,7 @@
 				]
 			},
 			"smoke-puff1-bg24": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7, "light": "ffd50c00", "dark": "604b3f" }
@@ -3676,7 +3688,7 @@
 				]
 			},
 			"smoke-puff1-bg25": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 1, "light": "ffd50c00", "dark": "604b3f" }
@@ -3686,7 +3698,7 @@
 				]
 			},
 			"smoke-puff1-bg26": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.6, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.9333, "light": "ffd50c00", "dark": "604b3f" }
@@ -3696,7 +3708,7 @@
 				]
 			},
 			"smoke-puff1-bg27": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ffd50cff", "dark": "604b3f", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ffd50cff", "dark": "604b3f" },
 					{ "time": 0.7333, "light": "ffd50c00", "dark": "604b3f" }
@@ -3706,7 +3718,7 @@
 				]
 			},
 			"smoke-puff1-fg": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.0667, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1333, "light": "fde252ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
@@ -3723,7 +3735,7 @@
 				]
 			},
 			"smoke-puff1-fg2": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3739,7 +3751,7 @@
 				]
 			},
 			"smoke-puff1-fg3": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffe457ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3755,7 +3767,7 @@
 				]
 			},
 			"smoke-puff1-fg4": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "fae781ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3771,7 +3783,7 @@
 				]
 			},
 			"smoke-puff1-fg5": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3787,7 +3799,7 @@
 				]
 			},
 			"smoke-puff1-fg6": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3803,7 +3815,7 @@
 				]
 			},
 			"smoke-puff1-fg7": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3819,7 +3831,7 @@
 				]
 			},
 			"smoke-puff1-fg8": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3835,7 +3847,7 @@
 				]
 			},
 			"smoke-puff1-fg9": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3851,7 +3863,7 @@
 				]
 			},
 			"smoke-puff1-fg10": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "fce35dff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3867,7 +3879,7 @@
 				]
 			},
 			"smoke-puff1-fg11": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7667, "light": "ab764c00", "dark": "ac8d75" }
@@ -3877,7 +3889,7 @@
 				]
 			},
 			"smoke-puff1-fg12": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8667, "light": "ac8c7500", "dark": "604a3f" }
@@ -3887,7 +3899,7 @@
 				]
 			},
 			"smoke-puff1-fg13": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3667, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
@@ -3897,7 +3909,7 @@
 				]
 			},
 			"smoke-puff1-fg14": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.4333, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1.0667, "light": "ab764c00", "dark": "ac8d75" }
@@ -3907,7 +3919,7 @@
 				]
 			},
 			"smoke-puff1-fg15": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.8333, "light": "ab764c00", "dark": "ac8d75" }
@@ -3917,7 +3929,7 @@
 				]
 			},
 			"smoke-puff1-fg16": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
@@ -3927,7 +3939,7 @@
 				]
 			},
 			"smoke-puff1-fg17": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.2333, "light": "e3c05eff", "dark": "ab7e59" },
 					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4, "light": "ab764cff", "dark": "ac8d75" },
@@ -3938,7 +3950,7 @@
 				]
 			},
 			"smoke-puff1-fg18": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3952,7 +3964,7 @@
 				]
 			},
 			"smoke-puff1-fg20": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3965,7 +3977,7 @@
 				]
 			},
 			"smoke-puff1-fg21": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3975,7 +3987,7 @@
 				]
 			},
 			"smoke-puff1-fg22": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3985,7 +3997,7 @@
 				]
 			},
 			"smoke-puff1-fg23": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.1333, "light": "ffdf31ff", "dark": "ff0000" },
 					{ "time": 0.1667, "light": "ffe568ff", "dark": "e26425" },
 					{ "time": 0.2, "light": "ffe568ff", "dark": "ab774c" },
@@ -3998,7 +4010,7 @@
 				]
 			},
 			"smoke-puff1-fg24": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7, "light": "ab764c00", "dark": "ac8d75" }
@@ -4008,7 +4020,7 @@
 				]
 			},
 			"smoke-puff1-fg25": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 1, "light": "ab764c00", "dark": "ac8d75" }
@@ -4018,7 +4030,7 @@
 				]
 			},
 			"smoke-puff1-fg26": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.6, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.9333, "light": "ab764c00", "dark": "ac8d75" }
@@ -4028,7 +4040,7 @@
 				]
 			},
 			"smoke-puff1-fg27": {
-				"twoColor": [
+				"rgba2": [
 					{ "time": 0.3, "light": "ab764cff", "dark": "ac8d75", "curve": "stepped" },
 					{ "time": 0.4667, "light": "ab764cff", "dark": "ac8d75" },
 					{ "time": 0.7333, "light": "ab764c00", "dark": "ac8d75" }
@@ -4038,7 +4050,7 @@
 				]
 			},
 			"tank-glow": {
-				"color": [
+				"rgba": [
 					{ "time": 0.0667, "color": "fc994d84" },
 					{
 						"time": 0.1333,
@@ -4864,7 +4876,7 @@
 						"time": 0.1333,
 						"x": 1.185,
 						"y": 0.945,
-						"curve": [ 0.199, 1.18, 0.222, 1.05, 0.199, 0.94, 0.222, 0.58 ]
+						"curve": [ 0.199, 1.182, 0.222, 1.048, 0.199, 0.939, 0.222, 0.579 ]
 					},
 					{ "time": 0.2333, "x": 1.008, "y": 0.471 }
 				]