fixed up video and texture handling

[chaz/yoink] / data / animations / Heroine.json

diff --git a/data/animations/Heroine.json b/data/animations/Heroine.json
index 55ffb7daf26d55f5aadd0e1d59d5c7ddfef86212..ca47ea041f7f556989feaae04151e556bee811cc 100644 (file)
--- a/data/animations/Heroine.json
+++ b/data/animations/Heroine.json
@@ -1,253 +1,283 @@
 {
-  "Stand": {
-    "type": "Stand",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 1,
-        "duration": 4
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 2
-      },
-      {
-        "index": 0,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 2,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 3
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 2
-      },
-      {
-        "index": 0,
-        "duration": 4
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 2,
-        "duration": 3
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 0,
-        "duration": 1
-      },
-      {
-        "index": 1,
-        "duration": 2
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      }
-    ]
-  },
-  "Blink": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 3,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Run": {
-    "type": "Run",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      },
-      {
-        "index": 6
-      },
-      {
-        "index": 7
-      }
-    ]
-  },
-  "StopRunning": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 10,
-    "loop": true,
-    "frames": [
-      {
-        "index": 8
-      }
-    ]
-  },
-  "Jump": {
-    "type": "Jump",
-    "next": "FlyDiagonallyUp",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 9,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Land": {
-    "type": "Stand",
-    "next": "StopRunning",
-    "delay": 0.5,
-    "frames": [
-      {
-        "index": 9,
-        "duration": 0.25
-      }
-    ]
-  },
-  "FlyDiagonallyUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 10
-      },
-      {
-        "index": 11
-      }
-    ]
-  },
-  "FlyDiagonallyDown": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 12
-      },
-      {
-        "index": 13
-      }
-    ]
-  },
-  "FlyStraightUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 0
-      }
-    ]
-  },
-  "FlyHorizontally": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 4
-      },
-      {
-        "index": 14
-      }
-    ]
-  },
-  "KnockedDown": {
-    "type": "Hit",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 17
-      },
-      {
-        "index": 18
-      }
-    ]
-  },
-  "Flattened": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 19
-      }
-    ]
-  },
-  "StartCharging": {
-    "type": "Charge",
-    "next": "Charge",
-    "delay": 0.2,
-    "frames": [
-      {
-        "index": 21
-      }
-    ]
-  },
-  "Charge": {
-    "type": "Charge",
-    "delay": 0.2,
-    "loop": true,
-    "frames": [
-      {
-        "index": 22
-      }
-    ]
-  },
-  "FireCharge": {
-    "type": "Charge",
-    "delay": 0.2,
-    "frames": [
-      {
-        "index": 23
-      }
-    ]
-  }
+       "Stand":
+       {
+               "type": "Stand",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 1,
+                               "duration": 4
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 2
+                       },
+                       {
+                               "index": 0,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 2,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 3
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 2
+                       },
+                       {
+                               "index": 0,
+                               "duration": 4
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 2,
+                               "duration": 3
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 0,
+                               "duration": 1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 2
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       }
+               ]
+       },
+       "Blink":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 3,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Run":
+       {
+               "type": "Run",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       },
+                       {
+                               "index": 6
+                       },
+                       {
+                               "index": 7
+                       }
+               ]
+       },
+       "StopRunning":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 10,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 8
+                       }
+               ]
+       },
+       "Jump":
+       {
+               "type": "Jump",
+               "next": "FlyDiagonallyUp",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 9,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Land":
+       {
+               "type": "Stand",
+               "next": "StopRunning",
+               "delay": 0.5,
+               "frames":
+               [
+                       {
+                               "index": 9,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "FlyDiagonallyUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 10
+                       },
+                       {
+                               "index": 11
+                       }
+               ]
+       },
+       "FlyDiagonallyDown":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 12
+                       },
+                       {
+                               "index": 13
+                       }
+               ]
+       },
+       "FlyStraightUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       }
+               ]
+       },
+       "FlyHorizontally":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 14
+                       }
+               ]
+       },
+       "KnockedDown":
+       {
+               "type": "Hit",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 17
+                       },
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "Flattened":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 19
+                       }
+               ]
+       },
+       "StartCharging":
+       {
+               "type": "Charge",
+               "next": "Charge",
+               "delay": 0.2,
+               "frames":
+               [
+                       {
+                               "index": 21
+                       }
+               ]
+       },
+       "Charge":
+       {
+               "type": "Charge",
+               "delay": 0.2,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 22
+                       }
+               ]
+       },
+       "FireCharge":
+       {
+               "type": "Charge",
+               "delay": 0.2,
+               "frames":
+               [
+                       {
+                               "index": 23
+                       }
+               ]
+       }
 }