hit/killsounds, swimming, main menu, fixed explosion physics

10 files changed, 426 insertions, 5 deletions

diff --git a/ui/HUD.gd b/ui/HUD.gd
index 4c5506b..9bbcae1 100644
--- a/ui/HUD.gd
+++ b/ui/HUD.gd
@@ -59,6 +59,12 @@ func ui_hide_chat():
 	if !$ChatPrompt.visible:
 		$Chat.visible = false
 
+func ui_play_hitsound():
+	$AudioCues/Hitsound.play()
+	
+func ui_play_killsound():
+	$AudioCues/Killsound.play()
+
 func update_characters():
 	for btn in character_list.get_children():
 		btn.queue_free()
diff --git a/ui/HUD.tscn b/ui/HUD.tscn
index 35c6cb7..5299b14 100644
--- a/ui/HUD.tscn
+++ b/ui/HUD.tscn
@@ -1,7 +1,9 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://ui/HUD.gd" type="Script" id=1]
-[ext_resource path="res://textures/FreeMono.otf" type="DynamicFontData" id=2]
+[ext_resource path="res://theming/FreeMono.otf" type="DynamicFontData" id=2]
+[ext_resource path="res://sounds/hitsound.wav" type="AudioStream" id=3]
+[ext_resource path="res://sounds/killsound.wav" type="AudioStream" id=4]
 
 [sub_resource type="DynamicFont" id=1]
 size = 42
@@ -37,6 +39,9 @@ tracks/0/keys = {
 }
 
 [sub_resource type="DynamicFont" id=5]
+size = 22
+outline_size = 1
+outline_color = Color( 0, 0, 0, 1 )
 font_data = ExtResource( 2 )
 
 [node name="HUD" type="Control"]
@@ -190,15 +195,25 @@ margin_bottom = 543.0
 anims/close_chat = SubResource( 4 )
 
 [node name="Health" type="Label" parent="."]
-visible = false
 anchor_left = 0.018
 anchor_top = 0.954
 anchor_right = 0.129
 anchor_bottom = 0.972
+margin_left = -1.432
+margin_top = -8.40002
+margin_right = -1.43199
+margin_bottom = 3.79999
 custom_fonts/font = SubResource( 5 )
-text = "HEALTH: "
 
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+[node name="AudioCues" type="Node" parent="."]
+
+[node name="Hitsound" type="AudioStreamPlayer" parent="AudioCues"]
+stream = ExtResource( 3 )
+volume_db = 5.244
+
+[node name="Killsound" type="AudioStreamPlayer" parent="AudioCues"]
+stream = ExtResource( 4 )
+volume_db = 5.244
 
 [connection signal="pressed" from="ServerJoinMenu/JoinTeam1" to="." method="ui_join_red"]
 [connection signal="pressed" from="ServerJoinMenu/JoinTeam2" to="." method="ui_join_blue"]
