diff --git a/Sprites/i1SHOW05.png b/Sprites/i1SHOW05.png new file mode 100644 index 0000000..6c42c73 Binary files /dev/null and b/Sprites/i1SHOW05.png differ diff --git a/Sprites/i1SHOW05.png.import b/Sprites/i1SHOW05.png.import new file mode 100644 index 0000000..779500c --- /dev/null +++ b/Sprites/i1SHOW05.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3bxybfkha33x" +path="res://.godot/imported/i1SHOW05.png-304b308a36e8cd22a28479af7354f705.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/i1SHOW05.png" +dest_files=["res://.godot/imported/i1SHOW05.png-304b308a36e8cd22a28479af7354f705.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/i2SHOW05.png b/Sprites/i2SHOW05.png new file mode 100644 index 0000000..7fad63f Binary files /dev/null and b/Sprites/i2SHOW05.png differ diff --git a/Sprites/i2SHOW05.png.import b/Sprites/i2SHOW05.png.import new file mode 100644 index 0000000..e10f9d1 --- /dev/null +++ b/Sprites/i2SHOW05.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bct03qrlqbp2p" +path="res://.godot/imported/i2SHOW05.png-fde52343e8297d72edfe888024c63c2b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/i2SHOW05.png" +dest_files=["res://.godot/imported/i2SHOW05.png-fde52343e8297d72edfe888024c63c2b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/i3SHOW05.png b/Sprites/i3SHOW05.png new file mode 100644 index 0000000..31c4e4f Binary files /dev/null and b/Sprites/i3SHOW05.png differ diff --git a/Sprites/i3SHOW05.png.import b/Sprites/i3SHOW05.png.import new file mode 100644 index 0000000..c3302a0 --- /dev/null +++ b/Sprites/i3SHOW05.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1d7lvq5y1aw2" +path="res://.godot/imported/i3SHOW05.png-a384dd3e208426eb5df4162df2cd2908.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/i3SHOW05.png" +dest_files=["res://.godot/imported/i3SHOW05.png-a384dd3e208426eb5df4162df2cd2908.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/i4SHOW05.png b/Sprites/i4SHOW05.png new file mode 100644 index 0000000..e69bf06 Binary files /dev/null and b/Sprites/i4SHOW05.png differ diff --git a/Sprites/i4SHOW05.png.import b/Sprites/i4SHOW05.png.import new file mode 100644 index 0000000..f693e75 --- /dev/null +++ b/Sprites/i4SHOW05.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dtuhor3ddshjj" +path="res://.godot/imported/i4SHOW05.png-0e28a11272f1cdf1405a41a59e36b0bf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/i4SHOW05.png" +dest_files=["res://.godot/imported/i4SHOW05.png-0e28a11272f1cdf1405a41a59e36b0bf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/i_HIDE00.png b/Sprites/i_HIDE00.png new file mode 100644 index 0000000..8d27e20 Binary files /dev/null and b/Sprites/i_HIDE00.png differ diff --git a/Sprites/i_HIDE00.png.import b/Sprites/i_HIDE00.png.import new file mode 100644 index 0000000..cfac40e --- /dev/null +++ b/Sprites/i_HIDE00.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1a8mhh32trmb" +path="res://.godot/imported/i_HIDE00.png-c72b1bd01c1f6d793497911d38a5a108.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/i_HIDE00.png" +dest_files=["res://.godot/imported/i_HIDE00.png-c72b1bd01c1f6d793497911d38a5a108.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/game.tscn b/game.tscn index b80151c..cc7495b 100644 --- a/game.tscn +++ b/game.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=15 format=3 uid="uid://sntwtley2f7d"] +[gd_scene load_steps=16 format=3 uid="uid://sntwtley2f7d"] -[ext_resource type="Texture2D" uid="uid://dj6mkweo8kgcs" path="res://Sprites/smol-up.png" id="1_80nbo"] [ext_resource type="Script" uid="uid://c7c1yy0hv1u3r" path="res://logic.gd" id="1_e2o6t"] -[ext_resource type="Texture2D" uid="uid://cmkql3pb4tbn8" path="res://Sprites/smol-right.png" id="3_7jktm"] -[ext_resource type="Texture2D" uid="uid://ducbe6ucctlr6" path="res://Sprites/smol-down.png" id="4_ryrav"] -[ext_resource type="Texture2D" uid="uid://25g6athehh1s" path="res://Sprites/smol-left.png" id="5_eow3j"] +[ext_resource type="Texture2D" uid="uid://dtuhor3ddshjj" path="res://Sprites/i4SHOW05.png" id="2_lc2xo"] +[ext_resource type="Texture2D" uid="uid://bct03qrlqbp2p" path="res://Sprites/i2SHOW05.png" id="3_215e1"] +[ext_resource type="Texture2D" uid="uid://b1d7lvq5y1aw2" path="res://Sprites/i3SHOW05.png" id="4_7sc4i"] +[ext_resource type="Texture2D" uid="uid://3bxybfkha33x" path="res://Sprites/i1SHOW05.png" id="5_80cx4"] +[ext_resource type="Texture2D" uid="uid://b1a8mhh32trmb" path="res://Sprites/i_HIDE00.png" id="6_e8heu"] [ext_resource type="Texture2D" uid="uid://y2ytspjqefbk" path="res://Sprites/smol-blank.png" id="6_ryrav"] [ext_resource type="Texture2D" uid="uid://n6rnl67gxggv" path="res://Sprites/hint00.png" id="7_hve3p"] [ext_resource type="Texture2D" uid="uid://bvgpivc827tra" path="res://Sprites/TimerBarGrey.png" id="8_iotsf"] @@ -19,15 +20,17 @@ font_size = 30 [sub_resource type="LabelSettings" id="LabelSettings_7sc4i"] font_size = 30 -[node name="Node2D" type="Node2D" node_paths=PackedStringArray("icon_container", "progress_bar", "scroll_container", "score_label", "life_container")] +[node name="Node2D" type="Node2D" node_paths=PackedStringArray("icon_container", "progress_bar", "scroll_container", "score_label", "life_container", "round_label")] script = ExtResource("1_e2o6t") +code_len = 1 icon_container = NodePath("CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer") -icons = Array[Texture]([ExtResource("1_80nbo"), ExtResource("3_7jktm"), ExtResource("4_ryrav"), ExtResource("5_eow3j"), ExtResource("6_ryrav")]) +icons = Array[Texture]([ExtResource("2_lc2xo"), ExtResource("3_215e1"), ExtResource("4_7sc4i"), ExtResource("5_80cx4"), ExtResource("6_e8heu")]) progress_bar = NodePath("CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/ProgressBar") scroll_container = NodePath("CanvasLayer/VBoxContainer/HFlowContainer") score_label = NodePath("CanvasLayer/Score_Lives Display/ScoreLabel") life_container = NodePath("CanvasLayer/Score_Lives Display/Lives") life_texture = ExtResource("9_iotsf") +round_label = NodePath("RoundDisplay/RoundLabel") [node name="CanvasLayer" type="CanvasLayer" parent="."] @@ -287,12 +290,12 @@ offset_right = 1095.0 offset_bottom = 488.0 texture = ExtResource("10_lc2xo") -[node name="Label" type="Label" parent="RoundDisplay"] +[node name="RoundLabel" type="Label" parent="RoundDisplay"] layout_mode = 0 -offset_left = 57.0 -offset_top = 81.0 -offset_right = 136.0 -offset_bottom = 123.0 -text = "8 of 8" +offset_left = 4.0 +offset_top = 82.0 +offset_right = 186.0 +offset_bottom = 124.0 +text = "888 of 888" label_settings = SubResource("LabelSettings_7sc4i") horizontal_alignment = 1 diff --git a/logic.gd b/logic.gd index 0b5ab06..883c7a5 100644 --- a/logic.gd +++ b/logic.gd @@ -11,6 +11,7 @@ extends Node2D @export var score_label : Label @export var life_container : HBoxContainer @export var life_texture : Texture +@export var round_label : Label var current_time : float = 5 var score : int = 0 var lives : int = 3 @@ -49,15 +50,22 @@ func _process(delta: float) -> void: target_scroll = (codepos*50) - 550 scroll_container.scroll_horizontal = lerpf(scroll_container.scroll_horizontal,target_scroll,0.05) score_label.text = str(score) + round_label.text = str(code_len) + " of " + str(code_len+ghost_tokens) + if not gaming: + round_label.text = "Get Ready!" if gaming: current_time -= delta progress_bar.value = (5-current_time)/allowed_time + else: test_break -= delta + progress_bar.value -= delta/1.5 if test_break <= 0: start_round() + progress_bar.modulate = Color(1,1,1,progress_bar.value) + if gaming and current_time <= 0: lose_round()