New main menu!

2DArt/Main Menu/Background.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://p427bphnxyjc"
+path="res://.godot/imported/Background.jpg-6c516da2fddcfe305b4baa5cd47a8643.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/Background.jpg"
+dest_files=["res://.godot/imported/Background.jpg-6c516da2fddcfe305b4baa5cd47a8643.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

2DArt/Main Menu/CreditSelected.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ds6ymkq367mdi"
+path="res://.godot/imported/CreditSelected.png-da358a893bb3ac463daa8e9e1af2754a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/CreditSelected.png"
+dest_files=["res://.godot/imported/CreditSelected.png-da358a893bb3ac463daa8e9e1af2754a.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

2DArt/Main Menu/CreditUnselected.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c8q2aon4qw0xp"
+path="res://.godot/imported/CreditUnselected.png-5608809c15b6cff7f4ab26e421a93234.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/CreditUnselected.png"
+dest_files=["res://.godot/imported/CreditUnselected.png-5608809c15b6cff7f4ab26e421a93234.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

2DArt/Main Menu/LogoMainMenu.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://boxpg8u6wo0uf"
+path="res://.godot/imported/LogoMainMenu.png-8cea5a2870e2c6105c344a0e4ca58be7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/LogoMainMenu.png"
+dest_files=["res://.godot/imported/LogoMainMenu.png-8cea5a2870e2c6105c344a0e4ca58be7.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

2DArt/Main Menu/PlayScreenHOST.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b8hvwlbkrib4k"
+path="res://.godot/imported/PlayScreenHOST.png-f5cf14f379a7d60692477a6640dcd64d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/PlayScreenHOST.png"
+dest_files=["res://.godot/imported/PlayScreenHOST.png-f5cf14f379a7d60692477a6640dcd64d.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

2DArt/Main Menu/PlayScreenJOIN.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b3hksm46ma2rm"
+path="res://.godot/imported/PlayScreenJOIN.png-df1bd23b0db9ced63afb7c924b9c53d4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/PlayScreenJOIN.png"
+dest_files=["res://.godot/imported/PlayScreenJOIN.png-df1bd23b0db9ced63afb7c924b9c53d4.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

2DArt/Main Menu/PlaySelected.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cuev8l405quxs"
+path="res://.godot/imported/PlaySelected.png-963d945f7deeeaf2938c3fcd8ac4fc5e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/PlaySelected.png"
+dest_files=["res://.godot/imported/PlaySelected.png-963d945f7deeeaf2938c3fcd8ac4fc5e.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

2DArt/Main Menu/PlayUnselected.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://256bck7an7h"
+path="res://.godot/imported/PlayUnselected.png-d96cd3cd2546ef6249790f3f388b7b17.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/PlayUnselected.png"
+dest_files=["res://.godot/imported/PlayUnselected.png-d96cd3cd2546ef6249790f3f388b7b17.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

2DArt/Main Menu/ProjectTeddyFULLLogo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://gt440iakn1t5"
+path="res://.godot/imported/ProjectTeddyFULLLogo.png-8a1da20c0ef627bc5e280a1e6ad470c6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/ProjectTeddyFULLLogo.png"
+dest_files=["res://.godot/imported/ProjectTeddyFULLLogo.png-8a1da20c0ef627bc5e280a1e6ad470c6.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

2DArt/Main Menu/ProjectTeddySmallLogo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d1lrg4811asyt"
+path="res://.godot/imported/ProjectTeddySmallLogo.png-3e86b67ed4ff79aa7f645e61fbf914ac.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/ProjectTeddySmallLogo.png"
+dest_files=["res://.godot/imported/ProjectTeddySmallLogo.png-3e86b67ed4ff79aa7f645e61fbf914ac.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

2DArt/Main Menu/SettingsSelected.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b3ftohrlyygnr"
+path="res://.godot/imported/SettingsSelected.png-1983ff7f177e24ea6deb69529f3e5a96.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/SettingsSelected.png"
+dest_files=["res://.godot/imported/SettingsSelected.png-1983ff7f177e24ea6deb69529f3e5a96.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

2DArt/Main Menu/SettingsUnselected.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://6o45rgrqwraw"
+path="res://.godot/imported/SettingsUnselected.png-440147e18a83d9a61cb00e2caa9c68f7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://2DArt/Main Menu/SettingsUnselected.png"
+dest_files=["res://.godot/imported/SettingsUnselected.png-440147e18a83d9a61cb00e2caa9c68f7.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

characters/teddy/Teddy.gd

@@ -97,10 +97,10 @@ func _physics_process(delta):
 			if Input.is_action_just_pressed("shoot"):
 				if Global.menuOpen == false:
 					if Global.multiplayerCurrent == true:
-						rpc("shoot_bullet", 1)
+						rpc("shoot_bullet")
-						shoot_bullet(0)
+						shoot_bullet()
 					else:
-						shoot_bullet(1)
+						shoot_bullet()
 		if Input.is_action_just_pressed("console"):
 			var scene_trs = load("res://scenes/console.tscn")
 			var scene = scene_trs.instantiate()
@@ -121,12 +121,11 @@ func remote_set_position(authority_position, bulletgenerator_position, bulletgen
 	$CollisionShape3D/Neck/Camera3D/BulletGenerator.global_rotation = bulletgenerator_rotation
 
 @rpc("any_peer", "reliable")
-func shoot_bullet(sound):
+func shoot_bullet():
 	var b = Bullet.instantiate()
 	b.set_multiplayer_authority(teddyAuthority)
 	teddyParent.add_child(b)
 	b.transform = $CollisionShape3D/Neck/Camera3D/BulletGenerator.global_transform
 	b.velocity = -b.global_transform.basis.z * b.muzzle_velocity
-	if sound == 1:
+	$sound.stream = load("res://sounds/pistol_shoot.wav")
-		$sound.stream = load("res://sounds/pistol_shoot.wav")
+	$sound.play()
-		$sound.play()

scenes/hostmenu.tscn

@@ -1,9 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://cv5bctupikqe7"]
 
 [ext_resource type="Script" path="res://scripts/host.gd" id="1_r5rkm"]
-
+[ext_resource type="Texture2D" uid="uid://b8hvwlbkrib4k" path="res://2DArt/Main Menu/PlayScreenHOST.png" id="2_s15iu"]
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8vwth"]
-bg_color = Color(0.2, 0.2, 0.2, 1)
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_xhmtq"]
 
@@ -16,43 +14,34 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_r5rkm")
 
-[node name="Panel" type="Panel" parent="."]
+[node name="PlayScreenHost" type="Sprite2D" parent="."]
-layout_mode = 1
+position = Vector2(576.556, 324.75)
-anchors_preset = 8
+scale = Vector2(0.300231, 0.300231)
-anchor_left = 0.5
+texture = ExtResource("2_s15iu")
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-offset_left = -272.0
-offset_top = -156.0
-offset_right = 268.0
-offset_bottom = 134.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_8vwth")
 
 [node name="close" type="Button" parent="."]
 layout_mode = 0
-offset_left = 311.0
+offset_left = 859.0
-offset_top = 174.0
+offset_top = 82.0
-offset_right = 342.0
+offset_right = 890.0
-offset_bottom = 205.0
+offset_bottom = 113.0
 text = "X"
+flat = true
 
 [node name="Panel2" type="Panel" parent="."]
 layout_mode = 0
-offset_left = 355.0
+offset_left = 308.0
-offset_top = 215.0
+offset_top = 229.0
-offset_right = 555.0
+offset_right = 508.0
-offset_bottom = 415.0
+offset_bottom = 429.0
 theme_override_styles/panel = SubResource("StyleBoxFlat_xhmtq")
 
 [node name="Label" type="Label" parent="."]
 layout_mode = 0
-offset_left = 395.0
+offset_left = 348.0
-offset_top = 295.0
+offset_top = 309.0
-offset_right = 511.0
+offset_right = 464.0
-offset_bottom = 321.0
+offset_bottom = 335.0
 text = "IMAGE OF MAP"
 
 [node name="mapLabel" type="Label" parent="."]
@@ -73,59 +62,76 @@ text = "Toyland"
 
 [node name="portBox" type="LineEdit" parent="."]
 layout_mode = 0
-offset_left = 675.0
+offset_left = 726.0
-offset_top = 412.0
+offset_top = 533.0
-offset_right = 742.062
+offset_right = 793.062
-offset_bottom = 443.0
+offset_bottom = 564.0
 placeholder_text = "Port"
 
 [node name="startButton" type="Button" parent="."]
 layout_mode = 0
-offset_left = 751.0
+offset_left = 802.0
-offset_top = 411.0
+offset_top = 532.0
-offset_right = 833.0
+offset_right = 884.0
-offset_bottom = 443.0
+offset_bottom = 564.0
 text = "START"
 
 [node name="lowerMapLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 359.0
+offset_left = 262.0
-offset_top = 423.0
+offset_top = 454.0
-offset_right = 402.0
+offset_right = 305.0
-offset_bottom = 449.0
+offset_bottom = 480.0
 text = "Map: "
 
 [node name="mapSelected" type="Label" parent="."]
 layout_mode = 0
-offset_left = 406.0
+offset_left = 309.0
-offset_top = 425.0
+offset_top = 456.0
-offset_right = 446.0
+offset_right = 349.0
-offset_bottom = 448.0
+offset_bottom = 479.0
 
 [node name="playerBox" type="LineEdit" parent="."]
 layout_mode = 0
-offset_left = 674.0
+offset_left = 725.0
-offset_top = 377.0
+offset_top = 498.0
-offset_right = 741.062
+offset_right = 792.062
-offset_bottom = 408.0
+offset_bottom = 529.0
 placeholder_text = "Players"
 
 [node name="maxPlayersLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 564.0
+offset_left = 615.0
-offset_top = 381.0
+offset_top = 502.0
-offset_right = 662.0
+offset_right = 713.0
-offset_bottom = 407.0
+offset_bottom = 528.0
 text = "Max Players:"
 
 [node name="portLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 623.0
+offset_left = 674.0
-offset_top = 416.0
+offset_top = 537.0
-offset_right = 663.0
+offset_right = 714.0
-offset_bottom = 442.0
+offset_bottom = 563.0
 text = "Port:"
 
+[node name="joinButton" type="Button" parent="."]
+layout_mode = 0
+offset_left = 410.0
+offset_top = 71.0
+offset_right = 522.0
+offset_bottom = 124.0
+flat = true
+
+[node name="hostLabel" type="Label" parent="."]
+layout_mode = 0
+offset_left = 534.0
+offset_top = 161.0
+offset_right = 620.0
+offset_bottom = 187.0
+text = "Host Game"
+
 [connection signal="pressed" from="close" to="." method="_on_close_pressed"]
 [connection signal="pressed" from="playground" to="." method="_on_playground_pressed"]
 [connection signal="pressed" from="startButton" to="." method="_on_start_button_pressed"]
+[connection signal="pressed" from="joinButton" to="." method="_on_join_button_pressed"]

scenes/mainmenu.tscn

@@ -1,6 +1,14 @@
-[gd_scene load_steps=2 format=3 uid="uid://dtvtu8w6b5es0"]
+[gd_scene load_steps=10 format=3 uid="uid://dtvtu8w6b5es0"]
 
 [ext_resource type="Script" path="res://scripts/mainmenu.gd" id="1_w5lhm"]
+[ext_resource type="Texture2D" uid="uid://p427bphnxyjc" path="res://2DArt/Main Menu/Background.jpg" id="2_xwdfd"]
+[ext_resource type="Texture2D" uid="uid://gt440iakn1t5" path="res://2DArt/Main Menu/ProjectTeddyFULLLogo.png" id="3_kac7j"]
+[ext_resource type="Texture2D" uid="uid://256bck7an7h" path="res://2DArt/Main Menu/PlayUnselected.png" id="4_aht2t"]
+[ext_resource type="Texture2D" uid="uid://cuev8l405quxs" path="res://2DArt/Main Menu/PlaySelected.png" id="4_tg1yj"]
+[ext_resource type="Texture2D" uid="uid://b3ftohrlyygnr" path="res://2DArt/Main Menu/SettingsSelected.png" id="6_1gsb2"]
+[ext_resource type="Texture2D" uid="uid://6o45rgrqwraw" path="res://2DArt/Main Menu/SettingsUnselected.png" id="6_f1knf"]
+[ext_resource type="Texture2D" uid="uid://c8q2aon4qw0xp" path="res://2DArt/Main Menu/CreditUnselected.png" id="8_h20ni"]
+[ext_resource type="Texture2D" uid="uid://ds6ymkq367mdi" path="res://2DArt/Main Menu/CreditSelected.png" id="8_plwex"]
 
 [node name="mainmenu" type="Control"]
 layout_mode = 3
@@ -11,34 +19,81 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_w5lhm")
 
+[node name="Background" type="Sprite2D" parent="."]
+position = Vector2(576.222, 324.375)
+scale = Vector2(0.300347, 0.300347)
+texture = ExtResource("2_xwdfd")
+
+[node name="ProjectTeddyFullLogo" type="Sprite2D" parent="."]
+position = Vector2(853, 120)
+scale = Vector2(0.225195, 0.225195)
+texture = ExtResource("3_kac7j")
+
 [node name="Button" type="Button" parent="."]
 layout_mode = 0
-offset_left = 479.0
+offset_left = 245.0
-offset_top = 187.0
+offset_top = 577.0
-offset_right = 670.0
+offset_right = 436.0
-offset_bottom = 250.0
+offset_bottom = 640.0
 text = "TUTORIAL"
 
-[node name="Button4" type="Button" parent="."]
+[node name="playButton" type="Button" parent="."]
-layout_mode = 0
+layout_mode = 1
+anchors_preset = -1
+anchor_left = 0.371528
+anchor_top = 0.0833333
+anchor_right = 0.386285
+anchor_bottom = 0.132716
 offset_left = 479.0
 offset_top = 256.0
 offset_right = 670.0
 offset_bottom = 319.0
-text = "MULTIPLAYER"
+flat = true
 metadata/_edit_use_anchors_ = true
 
-[node name="Button2" type="Button" parent="."]
+[node name="PlaySelected" type="Sprite2D" parent="playButton"]
-layout_mode = 0
+visible = false
+position = Vector2(104, 47)
+scale = Vector2(0.385241, 0.385241)
+texture = ExtResource("4_tg1yj")
+
+[node name="PlayUnselected" type="Sprite2D" parent="playButton"]
+position = Vector2(105, 46)
+scale = Vector2(0.384832, 0.384832)
+texture = ExtResource("4_aht2t")
+
+[node name="settingsButton" type="Button" parent="."]
+layout_mode = 1
+anchors_preset = -1
+anchor_left = 0.229167
+anchor_top = 0.149691
+anchor_right = 0.394965
+anchor_bottom = 0.191358
 offset_left = 479.0
 offset_top = 324.0
 offset_right = 670.0
 offset_bottom = 387.0
-text = "SETTINGS"
+flat = true
 metadata/_edit_use_anchors_ = true
 
+[node name="SettingsSelected" type="Sprite2D" parent="settingsButton"]
+visible = false
+position = Vector2(190, 44)
+scale = Vector2(0.353704, 0.353704)
+texture = ExtResource("6_1gsb2")
+
+[node name="SettingsUnselected" type="Sprite2D" parent="settingsButton"]
+position = Vector2(188.877, 43.7969)
+scale = Vector2(0.354051, 0.354051)
+texture = ExtResource("6_f1knf")
+
 [node name="Button3" type="Button" parent="."]
-layout_mode = 0
+layout_mode = 1
+anchors_preset = -1
+anchor_left = -0.000868056
+anchor_top = 0.283951
+anchor_right = -0.000868056
+anchor_bottom = 0.283951
 offset_left = 479.0
 offset_top = 392.0
 offset_right = 670.0
@@ -46,16 +101,33 @@ offset_bottom = 455.0
 text = "EXIT"
 metadata/_edit_use_anchors_ = true
 
-[node name="Button5" type="Button" parent="."]
+[node name="creditsButton" type="Button" parent="."]
 layout_mode = 0
-offset_left = 527.0
+offset_left = 809.0
-offset_top = 597.0
+offset_top = 522.0
-offset_right = 619.0
+offset_right = 1119.0
-offset_bottom = 637.0
+offset_bottom = 602.0
-text = "CREDITS"
+flat = true
+
+[node name="CreditSelected" type="Sprite2D" parent="creditsButton"]
+visible = false
+position = Vector2(155, 42)
+scale = Vector2(0.344, 0.344)
+texture = ExtResource("8_plwex")
+
+[node name="CreditUnselected" type="Sprite2D" parent="creditsButton"]
+position = Vector2(155.115, 42.25)
+scale = Vector2(0.344017, 0.344017)
+texture = ExtResource("8_h20ni")
 
 [connection signal="pressed" from="Button" to="." method="_on_button_pressed"]
-[connection signal="pressed" from="Button4" to="." method="_on_button_4_pressed"]
+[connection signal="mouse_entered" from="playButton" to="." method="_on_play_button_mouse_entered"]
-[connection signal="pressed" from="Button2" to="." method="_on_button_2_pressed"]
+[connection signal="mouse_exited" from="playButton" to="." method="_on_play_button_mouse_exited"]
+[connection signal="pressed" from="playButton" to="." method="_on_button_4_pressed"]
+[connection signal="mouse_entered" from="settingsButton" to="." method="_on_settings_button_mouse_entered"]
+[connection signal="mouse_exited" from="settingsButton" to="." method="_on_settings_button_mouse_exited"]
+[connection signal="pressed" from="settingsButton" to="." method="_on_button_2_pressed"]
 [connection signal="pressed" from="Button3" to="." method="_on_button_3_pressed"]
-[connection signal="pressed" from="Button5" to="." method="_on_button_5_pressed"]
+[connection signal="mouse_entered" from="creditsButton" to="." method="_on_credits_button_mouse_entered"]
+[connection signal="mouse_exited" from="creditsButton" to="." method="_on_credits_button_mouse_exited"]
+[connection signal="pressed" from="creditsButton" to="." method="_on_button_5_pressed"]

scenes/multiplayer.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=3 uid="uid://bu0htwo7n3pwa"]
+[gd_scene load_steps=3 format=3 uid="uid://bu0htwo7n3pwa"]
 
 [ext_resource type="Script" path="res://scripts/multiplayer.gd" id="1_ehfu1"]
+[ext_resource type="Texture2D" uid="uid://b3hksm46ma2rm" path="res://2DArt/Main Menu/PlayScreenJOIN.png" id="2_px3id"]
 
 [node name="multiplayer" type="Control"]
 layout_mode = 3
@@ -11,89 +12,87 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_ehfu1")
 
+[node name="PlayScreenJoin" type="Sprite2D" parent="."]
+position = Vector2(576.333, 324.625)
+scale = Vector2(0.300347, 0.300347)
+texture = ExtResource("2_px3id")
+
 [node name="playerNameBox" type="LineEdit" parent="."]
 layout_mode = 0
-offset_left = 483.0
+offset_left = 521.0
-offset_top = 579.0
+offset_top = 515.0
-offset_right = 650.0
+offset_right = 688.0
-offset_bottom = 622.0
+offset_bottom = 558.0
 
 [node name="playerLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 360.0
+offset_left = 398.0
-offset_top = 588.0
+offset_top = 524.0
-offset_right = 468.0
+offset_right = 506.0
-offset_bottom = 614.0
+offset_bottom = 550.0
 text = "Player Name: "
 
 [node name="backButton" type="Button" parent="."]
 layout_mode = 0
-offset_left = 5.0
+offset_left = 857.0
-offset_top = 5.0
+offset_top = 82.0
-offset_right = 93.0
+offset_right = 891.0
-offset_bottom = 48.0
+offset_bottom = 113.0
-text = "BACK"
+text = "X"
+flat = true
 
 [node name="ipBox" type="LineEdit" parent="."]
 layout_mode = 0
-offset_left = 341.0
+offset_left = 526.0
-offset_top = 249.0
+offset_top = 222.0
-offset_right = 498.0
+offset_right = 683.0
-offset_bottom = 287.0
+offset_bottom = 260.0
 
 [node name="joinGameLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 376.0
+offset_left = 562.0
-offset_top = 180.0
+offset_top = 174.0
-offset_right = 455.0
+offset_right = 641.0
-offset_bottom = 206.0
+offset_bottom = 200.0
 text = "Join Game"
 
 [node name="ipLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 244.0
+offset_left = 422.0
-offset_top = 253.0
+offset_top = 229.0
-offset_right = 334.0
+offset_right = 512.0
-offset_bottom = 279.0
+offset_bottom = 255.0
 text = "IP Address: "
 
 [node name="portBox" type="LineEdit" parent="."]
 layout_mode = 0
-offset_left = 342.0
+offset_left = 527.0
-offset_top = 294.0
+offset_top = 283.0
-offset_right = 414.0
+offset_right = 599.0
-offset_bottom = 330.0
+offset_bottom = 319.0
 
 [node name="portLabel" type="Label" parent="."]
 layout_mode = 0
-offset_left = 291.0
+offset_left = 464.0
-offset_top = 299.0
+offset_top = 288.0
-offset_right = 333.0
+offset_right = 506.0
-offset_bottom = 325.0
+offset_bottom = 314.0
 text = "Port: "
 
-[node name="hostLabel" type="Label" parent="."]
-layout_mode = 0
-offset_left = 712.0
-offset_top = 181.0
-offset_right = 798.0
-offset_bottom = 207.0
-text = "Host Game"
-
 [node name="hostButton" type="Button" parent="."]
 layout_mode = 0
-offset_left = 694.0
+offset_left = 258.0
-offset_top = 245.0
+offset_top = 72.0
-offset_right = 822.0
+offset_right = 381.0
-offset_bottom = 282.0
+offset_bottom = 123.0
-text = "HOST"
+flat = true
 
 [node name="joinButton" type="Button" parent="."]
 layout_mode = 0
-offset_left = 426.0
+offset_left = 613.0
-offset_top = 295.0
+offset_top = 283.0
-offset_right = 497.0
+offset_right = 684.0
-offset_bottom = 330.0
+offset_bottom = 318.0
 text = "JOIN"
 
 [node name="errorLabel" type="Label" parent="."]

scripts/host.gd

@@ -50,4 +50,8 @@ func _on_start_button_pressed():
 		$mapSelected.text = "NO PORT SPECIFIED"
 
 
-
+func _on_join_button_pressed():
+	var scene_trs =load("res://scenes/multiplayer.tscn")
+	var scene=scene_trs.instantiate()
+	get_parent().add_child(scene)
+	self.queue_free()

scripts/mainmenu.gd

@@ -5,7 +5,8 @@ var mainMenuScene = "res://scenes/mainmenu.tscn"
 func _ready():
 	if Global.playingGame == true:
 		$Button.text = "RESUME"
-		$Button4.text = "MAIN MENU"
+		$Background.visible = false
+		$playButton.visible = false
 
 func _process(delta):
 	pass
@@ -29,16 +30,42 @@ func _on_button_3_pressed():
 
 
 func _on_button_4_pressed():
-	if Global.playingGame == false:
+	var scene_trs =load("res://scenes/multiplayer.tscn")
-		get_tree().change_scene_to_file("res://scenes/multiplayer.tscn")
+	var scene=scene_trs.instantiate()
-	if Global.playingGame == true:
+	add_child(scene)
-		Global.goScene = mainMenuScene
-		var scene_trs =load("res://scenes/sceneChangerConfirm.tscn")
-		var scene=scene_trs.instantiate()
-		add_child(scene)
 
 
 func _on_button_5_pressed():
 	var scene_trs =load("res://scenes/credits.tscn")
 	var scene=scene_trs.instantiate()
 	add_child(scene)
+
+
+func _on_play_button_mouse_entered():
+	$playButton/PlayUnselected.visible = false
+	$playButton/PlaySelected.visible = true
+
+
+func _on_play_button_mouse_exited():
+	$playButton/PlayUnselected.visible = true
+	$playButton/PlaySelected.visible = false
+
+
+func _on_settings_button_mouse_entered():
+	$settingsButton/SettingsUnselected.visible = false
+	$settingsButton/SettingsSelected.visible = true
+
+
+func _on_settings_button_mouse_exited():
+	$settingsButton/SettingsUnselected.visible = true
+	$settingsButton/SettingsSelected.visible = false
+
+
+func _on_credits_button_mouse_entered():
+	$creditsButton/CreditUnselected.visible = false
+	$creditsButton/CreditSelected.visible = true
+
+
+func _on_credits_button_mouse_exited():
+	$creditsButton/CreditUnselected.visible = true
+	$creditsButton/CreditSelected.visible = false

scripts/multiplayer.gd

@@ -11,13 +11,14 @@ func _process(delta):
 
 
 func _on_button_pressed():
-	get_tree().change_scene_to_file("res://scenes/mainmenu.tscn")
+	self.queue_free()
 
 
 func _on_host_button_pressed():
 	var scene_trs =load("res://scenes/hostmenu.tscn")
 	var scene=scene_trs.instantiate()
-	add_child(scene)
+	get_parent().add_child(scene)
+	self.queue_free()
 
 
 func _on_join_button_pressed():