diff --git a/.gitignore b/.gitignore index 4875b09..dea9560 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ .DS_Store Thumbs.db +# Windows metadata +*.ini + # Temporary files *.tmp *.TMP @@ -15,4 +18,7 @@ Thumbs.db \#*\# #Plugins -/addons/autosave_g4/ \ No newline at end of file +/addons/autosave_g4/ + +#Exports +/_Exports/ \ No newline at end of file diff --git a/assets/audio/mus_ACTIONCAT_Level3_v2.mp3 b/assets/audio/mus_ACTIONCAT_Level3_v2.mp3 new file mode 100644 index 0000000..bbd31c2 Binary files /dev/null and b/assets/audio/mus_ACTIONCAT_Level3_v2.mp3 differ diff --git a/assets/audio/mus_ACTIONCAT_Level3_v2.mp3.import b/assets/audio/mus_ACTIONCAT_Level3_v2.mp3.import new file mode 100644 index 0000000..801a06f --- /dev/null +++ b/assets/audio/mus_ACTIONCAT_Level3_v2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b48rieqx4ua2" +path="res://.godot/imported/mus_ACTIONCAT_Level3_v2.mp3-7ef2d544368dc661e4ac792eed3841b8.mp3str" + +[deps] + +source_file="res://assets/audio/mus_ACTIONCAT_Level3_v2.mp3" +dest_files=["res://.godot/imported/mus_ACTIONCAT_Level3_v2.mp3-7ef2d544368dc661e4ac792eed3841b8.mp3str"] + +[params] + +loop=true +loop_offset=3.99 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/mus_CATSTLE_Level4_v2.mp3 b/assets/audio/mus_CATSTLE_Level4_v2.mp3 new file mode 100644 index 0000000..08dd4ea Binary files /dev/null and b/assets/audio/mus_CATSTLE_Level4_v2.mp3 differ diff --git a/assets/audio/mus_CATSTLE_Level4_v2.mp3.import b/assets/audio/mus_CATSTLE_Level4_v2.mp3.import new file mode 100644 index 0000000..4e5bf6a --- /dev/null +++ b/assets/audio/mus_CATSTLE_Level4_v2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://hwsjrm87cttg" +path="res://.godot/imported/mus_CATSTLE_Level4_v2.mp3-2f3911234feaa4225a8e0ce019283d64.mp3str" + +[deps] + +source_file="res://assets/audio/mus_CATSTLE_Level4_v2.mp3" +dest_files=["res://.godot/imported/mus_CATSTLE_Level4_v2.mp3-2f3911234feaa4225a8e0ce019283d64.mp3str"] + +[params] + +loop=true +loop_offset=7.1 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/mus_HAPPYCAT_Level1_v2.mp3 b/assets/audio/mus_HAPPYCAT_Level1_v2.mp3 new file mode 100644 index 0000000..a85ed86 Binary files /dev/null and b/assets/audio/mus_HAPPYCAT_Level1_v2.mp3 differ diff --git a/assets/audio/mus_HAPPYCAT_Level1_v2.mp3.import b/assets/audio/mus_HAPPYCAT_Level1_v2.mp3.import new file mode 100644 index 0000000..6f9e823 --- /dev/null +++ b/assets/audio/mus_HAPPYCAT_Level1_v2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://f8cbqrla4xar" +path="res://.godot/imported/mus_HAPPYCAT_Level1_v2.mp3-5b0f6916c8f0d254f90491d45244ef1d.mp3str" + +[deps] + +source_file="res://assets/audio/mus_HAPPYCAT_Level1_v2.mp3" +dest_files=["res://.godot/imported/mus_HAPPYCAT_Level1_v2.mp3-5b0f6916c8f0d254f90491d45244ef1d.mp3str"] + +[params] + +loop=true +loop_offset=4.36 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3 b/assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3 new file mode 100644 index 0000000..dee3032 Binary files /dev/null and b/assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3 differ diff --git a/assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3.import b/assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3.import new file mode 100644 index 0000000..1a05106 --- /dev/null +++ b/assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cmswi8bi0jhwp" +path="res://.godot/imported/mus_KITTYGLYPHICS_Level2_v2.mp3-1c92c8a2b77384463f2e3936c641cf13.mp3str" + +[deps] + +source_file="res://assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3" +dest_files=["res://.godot/imported/mus_KITTYGLYPHICS_Level2_v2.mp3-1c92c8a2b77384463f2e3936c641cf13.mp3str"] + +[params] + +loop=true +loop_offset=4.36 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/mus_STARCAT_Level5_v2.mp3 b/assets/audio/mus_STARCAT_Level5_v2.mp3 new file mode 100644 index 0000000..d4bee46 Binary files /dev/null and b/assets/audio/mus_STARCAT_Level5_v2.mp3 differ diff --git a/assets/audio/mus_STARCAT_Level5_v2.mp3.import b/assets/audio/mus_STARCAT_Level5_v2.mp3.import new file mode 100644 index 0000000..0073319 --- /dev/null +++ b/assets/audio/mus_STARCAT_Level5_v2.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bfl87mgy60yg4" +path="res://.godot/imported/mus_STARCAT_Level5_v2.mp3-d279c31405105098e5ee21160481b784.mp3str" + +[deps] + +source_file="res://assets/audio/mus_STARCAT_Level5_v2.mp3" +dest_files=["res://.godot/imported/mus_STARCAT_Level5_v2.mp3-d279c31405105098e5ee21160481b784.mp3str"] + +[params] + +loop=true +loop_offset=2.24 +bpm=0.0 +beat_count=0 +bar_beats=4 diff --git a/export_presets.cfg b/export_presets.cfg index ecaf197..d689794 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../_Exports/A Cat Game/Windows/ACatGame.exe" +export_path="_Exports/WIN/ACatGame.exe" patches=PackedStringArray() patch_delta_encoding=false patch_delta_compression_level_zstd=19 @@ -43,11 +43,11 @@ application/icon="uid://bx0ss7w04ruem" application/console_wrapper_icon="" application/icon_interpolation=4 application/file_version="" -application/product_version="" -application/company_name="Monarkie Digital Content Solutions LLC" +application/product_version="1.0.1.0" +application/company_name="Monarkie Digital" application/product_name="A Cat Game" application/file_description=" " -application/copyright="2025 Monarkie Digital Content Solutions" +application/copyright="2025 Monarkie Digital Content Solutions. LLC" application/trademarks="" application/export_angle=0 application/export_d3d12=0 @@ -80,7 +80,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="D:/Dev/Godot/_EXPORTS/acg/index.html" +export_path="../_EXPORTS/acg/index.html" patches=PackedStringArray() patch_delta_encoding=false patch_delta_compression_level_zstd=19 diff --git a/levels/level_1.tscn b/levels/level_1.tscn index 9916176..d758155 100644 --- a/levels/level_1.tscn +++ b/levels/level_1.tscn @@ -14,14 +14,15 @@ [ext_resource type="Texture2D" uid="uid://c0cyt3d7v3ba5" path="res://assets/tree_1.png" id="14_gtrna"] [ext_resource type="PackedScene" uid="uid://bo88goswugx77" path="res://scenes/HUD.tscn" id="15_xapae"] [ext_resource type="FontFile" uid="uid://bcf7oh6t3psng" path="res://assets/fonts/ADVERT_0.TTF" id="16_r0nt2"] +[ext_resource type="AudioStream" uid="uid://f8cbqrla4xar" path="res://assets/audio/mus_HAPPYCAT_Level1_v2.mp3" id="17_ryfpa"] [ext_resource type="Script" uid="uid://d0soyjq5kb5v7" path="res://scenes/score_label.gd" id="17_xv8d5"] [ext_resource type="Texture2D" uid="uid://bj2c070gp83h7" path="res://assets/star96.png" id="18_0wxk8"] -[ext_resource type="AudioStream" uid="uid://u1r704yti4c" path="res://assets/audio/ACatGame_Level-1.mp3" id="19_stsco"] [ext_resource type="AudioStream" uid="uid://cudbsaxq8i3dl" path="res://assets/audio/ACatGame_run.ogg" id="20_4cd1h"] [ext_resource type="AudioStream" uid="uid://053nc4ksgdfg" path="res://assets/audio/ACatGame_jump.ogg" id="21_ai2ei"] [ext_resource type="AudioStream" uid="uid://dom5x33m6nqul" path="res://assets/audio/ACatGame_star_collect.ogg" id="22_ua8iw"] [ext_resource type="AudioStream" uid="uid://c8qxnl7nv1smj" path="res://assets/audio/ACatGame_boxEnter.ogg" id="23_vg3su"] [ext_resource type="AudioStream" uid="uid://da084ylo50o0u" path="res://assets/audio/ACatGame_purr.ogg" id="24_yyq8c"] +[ext_resource type="PackedScene" uid="uid://3e4kxmne50j1" path="res://scenes/Pause.tscn" id="25_ntdhj"] [ext_resource type="AudioStream" uid="uid://dh38mhcfvism" path="res://assets/audio/ACatGame_Level-End-6.ogg" id="25_yik85"] [ext_resource type="AudioStream" uid="uid://c8j0qv4ncy4s1" path="res://assets/audio/ACatGame_Level-End.mp3" id="26_5vbbt"] @@ -461,7 +462,7 @@ scale = Vector2(0.510417, 0.510417) texture = ExtResource("18_0wxk8") [node name="level_1_theme" type="AudioStreamPlayer" parent="." unique_id=472350241] -stream = ExtResource("19_stsco") +stream = ExtResource("17_ryfpa") volume_db = -6.0 autoplay = true playback_type = 1 @@ -499,3 +500,5 @@ playback_type = 1 [node name="level_end" type="AudioStreamPlayer" parent="." unique_id=1191819219] stream = ExtResource("26_5vbbt") playback_type = 1 + +[node name="Pause" parent="." unique_id=191443371 instance=ExtResource("25_ntdhj")] diff --git a/levels/level_2.tscn b/levels/level_2.tscn index ea82944..c36a2d4 100644 --- a/levels/level_2.tscn +++ b/levels/level_2.tscn @@ -19,7 +19,7 @@ [ext_resource type="FontFile" uid="uid://bcf7oh6t3psng" path="res://assets/fonts/ADVERT_0.TTF" id="16_6oa44"] [ext_resource type="Script" uid="uid://d0soyjq5kb5v7" path="res://scenes/score_label.gd" id="17_3582p"] [ext_resource type="Texture2D" uid="uid://bj2c070gp83h7" path="res://assets/star96.png" id="18_nomkf"] -[ext_resource type="AudioStream" uid="uid://dc451glhugrvm" path="res://assets/audio/ACatGame_Level-2.mp3" id="20_00pa0"] +[ext_resource type="AudioStream" uid="uid://cmswi8bi0jhwp" path="res://assets/audio/mus_KITTYGLYPHICS_Level2_v2.mp3" id="20_00pa0"] [ext_resource type="AudioStream" uid="uid://cudbsaxq8i3dl" path="res://assets/audio/ACatGame_run.ogg" id="20_6bdx5"] [ext_resource type="AudioStream" uid="uid://053nc4ksgdfg" path="res://assets/audio/ACatGame_jump.ogg" id="21_qthv2"] [ext_resource type="AudioStream" uid="uid://dom5x33m6nqul" path="res://assets/audio/ACatGame_star_collect.ogg" id="22_wnekv"] @@ -27,6 +27,7 @@ [ext_resource type="AudioStream" uid="uid://da084ylo50o0u" path="res://assets/audio/ACatGame_purr.ogg" id="24_wvv8u"] [ext_resource type="AudioStream" uid="uid://dh38mhcfvism" path="res://assets/audio/ACatGame_Level-End-6.ogg" id="25_4s8mp"] [ext_resource type="AudioStream" uid="uid://c8j0qv4ncy4s1" path="res://assets/audio/ACatGame_Level-End.mp3" id="26_wsmxb"] +[ext_resource type="PackedScene" uid="uid://3e4kxmne50j1" path="res://scenes/Pause.tscn" id="28_amxoe"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qb6io"] texture = ExtResource("9_6dcgf") @@ -561,3 +562,5 @@ playback_type = 1 [node name="level_end" type="AudioStreamPlayer" parent="." unique_id=2011043219] stream = ExtResource("26_wsmxb") playback_type = 1 + +[node name="Pause" parent="." unique_id=191443371 instance=ExtResource("28_amxoe")] diff --git a/levels/level_3.tscn b/levels/level_3.tscn index 14303c6..b909b59 100644 --- a/levels/level_3.tscn +++ b/levels/level_3.tscn @@ -22,13 +22,14 @@ [ext_resource type="Script" uid="uid://d0soyjq5kb5v7" path="res://scenes/score_label.gd" id="18_7yfsq"] [ext_resource type="Texture2D" uid="uid://bj2c070gp83h7" path="res://assets/star96.png" id="19_wcms2"] [ext_resource type="AudioStream" uid="uid://cudbsaxq8i3dl" path="res://assets/audio/ACatGame_run.ogg" id="21_f34o0"] -[ext_resource type="AudioStream" uid="uid://dte1ymgxmv1ft" path="res://assets/audio/ACatGame_Level-3.mp3" id="22_8nkwk"] +[ext_resource type="AudioStream" uid="uid://b48rieqx4ua2" path="res://assets/audio/mus_ACTIONCAT_Level3_v2.mp3" id="22_8nkwk"] [ext_resource type="AudioStream" uid="uid://053nc4ksgdfg" path="res://assets/audio/ACatGame_jump.ogg" id="22_l4seb"] [ext_resource type="AudioStream" uid="uid://dom5x33m6nqul" path="res://assets/audio/ACatGame_star_collect.ogg" id="23_yw2fi"] [ext_resource type="AudioStream" uid="uid://c8qxnl7nv1smj" path="res://assets/audio/ACatGame_boxEnter.ogg" id="24_nhvch"] [ext_resource type="AudioStream" uid="uid://da084ylo50o0u" path="res://assets/audio/ACatGame_purr.ogg" id="25_og6ag"] [ext_resource type="AudioStream" uid="uid://dh38mhcfvism" path="res://assets/audio/ACatGame_Level-End-6.ogg" id="26_pch6f"] [ext_resource type="AudioStream" uid="uid://c8j0qv4ncy4s1" path="res://assets/audio/ACatGame_Level-End.mp3" id="27_xlsjf"] +[ext_resource type="PackedScene" uid="uid://3e4kxmne50j1" path="res://scenes/Pause.tscn" id="30_kyq6o"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qb6io"] texture = ExtResource("5_4gw27") @@ -701,3 +702,5 @@ playback_type = 1 [node name="level_end" type="AudioStreamPlayer" parent="." unique_id=1382311436] stream = ExtResource("27_xlsjf") playback_type = 1 + +[node name="Pause" parent="." unique_id=191443371 instance=ExtResource("30_kyq6o")] diff --git a/levels/level_4.tscn b/levels/level_4.tscn index 6f17a8e..9321785 100644 --- a/levels/level_4.tscn +++ b/levels/level_4.tscn @@ -33,8 +33,9 @@ [ext_resource type="AudioStream" uid="uid://c8qxnl7nv1smj" path="res://assets/audio/ACatGame_boxEnter.ogg" id="26_xtn87"] [ext_resource type="AudioStream" uid="uid://da084ylo50o0u" path="res://assets/audio/ACatGame_purr.ogg" id="27_uxflf"] [ext_resource type="AudioStream" uid="uid://dh38mhcfvism" path="res://assets/audio/ACatGame_Level-End-6.ogg" id="28_2xw5q"] -[ext_resource type="AudioStream" uid="uid://buvkf2qpr0na3" path="res://assets/audio/ACatGame_Level-4.mp3" id="28_3vxiy"] +[ext_resource type="AudioStream" uid="uid://hwsjrm87cttg" path="res://assets/audio/mus_CATSTLE_Level4_v2.mp3" id="28_3vxiy"] [ext_resource type="AudioStream" uid="uid://c8j0qv4ncy4s1" path="res://assets/audio/ACatGame_Level-End.mp3" id="29_746kk"] +[ext_resource type="PackedScene" uid="uid://3e4kxmne50j1" path="res://scenes/Pause.tscn" id="36_5vmwd"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qb6io"] texture = ExtResource("5_3p5ss") @@ -844,3 +845,5 @@ playback_type = 1 [node name="level_end" type="AudioStreamPlayer" parent="." unique_id=934162633] stream = ExtResource("29_746kk") playback_type = 1 + +[node name="Pause" parent="." unique_id=191443371 instance=ExtResource("36_5vmwd")] diff --git a/levels/level_5.tscn b/levels/level_5.tscn index 097ae33..46b7a3b 100644 --- a/levels/level_5.tscn +++ b/levels/level_5.tscn @@ -22,7 +22,7 @@ [ext_resource type="FontFile" uid="uid://bcf7oh6t3psng" path="res://assets/fonts/ADVERT_0.TTF" id="20_3y4s7"] [ext_resource type="Script" uid="uid://d0soyjq5kb5v7" path="res://scenes/score_label.gd" id="21_b0qus"] [ext_resource type="Texture2D" uid="uid://bj2c070gp83h7" path="res://assets/star96.png" id="22_j8rdx"] -[ext_resource type="AudioStream" uid="uid://dv7epmep4vw62" path="res://assets/audio/ACatGame_Level-5.mp3" id="23_1a4ff"] +[ext_resource type="AudioStream" uid="uid://bfl87mgy60yg4" path="res://assets/audio/mus_STARCAT_Level5_v2.mp3" id="23_1a4ff"] [ext_resource type="AudioStream" uid="uid://cudbsaxq8i3dl" path="res://assets/audio/ACatGame_run.ogg" id="24_q1r4k"] [ext_resource type="AudioStream" uid="uid://053nc4ksgdfg" path="res://assets/audio/ACatGame_jump.ogg" id="25_gw5cp"] [ext_resource type="AudioStream" uid="uid://dom5x33m6nqul" path="res://assets/audio/ACatGame_star_collect.ogg" id="26_i55hd"] @@ -30,6 +30,7 @@ [ext_resource type="AudioStream" uid="uid://da084ylo50o0u" path="res://assets/audio/ACatGame_purr.ogg" id="28_ucg27"] [ext_resource type="AudioStream" uid="uid://bkduqnsqt4vjo" path="res://assets/audio/ACatGame_Game-End-6.ogg" id="29_1a4ff"] [ext_resource type="AudioStream" uid="uid://c8j0qv4ncy4s1" path="res://assets/audio/ACatGame_Level-End.mp3" id="30_tlhyy"] +[ext_resource type="PackedScene" uid="uid://3e4kxmne50j1" path="res://scenes/Pause.tscn" id="31_5fr5s"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qb6io"] texture = ExtResource("5_pqyxy") @@ -737,3 +738,5 @@ playback_type = 1 [node name="level_end" type="AudioStreamPlayer" parent="." unique_id=739460065] stream = ExtResource("30_tlhyy") playback_type = 1 + +[node name="Pause" parent="." unique_id=191443371 instance=ExtResource("31_5fr5s")] diff --git a/project.godot b/project.godot index 30d1823..828da81 100644 --- a/project.godot +++ b/project.godot @@ -96,6 +96,7 @@ jump={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":2,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) ] } diff --git a/scenes/Pause.tscn b/scenes/Pause.tscn new file mode 100644 index 0000000..283c887 --- /dev/null +++ b/scenes/Pause.tscn @@ -0,0 +1,31 @@ +[gd_scene format=3 uid="uid://3e4kxmne50j1"] + +[ext_resource type="Script" uid="uid://bvnhuxaptwrdw" path="res://scenes/pause.gd" id="1_wcpj6"] +[ext_resource type="FontFile" uid="uid://bcf7oh6t3psng" path="res://assets/fonts/ADVERT_0.TTF" id="2_8v81o"] + +[node name="Pause" type="CanvasLayer" unique_id=191443371] +script = ExtResource("1_wcpj6") + +[node name="ColorRect" type="ColorRect" parent="." unique_id=412077959] +clip_contents = true +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0, 0, 0, 0.60784316) + +[node name="Label" type="Label" parent="." unique_id=1846226122] +anchors_preset = 14 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +offset_top = -11.5 +offset_bottom = 11.5 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_fonts/font = ExtResource("2_8v81o") +theme_override_font_sizes/font_size = 72 +text = "PAWSED" +horizontal_alignment = 1 +vertical_alignment = 1 diff --git a/scenes/pause.gd b/scenes/pause.gd new file mode 100644 index 0000000..17bf7a9 --- /dev/null +++ b/scenes/pause.gd @@ -0,0 +1,21 @@ +extends CanvasLayer + +@onready var paused:bool = false + +# Called when the node enters the scene tree for the first time. +func _ready(): + process_mode = Node.PROCESS_MODE_ALWAYS + hide() + + +func _physics_process(delta): + if Input.is_key_pressed(KEY_ESCAPE) and paused == false: + await get_tree().create_timer(0.25).timeout + paused = true + get_tree().paused = true + show() + elif Input.is_key_pressed(KEY_ESCAPE) and paused == true: + await get_tree().create_timer(0.25).timeout + paused = false + get_tree().paused = false + hide()