diff --git a/maps/boss/boss1_arena.gd b/maps/boss/boss1_arena.gd index a66c67a..150dd0b 100644 --- a/maps/boss/boss1_arena.gd +++ b/maps/boss/boss1_arena.gd @@ -17,6 +17,7 @@ func _on_Boss1_entered_phase(phase): $DelayedArrow3.start() 4: $ExitTimer.start() + Game.marathon_shards += 1 if not Debug.prey_slaughtered: var text_3d = Text3D.instance() text_3d.anim = "victory" diff --git a/maps/boss/boss1_arena.tscn b/maps/boss/boss1_arena.tscn index 30ab39b..5b2b6cc 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -23,6 +23,7 @@ pause_mode = 1 script = ExtResource( 7 ) music = ExtResource( 11 ) lore_entries = [ ExtResource( 16 ) ] +level_id = 3 next_level = ExtResource( 17 ) [node name="HUD" parent="." instance=ExtResource( 6 )] diff --git a/maps/graveyard.tscn b/maps/graveyard.tscn index e0c425a..b00888c 100644 --- a/maps/graveyard.tscn +++ b/maps/graveyard.tscn @@ -35,6 +35,7 @@ target_time_any = 35 target_time_100 = 160 music = ExtResource( 11 ) lore_entries = [ ExtResource( 25 ), ExtResource( 26 ), ExtResource( 23 ), ExtResource( 24 ) ] +level_id = 1 next_level = ExtResource( 27 ) [node name="Background" type="CanvasLayer" parent="."] diff --git a/maps/map.gd b/maps/map.gd index f7f7f70..90a8c0e 100644 --- a/maps/map.gd +++ b/maps/map.gd @@ -6,6 +6,7 @@ export var target_time_any = 0 export var target_time_100 = 0 export (AudioStream) var music export (Array, PackedScene) var lore_entries = [] +export var level_id: int = 0 export var next_level: PackedScene #Bonuses @@ -14,6 +15,7 @@ var life_bonus = true var collectible_bonus = false func _ready(): + Game.current_level = level_id Game.next_level = next_level get_tree().paused = true Game.can_pause = false diff --git a/maps/station.tscn b/maps/station.tscn index 436f3c0..0484b9a 100644 --- a/maps/station.tscn +++ b/maps/station.tscn @@ -60,6 +60,7 @@ script = ExtResource( 1 ) target_time_100 = 430 music = ExtResource( 9 ) lore_entries = [ ExtResource( 30 ), ExtResource( 29 ), ExtResource( 25 ) ] +level_id = 2 next_level = ExtResource( 34 ) [node name="Camera2D" parent="." instance=ExtResource( 6 )] diff --git a/objects/hud/options_screen_scholar.tscn b/objects/hud/options_screen_scholar.tscn index 97787f8..1d86f82 100644 --- a/objects/hud/options_screen_scholar.tscn +++ b/objects/hud/options_screen_scholar.tscn @@ -81,12 +81,11 @@ margin_bottom = 32.0 unique_name_in_owner = true margin_top = 36.0 margin_right = 218.0 -margin_bottom = 116.0 +margin_bottom = 64.0 focus_mode = 2 tabs_visible = false [node name="Game" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 focus_next = NodePath("Rumble/SelectRumble") @@ -138,6 +137,7 @@ script = ExtResource( 3 ) options = [ "none", "no stains", "full" ] [node name="Video" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 focus_next = NodePath("Fullscreen/SelectFullscreen")