fix: Frog mini bug, reordered some files

project.godot

@@ -93,7 +93,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Blobby"
-run/main_scene="res://src/UserInterface/Screens/MainScreen.tscn"
+run/main_scene="res://src/UserInterface/Screens/MainMenu/MainScreen.tscn"
 config/icon="res://icon.png"
 
 [autoload]

src/Actors/Blobby/BlobbyStateMachine.gd

@@ -120,18 +120,11 @@ func handle_wallslide_input(delta, direction) -> Vector2:
 
 func get_horizontal_direction() -> Vector2:
 	#TODO Check if this is fixed yet -> Seems like it, idk what i meant by that lul xd roflcopter lmao wtfbbq1!!!11!
-	# if Input.get_connected_joypads().size() > 0:
-	# 	if Input.is_action_pressed("move_right"):
-	# 		return Vector2(-1, 0)
-	# 	if Input.is_action_pressed("move_left"):
-	# 		return Vector2(1, 0)
-	return Vector2(
-		(
-			Input.get_action_strength("move_right")
-			- Input.get_action_strength("move_left")
-		),
-		0
-	)
+	if Input.is_action_pressed("move_right"):
+		return Vector2(1, 0)
+	if Input.is_action_pressed("move_left"):
+		return Vector2(-1, 0)
+	return Vector2(0,0);
 
 
 # Determines which state should be active at the moment

src/Actors/Enemies/Beings/WhatAreFrog.gd

@@ -514,5 +514,5 @@ func get_facing_direction() -> float:
 
 func _on_HurtTimer_timeout() -> void:
 	is_hurt = false
-	if(is_bound): add_to_group("harmful")
+	#if(is_bound): add_to_group("harmful")
 	$FrogSprite.material = null

src/Contraptions/Portal/Portal.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://assets/contraption/portal.png" type="Texture" id=1]
 [ext_resource path="res://src/Contraptions/Portal/Portal.gd" type="Script" id=2]
-[ext_resource path="res://src/UserInterface/Screens/LevelEndScreen.tscn" type="PackedScene" id=3]
+[ext_resource path="res://src/UserInterface/Screens/InGameMenu/LevelEndScreen.tscn" type="PackedScene" id=3]
 
 [sub_resource type="CapsuleShape2D" id=1]
 radius = 22.1169

src/UserInterface/Screens/InGameMenu/PauseScreen.tscn

@@ -4,8 +4,8 @@
 [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/UserInterface/Buttons/RetryButton.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/UserInterface/Screens/PauseScreen.gd" type="Script" id=5]
-[ext_resource path="res://src/UserInterface/Screens/Continue.gd" type="Script" id=6]
+[ext_resource path="res://src/UserInterface/Screens/InGameMenu/PauseScreen.gd" type="Script" id=5]
+[ext_resource path="res://src/UserInterface/Screens/InGameMenu/Continue.gd" type="Script" id=6]
 
 [node name="PauseScreen" type="Control"]
 pause_mode = 2

src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.tscn

@@ -1,49 +1,49 @@
 [gd_scene load_steps=27 format=2]
 
-[ext_resource path="res://assets/ui/Screenshot 2023-05-23 160521.png" type="Texture" id=1]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/ProfilesMenu.gd" type="Script" id=2]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/ActionKeyList.gd" type="Script" id=3]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/InputMapper.gd" type="Script" id=4]
-[ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=5]
-[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=6]
-[ext_resource path="res://assets/environment/background/starry-space.png" type="Texture" id=7]
-[ext_resource path="res://assets/environment/background/Spaceship-Wall.png" type="Texture" id=8]
-[ext_resource path="res://src/transparency.gdshader" type="Shader" id=9]
-[ext_resource path="res://assets/sounds/EpsonStart.ogg" type="AudioStream" id=10]
-[ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=11]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/ControlsMenu.gd" type="Script" id=12]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/KeySelectMenu.gd" type="Script" id=13]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/SaveButton.gd" type="Script" id=14]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/Reset.gd" type="Script" id=15]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/SaveAndQuitButton.gd" type="Script" id=16]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/SavedCheckBackButton.gd" type="Script" id=17]
-[ext_resource path="res://src/UserInterface/Screens/ControlsMenu/ReallyQuitMenu.gd" type="Script" id=18]
-[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=19]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/SaveButton.gd" type="Script" id=1]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/SavedCheckBackButton.gd" type="Script" id=2]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/KeySelectMenu.gd" type="Script" id=3]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/SaveAndQuitButton.gd" type="Script" id=4]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ControlsMenu.gd" type="Script" id=5]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ReallyQuitMenu.gd" type="Script" id=6]
+[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=7]
+[ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=8]
+[ext_resource path="res://assets/environment/background/Spaceship-Wall.png" type="Texture" id=9]
+[ext_resource path="res://assets/environment/background/starry-space.png" type="Texture" id=10]
+[ext_resource path="res://assets/sounds/EpsonStart.ogg" type="AudioStream" id=11]
+[ext_resource path="res://assets/ui/Screenshot 2023-05-23 160521.png" type="Texture" id=12]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ProfilesMenu.gd" type="Script" id=13]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/ActionKeyList.gd" type="Script" id=14]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/InputMapper.gd" type="Script" id=15]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/ControlsMenu/Reset.gd" type="Script" id=16]
+[ext_resource path="res://src/transparency.gdshader" type="Shader" id=17]
+[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=18]
+[ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=19]
 
 [sub_resource type="DynamicFont" id=1]
 size = 42
