M7 B2

Bug fixes and other fixes. Migration to Godot 4.3 (RC3)

assets/models/corner.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/corner.gltf-d27aae84dacf6337afe0f777beb3d2f1.
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/crouch.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/crouch.gltf-ace5d02cb4e9e58f95c55709db549ec7.
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/floor.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/floor.gltf-f41589b4f800248085aa506db510082f.s
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/frame.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/frame.gltf-0e20b27650c04f11c1dfb68fc46aec12.s
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/inverted_corner.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/inverted_corner.gltf-4b1ca22cbccec7314454316f
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/jump.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/jump.gltf-7b6f835bd8b0695f3d758d786ce34d46.sc
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/jump_corner.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/jump_corner.gltf-48aab81343564dd20cd29f0bff34
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/jump_corner2.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/jump_corner2.gltf-1a7d50337cb83e920dddd62bf38
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_1.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_1.gltf-b3faa75abaaa7744f04f516ad6700ff
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_2.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_2.gltf-53572c3c4bb5f3c8f79adfd45fe4bc2
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_3.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_3.gltf-22172a41fb8ad833b8941bfa6111f36
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_4.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_4.gltf-ab34f22899c6169c343831413f326e6
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_5.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_5.gltf-152ac59889e35702f24b64bc9de6062
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_6.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_6.gltf-59e685ed83ebcebad32d89c3ed47a83
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/stairs_7.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/stairs_7.gltf-a512293401a4d8fe9ae86955a71ea78
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

assets/models/wall.gltf.import

