diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd
index 076f12f..3293072 100644
--- a/source/assets/scripts/player_handlers/player_body_handler.gd
+++ b/source/assets/scripts/player_handlers/player_body_handler.gd
@@ -34,6 +34,7 @@ onready var sprite = $player_sprite
onready var reload_timer = $reload_timer
onready var shoot_point = $"weaponHolder/Player-character-theme-gun/shoot_point"
onready var hit_timer = $hit_timer
+onready var player_sprite_dead = $player_sprite_dead
var bullet_env = {
@@ -94,7 +95,7 @@ func _ready():
weaponPositionalOffset = Vector2(-$"weaponHolder/Player-character-theme-gun-na3".texture.get_width() * $"weaponHolder/Player-character-theme-gun-na3".scale.x / 2,-$"weaponHolder/Player-character-theme-gun-na3".texture.get_height() * $"weaponHolder/Player-character-theme-gun-na3".scale.y / 2) + Vector2(-$weaponHolder.get_shape().get_radius(), 0)
$"weaponHolder/Player-character-theme-gun".position = weaponPositionalOffset
-
+ player_sprite_dead.hide()
# warning-ignore:return_value_discarded
get_tree().connect("network_peer_connected", self, "_network_peer_connected")
username_text_instance = Global.instance_node_at_location(username_text, PersistentNodes, global_position)
diff --git a/source/assets/scripts/server_handlers/network_processors/network_setup.gd b/source/assets/scripts/server_handlers/network_processors/network_setup.gd
index bf9b4de..81b3541 100644
--- a/source/assets/scripts/server_handlers/network_processors/network_setup.gd
+++ b/source/assets/scripts/server_handlers/network_processors/network_setup.gd
@@ -60,6 +60,8 @@ func _ready() -> void:
func _process(_delta: float) -> void:
+ if Input.is_action_just_pressed("esc") and controls.is_visible_in_tree():
+ _on_return_pressed()
if Input.is_action_just_pressed("esc") and username.is_visible_in_tree():
username.hide()
controls.show()
diff --git a/source/assets/scripts/ui_element_handlers/menu_button.gd b/source/assets/scripts/ui_element_handlers/menu_button.gd
index 105f61d..d869f98 100644
--- a/source/assets/scripts/ui_element_handlers/menu_button.gd
+++ b/source/assets/scripts/ui_element_handlers/menu_button.gd
@@ -2,13 +2,12 @@ extends TextureButton
func _process(_delta) -> void:
- if Input.is_action_just_pressed("esc") and get_tree().get_current_scene().get_child(2).get_children() == []:
-# warning-ignore:return_value_discarded
- Global.instance_node(load("res://source/scenes/OVERLAY/elements/menu_button_overlay.tscn"), Global.ui)
- elif Input.is_action_just_pressed("esc") and get_tree().get_current_scene().get_child(2).get_children() != [] and not get_tree().get_current_scene().get_child(2).get_child(0).is_visible_in_tree():
- get_tree().get_current_scene().get_child(2).get_child(0).show()
- elif Input.is_action_just_pressed("esc") and get_tree().get_current_scene().get_child(2).get_children() != [] and get_tree().get_current_scene().get_child(2).get_child(0).is_visible_in_tree():
- get_tree().get_current_scene().get_child(2).get_child(0).hide()
+ if get_tree().get_current_scene().get_name() == "network_setup":
+ if Input.is_action_just_pressed("esc") and get_tree().get_current_scene().get_child(2).get_children() == [] and not get_tree().get_current_scene().get_child(1).is_visible_in_tree():
+ Global.instance_node(load("res://source/scenes/OVERLAY/elements/menu_button_overlay.tscn"), Global.ui)
+ else:
+ if Input.is_action_just_pressed("esc") and get_tree().get_current_scene().get_child(2).get_children() == []:
+ Global.instance_node(load("res://source/scenes/OVERLAY/elements/menu_button_overlay.tscn"), Global.ui)
func _on_menu_button_pressed():
diff --git a/source/assets/scripts/ui_element_handlers/menu_button_overlay.gd b/source/assets/scripts/ui_element_handlers/menu_button_overlay.gd
index c5658da..836bab6 100644
--- a/source/assets/scripts/ui_element_handlers/menu_button_overlay.gd
+++ b/source/assets/scripts/ui_element_handlers/menu_button_overlay.gd
@@ -1,8 +1,13 @@
extends Control
+func _process(_delta) -> void:
+ if Input.is_action_just_pressed("esc") and is_visible_in_tree():
+ queue_free()
+
+
func _on_return_to_game_pressed():
- hide()
+ queue_free()
func _on_return_to_main_menu_pressed():
diff --git a/source/assets/sprites/character/menu_player/tank.svg b/source/assets/sprites/character/menu_player/tank.svg
deleted file mode 100644
index d8b61c1..0000000
--- a/source/assets/sprites/character/menu_player/tank.svg
+++ /dev/null
@@ -1,826 +0,0 @@
-
-
diff --git a/source/assets/sprites/character/player/player_dead/Player-character-theme-05.svg b/source/assets/sprites/character/player/player_dead/Player-character-theme-05.svg
new file mode 100644
index 0000000..6f1ac00
--- /dev/null
+++ b/source/assets/sprites/character/player/player_dead/Player-character-theme-05.svg
@@ -0,0 +1,796 @@
+
+
diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn
index ee90c29..2cfb03f 100644
--- a/source/entities/player/player_node.tscn
+++ b/source/entities/player/player_node.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=175 format=2]
+[gd_scene load_steps=176 format=2]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/na/Player-character-theme-01.png" type="Texture" id=1]
[ext_resource path="res://source/assets/scripts/player_handlers/player_collider_handler.gd" type="Script" id=2]
@@ -15,6 +15,7 @@
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 7.png" type="Texture" id=13]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 12.png" type="Texture" id=14]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 10.png" type="Texture" id=15]
+[ext_resource path="res://source/assets/sprites/character/player/player_dead/Player-character-theme-05.svg" type="Texture" id=16]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 18.png" type="Texture" id=18]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/right_r/Player-character-theme-01_anim-idle – 34.png" type="Texture" id=19]
[ext_resource path="res://source/assets/sprites/character/player/theme/01/animation/left_r/Player-character-theme-01_anim-idle – 17.png" type="Texture" id=20]
@@ -175,11 +176,6 @@
animations = [ {
"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
"loop": true,
-"name": "move-speed-left-01",
-"speed": 35.0
-}, {
-"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
-"loop": true,
"name": "boost-speed-left-01",
"speed": 50.0
}, {
@@ -267,6 +263,11 @@ animations = [ {
"loop": true,
"name": "move-speed-right-02",
"speed": 35.0
+}, {
+"frames": [ ExtResource( 48 ), ExtResource( 4 ), ExtResource( 3 ), ExtResource( 46 ), ExtResource( 47 ), ExtResource( 32 ), ExtResource( 13 ), ExtResource( 40 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 22 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 37 ), ExtResource( 23 ), ExtResource( 39 ), ExtResource( 20 ), ExtResource( 18 ), ExtResource( 7 ), ExtResource( 34 ) ],
+"loop": true,
+"name": "move-speed-left-01",
+"speed": 35.0
} ]
[sub_resource type="RectangleShape2D" id=3]
@@ -297,11 +298,6 @@ radius = 41.5403
[sub_resource type="SpriteFrames" id=6]
animations = [ {
-"frames": [ ExtResource( 169 ) ],
-"loop": true,
-"name": "04",
-"speed": 5.0
-}, {
"frames": [ ExtResource( 170 ) ],
"loop": true,
"name": "02",
@@ -316,6 +312,11 @@ animations = [ {
"loop": true,
"name": "03",
"speed": 5.0
+}, {
+"frames": [ ExtResource( 169 ) ],
+"loop": true,
+"name": "04",
+"speed": 5.0
} ]
[node name="player" type="KinematicBody2D" groups=[
@@ -385,6 +386,10 @@ position = Vector2( -120, 0 )
rotation = 3.14159
scale = Vector2( 4, 4 )
+[node name="player_sprite_dead" type="Sprite" parent="."]
+visible = false
+texture = ExtResource( 16 )
+
[connection signal="timeout" from="network_tick_rate" to="." method="_on_network_tick_rate_timeout"]
[connection signal="timeout" from="reload_timer" to="." method="_on_reload_timer_timeout"]
[connection signal="timeout" from="hit_timer" to="." method="_on_hit_timer_timeout"]
diff --git a/source/scenes/GUI/network_setup.tscn b/source/scenes/GUI/network_setup.tscn
index c16130f..e7cc22c 100644
--- a/source/scenes/GUI/network_setup.tscn
+++ b/source/scenes/GUI/network_setup.tscn
@@ -15,23 +15,23 @@
[ext_resource path="res://source/scenes/OVERLAY/elements/wall.tscn" type="PackedScene" id=13]
[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/server_title.svg" type="Texture" id=14]
-[sub_resource type="DynamicFont" id=8]
+[sub_resource type="DynamicFont" id=1]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
-[sub_resource type="StyleBoxEmpty" id=9]
+[sub_resource type="StyleBoxEmpty" id=2]
-[sub_resource type="StyleBoxEmpty" id=10]
+[sub_resource type="StyleBoxEmpty" id=3]
-[sub_resource type="DynamicFont" id=11]
+[sub_resource type="DynamicFont" id=4]
size = 36
use_mipmaps = true
use_filter = true
font_data = ExtResource( 2 )
-[sub_resource type="DynamicFont" id=12]
+[sub_resource type="DynamicFont" id=5]
size = 36
use_mipmaps = true
use_filter = true
@@ -186,7 +186,7 @@ margin_left = -225.0
margin_top = -25.0
margin_right = -225.0
margin_bottom = -25.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Enter your username"
align = 1
@@ -218,9 +218,9 @@ margin_left = -175.0
margin_top = -28.0
margin_right = 175.0
margin_bottom = 28.0
-custom_styles/focus = SubResource( 9 )
-custom_styles/normal = SubResource( 10 )
-custom_fonts/font = SubResource( 11 )
+custom_styles/focus = SubResource( 2 )
+custom_styles/normal = SubResource( 3 )
+custom_fonts/font = SubResource( 4 )
custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 )
align = 1
placeholder_text = "username"
@@ -242,7 +242,7 @@ margin_bottom = 97.0
[node name="Label" type="Label" parent="multiplayer_configure/popup_screen/panel/confirm"]
anchor_right = 1.0
anchor_bottom = 1.0
-custom_fonts/font = SubResource( 12 )
+custom_fonts/font = SubResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "CONFIRM"
align = 1