diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index c6b13b7..7d316f7 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -1,20 +1,11 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://autoloads/level_data.gd" type="Script" id=1] [ext_resource path="res://maps/hills_scholar.tscn" type="PackedScene" id=2] -[ext_resource path="res://maps/canopy.tscn" type="PackedScene" id=3] -[ext_resource path="res://maps/cave.tscn" type="PackedScene" id=4] [ext_resource path="res://scripts/level_entry.gd" type="Script" id=5] -[ext_resource path="res://maps/mountain.tscn" type="PackedScene" id=6] -[ext_resource path="res://maps/abyss_scholar.tscn" type="PackedScene" id=7] [ext_resource path="res://maps/boss/boss1_arena.tscn" type="PackedScene" id=8] -[ext_resource path="res://maps/rust.tscn" type="PackedScene" id=9] [ext_resource path="res://maps/station.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/graveyard.tscn" type="PackedScene" id=11] -[ext_resource path="res://maps/lab.tscn" type="PackedScene" id=12] -[ext_resource path="res://maps/boss/boss2_arena.tscn" type="PackedScene" id=13] -[ext_resource path="res://maps/cave_scholar.tscn" type="PackedScene" id=14] -[ext_resource path="res://maps/hills.tscn" type="PackedScene" id=15] [sub_resource type="Resource" id=1] resource_name = "Verdant Hills" @@ -29,71 +20,6 @@ scores_id = 13253 times_id = 13255 scene = ExtResource( 2 ) -[sub_resource type="Resource" id=2] -resource_name = "Shady Canopy" -script = ExtResource( 5 ) -title = "Shady Canopy" -shard_titles = [ "Archer and His Friend", "Thirsty Spiders", "Spider's Den", "Dancing Above the Pond", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "canopy" -shards_required = 0 -boss_required = "" -boss = false -scores_id = 13254 -times_id = 13257 -scene = ExtResource( 3 ) - -[sub_resource type="Resource" id=4] -resource_name = "Echo Mountain" -script = ExtResource( 5 ) -title = "Echo Mountain" -shard_titles = [ "Push the Rock", "Twin Rolling Fiends", "Beware! Moving Platforms", "Crafty CatBat", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "mountain" -shards_required = 0 -boss_required = "" -boss = false -scores_id = 13263 -times_id = 13270 -scene = ExtResource( 6 ) - -[sub_resource type="Resource" id=6] -resource_name = "VS The Scrump" -script = ExtResource( 5 ) -title = "VS The Scrump" -shard_titles = [ "-w-", "owo", "uwu", "o3o", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "boss1" -shards_required = 4 -boss_required = "" -boss = true -scores_id = -1 -times_id = -1 -scene = ExtResource( 8 ) - -[sub_resource type="Resource" id=3] -resource_name = "Blue Ray Cavern" -script = ExtResource( 5 ) -title = "Blue Ray Cavern" -shard_titles = [ "Dynamic Duo", "Stalactite Scramble", "OverHead Obstacle Course", "Sneaky Snail", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "cave" -shards_required = 0 -boss_required = "boss1" -boss = false -scores_id = 13264 -times_id = 13271 -scene = ExtResource( 14 ) - -[sub_resource type="Resource" id=10] -resource_name = "Crater of the Abyss" -script = ExtResource( 5 ) -title = "Crater of the Abyss" -shard_titles = [ "Follow the minnow", "Beel enclosure", "Turchin jump", "Drop Down Mine Jump", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "abyss" -shards_required = 0 -boss_required = "boss1" -boss = false -scores_id = 13265 -times_id = 13272 -scene = ExtResource( 7 ) - [sub_resource type="Resource" id=9] resource_name = "ArlingWood Graveyard" script = ExtResource( 5 ) @@ -107,19 +33,6 @@ scores_id = 13266 times_id = 13273 scene = ExtResource( 11 ) -[sub_resource type="Resource" id=12] -resource_name = "VS. STG-2600" -script = ExtResource( 5 ) -title = "VS. STG-2600" -shard_titles = [ "", "", "", "", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "boss2" -shards_required = 8 -boss_required = "" -boss = true -scores_id = -1 -times_id = -1 -scene = ExtResource( 13 ) - [sub_resource type="Resource" id=8] resource_name = "Dread PD" script = ExtResource( 5 ) @@ -133,58 +46,19 @@ scores_id = 13267 times_id = 13274 scene = ExtResource( 10 ) -[sub_resource type="Resource" id=7] -resource_name = "Rust Inc." +[sub_resource type="Resource" id=6] +resource_name = "VS The Scrump" script = ExtResource( 5 ) -title = "Rust Inc." -shard_titles = [ "Precarious Block", "Beside the button", "Saws and bullets", "Beyond the Steam", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "rust" -shards_required = 0 -boss_required = "boss2" -boss = false -scores_id = 13268 -times_id = 13275 -scene = ExtResource( 9 ) - -[sub_resource type="Resource" id=11] -resource_name = "Fami's Lab" -script = ExtResource( 5 ) -title = "Fami's Lab" -shard_titles = [ "Jump the Spike", "Final Obstacle Course", "5-Finger Discount", "Partners in law", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "lab" -shards_required = 0 -boss_required = "boss2" -boss = false -scores_id = 13269 -times_id = 13276 -scene = ExtResource( 12 ) - -[sub_resource type="Resource" id=13] -resource_name = "Beta Verdant Hills" -script = ExtResource( 5 ) -title = "Beta Verdant Hills" -shard_titles = [ "Climb the Big Vine", "Next to the Lone Tree", "Slime's Treasure", "The Snake Pit", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "beta_hills" -shards_required = 72 +title = "VS The Scrump" +shard_titles = [ "-w-", "owo", "uwu", "o3o", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] +save_id = "boss1" +shards_required = 4 boss_required = "" -boss = false +boss = true scores_id = -1 times_id = -1 -scene = ExtResource( 15 ) - -[sub_resource type="Resource" id=14] -resource_name = "Beta Blue Ray Cavern" -script = ExtResource( 5 ) -title = "Beta Blue Ray Cavern" -shard_titles = [ "Star-Crossed Lovers", "The Snail Cave", "Members Only!", "OverHead Obstacle Course", "5 Rainbow Stars", "Collection Bonus", "Time Bonus", "Life Bonus" ] -save_id = "beta_cave" -shards_required = 72 -boss_required = "" -boss = false -scores_id = -1 -times_id = -1 -scene = ExtResource( 4 ) +scene = ExtResource( 8 ) [node name="LevelData" type="Node"] script = ExtResource( 1 ) -levels = [ SubResource( 1 ), SubResource( 2 ), SubResource( 4 ), SubResource( 6 ), SubResource( 3 ), SubResource( 10 ), SubResource( 9 ), SubResource( 12 ), SubResource( 8 ), SubResource( 7 ), SubResource( 11 ), SubResource( 13 ), SubResource( 14 ) ] +levels = [ SubResource( 1 ), SubResource( 9 ), SubResource( 8 ), SubResource( 6 ) ] diff --git a/autoloads/save.gd b/autoloads/save.gd index e09a4ed..f90ef05 100644 --- a/autoloads/save.gd +++ b/autoloads/save.gd @@ -148,11 +148,11 @@ var current_file: SaveFile = null func _ready() -> void: # TODO: make load last played file - current_file = load_file("user://file%d.pr" % Options.last_file) + current_file = load_file("user://demo_save.pr") if current_file: Game.difficulty = current_file.difficulty else: - current_file = SaveFile.new("user://testing.pr") + current_file = SaveFile.new("user://demo_save.pr") ## shortcut for loading a save file from specific path func load_file(path: String) -> SaveFile: diff --git a/cutscenes/intro_story.gd b/cutscenes/intro_story.gd index 4327876..fcd9421 100644 --- a/cutscenes/intro_story.gd +++ b/cutscenes/intro_story.gd @@ -9,9 +9,9 @@ func _input(event): if Input.is_action_just_pressed("ui_accept"): Fade.fade_out(0.4) yield(Fade, "fade_finished") - SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() + SceneManager.current_scene = load("res://maps/level_select.tscn").instance() func _on_AnimationPlayer_animation_finished(anim_name): Fade.fade_out(0.4) yield(Fade, "fade_finished") - SceneManager.current_scene = load("res://menus/level_select_scholar.tscn").instance() + SceneManager.current_scene = load("res://maps/level_select.tscn").instance() diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index 6864c36..be37485 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=22 format=2] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] +[ext_resource path="res://cutscenes/intro_story.tscn" type="PackedScene" 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://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] @@ -120,7 +120,7 @@ tracks/0/keys = { [node name="TitleScreen" type="Node"] script = ExtResource( 5 ) -next_menu = ExtResource( 6 ) +next_menu = ExtResource( 2 ) [node name="Day" type="Node2D" parent="."]