diff --git a/assets/audio/sfx/talking.ogg b/assets/audio/sfx/talking.ogg new file mode 100644 index 0000000..247bdc9 Binary files /dev/null and b/assets/audio/sfx/talking.ogg differ diff --git a/assets/audio/sfx/talking.ogg.import b/assets/audio/sfx/talking.ogg.import new file mode 100644 index 0000000..8c549fe --- /dev/null +++ b/assets/audio/sfx/talking.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dp7tqt5uocg0g" +path="res://.godot/imported/talking.ogg-c9f0588d86aab0968d7be785daa18ffa.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/sfx/talking.ogg" +dest_files=["res://.godot/imported/talking.ogg-c9f0588d86aab0968d7be785daa18ffa.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/vox/capri_die.ogg b/assets/audio/vox/capri_die.ogg index 2ce76ce..e9cc5ff 100644 Binary files a/assets/audio/vox/capri_die.ogg and b/assets/audio/vox/capri_die.ogg differ diff --git a/assets/audio/vox/capri_die2.ogg b/assets/audio/vox/capri_die2.ogg new file mode 100644 index 0000000..a08b241 Binary files /dev/null and b/assets/audio/vox/capri_die2.ogg differ diff --git a/assets/audio/vox/capri_die2.ogg.import b/assets/audio/vox/capri_die2.ogg.import new file mode 100644 index 0000000..6a8da0c --- /dev/null +++ b/assets/audio/vox/capri_die2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cxfl2cqlre0ma" +path="res://.godot/imported/capri_die2.ogg-18c0b1c511e561c078406a2aa0e5e748.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/vox/capri_die2.ogg" +dest_files=["res://.godot/imported/capri_die2.ogg-18c0b1c511e561c078406a2aa0e5e748.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/vox/capri_die3.ogg b/assets/audio/vox/capri_die3.ogg new file mode 100644 index 0000000..7015035 Binary files /dev/null and b/assets/audio/vox/capri_die3.ogg differ diff --git a/assets/audio/vox/capri_die3.ogg.import b/assets/audio/vox/capri_die3.ogg.import new file mode 100644 index 0000000..163d0e9 --- /dev/null +++ b/assets/audio/vox/capri_die3.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c6gck1lyk6aer" +path="res://.godot/imported/capri_die3.ogg-807c3e5821ef93d5e753c3908db8331e.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/vox/capri_die3.ogg" +dest_files=["res://.godot/imported/capri_die3.ogg-807c3e5821ef93d5e753c3908db8331e.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/vox/capri_jump.ogg b/assets/audio/vox/capri_jump.ogg index b1a8cd9..7683a40 100644 Binary files a/assets/audio/vox/capri_jump.ogg and b/assets/audio/vox/capri_jump.ogg differ diff --git a/assets/audio/vox/capri_jump2.ogg b/assets/audio/vox/capri_jump2.ogg new file mode 100644 index 0000000..a4998e8 Binary files /dev/null and b/assets/audio/vox/capri_jump2.ogg differ diff --git a/assets/audio/vox/capri_jump2.ogg.import b/assets/audio/vox/capri_jump2.ogg.import new file mode 100644 index 0000000..de3084f --- /dev/null +++ b/assets/audio/vox/capri_jump2.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://4kxio0mlrr4k" +path="res://.godot/imported/capri_jump2.ogg-138f7506a8a2d9c132199102602dc2e8.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/vox/capri_jump2.ogg" +dest_files=["res://.godot/imported/capri_jump2.ogg-138f7506a8a2d9c132199102602dc2e8.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/audio/vox/capri_jump3.ogg b/assets/audio/vox/capri_jump3.ogg new file mode 100644 index 0000000..f5fd19a Binary files /dev/null and b/assets/audio/vox/capri_jump3.ogg differ diff --git a/assets/audio/vox/capri_jump3.ogg.import b/assets/audio/vox/capri_jump3.ogg.import new file mode 100644 index 0000000..033480c --- /dev/null +++ b/assets/audio/vox/capri_jump3.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c350jqy4yue8c" +path="res://.godot/imported/capri_jump3.ogg-168c550662b5a80e215318bca06ff59a.oggvorbisstr" + +[deps] + +source_file="res://assets/audio/vox/capri_jump3.ogg" +dest_files=["res://.godot/imported/capri_jump3.ogg-168c550662b5a80e215318bca06ff59a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/textures/images/descent.png b/assets/textures/images/descent.png new file mode 100644 index 0000000..00f6bcb Binary files /dev/null and b/assets/textures/images/descent.png differ diff --git a/assets/textures/images/descent.png.import b/assets/textures/images/descent.png.import new file mode 100644 index 0000000..51f43ec --- /dev/null +++ b/assets/textures/images/descent.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d20y42ga1toxx" +path="res://.godot/imported/descent.png-006f7735d1f2d70f080ecd6b75c4d623.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/images/descent.png" +dest_files=["res://.godot/imported/descent.png-006f7735d1f2d70f080ecd6b75c4d623.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/cutscenes/world1_cut.tscn b/cutscenes/world1_cut.tscn new file mode 100644 index 0000000..2953c2b --- /dev/null +++ b/cutscenes/world1_cut.tscn @@ -0,0 +1,173 @@ +[gd_scene load_steps=7 format=3 uid="uid://bt3mxr1j3qyul"] + +[ext_resource type="Texture2D" uid="uid://d20y42ga1toxx" path="res://assets/textures/images/descent.png" id="1_edpvw"] +[ext_resource type="FontFile" uid="uid://dets0g4ce7npf" path="res://assets/fonts/Super Mario Bros. NES.ttf" id="2_3lnes"] +[ext_resource type="AudioStream" uid="uid://dp7tqt5uocg0g" path="res://assets/audio/sfx/talking.ogg" id="3_3lnes"] + +[sub_resource type="Animation" id="Animation_5wwpe"] +resource_name = "fade" +length = 6.0 +step = 0.25 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Label:position") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(2, 2.5, 2.56061, 2.62121), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [Vector2(-126.41, 6), Vector2(7, 6), Vector2(8, 6), Vector2(7, 6)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Label2:position") +tracks/1/interp = 2 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(2.55, 3.06515, 3.12576, 3.18636), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 0, +"values": [Vector2(295, 186), Vector2(169, 186), Vector2(170, 186), Vector2(169, 186)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("ColorRect:color") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0.030303, 2), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)] +} +tracks/3/type = "method" +tracks/3/imported = false +tracks/3/enabled = false +tracks/3/path = NodePath("AudioStreamPlayer") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(1.33333), +"transitions": PackedFloat32Array(1), +"values": [{ +"args": [0.0], +"method": &"play" +}] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("AudioStreamPlayer:playing") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(2), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} + +[sub_resource type="Animation" id="Animation_edpvw"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Label:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(7, 6)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Label2:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(169, 186)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("ColorRect:color") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Color(0, 0, 0, 1)] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("AudioStreamPlayer:playing") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_iw1oc"] +_data = { +&"RESET": SubResource("Animation_edpvw"), +&"fade": SubResource("Animation_5wwpe") +} + +[node name="World1Cut" type="Node2D"] + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +&"": SubResource("AnimationLibrary_iw1oc") +} +autoplay = "fade" + +[node name="Sprite2D" type="Sprite2D" parent="."] +position = Vector2(144, 108) +texture = ExtResource("1_edpvw") + +[node name="Label" type="Label" parent="."] +offset_left = 7.0 +offset_top = 6.0 +offset_right = 119.0 +offset_bottom = 29.0 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) +theme_override_constants/shadow_outline_size = 8 +theme_override_fonts/font = ExtResource("2_3lnes") +theme_override_font_sizes/font_size = 16 +text = "WORLD 1" + +[node name="Label2" type="Label" parent="."] +offset_left = 169.0 +offset_top = 186.0 +offset_right = 281.0 +offset_bottom = 209.0 +theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) +theme_override_constants/shadow_outline_size = 8 +theme_override_fonts/font = ExtResource("2_3lnes") +theme_override_font_sizes/font_size = 16 +text = "DESCENT" + +[node name="ColorRect" type="ColorRect" parent="."] +offset_right = 293.0 +offset_bottom = 219.0 +color = Color(0, 0, 0, 1) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("3_3lnes") + +[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_player_animation_finished"] diff --git a/maps/its_spring.tscn b/maps/its_spring.tscn index 37ca0ac..6bc989f 100644 --- a/maps/its_spring.tscn +++ b/maps/its_spring.tscn @@ -18,7 +18,7 @@ shader_parameter/animate_noise = true shader_parameter/noise_intensity = 1.0 shader_parameter/fps = 15.0 -[node name="Level1" type="Node2D"] +[node name="Level3" type="Node2D"] [node name="Sprite2D" type="Sprite2D" parent="."] material = SubResource("ShaderMaterial_sf5kh") diff --git a/maps/level1.tscn b/maps/level1.tscn index 58422e9..48df287 100644 --- a/maps/level1.tscn +++ b/maps/level1.tscn @@ -32,6 +32,13 @@ color = Color(0.194349, 0.194349, 0.194349, 0.447059) [node name="Player" parent="." instance=ExtResource("2_kip56")] position = Vector2(31, 139) +run_acceleration = 0.0 +max_run_speed = 0.0 +turn_acceleration = 0.0 +stopping_force = 0.0 +jump_power = 0.0 +splat_launch_power = 0.0 +splat_offset = 0.0 [node name="TileMap" type="TileMap" parent="."] tile_set = ExtResource("3_4td23") diff --git a/maps/tutorial.tscn b/maps/tutorial.tscn index 45a2d8f..8eeb932 100644 --- a/maps/tutorial.tscn +++ b/maps/tutorial.tscn @@ -16,7 +16,7 @@ shader_parameter/animate_noise = true shader_parameter/noise_intensity = 1.0 shader_parameter/fps = 15.0 -[node name="Level1" type="Node2D"] +[node name="Level2" type="Node2D"] [node name="Sprite2D" type="Sprite2D" parent="."] material = SubResource("ShaderMaterial_sf5kh") diff --git a/maps/yikes_more_spikes.tscn b/maps/yikes_more_spikes.tscn index c7c142f..b2e98f7 100644 --- a/maps/yikes_more_spikes.tscn +++ b/maps/yikes_more_spikes.tscn @@ -17,7 +17,7 @@ shader_parameter/animate_noise = true shader_parameter/noise_intensity = 1.0 shader_parameter/fps = 15.0 -[node name="Level1" type="Node2D"] +[node name="Level3" type="Node2D"] [node name="Sprite2D" type="Sprite2D" parent="."] material = SubResource("ShaderMaterial_sf5kh") diff --git a/maps/yikes_spikes.tscn b/maps/yikes_spikes.tscn index c0f1f2f..b077a82 100644 --- a/maps/yikes_spikes.tscn +++ b/maps/yikes_spikes.tscn @@ -17,7 +17,7 @@ shader_parameter/animate_noise = true shader_parameter/noise_intensity = 1.0 shader_parameter/fps = 15.0 -[node name="Level1" type="Node2D"] +[node name="Level3" type="Node2D"] [node name="Sprite2D" type="Sprite2D" parent="."] material = SubResource("ShaderMaterial_sf5kh") diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 71e1bad..a6d88e7 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,19 +1,35 @@ -[gd_scene load_steps=21 format=3 uid="uid://bwtpsjpe2lf7l"] +[gd_scene load_steps=27 format=3 uid="uid://bwtpsjpe2lf7l"] [ext_resource type="Script" uid="uid://dhyi4yn0xleoy" path="res://objects/player/player.gd" id="1_xs4s5"] [ext_resource type="Texture2D" uid="uid://c71nqfyw4a3v4" path="res://assets/textures/player/capri.png" id="3_trcll"] [ext_resource type="Script" uid="uid://cv55s54clajw5" path="res://scripts/spritesheet_animation/spritesheet_animation.gd" id="4_bsdw5"] +[ext_resource type="AudioStream" uid="uid://4kxio0mlrr4k" path="res://assets/audio/vox/capri_jump2.ogg" id="5_45urx"] [ext_resource type="Script" uid="uid://bhrh1qkv7nlyl" path="res://addons/godot_state_charts/state_chart.gd" id="5_bcjtl"] [ext_resource type="AudioStream" uid="uid://dfa1ev73rsc7g" path="res://assets/audio/vox/capri_die.ogg" id="5_bi5m7"] +[ext_resource type="AudioStream" uid="uid://c350jqy4yue8c" path="res://assets/audio/vox/capri_jump3.ogg" id="6_c34wb"] [ext_resource type="Script" uid="uid://b11v7h3ny6kh1" path="res://addons/godot_state_charts/compound_state.gd" id="6_jnxnd"] [ext_resource type="Script" uid="uid://rrj3six8lu8p" path="res://addons/godot_state_charts/transition.gd" id="7_rgjdc"] [ext_resource type="Script" uid="uid://b6u7unac5srh0" path="res://addons/godot_state_charts/expression_guard.gd" id="8_8i2im"] +[ext_resource type="AudioStream" uid="uid://cxfl2cqlre0ma" path="res://assets/audio/vox/capri_die2.ogg" id="8_45rsp"] [ext_resource type="AudioStream" uid="uid://7be7ts3rdegh" path="res://assets/audio/vox/capri_jump.ogg" id="9_8c74o"] +[ext_resource type="AudioStream" uid="uid://c6gck1lyk6aer" path="res://assets/audio/vox/capri_die3.ogg" id="9_ylcck"] [ext_resource type="Script" uid="uid://cyvphy8py4ntr" path="res://addons/godot_state_charts/atomic_state.gd" id="10_mvu25"] [sub_resource type="CircleShape2D" id="CircleShape2D_tvyy1"] radius = 6.0 +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_45rsp"] +streams_count = 3 +stream_0/stream = ExtResource("9_8c74o") +stream_1/stream = ExtResource("5_45urx") +stream_2/stream = ExtResource("6_c34wb") + +[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_x5bgp"] +streams_count = 3 +stream_0/stream = ExtResource("5_bi5m7") +stream_1/stream = ExtResource("8_45rsp") +stream_2/stream = ExtResource("9_ylcck") + [sub_resource type="Resource" id="Resource_sfpnl"] resource_name = "Not On Floor" script = ExtResource("8_8i2im") @@ -76,7 +92,7 @@ script = ExtResource("1_xs4s5") run_acceleration = 200.0 max_run_speed = 100.0 turn_acceleration = 300.0 -stopping_force = 200.0 +stopping_force = 250.0 gravity = 450.0 jump_power = 180.0 splat_launch_power = 240.0 @@ -143,12 +159,12 @@ fps = 8.0 [node name="Sounds" type="Node" parent="."] -[node name="Voice" type="AudioStreamPlayer" parent="Sounds"] -stream = ExtResource("9_8c74o") +[node name="Jump" type="AudioStreamPlayer" parent="Sounds"] +stream = SubResource("AudioStreamRandomizer_45rsp") bus = &"Capri" [node name="Death" type="AudioStreamPlayer" parent="Sounds"] -stream = ExtResource("5_bi5m7") +stream = SubResource("AudioStreamRandomizer_x5bgp") bus = &"Capri" [node name="StateChart" type="Node" parent="."] @@ -336,8 +352,8 @@ delay_in_seconds = ".25" [connection signal="taken" from="StateChart/Root/on Killed" to="Sounds/Death" method="play"] [connection signal="state_entered" from="StateChart/Root/Grounded/Standing/Idle" to="Graphics/Sprite/Idle" method="play"] [connection signal="state_entered" from="StateChart/Root/Grounded/Standing/Stopping" to="Graphics/Sprite/Run" method="play"] -[connection signal="state_physics_processing" from="StateChart/Root/Grounded/Standing/Stopping" to="." method="_scale_run_animation"] [connection signal="state_physics_processing" from="StateChart/Root/Grounded/Standing/Stopping" to="." method="_slow_to_stop"] +[connection signal="state_physics_processing" from="StateChart/Root/Grounded/Standing/Stopping" to="." method="_scale_run_animation"] [connection signal="state_entered" from="StateChart/Root/Grounded/Running" to="Graphics/Sprite/Run" method="play"] [connection signal="state_physics_processing" from="StateChart/Root/Grounded/Running" to="." method="_scale_run_animation"] [connection signal="state_physics_processing" from="StateChart/Root/Grounded/Running" to="." method="_apply_run_acceleration"] @@ -347,7 +363,7 @@ delay_in_seconds = ".25" [connection signal="state_entered" from="StateChart/Root/Airborne/Falling" to="Graphics/Sprite/Fall" method="play"] [connection signal="state_entered" from="StateChart/Root/Airborne/Jumping" to="." method="_start_jump"] [connection signal="state_entered" from="StateChart/Root/Airborne/Jumping" to="Graphics/Sprite/Jump" method="play"] -[connection signal="state_entered" from="StateChart/Root/Airborne/Jumping" to="Sounds/Voice" method="play"] +[connection signal="state_entered" from="StateChart/Root/Airborne/Jumping" to="Sounds/Jump" method="play"] [connection signal="state_entered" from="StateChart/Root/Airborne/Missile" to="Graphics/Sprite/Missile" method="play"] [connection signal="state_exited" from="StateChart/Root/Airborne/Missile" to="." method="_restore_graphics_rotation"] [connection signal="state_physics_processing" from="StateChart/Root/Airborne/Missile" to="." method="_face_towards_velocity"] diff --git a/objects/rotoboy/roto_boy.tscn b/objects/rotoboy/roto_boy.tscn index 2c76dd1..6c7ad6c 100644 --- a/objects/rotoboy/roto_boy.tscn +++ b/objects/rotoboy/roto_boy.tscn @@ -86,6 +86,6 @@ texture = ExtResource("3_gp51k") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { -"": SubResource("AnimationLibrary_l3464") +&"": SubResource("AnimationLibrary_l3464") } autoplay = "spin" diff --git a/objects/spikes/spikes.tscn b/objects/spikes/spikes.tscn index 57ed737..5023c2b 100644 --- a/objects/spikes/spikes.tscn +++ b/objects/spikes/spikes.tscn @@ -53,7 +53,7 @@ hframes = 5 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { -"": SubResource("AnimationLibrary_7km18") +&"": SubResource("AnimationLibrary_7km18") } autoplay = "spike"