@@ -13,14 +13,15 @@ dest_files=["res://.godot/imported/wall.gltf-5a937a3e90517c0241c6d52793662436.sc
 
 [params]
 
-nodes/root_type=""
+nodes/root_type="MeshInstance3D"
 nodes/root_name=""
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true
-meshes/light_baking=1
+meshes/light_baking=2
 meshes/lightmap_texel_size=0.2
 meshes/force_disable_compression=false
 skins/use_named_skins=true
@@ -28,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={}
 gltf/naming_version=1

menus/create.tscn

@@ -38,13 +38,13 @@ grow_vertical = 2
 custom_minimum_size = Vector2(256, 64)
 layout_mode = 2
 theme_override_font_sizes/font_size = 32
-placeholder_text = "Name"
+placeholder_text = "Username"
 
 [node name="ip" type="TextEdit" parent="player_customization"]
 custom_minimum_size = Vector2(256, 64)
 layout_mode = 2
 theme_override_font_sizes/font_size = 32
-placeholder_text = "Game Name"
+placeholder_text = "Room Name"
 
 [node name="join" type="Button" parent="player_customization"]
 layout_mode = 2

menus/main_menu.tscn

@@ -66,7 +66,7 @@ grow_vertical = 0
 [node name="Label" type="Label" parent="ver_string"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 32
-text = "M7 B1"
+text = "M7 B2"
 horizontal_alignment = 2
 
 [connection signal="pressed" from="main_content/join" to="." method="_on_join_pressed"]

menus/settings.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://buvl1aa0733mn"]
+[gd_scene load_steps=4 format=3 uid="uid://buvl1aa0733mn"]
 
-[ext_resource type="Script" path="res://scripts/settings.gd" id="1_kmx8a"]
+[ext_resource type="Script" path="res://scripts/settings_multioption.gd" id="1_kmx8a"]
 [ext_resource type="Script" path="res://scripts/main_settings.gd" id="1_vdm7d"]
+[ext_resource type="Script" path="res://scripts/settings_text.gd" id="3_faw6x"]
 
 [node name="Settings" type="Control"]
 layout_mode = 3
@@ -36,12 +37,29 @@ size_flags_horizontal = 4
 size_flags_vertical = 4
 theme_override_font_sizes/font_size = 32
 alignment = 1
-item_count = 2
 selected = 1
+item_count = 2
 popup/item_0/text = "Off"
-popup/item_0/id = 0
 popup/item_1/text = "On"
 popup/item_1/id = 1
 script = ExtResource("1_kmx8a")
 
+[node name="ip" type="HBoxContainer" parent="VBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+
+[node name="Label" type="Label" parent="VBoxContainer/ip"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 32
+text = "Matchmaking Server IP"
+
+[node name="TextEdit" type="TextEdit" parent="VBoxContainer/ip"]
+custom_minimum_size = Vector2(400, 56)
+layout_mode = 2
+theme_override_font_sizes/font_size = 32
+placeholder_text = "Matchmaking Server IP"
+script = ExtResource("3_faw6x")
+
 [connection signal="item_selected" from="VBoxContainer/fps_counter/OptionButton" to="VBoxContainer/fps_counter/OptionButton" method="_on_item_selected"]
+[connection signal="text_changed" from="VBoxContainer/ip/TextEdit" to="VBoxContainer/ip/TextEdit" method="_on_text_changed"]

objects/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=6 format=3 uid="uid://b440i2oidk5sp"]
+[gd_scene load_steps=5 format=3 uid="uid://b440i2oidk5sp"]
 
 [ext_resource type="Script" path="res://scripts/movement.gd" id="1_uru11"]
 
@@ -13,10 +13,8 @@ height = 1.75
 [sub_resource type="BoxShape3D" id="BoxShape3D_e4age"]
 size = Vector3(0.5, 0.25, 0.75)
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_6pbak"]
-size = Vector3(0.5, 1, 0.75)
-
 [node name="player" type="CharacterBody3D"]
+floor_stop_on_slope = false
 script = ExtResource("1_uru11")
 
 [node name="in_bag" type="ColorRect" parent="."]
@@ -32,6 +30,7 @@ color = Color(0, 0, 0, 1)
 shape = SubResource("CapsuleShape3D_2l8cp")
 
 [node name="bean" type="MeshInstance3D" parent="collision"]
+gi_mode = 2
 mesh = SubResource("CapsuleMesh_fhldf")
 skeleton = NodePath("../..")
 
@@ -88,31 +87,24 @@ size_flags_vertical = 0
 theme_override_font_sizes/font_size = 64
 text = "HP: 100 "
 
-[node name="hammer" type="StaticBody3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 0, 0)
+[node name="hammer" type="CSGBox3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.5, 0.5, 0)
 visible = false
-
-[node name="hammer2" type="CSGBox3D" parent="hammer"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.5, 0)
 size = Vector3(0.25, 0.25, 1)
 
-[node name="CSGBox3D" type="CSGBox3D" parent="hammer/hammer2"]
+[node name="CSGBox3D" type="CSGBox3D" parent="hammer"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.75)
 size = Vector3(0.5, 1, 0.75)
 
-[node name="detect_hit" type="Area3D" parent="hammer/hammer2/CSGBox3D"]
+[node name="detect_hit" type="Area3D" parent="hammer/CSGBox3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0)
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer/hammer2/CSGBox3D/detect_hit"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer/CSGBox3D/detect_hit"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.375, 0)
 shape = SubResource("BoxShape3D_e4age")
 disabled = true
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="hammer"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 1.25, 3.27835e-08)
-shape = SubResource("BoxShape3D_6pbak")
-
 [connection signal="timeout" from="time_in_bag" to="." method="_on_time_in_bag_timeout"]
 [connection signal="timeout" from="show_fps" to="." method="_on_show_fps_timeout"]
 [connection signal="timeout" from="jump_timeout" to="." method="_on_jump_timeout_timeout"]
-[connection signal="body_entered" from="hammer/hammer2/CSGBox3D/detect_hit" to="." method="_on_detect_hit_body_entered"]
+[connection signal="body_entered" from="hammer/CSGBox3D/detect_hit" to="." method="_on_detect_hit_body_entered"]

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="FreeFTF"
 run/main_scene="res://menus/main_menu.tscn"
-config/features=PackedStringArray("4.2", "Forward Plus")
+config/features=PackedStringArray("4.3", "Forward Plus")
 
 [autoload]
 
@@ -23,26 +23,30 @@ Game="*res://scripts/game.gd"
 Save="*res://scripts/save.gd"
 Load="*res://scripts/load.gd"
 
+[display]
+
+window/vsync/vsync_mode=0
+
 [input]
 
 forwards={
 "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,"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":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
 ]
 }
 backwards={
 "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,"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":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
 ]
 }
 left={
 "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,"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":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
 ]
 }
 right={
 "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,"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":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
 ]
 }
 cam_look={
@@ -52,7 +56,7 @@ cam_look={
 }
 jump={
 "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":32,"key_label":0,"unicode":32,"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":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
 ]
 }
 zoom_in={
@@ -67,17 +71,17 @@ zoom_out={
 }
 escape={
 "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":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
+"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":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 mouse_lock={
 "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":76,"key_label":0,"unicode":108,"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":76,"key_label":0,"unicode":108,"location":0,"echo":false,"script":null)
 ]
 }
 crouch={
 "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":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"echo":false,"script":null)
