Merge pull request #2493 from richTrash21/develop-char-opt

Use OR operator instead of Array.contains() in BaseCharacter
Merge pull request #2542 from FunkinCrew/main
2025-09-05 21:37:58 +00:00 · 2024-05-17 19:30:51 -04:00 · 2024-05-17 19:29:27 -04:00 · 2024-05-17 19:27:36 -04:00 · 2024-05-15 16:32:22 +04:00 · 2024-05-14 23:29:27 -04:00
3 changed files with 20 additions and 27 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 962130b2243a839106607d08a11599b1857bf8b3
+Subproject commit 783f22e741c85223da7f3f815b28fc4c6f240cbc
--- a/hmm.json
+++ b/hmm.json
@ -80,7 +80,7 @@
      "name": "hxCodec",
      "type": "git",
      "dir": null,
-      "ref": "c0c7f2680cc190c932a549c2e2fdd9b0ba2bd10e",
+      "ref": "61b98a7a353b7f529a8fec84ed9afc919a2dffdd",
      "url": "https://github.com/FunkinCrew/hxCodec"
    },
    {
--- a/source/funkin/play/character/BaseCharacter.hx
+++ b/source/funkin/play/character/BaseCharacter.hx
@ -420,7 +420,8 @@ class BaseCharacter extends Bopper
    {
      if (isSinging()) return;

-      if (['hey', 'cheer'].contains(getCurrentAnimation()) && !isAnimationFinished()) return;
+      var currentAnimation:String = getCurrentAnimation();
+      if ((currentAnimation == 'hey' || currentAnimation == 'cheer') && !isAnimationFinished()) return;
    }

    // Prevent dancing while another animation is playing.
@ -441,19 +442,15 @@ class BaseCharacter extends Bopper
    switch (player)
    {
      case 1:
-        return [
-          PlayerSettings.player1.controls.NOTE_LEFT_P,
-          PlayerSettings.player1.controls.NOTE_DOWN_P,
-          PlayerSettings.player1.controls.NOTE_UP_P,
-          PlayerSettings.player1.controls.NOTE_RIGHT_P,
-        ].contains(true);
+        return PlayerSettings.player1.controls.NOTE_LEFT_P
+          || PlayerSettings.player1.controls.NOTE_DOWN_P
+          || PlayerSettings.player1.controls.NOTE_UP_P
+          || PlayerSettings.player1.controls.NOTE_RIGHT_P;
      case 2:
-        return [
-          PlayerSettings.player2.controls.NOTE_LEFT_P,
-          PlayerSettings.player2.controls.NOTE_DOWN_P,
-          PlayerSettings.player2.controls.NOTE_UP_P,
-          PlayerSettings.player2.controls.NOTE_RIGHT_P,
-        ].contains(true);
+        return PlayerSettings.player2.controls.NOTE_LEFT_P
+          || PlayerSettings.player2.controls.NOTE_DOWN_P
+          || PlayerSettings.player2.controls.NOTE_UP_P
+          || PlayerSettings.player2.controls.NOTE_RIGHT_P;
    }
    return false;
  }
@ -469,19 +466,15 @@ class BaseCharacter extends Bopper
    switch (player)
    {
      case 1:
-        return [
-          PlayerSettings.player1.controls.NOTE_LEFT,
-          PlayerSettings.player1.controls.NOTE_DOWN,
-          PlayerSettings.player1.controls.NOTE_UP,
-          PlayerSettings.player1.controls.NOTE_RIGHT,
-        ].contains(true);
+        return PlayerSettings.player1.controls.NOTE_LEFT
+          || PlayerSettings.player1.controls.NOTE_DOWN
+          || PlayerSettings.player1.controls.NOTE_UP
+          || PlayerSettings.player1.controls.NOTE_RIGHT;
      case 2:
-        return [
-          PlayerSettings.player2.controls.NOTE_LEFT,
-          PlayerSettings.player2.controls.NOTE_DOWN,
-          PlayerSettings.player2.controls.NOTE_UP,
-          PlayerSettings.player2.controls.NOTE_RIGHT,
-        ].contains(true);
+        return PlayerSettings.player2.controls.NOTE_LEFT
+          || PlayerSettings.player2.controls.NOTE_DOWN
+          || PlayerSettings.player2.controls.NOTE_UP
+          || PlayerSettings.player2.controls.NOTE_RIGHT;
    }
    return false;
  }
Author	SHA1	Message	Date
Eric	6e5783ce8b	Merge pull request #2493 from richTrash21/develop-char-opt Use OR operator instead of Array.contains() in BaseCharacter	2024-05-17 19:30:51 -04:00
Eric	6a33f5026b	Merge pull request #2542 from FunkinCrew/main Apply fixes from main branch.	2024-05-17 19:29:27 -04:00
Eric	f4a31b30c3	Merge pull request #2472 from Noobz4Life/hxcodec-fix Bump hxCodec commit (fixes Linux issue where it crashes after load)	2024-05-17 19:27:36 -04:00
rich	a8279cdd76	Merge branch 'FunkinCrew:main' into develop-char-opt	2024-05-15 16:32:22 +04:00
Cameron Taylor	7490b7eab7	Merge branch 'develop-0.3.3'	2024-05-14 23:29:27 -04:00
Cameron Taylor	f21cff86be	asset submod grr...	2024-05-14 23:29:09 -04:00
richTrash21	7df41ebc56	minor optimization	2024-05-13 21:35:26 +04:00
Noobz4Life	42e69c1f73	bump hxcodec version	2024-05-12 18:51:21 -04:00
Noobz4Life	1f8954acad	bump hxcodec version (fixes linux compilation)	2024-05-11 21:47:28 -04:00