StrumLines Fix

Author: AlejoGDOfficial

.github/workflows/builds.yaml

@@ -29,49 +29,6 @@ jobs:
             pre_build_commands:
             artifact_path: export/32bit/windows/bin
 
-          - platform: Nintendo Switch
-            os: ubuntu-latest
-            haxe_setup: |
-              apt-get update
-              apt-get install -y wget git neko libgc-dev
-
-              wget https://github.com/HaxeFoundation/haxe/releases/download/4.3.4/haxe-4.3.4-linux64.tar.gz
-              mkdir haxe_temp
-              tar -xf haxe-4.3.4-linux64.tar.gz -C haxe_temp
-              cp -r haxe_temp/haxe_*/* /usr/local/bin/
-
-              mkdir -p ~/haxelib
-              haxelib --always --quiet setup ~/haxelib
-              haxelib --global --always --quiet update haxelib
-            build_cmd: haxelib run lime build Project.xml switch --app-version="4.0.0-${{ github.run_id}}" -D officialBuild
-            extra_libs: |
-              dkp-pacman -Sy --noconfirm
-                  
-              dkp-pacman -S --needed --noconfirm \
-                
-              switch-bzip2 switch-cmake switch-curl switch-flac \
-              switch-freetype switch-glad switch-glm switch-harfbuzz \
-              switch-libdrm_nouveau switch-libjpeg-turbo switch-libmodplug \
-              switch-libogg switch-libopus switch-libpng switch-libvorbis \
-              switch-libvorbisidec switch-libwebp switch-mesa switch-mpg123 \
-              switch-openal-soft switch-opusfile switch-pkg-config switch-sdl2 \
-              switch-sdl2_gfx switch-sdl2_image switch-sdl2_mixer \
-              switch-sdl2_net switch-sdl2_ttf switch-tools switch-zlib \
-              switch-liblua51
-                  
-              haxelib --always --quiet install format
-              haxelib --always --quiet install hxp
-              haxelib --always --quiet git lime https://github.com/Slushi-Github/lime-nx.git
-              haxelib --always --quiet git hxcpp https://github.com/Slushi-Github/hxcpp-nx.git
-              haxelib --always --quiet git hx_libnx https://github.com/Slushi-Github/hx_libnx.git
-            pre_build_commands: |
-              cd ~/haxelib/hxcpp/git/tools/hxcpp
-              haxe compile.hxml
-              cd -
-                  
-              haxelib run lime rebuild switch
-            artifact_path: export/release/switch/bin/*.nro
-
           - platform: Linux
             os: ubuntu-22.04
             haxe_setup:

source/funkin/visuals/game/StrumLine.hx

@@ -39,7 +39,7 @@ class StrumLine extends FlxSpriteGroup
 
     public var scrollSpeed:Float = 1;
 
-    public var inputMap:IntMap<Int> = new IntMap();
+    public var inputMap:IntMap<Array<Int>> = new IntMap();
 
     public final totalStrums:Int;
 
@@ -108,8 +108,15 @@ class StrumLine extends FlxSpriteGroup
         }
 
         for (arrayIndex => array in inputsArray)
+        {
             for (key in array)
-                inputMap.set(key, arrayIndex);
+            {
+                if (!inputMap.exists(key))
+                    inputMap.set(key, []);
+
+                inputMap.get(key).push(arrayIndex);
+            }
+        }
 
         x = chartData.rightToLeft ? data.position.x : FlxG.width - data.position.x - (data.strums.length - 1) * data.space - strums.members[strums.members.length - 1].width;
         y = ClientPrefs.data.downScroll ? FlxG.height - data.position.y - strumHeight : data.position.y;
@@ -201,12 +208,15 @@ class StrumLine extends FlxSpriteGroup
         if (botplay)
             return;
 
-        var strumIndex:Null<Int> = inputMap.get(key);
+        var strumIndex:Null<Array<Null<Int>>> = inputMap.get(key);
 
         if (strumIndex != null)
         {
-            keyPressed[strumIndex] = true;
-            keyJustPressed[strumIndex] = true;
+            for (indices in strumIndex)
+            {
+                keyPressed[indices] = true;
+                keyJustPressed[indices] = true;
+            }
         }
     }
 
@@ -215,12 +225,15 @@ class StrumLine extends FlxSpriteGroup
         if (botplay)
             return;
 
-        var strumIndex:Null<Int> = inputMap.get(key);
+        var strumIndex:Null<Array<Null<Int>>> = inputMap.get(key);
 
         if (strumIndex != null)
         {
-            keyPressed[strumIndex] = false;
-            keyJustReleased[strumIndex] = true;
+            for (indices in strumIndex)
+            {
+                keyPressed[indices] = false;
+                keyJustReleased[indices] = true;
+            }
         }
     }