diff --git a/ui/MainMenu.gd b/ui/MainMenu.gd
new file mode 100644
index 0000000..075789e
--- /dev/null
+++ b/ui/MainMenu.gd
@@ -0,0 +1,61 @@
+extends Node2D
+
+var client : NetworkedMultiplayerENet
+var world
+var local_server_tree = null
+
+func _ready():
+	world = preload("res://scenes/GameBase.tscn").instance()
+	#get_tree().connect("network_peer_connected", self, "_player_connected")
+	#get_tree().connect("network_peer_disconnected", self, "_player_disconnected")
+	get_tree().connect("connected_to_server", self, "_local_connection_successful")
+	get_tree().connect("connection_failed", self, "_connected_fail")
+	get_tree().connect("server_disconnected", world, "_connection_lost")
+	set_process(false)
+	set_physics_process(false)
+
+func to_host_menu():
+	var host_menu = preload("res://ui/servermenu/ServerUI.tscn").instance()
+	get_tree().get_root().add_child(host_menu)
+	queue_free()
+
+func to_join_menu():
+	var client_menu = preload("res://ui/clientmenu/ClientUI.tscn").instance()
+	get_tree().get_root().add_child(client_menu)
+	queue_free()
+
+func run_local_server():
+	local_server_tree = SceneTree.new()
+	local_server_tree.init()
+	local_server_tree.get_root().set_update_mode(Viewport.UPDATE_DISABLED)
+	var server_script = preload("res://scenes/Server.tscn").instance()
+
+	#CHANGE LEVEL HERE
+	server_script.start_server("Local Server", "Local Singleplayer Server", 3, "res://maps/Main.tscn", "127.0.0.1", 25565, local_server_tree, null, "print")
+	set_process(true)
+	set_physics_process(true)
+	client = NetworkedMultiplayerENet.new()
+	client.create_client("127.0.0.1", 25565)
+	get_tree().set_network_peer(client)
+
+func _local_connection_failed():
+	pass
+
+func _local_connection_successful():
+	get_tree().get_root().add_child(world)
+	world.client = client
+	world.client_id = get_tree().get_network_unique_id()
+	world.player_name = "Player"
+	world.is_local = true
+	world.local_server_tree = local_server_tree
+	print("Connected to local server.")
+	queue_free()
+
+func _process(delta):
+	local_server_tree.idle(delta)
+
+func _physics_process(delta):
+	local_server_tree.iteration(delta)
+
+func quit_game():
+	get_tree().quit()
diff --git a/ui/MainMenu.tscn b/ui/MainMenu.tscn
new file mode 100644
index 0000000..4cd993a
--- /dev/null
+++ b/ui/MainMenu.tscn
@@ -0,0 +1,44 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://theming/menu_font.tres" type="DynamicFont" id=1]
+[ext_resource path="res://ui/MainMenu.gd" type="Script" id=2]
+
+[node name="MainMenu" type="Node2D"]
+script = ExtResource( 2 )
+
+[node name="HostButton" type="Button" parent="."]
+margin_left = 83.0
+margin_top = 73.0
+margin_right = 236.0
+margin_bottom = 109.0
+custom_fonts/font = ExtResource( 1 )
+text = "Host Server"
+
+[node name="JoinButton" type="Button" parent="."]
+margin_left = 84.0
+margin_top = 121.0
+margin_right = 235.0
+margin_bottom = 157.0
+custom_fonts/font = ExtResource( 1 )
+text = "Join Server"
+
+[node name="LocalButton" type="Button" parent="."]
+margin_left = 84.0
+margin_top = 168.0
+margin_right = 235.0
+margin_bottom = 204.0
+custom_fonts/font = ExtResource( 1 )
+text = "Local Server"
+
+[node name="QuitButton" type="Button" parent="."]
+margin_left = 117.0
+margin_top = 226.0
+margin_right = 192.0
+margin_bottom = 246.0
+custom_fonts/font = ExtResource( 1 )
+text = "QUIT"
+
+[connection signal="pressed" from="HostButton" to="." method="to_host_menu"]
+[connection signal="pressed" from="JoinButton" to="." method="to_join_menu"]
+[connection signal="pressed" from="LocalButton" to="." method="run_local_server"]
+[connection signal="pressed" from="QuitButton" to="." method="quit_game"]
diff --git a/ui/clientmenu/ClientUI.gd b/ui/clientmenu/ClientUI.gd
new file mode 100644
index 0000000..8b9fbcc
--- /dev/null
+++ b/ui/clientmenu/ClientUI.gd
@@ -0,0 +1,59 @@
+extends Node2D
+
+var client : NetworkedMultiplayerENet
+var world
+var local_server_tree = null
+var is_local = false
+
+func _ready():
+	world = preload("res://scenes/GameBase.tscn").instance()
+	#get_tree().connect("network_peer_connected", self, "_player_connected")
+	#get_tree().connect("network_peer_disconnected", self, "_player_disconnected")
+	get_tree().connect("connected_to_server", self, "_connection_successful")
+	get_tree().connect("connection_failed", self, "_connected_fail")
+	get_tree().connect("server_disconnected", world, "_connection_lost")
+	set_process(false)
+	set_physics_process(false)
+	
+func _connect_btn():
+	client = NetworkedMultiplayerENet.new()
+	client.create_client($IP.text, $Port.value)
+	
+	get_tree().set_network_peer(client)
+	
+func _connection_successful():
+	get_tree().get_root().add_child(world)
+	world.client = client
+	world.client_id = get_tree().get_network_unique_id()
+	world.player_name = $Name.text
+	if is_local:
+		world.is_local = true
+		world.local_server_tree = local_server_tree
+	print("Connected.")
+	queue_free()
+
+func _run_local_server():
+	local_server_tree = SceneTree.new()
+	local_server_tree.init()
+	local_server_tree.get_root().set_update_mode(Viewport.UPDATE_DISABLED)
+	var server_script = preload("res://scenes/Server.tscn").instance()
+
+	#CHANGE LEVEL HERE
+	server_script.start_server("Local Server", "Local Singleplayer Server", 3, "res://maps/Main.tscn", "127.0.0.1", 25565, local_server_tree, null, "print")
+	set_process(true)
+	set_physics_process(true)
+	is_local = true
+	client = NetworkedMultiplayerENet.new()
+	client.create_client("127.0.0.1", 25565)
+	get_tree().set_network_peer(client)
+
+func back_to_main():
+	var main_menu = load("res://ui/MainMenu.tscn").instance()
+	get_tree().get_root().add_child(main_menu)
+	queue_free()
+
+func _process(delta):
+	local_server_tree.idle(delta)
+
+func _physics_process(delta):
+	local_server_tree.iteration(delta)
diff --git a/ui/clientmenu/ClientUI.tscn b/ui/clientmenu/ClientUI.tscn
new file mode 100644
index 0000000..6df552b
--- /dev/null
+++ b/ui/clientmenu/ClientUI.tscn
@@ -0,0 +1,45 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://ui/clientmenu/ClientUI.gd" type="Script" id=1]
+
+[node name="ClientUI" type="Node2D"]
+script = ExtResource( 1 )
+
+[node name="IP" type="LineEdit" parent="."]
+margin_left = 16.0
+margin_top = 64.0
+margin_right = 112.0
+margin_bottom = 88.0
+text = "127.0.0.1"
+
+[node name="Port" type="SpinBox" parent="."]
+margin_left = 128.0
+margin_top = 64.0
+margin_right = 202.0
+margin_bottom = 88.0
+max_value = 65536.0
+value = 25565.0
+
+[node name="Name" type="LineEdit" parent="."]
+margin_left = 16.0
+margin_top = 96.0
+margin_right = 199.0
+margin_bottom = 120.0
+text = "PlayerName"
+
+[node name="ConnectButton" type="Button" parent="."]
+margin_left = 16.0
+margin_top = 128.0
+margin_right = 202.0
+margin_bottom = 153.0
+text = "Connect"
+
+[node name="BackButton" type="Button" parent="."]
+margin_left = 16.0
+margin_top = 16.0
+margin_right = 80.0
+margin_bottom = 36.0
+text = "Back"
+
+[connection signal="pressed" from="ConnectButton" to="." method="_connect_btn"]
+[connection signal="pressed" from="BackButton" to="." method="back_to_main"]
diff --git a/ui/servermenu/CmdPrompt.gd b/ui/servermenu/CmdPrompt.gd
new file mode 100644
index 0000000..965631b
--- /dev/null
+++ b/ui/servermenu/CmdPrompt.gd
@@ -0,0 +1,26 @@
+extends LineEdit
+
+export var console_path := @""; onready var console := get_node(console_path) as ScrollContainer
+var server_ref = null
+var ui_ref = null
+
+func enter_cmd(new_text: String):
+	console.add_line(new_text)
+	text = ""
+	if new_text.substr(0,1) == "/": #PROCESS COMMAND
+		var end_ind = new_text.find(" ")-1
+		if end_ind < -1: end_ind = -1 
+		var cmd : String = new_text.substr(1, end_ind)
+		var args = new_text.substr(end_ind+1, -1).split(" ", false)
+		
+		if cmd == "say":
+			if server_ref != null:
+				var m_args = {"name" : "SERVER", "msg" : args.join(" ")}
+				server_ref._send_chat(m_args)
+		elif cmd == "start":
+			if server_ref == null:
+				ui_ref.start_server()
+		elif cmd == "stop":
+			if server_ref != null:
+				ui_ref.stop_server()
+		
diff --git a/ui/servermenu/Console.gd b/ui/servermenu/Console.gd
new file mode 100644
index 0000000..ac73525
--- /dev/null
+++ b/ui/servermenu/Console.gd
@@ -0,0 +1,14 @@
+extends ScrollContainer
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass
+
+func add_line(text):
+	var lbl = Label.new()
+	lbl.autowrap = true
+	lbl.text = text
+	text = ""
+	$ConsoleLines.add_child(lbl)
+	yield(get_tree().create_timer(0.05), "timeout")
+	ensure_control_visible(lbl)
diff --git a/ui/servermenu/ServerUI.gd b/ui/servermenu/ServerUI.gd
new file mode 100644
index 0000000..d065b21
--- /dev/null
+++ b/ui/servermenu/ServerUI.gd
@@ -0,0 +1,43 @@
+extends Node2D
+
+
+var server
+onready var console = get_node("Console")
+
+var is_running :bool = false
+
+func _ready():
+	$CmdPrompt.ui_ref = self
+
+func hide_init_fields():
+	for node in get_tree().get_nodes_in_group("init_fields"):
+		node.visible = false
+	$StopButton.visible = true
+
+func show_init_fields():
+	for node in get_tree().get_nodes_in_group("init_fields"):
+		node.visible = true
+	$StopButton.visible = false
+
+func start_server():
+	console.add_line("Server starting...")
+	is_running = true
+	
+	server = preload("res://scenes/Server.tscn").instance()
+	$CmdPrompt.server_ref = server
+	server.start_server($ServerName.text, $MOTD.text, $PlayerCount.value, $MapPath.text, $IP.text, $Port.value, get_tree(), console, "add_line")
+	
+	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
+	hide_init_fields()
+	
+func stop_server():
+	server.stop_server()
+	is_running = false
+	$CmdPrompt.server_ref = null
+	
+	show_init_fields()
+
+func back_to_main():
+	var main_menu = load("res://ui/MainMenu.tscn").instance()
+	get_tree().get_root().add_child(main_menu)
+	queue_free()
diff --git a/ui/servermenu/ServerUI.tscn b/ui/servermenu/ServerUI.tscn
new file mode 100644
index 0000000..f7ed009
--- /dev/null
+++ b/ui/servermenu/ServerUI.tscn
@@ -0,0 +1,108 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://ui/servermenu/CmdPrompt.gd" type="Script" id=1]
+[ext_resource path="res://ui/servermenu/Console.gd" type="Script" id=2]
+[ext_resource path="res://ui/servermenu/ServerUI.gd" type="Script" id=4]
+
+[sub_resource type="StyleBoxFlat" id=1]
+bg_color = Color( 0.0705882, 0.0705882, 0.0705882, 1 )
+
+[node name="ServerUI" type="Node2D"]
+script = ExtResource( 4 )
+
+[node name="StartButton" type="Button" parent="." groups=["init_fields"]]
+margin_left = 24.0
+margin_top = 56.0
+margin_right = 109.0
+margin_bottom = 76.0
+text = "Start Server"
+
+[node name="BackButton" type="Button" parent="." groups=["init_fields"]]
+margin_left = 24.0
+margin_top = 24.0
+margin_right = 112.0
+margin_bottom = 44.0
+text = "Back"
+
+[node name="StopButton" type="Button" parent="."]
+visible = false
+margin_left = 24.0
+margin_top = 88.0
+margin_right = 108.0
+margin_bottom = 108.0
+text = "Stop Server"
+
+[node name="MapPath" type="LineEdit" parent="." groups=["init_fields"]]
+margin_left = 120.0
+margin_top = 24.0
+margin_right = 337.0
+margin_bottom = 48.0
+text = "res://maps/Main.tscn"
+
+[node name="Console" type="ScrollContainer" parent="."]
+margin_left = 588.0
+margin_top = 19.0
+margin_right = 1004.0
+margin_bottom = 383.0
+custom_styles/bg = SubResource( 1 )
+scroll_horizontal_enabled = false
+script = ExtResource( 2 )
+
+[node name="ConsoleLines" type="VBoxContainer" parent="Console"]
+margin_right = 406.0
+margin_bottom = 14.0
+
+[node name="Label" type="Label" parent="Console/ConsoleLines"]
+margin_right = 406.0
+margin_bottom = 14.0
+text = "----------------------------------CONSOLE-----------------------------------"
+
+[node name="CmdPrompt" type="LineEdit" parent="."]
+margin_left = 588.0
+margin_top = 402.0
+margin_right = 1004.0
+margin_bottom = 426.0
+script = ExtResource( 1 )
+console_path = NodePath("../Console")
+
+[node name="PlayerCount" type="SpinBox" parent="." groups=["init_fields"]]
+margin_left = 344.0
+margin_top = 24.0
+margin_right = 418.0
+margin_bottom = 48.0
+min_value = 1.0
+value = 4.0
+
+[node name="Port" type="SpinBox" parent="." groups=["init_fields"]]
+margin_left = 264.0
+margin_top = 56.0
+margin_right = 338.0
+margin_bottom = 80.0
+max_value = 65536.0
+value = 25565.0
+
+[node name="IP" type="LineEdit" parent="." groups=["init_fields"]]
+margin_left = 120.0
+margin_top = 56.0
+margin_right = 250.0
+margin_bottom = 80.0
+text = "127.0.0.1"
+
+[node name="MOTD" type="TextEdit" parent="." groups=["init_fields"]]
+margin_left = 120.0
+margin_top = 120.0
+margin_right = 337.0
+margin_bottom = 160.0
+text = "MOTD"
+
+[node name="ServerName" type="LineEdit" parent="." groups=["init_fields"]]
+margin_left = 120.0
+margin_top = 88.0
+margin_right = 337.0
+margin_bottom = 112.0
+text = "Server Name"
+
+[connection signal="pressed" from="StartButton" to="." method="start_server"]
+[connection signal="pressed" from="BackButton" to="." method="back_to_main"]
+[connection signal="pressed" from="StopButton" to="." method="stop_server"]
+[connection signal="text_entered" from="CmdPrompt" to="CmdPrompt" method="enter_cmd"]