im gonna scream

Author: Z11Coding

assets/base_game/shared/characters/Zenetta-cowbell-p.json

@@ -16,22 +16,6 @@
 			"name": "idle alt",
 			"indices": []
 		},
-		{
-			"loop": false,
-			"offsets": [-22, 4],
-			"anim": "singLEFT",
-			"fps": 24,
-			"name": "left0",
-			"indices": []
-		},
-		{
-			"loop": false,
-			"offsets": [16, -34],
-			"anim": "singRIGHT",
-			"fps": 24,
-			"name": "right0",
-			"indices": []
-		},
 		{
 			"loop": false,
 			"offsets": [28, -41],
@@ -50,35 +34,55 @@
 		},
 		{
 			"loop": false,
-			"offsets": [-22, 29],
-			"anim": "singLEFT-alt",
+			"offsets": [27, -22],
+			"anim": "singDOWN-alt",
 			"fps": 24,
-			"name": "left alt",
+			"name": "down alt",
 			"indices": []
 		},
 		{
 			"loop": false,
-			"offsets": [16, -9],
-			"anim": "singRIGHT-alt",
+			"offsets": [4, -7],
+			"anim": "singUP-alt",
 			"fps": 24,
-			"name": "right alt",
+			"name": "up alt",
 			"indices": []
 		},
 		{
+			"prefix": "right0",
+			"offsets": [15, -34],
+			"indices": [],
+			"fps": 24,
+			"anim": "singLEFT",
 			"loop": false,
-			"offsets": [27, -22],
-			"anim": "singDOWN-alt",
+			"name": "right0"
+		},
+		{
+			"prefix": "left0",
+			"offsets": [-21, 4],
+			"indices": [],
 			"fps": 24,
-			"name": "down alt",
-			"indices": []
+			"anim": "singRIGHT",
+			"loop": false,
+			"name": "left0"
 		},
 		{
+			"prefix": "right alt",
+			"offsets": [16, -10],
+			"indices": [],
+			"fps": 24,
+			"anim": "singLEFT-alt",
 			"loop": false,
-			"offsets": [4, -7],
-			"anim": "singUP-alt",
+			"name": "right alt"
+		},
+		{
+			"prefix": "left alt",
+			"offsets": [-22, 30],
+			"indices": [],
 			"fps": 24,
-			"name": "up alt",
-			"indices": []
+			"anim": "singRIGHT-alt",
+			"loop": false,
+			"name": "left alt"
 		}
 	],
 	"vocals_file": "",

assets/base_game/shared/characters/Zenetta-cowbell.json

@@ -1942,6 +1942,11 @@ class APPlayState extends PlayState {
             return;
         }
 
+        if (zenetta.holdTimer > Conductor.stepCrochet * 0.001 * zenetta.singDuration
+            && zenetta.animation.curAnim.name.startsWith('sing')
+            && !zenetta.animation.curAnim.name.endsWith('miss'))
+            zenetta.dance();
+
         // if (archipelago.APItem.activeItem is archipelago.APItem.APChartModifier && cast(archipealgo.APItem.activeItem:archipelago.APItem.APChartModifier).chartModifier != chartModifier)
         //
         if ((startedCountdown && !(inCutscene || (function()
@@ -2177,8 +2182,8 @@ class APPlayState extends PlayState {
             if (resistanceAmount <= 0) resistanceAmount = 0;
             if (resistanceAmount == 1) health -= (0.00051 / (60 / ClientPrefs.data.framerate)) * dmgMultiplier;
 
-            zenetta.alpha = resistanceAmount;
-            boyfriend.alpha = (1.0000000001 - resistanceAmount);
+            zenetta.alpha = 0.0000000001 + resistanceAmount;
+            boyfriend.alpha = (1 - resistanceAmount);
             zenetta.x = boyfriend.x;
             zenetta.y = boyfriend.y - 280;
             bfkilledcheck = true;
@@ -2644,14 +2649,14 @@ class APPlayState extends PlayState {
 			case -1:
 				terminateMessage.visible = false;
 		}
-        super.beatHit();
-
         if (releasethebeast) {
             if (resistanceAmount < 1) resistanceAmount += 0.005;
-            var anim:String = zenetta.getAnimationName();
-            if(zenetta.holdTimer > Conductor.stepCrochet * (0.0011 #if FLX_PITCH / FlxG.sound.music.pitch #end) * zenetta.singDuration && anim.startsWith('sing') && !anim.endsWith('miss'))
+
+            if (curBeat % zenetta.danceEveryNumBeats == 0 && !zenetta.getAnimationName().endsWith('-alt')) {
                 zenetta.dance();
+            }
         }
+        super.beatHit();
     }
 
     override function closeSubState()