From b18b4368d1ded6e9de21b21e1fdefa20d86f37be Mon Sep 17 00:00:00 2001
From: justinorringer <justinorringer@gmail.com>
Date: Thu, 21 Dec 2023 00:46:40 -0500
Subject: [PATCH] Boost icon in the bottom right

---
 assets/menu/boost.png                 | Bin 0 -> 899 bytes
 assets/menu/boost_dark.png            | Bin 0 -> 512 bytes
 scenes/game_object/player/player.gd   |  12 ++++--
 scenes/game_object/player/player.tscn |  55 ++++++++++++++++++++++----
 4 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 assets/menu/boost.png
 create mode 100644 assets/menu/boost_dark.png

diff --git a/assets/menu/boost.png b/assets/menu/boost.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaa7be1d0f25755f1452077aba48d66571ae4e4a
GIT binary patch
literal 899
zcmV-}1AP36P)<h;3K|Lk000e1NJLTq002Dz0012b1^@s68O~(i00001b5ch_0Itp)
z=>Px&JxN4CR9J=WSzky~Q5gTu+*UzWx^~+Q?8#C1mk3;=TqRLp+UlhT(T9i%0wI}2
zK7|j_gBubN^j4Tf4?*1`Dk-ZO=oL+~n&4G}8Qi;F-6BkKI!`ZN*=pOpXWr{p^n(NU
z+<VS<zTbDw_vhY=Ap3x0u8|fC=(G^JQed9bRDPyO<Cvy&TwKFEhXpUglPs!FLs3<M
zc@7Y5l^vrdv?iT!2SZKvvi$bmk5XUoGJ?h7Oe!S6`Gi!9SR788L@BLEV}Rs4glOwX
z_=0_ZUR$psVWgzwpap3xcN~|VzY%JE0svSv&><xdBo89Q=>h{F1h7czgRwp>co|`f
zwaBt`Pm`2|K*7$)1sVYLgG~a`auHs!f%H=k+;0J3U#dY`=S?|ao|7XCAa4`^06?@A
zA;HV=IrFn?<7Vq}=BWcGC{o?jG!E(UR+6iwfT*U=WR&!O$RMF5gPpDCsrt+9tF4S2
zf}O2R(zS8;DYMDl|0Nwce~|Wf-J9EXsLq(_;H3oO#Aqbv;gy{x59=eD7e_ky?(t7*
z@6k1X17Qi`xNm`~bQ(zJ{Jztw2BXyiqOC*$PqqvV40Mm_U*Ecl5bh^EMrvZZ(Y67M
zI{Uoy(rq2Wl)122wbx>dd2YFhF59lyXPIu_TPjQd0OG|xTLmw}OL~%$OuExycSE(=
z!w!aBwuU?p+mR*5e#&1pIBR@$t$d@yNe6qFh`F#xkv|JwhEG_WNLC9BbdOnT&u*V`
z+0JeDus5=V@G>Sx*y#H1cGF_iu*2lK(--5@Nnf5Y&*1>)6D$rV9Y@;VbvIH_T44ye
z>x-BCH){i1;JtUma^zHbu;<YNRe4MgAYY?PA0y(9w;?h+1^~q-59<?~ch{QTeVQq~
zQs{E?O923)GvOiWp3*2D7Xj&-(<Of2a0mb(T6LyXO(oTa*;<0Wwp5sMdv4Z{&P{5W
zX_x(Qesjn3m8qs3MD7!&9LLj2TS+IGJiRX_Kd{8<V6_mP`8Fg!Dlt-8YTe80b?FM$
z65{yhC|!M$q=tw?%8JbFX75j<`p}Pqjn4|oY?=Ns0002u#ONG)(q@+WO24X*ma6|8
ZegO?1eAcwzF?|34002ovPDHLkV1k-+r<wo&

literal 0
HcmV?d00001

diff --git a/assets/menu/boost_dark.png b/assets/menu/boost_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6cef89b76584268667eb03689590bcd5685fa43
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq002Dz0012b1^@s68O~(i00001b5ch_0Itp)
z=>Px$x=BPqR9J;$WEf;1H6iXlj6Hk7B1T%+!9)u~2RmRHNXv<hRb+Lz04b?rG^VKy
zaK%uk;B7sj{^OUaWe=%&pC+CrlpM?7t6oY?P$k+tY8Pl!Pu|4jzkvoUxEx7N=>BJ5
zU`!*^A@mF^oXMLUN094bVgMockP=A)T4fOnh=~AVBWd=6MT|H-O=|L{W%4A(Eu_@t
zR4Wx};b~emLq{aQ8j?ey+UXX#p(N0A>OMJoF+4pKJd6xFgl}pK_ny2)iXN24$x!n!
z0|Ns?#as2Or0N;%aNq;vBqM5qx4Gtg6`$2VQo}5Qo`zQ&332~Z6V$0;Ct0B4GXq1f
z<P8zN_ET?Pmsv|yy;6Qku331K_v{6W7*iAC{tuSCUi@6+O=?2ie>SFnT$D7P@V3YX
zi)Yb6$qUun@5+A(l)pq3C)9aLO^EwHd%+?`tTEjod{dj+4y86If2sX}*w{u6jMRj<
z|5#&MxcB6>!5Yi>0I`9964OJit^1_XOt@d_rUa?_Fk*Trd0eLb)LU}&;Viv}lIKYU
zLt+pC8$gZ}Qb$z?*3*<ZjW(c7>@FXSP0dl2VGRIm7_mHJt<Nz40000<MNUMnLSTX}
CB;5D_

literal 0
HcmV?d00001

diff --git a/scenes/game_object/player/player.gd b/scenes/game_object/player/player.gd
index c57a35f..40c30f5 100644
--- a/scenes/game_object/player/player.gd
+++ b/scenes/game_object/player/player.gd
@@ -10,6 +10,7 @@ var can_boost = true
 @onready var tank_body: Sprite2D = $TankBody/Sprite2D
 @onready var barrel_color: Sprite2D = $Barrel/Sprite2D
 @onready var boost_timer: Timer = $BoostTimer
+@export var boost_icons: Array[TextureRect]
 
 @onready var previous_movement: Vector2 = Vector2.ZERO
 
@@ -54,9 +55,8 @@ func _process(delta):
 		apply_boost(direction)
 		can_boost = false
 		boost_timer.start()
-		
-	if boost_timer.is_stopped() and can_boost == false:
-		can_boost = true
+		boost_icons[0].visible = false # available icon
+		boost_icons[1].visible = true # unavailable icon
 	
 	move_and_slide()
 
@@ -79,3 +79,9 @@ func update_health_display():
 
 func on_health_changed():
 	update_health_display.rpc()
+
+func _on_boost_timer_timeout():
+	if can_boost == false:
+		can_boost = true
+		boost_icons[0].visible = true
+		boost_icons[1].visible = false
diff --git a/scenes/game_object/player/player.tscn b/scenes/game_object/player/player.tscn
index 8caf577..428b096 100644
--- a/scenes/game_object/player/player.tscn
+++ b/scenes/game_object/player/player.tscn
@@ -1,17 +1,21 @@
-[gd_scene load_steps=17 format=3 uid="uid://bam04hog13mtt"]
+[gd_scene load_steps=20 format=3 uid="uid://bam04hog13mtt"]
 
 [ext_resource type="Script" path="res://scenes/game_object/player/player.gd" id="1_hkal2"]
 [ext_resource type="PackedScene" uid="uid://73lr8fqud4" path="res://scenes/component/health_component.tscn" id="2_gt4m0"]
+[ext_resource type="Texture2D" uid="uid://bev0i3hblaggj" path="res://assets/menu/boost.png" id="2_mn8cc"]
 [ext_resource type="PackedScene" uid="uid://drybknwrows3o" path="res://scenes/game_object/player/tank_body.tscn" id="3_1e010"]
-[ext_resource type="Texture2D" uid="uid://cphdqa08uuq8a" path="res://scenes/game_object/player/tankGreen_barrel3_outline.png" id="3_vvwhs"]
+[ext_resource type="Texture2D" uid="uid://cjgsa7jtfnoms" path="res://assets/menu/boost_dark.png" id="3_ciky0"]
+[ext_resource type="Texture2D" uid="uid://8ip3d3virahl" path="res://scenes/game_object/player/tankGreen_barrel3_outline.png" id="3_vvwhs"]
 [ext_resource type="Script" path="res://scenes/game_object/player/Barrel.gd" id="4_yiyg3"]
 [ext_resource type="PackedScene" uid="uid://dp7s6opobih82" path="res://scenes/component/hurtbox_component.tscn" id="5_fvhfs"]
 [ext_resource type="PackedScene" uid="uid://mbsht4dt5quk" path="res://scenes/game_object/player/health_bar.tscn" id="7_p6dmh"]
-[ext_resource type="Texture2D" uid="uid://bh74bxar0ghpn" path="res://assets/sprites/Effects/Explosion1/explosion1.png" id="8_xuf46"]
-[ext_resource type="Texture2D" uid="uid://cfdfosrj6jftq" path="res://assets/sprites/Effects/Explosion1/explosion2.png" id="9_n372a"]
-[ext_resource type="Texture2D" uid="uid://civngppv5n2ow" path="res://assets/sprites/Effects/Explosion1/explosion3.png" id="10_ytrhg"]
-[ext_resource type="Texture2D" uid="uid://c3ujarddh4c3j" path="res://assets/sprites/Effects/Explosion1/explosion4.png" id="11_cxpyl"]
-[ext_resource type="Texture2D" uid="uid://bdw12ylwud1yh" path="res://assets/sprites/Effects/Explosion1/explosion5.png" id="12_pogg6"]
+[ext_resource type="Texture2D" uid="uid://qy1axfax8jfx" path="res://assets/sprites/Effects/Explosion1/explosion1.png" id="8_xuf46"]
+[ext_resource type="Texture2D" uid="uid://ct43tpf4bhlam" path="res://assets/sprites/Effects/Explosion1/explosion2.png" id="9_n372a"]
+[ext_resource type="Texture2D" uid="uid://1bj57cp5m24g" path="res://assets/sprites/Effects/Explosion1/explosion3.png" id="10_ytrhg"]
+[ext_resource type="Texture2D" uid="uid://dh70asex6npw2" path="res://assets/sprites/Effects/Explosion1/explosion4.png" id="11_cxpyl"]
+[ext_resource type="Texture2D" uid="uid://ctmtx3mrofxqa" path="res://assets/sprites/Effects/Explosion1/explosion5.png" id="12_pogg6"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_bk8ck"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_e32xm"]
 radius = 16.0312
@@ -56,10 +60,11 @@ animations = [{
 "speed": 5.0
 }]
 
-[node name="Player" type="CharacterBody2D" groups=["player"]]
+[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("boost_icons") groups=["player"]]
 collision_layer = 2
 collision_mask = 126
 script = ExtResource("1_hkal2")
+boost_icons = [NodePath("HUD/PanelContainer/MarginContainer/BoostAvailableIcon"), NodePath("HUD/PanelContainer/MarginContainer/BoostUnavailableIcon")]
 
 [node name="Camera2D" type="Camera2D" parent="."]
 limit_left = 0
@@ -68,6 +73,38 @@ limit_right = 4480
 limit_bottom = 4480
 position_smoothing_enabled = true
 
+[node name="HUD" type="CanvasLayer" parent="."]
+
+[node name="PanelContainer" type="PanelContainer" parent="HUD"]
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -715.0
+offset_top = -71.0
+offset_right = -24.0
+offset_bottom = -22.0
+grow_horizontal = 0
+grow_vertical = 0
+theme_override_styles/panel = SubResource("StyleBoxEmpty_bk8ck")
+
+[node name="MarginContainer" type="MarginContainer" parent="HUD/PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 630
+theme_override_constants/margin_top = 20
+
+[node name="BoostAvailableIcon" type="TextureRect" parent="HUD/PanelContainer/MarginContainer"]
+layout_mode = 2
+texture = ExtResource("2_mn8cc")
+stretch_mode = 2
+
+[node name="BoostUnavailableIcon" type="TextureRect" parent="HUD/PanelContainer/MarginContainer"]
+visible = false
+layout_mode = 2
+texture = ExtResource("3_ciky0")
+stretch_mode = 2
+
 [node name="HealthComponent" parent="." instance=ExtResource("2_gt4m0")]
 max_health = 50.0
 
@@ -143,4 +180,6 @@ visible = false
 sprite_frames = SubResource("SpriteFrames_qctma")
 frame_progress = 0.217273
 
+[connection signal="timeout" from="BoostTimer" to="." method="_on_boost_timer_timeout"]
+
 [editable path="TankBody"]