From d4b2c25a0a30c7717b247a31ef1a8581951ee098 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 14 Nov 2021 20:09:45 +0200 Subject: [PATCH] Added game control UI --- project.godot | 40 +-- .../network_processors/network_setup.gd | 4 +- .../server_handlers/trinity_site_level.gd | 10 +- source/assets/scripts/shooting/Control.gd | 2 - source/assets/sprites/GUI/bar-background.png | Bin 989 -> 0 bytes source/assets/sprites/GUI/bar-fill.png | Bin 984 -> 0 bytes .../GUI/{ => in_game/buttons}/button.svg | 0 .../{ => in_game/buttons}/button_disabled.svg | 0 .../{ => in_game/buttons}/button_hover.svg | 0 .../{ => in_game/buttons}/button_pressed.svg | 0 .../GUI/{ => in_game/buttons}/lan_logo.svg | 0 .../GUI/in_game/buttons/menu_button.svg | 80 +++++ .../{ => buttons}/menu_button_hover.svg | 64 ++-- .../in_game/buttons/menu_button_pressed.svg | 84 +++++ .../{ => in_game/buttons}/server_title.svg | 0 .../trinity_site_health_bar_negative.svg | 0 .../trinity_site_health_bar_positive.svg | 0 .../sprites/GUI/in_game/menu_button.svg | 13 - .../GUI/in_game/menu_button_pressed.svg | 101 ------ .../GUI/in_game/timer/background_panel.svg | 64 ++++ .../timer/trinity_site_display_screen.svg | 308 ++++++++++++++++++ .../trinity_site_display_screen_2 – 1.svg | 0 .../trinity_site_display_screen_2 – 2.svg | 0 .../trinity_site_display_screen_2.svg | 0 .../GUI/in_game/trajectories/background.svg | 65 ++++ .../in_game/trajectories/hyperbol_active.svg | 64 ++++ .../trajectories/hyperbol_inactive.svg | 64 ++++ .../GUI/in_game/trajectories/line_active.svg | 64 ++++ .../in_game/trajectories/line_inactive.svg | 64 ++++ .../in_game/trajectories/parabol_active.svg | 71 ++++ .../in_game/trajectories/parabol_inactive.svg | 68 ++++ .../GUI/in_game/trajectories/sin_active.svg | 68 ++++ .../GUI/in_game/trajectories/sin_inactive.svg | 71 ++++ .../in_game/trinity_site_display_input.svg | 51 --- .../in_game/trinity_site_display_screen.svg | 58 ---- .../trinity_site_health_bar_negative.png | Bin 351 -> 0 bytes .../trinity_site_health_bar_positive.png | Bin 352 -> 0 bytes .../trinity_site_input_background-example.svg | 123 ------- .../in_game/trinity_site_input_background.png | Bin 3145 -> 0 bytes .../in_game/trinity_site_input_background.svg | 15 - .../in_game/trinity_site_input_button_1.png | Bin 2237 -> 0 bytes .../in_game/trinity_site_input_button_1.svg | 36 -- .../trinity_site_input_button_1_active.png | Bin 2130 -> 0 bytes .../trinity_site_input_button_1_active.svg | 36 -- .../in_game/trinity_site_input_button_2.png | Bin 2114 -> 0 bytes .../in_game/trinity_site_input_button_2.svg | 36 -- .../trinity_site_input_button_2_active.png | Bin 2059 -> 0 bytes .../trinity_site_input_button_2_active.svg | 36 -- .../trinity_site_input_button_3 – 1.png | Bin 355 -> 0 bytes .../in_game/trinity_site_input_button_3.png | Bin 1986 -> 0 bytes .../in_game/trinity_site_input_button_3.svg | 36 -- .../trinity_site_input_button_3_active.png | Bin 1935 -> 0 bytes .../trinity_site_input_button_3_active.svg | 36 -- .../in_game/trinity_site_input_button_4.png | Bin 2065 -> 0 bytes .../in_game/trinity_site_input_button_4.svg | 36 -- .../trinity_site_input_button_4_active.png | Bin 2055 -> 0 bytes .../trinity_site_input_button_4_active.svg | 36 -- .../in_game/user_input/background_panel.svg | 126 +++++++ .../user_input/ready_button/ready_button.svg | 49 +++ .../ready_button/ready_button_hover.svg | 49 +++ .../ready_button/ready_button_pressed.svg | 49 +++ .../user_input/skip_button/skip_button.svg | 49 +++ .../skip_button/skip_button_hover.svg | 49 +++ .../skip_button/skip_button_pressedsvg.svg | 49 +++ .../user_input/trinity_site_display_input.svg | 272 ++++++++++++++++ source/assets/sprites/GUI/menu_button.svg | 105 ------ .../assets/sprites/GUI/menu_button_hover.svg | 161 --------- .../sprites/GUI/menu_button_pressed.svg | 161 --------- .../trinity_site/trinity_site_level.tscn | 93 ++---- source/scenes/GUI/main_menu.tscn | 2 +- source/scenes/GUI/network_setup.tscn | 6 +- .../GUI/server_handlers/server_browser.tscn | 8 +- source/scenes/GUI/singleplayer_setup.tscn | 4 +- source/scenes/OVERLAY/elements/HUD.tscn | 16 +- source/scenes/OVERLAY/elements/button.tscn | 15 +- .../scenes/OVERLAY/elements/menu_button.tscn | 7 +- .../OVERLAY/elements/menu_button_overlay.tscn | 5 +- .../OVERLAY/elements/simple_prompt.tscn | 2 +- source/scenes/OVERLAY/elements/timer.tscn | 54 +++ .../OVERLAY/elements/trajectory_control.tscn | 214 ++++++++++++ .../scenes/OVERLAY/elements/user_input.tscn | 294 +++++++++++++++++ .../OVERLAY/elements/username_text.tscn | 4 +- 82 files changed, 2516 insertions(+), 1231 deletions(-) delete mode 100644 source/assets/sprites/GUI/bar-background.png delete mode 100644 source/assets/sprites/GUI/bar-fill.png rename source/assets/sprites/GUI/{ => in_game/buttons}/button.svg (100%) rename source/assets/sprites/GUI/{ => in_game/buttons}/button_disabled.svg (100%) rename source/assets/sprites/GUI/{ => in_game/buttons}/button_hover.svg (100%) rename source/assets/sprites/GUI/{ => in_game/buttons}/button_pressed.svg (100%) rename source/assets/sprites/GUI/{ => in_game/buttons}/lan_logo.svg (100%) create mode 100644 source/assets/sprites/GUI/in_game/buttons/menu_button.svg rename source/assets/sprites/GUI/in_game/{ => buttons}/menu_button_hover.svg (61%) create mode 100644 source/assets/sprites/GUI/in_game/buttons/menu_button_pressed.svg rename source/assets/sprites/GUI/{ => in_game/buttons}/server_title.svg (100%) rename source/assets/sprites/GUI/in_game/{ => health_bar}/trinity_site_health_bar_negative.svg (100%) rename source/assets/sprites/GUI/in_game/{ => health_bar}/trinity_site_health_bar_positive.svg (100%) delete mode 100644 source/assets/sprites/GUI/in_game/menu_button.svg delete mode 100644 source/assets/sprites/GUI/in_game/menu_button_pressed.svg create mode 100644 source/assets/sprites/GUI/in_game/timer/background_panel.svg create mode 100644 source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen.svg rename source/assets/sprites/GUI/in_game/{ => timer}/trinity_site_display_screen_2 – 1.svg (100%) rename source/assets/sprites/GUI/in_game/{ => timer}/trinity_site_display_screen_2 – 2.svg (100%) rename source/assets/sprites/GUI/in_game/{ => timer}/trinity_site_display_screen_2.svg (100%) create mode 100644 source/assets/sprites/GUI/in_game/trajectories/background.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/hyperbol_inactive.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/line_active.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/line_inactive.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/parabol_active.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/parabol_inactive.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/sin_active.svg create mode 100644 source/assets/sprites/GUI/in_game/trajectories/sin_inactive.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_display_input.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_display_screen.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_health_bar_negative.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_health_bar_positive.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_background-example.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_background.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_background.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_1.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_1.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_2.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_2.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_3.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_3.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_4.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_4.svg delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.png delete mode 100644 source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/background_panel.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_pressed.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_hover.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_pressedsvg.svg create mode 100644 source/assets/sprites/GUI/in_game/user_input/trinity_site_display_input.svg delete mode 100644 source/assets/sprites/GUI/menu_button.svg delete mode 100644 source/assets/sprites/GUI/menu_button_hover.svg delete mode 100644 source/assets/sprites/GUI/menu_button_pressed.svg create mode 100644 source/scenes/OVERLAY/elements/timer.tscn create mode 100644 source/scenes/OVERLAY/elements/trajectory_control.tscn create mode 100644 source/scenes/OVERLAY/elements/user_input.tscn diff --git a/project.godot b/project.godot index e5984ad..c90e8a2 100644 --- a/project.godot +++ b/project.godot @@ -42,42 +42,42 @@ fps=false input_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) ] } input_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) ] } input_up={ "deadzone": 0.49, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) ] } input_down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) ] } input_debug={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":96,"unicode":0,"echo":false,"script":null) ] } input_enter={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) ] } input_shift={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777237,"unicode":0,"echo":false,"script":null) ] } input_shoot={ @@ -87,42 +87,42 @@ input_shoot={ } esc={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) ] } rotation_increase={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null) ] } rotation_decrease={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null) ] } line={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777351,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777351,"unicode":0,"echo":false,"script":null) ] } sine={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"unicode":0,"echo":false,"script":null) ] } hyper={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777353,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777353,"unicode":0,"echo":false,"script":null) ] } parab={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777354,"unicode":0,"echo":false,"script":null) ] } fullscreen_toggle={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777254,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777254,"unicode":0,"echo":false,"script":null) ] } diff --git a/source/assets/scripts/server_handlers/network_processors/network_setup.gd b/source/assets/scripts/server_handlers/network_processors/network_setup.gd index 32d85e5..204dbc3 100644 --- a/source/assets/scripts/server_handlers/network_processors/network_setup.gd +++ b/source/assets/scripts/server_handlers/network_processors/network_setup.gd @@ -1,5 +1,7 @@ extends Control +var player_amount = 1 + var player = load("res://source/entities/player/player_node.tscn") var current_spawn_location_instance_number = 1 @@ -57,7 +59,7 @@ func _process(_delta: float) -> void: controls.show() if get_tree().network_peer != null: - if get_tree().get_network_connected_peers().size() >= 1 and get_tree().is_network_server(): + if get_tree().get_network_connected_peers().size() >= player_amount and get_tree().is_network_server(): start_game.show() else: start_game.hide() diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd index d9a5d8a..d7bb757 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level.gd @@ -3,6 +3,8 @@ extends Node2D var current_spawn_location_instance_number = 1 var current_player_location_instance_number = null var time = 20 +onready var phase = $controls/timer/phase +onready var timer = $controls/timer/timer var globalActivePhase = null @@ -12,6 +14,7 @@ func _ready() -> void: setup_player_positions() Global.start_game(true) + func setup_player_positions() -> void: for player in PersistentNodes.get_children(): if player.is_in_group("Player"): @@ -29,11 +32,8 @@ func _player_disconnected(id) -> void: PersistentNodes.get_node(str(id)).queue_free() -func _on_timer_timeout(): - time -= 1 - - func _process(delta): globalActivePhase = Global.get_current_phase() if globalActivePhase["active"] != null: - $timer.text = str(globalActivePhase["active"]["phase_name"]) + phase.text = str(globalActivePhase["active"]["phase_name"]) + print(time) diff --git a/source/assets/scripts/shooting/Control.gd b/source/assets/scripts/shooting/Control.gd index 7fc4d00..beaff96 100644 --- a/source/assets/scripts/shooting/Control.gd +++ b/source/assets/scripts/shooting/Control.gd @@ -13,9 +13,7 @@ func _ready(): func _on_Line_pressed(): Global.set('control', self) return true - pass # Replace with function body. func _on_Sine_pressed(): Global.set('sine_button', self) - pass # Replace with function body. diff --git a/source/assets/sprites/GUI/bar-background.png b/source/assets/sprites/GUI/bar-background.png deleted file mode 100644 index 6a11cb2c7d4db2437049c2453a57160c5895531e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 989 zcmV<310wv1P)A2cNdQ!&VC#0Q~3YLc-bMTromWSYW1WokM;Xi*}WW)w8&h=1r> zmQFG%30XlX;~$1G1I1p%At5d6LBt|LO9!-Bab%91d+xd8C@OQ$-uvy|v-Upg`_{+W z_w2LQ6@EC)fO>-7%*uerfsw#4pifWcd7FFAz<>;>Qr;IW%6 zlKzTM%oBi_1!?{OF#1;S;_Z7i z1E+zfCH)@tGDiSrc0ceV@JO$Q;+?x)22KIvC0z*@hzsCL;Q6H0FJAhG6YcG^|8$D0 zSFhc!1Ag9JWT0=~`=}@%!?=nH29^ydbf=w?Ud$7KnNJprSB92eKHwl)zz|i!Cd;6lq4-XQPTBT-^c)Fb~x!r-_)8~&iooYRrpbC42&K% zl07?`DCyTP?)pJV)i(rSW&?r0qk;%7zTdEx?Yjy-K@=MwPWn5$u9ml#ERJIj&I<-f zx_CVUm|38P{ZXq6fBZ@1lxLkJEp4EWw0y?{gM%mgoKYpIH59-rz?SIc1FdZ=T>4hp zxNs6rc3lHim3c=xGbMcy3g8{!y(l}`&zor6ly#D@w1Hl-Xg>31&y2%bF6o0%04sra zqZS)K`HT&lbCN>ZcyR_#{k&IM^jeVQbH*x3E4=_5kbxI~13~T%q8ES{fZqaK)_~6d zE=M2m0`LOxTY$?N@EO46==&|e@#yzZ0C`8jo3}QxcB4NEPJ?_390jkCv^qQqd>z>2 zUk0Ti-1!(jZfs!EQ+Y3g7D&p50;mCUUi_asf1avo)6>a_W2g@A`<9_YhQv_^Rl;9~ z0vHbDREq}I^=~et-wuz44**}O#7dIYF5(EDO)CFZUtY`+h00000 LNkvXXu0mjfkRi*= diff --git a/source/assets/sprites/GUI/bar-fill.png b/source/assets/sprites/GUI/bar-fill.png deleted file mode 100644 index fd65befd316f172f3d8fcae1238fb3ed2cd57fe0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 984 zcmV;}11J26P)!?#RtFpe?yE>xp44O+I0if{sXzI_aRM;2u*@F?S|UzTc1p(AI{-*lFpB=0A?1{@I^f8 z;-BX@efRTu#qD{=7-;E!jcIekZ@k2oN%|@hz-nM$+&yrlo1WFLJCOxoVBWjynB96u z63H`?-irjV8Q30==zHT3y)S)I0Qe4};e|)2U%Mhn#3o5QBLQ>(TT2A6`yjo$JDt4( zFwn4m74_>^CXsBD)ZqdsK!LL$xB#*kD!AVTQ1Ak0!E*s*F;sBB3!vZy&VuIx$YQAA zeiuN&3!DYd1(3y1!Tm0Pf)_Xo-b4g2ek*v-A$ni*t>7$j^WZPD6}&~#j%X+FIp9sd z8I*@|PCmzZ2i7tB!ErZ()<}9g62PNCN$c>%o<2@52_4~Xd1s*I#H&neye~b15 zlx+%alk|Cs0KyA1^S1E36gef&(YEk~H(hQEubo*A$p@02j+|+OAt!*_a?FFLUY>y; z!XC|Ktyh9o0|B4`+$gIapP#x7`Ox#7h^Q%4UcO80000 + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/menu_button_hover.svg b/source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg similarity index 61% rename from source/assets/sprites/GUI/in_game/menu_button_hover.svg rename to source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg index 7ec8114..7454d76 100644 --- a/source/assets/sprites/GUI/in_game/menu_button_hover.svg +++ b/source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg @@ -1,79 +1,83 @@ + + + inkscape:current-layer="layer1" /> - - - - + id="defs847" /> + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + d="M 0,0 H 15.875 V 10.583333 A 5.2916667,5.2916667 0 0 1 10.583333,15.875 H 0 Z" + fill="#1c142d" + style="stroke-width:0.352777" /> diff --git a/source/assets/sprites/GUI/in_game/buttons/menu_button_pressed.svg b/source/assets/sprites/GUI/in_game/buttons/menu_button_pressed.svg new file mode 100644 index 0000000..e7b87df --- /dev/null +++ b/source/assets/sprites/GUI/in_game/buttons/menu_button_pressed.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/server_title.svg b/source/assets/sprites/GUI/in_game/buttons/server_title.svg similarity index 100% rename from source/assets/sprites/GUI/server_title.svg rename to source/assets/sprites/GUI/in_game/buttons/server_title.svg diff --git a/source/assets/sprites/GUI/in_game/trinity_site_health_bar_negative.svg b/source/assets/sprites/GUI/in_game/health_bar/trinity_site_health_bar_negative.svg similarity index 100% rename from source/assets/sprites/GUI/in_game/trinity_site_health_bar_negative.svg rename to source/assets/sprites/GUI/in_game/health_bar/trinity_site_health_bar_negative.svg diff --git a/source/assets/sprites/GUI/in_game/trinity_site_health_bar_positive.svg b/source/assets/sprites/GUI/in_game/health_bar/trinity_site_health_bar_positive.svg similarity index 100% rename from source/assets/sprites/GUI/in_game/trinity_site_health_bar_positive.svg rename to source/assets/sprites/GUI/in_game/health_bar/trinity_site_health_bar_positive.svg diff --git a/source/assets/sprites/GUI/in_game/menu_button.svg b/source/assets/sprites/GUI/in_game/menu_button.svg deleted file mode 100644 index ce0962c..0000000 --- a/source/assets/sprites/GUI/in_game/menu_button.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/source/assets/sprites/GUI/in_game/menu_button_pressed.svg b/source/assets/sprites/GUI/in_game/menu_button_pressed.svg deleted file mode 100644 index 9129046..0000000 --- a/source/assets/sprites/GUI/in_game/menu_button_pressed.svg +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/source/assets/sprites/GUI/in_game/timer/background_panel.svg b/source/assets/sprites/GUI/in_game/timer/background_panel.svg new file mode 100644 index 0000000..14eae64 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/timer/background_panel.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen.svg b/source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen.svg new file mode 100644 index 0000000..978bc84 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + 00:15 + + + + + + + + + MOVEMENT PHASE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trinity_site_display_screen_2 – 1.svg b/source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen_2 – 1.svg similarity index 100% rename from source/assets/sprites/GUI/in_game/trinity_site_display_screen_2 – 1.svg rename to source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen_2 – 1.svg diff --git a/source/assets/sprites/GUI/in_game/trinity_site_display_screen_2 – 2.svg b/source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen_2 – 2.svg similarity index 100% rename from source/assets/sprites/GUI/in_game/trinity_site_display_screen_2 – 2.svg rename to source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen_2 – 2.svg diff --git a/source/assets/sprites/GUI/in_game/trinity_site_display_screen_2.svg b/source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen_2.svg similarity index 100% rename from source/assets/sprites/GUI/in_game/trinity_site_display_screen_2.svg rename to source/assets/sprites/GUI/in_game/timer/trinity_site_display_screen_2.svg diff --git a/source/assets/sprites/GUI/in_game/trajectories/background.svg b/source/assets/sprites/GUI/in_game/trajectories/background.svg new file mode 100644 index 0000000..5913838 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/background.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg b/source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg new file mode 100644 index 0000000..d32034a --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/hyperbol_inactive.svg b/source/assets/sprites/GUI/in_game/trajectories/hyperbol_inactive.svg new file mode 100644 index 0000000..ae43d72 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/hyperbol_inactive.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/line_active.svg b/source/assets/sprites/GUI/in_game/trajectories/line_active.svg new file mode 100644 index 0000000..2ae489f --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/line_active.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/line_inactive.svg b/source/assets/sprites/GUI/in_game/trajectories/line_inactive.svg new file mode 100644 index 0000000..eff178f --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/line_inactive.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/parabol_active.svg b/source/assets/sprites/GUI/in_game/trajectories/parabol_active.svg new file mode 100644 index 0000000..df63126 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/parabol_active.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/parabol_inactive.svg b/source/assets/sprites/GUI/in_game/trajectories/parabol_inactive.svg new file mode 100644 index 0000000..eee5207 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/parabol_inactive.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/sin_active.svg b/source/assets/sprites/GUI/in_game/trajectories/sin_active.svg new file mode 100644 index 0000000..66bd841 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/sin_active.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trajectories/sin_inactive.svg b/source/assets/sprites/GUI/in_game/trajectories/sin_inactive.svg new file mode 100644 index 0000000..bd3ede1 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/trajectories/sin_inactive.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/trinity_site_display_input.svg b/source/assets/sprites/GUI/in_game/trinity_site_display_input.svg deleted file mode 100644 index 0747c7f..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_display_input.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PARABOL - - - - Active formula - y= x2+ x+ - - - - - - - Ready - Skip - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_display_screen.svg b/source/assets/sprites/GUI/in_game/trinity_site_display_screen.svg deleted file mode 100644 index 0c7d726..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_display_screen.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - 00:15 - - - - - - - - - MOVEMENT PHASE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_health_bar_negative.png b/source/assets/sprites/GUI/in_game/trinity_site_health_bar_negative.png deleted file mode 100644 index 1103f0e95d5718ea9bd85ec4048d45ea7d7c030a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^DL~A{!3HFqWPaBHDVAa<&kznEsNqQIU|?Vr^K@|x z@$gPgX=wWY|GzcE%&!hP3`dv@3MFjAkITkpO!0T)@R;?=P$KP^0Y|om@rI8d6J{LX z5Mp$5V>U4=h%%H?Olh&3CAN4?1l!>?5_{MTor;guIbG{@<5(zgNT2_dWZdW7oKj3( z6PO)BzqN$)LB!wl_V92fED>N@!10qI@Qc`jbNGUF`dVIHc_k#|JvyxXl r11*%EC|~%(?Qn;ohbJI=IwM2JfrNYO%pSx5LyW=G)z4*}Q$iB}^3#GI diff --git a/source/assets/sprites/GUI/in_game/trinity_site_health_bar_positive.png b/source/assets/sprites/GUI/in_game/trinity_site_health_bar_positive.png deleted file mode 100644 index f77a8aa5a0f1f0c642121ab9a351a3792b1dd5b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmV-m0iXVfP)k00004b3#c}2nYxW zdqp-zz7lnMn(fPGH_Zk8X;taKAM(5HZO2w-~)`%oUxyfb)ykND1`9KgK|a{ zXC6UAKoN2PsLGy@%FzfR6hiprt2px+G?-Ng8Ul)t4?tD?gj9}32%!+dFF%8)3u~Q$ zt_u_){|Q<3jo~{(#+Nce%0}h!guo)6$;5=uN1`I+#@{;(ZQmynW8kP793entgd8L) zLfXDhVz}}5_Gn;J5CTL-h$F!WS^sN0!}?#_C~(TCR!|5K5h0C?jEoIfBLq}uJo@{T yVI43cMso&r5)_UI`3N-q0uVO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HYPERBOL - - - - - - - - - - - - - LINE - - - - - - - - - - - - - SIN - - - - - - - - - - - - - PARABOL - - - WEAPON FUNCTION ARSENAL - GOVERNMENT ISSUED - V.613.92.1 - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_background.png b/source/assets/sprites/GUI/in_game/trinity_site_input_background.png deleted file mode 100644 index 468fe66da5459ed7963cd115ac0d400f0e47ffe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3145 zcmb`K`8N~}_s0i=vBWUQl64q9vNUSYAlqa&q$y+@d)dp3kX>PltRJ$CB}=k~u|;Ev zAzMQtvZOGw*Qm*o$MeJU{R_VLoO|EDyw5$a^FH^NORz>8pWzhc1ONbMOifTWr+RSO z<{-AyX&;`qbt=GM15*s>v?4$rNdN#hz!asA33c9b;_|~#1iJ!HqEEUtH96RrD~{~7 zN-by8vWpX{uYP?xDX#No^_W~Jq0Vwi6f)24x|UhL)rJ*P+S8)NI$>0U*<;8&mZZ!a8Tl zhh@}s;fY*jKYX0r%sl zRsmvBbDLwEqU+Y|>ch|yZy^oO@q)v17WB{VBZz0*OplrULU=Wut^{dD8v0iDiNQxZ zR>u)fo+it4ThRAVMH|Fj5O`gjN49fV*W+2L;U5i%(6R69qS`CE5@r{v6c&8lWERLe zY3G-a^j=r7eT@kIgTBMGO($dhc%ym7F0LCTY2MtfA_taI-NBuWnR9xUzS~hZ8OhMv z@TvZbxEUkMcU-YYj8H*f9f;%+BT-4)2WYyEJ3Vl|@C~@N9 zr?uh;vy+(=y0T)B{z|gUHS&k`;qzVvbkZQkvZGsK$oo=lRAXC%)!Sq=a>2_hON~$v6j3jiTqmk zj;YbKGM)GM5`a`SxnkRXp7h z^U?Z16b}v4IR2jYf-JT4a4GJe2%rK*-669=f8PgoIASB@^yc!|+Len8!t2Sn z26)7EjFr-ZS1kt^m2wjqB*H`Ha@h0d@~VXJKxaExl4*)<#r>y_0x7>V^0y!UeyZMA z+MfBPyCit|5+0N_c$ldH8~5~kVU()WaBpO7x6|I zBUtJ6LTLJvcOqskNGtKLP2(EfP+m;W=#ycT?A=}R+9Tu2Boo;8=CVrlcdF2g4l)tk zc5RI!p_4Nj?Kj-=mAi|g!Lc(pr-rG~6@JMPKtcSzY(JfW!u>E??08TIjx$m0!}6O8|5#irb6EUr5I^~#D zberf(k*+uYNPeW;$nzI5n>`YdejK^OvkC?Bjap8z7E>QI5+K#0EjNCr?is<$EeEdA zLJu}Q;j0yUv_pymibXDN2#%bJ2A&k%lmNSX$n+dguAE^P&BKma%CRiihkyp)$dtLE z4bxH^0qHdsHYhU8L-ecBbB^2ElhWVPry;pfM_AJCQI$JgeBao0@h`7hIQ;`WT)o|7 ztb|_9^WFUZNR00G<%GqH{SiR9$H|UphY8`rhJ2UHrb`}KMRk>z`7`W8(geb+?JwV~!5(xaANe-$WRP0R5h(F6wEWa)A%g`-P{&#_`g_m6AO-Zd8&flgPVG;DCO{aaJ<&Poy@SbwL)#j<_g=Ti0_Bl_=5D%B5 zUx1-oct7b{!G|Bkl^WqV@?t#1Nj%8u&Ru?LmBr?btM^=urFCkwVZD?Fi0MAdp?a9$S44X6f9BW%)w#*AbL@2ckq9uvlDQ}_lAfod7z^nvVU z?8=ljxDPdM2yHS+juBSzl4zPv^vPaQn@X=Ob}tRicLV+qj!kabE3U1pw*Rq_o-~S* zvYuAUa|O5k$U0DA0zo5gM&CVbl0FXDeF_qLZ3DSbBl^6S#OUyqGrdZS*`YR1G5* z;q$^bm-Z=brS%87J`-XZm?wC#tba!AIG!(+?|-^Uwe$$Rc~u8!(}i3Jcu-QO&M3slKBIjn zo%uL}0;Soi=3R2vgU&`NE}LX+&tvA@Fqwn^ndeQ4J~C-7No?3iC(GSR3mjsO#n;~k zXyd&^t-3Emy?d5=e!Qm1SfgssUYP_o>8gKvs2J7T_CN{ZRQs!YHcue-1G{rj5p9cc zYjwvQpG$)ww5!X7n5#1HwME{&gyF~aAT2wAv4pyt53v50$uYdsWUV0aqksPi9iFh> zT5f$tgQ+8{Dbd|EtfMr+n>1w*L#WH{vUj-3hb=wt6MEA@ o8FZXc>2Clqy^2QF8DQi71MQ^tS^xk5 diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_background.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_background.svg deleted file mode 100644 index d9ae15e..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_background.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - WEAPON FUNCTION ARSENAL - GOVERNMENT ISSUED - V.613.92.1 - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_1.png deleted file mode 100644 index 1d1e835a1f27ae484991b6147a12388ffe28a7b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2237 zcmV;u2txOXP)2Rx(!`o7Shbo`73>4cW2RLQ1d(d-@$%94a{zTGH}^dE{_XF4d+l}hQRx0f(VUjs__u9ex^!u5XlUrm&d$!0`S@5|@8skZ z!+-w#v-I}%UQp|}eCN)cvWA9+FUF4_f0>V2)#LcrZp$X+v3m%$Q2kG8A#qN^DgYfb zX3U!m`ii0`5rcI6p3_#VwU#?@=*pEV+cg~+2!25DfuQ@VYlE$-s*2=B*1EX3{8^H8 zb@y6JE?AU`iyd^m`L;NGxxSM+x_ZgW!->X*d5U9?2fC7Zf)~Zb_**^PoosFN^z`gw z5z?cgqH0vdCA=2c4!%Ehe+vlU)2C1S$HvCKGbt`Hj9Vxk(kjv>6qe%uo2x zthfMrAudSXYw7Op-cedw`j442XIdP<+raPVS)4N!78d%?n>VkBZ2->_VDpb$v#DyB zSaSo^PfiH7!Lx13jvYJpVtjl&!29~a<4ytY$hRh(W6wPu78X{>+y1pzyR4b}Yn96l zUBlrV@LnjtBr(()5#j+JOMQKPJdc?lRY)zo0Jn<-YA0~askOEBFW%lhTNQ=;DlfLv z)_+zDpFXGp|F2p;j-n@clhsNs?d@%=e0_cY#qFU{JD=MInF=fvuBoYcCOkain8~F0 zzz&(Ybq|X5o_bSL!i8P>`mAkrb+z*%BO`z4uek87R^j~o{D7pSq$*fqD8TS3ii{*f z>8%8ZRSq0D5S5&q+|1iHn@DJYn;1B7!GZ;aCX*=!mRP_27ej3(C5)z|mx3v$pq{=w zb)B#uJ>HwP?y06ugVtLA<`cpyeSLiw4jw!huL17^w6m(VsiULgZ=Rl>YifD00obUA z(Fhuo(3u~YMSRA1DE+C$kO1&F>WT>Upw7v+& zFBypvu}}F?1wR?6>B)^rRk3a6ju-`&y+c&_AZ>yenBRZ@-L$Dwr(yyU&@iFXty{OU zU0q#MjQSW#ZdpA^JQZ|yAR7Q4wt?l0c0l_3_U+rbZf-a(%jtqZa_f5=Al>vQ3EO<#OW!p2%z(iG>WHVq)3b0ym|9Ig?*Ce;o-3; zE3b~eKKGlEdLHVvvz`m0H(m{=uCA_sD;!F`;iP_s5kKQGA*f|el+G1pO;bJUZuJj2Pj{+fX?WCzWoUnJJaE09d-FPO4XFku)in4W*- zSF;1`ZM{(k1O8JUjEvi&3>Dfa=tx|jpYe>S#xOJ#MzVg2LzdpCF%U4qU+h!m7(P{lp*|4z$bwkxlBcnDjIUj&BV^%gha4G?EGSR~r!oMQ;LS z2hDNsOI{jC&>N?Gb74yg((Q2E`FJ z2a6(dMr>+oTC42ax9{1-ix+=~BxbOU$50P6H5gLjah&W;-qOaCrz*GvB*dP8>vT=EM*4<2EGUA zz&(5Rj9a>NX(=jllxC_Er;)aXbuBN$iTky0E_?Uxja{~ESvAfC@XxuWrDX@N=p;+E z9YZ=?HXat_-J9*#M5W4YZEg8}etv0uT@S86z;xNYdw1mW<;%a~ZQr}z)&TyVqCC99 zN}DI}+c@VbEMV)-ojd=SnwpB2&^v(k0W{RUdiCl%!NI|A^ZK%N{q~;~yv%$hd^KcJqk{{HhDQLhS&3MsK9_0 zo_6OS=&)!5aM$wk@)Wb#{NW=fW&rh@4!(=vXM+Z;R9b-ZBPrl@kmt0}D^{$q?Pg?T z(5_v(h(|Q7T)C3uIg7gsCRxN##LK75#Rb91S&v5|Pan^-j}D=VXtk`htZ zrcIk@&6+iY`WzL84p)ICxEP4S7U~bsuDrfb#TWmchN%T$5|%$N5XVg75NU(PIRH+c zJeiIjJxZfTkER(jW>9f)u{ef;&Ky5}T-1Yq7RR=KALubE^et6s8#L?zZ~@IBrm=q| zfR2lcBhIoYF)@+S)6w`7GNskq<&;*uxg`04>2` z6+kyRdR!0lIIkuxoHJ+6DQ>e{wFbVw2z%fw08|FJh#m}WZ29K_^n|}~W$+iSEvm{Q zYN$$!rCvbWsm;*F7TQJ#8q+oV{C_-n|DKSL@QrE-+W_Q!DBbse%7r`6o7T)}00000 LNkvXXu0mjf*iKr_ diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_1.svg deleted file mode 100644 index 2570fd7..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PARABOL - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.png deleted file mode 100644 index 949dfb3be708352b6f16aefd3bff69bd8aa38abe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2130 zcmV-Y2(9;tP)y+A_{W~7|u)}K?Nn{mp}MFVk#Yi(^k?cw23W~yW0Pg(FUTuW15_i0iM)gNCCiF;<)>({SO_VMvq!=P^| ziZW@C2mjA)gTe53XJ_ZWy1KgkQ>RX?QGrX){-1+F_xG+D_R5tjzT8QYy}kYWvXzE^ zh%Wv~bcstnUtg;wYJ1q*hl?}OG#?_bF+_nc5Y6H;j<2OL{C;*qil3ifbw7BEUhnVe zfh3@uK7IPRprD{nM~oPeBs)7+OoVdrs$M@c_;jMzLybk+2@el%vH)*> zh`}^#bNlw~fN|r-WwQ*RSpoXpuSTy9)!_XP-|U5F*_1UjG{kv(dqeX*mSkf|w>Ho) zH}JBDhiAT`klSB%L_71X^Xy;`2hXpLBzk@V&qM;H^%mY*VNR6`1<<7<*cC)k| z>GQq>@9F6&=LIXo1TDM`Xgev32M-=>a&~r3z@%HdO}~Z_hcnjqLg%F#<8vZIpTQvO zFlZcYVRAlv_%L3wSbzmz-7x{)l}skPHAH z%TmFrsrLb-OgcI`4mdhG#z7{49>HGrm0pfY&^L(yjfN2pA%lSoVGMO3yA>E@9ftNH zGuXLv=lnxML#qMp%v#>cT3)Hw%R2fN@fTj!J0a1B^ft%tEgZX(0qw%6;~yL`ChFBP z76T*%h!k2w96X0n(E~5F&5`5=N0Jwnii(Q4GiJ;vLbevk($H$qDTWQRT&twsS!i7K z5c@HzdMuy&LUwrh^5rn)-o1PA?(Xhs)<^?U1F0tBvKE6x)e6lT-ATABc{g)zi%I)_s>p2}#wXM~{9~IFy{>q&`fKo*|7rn~W0+nV(+62tnI= zye)Ojn}#BVb6AmFFZo>i3MfMupe=s0 z#(G$?VOTKq8kT278@-!}Q<=t|tcKPL`ZVfW4Gj-}xzZT2v__4AfD!)Y@dgfaNvoNm zIbb*Q{%@34P0REXlV~W=G6O_5sYPNcO}8kVC>3#{G*@f%keOS3qcNAT)(}BpS`#Q4 zJviE(Rd_xB$;HJbN^6`}r=HdVTk|^^r`y`v@|61e`b0h=NYSz)%5bHnt`;yzEsS-I zoy}mmi(CgA@na0B-o4{M?P5Y>laRP;a9zteP*_;F z09oExJ{Y{n+0z8Ay4K=FEp@a?P3oDm(KSqEkjy7HXagW?~nVQiK=!j`EG7*tGQk$YPfN+&&ta3jf;yb0c@|fRe;94YWR#j zja>cf^~Q(Ty?b}?s#UA78yC>7fQGkk-MaOKmzUSNYc~LHFrD2QVGZg-`v2nrOmaY9 z3jdAdtZq-DLf&H);xM;;{P^+de5*@By8sv^Ha2!FKhZ(XuliSbTiEkcBMb z+=C0~aA<>KUtV7R-prXZ)1Emoq+)!h(_tzCT%IsN9`LjP=OH=B=OA;`&}-MOHGj>> z$e_&3OyazSHf-2H@?KL@6K&nPm8z<$C^o-qcI2>ktA8Va z4h{|`&ax;XB7#y(ebC7o206MyQ|>@`R@WtcG@A zPd8W^uHpRu$&)9e7A#nBN(GI#0RkHDS){jxrWyLqaKa7L7r)KT;5S@f@jZ3qfTzV# zFQEH)o1ve=TSEPh&Hc8p&ad+1-LZJ_;xi@>L&pFYz+8I%1-{;w0M)@*{{R3007*qo IM6N<$g00>XGXMYp diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.svg deleted file mode 100644 index 557cf60..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PARABOL - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_2.png deleted file mode 100644 index cd59ddf4eaff4dff5410eefe59b8632c612a36ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2114 zcmV-I2)*}-P)R_;r#?eF(GZ#ui|!Y*fD zGTGUgdGkK+JKy(vzj-6Tz(tUq=KJ(3?LU0@(A&+;?M+it(?C4#P1l>4m;~UDBW{ho zy}ftEdpzpt=_z{hgMxxSvb40^&S9?xBy!HtKMQq^c;Sp`x*GJLWG zkG3hw$;o*wEG&$``?TPxCIi>!TLqm%&%NyK?w*bNj+HeX>XeL1;n98AE_wIZIz>gwt+95cU*kaBnit`P~uPS7!v=H}-2Y;Elh2m(0Vd(a98zAI-w9j!wC z-yAa){HEK2S`AIDtu34F?d^ZS_NY+}pG$*G1ZE0XR8-9N^z_P6C&mC>WnQ!F^XJutMty;CJj4UzMz`O?>oUC&4A@1+4uC7cA3yWBa zCIoGHC?>^ky7)h!y?NtdEFJ4qFUc9)Z9cR0> zTY2g`d<<(G{S*Nx^P_!lSBwIky=;JM|2L$yw0!}r-la>I{Du1Z`mIh*PJ4%Iji8qt z806)GdKOlO7*HF*t2@x>m z4OAjG-2rcmtw~#E!PzU%AnkND%cbL@y_m}MpRRu+bRug{-bs4WbU$4sbe=PO_>L!Z zbaebEU?{nUNqvYhekRzpZ@WY2Jf#$ENZC?U>EyYmMs?iKi@C4yr6G4n(9{s0W-0qC zEN(Ki?IB;M0gZ__ORVX!4p!)~(?*Y!9yt~MiZxi>;hv}Q@;wel#BCCcfhM04^jN8@ z-O;S%+3b)}(4oOf^szG}p(XSUnBgj_uf9y_W&v}KT+BIMHD(}=7T7@d<(|gCaou2O z8h9o6=Kb@pwd29e-ryDQNX3d&ggE1o`V-96` zF1W6C2eT*l|Lb6sO)RAtG(rj58Iz{Hm^8%>W)VXa8I5aX$x^CPsoX};%45flOi%$#QUTh{r~{=?Vwj%#I#C>Jt+a^BeBl|L1KP;J+!#*cDV-H63F!&JQSH z^WnpXm&L`!l_Nk8LE8~Dsa;c3lQ4Pm+WHX1EHUd2c*1B{KA!tgE>i5nMDmzX|~i$&>CtZG=1Y3^Fq@# s`uk5DFJFa+hhGydAq_zMPfGXw0|x8=z$*Jn8~^|S07*qoM6N<$f+LX)>;M1& diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_2.svg deleted file mode 100644 index eb098bc..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HYPERBOL - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.png deleted file mode 100644 index 313582bc3ea0aeb32dbbef9f39aa2edd490c9b61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2059 zcmV+m2=w=fP)fOL1sinlC+FvL~_ZcEVqyx`y&&E!8Vs+ z95GC5RMfvRG)j}yTu3988ZrGt%OXQZ6G2fCMHy4U1h=V_9TesD`<{Exei;Cu%MhXMSrE7$S| z4<4M+?s4V*{rd&iu3g*Pw{PDoyw9ZV$AA5{Y*Oxfh)@q@c~B3DV-i*YXz$*==P>A- zilRKzO2;2MY%-bt<__#BEiGN6>p)BJErPcMZKwM0fYqUU<6`~12Q4Sb&Hm2fh-yO^I8H8eDAV-c1G1qGF8ic5Gs za5H#IXiEzS;KPRxcO5ch$cHX2E=wfrZ#hJ$`4`%&Gf{Ydq6x#*s+IEk`ueqbd3j%t z8a1li3cMNoQJ%#yLuO`X*YV@W|IRjmX9ehYdz(~kKXTI*Q2&ETP4H}+g8lpVza9}0 z0q{l(cw8vJt@+k~W9+$s{{H@%yxsM38JUvONV&w1zM~72pA$uf6g`$ub{JMC(>Qh@4`2Vw6s_#uEs;I86`oz=Ib1S#^ zz*2GZAk%<_!X+go;Q;}C_8Sc30Xr;DvlZ&Y_g(b9YL~`Fs=9jh%J{&*zUr= zXJlk}Pnj~M2$twIL>P0dm_H@Cz~Wh$^OJ=~fc@HoKx`4iRF)+V{T zyML;wEuftMed5H4z(Ios!4@=q8IdibL~Edy#}QRl&r=8HsZ%G14IVrg6Oe#*=IU_w z?%h;pXXjXZ`Pf>Aq`&XoyO-XjOP865CV+Oy$;k;EHf-2=To|3$F%w67Rke0LCZHWj z>e1ZX+~DEEhnE1_jlKLOdwJH=rm|%;VQ;TzZ+{GEBd3q&IAR3MUG;dmL`SJ=?LN}m z97(Qn+8d%AIB+0j^ytxrHFZR9%~(_C8t?re@Bo+ z+PE}>=EPeh)_AO~6+HHS{Q87PibswjU$I)d_DPRpQ2+83W=B(n(jI8|6yTkuu4P9L zZB+NP3mSPYe7yJ@>jUOV6}5J~PU%X8bB=7zIYzW+AleG-QTLUe=D=~Z&CnQlc=JyC z*&fL18$2>T0nKr5A1@6=J}OSjqy_o)#EsQH?xRJp3ED#Odm zE1nx^z!_d#oi=US6gXqXj6ZnWv&q{!Ks80_yuwO{b6&oBzJh$Ca>IrV<7UsEUCaRY z0qp^3sD1tV^#y)@e)BGtnoM(7niO^2LxnY&7whrE1|87sfVLF=bLU9$?P7&`_$tI< zZdK2oJwFGqRN4q&RQ7eZb?esc=KMN1|AL9O?o)Uv*1!wniU>FMDE!iWK0ZEva#~s% zmh2m((!c?ffIAl!7RH8z zgsiYTF|49~)48WrGc;hO(gK_x$!=Z;c}YSiBqUHuN(!Z?r<1R*FP%MmmL^P?Km`Q_ zbo}^nbKiyz9ZEND+@KykdJr#)Q*v@L@i!U@4h|-x(I}4bx;L?U&8|&KN}|NXMA3$2 zVdwxIG~mTR6t>VRpq+Vrp@>gLR1rlF9TpZw+1c5|pVnx>f(7QrHg4RAmrfctZXAV% zh7vz50Tvq@E3QX}a4kx4aWQ3OWeG_9XOYamTY$!=Ccxh1YW6gsVGn={Xbv$q^cTxU zq3X<;SWY7W9v2s92IB0?tfo|&muQJ&EAhf1ahz?YbZTmcco zPAd6Z~C= zV2|kNXyPD19CB&wSWYRq@RQ5s`@E&8EUW>w#rGAR(oh}Hw=5r%J%00QQuLTHV-9iK z^_n&C{Y7{hUjd*p;6?Oc=zr`1sc)0NaHa5IPS$x@Sc9ur>IHN&wHX@UI6A#xx@Lc0 p;PLWRWMt$K&CBKi2w<*_{{u*bjlePGS5^Q3002ovPDHLkV1k)^{n`Kk diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.svg deleted file mode 100644 index 180d476..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HYPERBOL - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.png deleted file mode 100644 index 86a6f5c5eb6cd73b7adc9da570b21de2d29fcb45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmV-p0i6DcP)>Dl_ai zw1x$NasJ3-GbQSt3r{ZWI$?TUx82wuz#tQks-MB+yW7YgPWJ zU`-me*xIP6sal&hRG>zxB?WB?kw2)>AdOc({SGhJ=K?>FDVAB3+L}dj|)HIQsCV zqibYj#$;rv-9YHcUG@`A& z(j_%s>u2{nAM?vM+Xqk1 z5(31%T|+}d`E_-5-_D;uzsm@`4*Xf3MV+dus>*lq;>E|v2JkEcY}wI!I#n$uR@?yf z)02aA@MN3%>gwtxNl8fn*BHR#P7ZF&w<^?;=Uxg84XvVc-_|>W+Je$n>E`Xhv2c!h zFO*-tG(;N_>;|5$_V)H9nlr!4kV<$Ct``a9LExH0PfyRgo}OO2B#HSnUF&1JzQ4hJ zYO4bOuU|El#YTHFt(JB7_4Tgz_V)gfo`;9(`CK>2WMHmvOH0el@bHLgl}hr09SRP# z*^2e4ezP;fxm`3GZEss!>*A=WsLO_mbKfczE-NeZOG`^@h9&F`EJh%}VU_ao@|g7W z^iHM61vJ1_1ni%hnp&k&sp4RXExWJUO<}_aZCNv&TScSMTsd^;P?7>%187HCZB>7N z|7Y&*?w_>MWCO4*J#0!1cpTsnA#QA7VBiZ650B4fwK=pCpf6mw5H)MoEZBl=`0`I? zizs0V)UX~=Wphq6pO}{}U7S06_G~Ob9NHPt;?bi=Mb6I7nG@w>V*?WYe*F0H0T&mS zEJPDPyPi9DE^6-FxlOn+du!vkEF6}qYOFmLpn}b6UVZ-j`Pg~$=CuIYoxJ=NdHI8h zP#I7nXECKVdHXx^_Bud&Qu^3P5hHwS{xz#|32RkNOz>y#Ee&PmNAI#Dr|ui=MtGYd zNgJiTYU%j#`+|MZgzi(a{}1vx5L@s;NVXZg_1Lr)W2#=KfkdckVS^Lv%-U|{AD1L7L2+- zy3GbgL*Z+BX{fO|G$40vn8E#sRn{CUj5ZoQXiB_!Vx7Jg$<+9jwB+Zw-QZh938Vy; zs;i{Ivi<{2M#AluYyrJGGlGLQUhQLB^T#jgD$AS6$1!fu`1zp*l!YZQ;R+~>S!)Nw z-&~<|k3=~~4dooKjAbHXVy&Zii-KeeF@L;^@H7REvtxo5OE6R}r2GJxA=EXsEL$@m zJ!p!1M`&vx+0rAt?cpQU^E?tMCC%9L%Eu81Q0GG_@M z3#_Q9h;<*l9HE~En9XGA?bY+xyN!^eiu+wK>7;b+FD)ZU=i*x8B0q`XCcd* zMEh!&DSHYvH5n0m(_RnamVmIUO4R~E~9NY{w(F2%l`fQ<5#X+c>^_mbU1c*cjwcN zPP$OrIHb{S<8d00{+_5%xwp5s%*V$khaNJF7Cv-1?cKXKYSpS$ztXw)|K3&r{+FWI zuaMH}XnGr`m6ZhS*|TTQYuVY^HwfSfpuGSMweQ@y^Knp6&_}ettlhHvZwV1XD>muv z2~EI=6g$_)u*m@~jKbX4!NI{h0W6gE1TYTrbwEKuK?UX4u?@8ETyd;}wqk?%#yC2e zh(a&jO*uI^sl~;`ctaT$N@J@Y&|K||jEqUt;4FneZ#pJ|Q}3Cy9TrFXdH=}3faacd zr2}->v;nwtLqkKRTCLtO;luYKB5--9!|?0@}qIXz}v{6!ri#g-@N*qJGJeB`h#7&@4?TZ9Y#nT}q9i zGVGxXd4Lw+unM3%%<9#~jc7ONtwoC#oubDK$=1Lt5w{2a1%S!`=h1_pjc=^k7*upm z|8V8eKU`nRD)XozE6ulh0j;MtLEA6yREU7(n%+$Qs;Q~@COJ9zjNt^N?@(IvFMl_R Uz+PCkzW@LL07*qoM6N<$f&~WGWB>pF diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_3.svg deleted file mode 100644 index 594a988..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LINE - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.png deleted file mode 100644 index 256b5e62d70b4cc5931c09a58689eb9a561e7431..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1935 zcmV;A2XOd_P)b2^+4SQ$bljiI5T>RY#N9SsNwxIz0g@_zg(xA`skzPkvOQ2GazkT}L+1%Uec`mQF>SV0gT zG}7_A4r?@;zo-L6jg5`l6&)B2epK+$p!L<&!q(N*`O{4{*xA{=!AZLNnC6cvCS3fJ zvF87zy;mC<>*`_5)tRw}eWiWglNp=y2xHHNFpZ0&_DQk9!NCF&AuBL2ut8Rw!z+Px z;Ps*PEg%A)I(5n;EG+CjM@PpE9QK!T#!#!Sn5#2mA&)ZlQiN3H($?44x1+MM@~Z_4 z7PJ|F*Mi^6vpA+IDJk)YjEwx1Yyi)Sp!<%FsA@j)$Q4lk?ZqSTWSi>J($c8t=xBhe z_26-#2yV!?DjXxv&GGT^DWPqT`X;8?l+T1~^ytUBK>5}2OcUTE^0YNIHAT~yxhO*_ z;YDzrNFa9t`)oQoI^J}3o%FdNFn9QM{VvI;)++G-Co3i2Yc#CAtE=-vH#fKabiZMJ z#kGS>1{M`=XlMxW^P5?!Qn5*}Lw3HkQ15OxbGc*}wVHL_ym=$i-`~GVUvbg5N`(sx z3q6-CSyBf}j5jdv0tbgx4jnoa7#|AF=i;K(0 zvf3iF9iY#hJLex78VXymq%6j)5haX)>K{i`*|tU+m=`Xb51%`CE+!xm+McRSe}8|j zy}f+e*kD#N*^y%#PCbsVp%R>sj7&_G!wFY z#f<&YuizpI?7Lnj|0$2Hq@sF*uDJ z&Wyr+O)m{)R)+>;-bNbjiD&%I+tw@o+|$vx}_-y%wM(Lgs> zUFB^st^c$Yv!kY6um&_AG?hq*F zD5IQX{{0L@46>|urQ0M^E(R-%b>W_-z;Wijp!pOGl@Df1nIY6QHZ5DyAsuLnd&g*L zAjaG{jY%St;$}95F$^$MatKRc`87OFcXf3g6q=ix*H4=^Ez8^)k!N4#US}ydAKWc1 zEgOV_f`TWPEn9XTZz-?5fA1!d+#q}*eT8qWt*(*=;SPiGz<~py$nvJpx>^-wPd>&5 zBVzCJS0&#<;qfYpiRCf{jpqS9nUbb#N}5uPJ!%X%sEc>V@hpmDDc8%(D-+OOd3kvc ztyr<55+H`&T;z#!+*oNDPP~`$&1LW2yd3N-4_t6;e8ca_wzv1>_qY zyLaz?an-6-*9l+<(31cSwQt|P{gJn~_nNDX8cq6_8bMn3kYF|1#d`c>g$~Gez`X?e zbD>D_&3b`7FhyV#=C(|qKK)YwbERDYj7q+qymRNyBa~kURbA1r{l^4aidE6VxFCj` zi752aU7MPk8ke7+k0tv-t~77}EvlW6kT8W#I71=Ojp{^j>fDo-!)DWZ-oG+1phZtR zQUx6rZ2)dxQ&W=|92~rP!iixO>6^}gT(!`E=L|LZ_vrv7DS7@pNpb zq@=Knj0{#>TrB>NGH>2I@i#Fs(bQ(e^9b5c0S$O@Ad0q-E1>OZeW8v{MpQAWj0T;X zo6BNjV_8vAk=O?Blt~RLP9hF`Y65IORjsE14SN7wgr*Slw>gcE23=iU&CZ@Z%YuS} zSZ!^sMM{%+oiwf zt1MarYKz}j6iP#NK)0CGs+CWo)ug417A-nSx9O9uf$uM(r|}g4Dg$1O9t8c5m3fRd zPhYrl=nL0p3NMS+peio)0$N9Hg2p$FaW9yz>CNOySy|cEn3$N;vX`|35WrN`{{tC_ V8o=iKa)$r_002ovPDHLkV1o1KqmBRo diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.svg deleted file mode 100644 index 1cab73f..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LINE - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_4.png deleted file mode 100644 index b488325ebb1dbd193848581508fab9fff961f219..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2065 zcmV+s2=4cZP)m|@oK?n6O-1On5sl7l@KckwiRVDyPTE#kaPR}$DQqCW!ZfQ zGRe!n?3*|5H{biuf4-R~v9XIJyDZM}D-PD&+#KQJ;u5D)sUqnAKx=F3IHM-phK7d9 z=|A=0;NXqU&dwq)FRvT=Iy(9l2mZpjDDv|WP0FE+@#T=XW`MnO=T6|vnKQQ#=qr*W z1(@mhBbRkLUG2cYz)_7xb8OC>IcgcW05$$K3vC=-1MIC^w}R*)sWvt?Z;Do$Tl!g5 zbtkK=?q)bwYkF9B?~vgkP7c;AaE2rE@~~xL!A>kR*oB{qLh#2Z2x%c9AvH$uCZlc~ z>Cq%06%`dd6&V@%p}oC*s(9GtYxmiuYptyEcBj%nv#_}?EI!JeEsydv-233cgS67p z(r@G9;@V8W8#-Z5vsU%>^$|WkKDi_VXqExC@LU6r>f;tfd|iUC0iI-Yqp`6u$3v>a+&vBU0sjrBR&FL zZeKX(z!c%--rnBl1@M6r_mnb>yMFS9Sq5;mS{)q}6oiNa+5j#<4Zt-uH46g*0?$Jd z(C?E37CjZy&thHVmR)vLy9&6UDId5fUwP31%jlqY9hs$Zg ziq=E(Xaia$WYOK-{e`2W<7XIjJNDh4R1KTc4>Z1G%UnJ%P9eTw7b)4O1-( zV{oDG{{H?Gc6N42kO`peDat`2%E>z`Et)tmF<`pxp(8ZdnLn$lx=U#=&DO_r4r~wO z^-4-gLYFRGS_5cD(sCAQ`F%^H{Ni#i^3)kD|BQzHa=DppeRnpC40mIh-`!=U742q0 zlvWVYChy)u-n|>p&XhVFl{6rs_lcCsOYz?9ZAz+odwYM7$V#qIQXgxHo)K-7iG;B< z;zHN7XegE_hvmujJ1ONRXFv=*ymCt|4Kj(R1i!SRZNl6HGvxPs7EtP{Yd1iz`{??p zokn!?sWOVC9xf~q_6HlBs8X1{h&N>sG$QToX~%VHNx>+G1~En^(nTzWwghq_>d5WX zRC@+!GVFF*|GAE(>G49XP4MFr&$hjPjhPz2nJ}wj%$RZ}nWj4=N|cHzQHrs|J(R*@ z)`YYUo~WgjdyC22Q3q+k&y*5ih8?X4_aL|XU84E?M`vf}_2zt9DKP3o+lY`Qx;AI0 z!l%2sx(cL*hKA2+iy+P1j5r=>aS!0vzTiiz`9~)l$Op18*D*08()u-3x^UsbvnyAw z{LPZwW4z#)+Tq>Cn#JJTyX|S-Y$DAQV@+D{XuP%K$B#dQEN>cZ3|^<~X~tye8bEmU z0Ee~_Q4Bo%B2dshV8^mkp=ZiQHMD=Y2+*FCG^JD0lr)(V5pPK(RZ1ovA&sV{rmslK z>45gg%gdX+apT6)v1UE}Y(HLw816%qUw+nyHQn!{?TK2G?U4=hYx0%Lkt0VUH*MN< z7gyZrP_?(W@26G4IuUKtkS4c{AG<>j8yLAKDqFP_y1BV+rV0b7;YNo|PEJlxQc}`2 z!2Yjo8Q{ab>d6&~bQo<5Z>O<ZsO02itj0OC3!oA0y1Kege0_aCuAx2Vo%{ab z14Jh_=bt1r0mCUWwubPWhivX^e}DfBVjL9ESW08VMwOVDIE{LAn)2(=OC|rZqOvyH ziuLE4;%H2zVAT?=&)&n!=}8v{EhJN@boDsCIJ069qi!a;NW713GzUsIXJzN)3gt=L@D&y zvu7E7Ibc;)RV*qhiqUQ-qs}w(SC*ER#LFZ3 zQOU~6V)W^O#m2_6;^JZsotc@*Vq#)=N5%;~iy#1v1CcgBLmmJ}r0vM|>J-uHE7Kcd zw7<nq1uRMxLDP0Y3CVP|3>uclp#dz1wxz}!6}3J|l`merxPHZo z6_;hu*mL91_|77t%{5KXO_Ri7akKO_H=AU&mu`?d2O`b4dI3Em+5~NStI6WWDz8Y- v?Vy#(-!zE7Nk~YzqK_~JA9oD^(=q%Xj0wJ`jzw@A00000NkvXXu0mjf;!5}& diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_4.svg deleted file mode 100644 index fbada73..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SIN - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.png deleted file mode 100644 index dc22723efdd17fee31075c7c77e7560f3448260a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2055 zcmV+i2>ADjP)B+$oX6h3z0QBFz0NukwcRA$Y4IC>jlZv4xzew9@7|MLU0sLp@qW18#l>YX|LMa0 z?!$)<&ue2`d+^}Fxf?fb9O~b{|1~})Ysc|d|65Ecjy*!ChcZ2>hr~GnD*?1mpFRs1 z^est}p0cv=M^4MK{5LNkqqMYiqizA_;LU=YgEqCU5w^IvIG86%aC38eSCG^-lKf`@ zNoW5es`yVmda0DCww}nxi|E-t>am_(iH1H$6d6Xcw}AKv9WPeet!Np zW5$fRYXRN}-j-%@&XAdz*=53n3BR!npjicU*P#}x+K=3F2dw|WR ztOluvSHN3E0&NjE=2Bf<{hp6c=OjrYKj?ME7FDOtYS8}|^Hkl-GF8>q)_m&g>${uh zduVELqmyaCiiJx`O2Yc~?U!XRP-nA;%-?W$SZP*+#C(#y+h`Qzww6 zN=J_#4IMjnY+)Tw_Qt}tr-LUWvY_FyiL6e47p_4Q*EwndM>Y_7dlDTxcI*Y|_U+qC z{r&ydSd)ei-vDhP?M%RyZpNa}Ho{anr>O6+Z#c3EiQKt!XPLx0`N7lEGw#dph<-U~ zc^YUIHzE|awdr7CaLA4O94i&bZ|VC)4Gj%HN*qeEIjJ9Qi=JU^G-v46+EWp_=9h*X zo1o!%(66l_4Kl$!+24|hjWey zTO83|IK2N&9j7K>=3=@S50MGGYFp{B&@=~*lTL*eu@!GV*as{%IPHRIYD$0|)?8}^ z&2jGtmj&L`Fn ztQ_wS8>LlyK7Zd)h4d!#0qO$hO|7<6R$`a zpmj}DSh=RACf(1^FP<-G!WDkp-L`Mv9z18xoZtDkZ;Q5dfNF};evK_1#);R4#S-$3 z>aAP1j-Nk&{#6Ee0O-zuhP7|ry!lzro;?>`DwXAhYh_8Td#JFou~?6PoUi~*4yvss z^5#hK?FxwkyGg`hZe6cly}kmlu(S_=(OK7BH*em2kn`(-1s7%7eMI6?tbq&Tk`it@ zqVY?2QG9&-l(e)ol?rGW!z#oBRkaozZWlN0ySR9;?AMMXt4 zV#EjNpCX9AEYPY|tLz$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SIN - - - - diff --git a/source/assets/sprites/GUI/in_game/user_input/background_panel.svg b/source/assets/sprites/GUI/in_game/user_input/background_panel.svg new file mode 100644 index 0000000..2bf8fde --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/background_panel.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button.svg b/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button.svg new file mode 100644 index 0000000..3ec1441 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg b/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg new file mode 100644 index 0000000..bf2077c --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_pressed.svg b/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_pressed.svg new file mode 100644 index 0000000..c9a4ef4 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_pressed.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg b/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg new file mode 100644 index 0000000..cdcbd08 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_hover.svg b/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_hover.svg new file mode 100644 index 0000000..b2a49d8 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_hover.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_pressedsvg.svg b/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_pressedsvg.svg new file mode 100644 index 0000000..4367feb --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_pressedsvg.svg @@ -0,0 +1,49 @@ + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/user_input/trinity_site_display_input.svg b/source/assets/sprites/GUI/in_game/user_input/trinity_site_display_input.svg new file mode 100644 index 0000000..c101377 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/user_input/trinity_site_display_input.svg @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PARABOL + + + + Active formula + y= x2+ x+ + + + + + + + Ready + Skip + + + diff --git a/source/assets/sprites/GUI/menu_button.svg b/source/assets/sprites/GUI/menu_button.svg deleted file mode 100644 index 3699158..0000000 --- a/source/assets/sprites/GUI/menu_button.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/source/assets/sprites/GUI/menu_button_hover.svg b/source/assets/sprites/GUI/menu_button_hover.svg deleted file mode 100644 index 4e72842..0000000 --- a/source/assets/sprites/GUI/menu_button_hover.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/assets/sprites/GUI/menu_button_pressed.svg b/source/assets/sprites/GUI/menu_button_pressed.svg deleted file mode 100644 index 2156dd7..0000000 --- a/source/assets/sprites/GUI/menu_button_pressed.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index 4c1efb2..444efdf 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level.gd" type="Script" id=1] [ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2] @@ -11,8 +11,10 @@ [ext_resource path="res://source/entities/grass/grass_node.tscn" type="PackedScene" id=9] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_2.svg" type="Texture" id=10] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_1.svg" type="Texture" id=11] -[ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=12] [ext_resource path="res://source/scenes/OVERLAY/elements/menu_button.tscn" type="PackedScene" id=13] +[ext_resource path="res://source/scenes/OVERLAY/elements/trajectory_control.tscn" type="PackedScene" id=14] +[ext_resource path="res://source/scenes/OVERLAY/elements/user_input.tscn" type="PackedScene" id=15] +[ext_resource path="res://source/scenes/OVERLAY/elements/timer.tscn" type="PackedScene" id=16] [ext_resource path="res://source/assets/scripts/trinity_site_body_handler.gd" type="Script" id=46] [sub_resource type="DynamicFont" id=1] @@ -151,6 +153,7 @@ 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 @@ -174,19 +177,9 @@ __meta__ = { [node name="win_timer" type="Timer" parent="game_UI/winner"] wait_time = 4.0 -[node name="timer" type="Label" parent="."] -margin_right = 589.0 -margin_bottom = 175.0 -custom_fonts/font = ExtResource( 12 ) -text = "null" -align = 1 -valign = 1 -__meta__ = { -"_edit_use_anchors_": false -} - [node name="controls" type="Control" parent="."] -margin_right = 1920.0 +margin_left = -2.1189 +margin_right = 1917.88 margin_bottom = 1080.0 __meta__ = { "_edit_use_anchors_": false @@ -196,60 +189,26 @@ __meta__ = { margin_right = 50.0 margin_bottom = 50.0 -[node name="Line" type="Button" parent="controls"] -anchor_left = 0.018 -anchor_top = 0.875 -anchor_right = 0.06 -anchor_bottom = 0.95 -margin_left = 8.82419 -margin_top = -6.4104 -margin_right = 47.8242 -margin_bottom = 13.5896 -text = "Line" -__meta__ = { -"_edit_use_anchors_": false -} +[node name="user_input" parent="controls" instance=ExtResource( 15 )] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -240.0 +margin_top = -65.0 +margin_right = 240.0 +margin_bottom = 91.0 -[node name="Sine" type="Button" parent="controls"] -anchor_left = 0.018 -anchor_top = 0.875 -anchor_right = 0.06 -anchor_bottom = 0.95 -margin_left = 126.824 -margin_top = -6.4104 -margin_right = 165.824 -margin_bottom = 13.5896 -text = "Sine" -__meta__ = { -"_edit_use_anchors_": false -} +[node name="trajectory_control" parent="controls" instance=ExtResource( 14 )] +anchor_top = 1.0 +anchor_bottom = 1.0 +margin_top = -150.0 +margin_bottom = 0.0 -[node name="Parab" type="Button" parent="controls"] -anchor_left = 0.018 -anchor_top = 0.875 -anchor_right = 0.06 -anchor_bottom = 0.95 -margin_left = 241.824 -margin_top = -6.4104 -margin_right = 307.824 -margin_bottom = 13.5896 -text = "Parabola" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Hyper" type="Button" parent="controls"] -anchor_left = 0.018 -anchor_top = 0.875 -anchor_right = 0.06 -anchor_bottom = 0.95 -margin_left = 356.824 -margin_top = -6.4104 -margin_right = 433.824 -margin_bottom = 13.5896 -text = "Hyperbola" -__meta__ = { -"_edit_use_anchors_": false -} +[node name="timer" parent="controls" instance=ExtResource( 16 )] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -225.0 +margin_right = 225.0 [connection signal="timeout" from="game_UI/winner/win_timer" to="game_UI/winner" method="_on_win_timer_timeout"] diff --git a/source/scenes/GUI/main_menu.tscn b/source/scenes/GUI/main_menu.tscn index c93cbb5..f1b0856 100644 --- a/source/scenes/GUI/main_menu.tscn +++ b/source/scenes/GUI/main_menu.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://source/entities/menu_player/player_node.tscn" type="PackedScene" id=1] [ext_resource path="res://source/scenes/GUI/background.tscn" type="PackedScene" id=2] -[ext_resource path="res://source/assets/sprites/GUI/lan_logo.svg" type="Texture" id=3] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/lan_logo.svg" type="Texture" id=3] [ext_resource path="res://source/assets/sprites/GUI/logo_design/FUNCit_game_logo_dark_transparent.png" type="Texture" id=4] [ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=5] [ext_resource path="res://source/assets/scripts/ui_element_handlers/main_menu.gd" type="Script" id=6] diff --git a/source/scenes/GUI/network_setup.tscn b/source/scenes/GUI/network_setup.tscn index 799ada3..0e3d8d7 100644 --- a/source/scenes/GUI/network_setup.tscn +++ b/source/scenes/GUI/network_setup.tscn @@ -6,14 +6,14 @@ [ext_resource path="res://source/scenes/OVERLAY/elements/menu_button.tscn" type="PackedScene" id=4] [ext_resource path="res://source/scenes/GUI/background.tscn" type="PackedScene" id=5] [ext_resource path="res://source/scenes/OVERLAY/elements/floor.tscn" type="PackedScene" id=6] -[ext_resource path="res://source/assets/sprites/GUI/lan_logo.svg" type="Texture" id=7] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/lan_logo.svg" type="Texture" id=7] [ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=8] [ext_resource path="res://source/scenes/OVERLAY/elements/button.tscn" type="PackedScene" id=9] [ext_resource path="res://source/fonts/oxygen/oxygen_regular.tres" type="DynamicFont" id=10] [ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=11] [ext_resource path="res://source/assets/sprites/GUI/background_lobby.svg" type="Texture" id=12] [ext_resource path="res://source/scenes/OVERLAY/elements/wall.tscn" type="PackedScene" id=13] -[ext_resource path="res://source/assets/sprites/GUI/server_title.svg" type="Texture" id=15] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/server_title.svg" type="Texture" id=14] [sub_resource type="DynamicFont" id=1] size = 36 @@ -166,7 +166,7 @@ __meta__ = { [node name="enter_server_ip" type="Sprite" parent="multiplayer_configure/popup_screen"] position = Vector2( 960, 465 ) -texture = ExtResource( 15 ) +texture = ExtResource( 14 ) __meta__ = { "_edit_lock_": true } diff --git a/source/scenes/GUI/server_handlers/server_browser.tscn b/source/scenes/GUI/server_handlers/server_browser.tscn index 5aa5499..7f82808 100644 --- a/source/scenes/GUI/server_handlers/server_browser.tscn +++ b/source/scenes/GUI/server_handlers/server_browser.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=15 format=2] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/server_title.svg" type="Texture" id=1] [ext_resource path="res://source/scenes/GUI/server_handlers/server_listener.tscn" type="PackedScene" id=2] [ext_resource path="res://source/assets/scripts/server_handlers/server_processors/server_browser.gd" type="Script" id=3] [ext_resource path="res://source/scenes/OVERLAY/elements/button.tscn" type="PackedScene" id=4] [ext_resource path="res://source/assets/sprites/GUI/background_server.svg" type="Texture" id=5] -[ext_resource path="res://source/assets/sprites/GUI/server_title.svg" type="Texture" id=6] -[ext_resource path="res://source/assets/sprites/GUI/button_disabled.svg" type="Texture" id=7] +[ext_resource path="res://source/assets/sprites/GUI/in_game/button_disabled.svg" type="Texture" id=7] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=8] [sub_resource type="DynamicFont" id=1] @@ -178,7 +178,7 @@ __meta__ = { [node name="server_title" type="Sprite" parent="controls/background_panel"] position = Vector2( 225, -25 ) -texture = ExtResource( 6 ) +texture = ExtResource( 1 ) __meta__ = { "_edit_lock_": true } @@ -219,7 +219,7 @@ __meta__ = { [node name="enter_server_ip" type="Sprite" parent="popup_screen"] position = Vector2( 960, 465 ) -texture = ExtResource( 6 ) +texture = ExtResource( 1 ) __meta__ = { "_edit_lock_": true } diff --git a/source/scenes/GUI/singleplayer_setup.tscn b/source/scenes/GUI/singleplayer_setup.tscn index 9784d76..7cfcf24 100644 --- a/source/scenes/GUI/singleplayer_setup.tscn +++ b/source/scenes/GUI/singleplayer_setup.tscn @@ -2,9 +2,9 @@ [ext_resource path="res://source/assets/scripts/server_handlers/network_processors/singleplayer_setup.gd" type="Script" 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/buttons/server_title.svg" type="Texture" id=3] [ext_resource path="res://source/scenes/GUI/background.tscn" type="PackedScene" id=5] [ext_resource path="res://source/scenes/OVERLAY/elements/button.tscn" type="PackedScene" id=9] -[ext_resource path="res://source/assets/sprites/GUI/server_title.svg" type="Texture" id=15] [sub_resource type="DynamicFont" id=1] size = 36 @@ -49,7 +49,7 @@ __meta__ = { [node name="enter_server_ip" type="Sprite" parent="popup_screen"] position = Vector2( 960, 465 ) -texture = ExtResource( 15 ) +texture = ExtResource( 3 ) __meta__ = { "_edit_lock_": true } diff --git a/source/scenes/OVERLAY/elements/HUD.tscn b/source/scenes/OVERLAY/elements/HUD.tscn index 81713b2..ed3176b 100644 --- a/source/scenes/OVERLAY/elements/HUD.tscn +++ b/source/scenes/OVERLAY/elements/HUD.tscn @@ -1,10 +1,12 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/assets/sprites/GUI/bar-background.png" type="Texture" id=1] -[ext_resource path="res://source/assets/sprites/GUI/bar-fill.png" type="Texture" id=2] +[ext_resource path="res://source/assets/sprites/GUI/in_game/health_bar/trinity_site_health_bar_negative.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/GUI/in_game/health_bar/trinity_site_health_bar_positive.svg" type="Texture" id=2] [ext_resource path="res://source/assets/scripts/ui_element_handlers/HUD.gd" type="Script" id=3] -[node name="HUD" type="Node2D" groups=["Net"]] +[node name="HUD" type="Node2D" groups=[ +"Net", +]] script = ExtResource( 3 ) [node name="health_bar" type="TextureProgress" parent="."] @@ -12,10 +14,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -64.0 -margin_top = -20.0 -margin_right = 64.0 -margin_bottom = 20.0 +margin_left = -50.0 +margin_top = -5.0 +margin_right = 50.0 +margin_bottom = 5.0 value = 100.0 texture_under = ExtResource( 1 ) texture_progress = ExtResource( 2 ) diff --git a/source/scenes/OVERLAY/elements/button.tscn b/source/scenes/OVERLAY/elements/button.tscn index f50f245..416e16a 100644 --- a/source/scenes/OVERLAY/elements/button.tscn +++ b/source/scenes/OVERLAY/elements/button.tscn @@ -1,16 +1,17 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://source/assets/sprites/GUI/button.svg" type="Texture" id=1] -[ext_resource path="res://source/assets/sprites/GUI/button_hover.svg" type="Texture" id=2] -[ext_resource path="res://source/assets/sprites/GUI/button_pressed.svg" type="Texture" id=3] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/button_pressed.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/button_hover.svg" type="Texture" id=2] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/button.svg" type="Texture" id=3] [node name="TextureButton" type="TextureButton"] -margin_right = 40.0 -margin_bottom = 40.0 +margin_left = 2.99664 +margin_right = 302.997 +margin_bottom = 72.0 focus_mode = 0 enabled_focus_mode = 0 -texture_normal = ExtResource( 1 ) -texture_pressed = ExtResource( 3 ) +texture_normal = ExtResource( 3 ) +texture_pressed = ExtResource( 1 ) texture_hover = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false diff --git a/source/scenes/OVERLAY/elements/menu_button.tscn b/source/scenes/OVERLAY/elements/menu_button.tscn index 215ee09..ab0d9ce 100644 --- a/source/scenes/OVERLAY/elements/menu_button.tscn +++ b/source/scenes/OVERLAY/elements/menu_button.tscn @@ -1,13 +1,14 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://source/assets/sprites/GUI/in_game/menu_button_pressed.svg" type="Texture" id=1] -[ext_resource path="res://source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg" type="Texture" id=2] -[ext_resource path="res://source/assets/sprites/GUI/in_game/menu_button_hover.svg" type="Texture" id=3] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/menu_button.svg" type="Texture" id=2] +[ext_resource path="res://source/assets/sprites/GUI/in_game/buttons/menu_button_pressed.svg" type="Texture" id=3] [ext_resource path="res://source/assets/scripts/ui_element_handlers/menu_button.gd" type="Script" id=4] [node name="menu_button" type="TextureButton"] margin_right = 45.0 margin_bottom = 45.0 +rect_scale = Vector2( 1.25, 1.25 ) focus_mode = 0 enabled_focus_mode = 0 texture_normal = ExtResource( 2 ) diff --git a/source/scenes/OVERLAY/elements/menu_button_overlay.tscn b/source/scenes/OVERLAY/elements/menu_button_overlay.tscn index e3062e9..b89a08d 100644 --- a/source/scenes/OVERLAY/elements/menu_button_overlay.tscn +++ b/source/scenes/OVERLAY/elements/menu_button_overlay.tscn @@ -87,9 +87,12 @@ anchor_right = 1.0 anchor_bottom = 1.0 custom_fonts/font = SubResource( 3 ) custom_colors/font_color = Color( 0, 0, 0, 1 ) -text = "Retrun to main menu" +text = "Return to main menu" align = 1 valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} [node name="exit_game" parent="panel" instance=ExtResource( 2 )] anchor_left = 0.5 diff --git a/source/scenes/OVERLAY/elements/simple_prompt.tscn b/source/scenes/OVERLAY/elements/simple_prompt.tscn index 7d394fb..16826ac 100644 --- a/source/scenes/OVERLAY/elements/simple_prompt.tscn +++ b/source/scenes/OVERLAY/elements/simple_prompt.tscn @@ -55,8 +55,8 @@ margin_bottom = 155.5 [node name="OK" type="Label" parent="Panel/ok"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 2 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "OK" align = 1 valign = 1 diff --git a/source/scenes/OVERLAY/elements/timer.tscn b/source/scenes/OVERLAY/elements/timer.tscn new file mode 100644 index 0000000..1faa74e --- /dev/null +++ b/source/scenes/OVERLAY/elements/timer.tscn @@ -0,0 +1,54 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://source/assets/sprites/GUI/in_game/timer/background_panel.svg" type="Texture" id=1] +[ext_resource path="res://source/fonts/oxygen/oxygen_bold.tres" type="DynamicFont" id=2] +[ext_resource path="res://source/fonts/oxygen/Oxygen-Bold.ttf" type="DynamicFontData" id=3] + +[sub_resource type="StyleBoxTexture" id=1] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 450, 80 ) + +[sub_resource type="DynamicFont" id=2] +size = 18 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 3 ) + +[node name="timer" type="Panel"] +margin_right = 450.0 +margin_bottom = 80.0 +custom_styles/panel = SubResource( 1 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="time" type="Label" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -50.0 +margin_right = 50.0 +margin_bottom = 46.0 +custom_fonts/font = ExtResource( 2 ) +text = "00:00" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="phase" type="Label" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -150.0 +margin_top = 6.0 +margin_right = 150.0 +margin_bottom = 34.0 +custom_fonts/font = SubResource( 2 ) +text = "phase" +align = 1 +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/source/scenes/OVERLAY/elements/trajectory_control.tscn b/source/scenes/OVERLAY/elements/trajectory_control.tscn new file mode 100644 index 0000000..ba01923 --- /dev/null +++ b/source/scenes/OVERLAY/elements/trajectory_control.tscn @@ -0,0 +1,214 @@ +[gd_scene load_steps=15 format=2] + +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/background.svg" type="Texture" id=1] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/line_inactive.svg" type="Texture" 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/parabol_active.svg" type="Texture" id=4] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/sin_active.svg" type="Texture" id=5] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/sin_inactive.svg" type="Texture" id=6] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/parabol_inactive.svg" type="Texture" id=7] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_inactive.svg" type="Texture" id=8] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg" type="Texture" id=9] +[ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=10] + +[sub_resource type="StyleBoxTexture" id=1] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 550, 150 ) + +[sub_resource type="DynamicFont" id=2] +use_mipmaps = true +use_filter = true +font_data = ExtResource( 10 ) + +[sub_resource type="DynamicFont" id=3] +size = 8 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 10 ) + +[sub_resource type="DynamicFont" id=4] +size = 14 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 10 ) + +[node name="trajectory_control" type="Panel"] +margin_right = 550.0 +margin_bottom = 150.0 +custom_styles/panel = SubResource( 1 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="."] +margin_left = 8.0 +margin_top = 8.0 +margin_right = 243.0 +margin_bottom = 29.0 +custom_fonts/font = SubResource( 2 ) +text = "Weapon function arssenal" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="Label2" type="Label" parent="."] +margin_left = 128.0 +margin_top = 24.0 +margin_right = 253.0 +margin_bottom = 35.0 +custom_fonts/font = SubResource( 3 ) +custom_colors/font_color = Color( 0.113725, 0.203922, 0.552941, 1 ) +text = "Government issued - v/613.92.1" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="line" type="TextureButton" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -255.0 +margin_top = -40.0 +margin_right = -155.0 +margin_bottom = 60.0 +focus_mode = 0 +action_mode = 0 +enabled_focus_mode = 0 +texture_normal = ExtResource( 2 ) +texture_pressed = ExtResource( 3 ) +texture_hover = ExtResource( 3 ) +stretch_mode = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="line"] +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 11.0 +margin_top = -18.0 +margin_right = -11.0 +custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "line" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="parabol" type="TextureButton" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -125.0 +margin_top = -40.0 +margin_right = -25.0 +margin_bottom = 60.0 +texture_normal = ExtResource( 7 ) +texture_pressed = ExtResource( 4 ) +texture_hover = ExtResource( 4 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="parabol"] +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 11.0 +margin_top = -18.0 +margin_right = -11.0 +custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "parabol" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="hyperbol" type="TextureButton" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = 5.23596 +margin_top = -40.0 +margin_right = 105.236 +margin_bottom = 60.0 +texture_normal = ExtResource( 8 ) +texture_pressed = ExtResource( 9 ) +texture_hover = ExtResource( 9 ) +stretch_mode = 2 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="hyperbol"] +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 11.0 +margin_top = -18.0 +margin_right = -11.0 +custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "hyperbol" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="sine" type="TextureButton" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = 135.0 +margin_top = -40.0 +margin_right = 235.0 +margin_bottom = 60.0 +texture_normal = ExtResource( 6 ) +texture_pressed = ExtResource( 5 ) +texture_hover = ExtResource( 5 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="sine"] +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 11.0 +margin_top = -18.0 +margin_right = -11.0 +margin_bottom = 1.0 +custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "sin" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn new file mode 100644 index 0000000..43236ac --- /dev/null +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -0,0 +1,294 @@ +[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/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] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/parabol_active.svg" type="Texture" id=5] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/sin_active.svg" type="Texture" id=6] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_pressedsvg.svg" type="Texture" id=7] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_hover.svg" type="Texture" id=8] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button.svg" type="Texture" id=9] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_pressed.svg" type="Texture" id=10] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/ready_button/ready_button_hover.svg" type="Texture" id=11] +[ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button.svg" type="Texture" id=12] + +[sub_resource type="StyleBoxTexture" id=1] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 480, 156 ) + +[sub_resource type="StyleBoxTexture" id=7] +texture = ExtResource( 3 ) +region_rect = Rect2( 0, 0, 100, 100 ) + +[sub_resource type="DynamicFont" id=2] +size = 14 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="StyleBoxTexture" id=8] +texture = ExtResource( 5 ) +region_rect = Rect2( 0, 0, 100, 100 ) + +[sub_resource type="DynamicFont" id=3] +size = 14 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="StyleBoxTexture" id=6] +texture = ExtResource( 4 ) +region_rect = Rect2( 0, 0, 100, 100 ) + +[sub_resource type="DynamicFont" id=4] +size = 14 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="StyleBoxTexture" id=5] +texture = ExtResource( 6 ) +region_rect = Rect2( 0, 0, 100, 100 ) + +[sub_resource type="DynamicFont" id=9] +size = 22 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=10] +size = 22 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[sub_resource type="DynamicFont" id=11] +size = 22 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + +[node name="user_input" type="Panel"] +margin_right = 480.0 +margin_bottom = 156.0 +custom_styles/panel = SubResource( 1 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="trajectories" type="Control" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 50.0 +margin_top = 28.0 +margin_right = -330.0 +margin_bottom = -28.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="line" type="Panel" parent="trajectories"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -50.0 +margin_top = -50.0 +margin_right = 50.0 +margin_bottom = 50.0 +custom_styles/panel = SubResource( 7 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="trajectories/line"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -39.0 +margin_top = -19.0 +margin_right = 39.0 +custom_fonts/font = SubResource( 2 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "line" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="parabol" type="Panel" parent="trajectories"] +visible = false +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -50.0 +margin_top = -50.0 +margin_right = 50.0 +margin_bottom = 50.0 +custom_styles/panel = SubResource( 8 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="trajectories/parabol"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -39.0 +margin_top = -19.0 +margin_right = 39.0 +custom_fonts/font = SubResource( 3 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "parabol" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="hyperbol" type="Panel" parent="trajectories"] +visible = false +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -50.0 +margin_top = -50.0 +margin_right = 50.0 +margin_bottom = 50.0 +custom_styles/panel = SubResource( 6 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="trajectories/hyperbol"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -39.0 +margin_top = -19.0 +margin_right = 39.0 +custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "hyperbol" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="sin" type="Panel" parent="trajectories"] +visible = false +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -50.0 +margin_top = -50.0 +margin_right = 50.0 +margin_bottom = 50.0 +custom_styles/panel = SubResource( 5 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="trajectories/sin"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -39.0 +margin_top = -19.0 +margin_right = 39.0 +custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "sin" +align = 1 +valign = 1 +uppercase = true +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="controls" type="Control" parent="."] +margin_left = 165.0 +margin_top = 13.0 +margin_right = 465.0 +margin_bottom = 143.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="controls"] +anchor_right = 1.0 +margin_bottom = 29.0 +custom_fonts/font = SubResource( 9 ) +text = "Active formula" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ready_button" type="TextureButton" parent="controls"] +anchor_top = 1.0 +anchor_bottom = 1.0 +margin_top = -36.0 +margin_right = 120.0 +texture_normal = ExtResource( 9 ) +texture_pressed = ExtResource( 10 ) +texture_hover = ExtResource( 11 ) +__meta__ = { +"_edit_group_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="controls/ready_button"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_fonts/font = SubResource( 10 ) +text = "Ready" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="skip_button" type="TextureButton" parent="controls"] +margin_left = 180.0 +margin_top = 94.0 +margin_right = 300.0 +margin_bottom = 130.0 +texture_normal = ExtResource( 12 ) +texture_pressed = ExtResource( 7 ) +texture_hover = ExtResource( 8 ) +__meta__ = { +"_edit_group_": true, +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="controls/skip_button"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_fonts/font = SubResource( 11 ) +text = "Skip" +align = 1 +valign = 1 diff --git a/source/scenes/OVERLAY/elements/username_text.tscn b/source/scenes/OVERLAY/elements/username_text.tscn index 236ed60..ca2df41 100644 --- a/source/scenes/OVERLAY/elements/username_text.tscn +++ b/source/scenes/OVERLAY/elements/username_text.tscn @@ -9,7 +9,9 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 1 ) -[node name="username_text" type="Node2D" groups=["Net"]] +[node name="username_text" type="Node2D" groups=[ +"Net", +]] z_index = 10 script = ExtResource( 2 )