multiplayer pretty much works now i think

2023-11-17 20:49:38 +11:00
parent 2d123bd731
commit 9cf6944ac8
87 changed files with 1476 additions and 1223 deletions
--- a/Scenes/Menus/audio_options.tscn
+++ b/Scenes/Menus/audio_options.tscn
@ -0,0 +1,4 @@
+[gd_scene format=3 uid="uid://bwc45ogto8thn"]
+
+[node name="Audio" type="VBoxContainer"]
+visible = false
--- a/Scenes/Menus/gameplay_options.tscn
+++ b/Scenes/Menus/gameplay_options.tscn
@ -0,0 +1,167 @@
+[gd_scene load_steps=3 format=3 uid="uid://bjk7jf0bau5lv"]
+
+[ext_resource type="Script" path="res://Scripts/gameplay_options.gd" id="1_sy26f"]
+
+[sub_resource type="ImageTexture" id="ImageTexture_03x6q"]
+
+[node name="Gameplay" type="VBoxContainer" node_paths=PackedStringArray("look_sens_slider", "look_sens_input", "toggle_sprint_checkbox", "invert_lookY", "invert_lookX", "fixed_minimap", "tower_damage", "self_damage", "party_damage", "status_damage")]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_sy26f")
+look_sens_slider = NodePath("MouseSens/HBoxContainer/HSlider")
+look_sens_input = NodePath("MouseSens/HBoxContainer/SpinBox")
+toggle_sprint_checkbox = NodePath("ToggleSprint/CenterContainer/CheckButton")
+invert_lookY = NodePath("InvertMouseY/CenterContainer/CheckButton")
+invert_lookX = NodePath("InvertMouseX/CenterContainer/CheckButton")
+fixed_minimap = NodePath("FixedMinimap/CenterContainer/CheckButton")
+tower_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/TowerDamage")
+self_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/SelfDamage")
+party_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/PartyDamage")
+status_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/StatusDamage")
+
+[node name="MouseSens" type="HBoxContainer" parent="."]
+layout_mode = 2
+alignment = 1
+
+[node name="Label" type="Label" parent="MouseSens"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Look Sensitivity"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MouseSens"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="SpinBox" type="SpinBox" parent="MouseSens/HBoxContainer"]
+layout_mode = 2
+theme_override_icons/updown = SubResource("ImageTexture_03x6q")
+step = 0.01
+alignment = 1
+update_on_text_changed = true
+
+[node name="HSlider" type="HSlider" parent="MouseSens/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 1
+step = 0.01
+scrollable = false
+
+[node name="ToggleSprint" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="ToggleSprint"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Toggle Sprint"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CenterContainer" type="CenterContainer" parent="ToggleSprint"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="CheckButton" type="CheckButton" parent="ToggleSprint/CenterContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="InvertMouseY" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="InvertMouseY"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Invert Look Y"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CenterContainer" type="CenterContainer" parent="InvertMouseY"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="CheckButton" type="CheckButton" parent="InvertMouseY/CenterContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="InvertMouseX" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="InvertMouseX"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Invert Look X"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CenterContainer" type="CenterContainer" parent="InvertMouseX"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="CheckButton" type="CheckButton" parent="InvertMouseX/CenterContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="FixedMinimap" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="FixedMinimap"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Fixed Minimap"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CenterContainer" type="CenterContainer" parent="FixedMinimap"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="CheckButton" type="CheckButton" parent="FixedMinimap/CenterContainer"]
+layout_mode = 2
+
+[node name="FloatingDamageIndicators" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="FloatingDamageIndicators"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Floating Damage Indicators"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="CenterContainer" type="CenterContainer" parent="FloatingDamageIndicators"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="HBoxContainer" type="HBoxContainer" parent="FloatingDamageIndicators/CenterContainer"]
+layout_mode = 2
+
+[node name="TowerDamage" type="Button" parent="FloatingDamageIndicators/CenterContainer/HBoxContainer"]
+layout_mode = 2
+toggle_mode = true
+button_pressed = true
+text = "Tower Damage"
+
+[node name="SelfDamage" type="Button" parent="FloatingDamageIndicators/CenterContainer/HBoxContainer"]
+layout_mode = 2
+toggle_mode = true
+button_pressed = true
+text = "Self Damage"
+
+[node name="PartyDamage" type="Button" parent="FloatingDamageIndicators/CenterContainer/HBoxContainer"]
+layout_mode = 2
+toggle_mode = true
+button_pressed = true
+text = "Party Damage"
+
+[node name="StatusDamage" type="Button" parent="FloatingDamageIndicators/CenterContainer/HBoxContainer"]
+layout_mode = 2
+toggle_mode = true
+button_pressed = true
+text = "Status Effect Damage"
+
+[connection signal="value_changed" from="MouseSens/HBoxContainer/SpinBox" to="." method="_on_mouse_sens_spin_box_value_changed"]
+[connection signal="value_changed" from="MouseSens/HBoxContainer/HSlider" to="." method="_on_mouse_sens_h_slider_value_changed"]
--- a/Scenes/Menus/graphics_options.tscn
+++ b/Scenes/Menus/graphics_options.tscn
@ -0,0 +1,125 @@
+[gd_scene load_steps=3 format=3 uid="uid://bmd4mawasoc11"]
+
+[ext_resource type="Script" path="res://Scripts/graphics_options.gd" id="1_85rh6"]
+
+[sub_resource type="ImageTexture" id="ImageTexture_03x6q"]
+
+[node name="Graphics" type="VBoxContainer" node_paths=PackedStringArray("fov_input", "fov_slider", "vsync_dropdown", "aa_dropdown", "window_dropdown")]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_85rh6")
+fov_input = NodePath("FOV/HBoxContainer/SpinBox")
+fov_slider = NodePath("FOV/HBoxContainer/HSlider")
+vsync_dropdown = NodePath("VSync/OptionButton")
+aa_dropdown = NodePath("AntiAliasing/OptionButton")
+window_dropdown = NodePath("Windowed/OptionButton")
+
+[node name="FOV" type="HBoxContainer" parent="."]
+layout_mode = 2
+alignment = 1
+
+[node name="Label" type="Label" parent="FOV"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Field Of View"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="HBoxContainer" type="HBoxContainer" parent="FOV"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="SpinBox" type="SpinBox" parent="FOV/HBoxContainer"]
+layout_mode = 2
+theme_override_icons/updown = SubResource("ImageTexture_03x6q")
+min_value = 40.0
+max_value = 160.0
+value = 100.0
+allow_greater = true
+allow_lesser = true
+alignment = 1
+update_on_text_changed = true
+
+[node name="HSlider" type="HSlider" parent="FOV/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 1
+min_value = 40.0
+max_value = 160.0
+value = 100.0
+scrollable = false
+
+[node name="VSync" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="VSync"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "V-Sync"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="OptionButton" type="OptionButton" parent="VSync"]
+layout_mode = 2
+size_flags_horizontal = 3
+item_count = 4
+selected = 1
+popup/item_0/text = "Off"
+popup/item_0/id = 0
+popup/item_1/text = "On"
+popup/item_1/id = 1
+popup/item_2/text = "Adaptive"
+popup/item_2/id = 2
+popup/item_3/text = "Triple Buffered"
+popup/item_3/id = 3
+
+[node name="AntiAliasing" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="AntiAliasing"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Anti-Aliasing
+"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="OptionButton" type="OptionButton" parent="AntiAliasing"]
+layout_mode = 2
+size_flags_horizontal = 3
+item_count = 3
+selected = 0
+popup/item_0/text = "Off"
+popup/item_0/id = 0
+popup/item_1/text = "FXAA"
+popup/item_1/id = 1
+popup/item_2/text = "TAA"
+popup/item_2/id = 2
+
+[node name="Windowed" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Windowed"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Window Mode"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="OptionButton" type="OptionButton" parent="Windowed"]
+layout_mode = 2
+size_flags_horizontal = 3
+item_count = 3
+selected = 0
+popup/item_0/text = "Windowed"
+popup/item_0/id = 0
+popup/item_1/text = "Borderless Windowed"
+popup/item_1/id = 1
+popup/item_2/text = "Fullscreen"
+popup/item_2/id = 2
+
+[connection signal="value_changed" from="FOV/HBoxContainer/SpinBox" to="." method="_on_fov_spin_box_value_changed"]
+[connection signal="value_changed" from="FOV/HBoxContainer/HSlider" to="." method="_on_fov_h_slider_value_changed"]
--- a/Scenes/Menus/keybind_options.tscn
+++ b/Scenes/Menus/keybind_options.tscn
@ -0,0 +1,22 @@
+[gd_scene load_steps=2 format=3 uid="uid://bf2nosqt5f82e"]
+
+[ext_resource type="Script" path="res://Scripts/keybind_options.gd" id="1_oxg0p"]
+
+[node name="Keybinds" type="VBoxContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_oxg0p")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="ScrollContainer" type="ScrollContainer" parent="."]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
--- a/Scenes/Menus/multiplayer_lobby.tscn
+++ b/Scenes/Menus/multiplayer_lobby.tscn
@ -64,7 +64,6 @@ text = "Ready"

 [node name="Chatbox" parent="." instance=ExtResource("6_wtqwd")]
 layout_mode = 1
-offset_bottom = -507.0

 [connection signal="player_connected" from="." to="Scoreboard" method="add_player"]
 [connection signal="player_disconnected" from="." to="Scoreboard" method="remove_player"]
--- a/Scenes/Menus/options_menu.tscn
+++ b/Scenes/Menus/options_menu.tscn
@ -1,11 +1,12 @@
-[gd_scene load_steps=4 format=3 uid="uid://clulh7v8c7h85"]
+[gd_scene load_steps=6 format=3 uid="uid://clulh7v8c7h85"]

 [ext_resource type="Script" path="res://Scripts/options_menu.gd" id="1_bievw"]
-[ext_resource type="PackedScene" uid="uid://clsdko6ttudu8" path="res://Scenes/UI/keybind_popup.tscn" id="2_bq25i"]
+[ext_resource type="PackedScene" uid="uid://bjk7jf0bau5lv" path="res://Scenes/Menus/gameplay_options.tscn" id="3_25wuw"]
+[ext_resource type="PackedScene" uid="uid://bmd4mawasoc11" path="res://Scenes/Menus/graphics_options.tscn" id="4_ckcvq"]
+[ext_resource type="PackedScene" uid="uid://bf2nosqt5f82e" path="res://Scenes/Menus/keybind_options.tscn" id="5_4k33c"]
+[ext_resource type="PackedScene" uid="uid://bwc45ogto8thn" path="res://Scenes/Menus/audio_options.tscn" id="6_4vs8p"]

-[sub_resource type="ImageTexture" id="ImageTexture_03x6q"]
-
-[node name="OptionsMenu" type="PanelContainer" node_paths=PackedStringArray("look_sens_slider", "look_sens_input", "toggle_sprint_checkbox", "vsync_dropdown", "aa_dropdown", "window_dropdown", "invert_lookY", "invert_lookX", "fov_input", "fov_slider", "fixed_minimap", "tower_damage", "self_damage", "party_damage")]
+[node name="OptionsMenu" type="PanelContainer"]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@ -16,21 +17,6 @@ offset_bottom = -30.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_bievw")
-keybind_popup = ExtResource("2_bq25i")
-look_sens_slider = NodePath("VBoxContainer/TabContainer/Gameplay/MouseSens/HBoxContainer/HSlider")
-look_sens_input = NodePath("VBoxContainer/TabContainer/Gameplay/MouseSens/HBoxContainer/SpinBox")
-toggle_sprint_checkbox = NodePath("VBoxContainer/TabContainer/Gameplay/ToggleSprint/CenterContainer/CheckButton")
-vsync_dropdown = NodePath("VBoxContainer/TabContainer/Graphics/VSync/OptionButton")
-aa_dropdown = NodePath("VBoxContainer/TabContainer/Graphics/AntiAliasing/OptionButton")
-window_dropdown = NodePath("VBoxContainer/TabContainer/Graphics/Windowed/OptionButton")
-invert_lookY = NodePath("VBoxContainer/TabContainer/Gameplay/InvertMouseY/CenterContainer/CheckButton")
-invert_lookX = NodePath("VBoxContainer/TabContainer/Gameplay/InvertMouseX/CenterContainer/CheckButton")
-fov_input = NodePath("VBoxContainer/TabContainer/Graphics/FOV/HBoxContainer/SpinBox")
-fov_slider = NodePath("VBoxContainer/TabContainer/Graphics/FOV/HBoxContainer/HSlider")
-fixed_minimap = NodePath("VBoxContainer/TabContainer/Gameplay/FixedMinimap/CenterContainer/CheckButton")
-tower_damage = NodePath("VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer/Button")
-self_damage = NodePath("VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer/Button2")
-party_damage = NodePath("VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer/Button3")

 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
@ -39,275 +25,18 @@ layout_mode = 2
 layout_mode = 2
 size_flags_vertical = 3

-[node name="Gameplay" type="VBoxContainer" parent="VBoxContainer/TabContainer"]
+[node name="Gameplay" parent="VBoxContainer/TabContainer" instance=ExtResource("3_25wuw")]
 layout_mode = 2

-[node name="MouseSens" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay"]
-layout_mode = 2
-alignment = 1
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Gameplay/MouseSens"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Look Sensitivity"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay/MouseSens"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="SpinBox" type="SpinBox" parent="VBoxContainer/TabContainer/Gameplay/MouseSens/HBoxContainer"]
-layout_mode = 2
-theme_override_icons/updown = SubResource("ImageTexture_03x6q")
-step = 0.01
-alignment = 1
-update_on_text_changed = true
-
-[node name="HSlider" type="HSlider" parent="VBoxContainer/TabContainer/Gameplay/MouseSens/HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-size_flags_vertical = 1
-step = 0.01
-scrollable = false
-
-[node name="ToggleSprint" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Gameplay/ToggleSprint"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Toggle Sprint"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer/TabContainer/Gameplay/ToggleSprint"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="CheckButton" type="CheckButton" parent="VBoxContainer/TabContainer/Gameplay/ToggleSprint/CenterContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="InvertMouseY" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Gameplay/InvertMouseY"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Invert Look Y"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer/TabContainer/Gameplay/InvertMouseY"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="CheckButton" type="CheckButton" parent="VBoxContainer/TabContainer/Gameplay/InvertMouseY/CenterContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="InvertMouseX" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Gameplay/InvertMouseX"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Invert Look X"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer/TabContainer/Gameplay/InvertMouseX"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="CheckButton" type="CheckButton" parent="VBoxContainer/TabContainer/Gameplay/InvertMouseX/CenterContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="FixedMinimap" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Gameplay/FixedMinimap"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Fixed Minimap"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer/TabContainer/Gameplay/FixedMinimap"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="CheckButton" type="CheckButton" parent="VBoxContainer/TabContainer/Gameplay/FixedMinimap/CenterContainer"]
-layout_mode = 2
-
-[node name="FloatingDamageIndicators" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Floating Damage Indicators"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer"]
-layout_mode = 2
-
-[node name="Button" type="Button" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer"]
-layout_mode = 2
-toggle_mode = true
-button_pressed = true
-text = "Tower Damage"
-
-[node name="Button2" type="Button" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer"]
-layout_mode = 2
-toggle_mode = true
-button_pressed = true
-text = "Self Damage"
-
-[node name="Button3" type="Button" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer"]
-layout_mode = 2
-toggle_mode = true
-button_pressed = true
-text = "Party Damage"
-
-[node name="Button4" type="Button" parent="VBoxContainer/TabContainer/Gameplay/FloatingDamageIndicators/CenterContainer/HBoxContainer"]
-layout_mode = 2
-toggle_mode = true
-button_pressed = true
-text = "Status Effect Damage"
-
-[node name="Graphics" type="VBoxContainer" parent="VBoxContainer/TabContainer"]
+[node name="Graphics" parent="VBoxContainer/TabContainer" instance=ExtResource("4_ckcvq")]
 visible = false
 layout_mode = 2

-[node name="FOV" type="HBoxContainer" parent="VBoxContainer/TabContainer/Graphics"]
-layout_mode = 2
-alignment = 1
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Graphics/FOV"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Field Of View"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Graphics/FOV"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="SpinBox" type="SpinBox" parent="VBoxContainer/TabContainer/Graphics/FOV/HBoxContainer"]
-layout_mode = 2
-theme_override_icons/updown = SubResource("ImageTexture_03x6q")
-min_value = 40.0
-max_value = 160.0
-value = 100.0
-allow_greater = true
-allow_lesser = true
-alignment = 1
-update_on_text_changed = true
-
-[node name="HSlider" type="HSlider" parent="VBoxContainer/TabContainer/Graphics/FOV/HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-size_flags_vertical = 1
-min_value = 40.0
-max_value = 160.0
-value = 100.0
-scrollable = false
-
-[node name="VSync" type="HBoxContainer" parent="VBoxContainer/TabContainer/Graphics"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Graphics/VSync"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "V-Sync"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="OptionButton" type="OptionButton" parent="VBoxContainer/TabContainer/Graphics/VSync"]
-layout_mode = 2
-size_flags_horizontal = 3
-item_count = 4
-selected = 1
-popup/item_0/text = "Off"
-popup/item_0/id = 0
-popup/item_1/text = "On"
-popup/item_1/id = 1
-popup/item_2/text = "Adaptive"
-popup/item_2/id = 2
-popup/item_3/text = "Triple Buffered"
-popup/item_3/id = 3
-
-[node name="AntiAliasing" type="HBoxContainer" parent="VBoxContainer/TabContainer/Graphics"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Graphics/AntiAliasing"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Anti-Aliasing
-"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="OptionButton" type="OptionButton" parent="VBoxContainer/TabContainer/Graphics/AntiAliasing"]
-layout_mode = 2
-size_flags_horizontal = 3
-item_count = 3
-selected = 0
-popup/item_0/text = "Off"
-popup/item_0/id = 0
-popup/item_1/text = "FXAA"
-popup/item_1/id = 1
-popup/item_2/text = "TAA"
-popup/item_2/id = 2
-
-[node name="Windowed" type="HBoxContainer" parent="VBoxContainer/TabContainer/Graphics"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="VBoxContainer/TabContainer/Graphics/Windowed"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "Window Mode"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="OptionButton" type="OptionButton" parent="VBoxContainer/TabContainer/Graphics/Windowed"]
-layout_mode = 2
-size_flags_horizontal = 3
-item_count = 3
-selected = 0
-popup/item_0/text = "Windowed"
-popup/item_0/id = 0
-popup/item_1/text = "Borderless Windowed"
-popup/item_1/id = 1
-popup/item_2/text = "Fullscreen"
-popup/item_2/id = 2
-
-[node name="Keybinds" type="VBoxContainer" parent="VBoxContainer/TabContainer"]
+[node name="Keybinds" parent="VBoxContainer/TabContainer" instance=ExtResource("5_4k33c")]
 visible = false
 layout_mode = 2

-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/TabContainer/Keybinds"]
-layout_mode = 2
-
-[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer/TabContainer/Keybinds"]
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/TabContainer/Keybinds/ScrollContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-
-[node name="Audio" type="VBoxContainer" parent="VBoxContainer/TabContainer"]
-visible = false
+[node name="Audio" parent="VBoxContainer/TabContainer" instance=ExtResource("6_4vs8p")]
 layout_mode = 2

 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
@ -322,11 +51,5 @@ text = "Discard"
 layout_mode = 2
 text = "Confirm"

-[connection signal="value_changed" from="VBoxContainer/TabContainer/Gameplay/MouseSens/HBoxContainer/SpinBox" to="." method="_on_mouse_sens_spin_box_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Gameplay/MouseSens/HBoxContainer/HSlider" to="." method="_on_mouse_sens_h_slider_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Graphics/FOV/HBoxContainer/SpinBox" to="." method="_on_fov_spin_box_value_changed"]
-[connection signal="value_changed" from="VBoxContainer/TabContainer/Graphics/FOV/HBoxContainer/HSlider" to="." method="_on_fov_h_slider_value_changed"]
-[connection signal="item_selected" from="VBoxContainer/TabContainer/Graphics/VSync/OptionButton" to="." method="_on_vsync_option_button_item_selected"]
-[connection signal="item_selected" from="VBoxContainer/TabContainer/Graphics/AntiAliasing/OptionButton" to="." method="_on_AA_option_button_item_selected"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_cancel_pressed"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"]
--- a/Scenes/Menus/singleplayer_lobby.tscn
+++ b/Scenes/Menus/singleplayer_lobby.tscn
@ -54,9 +54,7 @@ grow_vertical = 2
 text = "Ready"

 [node name="Chatbox" parent="." instance=ExtResource("3_l8xy3")]
-visible = false
 layout_mode = 1
-offset_bottom = -507.0

 [connection signal="pressed" from="ReadyButton" to="Scoreboard" method="set_player_ready_state" binds= [1, true]]
 [connection signal="pressed" from="ReadyButton" to="ReadyButton" method="set_visible" binds= [false]]
--- a/Scenes/Towers/range_affecting_tower.tscn
+++ b/Scenes/Towers/range_affecting_tower.tscn
@ -0,0 +1,7 @@
+[gd_scene load_steps=3 format=3 uid="uid://bi6b2r6wek7he"]
+
+[ext_resource type="PackedScene" uid="uid://dxwtlvv632ae8" path="res://Scenes/Towers/status_applying_tower.tscn" id="1_x852w"]
+[ext_resource type="Script" path="res://Scripts/Towers/range_affecting_tower.gd" id="2_wc1xf"]
+
+[node name="RangeAffectingTower" instance=ExtResource("1_x852w")]
+script = ExtResource("2_wc1xf")
--- a/Scenes/Towers/shapecast_tower.tscn
+++ b/Scenes/Towers/shapecast_tower.tscn
@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=3 uid="uid://8uxu72vjo0cv"]
+
+[ext_resource type="PackedScene" uid="uid://bvqu1heobgboe" path="res://Scenes/Towers/tower.tscn" id="1_ljc02"]
+[ext_resource type="Script" path="res://Scripts/Towers/shapecast_tower.gd" id="2_qh834"]
+
+[node name="ShapecastTower" node_paths=PackedStringArray("shapecast", "particlesystem") instance=ExtResource("1_ljc02")]
+script = ExtResource("2_qh834")
+shapecast = NodePath("Yaw/ShapeCast3D")
+particlesystem = NodePath("Yaw/ShapeCast3D/GPUParticles3D")
+status_stats = null
+
+[node name="ShapeCast3D" type="ShapeCast3D" parent="Yaw" index="0"]
+
+[node name="GPUParticles3D" type="GPUParticles3D" parent="Yaw/ShapeCast3D" index="0"]
--- a/Scenes/UI/chatbox.tscn
+++ b/Scenes/UI/chatbox.tscn
@ -1,8 +1,11 @@
-[gd_scene load_steps=2 format=3 uid="uid://ddmg342ff2qaq"]
+[gd_scene load_steps=3 format=3 uid="uid://ddmg342ff2qaq"]

 [ext_resource type="Script" path="res://Scripts/chatbox.gd" id="1_k3g22"]

-[node name="Chatbox" type="Control"]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_c3kb6"]
+bg_color = Color(0.223529, 0.211765, 0.184314, 0.462745)
+
+[node name="Chatbox" type="Control" node_paths=PackedStringArray("input_line", "textbox", "text_panel", "fade_timer")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@ -11,24 +14,32 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 script = ExtResource("1_k3g22")
+input_line = NodePath("VBoxContainer/LineEdit")
+textbox = NodePath("VBoxContainer/PanelContainer/RichTextLabel")
+text_panel = NodePath("VBoxContainer/PanelContainer")
+fade_timer = NodePath("Timer")

 [node name="VBoxContainer" type="VBoxContainer" parent="."]
-layout_mode = 1
-anchors_preset = -1
-anchor_top = 1.0
-anchor_bottom = 1.0
-offset_left = 15.0
-offset_top = -210.0
-offset_right = 350.0
-offset_bottom = -10.0
-grow_vertical = 0
+layout_mode = 2
+offset_left = 40.0
+offset_top = 100.0
+offset_right = 375.0
+offset_bottom = 300.0
 mouse_filter = 2
 alignment = 2

-[node name="RichTextLabel" type="RichTextLabel" parent="VBoxContainer"]
+[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer"]
+modulate = Color(1, 1, 1, 0)
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_styles/panel = SubResource("StyleBoxFlat_c3kb6")
+
+[node name="RichTextLabel" type="RichTextLabel" parent="VBoxContainer/PanelContainer"]
+modulate = Color(1, 1, 1, 0)
 layout_mode = 2
 size_flags_vertical = 3
 mouse_filter = 2
+bbcode_enabled = true
 scroll_following = true

 [node name="LineEdit" type="LineEdit" parent="VBoxContainer"]
@ -37,3 +48,8 @@ layout_mode = 2
 mouse_filter = 2
 context_menu_enabled = false
 selecting_enabled = false
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 3.5
+
+[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
--- a/Scenes/Weapons/shapecast_weapon.tscn
+++ b/Scenes/Weapons/shapecast_weapon.tscn
@ -0,0 +1,44 @@
+[gd_scene load_steps=7 format=3 uid="uid://dp4gfr5h0tbcd"]
+
+[ext_resource type="PackedScene" uid="uid://b7nargdyg28fj" path="res://Scenes/Weapons/weapon.tscn" id="1_gfchc"]
+[ext_resource type="Script" path="res://Scripts/Weapons/shapecast_weapon.gd" id="2_lg6v5"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_uk6ey"]
+size = Vector3(2, 2, 3)
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vi555"]
+vertex_color_use_as_albedo = true
+
+[sub_resource type="BoxMesh" id="BoxMesh_o37rs"]
+material = SubResource("StandardMaterial3D_vi555")
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sgbeo"]
+transparency = 1
+cull_mode = 1
+shading_mode = 0
+albedo_color = Color(1, 0, 0.415686, 0.223529)
+
+[node name="ShapecastWeapon" node_paths=PackedStringArray("shapecast", "range_debug_indicator", "particles") instance=ExtResource("1_gfchc")]
+script = ExtResource("2_lg6v5")
+shapecast = NodePath("ShapeCast3D")
+range_debug_indicator = NodePath("CSGSphere3D")
+status_stats = null
+particles = NodePath("ShapeCast3D/GPUParticles3D")
+
+[node name="ShapeCast3D" type="ShapeCast3D" parent="." index="2"]
+transform = Transform3D(0.984808, 0, 0.173648, 0, 1, 0, -0.173648, 0, 0.984808, 0, 0, 0)
+shape = SubResource("BoxShape3D_uk6ey")
+target_position = Vector3(0, 0, -1.5)
+collision_mask = 4
+
+[node name="GPUParticles3D" type="GPUParticles3D" parent="ShapeCast3D" index="0"]
+amount = 36
+visibility_aabb = AABB(-1.02851, -1.00566, -3.03983, 2.05703, 2.01132, 6.07966)
+draw_pass_1 = SubResource("BoxMesh_o37rs")
+
+[node name="CSGSphere3D" type="CSGSphere3D" parent="." index="3"]
+visible = false
+radius = 4.104
+radial_segments = 16
+rings = 16
+material = SubResource("StandardMaterial3D_sgbeo")
--- a/Scenes/tower_base.tscn
+++ b/Scenes/tower_base.tscn
@ -1,28 +1,27 @@
-[gd_scene load_steps=5 format=3 uid="uid://ddbbwx0yy16lh"]
+[gd_scene load_steps=6 format=3 uid="uid://ddbbwx0yy16lh"]

 [ext_resource type="Script" path="res://Scripts/tower_base.gd" id="1_tghvd"]
 [ext_resource type="Script" path="res://Scripts/inventory.gd" id="2_p5c7g"]
 [ext_resource type="Texture2D" uid="uid://ba85u6i558x4w" path="res://Assets/Textures/minimap_node.png" id="3_01hk3"]
+[ext_resource type="ArrayMesh" uid="uid://cr83c74ys8rll" path="res://textmesh.res" id="4_hosgw"]

 [sub_resource type="BoxShape3D" id="BoxShape3D_lc72v"]
+size = Vector3(1.1, 1.1, 1.1)

 [node name="Node3D" type="StaticBody3D" node_paths=PackedStringArray("inventory", "block", "collider", "minimap_icon")]
 collision_layer = 17
 script = ExtResource("1_tghvd")
 inventory = NodePath("Inventory")
-block = NodePath("CSGBox3D")
+block = NodePath("MeshInstance3D")
 collider = NodePath("CollisionShape3D")
 minimap_icon = NodePath("Sprite3D")

-[node name="CSGBox3D" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
-
 [node name="Inventory" type="Node" parent="."]
 script = ExtResource("2_p5c7g")
 max_size = 1

 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, 0)
 shape = SubResource("BoxShape3D_lc72v")

 [node name="Sprite3D" type="Sprite3D" parent="."]
@ -31,3 +30,7 @@ layers = 4
 modulate = Color(0, 1, 0, 1)
 texture_filter = 0
 texture = ExtResource("3_01hk3")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, 0)
+mesh = ExtResource("4_hosgw")
--- a/Scenes/tower_frame.tscn
+++ b/Scenes/tower_frame.tscn
@ -17,23 +17,23 @@ albedo_color = Color(0.0980392, 0.309804, 0.180392, 1)
 [node name="Node3D" type="Node3D"]

 [node name="CSGBox3D2" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, 0.525)
-size = Vector3(1, 0.04, 0.05)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, 0.575)
+size = Vector3(0.525, 0.04, 0.05)
 material = SubResource("StandardMaterial3D_xt3aj")

 [node name="CSGBox3D3" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, -0.525)
-size = Vector3(1, 0.04, 0.05)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, -0.575)
+size = Vector3(0.525, 0.04, 0.05)
 material = SubResource("StandardMaterial3D_gbm1j")

 [node name="CSGBox3D4" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.525, 0.02, 0)
-size = Vector3(0.05, 0.04, 1.1)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.575, 0.02, 0)
+size = Vector3(0.05, 0.04, 0.525)
 material = SubResource("StandardMaterial3D_18qg8")

 [node name="CSGBox3D5" type="CSGBox3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.525, 0.02, 0)
-size = Vector3(0.05, 0.04, 1.1)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.575, 0.02, 0)
+size = Vector3(0.05, 0.04, 0.525)
 material = SubResource("StandardMaterial3D_ip8b2")

 [node name="Sprite3D" type="Sprite3D" parent="."]