Correctly configured 'esc' button

This commit is contained in:
Kristofers Solo 2021-11-15 19:08:38 +02:00
parent f3a5b899e7
commit 142a93f5e2
8 changed files with 838 additions and 856 deletions

View File

@ -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)

View File

@ -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()

View File

@ -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():

View File

@ -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():

View File

@ -1,826 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="189"
height="171"
viewBox="0 0 189 171"
version="1.1"
id="svg130"
sodipodi:docname="tank.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview132"
pagecolor="#505050"
bordercolor="#ffffff"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
showgrid="false"
inkscape:zoom="1.0559662"
inkscape:cx="392.53149"
inkscape:cy="360.33349"
inkscape:window-width="1920"
inkscape:window-height="1007"
inkscape:window-x="1920"
inkscape:window-y="44"
inkscape:window-maximized="1"
inkscape:current-layer="svg130" />
<defs
id="defs8">
<clipPath
id="clip-path">
<rect
width="551"
height="75"
fill="none"
id="rect2"
x="0"
y="0" />
</clipPath>
<clipPath
id="clip-Tank">
<rect
width="630"
height="596.60999"
id="rect5"
x="0"
y="0" />
</clipPath>
</defs>
<g
id="Tank"
clip-path="url(#clip-Tank)"
transform="scale(0.3,0.28661941)">
<g
id="Group_44"
data-name="Group 44">
<g
id="Gun"
transform="rotate(47,48.341,111.17669)">
<rect
id="Rectangle_40"
data-name="Rectangle 40"
width="188"
height="66"
transform="translate(58,15)"
fill="#7a9ff6"
x="0"
y="0" />
<rect
id="Rectangle_39"
data-name="Rectangle 39"
width="58"
height="85"
transform="translate(188,15)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_41"
data-name="Rectangle 41"
width="58"
height="100"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_42"
data-name="Rectangle 42"
width="130"
height="31"
transform="translate(58,50)"
fill="rgba(0,0,0,0.11)"
x="0"
y="0" />
<rect
id="Rectangle_43"
data-name="Rectangle 43"
width="58"
height="31"
transform="translate(188,69)"
fill="rgba(0,0,0,0.11)"
x="0"
y="0" />
<rect
id="Rectangle_44"
data-name="Rectangle 44"
width="58"
height="31"
transform="translate(0,69)"
fill="rgba(0,0,0,0.11)"
x="0"
y="0" />
<rect
id="Rectangle_46"
data-name="Rectangle 46"
width="96"
height="13"
rx="6.5"
transform="translate(80.507,21.57)"
fill="#ffffff"
x="0"
y="0" />
</g>
<g
id="Top"
transform="translate(-185,-103.387)">
<path
id="Rectangle_28"
data-name="Rectangle 28"
d="M 139,0 H 360 V 182 H 0 V 139 A 139,139 0 0 1 139,0 Z"
transform="translate(329,279)"
fill="#89d9e2" />
<path
id="Rectangle_29"
data-name="Rectangle 29"
d="m 12,0 h 152 a 12,12 0 0 1 12,12 v 0 H 0 v 0 A 12,12 0 0 1 12,0 Z"
transform="translate(488,267)"
fill="#432f51" />
<path
id="Rectangle_30"
data-name="Rectangle 30"
d="M 11,0 V 0 A 11,11 0 0 1 22,11 V 25 H 0 V 11 A 11,11 0 0 1 11,0 Z"
transform="translate(621,242)"
fill="#61d6a8" />
<rect
id="Rectangle_31"
data-name="Rectangle 31"
width="217"
height="16"
rx="8"
transform="translate(435,310)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_32"
data-name="Rectangle 32"
width="15"
height="16"
rx="7.5"
transform="translate(420,344)"
fill="#2f397b"
x="0"
y="0" />
<rect
id="Rectangle_33"
data-name="Rectangle 33"
width="15"
height="16"
rx="7.5"
transform="translate(455,344)"
fill="#2f397b"
x="0"
y="0" />
<rect
id="Rectangle_34"
data-name="Rectangle 34"
width="15"
height="16"
rx="7.5"
transform="translate(491,344)"
fill="#2f397b"
x="0"
y="0" />
<rect
id="Rectangle_35"
data-name="Rectangle 35"
width="15"
height="16"
rx="7.5"
transform="translate(526,344)"
fill="#2f397b"
x="0"
y="0" />
<rect
id="Rectangle_36"
data-name="Rectangle 36"
width="15"
height="16"
rx="7.5"
transform="translate(561,344)"
fill="#2f397b"
x="0"
y="0" />
<rect
id="Rectangle_37"
data-name="Rectangle 37"
width="15"
height="16"
rx="7.5"
transform="translate(596,344)"
fill="#2f397b"
x="0"
y="0" />
<rect
id="Rectangle_38"
data-name="Rectangle 38"
width="15"
height="16"
rx="7.5"
transform="translate(631,344)"
fill="#2f397b"
x="0"
y="0" />
</g>
<g
id="Base"
transform="translate(-185,-103.387)">
<g
id="Rectangle_1"
data-name="Rectangle 1"
transform="translate(200,600)"
fill="#432f51"
stroke="#61d6a8"
stroke-width="8">
<path
d="m 0,0 h 600 v 25 a 75,75 0 0 1 -75,75 H 75 A 75,75 0 0 1 0,25 Z"
stroke="none"
id="path30" />
<path
d="m 8,4 h 584 a 4,4 0 0 1 4,4 V 25 A 71,71 0 0 1 525,96 H 75 A 71,71 0 0 1 4,25 V 8 A 4,4 0 0 1 8,4 Z"
fill="none"
id="path32" />
</g>
<g
id="Repeat_Grid_1"
data-name="Repeat Grid 1"
transform="translate(225,607)"
clip-path="url(#clip-path)">
<g
transform="translate(-257,-601)"
id="g40">
<g
id="Ellipse_2"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#7a9ff6"
stroke="#61d6a8"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle35" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle37" />
</g>
</g>
<g
transform="translate(-162,-601)"
id="g47">
<g
id="Ellipse_2-2"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#7a9ff6"
stroke="#61d6a8"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle42" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle44" />
</g>
</g>
<g
transform="translate(-67,-601)"
id="g54">
<g
id="Ellipse_2-3"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#7a9ff6"
stroke="#61d6a8"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle49" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle51" />
</g>
</g>
<g
transform="translate(28,-601)"
id="g61">
<g
id="Ellipse_2-4"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#7a9ff6"
stroke="#61d6a8"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle56" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle58" />
</g>
</g>
<g
transform="translate(123,-601)"
id="g68">
<g
id="Ellipse_2-5"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#7a9ff6"
stroke="#61d6a8"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle63" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle65" />
</g>
</g>
<g
transform="translate(218,-601)"
id="g75">
<g
id="Ellipse_2-6"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#7a9ff6"
stroke="#61d6a8"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle70" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle72" />
</g>
</g>
</g>
<circle
id="Ellipse_3"
data-name="Ellipse 3"
cx="8"
cy="8"
r="8"
transform="translate(397,671)"
fill="#61d6a8" />
<circle
id="Ellipse_4"
data-name="Ellipse 4"
cx="8"
cy="8"
r="8"
transform="translate(302,671)"
fill="#61d6a8" />
<circle
id="Ellipse_5"
data-name="Ellipse 5"
cx="8"
cy="8"
r="8"
transform="translate(492,671)"
fill="#61d6a8" />
<circle
id="Ellipse_6"
data-name="Ellipse 6"
cx="8"
cy="8"
r="8"
transform="translate(587,671)"
fill="#61d6a8" />
<circle
id="Ellipse_7"
data-name="Ellipse 7"
cx="8"
cy="8"
r="8"
transform="translate(682,671)"
fill="#61d6a8" />
<rect
id="Rectangle_10"
data-name="Rectangle 10"
width="630"
height="65"
transform="translate(185,549)"
fill="#ffffff"
x="0"
y="0" />
<rect
id="Rectangle_11"
data-name="Rectangle 11"
width="630"
height="65"
transform="translate(185,576)"
fill="rgba(0,0,0,0.22)"
x="0"
y="0" />
<rect
id="Rectangle_2"
data-name="Rectangle 2"
width="30"
height="65"
transform="translate(185,549)"
fill="#89d9e2"
x="0"
y="0" />
<rect
id="Rectangle_4"
data-name="Rectangle 4"
width="111"
height="65"
transform="translate(215,549)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_5"
data-name="Rectangle 5"
width="111"
height="65"
transform="translate(437,549)"
fill="#7a9ff6"
x="0"
y="0" />
<rect
id="Rectangle_6"
data-name="Rectangle 6"
width="111"
height="65"
transform="translate(326,549)"
fill="#89d9e2"
x="0"
y="0" />
<rect
id="Rectangle_7"
data-name="Rectangle 7"
width="111"
height="65"
transform="translate(659,549)"
fill="#7a9ff6"
x="0"
y="0" />
<rect
id="Rectangle_8"
data-name="Rectangle 8"
width="111"
height="65"
transform="translate(548,549)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_9"
data-name="Rectangle 9"
width="45"
height="65"
transform="translate(770,549)"
fill="#89d9e2"
x="0"
y="0" />
<circle
id="Ellipse_8"
data-name="Ellipse 8"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(306,555)"
fill="#432f51" />
<circle
id="Ellipse_9"
data-name="Ellipse 9"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(306,598)"
fill="#432f51" />
<circle
id="Ellipse_10"
data-name="Ellipse 10"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(419,555)"
fill="#61d6a8" />
<circle
id="Ellipse_11"
data-name="Ellipse 11"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(419,598)"
fill="#61d6a8" />
<circle
id="Ellipse_12"
data-name="Ellipse 12"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,556)"
fill="#fb8168" />
<circle
id="Ellipse_13"
data-name="Ellipse 13"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,599)"
fill="#fb8168" />
<circle
id="Ellipse_14"
data-name="Ellipse 14"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,556)"
fill="#89d9e2" />
<circle
id="Ellipse_15"
data-name="Ellipse 15"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,599)"
fill="#89d9e2" />
<circle
id="Ellipse_16"
data-name="Ellipse 16"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(641,557)"
fill="#89d9e2" />
<circle
id="Ellipse_17"
data-name="Ellipse 17"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(641,600)"
fill="#89d9e2" />
<circle
id="Ellipse_18"
data-name="Ellipse 18"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(753,557)"
fill="#432f51" />
<circle
id="Ellipse_19"
data-name="Ellipse 19"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(753,600)"
fill="#432f51" />
<path
id="Path_2"
data-name="Path 2"
d="M 0,0 H 364.806 V 24.994 H 417 V 140 H 0 Z"
transform="translate(348,409)"
fill="#61d6a8" />
<path
id="Path_1"
data-name="Path 1"
d="M 57.448,0 H 365.5 V 103.912 H 0 Z"
transform="translate(238,445.088)"
fill="#89d9e2" />
<rect
id="Rectangle_12"
data-name="Rectangle 12"
width="320"
height="12"
transform="translate(295,433)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_13"
data-name="Rectangle 13"
width="12"
height="89"
transform="translate(603,433)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_14"
data-name="Rectangle 14"
width="102"
height="27"
transform="translate(603,522)"
fill="#89d9e2"
x="0"
y="0" />
<rect
id="Rectangle_15"
data-name="Rectangle 15"
width="60"
height="11"
transform="translate(705,480)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_16"
data-name="Rectangle 16"
width="60"
height="58"
transform="translate(705,491)"
fill="#89d9e2"
x="0"
y="0" />
<rect
id="Rectangle_17"
data-name="Rectangle 17"
width="102"
height="11"
transform="translate(603,511)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_18"
data-name="Rectangle 18"
width="60"
height="24"
transform="translate(740,525)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_19"
data-name="Rectangle 19"
width="630"
height="5"
transform="translate(185,544)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_20"
data-name="Rectangle 20"
width="320"
height="12"
transform="translate(393,397)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_21"
data-name="Rectangle 21"
width="90"
height="99"
transform="translate(345,445)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_22"
data-name="Rectangle 22"
width="90"
height="99"
transform="translate(513,445)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_23"
data-name="Rectangle 23"
width="48"
height="16"
rx="8"
transform="translate(452,471)"
fill="#432f51"
x="0"
y="0" />
<rect
id="Rectangle_24"
data-name="Rectangle 24"
width="48"
height="16"
rx="8"
transform="translate(329,497)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_25"
data-name="Rectangle 25"
width="48"
height="16"
rx="8"
transform="translate(315,471)"
fill="#61d6a8"
x="0"
y="0" />
<rect
id="Rectangle_26"
data-name="Rectangle 26"
width="48"
height="16"
rx="8"
transform="translate(488,517)"
fill="#89d9e2"
x="0"
y="0" />
<rect
id="Rectangle_27"
data-name="Rectangle 27"
width="48"
height="16"
rx="8"
transform="translate(424,492)"
fill="#61d6a8"
x="0"
y="0" />
<circle
id="Ellipse_20"
data-name="Ellipse 20"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(715,520)"
fill="#61d6a8" />
<circle
id="Ellipse_21"
data-name="Ellipse 21"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(715,505)"
fill="#61d6a8" />
</g>
<rect
id="Rectangle_45"
data-name="Rectangle 45"
width="74"
height="13"
rx="6.5"
transform="translate(272,184.613)"
fill="#ffffff"
x="0"
y="0" />
<rect
id="Rectangle_47"
data-name="Rectangle 47"
width="109"
height="13"
rx="6.5"
transform="translate(380,184.613)"
fill="#ffffff"
x="0"
y="0" />
<rect
id="Rectangle_48"
data-name="Rectangle 48"
width="122"
height="13"
rx="6.5"
transform="translate(132,351.613)"
fill="#ffffff"
x="0"
y="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 21 KiB

