diff --git a/art/background.png b/art/background.png index fa47954..9a346fe 100644 Binary files a/art/background.png and b/art/background.png differ diff --git a/art/block/portal.png b/art/block/portal.png index 71e9d88..838a586 100644 Binary files a/art/block/portal.png and b/art/block/portal.png differ diff --git a/art/block/portal2.png b/art/block/portal2.png new file mode 100644 index 0000000..0ccfb91 Binary files /dev/null and b/art/block/portal2.png differ diff --git a/art/block/portal2.png.import b/art/block/portal2.png.import new file mode 100644 index 0000000..7f06243 --- /dev/null +++ b/art/block/portal2.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://55ihxa2emnep" +path="res://.godot/imported/portal2.png-e3a41ececa3346bc494c9fae21e9005f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/block/portal2.png" +dest_files=["res://.godot/imported/portal2.png-e3a41ececa3346bc494c9fae21e9005f.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/block/portal3.png b/art/block/portal3.png new file mode 100644 index 0000000..3c799db Binary files /dev/null and b/art/block/portal3.png differ diff --git a/art/block/portal3.png.import b/art/block/portal3.png.import new file mode 100644 index 0000000..cae6641 --- /dev/null +++ b/art/block/portal3.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d4a5x8gwhl2wc" +path="res://.godot/imported/portal3.png-0c201655fcc2b470acb54065254901e0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/block/portal3.png" +dest_files=["res://.godot/imported/portal3.png-0c201655fcc2b470acb54065254901e0.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/dash_particle.png b/art/dash_particle.png index 7453880..22fa243 100644 Binary files a/art/dash_particle.png and b/art/dash_particle.png differ diff --git a/art/jump_particle.png b/art/jump_particle.png index 7453880..7649531 100644 Binary files a/art/jump_particle.png and b/art/jump_particle.png differ diff --git a/art/player/crouch/frame0.png b/art/player/crouch/frame0.png new file mode 100644 index 0000000..abf8fe9 Binary files /dev/null and b/art/player/crouch/frame0.png differ diff --git a/art/player/crouch/frame0.png.import b/art/player/crouch/frame0.png.import new file mode 100644 index 0000000..32e2db7 --- /dev/null +++ b/art/player/crouch/frame0.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://do1kisv06nhnk" +path="res://.godot/imported/frame0.png-53a6b0e88691895147b6f74459dd52b5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crouch/frame0.png" +dest_files=["res://.godot/imported/frame0.png-53a6b0e88691895147b6f74459dd52b5.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/crouch/frame1.png b/art/player/crouch/frame1.png new file mode 100644 index 0000000..142e417 Binary files /dev/null and b/art/player/crouch/frame1.png differ diff --git a/art/player/crouch/frame1.png.import b/art/player/crouch/frame1.png.import new file mode 100644 index 0000000..a67801b --- /dev/null +++ b/art/player/crouch/frame1.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ddhhtwgtowokp" +path="res://.godot/imported/frame1.png-ffcfb367aed4ca1a80bdcbc8a4151f70.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crouch/frame1.png" +dest_files=["res://.godot/imported/frame1.png-ffcfb367aed4ca1a80bdcbc8a4151f70.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/crouch/frame2.png b/art/player/crouch/frame2.png new file mode 100644 index 0000000..eab1cb1 Binary files /dev/null and b/art/player/crouch/frame2.png differ diff --git a/art/player/crouch/frame2.png.import b/art/player/crouch/frame2.png.import new file mode 100644 index 0000000..557fa52 --- /dev/null +++ b/art/player/crouch/frame2.png.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyxbitw8hbd3s" +path="res://.godot/imported/frame2.png-cf16175862e5185219facae56cdec41f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://art/player/crouch/frame2.png" +dest_files=["res://.godot/imported/frame2.png-cf16175862e5185219facae56cdec41f.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/sarco_closed.png b/art/sarco_closed.png new file mode 100644 index 0000000..f60b03c Binary files /dev/null and b/art/sarco_closed.png differ diff --git a/coin.tscn b/coin.tscn index 46ca429..2791195 100644 --- a/coin.tscn +++ b/coin.tscn @@ -6,8 +6,7 @@ [ext_resource type="Texture2D" uid="uid://cr2wdd0yn1syy" path="res://art/coin_glow.png" id="4_pdq0q"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_6qpsl"] -radius = 7.0 -height = 20.0 +height = 26.0 [node name="Coin" type="Node2D" unique_id=1739014101] script = ExtResource("1_0t63x") diff --git a/player_2d.gd b/player_2d.gd index a58f406..1882628 100644 --- a/player_2d.gd +++ b/player_2d.gd @@ -5,9 +5,7 @@ const DASH_SPEED = 600 const HORIZONTAL_DASH_MULT = 1.8 const FRICTION = 100 const GRAVITY_MULT = 0.8 - const JUMP_VELOCITY = -410.0 - const DASH_LENGTH = 0.2 var fall_timer = 0.0 @@ -31,7 +29,6 @@ func refresh_dash(new_dashes): dashes = 1 if dashes > 0: $Jetpack/DashIndicator.show() - func refresh_jump(new_jumps): if new_jumps: @@ -69,6 +66,7 @@ func on_teleport(): $Camera2D.position_smoothing_enabled = true await get_tree().create_timer(1).timeout teleport_cooldown = 0 + func spawn_ghost(position): var ghost = preload("res://ghost.tscn") ghost = ghost.instantiate() @@ -131,8 +129,17 @@ func _process(delta: float) -> void: elif direction > 0: $Sprite2D.flip_h = false $Sprite2D/HatSprite.flip_h = false - - if Input.is_action_just_pressed("dash") and dashes > 0: + + if Input.is_action_pressed("dash_down") and is_on_floor(): + print("Crouching") + $Sprite2D.play("crouch") + print("MODULATE: " + str($Parallax2D/Sprite2D.modulate)) + $Parallax2D/Sprite2D.modulate = Color.CYAN + + for hidden_object in get_tree().get_nodes_in_group("Hidden"): + hidden_object.show() + + elif Input.is_action_just_pressed("dash") and dashes > 0: dashing = true dashes -= 1 velocity = Vector2( @@ -153,8 +160,11 @@ func _process(delta: float) -> void: velocity.x = move_toward(velocity.x, 0, FRICTION) $Sprite2D.play("idle") $Sprite2D/HatSprite.play("idle") + $Parallax2D/Sprite2D.modulate = Color.CORAL - #print("PLAYER X POSITION: " + str(position.y)) + for hidden_object in get_tree().get_nodes_in_group("Hidden"): + hidden_object.hide() + #Falling to death. if position.y >= death_threshold: print("SLASH KILL") diff --git a/player_2d.tscn b/player_2d.tscn index 867bfca..b361009 100644 --- a/player_2d.tscn +++ b/player_2d.tscn @@ -5,12 +5,15 @@ [ext_resource type="Texture2D" uid="uid://dpdxs6gjmexgh" path="res://art/background.png" id="3_p3026"] [ext_resource type="Texture2D" uid="uid://biv3f67rqumak" path="res://art/level_start.png" id="4_nj6as"] [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/idle/frame1.png" id="5_6jyqn"] -[ext_resource type="Texture2D" uid="uid://lmje8plw76e1" path="res://art/player/idle/frame2.png" id="6_gt2ls"] +[ext_resource type="Texture2D" uid="uid://ddhhtwgtowokp" path="res://art/player/crouch/frame1.png" id="6_3prq1"] +[ext_resource type="Texture2D" uid="uid://do1kisv06nhnk" path="res://art/player/crouch/frame0.png" id="6_lu0ka"] +[ext_resource type="Texture2D" uid="uid://dyxbitw8hbd3s" path="res://art/player/crouch/frame2.png" id="7_lu0ka"] [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://lk0f1qyswyxv" path="res://art/player/idle/frame1.png" id="8_3prq1"] [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://lmje8plw76e1" path="res://art/player/idle/frame2.png" id="9_lu0ka"] [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://cn31x2l44je2t" path="res://art/dash_glow.png" id="10_ur4nw"] @@ -33,10 +36,24 @@ size = Vector2(1280, 720) animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("5_6jyqn") +"texture": ExtResource("6_lu0ka") }, { "duration": 1.0, -"texture": ExtResource("6_gt2ls") +"texture": ExtResource("6_3prq1") +}, { +"duration": 1.0, +"texture": ExtResource("7_lu0ka") +}], +"loop": 1, +"name": &"crouch", +"speed": 1.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("8_3prq1") +}, { +"duration": 1.0, +"texture": ExtResource("9_lu0ka") }], "loop": 1, "name": &"idle", @@ -44,16 +61,16 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("5_6jyqn") -}, { -"duration": 1.0, -"texture": ExtResource("6_gt2ls") -}, { -"duration": 1.0, "texture": ExtResource("7_pmt5n") }, { "duration": 1.0, "texture": ExtResource("8_nj6as") +}, { +"duration": 1.0, +"texture": ExtResource("8_3prq1") +}, { +"duration": 1.0, +"texture": ExtResource("9_lu0ka") }], "loop": 1, "name": &"running", @@ -139,9 +156,9 @@ z_index = 1 texture_filter = 1 position = Vector2(0, 2) sprite_frames = SubResource("SpriteFrames_fvyjh") -animation = &"idle" +animation = &"crouch" autoplay = "idle" -frame_progress = 0.524591 +frame_progress = 0.44028828 [node name="HatSprite" type="AnimatedSprite2D" parent="Sprite2D" unique_id=1954184475] visible = false @@ -152,6 +169,8 @@ animation = &"running" autoplay = "idle" frame_progress = 0.8061519 +[node name="DaydreamSprite" type="Sprite2D" parent="Sprite2D" unique_id=67766652] + [node name="Jetpack" type="AnimatedSprite2D" parent="." unique_id=657113514] position = Vector2(0, 1) sprite_frames = SubResource("SpriteFrames_5s8kx") diff --git a/player_2d.tscn7791949109.tmp b/player_2d.tscn7791949109.tmp new file mode 100644 index 0000000..bf8bc9c --- /dev/null +++ b/player_2d.tscn7791949109.tmp @@ -0,0 +1,211 @@ +[gd_scene format=3 uid="uid://pmnwck5v0ntm"] + +[ext_resource type="Script" uid="uid://cojhnj15psd2x" path="res://player_2d.gd" id="1_sy00s"] +[ext_resource type="Shader" uid="uid://mmf86jusrkrr" path="res://shaders/warp_shader.gdshader" id="3_gt2ls"] +[ext_resource type="Texture2D" uid="uid://dpdxs6gjmexgh" path="res://art/background.png" id="3_p3026"] +[ext_resource type="Texture2D" uid="uid://biv3f67rqumak" path="res://art/level_start.png" id="4_nj6as"] +[ext_resource type="Script" uid="uid://3bqq3mfbby2c" path="res://warp_shader.gd" id="4_pmt5n"] +[ext_resource type="Texture2D" uid="uid://ddhhtwgtowokp" path="res://art/player/crouch/frame1.png" id="6_3prq1"] +[ext_resource type="Texture2D" uid="uid://dyxbitw8hbd3s" path="res://art/player/crouch/frame2.png" id="7_lu0ka"] +[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://lk0f1qyswyxv" path="res://art/player/idle/frame1.png" id="8_3prq1"] +[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://lmje8plw76e1" path="res://art/player/idle/frame2.png" id="9_lu0ka"] +[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://cn31x2l44je2t" path="res://art/dash_glow.png" id="10_ur4nw"] +[ext_resource type="Texture2D" uid="uid://biscdhn8jh8ha" path="res://art/jump_glow.png" id="11_3lee2"] +[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"] +[ext_resource type="Texture2D" uid="uid://d1tj8sw2hiwgw" path="res://art/dash_particle.png" id="16_ur4nw"] +[ext_resource type="Texture2D" uid="uid://deacp021ytuew" path="res://art/jump_particle.png" id="18_fat58"] +[ext_resource type="AudioStream" uid="uid://b4dkj4gmvk7bg" path="res://sound/double_jump.wav" id="20_1741q"] +[ext_resource type="AudioStream" uid="uid://dc7bd22vwkf34" path="res://sound/death.wav" id="20_l50qk"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_pmt5n"] +shader = ExtResource("3_gt2ls") + +[sub_resource type="QuadMesh" id="QuadMesh_nj6as"] +size = Vector2(1280, 720) + +[sub_resource type="SpriteFrames" id="SpriteFrames_fvyjh"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("6_3prq1") +}, { +"duration": 1.0, +"texture": ExtResource("7_lu0ka") +}], +"loop": 1, +"name": &"crouch", +"speed": 1.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("8_3prq1") +}, { +"duration": 1.0, +"texture": ExtResource("9_lu0ka") +}], +"loop": 1, +"name": &"idle", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("7_pmt5n") +}, { +"duration": 1.0, +"texture": ExtResource("8_nj6as") +}, { +"duration": 1.0, +"texture": ExtResource("8_3prq1") +}, { +"duration": 1.0, +"texture": ExtResource("9_lu0ka") +}], +"loop": 1, +"name": &"running", +"speed": 12.0 +}] + +[sub_resource type="SpriteFrames" id="SpriteFrames_pmt5n"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("10_5s8kx") +}], +"loop": 1, +"name": &"idle", +"speed": 6.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("11_4apft") +}, { +"duration": 1.0, +"texture": ExtResource("10_5s8kx") +}], +"loop": 1, +"name": &"running", +"speed": 6.0 +}] + +[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="RectangleShape2D" id="RectangleShape2D_fj7yv"] +size = Vector2(10, 16) + +[node name="Player2D" type="CharacterBody2D" unique_id=889851478] +script = ExtResource("1_sy00s") + +[node name="CanvasLayer2" type="CanvasLayer" parent="." unique_id=1854423107] + +[node name="WarpShader" type="MeshInstance2D" parent="CanvasLayer2" unique_id=88397728] +material = SubResource("ShaderMaterial_pmt5n") +mesh = SubResource("QuadMesh_nj6as") +script = ExtResource("4_pmt5n") + +[node name="Sprite2D" type="Sprite2D" parent="CanvasLayer2/WarpShader" unique_id=1651549733] +visible = false +texture = ExtResource("4_nj6as") + +[node name="Parallax2D" type="Parallax2D" parent="." unique_id=270393374] +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) +texture = ExtResource("3_p3026") + +[node name="Camera2D" type="Camera2D" parent="." unique_id=962368438] +zoom = Vector2(1.75, 1.75) +process_callback = 0 +position_smoothing_enabled = true + +[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 = &"crouch" +autoplay = "idle" +frame_progress = 0.6154751 + +[node name="HatSprite" type="AnimatedSprite2D" parent="Sprite2D" unique_id=1954184475] +visible = false +position = Vector2(0, -13) +scale = Vector2(0.9, 0.9) +sprite_frames = SubResource("SpriteFrames_pmt5n") +animation = &"running" +autoplay = "idle" +frame_progress = 0.8061519 + +[node name="Jetpack" type="AnimatedSprite2D" parent="." unique_id=657113514] +position = Vector2(0, 1) +sprite_frames = SubResource("SpriteFrames_5s8kx") +animation = &"idle" +autoplay = "idle" + +[node name="DashIndicator" type="CPUParticles2D" parent="Jetpack" unique_id=1424397604] +position = Vector2(-11, -2) +texture = ExtResource("16_ur4nw") +lifetime = 0.1 +gravity = Vector2(0, 0) + +[node name="DashIndicatorGlow" type="PointLight2D" parent="Jetpack/DashIndicator" unique_id=1334369973] +position = Vector2(-1, 0) +energy = 10.0 +texture = ExtResource("10_ur4nw") + +[node name="JumpIndicator" type="CPUParticles2D" parent="Jetpack" unique_id=1519478958] +position = Vector2(13, -2) +texture = ExtResource("18_fat58") +lifetime = 0.1 +gravity = Vector2(0, 0) + +[node name="JumpIndicatorGlow" type="PointLight2D" parent="Jetpack/JumpIndicator" unique_id=920409859] +position = Vector2(-1, 0) +energy = 10.0 +texture = ExtResource("11_3lee2") + +[node name="JumpSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=2009313321] + +[node name="DashSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=403353396] + +[node name="DeathSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=1365918564] +stream = ExtResource("20_l50qk") + +[node name="DoubleJumpSound" type="AudioStreamPlayer2D" parent="Jetpack" unique_id=1131911389] +stream = ExtResource("20_1741q") + +[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") +volume_db = -5.0 diff --git a/project.godot b/project.godot index fec94bd..65816c5 100644 --- a/project.godot +++ b/project.godot @@ -22,6 +22,10 @@ window/size/viewport_width=1280 window/size/viewport_height=720 window/stretch/mode="canvas_items" +[global_group] + +Hidden="" + [gui] common/auto_focus_strategy=1 diff --git a/spike.tscn b/spike.tscn index 75747f8..6427201 100644 --- a/spike.tscn +++ b/spike.tscn @@ -4,20 +4,20 @@ [ext_resource type="Texture2D" uid="uid://bu5wgerfu7cbc" path="res://art/spike.png" id="2_7k7bx"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_xfwl5"] -size = Vector2(15, 11) +size = Vector2(15, 12) [node name="Spike" type="Node2D" unique_id=1739014101] script = ExtResource("1_7k7bx") [node name="Sprite2D" type="Sprite2D" parent="." unique_id=813041394] texture_filter = 1 -position = Vector2(0, 1) +position = Vector2(0, 2) texture = ExtResource("2_7k7bx") [node name="Area2D" type="Area2D" parent="." unique_id=170499029] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=1865546056] -position = Vector2(-0.5, 1.5) +position = Vector2(-0.5, 0) shape = SubResource("RectangleShape2D_xfwl5") [connection signal="body_entered" from="Area2D" to="." method="on_contact"] diff --git a/teleporter.gd b/teleporter.gd index ba99878..3692f7e 100644 --- a/teleporter.gd +++ b/teleporter.gd @@ -7,6 +7,7 @@ var enabled = true var cooldown = 2 func _ready() -> void: + modulate = Color.PURPLE add_to_group("TELEPORTERS") func check_for_pair() -> String: diff --git a/teleporter.tscn b/teleporter.tscn index 3a3724f..0995f1a 100644 --- a/teleporter.tscn +++ b/teleporter.tscn @@ -2,19 +2,39 @@ [ext_resource type="Texture2D" uid="uid://d0tvtt4eu8jmt" path="res://art/block/portal.png" id="1_eumkw"] [ext_resource type="Script" uid="uid://bjbxktiuqlh1f" path="res://teleporter.gd" id="1_tuehi"] +[ext_resource type="Texture2D" uid="uid://55ihxa2emnep" path="res://art/block/portal2.png" id="3_ahrse"] +[ext_resource type="Texture2D" uid="uid://d4a5x8gwhl2wc" path="res://art/block/portal3.png" id="4_cpfq8"] -[sub_resource type="RectangleShape2D" id="RectangleShape2D_eumkw"] -size = Vector2(16, 16) +[sub_resource type="SpriteFrames" id="SpriteFrames_tuehi"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("1_eumkw") +}, { +"duration": 1.0, +"texture": ExtResource("3_ahrse") +}, { +"duration": 1.0, +"texture": ExtResource("4_cpfq8") +}], +"loop": 1, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="CircleShape2D" id="CircleShape2D_7k7bx"] +radius = 14.0 [node name="Teleporter" type="Node2D" unique_id=1201409437] script = ExtResource("1_tuehi") -[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1680278216] -texture = ExtResource("1_eumkw") +[node name="Sprite2D" type="AnimatedSprite2D" parent="." unique_id=395479262] +sprite_frames = SubResource("SpriteFrames_tuehi") +autoplay = "default" [node name="Area2D" type="Area2D" parent="Sprite2D" unique_id=2050186824] [node name="CollisionShape2D" type="CollisionShape2D" parent="Sprite2D/Area2D" unique_id=1560168165] -shape = SubResource("RectangleShape2D_eumkw") +shape = SubResource("CircleShape2D_7k7bx") [connection signal="body_entered" from="Sprite2D/Area2D" to="." method="_on_contact"] diff --git a/vertical_long_block.gd b/vertical_long_block.gd new file mode 100644 index 0000000..5a04c4e --- /dev/null +++ b/vertical_long_block.gd @@ -0,0 +1,12 @@ +extends RigidBody2D + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + add_to_group("Hidden") + #pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/vertical_long_block.gd.uid b/vertical_long_block.gd.uid new file mode 100644 index 0000000..905d01a --- /dev/null +++ b/vertical_long_block.gd.uid @@ -0,0 +1 @@ +uid://0o8303qahgvi diff --git a/vertical_long_block.tscn b/vertical_long_block.tscn index abfabc4..1ba2c3a 100644 --- a/vertical_long_block.tscn +++ b/vertical_long_block.tscn @@ -1,11 +1,14 @@ [gd_scene format=3 uid="uid://bos6oh7nwyeca"] +[ext_resource type="Script" uid="uid://0o8303qahgvi" path="res://vertical_long_block.gd" id="1_23eij"] [ext_resource type="PackedScene" uid="uid://ckqable762x8v" path="res://block.tscn" id="1_noju1"] [node name="VerticalLongBlock" type="RigidBody2D" unique_id=925152188] +visible = false rotation = 1.5707964 gravity_scale = 0.0 freeze = true +script = ExtResource("1_23eij") [node name="Block" parent="." unique_id=1409784601 instance=ExtResource("1_noju1")] diff --git a/world.tscn b/world.tscn index 5e10cf6..2b8c3d6 100644 --- a/world.tscn +++ b/world.tscn @@ -363,4 +363,58 @@ position = Vector2(192, 185.11545) [node name="OldComputer" parent="." unique_id=1951254108 instance=ExtResource("19_cbp6q")] unique_name_in_owner = true +[node name="Block" parent="." unique_id=226580978 instance=ExtResource("2_036b0")] +position = Vector2(6637, -253.12886) + +[node name="Block8" parent="." unique_id=1888713372 instance=ExtResource("2_036b0")] +position = Vector2(7051, -324.12885) + +[node name="Block2" parent="." unique_id=1340396826 instance=ExtResource("2_036b0")] +position = Vector2(6726, -275.12885) + +[node name="Block3" parent="." unique_id=455015054 instance=ExtResource("2_036b0")] +position = Vector2(6685, -201.12886) + +[node name="Block4" parent="." unique_id=271275249 instance=ExtResource("2_036b0")] +position = Vector2(6887, -122.12882) + +[node name="Block5" parent="." unique_id=1565777007 instance=ExtResource("2_036b0")] +position = Vector2(6790, -414.12885) + +[node name="Block6" parent="." unique_id=1681974152 instance=ExtResource("2_036b0")] +position = Vector2(6790, -398.12885) + +[node name="Block7" parent="." unique_id=1490990568 instance=ExtResource("2_036b0")] +position = Vector2(6960, -220.12886) + +[node name="Block9" parent="." unique_id=1760473287 instance=ExtResource("2_036b0")] +position = Vector2(7219, -379.12885) + +[node name="Block10" parent="." unique_id=1502546202 instance=ExtResource("2_036b0")] +position = Vector2(7398, -214.12886) + +[node name="Block11" parent="." unique_id=989534371 instance=ExtResource("2_036b0")] +position = Vector2(7607, -277.12885) + +[node name="LongBlock" parent="." unique_id=1836871184 instance=ExtResource("3_dwbse")] +position = Vector2(7963, -271.12885) + +[node name="VerticalLongBlock" parent="." unique_id=1990277242 instance=ExtResource("4_pkg7o")] +position = Vector2(7864, -322.12885) + +[node name="VerticalLongBlock2" parent="." unique_id=10220440 instance=ExtResource("4_pkg7o")] +position = Vector2(7864, -212.12886) + +[node name="VerticalLongBlock3" parent="." unique_id=328455786 instance=ExtResource("4_pkg7o")] +position = Vector2(7865, -433.12885) + +[node name="VerticalLongBlock4" parent="." unique_id=1600998389 instance=ExtResource("4_pkg7o")] +position = Vector2(7732, -505.12885) + +[node name="VerticalLongBlock5" parent="." unique_id=1683553252 instance=ExtResource("4_pkg7o")] +position = Vector2(7732, -109.12882) + +[node name="VerticalLongBlock6" parent="." unique_id=200846556 instance=ExtResource("4_pkg7o")] +position = Vector2(7865, -18.128824) + [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]