diff --git a/audio/sounds/msx_ending.ogg b/audio/sounds/msx_ending.ogg new file mode 100644 index 0000000..4e47a62 Binary files /dev/null and b/audio/sounds/msx_ending.ogg differ diff --git a/audio/sounds/msx_ending.ogg.import b/audio/sounds/msx_ending.ogg.import new file mode 100644 index 0000000..ee3d861 --- /dev/null +++ b/audio/sounds/msx_ending.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/msx_ending.ogg-614ae91555266d58eb574b3e451e1a59.oggstr" + +[deps] + +source_file="res://audio/sounds/msx_ending.ogg" +dest_files=[ "res://.import/msx_ending.ogg-614ae91555266d58eb574b3e451e1a59.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index f7314a9..9947724 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -16,6 +16,7 @@ onready var ac_voice = $Voice onready var ac_small_explosion = $SmallExplosion onready var ac_mech_hurt = $MechHurt onready var ac_mech_shoot = $MechShoot +onready var ac_msx_ending = $Ending #Sounds const a_key = preload("res://audio/sounds/key.ogg") const a_arrow = preload("res://audio/sounds/arrow_collect.ogg") diff --git a/autoloads/audio.tscn b/autoloads/audio.tscn index 6952ba7..6ef5b89 100644 --- a/autoloads/audio.tscn +++ b/autoloads/audio.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://autoloads/audio.gd" type="Script" id=1] [ext_resource path="res://audio/sounds/shard.ogg" type="AudioStream" id=2] [ext_resource path="res://audio/music/pause.ogg" type="AudioStream" id=3] +[ext_resource path="res://audio/sounds/msx_ending.ogg" type="AudioStream" id=4] [node name="Audio" type="Node"] pause_mode = 2 @@ -62,4 +63,7 @@ volume_db = -10.0 [node name="MechShoot" type="AudioStreamPlayer" parent="."] volume_db = -20.0 +[node name="Ending" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) + [connection signal="finished" from="ShardSound" to="." method="_on_ShardSound_finished"] diff --git a/autoloads/fade.tscn b/autoloads/fade.tscn index 46eb839..fdb6a5f 100644 --- a/autoloads/fade.tscn +++ b/autoloads/fade.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://graphics/fade_patterns/diamonds2.png" type="Texture" id=1] +[ext_resource path="res://graphics/fade_patterns/squarescascade.png" type="Texture" id=1] [ext_resource path="res://autoloads/fade.gd" type="Script" id=2] [ext_resource path="res://shaders/fade.gdshader" type="Shader" id=3] [sub_resource type="ShaderMaterial" id=6] shader = ExtResource( 3 ) -shader_param/color = Color( 0, 0, 0, 1 ) +shader_param/color = Color( 1, 1, 1, 1 ) shader_param/smooth_mode = false -shader_param/reverse = false +shader_param/reverse = true shader_param/opacity = 0.0 [sub_resource type="Animation" id=7] diff --git a/autoloads/game.gd b/autoloads/game.gd index 1f3e1c9..015a6c9 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -153,10 +153,10 @@ func tally_scores() -> void: #Go to new map -func change_map(map: PackedScene) -> void: +func change_map(map: PackedScene,fade:float = Options.transition_speed_secs) -> void: get_tree().paused = true can_pause = false - Fade.fade_out(Options.transition_speed_secs) + Fade.fade_out(fade) yield(Fade, "fade_finished") can_pause = true # save deaths diff --git a/maps/future/mountain_future.tscn b/maps/future/mountain_future.tscn index e0ba76d..10e3106 100644 --- a/maps/future/mountain_future.tscn +++ b/maps/future/mountain_future.tscn @@ -1,4 +1,8 @@ +<<<<<<< HEAD [gd_scene load_steps=36 format=2] +======= +[gd_scene load_steps=28 format=2] +>>>>>>> 15d8307 (tghe end) [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://maps/future/mountain_future.gd" type="Script" id=2] @@ -18,7 +22,11 @@ [ext_resource path="res://objects/enemy/roboturret.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=17] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=18] +<<<<<<< HEAD [ext_resource path="res://objects/respawn_point.tscn" type="PackedScene" id=19] +======= +[ext_resource path="res://audio/sounds/msx_ending.ogg" type="AudioStream" id=19] +>>>>>>> 15d8307 (tghe end) [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=21] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=22] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=23] @@ -586,6 +594,13 @@ anims/liftoff = SubResource( 10 ) [node name="CanvasModulate" type="CanvasModulate" parent="."] +[node name="AnimationPlayer2" type="AnimationPlayer" parent="."] + +[node name="EndingSound" type="AudioStreamPlayer" parent="."] +unique_name_in_owner = true +stream = ExtResource( 19 ) +volume_db = -9.613 + [connection signal="timeout" from="LightningTimer" to="." method="_spawn_lightning"] [connection signal="tree_entered" from="Background/BackgroundMountain/Mountain" to="Background/BackgroundMountain/Mountain" method="set_visible" binds= [ true ]] [connection signal="collected" from="Collectibles/Shards/Shard3" to="Enemies/TopMiddle/Mine" method="kill_for_real"] diff --git a/maps/msx_ending.gd b/maps/msx_ending.gd new file mode 100644 index 0000000..12089cf --- /dev/null +++ b/maps/msx_ending.gd @@ -0,0 +1,11 @@ +extends Node2D + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + Fade.fade_in(2) diff --git a/maps/msx_ending.tscn b/maps/msx_ending.tscn new file mode 100644 index 0000000..b42c8b6 --- /dev/null +++ b/maps/msx_ending.tscn @@ -0,0 +1,74 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://graphics/hud/msx_ending.png" type="Texture" id=1] +[ext_resource path="res://ui/theme.tres" type="Theme" id=2] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=3] +[ext_resource path="res://maps/msx_ending.gd" type="Script" id=4] + +[sub_resource type="Animation" id=1] +resource_name = "GO" +length = 13.0 +tracks/0/type = "value" +tracks/0/path = NodePath("End:rect_position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 5.8, 6.8, 8.8 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( -39, 70 ), Vector2( -39, 70 ), Vector2( 81, 70 ), Vector2( 111, 70 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("The:rect_position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 5.8, 6.8, 8.8 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 251, 70 ), Vector2( 251, 70 ), Vector2( 81, 70 ), Vector2( 51, 70 ) ] +} + +[node name="msx_ending" type="Node2D"] +script = ExtResource( 4 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 128, 96 ) +texture = ExtResource( 1 ) + +[node name="Label" type="Label" parent="."] +material = ExtResource( 3 ) +margin_left = 10.0 +margin_top = 16.0 +margin_right = 143.0 +margin_bottom = 39.0 +theme = ExtResource( 2 ) +text = "Wow... +What a crazy dream." + +[node name="End" type="Label" parent="."] +material = ExtResource( 3 ) +margin_left = -39.0 +margin_top = 70.0 +margin_right = 10.9994 +margin_bottom = 93.0 +theme = ExtResource( 2 ) +text = "End " + +[node name="The" type="Label" parent="."] +material = ExtResource( 3 ) +margin_left = 251.0 +margin_top = 70.0 +margin_right = 301.0 +margin_bottom = 93.0 +theme = ExtResource( 2 ) +text = "THE" +align = 2 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "GO" +anims/GO = SubResource( 1 )