View File

@ -0,0 +1,796 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="165"
height="103.05"
viewBox="0 0 165 103.05"
version="1.1"
id="svg125"
sodipodi:docname="Player-character-theme-05.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview127"
pagecolor="#505050"
bordercolor="#ffffff"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
showgrid="false"
inkscape:zoom="2.7423581"
inkscape:cx="84.963375"
inkscape:cy="6.5636942"
inkscape:window-width="1920"
inkscape:window-height="1007"
inkscape:window-x="1920"
inkscape:window-y="44"
inkscape:window-maximized="1"
inkscape:current-layer="Tank-Design"
height="118.039px" />
<defs
id="defs8">
<clipPath
id="clip-path">
<rect
width="551"
height="75"
fill="none"
id="rect2"
x="0"
y="0" />
</clipPath>
<clipPath
id="clip-Player-character-theme-05">
<rect
width="630"
height="458"
id="rect5"
x="0"
y="0" />
</clipPath>
</defs>
<g
id="Player-character-theme-05"
clip-path="url(#clip-Player-character-theme-05)"
transform="matrix(0.30104371,0,0,0.30104371,-0.65753565,-19.387223)">
<g
id="Tank-Design"
transform="translate(6.725,-137)">
<g
id="g1056"
transform="matrix(0.86613947,0,0,0.86613947,-0.60783576,26.959517)">
<g
id="Group_1"
data-name="Group 1"
transform="matrix(0.978,-0.208,0.208,0.978,-53.505,138.785)">
<g
id="Top"
transform="translate(-185,-103.387)">
<path
id="Rectangle_28"
data-name="Rectangle 28"
d="M 139,0 H 360 V 182 H 0 V 139 A 139,139 0 0 1 139,0 Z"
transform="translate(329,279)"
fill="#3b3b3b" />
<path
id="Rectangle_29"
data-name="Rectangle 29"
d="m 12,0 h 152 a 12,12 0 0 1 12,12 v 0 H 0 v 0 A 12,12 0 0 1 12,0 Z"
transform="translate(488,267)"
fill="#1d1d1d" />
<path
id="Rectangle_30"
data-name="Rectangle 30"
d="M 11,0 V 0 A 11,11 0 0 1 22,11 V 25 H 0 V 11 A 11,11 0 0 1 11,0 Z"
transform="rotate(-73,396.854,-29.301207)"
fill="#2a2a2a" />
<rect
id="Rectangle_31"
data-name="Rectangle 31"
width="217"
height="16"
rx="30.681219"
transform="translate(435,310)"
fill="#2a2a2a"
x="0"
y="0"
ry="30.681219" />
<rect
id="Rectangle_32"
data-name="Rectangle 32"
width="15"
height="16"
rx="28.763643"
transform="translate(420,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
<rect
id="Rectangle_33"
data-name="Rectangle 33"
width="15"
height="16"
rx="28.763643"
transform="translate(455,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
<rect
id="Rectangle_34"
data-name="Rectangle 34"
width="15"
height="16"
rx="28.763643"
transform="translate(491,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
<rect
id="Rectangle_35"
data-name="Rectangle 35"
width="15"
height="16"
rx="28.763643"
transform="translate(526,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
<rect
id="Rectangle_36"
data-name="Rectangle 36"
width="15"
height="16"
rx="28.763643"
transform="translate(561,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
<rect
id="Rectangle_37"
data-name="Rectangle 37"
width="15"
height="16"
rx="28.763643"
transform="translate(596,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
<rect
id="Rectangle_38"
data-name="Rectangle 38"
width="15"
height="16"
rx="28.763643"
transform="translate(631,344)"
fill="#1d1d1d"
x="0"
y="0"
ry="28.763643" />
</g>
<rect
id="Shading-block"
width="74"
height="13"
rx="24.928492"
transform="translate(272,184.613)"
fill="#444444"
x="0"
y="0"
ry="24.928492" />
<rect
id="Shading-block-2"
data-name="Shading-block"
width="109"
height="13"
rx="24.928492"
transform="translate(380,184.613)"
fill="#444444"
x="0"
y="0"
ry="24.928492" />
</g>
<g
id="Base"
transform="translate(-185,-103.387)">
<g
id="Group_2"
data-name="Group 2">
<g
id="Rectangle_1"
data-name="Rectangle 1"
transform="translate(200,600)"
fill="#1d1d1d"
stroke="#2a2a2a"
stroke-width="8">
<path
d="m 0,0 h 600 v 25 a 75,75 0 0 1 -75,75 H 75 A 75,75 0 0 1 0,25 Z"
stroke="none"
id="path25" />
<path
d="m 8,4 h 584 a 4,4 0 0 1 4,4 V 25 A 71,71 0 0 1 525,96 H 75 A 71,71 0 0 1 4,25 V 8 A 4,4 0 0 1 8,4 Z"
fill="none"
id="path27" />
</g>
<g
id="Repeat_Grid_1"
data-name="Repeat Grid 1"
transform="translate(225,607)"
clip-path="url(#clip-path)">
<g
transform="translate(-257,-601)"
id="g35">
<g
id="Ellipse_2"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#929292"
stroke="#787878"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle30" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle32" />
</g>
</g>
<g
transform="translate(-162,-601)"
id="g42">
<g
id="Ellipse_2-2"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#929292"
stroke="#787878"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle37" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle39" />
</g>
</g>
<g
transform="translate(-67,-601)"
id="g49">
<g
id="Ellipse_2-3"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#929292"
stroke="#787878"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle44" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle46" />
</g>
</g>
<g
transform="translate(28,-601)"
id="g56">
<g
id="Ellipse_2-4"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#929292"
stroke="#787878"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle51" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle53" />
</g>
</g>
<g
transform="translate(123,-601)"
id="g63">
<g
id="Ellipse_2-5"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#929292"
stroke="#787878"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle58" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle60" />
</g>
</g>
<g
transform="translate(218,-601)"
id="g70">
<g
id="Ellipse_2-6"
data-name="Ellipse 2"
transform="translate(257,601)"
fill="#929292"
stroke="#787878"
stroke-width="7">
<circle
cx="37.5"
cy="37.5"
r="37.5"
stroke="none"
id="circle65" />
<circle
cx="37.5"
cy="37.5"
r="34"
fill="none"
id="circle67" />
</g>
</g>
</g>
<circle
id="Ellipse_3"
data-name="Ellipse 3"
cx="8"
cy="8"
r="8"
transform="translate(397,671)"
fill="#2a2a2a" />
<circle
id="Ellipse_4"
data-name="Ellipse 4"
cx="8"
cy="8"
r="8"
transform="translate(302,671)"
fill="#2a2a2a" />
<circle
id="Ellipse_5"
data-name="Ellipse 5"
cx="8"
cy="8"
r="8"
transform="translate(492,671)"
fill="#2a2a2a" />
<circle
id="Ellipse_6"
data-name="Ellipse 6"
cx="8"
cy="8"
r="8"
transform="translate(587,671)"
fill="#2a2a2a" />
<circle
id="Ellipse_7"
data-name="Ellipse 7"
cx="8"
cy="8"
r="8"
transform="translate(682,671)"
fill="#2a2a2a" />
</g>
<g
id="Group_3"
data-name="Group 3"
transform="rotate(3,-314.91732,540.32801)">
<g
id="g960">
<rect
id="Rectangle_10"
data-name="Rectangle 10"
width="630"
height="65"
transform="translate(185,549)"
fill="#ffffff"
x="0"
y="0" />
<path
id="Intersection_4"
data-name="Intersection 4"
d="M -2041.885,168.387 A 74.855,74.855 0 0 1 -2070,109.845 v -6.457 h 600 v 6.457 a 74.854,74.854 0 0 1 -28.115,58.542 z"
transform="rotate(-3,8374.1346,-43060.808)"
fill="rgba(0,0,0,0.22)"
style="fill:#000000;fill-opacity:1" />
<rect
id="Rectangle_2"
data-name="Rectangle 2"
width="30"
height="65"
transform="translate(185,549)"
fill="#3b3b3b"
x="0"
y="0" />
<rect
id="Rectangle_4"
data-name="Rectangle 4"
width="111"
height="65"
transform="translate(215,549)"
fill="#2a2a2a"
x="-1.4210855e-14"
y="-5.6843419e-14"
ry="6.5628485e-14"
rx="6.5628485e-14" />
<rect
id="Rectangle_5"
data-name="Rectangle 5"
width="111"
height="65"
transform="translate(437,549)"
fill="#929292"
x="0"
y="0" />
<rect
id="Rectangle_6"
data-name="Rectangle 6"
width="111"
height="65"
transform="translate(326,549)"
fill="#3b3b3b"
x="2.8421709e-14"
y="-5.6843419e-14" />
<rect
id="Rectangle_7"
data-name="Rectangle 7"
width="111"
height="65"
transform="translate(659,549)"
fill="#929292"
x="0"
y="0" />
<rect
id="Rectangle_8"
data-name="Rectangle 8"
width="111"
height="65"
transform="translate(548,549)"
fill="#2a2a2a"
x="0"
y="0" />
<rect
id="Rectangle_9"
data-name="Rectangle 9"
width="45"
height="65"
transform="translate(770,549)"
fill="#787878"
x="0"
y="0" />
<circle
id="Ellipse_8"
data-name="Ellipse 8"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(306,555)"
fill="#3b3b3b" />
<circle
id="Ellipse_9"
data-name="Ellipse 9"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(306,598)"
fill="#3b3b3b" />
<circle
id="Ellipse_10"
data-name="Ellipse 10"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(419,555)"
fill="#2a2a2a" />
<circle
id="Ellipse_11"
data-name="Ellipse 11"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(419,598)"
fill="#2a2a2a" />
<circle
id="Ellipse_12"
data-name="Ellipse 12"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,556)"
fill="#fb8168" />
<circle
id="Ellipse_13"
data-name="Ellipse 13"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,599)"
fill="#fb8168" />
<circle
id="Ellipse_14"
data-name="Ellipse 14"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,556)"
fill="#3b3b3b" />
<circle
id="Ellipse_15"
data-name="Ellipse 15"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(531,599)"
fill="#3b3b3b" />
<circle
id="Ellipse_16"
data-name="Ellipse 16"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(641,557)"
fill="#3b3b3b" />
<circle
id="Ellipse_17"
data-name="Ellipse 17"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(641,600)"
fill="#3b3b3b" />
<circle
id="Ellipse_18"
data-name="Ellipse 18"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(753,557)"
fill="#1d1d1d" />
<circle
id="Ellipse_19"
data-name="Ellipse 19"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(753,600)"
fill="#1d1d1d" />
<path
id="Path_2"
data-name="Path 2"
d="M 0,0 H 364.806 V 24.994 H 417 V 140 H 0 Z"
transform="translate(348,409)"
fill="#2a2a2a" />
<path
id="Path_1"
data-name="Path 1"
d="M 57.448,0 H 365.5 V 103.912 H 0 Z"
transform="translate(238,445.089)"
fill="#3b3b3b" />
<rect
id="Rectangle_12"
data-name="Rectangle 12"
width="320"
height="12"
transform="translate(295,433)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_13"
data-name="Rectangle 13"
width="12"
height="89"
transform="translate(603,433)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_14"
data-name="Rectangle 14"
width="102"
height="27"
transform="translate(603,522)"
fill="#3b3b3b"
x="0"
y="0" />
<rect
id="Rectangle_15"
data-name="Rectangle 15"
width="60"
height="11"
transform="translate(705,480)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_16"
data-name="Rectangle 16"
width="60"
height="58"
transform="translate(705,491)"
fill="#3b3b3b"
x="0"
y="0" />
<rect
id="Rectangle_17"
data-name="Rectangle 17"
width="102"
height="11"
transform="translate(603,511)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_18"
data-name="Rectangle 18"
width="60"
height="24"
transform="translate(740,525)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_19"
data-name="Rectangle 19"
width="630"
height="5"
transform="translate(185,544)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_20"
data-name="Rectangle 20"
width="320"
height="12"
transform="translate(393,397)"
fill="#1d1d1d"
x="0"
y="0" />
<rect
id="Rectangle_21"
data-name="Rectangle 21"
width="90"
height="99"
transform="translate(345,445)"
fill="#2a2a2a"
x="0"
y="0" />
<rect
id="Rectangle_22"
data-name="Rectangle 22"
width="90"
height="99"
transform="translate(513,445)"
fill="#2a2a2a"
x="0"
y="0" />
<rect
id="Rectangle_23"
data-name="Rectangle 23"
width="48"
height="16"
rx="30.681219"
transform="translate(452,471)"
fill="#1d1d1d"
x="0"
y="0"
ry="30.681219" />
<rect
id="Rectangle_24"
data-name="Rectangle 24"
width="48"
height="16"
rx="30.681219"
transform="translate(329,497)"
fill="#2a2a2a"
x="0"
y="0"
ry="30.681219" />
<rect
id="Rectangle_25"
data-name="Rectangle 25"
width="48"
height="16"
rx="30.681219"
transform="translate(315,471)"
fill="#2a2a2a"
x="0"
y="0"
ry="30.681219" />
<rect
id="Rectangle_26"
data-name="Rectangle 26"
width="48"
height="16"
rx="30.681219"
transform="translate(488,517)"
fill="#3b3b3b"
x="0"
y="0"
ry="30.681219" />
<rect
id="Rectangle_27"
data-name="Rectangle 27"
width="48"
height="16"
rx="30.681219"
transform="translate(424,492)"
fill="#2a2a2a"
x="0"
y="0"
ry="30.681219" />
<circle
id="Ellipse_20"
data-name="Ellipse 20"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(715,520)"
fill="#555354" />
<circle
id="Ellipse_21"
data-name="Ellipse 21"
cx="4.5"
cy="4.5"
r="4.5"
transform="translate(715,505)"
fill="#555354" />
</g>
</g>
</g>
<rect
id="Shading-block-3"
data-name="Shading-block"
width="122"
height="13"
rx="24.928492"
transform="rotate(3,-7348.5405,2799.1257)"
fill="#444444"
x="0"
y="0"
ry="24.928492" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -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"]

View File

@ -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