team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

more marathon mode phixes

Browse source
This commit is contained in:
Haze Weathers 2023-12-30 21:12:06 -05:00
parent db0a61e162
commit 95cb99ff49
6 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
maps/boss/boss1_arena.gd
View file

@ -17,6 +17,7 @@ func _on_Boss1_entered_phase(phase):
$DelayedArrow3.start() $DelayedArrow3.start()
4: 4:
$ExitTimer.start() $ExitTimer.start()
Game.marathon_shards += 1
if not Debug.prey_slaughtered: if not Debug.prey_slaughtered:
var text_3d = Text3D.instance() var text_3d = Text3D.instance()
text_3d.anim = "victory" text_3d.anim = "victory"

1
maps/boss/boss1_arena.tscn
View file

@ -23,6 +23,7 @@ pause_mode = 1
script = ExtResource( 7 ) script = ExtResource( 7 )
music = ExtResource( 11 ) music = ExtResource( 11 )
lore_entries = [ ExtResource( 16 ) ] lore_entries = [ ExtResource( 16 ) ]
level_id = 3
next_level = ExtResource( 17 ) next_level = ExtResource( 17 )
[node name="HUD" parent="." instance=ExtResource( 6 )] [node name="HUD" parent="." instance=ExtResource( 6 )]

1
maps/graveyard.tscn
View file

@ -35,6 +35,7 @@ target_time_any = 35
target_time_100 = 160 target_time_100 = 160
music = ExtResource( 11 ) music = ExtResource( 11 )
lore_entries = [ ExtResource( 25 ), ExtResource( 26 ), ExtResource( 23 ), ExtResource( 24 ) ] lore_entries = [ ExtResource( 25 ), ExtResource( 26 ), ExtResource( 23 ), ExtResource( 24 ) ]
level_id = 1
next_level = ExtResource( 27 ) next_level = ExtResource( 27 )
[node name="Background" type="CanvasLayer" parent="."] [node name="Background" type="CanvasLayer" parent="."]

2
maps/map.gd
View file

@ -6,6 +6,7 @@ export var target_time_any = 0
export var target_time_100 = 0 export var target_time_100 = 0
export (AudioStream) var music export (AudioStream) var music
export (Array, PackedScene) var lore_entries = [] export (Array, PackedScene) var lore_entries = []
export var level_id: int = 0
export var next_level: PackedScene export var next_level: PackedScene
#Bonuses #Bonuses
@ -14,6 +15,7 @@ var life_bonus = true
var collectible_bonus = false var collectible_bonus = false
func _ready(): func _ready():
Game.current_level = level_id
Game.next_level = next_level Game.next_level = next_level
get_tree().paused = true get_tree().paused = true
Game.can_pause = false Game.can_pause = false

1
maps/station.tscn
View file

@ -60,6 +60,7 @@ script = ExtResource( 1 )
target_time_100 = 430 target_time_100 = 430
music = ExtResource( 9 ) music = ExtResource( 9 )
lore_entries = [ ExtResource( 30 ), ExtResource( 29 ), ExtResource( 25 ) ] lore_entries = [ ExtResource( 30 ), ExtResource( 29 ), ExtResource( 25 ) ]
level_id = 2
next_level = ExtResource( 34 ) next_level = ExtResource( 34 )
[node name="Camera2D" parent="." instance=ExtResource( 6 )] [node name="Camera2D" parent="." instance=ExtResource( 6 )]

4
objects/hud/options_screen_scholar.tscn
View file

@ -81,12 +81,11 @@ margin_bottom = 32.0
unique_name_in_owner = true unique_name_in_owner = true
margin_top = 36.0 margin_top = 36.0
margin_right = 218.0 margin_right = 218.0
margin_bottom = 116.0 margin_bottom = 64.0
focus_mode = 2 focus_mode = 2
tabs_visible = false tabs_visible = false
[node name="Game" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] [node name="Game" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"]
visible = false
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
focus_next = NodePath("Rumble/SelectRumble") focus_next = NodePath("Rumble/SelectRumble")
@ -138,6 +137,7 @@ script = ExtResource( 3 )
options = [ "none", "no stains", "full" ] options = [ "none", "no stains", "full" ]
[node name="Video" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] [node name="Video" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"]
visible = false
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
focus_next = NodePath("Fullscreen/SelectFullscreen") focus_next = NodePath("Fullscreen/SelectFullscreen")