fixed a few things

usb-port-2 · Sep 19, 2024 · fc8a2ff · fc8a2ff
1 parent b7f2d8c
commit fc8a2ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/load_in/scripts/Song.hx b/load_in/scripts/Song.hx
@@ -17,5 +17,11 @@ function onNoteHit(e)
         e.character.playAnim("smash", true);
     }
 
-function measureHit()
-    curCameraTarget = strumLines.members[1].character[0].getAnim() != "idle" ? 1 : 0;
+function measureHit() {
+    if(strumLines.members[1].character[0].getAnimName() != "idle")
+        curCameraTarget = 1;
+    else if(strumLines.members[0].character[0].getAnimName() != "idle")
+        curCameraTarget = 0;
+    else
+        curCameraTarget = (curCameraTarget == 0 ? 1 : 0);
+}
diff --git a/load_in/stages/farm.hx b/load_in/stages/farm.hx
@@ -1,6 +1,6 @@
 function postCreate() {
     defaultCamZoom = camGame.zoom = 0.6;
-    for(a in [
+    for(num => a in [
         // [graphic, x, y, scrollx, scrolly, scale]
         ["sky", -900, -200, 0.85, 0.7, 1.6],
         ["field_back", -410, 185, 0.75, 0.75, 1],
@@ -13,7 +13,7 @@ function postCreate() {
         getImageFromGithub(sprite, "stages/" + SONG.stage + "/" + a[0]);
         sprite.scrollFactor.set(a[3], a[4]);
         sprite.scale.x = sprite.scale.y = a[5];
-        add(sprite);
+        insert(num, sprite);
     }
     strumLines.members[0].characters[0].setPosition(315, 218);
     strumLines.members[1].characters[0].setPosition(920, 525);