diff --git a/graphics/hud/munchy-misadventure.png b/graphics/hud/munchy-misadventure.png new file mode 100644 index 0000000..e69dca4 Binary files /dev/null and b/graphics/hud/munchy-misadventure.png differ diff --git a/graphics/hud/munchy-misadventure.png.import b/graphics/hud/munchy-misadventure.png.import new file mode 100644 index 0000000..d8a26a2 --- /dev/null +++ b/graphics/hud/munchy-misadventure.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/munchy-misadventure.png-e305f75916c9915c4c6b4b3b56cc6773.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/munchy-misadventure.png" +dest_files=[ "res://.import/munchy-misadventure.png-e305f75916c9915c4c6b4b3b56cc6773.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/maps/future/mountain_future.gd b/maps/future/mountain_future.gd index 7621be0..020ea93 100644 --- a/maps/future/mountain_future.gd +++ b/maps/future/mountain_future.gd @@ -40,3 +40,11 @@ func _physics_process(delta): Game.score += 500 Game.shards_collected[0] = true slaughter_shard_collected = true + + if Game.shards >= 5: + end_game() + + +func end_game() -> void: + Audio.ac_msx_ending.play() + Game.change_map(preload("res://maps/msx_ending.tscn"), 2.0) diff --git a/menus/title_screen.gd b/menus/title_screen.gd index b78588e..6298275 100644 --- a/menus/title_screen.gd +++ b/menus/title_screen.gd @@ -16,15 +16,10 @@ onready var revolution_2083_ivy = preload("res://audio/sounds/revolution2083_ivy func _input(event): if Input.is_action_just_pressed("start") && !has_started: Audio.play_sound(Audio.a_star,Audio.ac_collectible) - var r = 40 - if r > 0 && r < 31: audio.stream = penny_voice - if r >= 30 && r < 61: audio.stream = haze_voice - if r >= 60 && r < 91: audio.stream = ivy_voice - if r >= 90: audio.stream = dog_voice - if r == 0: audio.stream = robo_voice - audio.play() $AnimationPlayer.play("activate") has_started = true + yield(get_tree().create_timer(0.5), "timeout") + Game.change_map(next_menu) func _ready(): Fade.fade_in(Options.transition_speed_secs) diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index 57d919d..f2fd892 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=21 format=2] +[ext_resource path="res://tilesets/future/t_mountain_future.tres" type="TileSet" id=1] +[ext_resource path="res://graphics/hud/munchy-misadventure.png" type="Texture" id=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=3] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4] [ext_resource path="res://menus/title_screen.gd" type="Script" id=5] -[ext_resource path="res://menus/main_menu.tscn" type="PackedScene" id=6] +[ext_resource path="res://maps/future/mountain_future.tscn" type="PackedScene" id=6] [ext_resource path="res://graphics/hud/logo.png" type="Texture" id=7] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=8] [ext_resource path="res://graphics/backgrounds/sun_and_clouds.png" type="Texture" id=9] @@ -24,8 +26,8 @@ shader_param/uv_transform = Transform2D( 0, 1, 1, 0, 0, 0 ) [sub_resource type="ShaderMaterial" id=3] shader = ExtResource( 8 ) -shader_param/color_1 = Color( 0.662745, 0.647059, 0.819608, 1 ) -shader_param/color_2 = Color( 0.12549, 0.133333, 0.227451, 1 ) +shader_param/color_1 = Color( 0.321569, 0.301961, 0.505882, 1 ) +shader_param/color_2 = Color( 0.227451, 0.12549, 0.227451, 1 ) shader_param/checker_size = Vector2( 16, 16 ) shader_param/pan_speed = Vector2( 0, 0 ) shader_param/cycle_speed = Vector2( 6, 3 ) @@ -119,30 +121,31 @@ next_menu = ExtResource( 6 ) [node name="Day" type="Node2D" parent="."] [node name="ColorRect" type="ColorRect" parent="Day"] +visible = false material = SubResource( 7 ) margin_right = 256.0 margin_bottom = 192.0 [node name="Sprite" type="Sprite" parent="Day"] +visible = false position = Vector2( 128, 96 ) texture = ExtResource( 9 ) [node name="Night" type="Node2D" parent="."] -visible = false -[node name="ColorRect2" type="ColorRect" parent="Night"] +[node name="ColorRect2" type="ColorRect" parent="."] material = SubResource( 3 ) margin_right = 256.0 margin_bottom = 192.0 -[node name="ColorRect" type="ColorRect" parent="Night"] +[node name="ColorRect" type="ColorRect" parent="."] material = SubResource( 5 ) margin_right = 256.0 margin_bottom = 192.0 -color = Color( 1, 1, 1, 0.392157 ) +color = Color( 0.619608, 0, 0.45098, 0.392157 ) -[node name="Sprite" type="Sprite" parent="Night"] -position = Vector2( 296, 96 ) +[node name="Sprite2" type="Sprite" parent="."] +position = Vector2( 288, 64 ) texture = ExtResource( 12 ) [node name="SmokeParticles" type="CPUParticles2D" parent="."] @@ -166,19 +169,21 @@ scale_amount_curve = SubResource( 4 ) color = Color( 0.0666667, 0.0666667, 0.0666667, 1 ) [node name="Logo" type="Sprite" parent="."] +visible = false position = Vector2( 128, 96 ) texture = ExtResource( 7 ) [node name="Label" type="Label" parent="."] material = ExtResource( 4 ) -margin_top = 136.0 +margin_top = 176.0 margin_right = 256.0 -margin_bottom = 159.0 +margin_bottom = 199.0 theme = ExtResource( 3 ) text = "Press start!" align = 1 [node name="TitleCredits" type="Sprite" parent="."] +visible = false position = Vector2( 128, 96 ) texture = ExtResource( 13 ) @@ -191,4 +196,16 @@ anims/blink = SubResource( 6 ) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] volume_db = -7.866 +[node name="TileMap" type="TileMap" parent="."] +position = Vector2( 4, -11 ) +tile_set = ExtResource( 1 ) +cell_size = Vector2( 8, 8 ) +format = 1 +tile_data = PoolIntArray( 131094, 4, 65537, 131095, 4, 2, 131096, 4, 3, 131098, 4, 65536, 196625, 4, 65536, 196629, 4, 65537, 196630, 4, 196611, 196634, 4, 131072, 262147, 4, 65536, 262161, 4, 131072, 262165, 4, 131072, 262169, 4, 1, 262170, 4, 196611, 327683, 4, 131072, 327686, 4, 65536, 327697, 4, 196609, 327698, 4, 65538, 327699, 4, 65538, 327700, 4, 65538, 327701, 4, 196611, 327708, 4, 65537, 327709, 4, 2, 327710, 4, 3, 393218, 4, 65537, 393219, 4, 196610, 393220, 4, 65538, 393221, 4, 65538, 393222, 4, 131075, 393226, 4, 65537, 393227, 4, 2, 393228, 4, 3, 393234, 4, 196609, 393235, 4, 131074, 393236, 4, 131075, 393244, 4, 131072, 458754, 4, 131072, 458756, 4, 131073, 458757, 4, 131074, 458758, 4, 196610, 458759, 4, 65539, 458762, 4, 131072, 458771, 4, 131073, 458772, 4, 131075, 458780, 4, 196609, 458781, 4, 65539, 524289, 4, 65537, 524290, 4, 196611, 524292, 4, 131073, 524293, 4, 196611, 524295, 4, 131072, 524298, 4, 196609, 524299, 4, 2, 524300, 4, 65539, 524307, 4, 131073, 524308, 4, 196610, 524309, 4, 65539, 524317, 4, 131072, 589825, 4, 196608, 589828, 4, 196608, 589831, 4, 131072, 589836, 4, 131072, 589842, 4, 65537, 589843, 4, 196611, 589845, 4, 196609, 589846, 4, 65539, 589852, 4, 65537, 589853, 4, 196611, 655367, 4, 196609, 655368, 4, 3, 655371, 4, 65537, 655372, 4, 196611, 655374, 4, 0, 655376, 4, 65537, 655377, 4, 2, 655378, 4, 196611, 655382, 4, 196609, 655383, 4, 65539, 655386, 4, 1, 655387, 4, 2, 655388, 4, 196611, 720906, 4, 1, 720907, 4, 196611, 720912, 4, 196608, 720919, 4, 196608 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0, 2 ) +texture = ExtResource( 2 ) +centered = false + [connection signal="finished" from="AudioStreamPlayer" to="." method="_on_AudioStreamPlayer_finished"] diff --git a/project.godot b/project.godot index f8386a9..dfd555a 100644 --- a/project.godot +++ b/project.godot @@ -87,7 +87,7 @@ _global_script_class_icons={ [application] config/name="Revolution 2083" -run/main_scene="res://maps/future/mountain_future.tscn" +run/main_scene="res://menus/title_screen.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="heromark2" boot_splash/show_image=false