diff --git a/art/background.png b/art/background.png index 44868f4..fa47954 100644 Binary files a/art/background.png and b/art/background.png differ diff --git a/art/coin_glow.png b/art/coin_glow.png index 41c7368..de7dd53 100644 Binary files a/art/coin_glow.png and b/art/coin_glow.png differ diff --git a/art/player/crystal.png b/art/player/crystal.png new file mode 100644 index 0000000..03d863f Binary files /dev/null and b/art/player/crystal.png differ diff --git a/art/player/crystal.png.import b/art/player/crystal.png.import new file mode 100644 index 0000000..65cf769 --- /dev/null +++ b/art/player/crystal.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dgq8el2qldlui" +path="res://.godot/imported/crystal.png-f400ccecbf2f6275ac5b4fc99ab0cc5f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crystal.png" +dest_files=["res://.godot/imported/crystal.png-f400ccecbf2f6275ac5b4fc99ab0cc5f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/high_quality_mode=0 +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 +mipmaps/preserve_alpha_test_coverage=false +mipmaps/alpha_test_threshold=0.5 +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/art/player/crystal2.png b/art/player/crystal2.png new file mode 100644 index 0000000..39f599d Binary files /dev/null and b/art/player/crystal2.png differ diff --git a/art/player/crystal2.png.import b/art/player/crystal2.png.import new file mode 100644 index 0000000..835acaf --- /dev/null +++ b/art/player/crystal2.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bfyd1tro3s0gl" +path="res://.godot/imported/crystal2.png-a1d57eb33ddb9f0b3afb6f221f8c959e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crystal2.png" +dest_files=["res://.godot/imported/crystal2.png-a1d57eb33ddb9f0b3afb6f221f8c959e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/high_quality_mode=0 +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 +mipmaps/preserve_alpha_test_coverage=false +mipmaps/alpha_test_threshold=0.5 +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/art/player/crystal3.png b/art/player/crystal3.png new file mode 100644 index 0000000..50a17a5 Binary files /dev/null and b/art/player/crystal3.png differ diff --git a/art/player/crystal3.png.import b/art/player/crystal3.png.import new file mode 100644 index 0000000..fae86a2 --- /dev/null +++ b/art/player/crystal3.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://du5i0tg6u1lal" +path="res://.godot/imported/crystal3.png-e97f8335eb3cd552adf148410ef74af2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crystal3.png" +dest_files=["res://.godot/imported/crystal3.png-e97f8335eb3cd552adf148410ef74af2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/high_quality_mode=0 +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 +mipmaps/preserve_alpha_test_coverage=false +mipmaps/alpha_test_threshold=0.5 +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/art/player/crystal4.png b/art/player/crystal4.png new file mode 100644 index 0000000..e8671a9 Binary files /dev/null and b/art/player/crystal4.png differ diff --git a/art/player/crystal4.png.import b/art/player/crystal4.png.import new file mode 100644 index 0000000..4a6e232 --- /dev/null +++ b/art/player/crystal4.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bko8dvawpul3c" +path="res://.godot/imported/crystal4.png-b97d9919b7a796736fb8eaf83cd5646d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crystal4.png" +dest_files=["res://.godot/imported/crystal4.png-b97d9919b7a796736fb8eaf83cd5646d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/high_quality_mode=0 +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 +mipmaps/preserve_alpha_test_coverage=false +mipmaps/alpha_test_threshold=0.5 +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/music_button.gd b/music_button.gd index f2e5905..930574e 100644 --- a/music_button.gd +++ b/music_button.gd @@ -1,16 +1,16 @@ extends TextureButton +var first_press = false -# Called when the node enters the scene tree for the first time. func _ready() -> void: - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. + pass + func _process(delta: float) -> void: pass - func _on_toggled(toggled_on: bool) -> void: + if !first_press: + first_press = true + %Player2D.get_node("BackgroundMusic").play() toggled_on = !toggled_on - %Player2D.get_node("BackgroundMusic").playing = !%Player2D.get_node("BackgroundMusic").playing + %Player2D.get_node("BackgroundMusic").stream_paused = !%Player2D.get_node("BackgroundMusic").stream_paused diff --git a/player_2d.gd b/player_2d.gd index fae77c4..c2bf67a 100644 --- a/player_2d.gd +++ b/player_2d.gd @@ -19,7 +19,7 @@ var death_threshold = 1000 var coins = 0 func _ready() -> void: - pass + DisplayServer.window_set_title("JUMPS EQUALS JUMPS") func refresh_dash(new_dashes): if new_dashes: diff --git a/player_2d.tscn b/player_2d.tscn index e8ccf05..f06d60e 100644 --- a/player_2d.tscn +++ b/player_2d.tscn @@ -7,10 +7,14 @@ [ext_resource type="Script" uid="uid://3bqq3mfbby2c" path="res://warp_shader.gd" id="4_pmt5n"] [ext_resource type="Texture2D" uid="uid://lk0f1qyswyxv" path="res://art/player/running/frame1.png" id="5_6jyqn"] [ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/running/frame2.png" id="6_gt2ls"] +[ext_resource type="Texture2D" uid="uid://bfyd1tro3s0gl" path="res://art/player/crystal2.png" id="7_oy4pt"] [ext_resource type="Texture2D" uid="uid://dh7a1knyqn5nd" path="res://art/player/running/frame3.png" id="7_pmt5n"] [ext_resource type="Texture2D" uid="uid://yf13nw31k8ua" path="res://art/player/running/frame4.png" id="8_nj6as"] +[ext_resource type="Texture2D" uid="uid://du5i0tg6u1lal" path="res://art/player/crystal3.png" id="8_ukfft"] +[ext_resource type="Texture2D" uid="uid://bko8dvawpul3c" path="res://art/player/crystal4.png" id="9_ur4nw"] [ext_resource type="Texture2D" uid="uid://ba4kjeulthw1g" path="res://art/hats/dunce1.png" id="10_5s8kx"] [ext_resource type="Texture2D" uid="uid://cp1v5uhvbfws6" path="res://art/hats/dunce2.png" id="11_4apft"] +[ext_resource type="Texture2D" uid="uid://dgq8el2qldlui" path="res://art/player/crystal.png" id="12_4apft"] [ext_resource type="AudioStream" uid="uid://bkiipooikacjj" path="res://sound/patience.wav" id="12_5s8kx"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_pmt5n"] @@ -19,6 +23,26 @@ shader = ExtResource("3_gt2ls") [sub_resource type="QuadMesh" id="QuadMesh_nj6as"] size = Vector2(1280, 720) +[sub_resource type="SpriteFrames" id="SpriteFrames_5s8kx"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("12_4apft") +}, { +"duration": 1.0, +"texture": ExtResource("7_oy4pt") +}, { +"duration": 1.0, +"texture": ExtResource("8_ukfft") +}, { +"duration": 1.0, +"texture": ExtResource("9_ur4nw") +}], +"loop": 1, +"name": &"idle", +"speed": 5.0 +}] + [sub_resource type="SpriteFrames" id="SpriteFrames_fvyjh"] animations = [{ "frames": [{ @@ -90,7 +114,10 @@ visible = false texture = ExtResource("4_nj6as") [node name="Parallax2D" type="Parallax2D" parent="." unique_id=270393374] -repeat_size = Vector2(1, 1) +repeat_size = Vector2(1280, 720) +autoscroll = Vector2(5, 0) +follow_viewport = false +ignore_camera_scroll = true [node name="Sprite2D" type="Sprite2D" parent="Parallax2D" unique_id=1267606565] scale = Vector2(3, 3) @@ -101,14 +128,20 @@ zoom = Vector2(1.75, 1.75) process_callback = 0 position_smoothing_enabled = true +[node name="Jetpack" type="AnimatedSprite2D" parent="." unique_id=657113514] +position = Vector2(0, 1) +sprite_frames = SubResource("SpriteFrames_5s8kx") +animation = &"idle" +autoplay = "idle" + [node name="Sprite2D" type="AnimatedSprite2D" parent="." unique_id=693422376] z_index = 1 texture_filter = 1 position = Vector2(0, 2) sprite_frames = SubResource("SpriteFrames_fvyjh") -animation = &"running" +animation = &"idle" autoplay = "idle" -frame_progress = 0.34893045 +frame_progress = 0.524591 [node name="HatSprite" type="AnimatedSprite2D" parent="Sprite2D" unique_id=1954184475] visible = false @@ -117,11 +150,11 @@ scale = Vector2(0.9, 0.9) sprite_frames = SubResource("SpriteFrames_pmt5n") animation = &"running" autoplay = "idle" -frame_progress = 0.4117694 +frame_progress = 0.8061519 [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1294571021] shape = SubResource("RectangleShape2D_fj7yv") [node name="BackgroundMusic" type="AudioStreamPlayer2D" parent="." unique_id=2123463449] stream = ExtResource("12_5s8kx") -autoplay = true +volume_db = -5.0 diff --git a/project.godot b/project.godot index 1b40883..b9f6add 100644 --- a/project.godot +++ b/project.godot @@ -183,6 +183,23 @@ dash={ "axis": 5, "axis_value": 1.0, "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": 4194325, +"key_label": 0, +"unicode": 0, +"location": 0, +"echo": false, +"script": null )] } dash_down={ @@ -194,6 +211,23 @@ dash_down={ "axis": 1, "axis_value": 1.0, "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": 83, +"key_label": 0, +"unicode": 115, +"location": 0, +"echo": false, +"script": null )] } dash_left={ @@ -205,6 +239,23 @@ dash_left={ "axis": 0, "axis_value": -1.0, "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": 65, +"key_label": 0, +"unicode": 97, +"location": 0, +"echo": false, +"script": null )] } dash_right={ @@ -216,6 +267,23 @@ dash_right={ "axis": 0, "axis_value": 1.0, "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": 68, +"key_label": 0, +"unicode": 100, +"location": 0, +"echo": false, +"script": null )] } dash_up={ @@ -227,6 +295,23 @@ dash_up={ "axis": 1, "axis_value": -1.0, "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 )] } restart={ diff --git a/sound/patience.wav.import b/sound/patience.wav.import index 20908a7..58afb77 100644 --- a/sound/patience.wav.import +++ b/sound/patience.wav.import @@ -12,8 +12,8 @@ dest_files=["res://.godot/imported/patience.wav-f364cfbc42ed94f9c736edeb772f3a3f [params] -force/8_bit=false -force/mono=false +force/8_bit=true +force/mono=true force/max_rate=false force/max_rate_hz=44100 edit/trim=false diff --git a/world.tscn b/world.tscn index ef58ad1..4a8a5d0 100644 --- a/world.tscn +++ b/world.tscn @@ -25,6 +25,36 @@ position = Vector2(55, 102.324905) [node name="Tutorial" type="Node2D" parent="." unique_id=1391494772] +[node name="LongBlock7" parent="Tutorial" unique_id=426800863 instance=ExtResource("6_dwbse")] +position = Vector2(1946, 401.7399) + +[node name="LongBlock8" parent="Tutorial" unique_id=1886381744 instance=ExtResource("6_dwbse")] +position = Vector2(2282, 401.7399) + +[node name="LongBlock7" parent="Tutorial/LongBlock8" unique_id=1460533623 instance=ExtResource("6_dwbse")] +position = Vector2(663, -109.296875) + +[node name="LongBlock8" parent="Tutorial/LongBlock8" unique_id=459909459 instance=ExtResource("6_dwbse")] +position = Vector2(999, -109.296875) + +[node name="LongBlock7" parent="Tutorial/LongBlock8/LongBlock8" unique_id=1762425041 instance=ExtResource("6_dwbse")] +position = Vector2(663, -109.296875) + +[node name="LongBlock8" parent="Tutorial/LongBlock8/LongBlock8" unique_id=20723843 instance=ExtResource("6_dwbse")] +position = Vector2(999, -109.296875) + +[node name="LongBlock7" parent="Tutorial/LongBlock8/LongBlock8/LongBlock8" unique_id=181475134 instance=ExtResource("6_dwbse")] +position = Vector2(663, -109.296875) + +[node name="LongBlock8" parent="Tutorial/LongBlock8/LongBlock8/LongBlock8" unique_id=1555015232 instance=ExtResource("6_dwbse")] +position = Vector2(999, -109.296875) + +[node name="LongBlock7" parent="Tutorial/LongBlock8/LongBlock8/LongBlock8/LongBlock8" unique_id=557909882 instance=ExtResource("6_dwbse")] +position = Vector2(663, -109.296875) + +[node name="LongBlock8" parent="Tutorial/LongBlock8/LongBlock8/LongBlock8/LongBlock8" unique_id=734234422 instance=ExtResource("6_dwbse")] +position = Vector2(999, -109.296875) + [node name="LevelStart" parent="Tutorial" unique_id=1489270643 instance=ExtResource("4_ic0uy")] unique_name_in_owner = true visible = false @@ -58,7 +88,52 @@ position = Vector2(166, 200) [node name="VerticalLongBlock" parent="Tutorial" unique_id=925152188 instance=ExtResource("4_pkg7o")] position = Vector2(250, 141) -[node name="Coin" parent="Tutorial" unique_id=1739014101 instance=ExtResource("8_ioo17")] +[node name="Coin5" parent="Tutorial" unique_id=874141343 instance=ExtResource("8_ioo17")] +position = Vector2(800, 373.18488) + +[node name="Coin6" parent="Tutorial" unique_id=1739014101 instance=ExtResource("8_ioo17")] +position = Vector2(840, 373.18488) + +[node name="Coin7" parent="Tutorial" unique_id=1551757221 instance=ExtResource("8_ioo17")] +position = Vector2(875, 373.18488) + +[node name="Coin8" parent="Tutorial" unique_id=1790865521 instance=ExtResource("8_ioo17")] +position = Vector2(912, 372.20023) + +[node name="Coin9" parent="Tutorial" unique_id=1207799124 instance=ExtResource("8_ioo17")] +position = Vector2(952, 372.20023) + +[node name="Coin10" parent="Tutorial" unique_id=260348872 instance=ExtResource("8_ioo17")] +position = Vector2(987, 372.20023) + +[node name="Coin14" parent="Tutorial" unique_id=1906008614 instance=ExtResource("8_ioo17")] +position = Vector2(1091, 300.32028) + +[node name="Coin15" parent="Tutorial" unique_id=1955593631 instance=ExtResource("8_ioo17")] +position = Vector2(1131, 300.32028) + +[node name="Coin16" parent="Tutorial" unique_id=206832709 instance=ExtResource("8_ioo17")] +position = Vector2(1166, 300.32028) + +[node name="Coin17" parent="Tutorial" unique_id=1885953643 instance=ExtResource("8_ioo17")] +position = Vector2(1288, 215.63982) + +[node name="Coin18" parent="Tutorial" unique_id=1276856826 instance=ExtResource("8_ioo17")] +position = Vector2(1325, 181.17682) + +[node name="Coin19" parent="Tutorial" unique_id=59058959 instance=ExtResource("8_ioo17")] +position = Vector2(1364, 144.74452) + +[node name="Coin11" parent="Tutorial" unique_id=857910277 instance=ExtResource("8_ioo17")] +position = Vector2(691, 373.18488) + +[node name="Coin12" parent="Tutorial" unique_id=1595757142 instance=ExtResource("8_ioo17")] +position = Vector2(731, 373.18488) + +[node name="Coin13" parent="Tutorial" unique_id=297731416 instance=ExtResource("8_ioo17")] +position = Vector2(766, 373.18488) + +[node name="Coin" parent="Tutorial" unique_id=1379363365 instance=ExtResource("8_ioo17")] [node name="Coin2" parent="Tutorial" unique_id=1206818588 instance=ExtResource("8_ioo17")] position = Vector2(0, -28.555042) @@ -83,7 +158,7 @@ position = Vector2(1368, 401) [node name="Block" parent="ZoeLevel" unique_id=878186522 instance=ExtResource("2_036b0")] position = Vector2(55, 118) -[node name="LongBlock" parent="ZoeLevel" unique_id=426800863 instance=ExtResource("3_dwbse")] +[node name="LongBlock" parent="ZoeLevel" unique_id=1035095840 instance=ExtResource("3_dwbse")] position = Vector2(166, 200) [node name="VerticalLongBlock" parent="ZoeLevel" unique_id=1984351408 instance=ExtResource("4_pkg7o")] @@ -114,6 +189,7 @@ text = "COINS:" script = ExtResource("3_wse8f") [node name="MusicButton" type="TextureButton" parent="CanvasLayer" unique_id=1088022504] +unique_name_in_owner = true anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 @@ -125,6 +201,8 @@ grow_horizontal = 0 scale = Vector2(3.305284, 3.305284) focus_mode = 0 toggle_mode = true +button_pressed = true +action_mode = 0 texture_normal = ExtResource("12_2o6r5") texture_pressed = ExtResource("13_70uel") texture_disabled = ExtResource("13_70uel")