-font_data = ExtResource( 6 )
+font_data = ExtResource( 18 )
 
 [sub_resource type="ShaderMaterial" id=6]
-shader = ExtResource( 9 )
+shader = ExtResource( 17 )
 shader_param/transparency = 0.1
 
 [sub_resource type="DynamicFont" id=2]
-font_data = ExtResource( 6 )
+font_data = ExtResource( 18 )
 
 [sub_resource type="DynamicFont" id=3]
-font_data = ExtResource( 6 )
+font_data = ExtResource( 18 )
 
 [sub_resource type="DynamicFont" id=4]
-font_data = ExtResource( 6 )
+font_data = ExtResource( 18 )
 
 [sub_resource type="ShaderMaterial" id=8]
-shader = ExtResource( 9 )
+shader = ExtResource( 17 )
 shader_param/transparency = 0.778
 
 [sub_resource type="DynamicFont" id=7]
 size = 20
-font_data = ExtResource( 6 )
+font_data = ExtResource( 18 )
 
 [node name="ControlsMenu" type="Control"]
 anchor_right = 1.0
@@ -51,28 +51,28 @@ anchor_bottom = 1.0
 input_pass_on_modal_close_click = false
 size_flags_horizontal = 0
 size_flags_vertical = 0
-theme = ExtResource( 5 )
-script = ExtResource( 12 )
+theme = ExtResource( 8 )
+script = ExtResource( 5 )
 
-[node name="SignalManager" parent="." instance=ExtResource( 19 )]
+[node name="SignalManager" parent="." instance=ExtResource( 7 )]
 
 [node name="InputMapper" type="Node" parent="."]
 unique_name_in_owner = true