+"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":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }
 click={

scripts/client.gd

@@ -17,7 +17,7 @@ func _ready():
 
 func join_game():
 	var peer = ENetMultiplayerPeer.new()
-	peer.create_client(Game.ip, Game.port)
+	peer.create_client(Game.settings["ip"], Game.settings["port"])
 	multiplayer.multiplayer_peer = peer
 	
 func is_valid(sender_id, must_be_from_owner):
@@ -50,10 +50,10 @@ func _on_player_disconnected(id):
 				Game.players = 0
 			else:
 				Game.players -= 1
-			print("found")
 			await get_tree().create_timer(0.5).timeout
 			current_character.free()
-			print("freed")
+			if current_character.captured_by != null:
+				current_character.captured_by.lost_one()
 		x += 1
 	Game.player_list.erase(id)
 
@@ -98,4 +98,3 @@ func sync_computers(node_name, current):
 func sync_beast(player):
 	if is_valid(multiplayer.get_remote_sender_id(), true):
 		Game.sync_beast(player)
-

scripts/create.gd

@@ -55,4 +55,3 @@ func _on_connected_ok():
 	$player_customization/join.disabled = true
 	$player_customization/name.editable = false
 	$player_customization/ip.editable = false
-

scripts/game.gd

@@ -9,7 +9,7 @@
 
 extends Node
 
-var settings = {"save_version" = 2, "fps_counter" = 1, "port" = 35000, "ip" = "127.0.0.1"}
+var settings = {"save_version" = 3, "fps_counter" = 1, "port" = 35000, "ip" = "127.0.0.1"}
 var computers = 0
 var players = 0
 var map_name = "mansion"
@@ -21,8 +21,6 @@ var player_escaped = false
 var is_beast = false
 var character = preload("res://objects/player.tscn")
 # Server Variables
-var port = 35000
-var ip = "127.0.0.1"
 var player_name
 var room_name
 var is_server = false

scripts/game_menu.gd

@@ -15,4 +15,3 @@ func _on_button_pressed():
 	Game.reset()
 	get_tree().change_scene_to_file("res://menus/main_menu.tscn")
 	queue_free()
-

scripts/matchmaking.gd

@@ -29,7 +29,11 @@ func create_game():
 	multiplayer.multiplayer_peer = peer
 
 func _on_player_disconnected(id):
-	if multiplayer.is_server():
+	while multiplayer.is_server():
+		for i in range(5000):
+			if id in multiplayer.get_peers():
+				break
+			await get_tree().create_timer(0.001).timeout
 		var room_name = player_associations[id]
 		var player_list = create_player_list(room_name)
 		if game_rooms.has(room_name) and game_rooms[room_name] == id:
@@ -41,6 +45,7 @@ func _on_player_disconnected(id):
 				Client.rpc_id(p,"_on_player_disconnected",id)
 		player_associations.erase(id)
 		name_associations.erase(id)
+		break
 	
 func _on_player_connected(id):
 	if multiplayer.is_server():

scripts/movement.gd

@@ -10,7 +10,7 @@
 extends CharacterBody3D
 
 
-var jump_velocity = 12
+var jump_velocity = 4.5
 var speed = 7
 var zoom = 0
 var player_no
@@ -47,6 +47,12 @@ func _ready():
 func _physics_process(delta):
 	if enabled:
 		
+		if Input.is_action_just_pressed("jump") and is_on_floor() and $jump_timeout.is_stopped():
+			if beast:
+				speed -= 5
+				$jump_timeout.start()
+			velocity.y = jump_velocity
+		
 		if not is_on_floor():
 			velocity.y -= gravity * delta
 
@@ -62,11 +68,11 @@ func _physics_process(delta):
 				$cam_y.position.y = 0.5
 				position.y += 1
 		
-		if Input.is_action_pressed("click") and $hammer.rotation_degrees.x > -90:
+		if Input.is_action_pressed("click") and $hammer.rotation_degrees.x > 0:
 			$hammer.rotation_degrees.x -= 5
 			for id in Game.player_list:
 				Client.rpc_id(id,"sync_hammer",name, $hammer.rotation)
-		elif $hammer.rotation_degrees.x < 0 and !Input.is_action_pressed("click"):
+		elif $hammer.rotation_degrees.x < 90 and !Input.is_action_pressed("click"):
 			$hammer.rotation_degrees.x += 5
 			for id in Game.player_list:
 				Client.rpc_id(id,"sync_hammer",name, $hammer.rotation)
@@ -80,15 +86,6 @@ func _physics_process(delta):
 			velocity.x = move_toward(velocity.x, 0, speed)
 			velocity.z = move_toward(velocity.z, 0, speed)
 		
-		if Input.is_action_just_pressed("jump") and is_on_floor() and $jump_timeout.is_stopped():
-			if beast:
-				speed -= 5
-				$jump_timeout.start()
-			if velocity.x == 0 or velocity.y == 0:
-				velocity.y = jump_velocity
-			else:
-				velocity.y = jump_velocity/2
-
 		move_and_slide()
 	
 	if !npc:
@@ -132,9 +129,9 @@ func beast_init():
 	beast = true
 	speed += 2
 	position.y += 10
-	$hammer/hammer2/CSGBox3D/detect_hit.monitoring = true
-	$hammer/hammer2/CSGBox3D/detect_hit.monitorable = true
-	$hammer/hammer2/CSGBox3D/detect_hit/CollisionShape3D.disabled = false
+	$hammer/CSGBox3D/detect_hit.monitoring = true
+	$hammer/CSGBox3D/detect_hit.monitorable = true
+	$hammer/CSGBox3D/detect_hit/CollisionShape3D.disabled = false
 	$hammer.show()
 	$bag.show()
 
@@ -183,6 +180,7 @@ func _on_time_in_bag_timeout():
 		enabled = true
 	caught = false
 	captured_by.lost_one()
+	captured_by = null
 	position = position_pre
 	$in_bag.visible = false
 

scripts/settings_text.gd

@@ -0,0 +1,7 @@
+extends TextEdit
+
+func _ready():
+	text = Game.settings[get_parent().name]
+
+func _on_text_changed():
+	Game.save_setting(get_parent().name, text)