From d70995515d489f4ba2e9719e3808d0d089229f05 Mon Sep 17 00:00:00 2001
From: Rmojarro1 <48000819+Rmojarro1@users.noreply.github.com>
Date: Tue, 4 Mar 2025 18:57:54 -0800
Subject: [PATCH 1/5] Added basic controller support

Added new button for controller in settings, will also swap to controller controls if gamepad buttons are pressed in battle if they were not selected. currently only for d-pad directions, added functionality for menu navigation, pausing game(start button), opening inventory(select button), confirming (A button). Testing with 8BitDo Ultimate Cotroller
---
 scenes/NoteManager/scripts/InputHandler.cs    |  66 +++++++++++++++++-
 scenes/Remapping/ControlSchemes.cs            |  20 ++++++
 scenes/Remapping/ControlSettings.cs           |  14 ++++
 scenes/Remapping/Remap.tscn                   |   8 +++
 scenes/Remapping/assets/360_Dpad_Down.png     | Bin 0 -> 5248 bytes
 .../Remapping/assets/360_Dpad_Down.png.import |  34 +++++++++
 scenes/Remapping/assets/360_Dpad_Left.png     | Bin 0 -> 5201 bytes
 .../Remapping/assets/360_Dpad_Left.png.import |  34 +++++++++
 scenes/Remapping/assets/360_Dpad_Right.png    | Bin 0 -> 5173 bytes
 .../assets/360_Dpad_Right.png.import          |  34 +++++++++
 scenes/Remapping/assets/360_Dpad_Up.png       | Bin 0 -> 5157 bytes
 .../Remapping/assets/360_Dpad_Up.png.import   |  34 +++++++++
 12 files changed, 241 insertions(+), 3 deletions(-)
 create mode 100644 scenes/Remapping/assets/360_Dpad_Down.png
 create mode 100644 scenes/Remapping/assets/360_Dpad_Down.png.import
 create mode 100644 scenes/Remapping/assets/360_Dpad_Left.png
 create mode 100644 scenes/Remapping/assets/360_Dpad_Left.png.import
 create mode 100644 scenes/Remapping/assets/360_Dpad_Right.png
 create mode 100644 scenes/Remapping/assets/360_Dpad_Right.png.import
 create mode 100644 scenes/Remapping/assets/360_Dpad_Up.png
 create mode 100644 scenes/Remapping/assets/360_Dpad_Up.png.import

diff --git a/scenes/NoteManager/scripts/InputHandler.cs b/scenes/NoteManager/scripts/InputHandler.cs
index 1b6f32c5..c373a308 100644
--- a/scenes/NoteManager/scripts/InputHandler.cs
+++ b/scenes/NoteManager/scripts/InputHandler.cs
@@ -97,17 +97,56 @@ private void LoadControlScheme()
         }
 
         var selectedScheme = ControlSchemes.Schemes[scheme];
+
         foreach (var arrow in Arrows)
         {
             if (selectedScheme.ContainsKey(arrow.Key))
             {
-                InputEventKey eventKey = new InputEventKey();
-                eventKey.Keycode = (Key)Enum.Parse(typeof(Key), selectedScheme[arrow.Key]);
-                InputMap.ActionAddEvent(arrow.Key, eventKey);
+                string inputName = selectedScheme[arrow.Key];
+
+                if (inputName.StartsWith("Joypad")) // Controller input
+                {
+                    InputEventJoypadButton eventJoypad = new InputEventJoypadButton();
+                    eventJoypad.ButtonIndex = GetJoypadButton(inputName);
+
+                    if (eventJoypad.ButtonIndex != JoyButton.Invalid) // Ensure it's valid
+                    {
+                        InputMap.ActionAddEvent(arrow.Key, eventJoypad);
+                    }
+                    else
+                    {
+                        GD.PrintErr($"Invalid joypad button mapping: {inputName}");
+                    }
+                }
+                else // Keyboard input
+                {
+                    if (Enum.TryParse(inputName, out Key keycode)) // Check if valid keyboard key
+                    {
+                        InputEventKey eventKey = new InputEventKey();
+                        eventKey.Keycode = keycode;
+                        InputMap.ActionAddEvent(arrow.Key, eventKey);
+                    }
+                    else
+                    {
+                        GD.PrintErr($"Invalid key mapping: {inputName}");
+                    }
+                }
             }
         }
     }
 
+    private JoyButton GetJoypadButton(string action)
+    {
+        return action switch
+        {
+            "Joypad_Dpad_Up" => JoyButton.DpadUp,
+            "Joypad_Dpad_Down" => JoyButton.DpadDown,
+            "Joypad_Dpad_Left" => JoyButton.DpadLeft,
+            "Joypad_Dpad_Right" => JoyButton.DpadRight,
+            _ => JoyButton.Invalid, // Return an invalid button if unknown
+        };
+    }
+
     public override void _Process(double delta)
     {
         foreach (var arrow in Arrows)
@@ -124,4 +163,25 @@ public override void _Process(double delta)
             }
         }
     }
+
+    public override void _Input(InputEvent @event)
+    {
+        // Detect if a gamepad button is pressed
+        if (@event is InputEventJoypadButton || @event is InputEventJoypadMotion)
+        {
+            // Get the currently active control scheme
+            string currentScheme = (string)ProjectSettings.GetSetting("game/input_scheme");
+
+            // Switch to "CONTROLLER" scheme if not already active
+            if (currentScheme != "CONTROLLER")
+            {
+                GD.Print("Gamepad detected, switching to CONTROLLER scheme.");
+                ProjectSettings.SetSetting("game/input_scheme", "CONTROLLER");
+                ProjectSettings.Save();
+
+                // Reload the control scheme to apply changes
+                LoadControlScheme();
+            }
+        }
+    }
 }
diff --git a/scenes/Remapping/ControlSchemes.cs b/scenes/Remapping/ControlSchemes.cs
index 7d8ac898..22eb999d 100644
--- a/scenes/Remapping/ControlSchemes.cs
+++ b/scenes/Remapping/ControlSchemes.cs
@@ -38,6 +38,16 @@ public static class ControlSchemes
                 { "arrowRight", "R" },
             }
         },
+        {
+            "CONTROLLER",
+            new Dictionary<string, string>()
+            {
+                { "arrowUp", "Joypad_Dpad_Up" },
+                { "arrowDown", "Joypad_Dpad_Down" },
+                { "arrowLeft", "Joypad_Dpad_Left" },
+                { "arrowRight", "Joypad_Dpad_Right" },
+            }
+        },
     };
 
     public static Dictionary<string, Dictionary<string, string>> SpriteMappings = new Dictionary<
@@ -75,5 +85,15 @@ public static class ControlSchemes
                 { "down", "res://scenes/Remapping/assets/E_Key_Light.png" },
             }
         },
+        {
+            "CONTROLLER",
+            new Dictionary<string, string>()
+            {
+                { "left", "res://scenes/Remapping/assets/360_Dpad_Left.png" },
+                { "right", "res://scenes/Remapping/assets/360_Dpad_Right.png" },
+                { "up", "res://scenes/Remapping/assets/360_Dpad_Up.png" },
+                { "down", "res://scenes/Remapping/assets/360_Dpad_Down.png" },
+            }
+        },
     };
 }
diff --git a/scenes/Remapping/ControlSettings.cs b/scenes/Remapping/ControlSettings.cs
index 21d3d3b0..13ecb99f 100644
--- a/scenes/Remapping/ControlSettings.cs
+++ b/scenes/Remapping/ControlSettings.cs
@@ -28,6 +28,8 @@ public override void _Ready()
             .Connect("pressed", Callable.From(OnArrowButtonPressed));
         GetNode<Button>("Panel/QWERTButton")
             .Connect("pressed", Callable.From(OnQWERTButtonPressed));
+        GetNode<Button>("Panel/ControllerButton")
+            .Connect("pressed", Callable.From(OnControllerButtonPressed));
 
         string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
         switch (scheme)
@@ -44,6 +46,10 @@ public override void _Ready()
                 OnWASDButtonPressed();
                 GetNode<Button>("Panel/WASDButton").GrabFocus();
                 break;
+            case "CONTROLLER":
+                OnControllerButtonPressed();
+                GetNode<Button>("Panel/ControllerButton").GrabFocus();
+                break;
         }
 
         _closeButton.Pressed += CloseMenu;
@@ -95,6 +101,14 @@ private void OnQWERTButtonPressed()
         ChangeKeySprites("QWERT");
     }
 
