diff --git a/max-effort/Resources/Day_Day1.tres b/max-effort/Resources/Day_Day1.tres index 5e3aeb8..54e04cc 100644 --- a/max-effort/Resources/Day_Day1.tres +++ b/max-effort/Resources/Day_Day1.tres @@ -1,9 +1,10 @@ -[gd_resource type="DayConfig" load_steps=3 format=3 uid="uid://d30pwvrr7m72j"] +[gd_resource type="DayConfig" load_steps=4 format=3 uid="uid://d30pwvrr7m72j"] +[ext_resource type="HazardDef" uid="uid://xsxsa2m5ryjr" path="res://Resources/Hazard_Phone.tres" id="1_ilyy2"] [ext_resource type="HazardDef" uid="uid://pgmnp6ev1ark" path="res://Resources/Hazard_GymBro.tres" id="1_qov1i"] [ext_resource type="PackedScene" uid="uid://dxq2510ywj1hy" path="res://Objects/bench_press.tscn" id="2_ilyy2"] [resource] target_weight = 25.0 mini_game_scene = ExtResource("2_ilyy2") -available_hazards = Array[HazardDef]([ExtResource("1_qov1i")]) +available_hazards = Array[HazardDef]([ExtResource("1_ilyy2"), ExtResource("1_qov1i")]) diff --git a/max-effort/Resources/Day_Day2.tres b/max-effort/Resources/Day_Day2.tres index 75b8262..e8fd6fc 100644 --- a/max-effort/Resources/Day_Day2.tres +++ b/max-effort/Resources/Day_Day2.tres @@ -1,6 +1,7 @@ -[gd_resource type="DayConfig" load_steps=3 format=3 uid="uid://b0j1f8h6tioaf"] +[gd_resource type="DayConfig" load_steps=4 format=3 uid="uid://b0j1f8h6tioaf"] [ext_resource type="HazardDef" uid="uid://pgmnp6ev1ark" path="res://Resources/Hazard_GymBro.tres" id="1_x1txs"] +[ext_resource type="HazardDef" uid="uid://xsxsa2m5ryjr" path="res://Resources/Hazard_Phone.tres" id="2_18026"] [ext_resource type="PackedScene" uid="uid://dx1k40qfioaas" path="res://Objects/deadlift.tscn" id="2_x1txs"] [resource] @@ -8,4 +9,4 @@ day_number = 1 day_title = "Day 2" target_weight = 7.0 mini_game_scene = ExtResource("2_x1txs") -available_hazards = Array[HazardDef]([ExtResource("1_x1txs")]) +available_hazards = Array[HazardDef]([ExtResource("1_x1txs"), ExtResource("2_18026")]) diff --git a/max-effort/Resources/Hazard_GymBro.tres b/max-effort/Resources/Hazard_GymBro.tres index 35abba4..e190e3c 100644 --- a/max-effort/Resources/Hazard_GymBro.tres +++ b/max-effort/Resources/Hazard_GymBro.tres @@ -1,35 +1,73 @@ -[gd_resource type="HazardDef" load_steps=14 format=3 uid="uid://pgmnp6ev1ark"] +[gd_resource type="HazardDef" load_steps=16 format=3 uid="uid://pgmnp6ev1ark"] -[ext_resource type="Texture2D" uid="uid://c43wo6u2c0d43" path="res://Sprites/chad_walk0.png" id="1_v1id6"] -[ext_resource type="Texture2D" uid="uid://dt5i4j2gvqso" path="res://Sprites/chad_walk1.png" id="2_xcd3t"] -[ext_resource type="Texture2D" uid="uid://by265t6kx8us4" path="res://Sprites/chad_walk2.png" id="3_57x2g"] -[ext_resource type="Texture2D" uid="uid://dway2w8pbk5lp" path="res://Sprites/chad_walk3.png" id="4_s8hf6"] -[ext_resource type="Texture2D" uid="uid://bunfddn1pa8pj" path="res://Sprites/chad_walk4.png" id="5_tdncn"] -[ext_resource type="Texture2D" uid="uid://664m2cxtmmur" path="res://Sprites/chad_wave0.png" id="6_twq7w"] -[ext_resource type="Texture2D" uid="uid://tu8ph6cjdwhv" path="res://Sprites/chad_wave1.png" id="7_jshom"] -[ext_resource type="Texture2D" uid="uid://b28aaketyf0t1" path="res://Sprites/chad_wave2.png" id="8_hejui"] -[ext_resource type="Texture2D" uid="uid://jyr4f2p7jbk8" path="res://Sprites/chad_wave3.png" id="9_envil"] -[ext_resource type="Texture2D" uid="uid://f013utfdsqqe" path="res://Sprites/chad_wave4.png" id="10_tcjtc"] -[ext_resource type="Texture2D" uid="uid://duryxgc54alp5" path="res://Sprites/chad_wave5.png" id="11_i0i8i"] -[ext_resource type="Texture2D" uid="uid://yy2yrm4gq6w4" path="res://Sprites/chad_wave6.png" id="12_seh7d"] +[ext_resource type="Texture2D" uid="uid://hbin8d5ctth0" path="res://Sprites/chad_walk.png" id="1_5k0w7"] +[ext_resource type="Texture2D" uid="uid://cdtf3ll2r3jqx" path="res://Sprites/chad_wave.png" id="2_jih8f"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_5k0w7"] +atlas = ExtResource("1_5k0w7") +region = Rect2(0, 0, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jih8f"] +atlas = ExtResource("1_5k0w7") +region = Rect2(506, 0, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gtt4v"] +atlas = ExtResource("1_5k0w7") +region = Rect2(1012, 0, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_r1ltb"] +atlas = ExtResource("1_5k0w7") +region = Rect2(0, 415, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_t6o42"] +atlas = ExtResource("1_5k0w7") +region = Rect2(506, 415, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_blvmx"] +atlas = ExtResource("2_jih8f") +region = Rect2(0, 0, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_aaypy"] +atlas = ExtResource("2_jih8f") +region = Rect2(506, 0, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_svufv"] +atlas = ExtResource("2_jih8f") +region = Rect2(1012, 0, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_cbnsu"] +atlas = ExtResource("2_jih8f") +region = Rect2(0, 415, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_8xkbk"] +atlas = ExtResource("2_jih8f") +region = Rect2(506, 415, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_v1id6"] +atlas = ExtResource("2_jih8f") +region = Rect2(1012, 415, 506, 415) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xcd3t"] +atlas = ExtResource("2_jih8f") +region = Rect2(0, 830, 506, 415) [sub_resource type="SpriteFrames" id="SpriteFrames_44y3n"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("1_v1id6") +"texture": SubResource("AtlasTexture_5k0w7") }, { "duration": 1.0, -"texture": ExtResource("2_xcd3t") +"texture": SubResource("AtlasTexture_jih8f") }, { "duration": 1.0, -"texture": ExtResource("3_57x2g") +"texture": SubResource("AtlasTexture_gtt4v") }, { "duration": 1.0, -"texture": ExtResource("4_s8hf6") +"texture": SubResource("AtlasTexture_r1ltb") }, { "duration": 1.0, -"texture": ExtResource("5_tdncn") +"texture": SubResource("AtlasTexture_t6o42") }], "loop": true, "name": &"walking", @@ -37,25 +75,25 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("6_twq7w") +"texture": SubResource("AtlasTexture_blvmx") }, { "duration": 1.0, -"texture": ExtResource("7_jshom") +"texture": SubResource("AtlasTexture_aaypy") }, { "duration": 1.0, -"texture": ExtResource("8_hejui") +"texture": SubResource("AtlasTexture_svufv") }, { "duration": 1.0, -"texture": ExtResource("9_envil") +"texture": SubResource("AtlasTexture_cbnsu") }, { "duration": 1.0, -"texture": ExtResource("10_tcjtc") +"texture": SubResource("AtlasTexture_8xkbk") }, { "duration": 1.0, -"texture": ExtResource("11_i0i8i") +"texture": SubResource("AtlasTexture_v1id6") }, { "duration": 1.0, -"texture": ExtResource("12_seh7d") +"texture": SubResource("AtlasTexture_xcd3t") }], "loop": true, "name": &"waving", diff --git a/max-effort/Resources/Hazard_Phone.tres b/max-effort/Resources/Hazard_Phone.tres new file mode 100644 index 0000000..29cb7e2 --- /dev/null +++ b/max-effort/Resources/Hazard_Phone.tres @@ -0,0 +1,39 @@ +[gd_resource type="HazardDef" load_steps=7 format=3 uid="uid://xsxsa2m5ryjr"] + +[ext_resource type="Texture2D" uid="uid://qxwqstvnefxh" path="res://Sprites/phone0000.png" id="1_3ftmh"] +[ext_resource type="Texture2D" uid="uid://cgrnf6c1m06yj" path="res://Sprites/phone0001.png" id="2_c0vd0"] +[ext_resource type="Texture2D" uid="uid://c7d4dcdpdd0jg" path="res://Sprites/phone0002.png" id="3_1545i"] +[ext_resource type="Texture2D" uid="uid://crhfygv6chc4v" path="res://Sprites/phone0003.png" id="4_lwhbi"] +[ext_resource type="Texture2D" uid="uid://b8looen5t2i3f" path="res://Sprites/phone0004.png" id="5_7usw4"] + +[sub_resource type="SpriteFrames" id="SpriteFrames_jf2a0"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_3ftmh") +}, { +"duration": 1.0, +"texture": ExtResource("2_c0vd0") +}, { +"duration": 1.0, +"texture": ExtResource("3_1545i") +}, { +"duration": 1.0, +"texture": ExtResource("4_lwhbi") +}, { +"duration": 1.0, +"texture": ExtResource("5_7usw4") +}], +"loop": true, +"name": &"default", +"speed": 12.0 +}] + +[resource] +hazard_type = "PhoneDistraction" +display_name = "Phone" +animations = SubResource("SpriteFrames_jf2a0") +idle_anim_name = "default" +walk_anim_name = "" +time_to_fail = 6.0 +spawn_weight = 0.4 diff --git a/max-effort/Resources/SoundBank.tres b/max-effort/Resources/SoundBank.tres index 85d0084..044c7b1 100644 --- a/max-effort/Resources/SoundBank.tres +++ b/max-effort/Resources/SoundBank.tres @@ -1,3 +1,26 @@ -[gd_resource type="SoundBank" format=3 uid="uid://b8ouri8tqw8vp"] +[gd_resource type="SoundBank" load_steps=12 format=3 uid="uid://b8ouri8tqw8vp"] + +[ext_resource type="AudioStream" uid="uid://b2msvw1h4ampg" path="res://Sfxs/Ygh.ogg" id="1_1l0qw"] +[ext_resource type="AudioStream" uid="uid://bbchwsohdu0pk" path="res://Sfxs/CameraTrauma.ogg" id="1_lms4n"] +[ext_resource type="AudioStream" uid="uid://rmyrftgx0wi3" path="res://Sfxs/dzwoni_debil.ogg" id="1_t7wpv"] +[ext_resource type="AudioStream" uid="uid://di6ngr3imfdo8" path="res://Sfxs/Failure.ogg" id="2_fccuv"] +[ext_resource type="AudioStream" uid="uid://c2k77xvake638" path="res://Sfxs/Bro.ogg" id="3_iiodx"] +[ext_resource type="AudioStream" uid="uid://drihn3fye1ar2" path="res://Sfxs/heartbeat.ogg" id="4_lms4n"] +[ext_resource type="AudioStream" uid="uid://bekeytl7id80p" path="res://Sfxs/pop.ogg" id="5_3acj8"] +[ext_resource type="AudioStream" uid="uid://e1eyqry63db6" path="res://Sfxs/Get out.ogg" id="5_a5p2r"] +[ext_resource type="AudioStream" uid="uid://ddyk3s84t56qc" path="res://Sfxs/HazardSpawn.ogg" id="6_dcb8s"] +[ext_resource type="AudioStream" uid="uid://bv37o4wgirvt0" path="res://Sfxs/Hnngh.ogg" id="7_3acj8"] +[ext_resource type="AudioStream" uid="uid://bpvek3n7gni07" path="res://Sfxs/Light weight.ogg" id="8_dcb8s"] [resource] +strain_loop = ExtResource("7_3acj8") +effort_exhale = ExtResource("1_1l0qw") +win_stinger = ExtResource("8_dcb8s") +fail_stinger = ExtResource("2_fccuv") +heartbeat_loop = ExtResource("4_lms4n") +hazard_spawn = ExtResource("6_dcb8s") +hazard_resolve = ExtResource("5_3acj8") +camera_trauma = ExtResource("1_lms4n") +phone_ring = ExtResource("1_t7wpv") +gym_bro = ExtResource("3_iiodx") +manager_get_out = ExtResource("5_a5p2r") diff --git a/max-effort/Scenes/main.tscn b/max-effort/Scenes/main.tscn index d73ed23..4d06e4f 100644 --- a/max-effort/Scenes/main.tscn +++ b/max-effort/Scenes/main.tscn @@ -7,6 +7,7 @@ [ext_resource type="PackedScene" uid="uid://bg4uaukekjbx" path="res://Scenes/main_menu.tscn" id="4_6bp64"] [ext_resource type="PackedScene" uid="uid://bqxc62tofqger" path="res://Objects/hazard_animated.tscn" id="4_21xkr"] [ext_resource type="DayConfig" uid="uid://b0j1f8h6tioaf" path="res://Resources/Day_Day2.tres" id="4_344ge"] +[ext_resource type="HazardDef" uid="uid://xsxsa2m5ryjr" path="res://Resources/Hazard_Phone.tres" id="6_344ge"] [sub_resource type="Curve" id="Curve_bo1nx"] _data = [Vector2(0, 0), 0.0, 1.4, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] @@ -47,8 +48,8 @@ camera = NodePath("../../Camera2D") min_focus_for_shake = 0.7 [node name="HazardSystem" type="HazardSystem" parent="Systems" node_paths=PackedStringArray("spawn_locations")] -possible_hazards = Array[HazardDef]([ExtResource("3_kry3j")]) -spawn_locations = [NodePath("../../HazardSpots/Right"), NodePath("../../HazardSpots/Left")] +possible_hazards = Array[HazardDef]([ExtResource("3_kry3j"), ExtResource("6_344ge")]) +spawn_locations = [NodePath("../../HazardSpots/Right"), NodePath("../../HazardSpots/Left"), NodePath("../../HazardSpots/Top"), NodePath("../../HazardSpots/Down")] hazard_prefab = ExtResource("4_21xkr") [node name="GameContainer" type="Node" parent="."] @@ -58,6 +59,12 @@ hazard_prefab = ExtResource("4_21xkr") [node name="Right" type="Marker2D" parent="HazardSpots"] position = Vector2(502, 0) +[node name="Top" type="Marker2D" parent="HazardSpots"] +position = Vector2(0, -228) + +[node name="Down" type="Marker2D" parent="HazardSpots"] +position = Vector2(0, 212) + [node name="Left" type="Marker2D" parent="HazardSpots"] position = Vector2(-500, 0) diff --git a/max-effort/Sfxs/Bro.ogg b/max-effort/Sfxs/Bro.ogg new file mode 100644 index 0000000..dd5e4ad Binary files /dev/null and b/max-effort/Sfxs/Bro.ogg differ diff --git a/max-effort/Sfxs/Bro.ogg.import b/max-effort/Sfxs/Bro.ogg.import new file mode 100644 index 0000000..7ec46df --- /dev/null +++ b/max-effort/Sfxs/Bro.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c2k77xvake638" +path="res://.godot/imported/Bro.ogg-ba58997d7e8861703a444bbaf615f57d.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Bro.ogg" +dest_files=["res://.godot/imported/Bro.ogg-ba58997d7e8861703a444bbaf615f57d.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/CameraTrauma.ogg b/max-effort/Sfxs/CameraTrauma.ogg new file mode 100644 index 0000000..b45fa50 Binary files /dev/null and b/max-effort/Sfxs/CameraTrauma.ogg differ diff --git a/max-effort/Sfxs/CameraTrauma.ogg.import b/max-effort/Sfxs/CameraTrauma.ogg.import new file mode 100644 index 0000000..30fb606 --- /dev/null +++ b/max-effort/Sfxs/CameraTrauma.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bbchwsohdu0pk" +path="res://.godot/imported/CameraTrauma.ogg-961a7630e3be4d7c7c843cacb222bafc.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/CameraTrauma.ogg" +dest_files=["res://.godot/imported/CameraTrauma.ogg-961a7630e3be4d7c7c843cacb222bafc.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/Failure.ogg b/max-effort/Sfxs/Failure.ogg new file mode 100644 index 0000000..ca908b8 Binary files /dev/null and b/max-effort/Sfxs/Failure.ogg differ diff --git a/max-effort/Sfxs/Failure.ogg.import b/max-effort/Sfxs/Failure.ogg.import new file mode 100644 index 0000000..933fc80 --- /dev/null +++ b/max-effort/Sfxs/Failure.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://di6ngr3imfdo8" +path="res://.godot/imported/Failure.ogg-cc422f04faa247f534f43f0e1d7191aa.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Failure.ogg" +dest_files=["res://.godot/imported/Failure.ogg-cc422f04faa247f534f43f0e1d7191aa.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/Get out.ogg b/max-effort/Sfxs/Get out.ogg new file mode 100644 index 0000000..ed1354d Binary files /dev/null and b/max-effort/Sfxs/Get out.ogg differ diff --git a/max-effort/Sfxs/Get out.ogg.import b/max-effort/Sfxs/Get out.ogg.import new file mode 100644 index 0000000..92113a8 --- /dev/null +++ b/max-effort/Sfxs/Get out.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://e1eyqry63db6" +path="res://.godot/imported/Get out.ogg-479d8ca30559cfd7087bc8301b99aa0d.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Get out.ogg" +dest_files=["res://.godot/imported/Get out.ogg-479d8ca30559cfd7087bc8301b99aa0d.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/HazardSpawn.ogg b/max-effort/Sfxs/HazardSpawn.ogg new file mode 100644 index 0000000..b36b844 Binary files /dev/null and b/max-effort/Sfxs/HazardSpawn.ogg differ diff --git a/max-effort/Sfxs/HazardSpawn.ogg.import b/max-effort/Sfxs/HazardSpawn.ogg.import new file mode 100644 index 0000000..c97b1d0 --- /dev/null +++ b/max-effort/Sfxs/HazardSpawn.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://ddyk3s84t56qc" +path="res://.godot/imported/HazardSpawn.ogg-f2d60ee3a7d3c850b788885c6e0d377b.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/HazardSpawn.ogg" +dest_files=["res://.godot/imported/HazardSpawn.ogg-f2d60ee3a7d3c850b788885c6e0d377b.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/Hnngh.ogg b/max-effort/Sfxs/Hnngh.ogg new file mode 100644 index 0000000..b9e987c Binary files /dev/null and b/max-effort/Sfxs/Hnngh.ogg differ diff --git a/max-effort/Sfxs/Hnngh.ogg.import b/max-effort/Sfxs/Hnngh.ogg.import new file mode 100644 index 0000000..0cbeef7 --- /dev/null +++ b/max-effort/Sfxs/Hnngh.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bv37o4wgirvt0" +path="res://.godot/imported/Hnngh.ogg-42ec01714846a8d3fc190724591c0746.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Hnngh.ogg" +dest_files=["res://.godot/imported/Hnngh.ogg-42ec01714846a8d3fc190724591c0746.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/Light weight.ogg b/max-effort/Sfxs/Light weight.ogg new file mode 100644 index 0000000..df9103a Binary files /dev/null and b/max-effort/Sfxs/Light weight.ogg differ diff --git a/max-effort/Sfxs/Light weight.ogg.import b/max-effort/Sfxs/Light weight.ogg.import new file mode 100644 index 0000000..408939a --- /dev/null +++ b/max-effort/Sfxs/Light weight.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bpvek3n7gni07" +path="res://.godot/imported/Light weight.ogg-f3805a7350fa53ea58965c4a0283bac7.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Light weight.ogg" +dest_files=["res://.godot/imported/Light weight.ogg-f3805a7350fa53ea58965c4a0283bac7.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/Yeah!.ogg b/max-effort/Sfxs/Yeah!.ogg new file mode 100644 index 0000000..e7527e8 Binary files /dev/null and b/max-effort/Sfxs/Yeah!.ogg differ diff --git a/max-effort/Sfxs/Yeah!.ogg.import b/max-effort/Sfxs/Yeah!.ogg.import new file mode 100644 index 0000000..cdd7143 --- /dev/null +++ b/max-effort/Sfxs/Yeah!.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://yxfii24eknql" +path="res://.godot/imported/Yeah!.ogg-dfdca4e36e0deefe2ea689d474a3f9d7.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Yeah!.ogg" +dest_files=["res://.godot/imported/Yeah!.ogg-dfdca4e36e0deefe2ea689d474a3f9d7.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/Ygh.ogg b/max-effort/Sfxs/Ygh.ogg new file mode 100644 index 0000000..d230893 Binary files /dev/null and b/max-effort/Sfxs/Ygh.ogg differ diff --git a/max-effort/Sfxs/Ygh.ogg.import b/max-effort/Sfxs/Ygh.ogg.import new file mode 100644 index 0000000..225105e --- /dev/null +++ b/max-effort/Sfxs/Ygh.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b2msvw1h4ampg" +path="res://.godot/imported/Ygh.ogg-4963b418a7c5a7dca66fed00ede24701.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/Ygh.ogg" +dest_files=["res://.godot/imported/Ygh.ogg-4963b418a7c5a7dca66fed00ede24701.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/dzwoni_debil.ogg b/max-effort/Sfxs/dzwoni_debil.ogg new file mode 100644 index 0000000..7984107 Binary files /dev/null and b/max-effort/Sfxs/dzwoni_debil.ogg differ diff --git a/max-effort/Sfxs/dzwoni_debil.ogg.import b/max-effort/Sfxs/dzwoni_debil.ogg.import new file mode 100644 index 0000000..225f5e4 --- /dev/null +++ b/max-effort/Sfxs/dzwoni_debil.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://rmyrftgx0wi3" +path="res://.godot/imported/dzwoni_debil.ogg-3359f821a7977762cb4e36c50337b7ef.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/dzwoni_debil.ogg" +dest_files=["res://.godot/imported/dzwoni_debil.ogg-3359f821a7977762cb4e36c50337b7ef.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/heartbeat.ogg b/max-effort/Sfxs/heartbeat.ogg new file mode 100644 index 0000000..664f943 Binary files /dev/null and b/max-effort/Sfxs/heartbeat.ogg differ diff --git a/max-effort/Sfxs/heartbeat.ogg.import b/max-effort/Sfxs/heartbeat.ogg.import new file mode 100644 index 0000000..4eef1d6 --- /dev/null +++ b/max-effort/Sfxs/heartbeat.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://drihn3fye1ar2" +path="res://.godot/imported/heartbeat.ogg-8842e60abfe3626f26008c57c60f42d0.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/heartbeat.ogg" +dest_files=["res://.godot/imported/heartbeat.ogg-8842e60abfe3626f26008c57c60f42d0.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sfxs/pop.ogg b/max-effort/Sfxs/pop.ogg new file mode 100644 index 0000000..5972704 Binary files /dev/null and b/max-effort/Sfxs/pop.ogg differ diff --git a/max-effort/Sfxs/pop.ogg.import b/max-effort/Sfxs/pop.ogg.import new file mode 100644 index 0000000..2614eb7 --- /dev/null +++ b/max-effort/Sfxs/pop.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bekeytl7id80p" +path="res://.godot/imported/pop.ogg-1cbfe42b9377810791cc8f7677c7d355.oggvorbisstr" + +[deps] + +source_file="res://Sfxs/pop.ogg" +dest_files=["res://.godot/imported/pop.ogg-1cbfe42b9377810791cc8f7677c7d355.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/max-effort/Sprites/chad_walk.png b/max-effort/Sprites/chad_walk.png new file mode 100644 index 0000000..0abbeba Binary files /dev/null and b/max-effort/Sprites/chad_walk.png differ diff --git a/max-effort/Sprites/chad_wave0.png.import b/max-effort/Sprites/chad_walk.png.import similarity index 74% rename from max-effort/Sprites/chad_wave0.png.import rename to max-effort/Sprites/chad_walk.png.import index 10c63d0..8fa646e 100644 --- a/max-effort/Sprites/chad_wave0.png.import +++ b/max-effort/Sprites/chad_walk.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://664m2cxtmmur" -path="res://.godot/imported/chad_wave0.png-7452b570847815d288a291f1ec8574e6.ctex" +uid="uid://hbin8d5ctth0" +path="res://.godot/imported/chad_walk.png-46fbd894d1c39b0df171668dc784f8f3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Sprites/chad_wave0.png" -dest_files=["res://.godot/imported/chad_wave0.png-7452b570847815d288a291f1ec8574e6.ctex"] +source_file="res://Sprites/chad_walk.png" +dest_files=["res://.godot/imported/chad_walk.png-46fbd894d1c39b0df171668dc784f8f3.ctex"] [params] diff --git a/max-effort/Sprites/chad_walk.png~ b/max-effort/Sprites/chad_walk.png~ new file mode 100644 index 0000000..1c0ada9 Binary files /dev/null and b/max-effort/Sprites/chad_walk.png~ differ diff --git a/max-effort/Sprites/chad_walk0.png b/max-effort/Sprites/chad_walk0.png deleted file mode 100644 index 99af52f..0000000 Binary files a/max-effort/Sprites/chad_walk0.png and /dev/null differ diff --git a/max-effort/Sprites/chad_walk0.png-autosave.kra b/max-effort/Sprites/chad_walk0.png-autosave.kra new file mode 100644 index 0000000..b075f66 Binary files /dev/null and b/max-effort/Sprites/chad_walk0.png-autosave.kra differ diff --git a/max-effort/Sprites/chad_walk0.png.import b/max-effort/Sprites/chad_walk0.png.import deleted file mode 100644 index eb77a19..0000000 --- a/max-effort/Sprites/chad_walk0.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c43wo6u2c0d43" -path="res://.godot/imported/chad_walk0.png-8e4fc165652b5af437c3106b59f93650.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_walk0.png" -dest_files=["res://.godot/imported/chad_walk0.png-8e4fc165652b5af437c3106b59f93650.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_walk1.png b/max-effort/Sprites/chad_walk1.png deleted file mode 100644 index 64fe665..0000000 Binary files a/max-effort/Sprites/chad_walk1.png and /dev/null differ diff --git a/max-effort/Sprites/chad_walk2.png b/max-effort/Sprites/chad_walk2.png deleted file mode 100644 index 5741254..0000000 Binary files a/max-effort/Sprites/chad_walk2.png and /dev/null differ diff --git a/max-effort/Sprites/chad_walk2.png.import b/max-effort/Sprites/chad_walk2.png.import deleted file mode 100644 index 3e65adf..0000000 --- a/max-effort/Sprites/chad_walk2.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://by265t6kx8us4" -path="res://.godot/imported/chad_walk2.png-6275d1149cbf6b3a53f8cc57ae4023c9.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_walk2.png" -dest_files=["res://.godot/imported/chad_walk2.png-6275d1149cbf6b3a53f8cc57ae4023c9.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_walk3.png b/max-effort/Sprites/chad_walk3.png deleted file mode 100644 index af13872..0000000 Binary files a/max-effort/Sprites/chad_walk3.png and /dev/null differ diff --git a/max-effort/Sprites/chad_walk3.png.import b/max-effort/Sprites/chad_walk3.png.import deleted file mode 100644 index cb228b1..0000000 --- a/max-effort/Sprites/chad_walk3.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dway2w8pbk5lp" -path="res://.godot/imported/chad_walk3.png-83f190047fc9396d428eeeadc1ee67bb.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_walk3.png" -dest_files=["res://.godot/imported/chad_walk3.png-83f190047fc9396d428eeeadc1ee67bb.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_walk4.png b/max-effort/Sprites/chad_walk4.png deleted file mode 100644 index 5b75302..0000000 Binary files a/max-effort/Sprites/chad_walk4.png and /dev/null differ diff --git a/max-effort/Sprites/chad_walk4.png.import b/max-effort/Sprites/chad_walk4.png.import deleted file mode 100644 index b21fed2..0000000 --- a/max-effort/Sprites/chad_walk4.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bunfddn1pa8pj" -path="res://.godot/imported/chad_walk4.png-e04181ba7df8daa1c7400ecfa9120b36.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_walk4.png" -dest_files=["res://.godot/imported/chad_walk4.png-e04181ba7df8daa1c7400ecfa9120b36.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_wave.png b/max-effort/Sprites/chad_wave.png new file mode 100644 index 0000000..b9f6a48 Binary files /dev/null and b/max-effort/Sprites/chad_wave.png differ diff --git a/max-effort/Sprites/chad_wave1.png.import b/max-effort/Sprites/chad_wave.png.import similarity index 74% rename from max-effort/Sprites/chad_wave1.png.import rename to max-effort/Sprites/chad_wave.png.import index 4f22b89..e1a940a 100644 --- a/max-effort/Sprites/chad_wave1.png.import +++ b/max-effort/Sprites/chad_wave.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://tu8ph6cjdwhv" -path="res://.godot/imported/chad_wave1.png-f0592da2a6c2b61ba47c87e39b1a9a35.ctex" +uid="uid://cdtf3ll2r3jqx" +path="res://.godot/imported/chad_wave.png-e0bdd97ba26d0b60b31fd8ad75e05484.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Sprites/chad_wave1.png" -dest_files=["res://.godot/imported/chad_wave1.png-f0592da2a6c2b61ba47c87e39b1a9a35.ctex"] +source_file="res://Sprites/chad_wave.png" +dest_files=["res://.godot/imported/chad_wave.png-e0bdd97ba26d0b60b31fd8ad75e05484.ctex"] [params] diff --git a/max-effort/Sprites/chad_wave.png~ b/max-effort/Sprites/chad_wave.png~ new file mode 100644 index 0000000..ddc05c2 Binary files /dev/null and b/max-effort/Sprites/chad_wave.png~ differ diff --git a/max-effort/Sprites/chad_wave0.png b/max-effort/Sprites/chad_wave0.png deleted file mode 100644 index 47033a5..0000000 Binary files a/max-effort/Sprites/chad_wave0.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave1.png b/max-effort/Sprites/chad_wave1.png deleted file mode 100644 index 7354989..0000000 Binary files a/max-effort/Sprites/chad_wave1.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave2.png b/max-effort/Sprites/chad_wave2.png deleted file mode 100644 index 8fabd22..0000000 Binary files a/max-effort/Sprites/chad_wave2.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave2.png.import b/max-effort/Sprites/chad_wave2.png.import deleted file mode 100644 index f5d0c10..0000000 --- a/max-effort/Sprites/chad_wave2.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://b28aaketyf0t1" -path="res://.godot/imported/chad_wave2.png-2c28d86e420f732e4cc32daf20b49920.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_wave2.png" -dest_files=["res://.godot/imported/chad_wave2.png-2c28d86e420f732e4cc32daf20b49920.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_wave3.png b/max-effort/Sprites/chad_wave3.png deleted file mode 100644 index eb227dc..0000000 Binary files a/max-effort/Sprites/chad_wave3.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave4.png b/max-effort/Sprites/chad_wave4.png deleted file mode 100644 index 58bcd4d..0000000 Binary files a/max-effort/Sprites/chad_wave4.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave4.png.import b/max-effort/Sprites/chad_wave4.png.import deleted file mode 100644 index df3686c..0000000 --- a/max-effort/Sprites/chad_wave4.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://f013utfdsqqe" -path="res://.godot/imported/chad_wave4.png-d9dcca2f7e8dd0d27166f8047669505f.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_wave4.png" -dest_files=["res://.godot/imported/chad_wave4.png-d9dcca2f7e8dd0d27166f8047669505f.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_wave5.png b/max-effort/Sprites/chad_wave5.png deleted file mode 100644 index ff841ca..0000000 Binary files a/max-effort/Sprites/chad_wave5.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave5.png.import b/max-effort/Sprites/chad_wave5.png.import deleted file mode 100644 index 83d2a28..0000000 --- a/max-effort/Sprites/chad_wave5.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://duryxgc54alp5" -path="res://.godot/imported/chad_wave5.png-aa21a1c7a76438f4a886d5f1b68bbcc5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_wave5.png" -dest_files=["res://.godot/imported/chad_wave5.png-aa21a1c7a76438f4a886d5f1b68bbcc5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/chad_wave6.png b/max-effort/Sprites/chad_wave6.png deleted file mode 100644 index a63c2b9..0000000 Binary files a/max-effort/Sprites/chad_wave6.png and /dev/null differ diff --git a/max-effort/Sprites/chad_wave6.png.import b/max-effort/Sprites/chad_wave6.png.import deleted file mode 100644 index e9cea02..0000000 --- a/max-effort/Sprites/chad_wave6.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://yy2yrm4gq6w4" -path="res://.godot/imported/chad_wave6.png-3d42c992783b312c1ab7802034e07a03.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Sprites/chad_wave6.png" -dest_files=["res://.godot/imported/chad_wave6.png-3d42c992783b312c1ab7802034e07a03.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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/max-effort/Sprites/icon.kra b/max-effort/Sprites/icon.kra new file mode 100644 index 0000000..fe710a0 Binary files /dev/null and b/max-effort/Sprites/icon.kra differ diff --git a/max-effort/Sprites/icon.png b/max-effort/Sprites/icon.png new file mode 100644 index 0000000..8e8fc3b Binary files /dev/null and b/max-effort/Sprites/icon.png differ diff --git a/max-effort/Sprites/chad_wave3.png.import b/max-effort/Sprites/icon.png.import similarity index 74% rename from max-effort/Sprites/chad_wave3.png.import rename to max-effort/Sprites/icon.png.import index 2d5cce1..c442534 100644 --- a/max-effort/Sprites/chad_wave3.png.import +++ b/max-effort/Sprites/icon.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://jyr4f2p7jbk8" -path="res://.godot/imported/chad_wave3.png-c5f30d3e0f297bd9fc2597ab6e730b5a.ctex" +uid="uid://c5j20bw65n5lv" +path="res://.godot/imported/icon.png-f9ba9008f31679cd240e2c5f33a9a4fb.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Sprites/chad_wave3.png" -dest_files=["res://.godot/imported/chad_wave3.png-c5f30d3e0f297bd9fc2597ab6e730b5a.ctex"] +source_file="res://Sprites/icon.png" +dest_files=["res://.godot/imported/icon.png-f9ba9008f31679cd240e2c5f33a9a4fb.ctex"] [params] diff --git a/max-effort/Sprites/phone0000.png b/max-effort/Sprites/phone0000.png new file mode 100644 index 0000000..dba398e Binary files /dev/null and b/max-effort/Sprites/phone0000.png differ diff --git a/max-effort/Sprites/chad_walk1.png.import b/max-effort/Sprites/phone0000.png.import similarity index 74% rename from max-effort/Sprites/chad_walk1.png.import rename to max-effort/Sprites/phone0000.png.import index 3cc3cd3..531b828 100644 --- a/max-effort/Sprites/chad_walk1.png.import +++ b/max-effort/Sprites/phone0000.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dt5i4j2gvqso" -path="res://.godot/imported/chad_walk1.png-33816be91d7ff97b4b5f437f937fae6e.ctex" +uid="uid://qxwqstvnefxh" +path="res://.godot/imported/phone0000.png-cb1054f0e5a2be871287befd6820a302.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Sprites/chad_walk1.png" -dest_files=["res://.godot/imported/chad_walk1.png-33816be91d7ff97b4b5f437f937fae6e.ctex"] +source_file="res://Sprites/phone0000.png" +dest_files=["res://.godot/imported/phone0000.png-cb1054f0e5a2be871287befd6820a302.ctex"] [params] diff --git a/max-effort/Sprites/phone0001.png b/max-effort/Sprites/phone0001.png new file mode 100644 index 0000000..4a83e3c Binary files /dev/null and b/max-effort/Sprites/phone0001.png differ diff --git a/max-effort/Sprites/phone0001.png.import b/max-effort/Sprites/phone0001.png.import new file mode 100644 index 0000000..f712336 --- /dev/null +++ b/max-effort/Sprites/phone0001.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cgrnf6c1m06yj" +path="res://.godot/imported/phone0001.png-f437dac95e270f88fe968cceb8493ec2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/phone0001.png" +dest_files=["res://.godot/imported/phone0001.png-f437dac95e270f88fe968cceb8493ec2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/max-effort/Sprites/phone0002.png b/max-effort/Sprites/phone0002.png new file mode 100644 index 0000000..8754f7b Binary files /dev/null and b/max-effort/Sprites/phone0002.png differ diff --git a/max-effort/Sprites/phone0002.png.import b/max-effort/Sprites/phone0002.png.import new file mode 100644 index 0000000..1583992 --- /dev/null +++ b/max-effort/Sprites/phone0002.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7d4dcdpdd0jg" +path="res://.godot/imported/phone0002.png-f268f07a6354618e2320a960f4068d50.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/phone0002.png" +dest_files=["res://.godot/imported/phone0002.png-f268f07a6354618e2320a960f4068d50.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/max-effort/Sprites/phone0003.png b/max-effort/Sprites/phone0003.png new file mode 100644 index 0000000..ff53331 Binary files /dev/null and b/max-effort/Sprites/phone0003.png differ diff --git a/max-effort/Sprites/phone0003.png.import b/max-effort/Sprites/phone0003.png.import new file mode 100644 index 0000000..ec25256 --- /dev/null +++ b/max-effort/Sprites/phone0003.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://crhfygv6chc4v" +path="res://.godot/imported/phone0003.png-3ea20e80ee50567b73a1106600745f12.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/phone0003.png" +dest_files=["res://.godot/imported/phone0003.png-3ea20e80ee50567b73a1106600745f12.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/max-effort/Sprites/phone0004.png b/max-effort/Sprites/phone0004.png new file mode 100644 index 0000000..706fae1 Binary files /dev/null and b/max-effort/Sprites/phone0004.png differ diff --git a/max-effort/Sprites/phone0004.png.import b/max-effort/Sprites/phone0004.png.import new file mode 100644 index 0000000..8c1d8f6 --- /dev/null +++ b/max-effort/Sprites/phone0004.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8looen5t2i3f" +path="res://.godot/imported/phone0004.png-dab818f559aade0ca6a89a8c7e71989e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/phone0004.png" +dest_files=["res://.godot/imported/phone0004.png-dab818f559aade0ca6a89a8c7e71989e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/max-effort/icon.svg b/max-effort/icon.svg deleted file mode 100644 index c6bbb7d..0000000 --- a/max-effort/icon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/max-effort/icon.svg.import b/max-effort/icon.svg.import deleted file mode 100644 index 224967c..0000000 --- a/max-effort/icon.svg.import +++ /dev/null @@ -1,43 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d1exufucxsjrq" -path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://icon.svg" -dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -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/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/max-effort/project.godot b/max-effort/project.godot index 87c5e6a..bbb95c8 100644 --- a/max-effort/project.godot +++ b/max-effort/project.godot @@ -10,10 +10,10 @@ config_version=5 [application] -config/name="max-effort" +config/name="Max Effort" run/main_scene="uid://bg4uaukekjbx" config/features=PackedStringArray("4.5", "GL Compatibility") -config/icon="res://icon.svg" +config/icon="uid://c5j20bw65n5lv" [autoload] diff --git a/rust/src/data/hazard_def.rs b/rust/src/data/hazard_def.rs index faf5229..e625a99 100644 --- a/rust/src/data/hazard_def.rs +++ b/rust/src/data/hazard_def.rs @@ -1,6 +1,6 @@ use godot::{classes::SpriteFrames, prelude::*}; -#[derive(GodotConvert, Export, Var, Default, Clone, PartialEq, Eq, Debug)] +#[derive(GodotConvert, Export, Var, Default, Clone, PartialEq, Eq, Debug, Hash)] #[godot(via=GString)] pub enum HazardType { #[default] diff --git a/rust/src/data/sound_bank.rs b/rust/src/data/sound_bank.rs index aab5de9..6cfdb3e 100644 --- a/rust/src/data/sound_bank.rs +++ b/rust/src/data/sound_bank.rs @@ -19,6 +19,12 @@ pub struct SoundBank { pub hazard_resolve: Option>, #[export] pub camera_trauma: Option>, + #[export] + pub phone_ring: Option>, + #[export] + pub gym_bro: Option>, + #[export] + pub manager_get_out: Option>, #[export] pub menu_music: Option>, @@ -40,6 +46,9 @@ impl IResource for SoundBank { hazard_spawn: None, hazard_resolve: None, camera_trauma: None, + phone_ring: None, + gym_bro: None, + manager_get_out: None, menu_music: None, game_music: None, base, diff --git a/rust/src/systems/sound_manager.rs b/rust/src/systems/sound_manager.rs index 8fb8a27..a869a58 100644 --- a/rust/src/systems/sound_manager.rs +++ b/rust/src/systems/sound_manager.rs @@ -1,4 +1,10 @@ -use crate::{consts, core::event_bus::EventBus, data::sound_bank::SoundBank}; +use std::collections::HashMap; + +use crate::{ + consts, + core::event_bus::EventBus, + data::{hazard_def::HazardType, sound_bank::SoundBank}, +}; use godot::{ classes::{AudioServer, AudioStream, AudioStreamPlayer}, prelude::*, @@ -24,6 +30,7 @@ pub struct SoundManager { is_lifting: bool, current_lift_progress: f32, + active_hazard_sounds: HashMap, master_bus_idx: i32, music_bus_idx: i32, @@ -50,6 +57,7 @@ impl INode for SoundManager { master_bus_idx: audio_server.get_bus_index("Master"), music_bus_idx: audio_server.get_bus_index("Music"), sfx_bus_idx: audio_server.get_bus_index("Sfx"), + active_hazard_sounds: HashMap::new(), event_bus: None, base, } @@ -116,16 +124,18 @@ impl SoundManager { self.bank.as_ref().and_then(|b| selector(&b.bind())) } - fn play_bank_sfx(&mut self, selector: F, pitch: f32) + fn play_bank_sfx(&mut self, selector: F, pitch: f32) -> Option where F: FnOnce(&SoundBank) -> Option>, { if let Some(clip) = self.get_stream(selector) { - self.play_sfx(clip, pitch); + self.play_sfx(clip, pitch) + } else { + None } } - fn play_sfx(&mut self, clip: Gd, pitch: f32) { + fn play_sfx(&mut self, clip: Gd, pitch: f32) -> Option { let mut chosen_index = None; for (i, p) in self.sfx_pool.iter_mut().enumerate() { @@ -149,12 +159,16 @@ impl SoundManager { } if let Some(idx) = chosen_index { + self.active_hazard_sounds.retain(|_, v| *v != idx); + if let Some(p) = self.sfx_pool.get_mut(idx) { p.set_stream(&clip); p.set_pitch_scale(pitch); p.play(); } } + + chosen_index } fn play_music(&mut self, clip: Gd) { @@ -238,13 +252,28 @@ impl SoundManager { } #[func] - fn on_hazard_resolved(&mut self, _type: String) { + fn on_hazard_resolved(&mut self, hazard_type: HazardType) { + if let Some(idx) = self.active_hazard_sounds.remove(&hazard_type) { + if let Some(p) = self.sfx_pool.get_mut(idx) { + p.stop(); + } + } + self.play_bank_sfx(|b| b.hazard_resolve.clone(), 1.0); } #[func] - fn on_hazard_spawned(&mut self, _type: String) { - self.play_bank_sfx(|b| b.hazard_spawn.clone(), 1.0); + fn on_hazard_spawned(&mut self, hazard_type: HazardType) { + let player_idx = match hazard_type { + HazardType::GymBro => self.play_bank_sfx(|b| b.gym_bro.clone(), 1.0), + HazardType::PhoneDistraction => self.play_bank_sfx(|b| b.phone_ring.clone(), 1.0), + HazardType::Manager => self.play_bank_sfx(|b| b.manager_get_out.clone(), 1.0), + _ => self.play_bank_sfx(|b| b.hazard_spawn.clone(), 1.0), + }; + + if let Some(idx) = player_idx { + self.active_hazard_sounds.insert(hazard_type, idx); + } } #[func]