[ENHANCEMENT] Make pico-speaker revert to idle animation when not shooting

preload/data/characters/pico-speaker.json

@@ -4,62 +4,60 @@
   "assetPath": "characters/picoSpeaker",
   "startingAnimation": "idle",
   "singTime": 8.0,
-  "offsets": [125, 5],
+  "offsets": [12.5, 5],
   "animations": [
     {
       "name": "idle",
-      "prefix": "Pico shoot 1",
-      "offsets": [0, 0],
-      "looped": true,
-      "frameIndices": [17, 18, 19, 20, 21, 22, 23, 24, 25]
+      "prefix": "Pico idle",
+      "offsets": [0, 0]
     },
     {
       "name": "shoot1",
       "prefix": "Pico shoot 1",
-      "offsets": [0, 0]
+      "offsets": [0, 130]
     },
     {
       "name": "shoot1-hold",
       "prefix": "Pico shoot 1",
-      "offsets": [0, 0],
+      "offsets": [0, 130],
       "looped": true,
-      "frameIndices": [22, 23, 24, 25]
+      "frameIndices": [22, 23, 24]
     },
     {
       "name": "shoot2",
       "prefix": "Pico shoot 2",
-      "offsets": [-1, -128]
+      "offsets": [-1, 2]
     },
     {
       "name": "shoot2-hold",
       "prefix": "Pico shoot 2",
-      "offsets": [-1, -128],
+      "offsets": [-1, 2],
       "looped": true,
-      "frameIndices": [56, 57, 58, 59]
+      "frameIndices": [56, 57, 58]
     },
     {
       "name": "shoot3",
       "prefix": "Pico shoot 3",
-      "offsets": [412, -64]
+      "offsets": [413, 66]
     },
     {
       "name": "shoot3-hold",
       "prefix": "Pico shoot 3",
-      "offsets": [412, -64],
+      "offsets": [413, 66],
       "looped": true,
-      "frameIndices": [49, 50, 51, 52]
+      "frameIndices": [49, 50, 51]
     },
     {
       "name": "shoot4",
       "prefix": "Pico shoot 4",
-      "offsets": [439, -19]
+      "offsets": [440, 111]
     },
     {
       "name": "shoot4-hold",
       "prefix": "Pico shoot 4",
-      "offsets": [439, -19],
+      "offsets": [440, 111],
       "looped": true,
-      "frameIndices": [49, 50, 51, 52]
+      "frameIndices": [49, 50, 51]
     }
   ]
-}
+}

preload/data/songs/stress/stress-chart.json

@@ -4,6 +4,7 @@
   "events": [
     { "t": 0, "e": "FocusCamera", "v": { "char": 1 } },
     { "t": 5393, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 10786.5168539326, "e": "PlayAnimation", "v": { "target": "gf", "anim": "idle", "force": true } },
     { "t": 11123, "e": "FocusCamera", "v": { "char": 1 } },
     { "t": 14831, "e": "FocusCamera", "v": { "char": 0 } },
     { "t": 21573, "e": "FocusCamera", "v": { "char": 1 } },
@@ -25,7 +26,8 @@
     { "t": 97078, "e": "FocusCamera", "v": { "char": 1 } },
     { "t": 102471, "e": "FocusCamera", "v": { "char": 0 } },
     { "t": 107865, "e": "FocusCamera", "v": { "char": 1 } },
-    { "t": 113258, "e": "FocusCamera", "v": { "char": 0 } }
+    { "t": 113258, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 122022.471910112, "e": "PlayAnimation", "v": { "target": "gf", "anim": "idle", "force": true } }
   ],
   "notes": {
     "picospeaker": [
@@ -3034,4 +3036,4 @@
     ]
   },
   "generatedBy": "Friday Night Funkin' - v0.7.3 (master:ce83e96) PROTOTYPE"
-}
+}

preload/scripts/characters/pico-speaker.hxc

@@ -101,13 +101,20 @@ class PicoSpeakerCharacter extends SparrowCharacter
     switch (direction)
     {
       case 0:
-        this.playAnimation('shoot1', true, true);
+        this.playAnimation('shoot1', true, false);
       case 1:
-        this.playAnimation('shoot2', true, true);
+        this.playAnimation('shoot2', true, false);
       case 2:
-        this.playAnimation('shoot3', true, true);
+        this.playAnimation('shoot3', true, false);
       case 3:
-        this.playAnimation('shoot4', true, true);
+        this.playAnimation('shoot4', true, false);
     }
   }
+
+  //So pico won't be "doing cool things" after retrying
+  override function onSongRetry()
+  {
+    super.onSongRetry();
+    this.playAnimation('idle', true, true);
+  }
 }