+    private void OnControllerButtonPressed()
+    {
+        GetNode<Label>("Panel/Label").Text = "Controller Selected";
+        ProjectSettings.SetSetting("game/input_scheme", "CONTROLLER");
+        ProjectSettings.Save();
+        ChangeKeySprites("CONTROLLER");
+    }
+
     private void ChangeKeySprites(string scheme)
     {
         var selectedScheme = ControlSchemes.SpriteMappings[scheme];
diff --git a/scenes/Remapping/Remap.tscn b/scenes/Remapping/Remap.tscn
index 170b997f..40bf965b 100644
--- a/scenes/Remapping/Remap.tscn
+++ b/scenes/Remapping/Remap.tscn
@@ -60,6 +60,14 @@ offset_right = 603.0
 offset_bottom = 125.0
 text = "CONTROLS_QWER_BUTTON"
 
+[node name="ControllerButton" type="Button" parent="Panel"]
+layout_mode = 0
+offset_left = 404.0
+offset_top = 57.0
+offset_right = 491.0
+offset_bottom = 88.0
+text = "Controller"
+
 [node name="TitleButton" type="Button" parent="Panel"]
 layout_mode = 0
 offset_left = 232.0
diff --git a/scenes/Remapping/assets/360_Dpad_Down.png b/scenes/Remapping/assets/360_Dpad_Down.png
new file mode 100644
index 0000000000000000000000000000000000000000..944d59bb015bd1304c86dad5ccc0af75779a4c16
GIT binary patch
literal 5248
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
B3-JH|

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Down.png.import b/scenes/Remapping/assets/360_Dpad_Down.png.import
new file mode 100644
index 00000000..9e66d35d
--- /dev/null
+++ b/scenes/Remapping/assets/360_Dpad_Down.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ccxvc4o887ugg"
+path="res://.godot/imported/360_Dpad_Down.png-38115a1bb92c3261d97311636caf8e7f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/360_Dpad_Down.png"
+dest_files=["res://.godot/imported/360_Dpad_Down.png-38115a1bb92c3261d97311636caf8e7f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/Remapping/assets/360_Dpad_Left.png b/scenes/Remapping/assets/360_Dpad_Left.png
new file mode 100644
index 0000000000000000000000000000000000000000..6091cf2d61225132961f79fab80e4abd455a7e51
GIT binary patch
literal 5201
zcmX|Fc|26#`yUZQgRy0&u{UWfNp_hmGuB3gETOSxq%6r2WiTlFE@W&qwvZva?0fRj
zgfK|5Wy`*OZ@)i&_jT_%ulu_9KKFUf^PKnleNNPEV?AajJ|++d#EeF1n*u%d-vy=z
zTCcejGZ2WA2d%AT=Kp5Rw%3!tyZ$u5epH|XZEBC?ysT9DqLi3a6DFnQXQjQz7`x6P
zkSnQF&k6;)y5@&6@*tXXShn*hMY;GZG7ug%cGtIW#eNw^T~%yo_=6<r`}*#5Xzi+h
zVE`*;O__HdE(<SLw2)r#|De*}sB2^P+;~K@V1DD$W%rtiqsQyM0*lnYfB$+VtYzG=
zvqpaV_H7!&Sy(_?CKIKyK#DZUMbe(Etu!z!#doS{dwaXdvvxA~{=>ycN^JbSvfbt)
zw>TOP={l17Bw6^)n>T9KUg}XB_n@X_clqC&xm#nB8S0YpD;?!4^>MLraV>Sf0t)>L
z@ud|NAw<$LEoic$O3*^-5?)P3MdgrE;?Z#hR$y0gW{yb~)P7fp%nLPxho_`)m6n!*
zKvm<?RpTC|0r$!-g6tLe^2Xd9fOclRoxJv;n*|JulT7NJx0r?6T!C5a&ayd@3QaT)
zuzzr_HTU*sBZcRFOf-o68u4Y%x6>0JbFUe3RnQn!z;Vm<N^vq>a5Jd1d=>Z*jY*D-
za9AB%*=f02AjkeYrkvVmtcDB?Fg54;WWzGQ$&>0-xuPZL!b1;fCz#i|WqJv8dtXh_
zhb8s4Dj50U+}xt3WH2t`IvAnre6J(PxJNP*SFELAI{_!c7Ua(iI+*z3#e`lgsC85e
zls-rWy!g=ADA4eHl04#}II`rUMv3Vp7Hd#^6Z#k8d$F=YagU!rM~FJ#qU<yUG@W`S
zM1;WLB{m3d{?}c#^75QIT8Omv<z=`iZD<9pHe)YVKB@-<vZY{3#)2rFRgy`JM<FWN
zy6?@98o6ny&&03hio2uE4P?gy`3C}T0FgV^eQfm#O#wUGHjCz5;ose~1Ub*!Qi6x0
zonpeY%+0aYR?;#uqAB{l(NmrZd}r1`a_?M+(|L;*+$&Rrw0{rp@LGJLYzF6Y&7`M3
z5i=zSiX_pEjQI*Mq&lI`Y$!WF`VB;=k{!ObyM`*+&Wie@3d#KoZ`(e&@pS!}n3zzl
zk}2-|;eq;OgW!v(WPnW<NHH;mpA)@_;Y{v#0=4?9(L>A1K_SJvN5Sv0G-<k-X~={D
z55)_%6!o16GIP7^O|Vv>Y1_epazs0<;r^%sgq{|P+$Spf*v^#QEy>z`@_JDOw(#VW
ze_@dt_8lqO^nFJUs(94W);8RMN2p0K5?XoZU{Qy#(5veoFPJ9=gad?p3&Z(s7kE{}
zTZ%WL@`emLBLf->iOc-zE4c6^V~JW=C=U4dZrLfNQI$`J@I5bfo*+6#i+S>ON#RZk
zCy~3G!!XyR(DdJL%2!ss-<vtMytsv?>~t?YQQj4k1Ycug*Nz}cNu}t2QDBZHzO|G-
zgeZ%{Vzr95>7p;0>&z+{JF0$WWy%pSH?OR!`kVt8duIlhM~_Q$GUY}pO4B=wVBOq$
zx#{zOsF-vxx8IuuWz!swzb7sy@cL{X$olHQ^s`a!=?-a~_0gRofx71AKw#H;XFr%%
zP|kSA>!5~4s3yC!Mf18hFA@{<3we0uYZKOQS9&{fAQR#V)Jvci&M2qb?T9NkQ0J~?
zK;S7%p_*&?mVn!=Nu}=5>Cyj(1HfH)M284%=y1a<EY`+oR1F~yEvo`)j>unTmS2@m
z(R1L5&@;srxMuDieB2e2`<IP(ZkZ+)zqX(0f|#=yUYvT_8Qt!2{$1sge~Eo?SVrnI
zBru)RS)P~ma;GEa<7EI2Hk9t(Ixi;iv(M|<4{JV#bJQr4^Dj;<H}zKP|9C&rnG)8s
zrAf=Tfk<~{Tr$;0J4hrsEVyM#c#qXmC=`wgVKI?^=)#3WX;XZEX%&txS;AOU*gHpr
zT#!5#NbFvp1VPQeYW`iPV`WdlkSruu@;%Aj(L#w07EM%R*QjPQboq&)E<$7Ee{1dO
zc76=CUzY(NW98ENqjn2E0tZJ!8|vo2@njGqMNdQrX{=`jVJuU_x3|6j9tHa}*!rpK
zBO&eSeQz12uG}dkW*MQy@NY+#>}7dc6$V=a%*}To+L%sw^p-3dDt}k{-$d7`fT!ro
zB^1vs*CRY8Bb=<#4JEt;B)zozohONSf?zrx(rQvyz9I{0uZ4c|tQ~j3;G%q&>toH}
z3kPWkf2&k+ThKMgyj&>j+(+e$FarYvR#*ZH6UBFPYr!CwjVq5tT8xV=-SmIuS-Y}5
zkl0ayy@YRlED-k-$j$J}6sZ($Zf-9DhWheq&1PFN?ub6)9q*G*0tf_RpQhHlWNiA8
zV%CgK4PaY-iE4|=-~?(Br~o=TShjJ#UByv(jEZK|$=eUo{i1H;9*W6OYNCIJ&t}N+
zIyZxet%<UxrVB;EXi^JuIZEtjU-cF$(zP+k=Q;Ejmpq$XhN0R*kIf9g1#R}wd$ES{
zpHY2Sc_AdoqpYl~iK9kB7!8&YtS=YMHlF`hW-aZdWV9HwztPUB1>XF<WhgPfY56W#
zpJ|gf!y#mE>gncO=Y`|l$wyKBsR;!nc(u&&UVZsGXg}_Q{H^UO(wKX`8C;N)={!#a
z+ixB5wyB1vmCenu_sSxGb7#jF)M_u=nj~qG&c?;T2MoZMm7OBe_U_tb&amd$@wK6$
zp@Kc~y{ka7ce%xt(Q-TxeTS&&JiLde=V_T4T%D;w5}aX3UvrOn@6Xf&LE)5wFYYxP
zKYKYiV{{r1er4sXAD%SJToXsYQ=;{<Uv)n?K3u7&?4M^`-a8UP8#5t$!t(R;&lnFi
z%$!p63(J&J3`Y;-0e+;;$7yygExli?U#YLFt3%lcb&iko#(X`OX55jj`t(Cfi*TSW
zg71tMHE|A#LcPO#;BW`23&3=~qYSvxzO}VwmM!xVL1zx<3OYO4+h0h#|NUuL8z_Io
zwP*|Ar2n43$;p|E(>x{kjL*NFS+72JARUVNRXp|gw`75f#>ca2>{El0J&2ICQ4`JA
z*}nzOo0~sg`F0hckAhLRRMbr^bft8E+HXZ>Vk%wNyqw`E-Yt`dCGu-&x0@{A>y5!1
zGydh{<R;#qxbq}wWY5L3Pj^d<jCA2Cj?-3(Svr8L%)_*;Cr5japFDXv6LJ<zQqh4T
zfed`ld`<9C8D!@rjlo0vhZKyGPWXR<@vyAHL+3x4MK~IiE*SsrPgCHY<Mo@XK~^ud
z1PmoO-ehNoOI#BRpI36NoorUfyY!`uwNXDOq5u#a0>Z-8!_h<!n)ssp2)3%WkoZFE
z*VskIbS^UPfqX_N^yS`kAZu>0;#sK?De-rvZsMopS7P^s#L<7JqdSR_Q2Z*0U_@}O
zJ1|lheF^=1m)VxGv$P7-P)*HsKqn2D#X$f|N&=2b0?1K?i`DXwFrz<njsTW(ET}6f
z5txQO=u*VRfA+l%EZ<~DKD{nZv*yFMA&T!X)qB)(vWo=IYFTi*Nr+S9mb<3T(SZ2*
z`IS^vA0TR^?Jjb9yvo+^E6JA{6Z3n1`}0kKAD_HkmR(%5Zd-~W&_QO(eJ?iugEgRl
z38M7eRJ<fKR@Un4=Td+WFWj+4!$hM<b=I|>&%o^5-?U8(%*U8P8jOsl$vMA0|LcgO
zKmBDy-wCibvM-xKy8pAQLiC$WgO7a?tIZF`ANYsur$<9E0^H)foE6ph+a2hEm@s}u
zD`=4|33xEAPA8kDLz4YM3$k+|#11JqT%?{w;R&?V8D1^Cz=kl<@g$nqvuiNGToKmK
zPj56TVxEjWpx*S$^${XU_0ed?Tx_3lB!nThM%O#ydrJMY!BMKpoQqc+gZh1^Xx$EI
zb`CFA=;gC*7q(xF!HR}UN?t}EBgcHhj1NuUb1E1aaB9rr2-4OOP!S_&Jp0yK?Tp6c
z#Ke}(L&Yp<I!&QCbvhlbR6fodja#eZbHm(sI6FBk|5Lb%sk^1!Ftv-)Zdo68Lp9zE
zHxR7V(gf-x@SApQZ0v1Bn)>XX7!^&_%t_RCIT>{Jc3AF{g<$1*3r3ed`9}qT?aVeG
zuQ5Q4dxVsb*#37xa|$3bpVHbPSR7691?us5e?BfMCyus0O*HCo)?rf7I-R&8jB((I
z!mpm6;@1JIE*V+cCm@}zi)=e4W@d5&jgyPqaz@37m&&XA6D#I#is7M&Z=gCDzh@>7
zLqaqk-wN#)79SENran{6X35bAj<!K`>;5dI*1Gp!LJSUF>805);kThoF?+at;T8`5
ziy0x~;v_E>fd&)zFNtIgR+(j2w46@lv#4ednTaOp0SZ#$QEpBSadc^*Y#SJ4Rnz!i
z9#OP#=|DNS%!)P2cxP7bQDTl}$e#<UO0i*SGWU&bi;CO;{j+0JjpLWGYfO)F%?#s8
zh!l6++t`qmy`bUK`9)!{$xx!2%g>~ERI7Njt=eUHW6a_{O`VwAvuDbWCFVzqO*W4Y
zyv<6?ll4Ooy{?(Rtf}a8<DjUl8WhYK-nAMe42I<ut7}VG&ol=gUGiwSXQN%1mGkBe
zwO^(Mo4Y>Uw1O5$7au=-ePeo~j@;edoyXptYp?PUQ339+Qv7Vp5)HWtX#TUioC`El
zXYt0xl^;KL#15sOPcEpP4!9t5zxgljItNF2k|#F^aZ4}=8G)PhKRy1`?fgntw9$Xl
z(R2KdPs=N8gb=Abln2dHzM}C>VU5Ptq^SI=dgY5D!QT<tVqzIZQ70$CtLy9ertkgb
zt+CbCk6UyE2;0mVdw&7QG`f1;XIi^j&W$O-EmH$&LwWrJ4Mn4>$B)ZLTvuOS`%~m5
zlA>SvA#z@+^a<aAQGNdM-@pH*y^@S@F$I(*vI9zRjnvJ@c*u7M-f=jvPV_hlQ|iv>
z)~9_U;Ig<pV0+gJk(M;UmH9}#tLQViNjWy`Zb^7Ac5dnBsDe5kWjqsw-+!g_ECnqB
zx_CPoXAyI5DtsUex}|hCaQ=r_QsS&vk6NCgL|BkU9Prin#X%EkC(QJ$7Z?dPs8|B{
zDOi*5wOT|-X6XH7JOR%WF}t~erCt+UY6)u#H3}8?dv`;C<pC}zTK%W?<x1%bz-nsA
zhYyG<clhYstGQ<1Npi4c@22ScG52R+HdPt7W3*q3Wl^1)G`m#9jFbEF+}z6qhs>f!
zR5qkgXYhUWs_dfq#5^JdC(HAp&xu$;f<xMGYUJvDvgul0CP^+CugX?J#_N69O*;aY
z@>12bxpWyZoabvF&2;tkF#&RT>p%_C9*+?H;@41q<>9uL%@T;c{Jm;yb$f^e{zF+y
zs#E8^?~AIJ^;>99jSU_3Is!X)jU+g7J8n1dSf~T5k)q6lvpZ0vUt;5+BpYndd0Q1p
zh{S1}<e12^(2DB_;Hs2EzdN8;3I30gwTh=<GhMRjMZIQYt_q1ms-G48`{MnboRtLr
z+_an%WQi=5oASKzBuq1;uNaIej>!fz>Hbh5p-MPt9J6DY+6gYqiV@pWBaB(HL@_S;
zH3U<9gSmDB)KjSd2_h+j&qTCMJ20wcc)}iLQKS@M2mdUFmCyL#`f*<AYdi}K>yp`?
zQhcvLO+(`pX=aOu0y2fXDIr}T=&VNsv*ohB^oT$pOJm64LuuHzx^ISRuzs|yi+Xx`
zXI$eb#v(gI4PcqBN>|ZO#z_d0artBJXdIJzDlI{RE`8{O$%8LT*R&QI%47T*2EQE#
zHs$zCZrjWHL&sY|10U-(c_3uicMg>{T0~*d<eL7ClTkM5)BR_>yH=2ZFC*kNzbvO7
zx_FxI$7GjhdUJ+&pN6SsC#x(dDo-V~=-_XF`X*LjH@{eJ6$3X&Me|(0wa5@*dD_`|
z{!W{jV1Ey=i$L&}xXa@_6r!xIuKp1hc!AyYT^<8sjHN~{bWcx@*AFwb0XLz?EO$^Y
z_b!9CJ`4>HkF4z61h--30pv+gk;cbo7a+<Z-e|IhvhuTEO0ny<crq^VhyAF+h-a;X
z)!lb7m;F+mteV+)i^#+|iz*fWqdXE^B8d^$m8ib&6WXgtvTHi?f{P*mOj!R{5I{H`
zE9EQ1$+aruJdqGTzpnrE1=<mQaCPDIX0cbNn~O{I>KFELT<Z?Z^t8^6FAP$~*ZjhI
z{QVcG1LwViFIxf#;EBWG?of7Y!AG2t?J$o?=l-fjTf&3y!$U)A2KDIaZxR7+RVNZ=
zr2S;^<!|(cK7kh4fzl%Xf#8sy-rnBoHv11WXulk{Oj8TXqUYL|GZqxyN`)axLezxv
zr#u-F9#fTub{l&^7e6`_Pp<8<va+6u7z@$JrX|F2(vG-4oWO>Kh0)H?T_1RBof__0
z%dap?8#)D8RW7-~g%5A;-uV6d_xesi@cOd0M;ufBL+~dX<3nSq3_)czHSG$@gAzi9
zVb|icN^H9rk+Onbi<H*5_#n{xQBIdCn6icVQ9|)vC#>`5y>(!+b4*Q3dwh0!68>>9
zMyAnVl0?#7vl_3Ket4uZ9Tj*r5Mp9t!WtJFd%E3sVSD`I_?BnGRL%jXGA}lf8>t%y
z-P!;S8OqMfIm+SARO<q7+fIOBr=#3RNdrwt&Ke+CvY+aJ$9Y*IE7R;2!z~V99*K2q
zfCC*MgLb*>>d2maiyee7m5T%UcqeB^P+QDT1{#Qu*K42M*j`BmvsIjjaawep<q@SO
zQBv3M*vCPuR+NV3by^Zt8SSnhwf}Rk*)unv%AwU_0I`%CTd7-i;63g9%NW@z$>iNw
x5{W;WNS9*;_J1mM)&1Plu>aqhgGQgx1}V2qO26pN0=5c4XdPqia-{vs{{cUY*rxyh

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Left.png.import b/scenes/Remapping/assets/360_Dpad_Left.png.import
new file mode 100644
index 00000000..41de30bb
--- /dev/null
+++ b/scenes/Remapping/assets/360_Dpad_Left.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://gkgf0qk7t2qd"
+path="res://.godot/imported/360_Dpad_Left.png-927dcd2d6c67bc56b6e9b7829035b4dc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/360_Dpad_Left.png"
+dest_files=["res://.godot/imported/360_Dpad_Left.png-927dcd2d6c67bc56b6e9b7829035b4dc.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/Remapping/assets/360_Dpad_Right.png b/scenes/Remapping/assets/360_Dpad_Right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d099719f1917f1fa2508364dfd7042bd4bcc1a5e
GIT binary patch
literal 5173
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

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Right.png.import b/scenes/Remapping/assets/360_Dpad_Right.png.import
new file mode 100644
index 00000000..a8e64125
--- /dev/null
+++ b/scenes/Remapping/assets/360_Dpad_Right.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://crpuoy61vvk7l"
+path="res://.godot/imported/360_Dpad_Right.png-0aec790dee5a162107b568ed08de5343.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/360_Dpad_Right.png"
+dest_files=["res://.godot/imported/360_Dpad_Right.png-0aec790dee5a162107b568ed08de5343.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/scenes/Remapping/assets/360_Dpad_Up.png b/scenes/Remapping/assets/360_Dpad_Up.png
new file mode 100644
index 0000000000000000000000000000000000000000..8939669d6cc99301cd70e851edd2badb618d8e2a
GIT binary patch
literal 5157
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
G;r|Cf7ty}}

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Up.png.import b/scenes/Remapping/assets/360_Dpad_Up.png.import
new file mode 100644
index 00000000..fbd8da0d
--- /dev/null
+++ b/scenes/Remapping/assets/360_Dpad_Up.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b8obc10bo43tn"
+path="res://.godot/imported/360_Dpad_Up.png-8f15a022de783873fca6ccee7bfe71d0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/Remapping/assets/360_Dpad_Up.png"
+dest_files=["res://.godot/imported/360_Dpad_Up.png-8f15a022de783873fca6ccee7bfe71d0.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

From a0534210bb8a042983475c7a14e14871e4dd3c44 Mon Sep 17 00:00:00 2001
From: Rmojarro1 <48000819+Rmojarro1@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:26:40 -0800
Subject: [PATCH 2/5] Control Stick support

Left stick is now usable during battle, can be used interchangably with the d-pad. helper function added in input handler to translate joystick input
---
 scenes/NoteManager/scripts/InputHandler.cs | 78 ++++++++++++++++++----
 scenes/Remapping/ControlSchemes.cs         |  4 ++
 2 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/scenes/NoteManager/scripts/InputHandler.cs b/scenes/NoteManager/scripts/InputHandler.cs
index c373a308..298bef5e 100644
--- a/scenes/NoteManager/scripts/InputHandler.cs
+++ b/scenes/NoteManager/scripts/InputHandler.cs
@@ -104,14 +104,22 @@ private void LoadControlScheme()
             {
                 string inputName = selectedScheme[arrow.Key];
 
-                if (inputName.StartsWith("Joypad")) // Controller input
+                if (inputName.StartsWith("Joypad")) // Controller input (D-pad or Stick)
                 {
-                    InputEventJoypadButton eventJoypad = new InputEventJoypadButton();
-                    eventJoypad.ButtonIndex = GetJoypadButton(inputName);
+                    if (inputName.Contains("Stick")) // Left Stick Motion
+                    {
+                        InputEventJoypadMotion eventJoypadMotion = new InputEventJoypadMotion();
+                        eventJoypadMotion.Axis = GetJoypadAxis(inputName);
+                        InputMap.ActionAddEvent(arrow.Key, eventJoypadMotion);
+                    }
 
-                    if (eventJoypad.ButtonIndex != JoyButton.Invalid) // Ensure it's valid
+                    // Add D-pad button mapping
+                    InputEventJoypadButton eventJoypadButton = new InputEventJoypadButton();
+                    eventJoypadButton.ButtonIndex = GetJoypadButton(inputName);
+
+                    if (eventJoypadButton.ButtonIndex != JoyButton.Invalid)
                     {
-                        InputMap.ActionAddEvent(arrow.Key, eventJoypad);
+                        InputMap.ActionAddEvent(arrow.Key, eventJoypadButton);
                     }
                     else
                     {
@@ -120,7 +128,7 @@ private void LoadControlScheme()
                 }
                 else // Keyboard input
                 {
-                    if (Enum.TryParse(inputName, out Key keycode)) // Check if valid keyboard key
+                    if (Enum.TryParse(inputName, out Key keycode))
                     {
                         InputEventKey eventKey = new InputEventKey();
                         eventKey.Keycode = keycode;
@@ -135,6 +143,18 @@ private void LoadControlScheme()
         }
     }
 
+    private JoyAxis GetJoypadAxis(string action)
+    {
+        return action switch
+        {
+            "Joypad_Left_Stick_Up" => JoyAxis.LeftY,
+            "Joypad_Left_Stick_Down" => JoyAxis.LeftY,
+            "Joypad_Left_Stick_Left" => JoyAxis.LeftX,
+            "Joypad_Left_Stick_Right" => JoyAxis.LeftX,
+            _ => JoyAxis.Invalid, // Return an invalid axis if unknown
+        };
+    }
+
     private JoyButton GetJoypadButton(string action)
     {
         return action switch
@@ -166,22 +186,56 @@ public override void _Process(double delta)
 
     public override void _Input(InputEvent @event)
     {
-        // Detect if a gamepad button is pressed
+        // Switch to CONTROLLER scheme if gamepad is used
         if (@event is InputEventJoypadButton || @event is InputEventJoypadMotion)
         {
-            // Get the currently active control scheme
             string currentScheme = (string)ProjectSettings.GetSetting("game/input_scheme");
-
-            // Switch to "CONTROLLER" scheme if not already active
             if (currentScheme != "CONTROLLER")
             {
                 GD.Print("Gamepad detected, switching to CONTROLLER scheme.");
                 ProjectSettings.SetSetting("game/input_scheme", "CONTROLLER");
                 ProjectSettings.Save();
-
-                // Reload the control scheme to apply changes
                 LoadControlScheme();
             }
         }
+
+        // Detect left stick movement and trigger button presses
+        if (@event is InputEventJoypadMotion motionEvent)
+        {
+            float deadzone = 0.5f; // Stick must be moved past this threshold
+
+            if (motionEvent.Axis == JoyAxis.LeftX)
+            {
+                if (motionEvent.AxisValue < -deadzone)
+                {
+                    Input.ActionPress("arrowLeft");
+                }
+                else if (motionEvent.AxisValue > deadzone)
+                {
+                    Input.ActionPress("arrowRight");
+                }
+                else
+                {
+                    Input.ActionRelease("arrowLeft");
+                    Input.ActionRelease("arrowRight");
+                }
+            }
+            else if (motionEvent.Axis == JoyAxis.LeftY)
+            {
+                if (motionEvent.AxisValue < -deadzone)
+                {
+                    Input.ActionPress("arrowUp");
+                }
+                else if (motionEvent.AxisValue > deadzone)
+                {
+                    Input.ActionPress("arrowDown");
+                }
+                else
+                {
+                    Input.ActionRelease("arrowUp");
+                    Input.ActionRelease("arrowDown");
+                }
+            }
+        }
     }
 }
diff --git a/scenes/Remapping/ControlSchemes.cs b/scenes/Remapping/ControlSchemes.cs
index 22eb999d..4f3a3c36 100644
--- a/scenes/Remapping/ControlSchemes.cs
+++ b/scenes/Remapping/ControlSchemes.cs
@@ -46,6 +46,10 @@ public static class ControlSchemes
                 { "arrowDown", "Joypad_Dpad_Down" },
                 { "arrowLeft", "Joypad_Dpad_Left" },
                 { "arrowRight", "Joypad_Dpad_Right" },
+                { "leftStickUp", "Joypad_Left_Stick_Up" }, // Left Stick Up
+                { "leftStickDown", "Joypad_Left_Stick_Down" }, // Left Stick Down
+                { "leftStickLeft", "Joypad_Left_Stick_Left" }, // Left Stick Left
+                { "leftStickRight", "Joypad_Left_Stick_Right" }, // Left Stick Right
             }
         },
     };

From a2a0c8c5f7ff12f6945d466752fb591efb04fc31 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Wed, 5 Mar 2025 13:30:03 -0800
Subject: [PATCH 3/5] Prep controls for rebase

---
 scenes/Remapping/ControlSchemes.cs               |   8 ++++----
 scenes/Remapping/assets/360_Dpad_Down.png        | Bin 5248 -> 0 bytes
 scenes/Remapping/assets/360_Dpad_Left.png        | Bin 5201 -> 0 bytes
 scenes/Remapping/assets/360_Dpad_Right.png       | Bin 5173 -> 0 bytes
 scenes/Remapping/assets/360_Dpad_Up.png          | Bin 5157 -> 0 bytes
 .../Remapping/assets/Positional_Prompts_Down.png | Bin 0 -> 2403 bytes
 ...import => Positional_Prompts_Down.png.import} |   8 ++++----
 .../Remapping/assets/Positional_Prompts_Left.png | Bin 0 -> 2408 bytes
 ...import => Positional_Prompts_Left.png.import} |   8 ++++----
 .../assets/Positional_Prompts_Right.png          | Bin 0 -> 2458 bytes
 ...mport => Positional_Prompts_Right.png.import} |   8 ++++----
 .../Remapping/assets/Positional_Prompts_Up.png   | Bin 0 -> 2398 bytes
 ...g.import => Positional_Prompts_Up.png.import} |   8 ++++----
 13 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 scenes/Remapping/assets/360_Dpad_Down.png
 delete mode 100644 scenes/Remapping/assets/360_Dpad_Left.png
 delete mode 100644 scenes/Remapping/assets/360_Dpad_Right.png
 delete mode 100644 scenes/Remapping/assets/360_Dpad_Up.png
 create mode 100644 scenes/Remapping/assets/Positional_Prompts_Down.png
 rename scenes/Remapping/assets/{360_Dpad_Down.png.import => Positional_Prompts_Down.png.import} (64%)
 create mode 100644 scenes/Remapping/assets/Positional_Prompts_Left.png
 rename scenes/Remapping/assets/{360_Dpad_Up.png.import => Positional_Prompts_Left.png.import} (64%)
 create mode 100644 scenes/Remapping/assets/Positional_Prompts_Right.png
 rename scenes/Remapping/assets/{360_Dpad_Left.png.import => Positional_Prompts_Right.png.import} (63%)
 create mode 100644 scenes/Remapping/assets/Positional_Prompts_Up.png
 rename scenes/Remapping/assets/{360_Dpad_Right.png.import => Positional_Prompts_Up.png.import} (64%)

diff --git a/scenes/Remapping/ControlSchemes.cs b/scenes/Remapping/ControlSchemes.cs
index 4f3a3c36..7e0de338 100644
--- a/scenes/Remapping/ControlSchemes.cs
+++ b/scenes/Remapping/ControlSchemes.cs
@@ -93,10 +93,10 @@ public static class ControlSchemes
             "CONTROLLER",
             new Dictionary<string, string>()
             {
-                { "left", "res://scenes/Remapping/assets/360_Dpad_Left.png" },
-                { "right", "res://scenes/Remapping/assets/360_Dpad_Right.png" },
-                { "up", "res://scenes/Remapping/assets/360_Dpad_Up.png" },
-                { "down", "res://scenes/Remapping/assets/360_Dpad_Down.png" },
+                { "left", "res://scenes/Remapping/assets/Positional_Prompts_Left.png" },
+                { "right", "res://scenes/Remapping/assets/Positional_Prompts_Right.png" },
+                { "up", "res://scenes/Remapping/assets/Positional_Prompts_Up.png" },
+                { "down", "res://scenes/Remapping/assets/Positional_Prompts_Down.png" },
             }
         },
     };
diff --git a/scenes/Remapping/assets/360_Dpad_Down.png b/scenes/Remapping/assets/360_Dpad_Down.png
deleted file mode 100644
index 944d59bb015bd1304c86dad5ccc0af75779a4c16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5248
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
B3-JH|

diff --git a/scenes/Remapping/assets/360_Dpad_Left.png b/scenes/Remapping/assets/360_Dpad_Left.png
deleted file mode 100644
index 6091cf2d61225132961f79fab80e4abd455a7e51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5201
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

diff --git a/scenes/Remapping/assets/360_Dpad_Right.png b/scenes/Remapping/assets/360_Dpad_Right.png
deleted file mode 100644
index d099719f1917f1fa2508364dfd7042bd4bcc1a5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5173
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

diff --git a/scenes/Remapping/assets/360_Dpad_Up.png b/scenes/Remapping/assets/360_Dpad_Up.png
deleted file mode 100644
index 8939669d6cc99301cd70e851edd2badb618d8e2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5157
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
G;r|Cf7ty}}

diff --git a/scenes/Remapping/assets/Positional_Prompts_Down.png b/scenes/Remapping/assets/Positional_Prompts_Down.png
new file mode 100644
index 0000000000000000000000000000000000000000..78da86ff1aaeb0f2ee99add45230071a38cd0721
GIT binary patch
literal 2403
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
Vzvml9*}DJ$002ovPDHLkV1mchg_QsR

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Down.png.import b/scenes/Remapping/assets/Positional_Prompts_Down.png.import
similarity index 64%
rename from scenes/Remapping/assets/360_Dpad_Down.png.import
rename to scenes/Remapping/assets/Positional_Prompts_Down.png.import
index 9e66d35d..00f28579 100644
--- a/scenes/Remapping/assets/360_Dpad_Down.png.import
+++ b/scenes/Remapping/assets/Positional_Prompts_Down.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ccxvc4o887ugg"
-path="res://.godot/imported/360_Dpad_Down.png-38115a1bb92c3261d97311636caf8e7f.ctex"
+uid="uid://d2228hw1busi"
+path="res://.godot/imported/Positional_Prompts_Down.png-b3e15455423619c63428f07cb50299dc.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/Remapping/assets/360_Dpad_Down.png"
-dest_files=["res://.godot/imported/360_Dpad_Down.png-38115a1bb92c3261d97311636caf8e7f.ctex"]
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Down.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Down.png-b3e15455423619c63428f07cb50299dc.ctex"]
 
 [params]
 
diff --git a/scenes/Remapping/assets/Positional_Prompts_Left.png b/scenes/Remapping/assets/Positional_Prompts_Left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccf72ae16b76170571a3af3c3c28d9bedaf50209
GIT binary patch
literal 2408
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
a8UF(*p`!-yBvDxa0000<MNUMnLSTZG!*bRD

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Up.png.import b/scenes/Remapping/assets/Positional_Prompts_Left.png.import
similarity index 64%
rename from scenes/Remapping/assets/360_Dpad_Up.png.import
rename to scenes/Remapping/assets/Positional_Prompts_Left.png.import
index fbd8da0d..55caa19a 100644
--- a/scenes/Remapping/assets/360_Dpad_Up.png.import
+++ b/scenes/Remapping/assets/Positional_Prompts_Left.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b8obc10bo43tn"
-path="res://.godot/imported/360_Dpad_Up.png-8f15a022de783873fca6ccee7bfe71d0.ctex"
+uid="uid://dhnaqfw7ev076"
+path="res://.godot/imported/Positional_Prompts_Left.png-a65d4cc25e7277af3c038537e36204a9.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/Remapping/assets/360_Dpad_Up.png"
-dest_files=["res://.godot/imported/360_Dpad_Up.png-8f15a022de783873fca6ccee7bfe71d0.ctex"]
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Left.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Left.png-a65d4cc25e7277af3c038537e36204a9.ctex"]
 
 [params]
 
diff --git a/scenes/Remapping/assets/Positional_Prompts_Right.png b/scenes/Remapping/assets/Positional_Prompts_Right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a821aa8c58b90b6954580ffac9a8de25242e8c7
GIT binary patch
literal 2458
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
Y0U+_l38Y?|DgXcg07*qoM6N<$g3A}5UH||9

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Left.png.import b/scenes/Remapping/assets/Positional_Prompts_Right.png.import
similarity index 63%
rename from scenes/Remapping/assets/360_Dpad_Left.png.import
rename to scenes/Remapping/assets/Positional_Prompts_Right.png.import
index 41de30bb..5e3c9a34 100644
--- a/scenes/Remapping/assets/360_Dpad_Left.png.import
+++ b/scenes/Remapping/assets/Positional_Prompts_Right.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://gkgf0qk7t2qd"
-path="res://.godot/imported/360_Dpad_Left.png-927dcd2d6c67bc56b6e9b7829035b4dc.ctex"
+uid="uid://bm2i63ejobjdb"
+path="res://.godot/imported/Positional_Prompts_Right.png-7a91b0b4600d650c6bfcac6dd3e771e5.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/Remapping/assets/360_Dpad_Left.png"
-dest_files=["res://.godot/imported/360_Dpad_Left.png-927dcd2d6c67bc56b6e9b7829035b4dc.ctex"]
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Right.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Right.png-7a91b0b4600d650c6bfcac6dd3e771e5.ctex"]
 
 [params]
 
diff --git a/scenes/Remapping/assets/Positional_Prompts_Up.png b/scenes/Remapping/assets/Positional_Prompts_Up.png
new file mode 100644
index 0000000000000000000000000000000000000000..888a3439f9d7490953926db8fa79bd69a0837425
GIT binary patch
literal 2398
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
QiU0rr07*qoM6N<$f(hz)XaE2J

literal 0
HcmV?d00001

diff --git a/scenes/Remapping/assets/360_Dpad_Right.png.import b/scenes/Remapping/assets/Positional_Prompts_Up.png.import
similarity index 64%
rename from scenes/Remapping/assets/360_Dpad_Right.png.import
rename to scenes/Remapping/assets/Positional_Prompts_Up.png.import
index a8e64125..c1def7b1 100644
--- a/scenes/Remapping/assets/360_Dpad_Right.png.import
+++ b/scenes/Remapping/assets/Positional_Prompts_Up.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://crpuoy61vvk7l"
-path="res://.godot/imported/360_Dpad_Right.png-0aec790dee5a162107b568ed08de5343.ctex"
+uid="uid://dlj21le4bp7cw"
+path="res://.godot/imported/Positional_Prompts_Up.png-7d12b23f22144d5032611d5d3d789658.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/Remapping/assets/360_Dpad_Right.png"
-dest_files=["res://.godot/imported/360_Dpad_Right.png-0aec790dee5a162107b568ed08de5343.ctex"]
+source_file="res://scenes/Remapping/assets/Positional_Prompts_Up.png"
+dest_files=["res://.godot/imported/Positional_Prompts_Up.png-7d12b23f22144d5032611d5d3d789658.ctex"]
 
 [params]
 

From c30528df7e053f585a1db50baaa376d19f958120 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Wed, 5 Mar 2025 14:53:11 -0800
Subject: [PATCH 4/5] Refactored control changes

Controller input is dependent on a controller actually being connected
Controls can update mid-battle
Simplified control changing for better maintainability
---
 Globals/translations.csv                   |   1 +
 project.godot                              | 106 ++++++++++++---
 scenes/NoteManager/scripts/InputHandler.cs | 145 ++-------------------
 scenes/Options/OptionsMenu.cs              |   2 +-
 scenes/Remapping/ControlSchemes.cs         |  51 --------
 scenes/Remapping/ControlSettings.cs        |  26 +++-
 scenes/Remapping/Remap.tscn                |  24 ++--
 scenes/UI/Pause.tscn                       |   8 +-
 scenes/UI/scripts/Inventory.cs             |   2 +-
 scenes/UI/scripts/PauseMenu.cs             |   2 +-
 10 files changed, 140 insertions(+), 227 deletions(-)

diff --git a/Globals/translations.csv b/Globals/translations.csv
index 00430d51..03ae918b 100644
--- a/Globals/translations.csv
+++ b/Globals/translations.csv
@@ -10,6 +10,7 @@ CONTROLS_TITLE_TYPE_QWER,QWERT,QWERT
 CONTROLS_TITLE_TYPE_ARROW,Arrow,箭头键
 CONTROLS_TITLE_SELECTED,Selected,已选择
 CONTROLS_WASD_BUTTON,WASD,WASD
+CONTROLS_CONTROLLER_BUTTON,Controller,控制杆
 CONTROLS_QWER_BUTTON,QWER,QWER
 CONTROLS_ARROW_BUTTON,Arrow Keys,箭头键
 CONTROLS_RETURN_BUTTON,Return,返回
diff --git a/project.godot b/project.godot
index c29c5c15..7e6f2f23 100644
--- a/project.godot
+++ b/project.godot
@@ -39,10 +39,25 @@ project/assembly_name="Funk Engine"
 
 [game]
 
-input_scheme="ARROWS"
+input_scheme="CONTROLLER"
 
 [input]
 
+ui_accept={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194310,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+ui_cancel={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194305,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
+]
+}
 ui_left={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
@@ -75,55 +90,106 @@ ui_down={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
 ]
 }
-arrowUp={
+ARROWS_arrowUp={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null)
 ]
 }
-arrowDown={
+ARROWS_arrowDown={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null)
 ]
 }
-arrowLeft={
+ARROWS_arrowLeft={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null)
 ]
 }
-arrowRight={
+ARROWS_arrowRight={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":86,"key_label":0,"unicode":118,"location":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"location":0,"echo":false,"script":null)
 ]
 }
 Pause={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 Inventory={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":4,"pressure":0.0,"pressed":true,"script":null)
 ]
 }
 Secondary={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowUp={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowDown={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowLeft={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+CONTROLLER_arrowRight={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
+]
+}
+WASD_arrowUp={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+]
+}
+WASD_arrowDown={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
+]
+}
+WASD_arrowLeft={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
+]
+}
+WASD_arrowRight={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowUp={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowDown={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowLeft={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
+]
+}
+QWERT_arrowRight={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
 ]
 }
 
diff --git a/scenes/NoteManager/scripts/InputHandler.cs b/scenes/NoteManager/scripts/InputHandler.cs
index 298bef5e..f11b79fd 100644
--- a/scenes/NoteManager/scripts/InputHandler.cs
+++ b/scenes/NoteManager/scripts/InputHandler.cs
@@ -81,161 +81,36 @@ public void FeedbackEffect(ArrowType arrow, string text)
     public override void _Ready()
     {
         InitializeArrowCheckers();
-        LoadControlScheme();
     }
 
-    private void LoadControlScheme()
+    public override void _UnhandledInput(InputEvent @event)
     {
-        string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
-        foreach (var arrow in Arrows)
-        {
-            var events = InputMap.ActionGetEvents(arrow.Key);
-            foreach (var inputEvent in events)
-            {
-                InputMap.ActionEraseEvent(arrow.Key, inputEvent);
-            }
-        }
-
-        var selectedScheme = ControlSchemes.Schemes[scheme];
-
-        foreach (var arrow in Arrows)
+        if (@event is InputEventJoypadButton)
         {
-            if (selectedScheme.ContainsKey(arrow.Key))
-            {
-                string inputName = selectedScheme[arrow.Key];
-
-                if (inputName.StartsWith("Joypad")) // Controller input (D-pad or Stick)
-                {
-                    if (inputName.Contains("Stick")) // Left Stick Motion
-                    {
-                        InputEventJoypadMotion eventJoypadMotion = new InputEventJoypadMotion();
-                        eventJoypadMotion.Axis = GetJoypadAxis(inputName);
-                        InputMap.ActionAddEvent(arrow.Key, eventJoypadMotion);
-                    }
-
-                    // Add D-pad button mapping
-                    InputEventJoypadButton eventJoypadButton = new InputEventJoypadButton();
-                    eventJoypadButton.ButtonIndex = GetJoypadButton(inputName);
-
-                    if (eventJoypadButton.ButtonIndex != JoyButton.Invalid)
-                    {
-                        InputMap.ActionAddEvent(arrow.Key, eventJoypadButton);
-                    }
-                    else
-                    {
-                        GD.PrintErr($"Invalid joypad button mapping: {inputName}");
-                    }
-                }
-                else // Keyboard input
-                {
-                    if (Enum.TryParse(inputName, out Key keycode))
-                    {
-                        InputEventKey eventKey = new InputEventKey();
-                        eventKey.Keycode = keycode;
-                        InputMap.ActionAddEvent(arrow.Key, eventKey);
-                    }
-                    else
-                    {
-                        GD.PrintErr($"Invalid key mapping: {inputName}");
-                    }
-                }
-            }
+            SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.InputKey, "CONTROLLER");
         }
     }
 
-    private JoyAxis GetJoypadAxis(string action)
-    {
-        return action switch
-        {
-            "Joypad_Left_Stick_Up" => JoyAxis.LeftY,
-            "Joypad_Left_Stick_Down" => JoyAxis.LeftY,
-            "Joypad_Left_Stick_Left" => JoyAxis.LeftX,
-            "Joypad_Left_Stick_Right" => JoyAxis.LeftX,
-            _ => JoyAxis.Invalid, // Return an invalid axis if unknown
-        };
-    }
-
-    private JoyButton GetJoypadButton(string action)
+    public override void _Process(double delta)
     {
-        return action switch
+        string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
+        if (Input.GetConnectedJoypads().Count <= 0 && scheme == "CONTROLLER")
         {
-            "Joypad_Dpad_Up" => JoyButton.DpadUp,
-            "Joypad_Dpad_Down" => JoyButton.DpadDown,
-            "Joypad_Dpad_Left" => JoyButton.DpadLeft,
-            "Joypad_Dpad_Right" => JoyButton.DpadRight,
-            _ => JoyButton.Invalid, // Return an invalid button if unknown
-        };
-    }
+            SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.InputKey, "ARROWS");
+        }
 
-    public override void _Process(double delta)
-    {
         foreach (var arrow in Arrows)
         {
-            if (Input.IsActionJustPressed(arrow.Key))
+            if (Input.IsActionJustPressed(scheme + "_" + arrow.Key))
             {
                 EmitSignal(nameof(NotePressed), (int)arrow.Type);
                 arrow.Node.SetPressed(true);
             }
-            else if (Input.IsActionJustReleased(arrow.Key))
+            else if (Input.IsActionJustReleased(scheme + "_" + arrow.Key))
             {
                 EmitSignal(nameof(NoteReleased), (int)arrow.Type);
                 arrow.Node.SetPressed(false);
             }
         }
     }
-
-    public override void _Input(InputEvent @event)
-    {
-        // Switch to CONTROLLER scheme if gamepad is used
-        if (@event is InputEventJoypadButton || @event is InputEventJoypadMotion)
-        {
-            string currentScheme = (string)ProjectSettings.GetSetting("game/input_scheme");
-            if (currentScheme != "CONTROLLER")
-            {
-                GD.Print("Gamepad detected, switching to CONTROLLER scheme.");
-                ProjectSettings.SetSetting("game/input_scheme", "CONTROLLER");
-                ProjectSettings.Save();
-                LoadControlScheme();
-            }
-        }
-
-        // Detect left stick movement and trigger button presses
-        if (@event is InputEventJoypadMotion motionEvent)
-        {
-            float deadzone = 0.5f; // Stick must be moved past this threshold
-
-            if (motionEvent.Axis == JoyAxis.LeftX)
-            {
-                if (motionEvent.AxisValue < -deadzone)
-                {
-                    Input.ActionPress("arrowLeft");
-                }
-                else if (motionEvent.AxisValue > deadzone)
-                {
-                    Input.ActionPress("arrowRight");
-                }
-                else
-                {
-                    Input.ActionRelease("arrowLeft");
-                    Input.ActionRelease("arrowRight");
-                }
-            }
-            else if (motionEvent.Axis == JoyAxis.LeftY)
-            {
-                if (motionEvent.AxisValue < -deadzone)
-                {
-                    Input.ActionPress("arrowUp");
-                }
-                else if (motionEvent.AxisValue > deadzone)
-                {
-                    Input.ActionPress("arrowDown");
-                }
-                else
-                {
-                    Input.ActionRelease("arrowUp");
-                    Input.ActionRelease("arrowDown");
-                }
-            }
-        }
-    }
 }
diff --git a/scenes/Options/OptionsMenu.cs b/scenes/Options/OptionsMenu.cs
index 587cb621..a245ea9a 100644
--- a/scenes/Options/OptionsMenu.cs
+++ b/scenes/Options/OptionsMenu.cs
@@ -48,7 +48,7 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause"))
+        if (@event.IsActionPressed("ui_cancel"))
         {
             CloseMenu();
             GetViewport().SetInputAsHandled();
diff --git a/scenes/Remapping/ControlSchemes.cs b/scenes/Remapping/ControlSchemes.cs
index 7e0de338..3829747a 100644
--- a/scenes/Remapping/ControlSchemes.cs
+++ b/scenes/Remapping/ControlSchemes.cs
@@ -3,57 +3,6 @@
 
 public static class ControlSchemes
 {
-    public static Dictionary<string, Dictionary<string, string>> Schemes = new Dictionary<
-        string,
-        Dictionary<string, string>
-    >()
-    {
-        {
-            "WASD",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "W" },
-                { "arrowDown", "S" },
-                { "arrowLeft", "A" },
-                { "arrowRight", "D" },
-            }
-        },
-        {
-            "ARROWS",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "Up" },
-                { "arrowDown", "Down" },
-                { "arrowLeft", "Left" },
-                { "arrowRight", "Right" },
-            }
-        },
-        {
-            "QWERT",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "W" },
-                { "arrowDown", "E" },
-                { "arrowLeft", "Q" },
-                { "arrowRight", "R" },
-            }
-        },
-        {
-            "CONTROLLER",
-            new Dictionary<string, string>()
-            {
-                { "arrowUp", "Joypad_Dpad_Up" },
-                { "arrowDown", "Joypad_Dpad_Down" },
-                { "arrowLeft", "Joypad_Dpad_Left" },
-                { "arrowRight", "Joypad_Dpad_Right" },
-                { "leftStickUp", "Joypad_Left_Stick_Up" }, // Left Stick Up
-                { "leftStickDown", "Joypad_Left_Stick_Down" }, // Left Stick Down
-                { "leftStickLeft", "Joypad_Left_Stick_Left" }, // Left Stick Left
-                { "leftStickRight", "Joypad_Left_Stick_Right" }, // Left Stick Right
-            }
-        },
-    };
-
     public static Dictionary<string, Dictionary<string, string>> SpriteMappings = new Dictionary<
         string,
         Dictionary<string, string>
diff --git a/scenes/Remapping/ControlSettings.cs b/scenes/Remapping/ControlSettings.cs
index 13ecb99f..aaf99269 100644
--- a/scenes/Remapping/ControlSettings.cs
+++ b/scenes/Remapping/ControlSettings.cs
@@ -21,6 +21,8 @@ public partial class ControlSettings : Node2D
     [Export]
     private Button _closeButton;
 
+    private Button _controllerButton;
+
     public override void _Ready()
     {
         GetNode<Button>("Panel/WASDButton").Connect("pressed", Callable.From(OnWASDButtonPressed));
@@ -28,8 +30,11 @@ public override void _Ready()
             .Connect("pressed", Callable.From(OnArrowButtonPressed));
         GetNode<Button>("Panel/QWERTButton")
             .Connect("pressed", Callable.From(OnQWERTButtonPressed));
-        GetNode<Button>("Panel/ControllerButton")
-            .Connect("pressed", Callable.From(OnControllerButtonPressed));
+        _controllerButton = GetNode<Button>("Panel/ControllerButton");
+        _controllerButton.Connect("pressed", Callable.From(OnControllerButtonPressed));
+
+        ControllerConnectionChanged(-1, false);
+        Input.JoyConnectionChanged += ControllerConnectionChanged;
 
         string scheme = SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey).As<string>();
         switch (scheme)
@@ -70,7 +75,7 @@ private void CloseMenu()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause"))
+        if (@event.IsActionPressed("ui_cancel"))
         {
             CloseMenu();
             GetViewport().SetInputAsHandled();
@@ -104,11 +109,22 @@ private void OnQWERTButtonPressed()
     private void OnControllerButtonPressed()
     {
         GetNode<Label>("Panel/Label").Text = "Controller Selected";
-        ProjectSettings.SetSetting("game/input_scheme", "CONTROLLER");
-        ProjectSettings.Save();
+        SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.InputKey, "CONTROLLER");
         ChangeKeySprites("CONTROLLER");
     }
 
+    private void ControllerConnectionChanged(long id, bool connected)
+    {
+        _controllerButton.Visible = Input.GetConnectedJoypads().Count > 0;
+        if (
+            (string)SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey) == "CONTROLLER"
+            && !_closeButton.Visible
+        )
+        {
+            OnArrowButtonPressed();
+        }
+    }
+
     private void ChangeKeySprites(string scheme)
     {
         var selectedScheme = ControlSchemes.SpriteMappings[scheme];
diff --git a/scenes/Remapping/Remap.tscn b/scenes/Remapping/Remap.tscn
index 40bf965b..99227dda 100644
--- a/scenes/Remapping/Remap.tscn
+++ b/scenes/Remapping/Remap.tscn
@@ -37,11 +37,11 @@ text = "Choose Control Scheme"
 horizontal_alignment = 1
 
 [node name="WASDButton" type="Button" parent="Panel"]
-layout_mode = 2
-offset_left = 450.0
-offset_top = 50.0
-offset_right = 555.0
-offset_bottom = 81.0
+layout_mode = 0
+offset_left = 507.0
+offset_top = 54.0
+offset_right = 515.0
+offset_bottom = 62.0
 text = "CONTROLS_WASD_BUTTON"
 
 [node name="ArrowButton" type="Button" parent="Panel"]
@@ -62,11 +62,11 @@ text = "CONTROLS_QWER_BUTTON"
 
 [node name="ControllerButton" type="Button" parent="Panel"]
 layout_mode = 0
-offset_left = 404.0
+offset_left = 399.0
 offset_top = 57.0
-offset_right = 491.0
+offset_right = 486.0
 offset_bottom = 88.0
-text = "Controller"
+text = "CONTROLS_CONTROLLER_BUTTON"
 
 [node name="TitleButton" type="Button" parent="Panel"]
 layout_mode = 0
@@ -139,20 +139,20 @@ text = "="
 
 [node name="LeftRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 160)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("5_xn13c")
 
 [node name="UpRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 200)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("7_1a2jy")
 
 [node name="DownRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 243)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("6_qrl0g")
 
 [node name="RightRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(225, 284)
-scale = Vector2(0.5, 0.5)
+scale = Vector2(0.4, 0.4)
 texture = ExtResource("8_o7swo")
diff --git a/scenes/UI/Pause.tscn b/scenes/UI/Pause.tscn
index 04dc7dbd..eefb1b39 100644
--- a/scenes/UI/Pause.tscn
+++ b/scenes/UI/Pause.tscn
@@ -44,6 +44,8 @@ theme_override_constants/margin_bottom = 20
 
 [node name="ResumeButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer"]
 layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer3/PlaceHolderButton")
+focus_neighbor_bottom = NodePath("../../MarginContainer4/OptionsButton")
 text = "ESCAPE_MENU_RESUME"
 
 [node name="MarginContainer4" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
@@ -56,7 +58,7 @@ theme_override_constants/margin_bottom = 20
 
 [node name="OptionsButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer4"]
 layout_mode = 2
-focus_neighbor_top = NodePath("../../MarginContainer3/PlaceHolderButton")
+focus_neighbor_top = NodePath("../../MarginContainer/ResumeButton")
 focus_neighbor_bottom = NodePath("../../MarginContainer2/QuitButton")
 text = "TITLE_OPTIONS"
 
@@ -70,6 +72,8 @@ theme_override_constants/margin_bottom = 20
 
 [node name="QuitButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer2"]
 layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer4/OptionsButton")
+focus_neighbor_bottom = NodePath("../../MarginContainer3/PlaceHolderButton")
 text = "ESCAPE_MENU_QUIT"
 
 [node name="MarginContainer3" type="MarginContainer" parent="MarginContainer/VBoxContainer"]
@@ -82,4 +86,6 @@ theme_override_constants/margin_bottom = 20
 
 [node name="PlaceHolderButton" type="Button" parent="MarginContainer/VBoxContainer/MarginContainer3"]
 layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer2/QuitButton")
+focus_neighbor_bottom = NodePath("../../MarginContainer/ResumeButton")
 text = "ESCAPE_MENU_TITLE"
diff --git a/scenes/UI/scripts/Inventory.cs b/scenes/UI/scripts/Inventory.cs
index a068f760..b8d1cede 100644
--- a/scenes/UI/scripts/Inventory.cs
+++ b/scenes/UI/scripts/Inventory.cs
@@ -52,7 +52,7 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause") || @event.IsActionPressed("Inventory"))
+        if (@event.IsActionPressed("ui_cancel") || @event.IsActionPressed("Inventory"))
         {
             Resume();
             GetViewport().SetInputAsHandled();
diff --git a/scenes/UI/scripts/PauseMenu.cs b/scenes/UI/scripts/PauseMenu.cs
index a7063903..7f78cf79 100644
--- a/scenes/UI/scripts/PauseMenu.cs
+++ b/scenes/UI/scripts/PauseMenu.cs
@@ -34,7 +34,7 @@ private void OpenOptions()
 
     public override void _Input(InputEvent @event)
     {
-        if (@event.IsActionPressed("Pause"))
+        if (@event.IsActionPressed("ui_cancel"))
         {
             Resume();
             GetViewport().SetInputAsHandled();

From b3faba1c8ac2bc737886c81c99475e7cc1d4bec2 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Wed, 5 Mar 2025 20:14:09 -0800
Subject: [PATCH 5/5] Fix looped notes jumping

The more a song's length is over where a natural beat should end, the more looped notes would jump into place at playback = 0.
Instead looped notes are a set offset instead of beats+bpl
---
 project.godot                                | 1 -
 scenes/ChartViewport/scripts/ChartManager.cs | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/project.godot b/project.godot
index 7e6f2f23..79c32531 100644
--- a/project.godot
+++ b/project.godot
@@ -39,7 +39,6 @@ project/assembly_name="Funk Engine"
 
 [game]
 
-input_scheme="CONTROLLER"
 
 [input]
 
diff --git a/scenes/ChartViewport/scripts/ChartManager.cs b/scenes/ChartViewport/scripts/ChartManager.cs
index e6ebc908..b2ab47f0 100644
--- a/scenes/ChartViewport/scripts/ChartManager.cs
+++ b/scenes/ChartViewport/scripts/ChartManager.cs
@@ -96,7 +96,7 @@ public NoteArrow AddArrowToLane(
     )
     {
         var newNote = CreateNote(type, note, beat); //TODO: Notes on track have unqiue visuals
-        var loopArrow = CreateNote(type, note, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        var loopArrow = CreateNote(type, note, beat, 1); //Create a dummy arrow for looping visuals
         if (colorOverride != default)
         {
             newNote.SelfModulate = colorOverride;
@@ -106,7 +106,7 @@ public NoteArrow AddArrowToLane(
         return newNote;
     }
 
-    private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
+    private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0, int loopOffset = 0)
     {
         var noteScene = ResourceLoader.Load<PackedScene>("res://scenes/NoteManager/note.tscn");
         NoteArrow newArrow = noteScene.Instantiate<NoteArrow>();
@@ -114,7 +114,9 @@ private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
         newArrow.OutlineSprite.Modulate = IH.Arrows[(int)arrow].Color;
 
         _arrowGroup.AddChild(newArrow);
-        newArrow.Bounds = (float)(beat / TrueBeatsPerLoop * (ChartLength / 2));
+        newArrow.Bounds = (float)(
+            beat / TrueBeatsPerLoop * (ChartLength / 2) + loopOffset * (ChartLength / 2)
+        );
         newArrow.Position += Vector2.Right * newArrow.Bounds * 10; //temporary fix for notes spawning and instantly calling loop from originating at 0,0
         return newArrow;
     }