-script = ExtResource( 4 )
+script = ExtResource( 15 )
 
 [node name="background" type="TextureRect" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_top = 46.0
 margin_bottom = 46.0
-texture = ExtResource( 7 )
+texture = ExtResource( 10 )
 expand = true
 stretch_mode = 1
 
 [node name="background2" type="TextureRect" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
-texture = ExtResource( 8 )
+texture = ExtResource( 9 )
 expand = true
 stretch_mode = 1
 
@@ -89,7 +89,7 @@ grow_horizontal = 2
 grow_vertical = 2
 focus_neighbour_top = NodePath("../Back")
 focus_neighbour_bottom = NodePath("../KeymapViewer/ScrollContainer")
-script = ExtResource( 2 )
+script = ExtResource( 13 )
 
 [node name="Titel" type="Label" parent="."]
 anchor_left = 0.5
@@ -116,7 +116,7 @@ margin_top = -3.0
 margin_right = 251.0
 margin_bottom = 265.0
 rect_scale = Vector2( 0.0627026, 0.0522158 )
-texture = ExtResource( 1 )
+texture = ExtResource( 12 )
 
 [node name="KeymapViewer" type="VBoxContainer" parent="."]
 anchor_left = 0.1
@@ -182,11 +182,9 @@ follow_focus = true
 
 [node name="ActionKeyList" type="VBoxContainer" parent="KeymapViewer/ScrollContainer"]
 unique_name_in_owner = true
-margin_right = 552.0
-margin_bottom = 177.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = ExtResource( 3 )
+script = ExtResource( 14 )
 
 [node name="Back" type="Button" parent="."]
 unique_name_in_owner = true
@@ -207,7 +205,7 @@ input_pass_on_modal_close_click = false
 size_flags_horizontal = 0
 size_flags_vertical = 0
 text = "Back"
-script = ExtResource( 17 )
+script = ExtResource( 2 )
 next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn"
 
 [node name="Reset" type="Button" parent="."]
@@ -230,7 +228,7 @@ input_pass_on_modal_close_click = false
 size_flags_horizontal = 0
 size_flags_vertical = 0
 text = "Reset"
-script = ExtResource( 15 )
+script = ExtResource( 16 )
 
 [node name="Save" type="Button" parent="."]
 unique_name_in_owner = true
@@ -251,7 +249,7 @@ input_pass_on_modal_close_click = false
 size_flags_horizontal = 0
 size_flags_vertical = 0
 text = "Save"
-script = ExtResource( 14 )
+script = ExtResource( 1 )
 
 [node name="KeySelectMenu" type="Panel" parent="."]
 pause_mode = 1
@@ -263,7 +261,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 focus_mode = 2
 input_pass_on_modal_close_click = false
-script = ExtResource( 13 )
+script = ExtResource( 3 )
 
 [node name="Timer" type="Timer" parent="KeySelectMenu"]
 wait_time = 5.0
@@ -310,7 +308,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 focus_mode = 2
 input_pass_on_modal_close_click = false
-script = ExtResource( 18 )
+script = ExtResource( 6 )
 
 [node name="Prompt" type="Label" parent="ReallyQuitMenu"]
 anchor_left = 0.5
@@ -360,7 +358,7 @@ size_flags_horizontal = 7
 size_flags_vertical = 4
 text = "Save And Quit"
 icon_align = 1
-script = ExtResource( 16 )
+script = ExtResource( 4 )
 next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn"
 
 [node name="ContinueEdit" type="Button" parent="ReallyQuitMenu/VBoxContainer"]
@@ -391,11 +389,11 @@ input_pass_on_modal_close_click = false
 size_flags_horizontal = 7
 size_flags_vertical = 4
 text = "Quit Don't Save"
-script = ExtResource( 11 )
+script = ExtResource( 19 )
 next_screen_path = "res://src/UserInterface/Screens/MainScreen.tscn"
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 10 )
+stream = ExtResource( 11 )
 volume_db = -10.065
 autoplay = true
 bus = "Music"

src/UserInterface/Screens/MainMenu/MainScreen.tscn

@@ -3,19 +3,19 @@
 [ext_resource path="res://src/UserInterface/Buttons/QuitButton.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/UserInterface/Buttons/Titel.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.tscn" type="PackedScene" id=3]
-[ext_resource path="res://assets/environment/background/starry-space.png" type="Texture" id=4]
+[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=4]
 [ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=5]
-[ext_resource path="res://src/UserInterface/Screens/LevelList.gd" type="Script" id=6]
-[ext_resource path="res://src/UserInterface/Screens/LevelSelectButtonGroup.tres" type="ButtonGroup" id=7]
-[ext_resource path="res://assets/environment/background/Spaceship-Wall.png" type="Texture" id=8]
-[ext_resource path="res://assets/sounds/EpsonStart.ogg" type="AudioStream" id=9]
-[ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=10]
-[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=11]
-[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=12]
+[ext_resource path="res://assets/environment/background/Spaceship-Wall.png" type="Texture" id=6]
+[ext_resource path="res://assets/environment/background/starry-space.png" type="Texture" id=7]
+[ext_resource path="res://assets/sounds/EpsonStart.ogg" type="AudioStream" id=8]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/LevelSelectButtonGroup.tres" type="ButtonGroup" id=9]
+[ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=10]
+[ext_resource path="res://src/UserInterface/Screens/MainMenu/LevelList.gd" type="Script" id=11]
+[ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=12]
 
 [sub_resource type="DynamicFont" id=1]
 size = 69
-font_data = ExtResource( 11 )
+font_data = ExtResource( 10 )
 
 [node name="MainScreen" type="Control"]
 anchor_right = 1.0
@@ -25,21 +25,21 @@ size_flags_horizontal = 0
 size_flags_vertical = 0
 theme = ExtResource( 5 )
 
-[node name="SignalManager" parent="." instance=ExtResource( 12 )]
+[node name="SignalManager" parent="." instance=ExtResource( 4 )]
 
 [node name="background" type="TextureRect" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_top = -128.0
 margin_bottom = -128.0
-texture = ExtResource( 4 )
+texture = ExtResource( 7 )
 expand = true
 stretch_mode = 1
 
 [node name="background2" type="TextureRect" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
-texture = ExtResource( 8 )
+texture = ExtResource( 6 )
 expand = true
 stretch_mode = 1
 
@@ -86,7 +86,7 @@ margin_bottom = 65.0
 focus_neighbour_top = NodePath("../PlayButton")
 focus_neighbour_bottom = NodePath("../QuitButton")
 text = "Controls"
-script = ExtResource( 10 )
+script = ExtResource( 12 )
 next_screen_path = "res://src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn"
 
 [node name="QuitButton" parent="MenuContainer/Buttons" instance=ExtResource( 1 )]
@@ -107,7 +107,7 @@ margin_bottom = 100.0
 focus_mode = 2
 follow_focus = true
 scroll_horizontal_enabled = false
-script = ExtResource( 6 )
+script = ExtResource( 11 )
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MenuContainer/LevelList"]
 focus_mode = 2
@@ -117,10 +117,10 @@ visible = false
 margin_right = 24.0
 margin_bottom = 24.0
 focus_neighbour_left = NodePath("../../../Buttons/PlayButton")
-group = ExtResource( 7 )
+group = ExtResource( 9 )
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 9 )
+stream = ExtResource( 8 )
 volume_db = -10.065
 autoplay = true
 bus = "Music"

src/UserInterface/UserInterface.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://src/UserInterface/Screens/PauseScreen.tscn" type="PackedScene" id=1]
+[ext_resource path="res://src/UserInterface/Screens/InGameMenu/PauseScreen.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/UserInterface/Screens/HUD.tscn" type="PackedScene" id=2]
 
 [node name="UserInterface" type="CanvasLayer"]