From ba44fd60d17f1b5af7e14dac7196113d76c76357 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 14 Nov 2021 22:07:11 +0200 Subject: [PATCH] Fixed bug 'trinity site not loading' --- source/assets/scripts/server_handlers/trinity_site_level.gd | 2 +- .../scripts/server_handlers/trinity_site_level_playground.gd | 2 +- source/levels/trinity_site/trinity_site_level.tscn | 1 - source/levels/trinity_site/trinity_site_level_playground.tscn | 2 +- source/scenes/OVERLAY/elements/user_input.tscn | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd index e40f25d..36ffddd 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level.gd @@ -32,7 +32,7 @@ func _player_disconnected(id) -> void: PersistentNodes.get_node(str(id)).queue_free() -func _process(delta): +func _process(_delta): globalActivePhase = Global.get_current_phase() if globalActivePhase["active"] != null: phase.text = str(globalActivePhase["active"]["phase_name"]) diff --git a/source/assets/scripts/server_handlers/trinity_site_level_playground.gd b/source/assets/scripts/server_handlers/trinity_site_level_playground.gd index d9a5d8a..c51b495 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level_playground.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level_playground.gd @@ -33,7 +33,7 @@ func _on_timer_timeout(): time -= 1 -func _process(delta): +func _process(_delta): globalActivePhase = Global.get_current_phase() if globalActivePhase["active"] != null: $timer.text = str(globalActivePhase["active"]["phase_name"]) diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index 444efdf..48df8da 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -153,7 +153,6 @@ script = ExtResource( 2 ) script = ExtResource( 6 ) [node name="winner" type="Label" parent="game_UI"] -visible = false anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 diff --git a/source/levels/trinity_site/trinity_site_level_playground.tscn b/source/levels/trinity_site/trinity_site_level_playground.tscn index 169a1a5..14ac053 100644 --- a/source/levels/trinity_site/trinity_site_level_playground.tscn +++ b/source/levels/trinity_site/trinity_site_level_playground.tscn @@ -158,10 +158,10 @@ margin_left = 2.37842 margin_top = -35.5 margin_right = 2.37842 margin_bottom = 106.5 +custom_fonts/font = SubResource( 1 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_offset_x = 6 custom_constants/shadow_offset_y = 6 -custom_fonts/font = SubResource( 1 ) text = "You are the winner" align = 1 valign = 1 diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn index d5b7aec..5acf2ef 100644 --- a/source/scenes/OVERLAY/elements/user_input.tscn +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=24 format=2] -[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/user_input_background_panel.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/background_panel.svg" type="Texture" id=1] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=2] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/line_active.svg" type="Texture" id=3] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg" type="Texture" id=4]