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 6a11cb2..0000000 Binary files a/source/assets/sprites/GUI/bar-background.png and /dev/null differ diff --git a/source/assets/sprites/GUI/bar-fill.png b/source/assets/sprites/GUI/bar-fill.png deleted file mode 100644 index fd65bef..0000000 Binary files a/source/assets/sprites/GUI/bar-fill.png and /dev/null differ diff --git a/source/assets/sprites/GUI/button.svg b/source/assets/sprites/GUI/in_game/buttons/button.svg similarity index 100% rename from source/assets/sprites/GUI/button.svg rename to source/assets/sprites/GUI/in_game/buttons/button.svg diff --git a/source/assets/sprites/GUI/button_disabled.svg b/source/assets/sprites/GUI/in_game/buttons/button_disabled.svg similarity index 100% rename from source/assets/sprites/GUI/button_disabled.svg rename to source/assets/sprites/GUI/in_game/buttons/button_disabled.svg diff --git a/source/assets/sprites/GUI/button_hover.svg b/source/assets/sprites/GUI/in_game/buttons/button_hover.svg similarity index 100% rename from source/assets/sprites/GUI/button_hover.svg rename to source/assets/sprites/GUI/in_game/buttons/button_hover.svg diff --git a/source/assets/sprites/GUI/button_pressed.svg b/source/assets/sprites/GUI/in_game/buttons/button_pressed.svg similarity index 100% rename from source/assets/sprites/GUI/button_pressed.svg rename to source/assets/sprites/GUI/in_game/buttons/button_pressed.svg diff --git a/source/assets/sprites/GUI/lan_logo.svg b/source/assets/sprites/GUI/in_game/buttons/lan_logo.svg similarity index 100% rename from source/assets/sprites/GUI/lan_logo.svg rename to source/assets/sprites/GUI/in_game/buttons/lan_logo.svg diff --git a/source/assets/sprites/GUI/in_game/buttons/menu_button.svg b/source/assets/sprites/GUI/in_game/buttons/menu_button.svg new file mode 100644 index 0000000..e463b85 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/buttons/menu_button.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + diff --git a/source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg b/source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg new file mode 100644 index 0000000..7454d76 --- /dev/null +++ b/source/assets/sprites/GUI/in_game/buttons/menu_button_hover.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + 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/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 1103f0e..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_health_bar_negative.png and /dev/null differ 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 f77a8aa..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_health_bar_positive.png and /dev/null differ diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_background-example.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_background-example.svg deleted file mode 100644 index 44ecd19..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_background-example.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 468fe66..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_background.png and /dev/null differ 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 1d1e835..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1.png and /dev/null differ 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 949dfb3..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_1_active.png and /dev/null differ 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 cd59ddf..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2.png and /dev/null differ 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 313582b..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_2_active.png and /dev/null differ 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 86a6f5c..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.png and /dev/null differ diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg deleted file mode 100644 index ce0962c..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3 – 1.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3.png b/source/assets/sprites/GUI/in_game/trinity_site_input_button_3.png deleted file mode 100644 index fcd1519..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3.png and /dev/null differ 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 256b5e6..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_3_active.png and /dev/null differ 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 b488325..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4.png and /dev/null differ 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 dc22723..0000000 Binary files a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.png and /dev/null differ diff --git a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.svg b/source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.svg deleted file mode 100644 index 3389315..0000000 --- a/source/assets/sprites/GUI/in_game/trinity_site_input_button_4_active.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 5f8425e..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,87 +177,38 @@ __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 } [node name="menu_button" parent="controls" instance=ExtResource( 13 )] -anchor_left = 1.0 -anchor_right = 1.0 -margin_left = -70.0 -margin_top = 20.0 -margin_right = -20.0 -margin_bottom = 70.0 -focus_mode = 0 +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 3edc7c7..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] @@ -50,8 +50,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "PLAY" align = 1 valign = 1 @@ -75,8 +75,8 @@ margin_left = -98.8223 margin_top = -36.0 margin_right = 134.178 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "LAN Party" align = 1 valign = 1 @@ -107,8 +107,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "EXIT" align = 1 valign = 1 diff --git a/source/scenes/GUI/network_setup.tscn b/source/scenes/GUI/network_setup.tscn index d4c5e61..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 @@ -21,16 +21,16 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) -[sub_resource type="DynamicFont" id=4] -size = 36 -use_mipmaps = true -use_filter = true -font_data = ExtResource( 2 ) - [sub_resource type="StyleBoxEmpty" id=2] [sub_resource type="StyleBoxEmpty" id=3] +[sub_resource type="DynamicFont" id=4] +size = 36 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + [sub_resource type="DynamicFont" id=5] size = 36 use_mipmaps = true @@ -91,8 +91,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CREATE SERVER" align = 1 valign = 1 @@ -115,8 +115,8 @@ anchor_bottom = 0.5 margin_left = -233.0 margin_top = -36.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "JOIN SERVER" align = 1 valign = 1 @@ -147,8 +147,8 @@ margin_left = -150.0 margin_top = -36.0 margin_right = 150.0 margin_bottom = 36.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 8 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "RETURN" align = 1 valign = 1 @@ -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 } @@ -178,8 +178,8 @@ margin_left = -225.0 margin_top = -25.0 margin_right = -225.0 margin_bottom = -25.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Enter your username" align = 1 valign = 1 @@ -210,10 +210,10 @@ margin_left = -175.0 margin_top = -28.0 margin_right = 175.0 margin_bottom = 28.0 -custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) -custom_fonts/font = SubResource( 4 ) custom_styles/focus = SubResource( 2 ) custom_styles/normal = SubResource( 3 ) +custom_fonts/font = SubResource( 4 ) +custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) align = 1 placeholder_text = "username" __meta__ = { @@ -234,8 +234,8 @@ margin_bottom = 97.0 [node name="Label" type="Label" parent="multiplayer_configure/popup_screen/panel/confirm"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CONFIRM" align = 1 valign = 1 @@ -288,8 +288,8 @@ margin_left = -74.5 margin_top = -32.0 margin_right = 74.5 margin_bottom = 32.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = ExtResource( 10 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "START" align = 1 valign = 1 @@ -307,8 +307,8 @@ margin_left = -319.0 margin_top = -56.0 margin_right = 319.0 margin_bottom = 56.0 -custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_fonts/font = SubResource( 6 ) +custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) align = 1 valign = 1 __meta__ = { @@ -325,8 +325,8 @@ margin_left = -116.5 margin_top = 60.0 margin_right = 116.5 margin_bottom = 89.0 -custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) custom_fonts/font = SubResource( 7 ) +custom_colors/font_color = Color( 0.439216, 0.666667, 1, 0.27451 ) text = "WAITING FOR PLAYERS" align = 1 valign = 1 @@ -335,12 +335,8 @@ __meta__ = { } [node name="menu_button" parent="UI" instance=ExtResource( 4 )] -anchor_left = 1.0 -anchor_right = 1.0 -margin_left = -70.0 -margin_top = 20.0 -margin_right = -20.0 -margin_bottom = 70.0 +margin_right = 50.0 +margin_bottom = 50.0 [node name="spawn_locations" type="Node" parent="."] 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 b496ae2..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 @@ -12,16 +12,16 @@ use_mipmaps = true use_filter = true font_data = ExtResource( 2 ) -[sub_resource type="DynamicFont" id=4] -size = 36 -use_mipmaps = true -use_filter = true -font_data = ExtResource( 2 ) - [sub_resource type="StyleBoxEmpty" id=2] [sub_resource type="StyleBoxEmpty" id=3] +[sub_resource type="DynamicFont" id=4] +size = 36 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 2 ) + [sub_resource type="DynamicFont" id=5] size = 36 use_mipmaps = true @@ -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 } @@ -61,8 +61,8 @@ margin_left = -225.0 margin_top = -25.0 margin_right = -225.0 margin_bottom = -25.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Enter your username" align = 1 valign = 1 @@ -93,10 +93,10 @@ margin_left = -175.0 margin_top = -28.0 margin_right = 175.0 margin_bottom = 28.0 -custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) -custom_fonts/font = SubResource( 4 ) custom_styles/focus = SubResource( 2 ) custom_styles/normal = SubResource( 3 ) +custom_fonts/font = SubResource( 4 ) +custom_colors/selection_color = Color( 0.8, 0.8, 0.8, 1 ) align = 1 placeholder_text = "username" __meta__ = { @@ -117,8 +117,8 @@ margin_bottom = 97.0 [node name="Label" type="Label" parent="popup_screen/panel/confirm"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 5 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "CONFIRM" align = 1 valign = 1 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 33e5996..ab0d9ce 100644 --- a/source/scenes/OVERLAY/elements/menu_button.tscn +++ b/source/scenes/OVERLAY/elements/menu_button.tscn @@ -1,18 +1,19 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://source/assets/sprites/GUI/menu_button.svg" type="Texture" id=1] -[ext_resource path="res://source/assets/sprites/GUI/menu_button_pressed.svg" type="Texture" id=2] -[ext_resource path="res://source/assets/sprites/GUI/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 = 40.0 -margin_bottom = 40.0 +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( 1 ) -texture_pressed = ExtResource( 2 ) -texture_hover = ExtResource( 3 ) +texture_normal = ExtResource( 2 ) +texture_pressed = ExtResource( 3 ) +texture_hover = ExtResource( 1 ) script = ExtResource( 4 ) __meta__ = { "_edit_use_anchors_": false diff --git a/source/scenes/OVERLAY/elements/menu_button_overlay.tscn b/source/scenes/OVERLAY/elements/menu_button_overlay.tscn index 38730ca..b89a08d 100644 --- a/source/scenes/OVERLAY/elements/menu_button_overlay.tscn +++ b/source/scenes/OVERLAY/elements/menu_button_overlay.tscn @@ -64,8 +64,8 @@ enabled_focus_mode = 2 [node name="Label" type="Label" parent="panel/return_to_game"] 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 = "Return to game" align = 1 valign = 1 @@ -85,11 +85,14 @@ enabled_focus_mode = 2 [node name="Label" type="Label" parent="panel/return_to_main_menu"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 3 ) -text = "Retrun to main menu" +custom_colors/font_color = Color( 0, 0, 0, 1 ) +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 @@ -106,8 +109,8 @@ enabled_focus_mode = 2 [node name="Label" type="Label" parent="panel/exit_game"] anchor_right = 1.0 anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_fonts/font = SubResource( 4 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) text = "Exit game" align = 1 valign = 1 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 )