Fix merge and integration issues with remap menu

Added input button attributions

Author: LifeHckr

README.md

@@ -15,5 +15,6 @@ Current team members include:
 
 #### Attributions:
 First Song: <a href="https://freesound.org/people/Magntron/sounds/335571/" title="gameMusic">gameMusic by Magntron - freesound.org</a>
+Input buttons by <a href="https://thoseawesomeguys.com/prompts/" title="inputkeys">Nicolae (Xelu) Berbece</a>
 
 

project.godot

@@ -10,6 +10,7 @@ config_version=5
 
 [application]
 
+config/name="ProjectFunkEngine"
 run/main_scene="res://scenes/SceneTransitions/TitleScreen.tscn"
 config/features=PackedStringArray("4.3", "C#", "Forward Plus")
 config/icon="res://scenes/BattleDirector/assets/Character1.png"
@@ -33,7 +34,7 @@ project/assembly_name="Funk Engine"
 
 [game]
 
-input_scheme="ARROWS"
+input_scheme="QWERT"
 
 [input]
 

scenes/Remapping/ControlSchemes.cs

@@ -32,8 +32,8 @@ public static class ControlSchemes
             "QWERT",
             new Dictionary<string, string>()
             {
-                { "arrowUp", "E" },
-                { "arrowDown", "W" },
+                { "arrowUp", "W" },
+                { "arrowDown", "E" },
                 { "arrowLeft", "Q" },
                 { "arrowRight", "R" },
             }
@@ -71,8 +71,8 @@ public static class ControlSchemes
             {
                 { "left", "res://scenes/Remapping/assets/Q_Key_Light.png" },
                 { "right", "res://scenes/Remapping/assets/R_Key_Light.png" },
-                { "up", "res://scenes/Remapping/assets/E_Key_Light.png" },
-                { "down", "res://scenes/Remapping/assets/W_Key_Light.png" },
+                { "up", "res://scenes/Remapping/assets/W_Key_Light.png" },
+                { "down", "res://scenes/Remapping/assets/E_Key_Light.png" },
             }
         },
     };

scenes/Remapping/Remap.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=9 format=3 uid="uid://bew23sumjs0fg"]
+[gd_scene load_steps=8 format=3 uid="uid://bew23sumjs0fg"]
 
 [ext_resource type="Script" path="res://scenes/Remapping/ControlSettings.cs" id="1_ir12b"]
-[ext_resource type="Script" path="res://scenes/Remapping/ControlSchemes.cs" id="1_n6sxo"]
 [ext_resource type="Script" path="res://scenes/SceneTransitions/scripts/SceneChange.cs" id="2_oippk"]
 [ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://scenes/NoteManager/assets/outline_white.png" id="4_se2m3"]
 [ext_resource type="Texture2D" uid="uid://cr6wtf6j6dcfg" path="res://scenes/Remapping/assets/Arrow_Left_Key_Light.png" id="5_xn13c"]
@@ -21,7 +20,6 @@ offset_left = 4.0
 offset_top = 4.0
 offset_right = 638.0
 offset_bottom = 346.0
-script = ExtResource("1_n6sxo")
 
 [node name="Label" type="Label" parent="Panel"]
 layout_mode = 2
@@ -72,47 +70,51 @@ offset_top = -4.0
 offset_right = 36.0
 offset_bottom = 36.0
 
-[node name="Right" type="Sprite2D" parent="Panel/Control"]
+[node name="Left" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(67, 85)
 rotation = -3.14159
 texture = ExtResource("4_se2m3")
 
-[node name="Left" type="Sprite2D" parent="Panel/Control"]
+[node name="Up" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(67, 139)
-rotation = 1.5708
+rotation = -1.5708
 texture = ExtResource("4_se2m3")
 
-[node name="Up" type="Sprite2D" parent="Panel/Control"]
+[node name="Down" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(67, 196)
-rotation = -1.5708
+rotation = 1.5708
 texture = ExtResource("4_se2m3")
 
-[node name="Down" type="Sprite2D" parent="Panel/Control"]
+[node name="Right" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(68, 249)
 texture = ExtResource("4_se2m3")
 
 [node name="Label" type="Label" parent="Panel/Control"]
+layout_mode = 0
 offset_left = 95.0
 offset_top = 74.0
 offset_right = 108.0
 offset_bottom = 97.0
 text = "="
 
 [node name="Label2" type="Label" parent="Panel/Control"]
+layout_mode = 0
 offset_left = 94.0
 offset_top = 128.0
 offset_right = 107.0
 offset_bottom = 151.0
 text = "="
 
 [node name="Label3" type="Label" parent="Panel/Control"]
+layout_mode = 0
 offset_left = 96.0
 offset_top = 187.0
 offset_right = 109.0
 offset_bottom = 210.0
 text = "="
 
 [node name="Label4" type="Label" parent="Panel/Control"]
+layout_mode = 0
 offset_left = 96.0
 offset_top = 239.0
 offset_right = 109.0
@@ -124,15 +126,15 @@ position = Vector2(147, 87)
 scale = Vector2(0.62, 0.62)
 texture = ExtResource("5_xn13c")
 
-[node name="DownRemap" type="Sprite2D" parent="Panel/Control"]
+[node name="UpRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(148, 139)
 scale = Vector2(0.62, 0.62)
-texture = ExtResource("6_qrl0g")
+texture = ExtResource("7_1a2jy")
 
-[node name="UpRemap" type="Sprite2D" parent="Panel/Control"]
+[node name="DownRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(148, 197)
 scale = Vector2(0.62, 0.62)
-texture = ExtResource("7_1a2jy")
+texture = ExtResource("6_qrl0g")
 
 [node name="RightRemap" type="Sprite2D" parent="Panel/Control"]
 position = Vector2(150, 255)

scenes/SceneTransitions/TitleScreen.tscn

@@ -103,10 +103,10 @@ layout_mode = 2
 size_flags_horizontal = 3
 text = "Quit Game"
 script = ExtResource("2_7f3m6")
-ScenePath = 2
+ScenePath = 4
 
 [node name="Button" type="Button" parent="VBoxContainer"]
 layout_mode = 2
 text = "Change Controls"
 script = ExtResource("2_7f3m6")
-ScenePath = 4
+ScenePath = 6