diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index 8faef93..c9443d9 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -271,7 +271,8 @@ func _physics_process(delta) -> void: # warning-ignore:return_value_discarded move_and_slide(velocityVDIR.rotated(rotationalHolder)) rotate_weapon() - if user_input["shoot"] and can_shoot and not is_reloading: + + if user_input["shoot"] and can_shoot and not is_reloading and Global.mode == 1: rpc("shoot", trajectory) is_reloading = true reload_timer.start() diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index 263ea81..61ac3c4 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -10,6 +10,7 @@ var global var control var user_input var bot_weapon +var mode = 1 var clientPhase = { "0": { diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd index 30d72a8..e429484 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level.gd @@ -15,6 +15,7 @@ func _ready() -> void: if get_tree().is_network_server(): setup_player_positions() Global.start_game(true) + Global.mode = 2 func setup_player_positions() -> void: diff --git a/source/assets/scripts/server_handlers/trinity_site_level_playground.gd b/source/assets/scripts/server_handlers/trinity_site_level_playground.gd index 3700747..597aaaf 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level_playground.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level_playground.gd @@ -6,6 +6,7 @@ var current_player_location_instance_number = null var globalActivePhase = null func _ready() -> void: + Global.mode = 1 $controls/user_input/controls/ready_button.hide() $controls/user_input/controls/skip_button.hide() # warning-ignore:return_value_discarded diff --git a/source/assets/scripts/shooting/Trajectories/trajectories.gd b/source/assets/scripts/shooting/Trajectories/trajectories.gd index cf0221e..26b98d7 100644 --- a/source/assets/scripts/shooting/Trajectories/trajectories.gd +++ b/source/assets/scripts/shooting/Trajectories/trajectories.gd @@ -14,7 +14,14 @@ var amp = 5 # Called when the node enters the scene tree for the first time. func _ready(): Global.set("user_input", self) - + + +func _on_ready_button_pressed(): + pass # Replace with function body. + + +func _on_skip_button_pressed(): + pass # Replace with function body. func _on_line_SpinBox_value_changed(value): @@ -41,7 +48,6 @@ func _on_b_param_h_SpinBox_value_changed(value): if b_param_hyper != 0: Global.get("player").enable_trajectory_line("hyper") Global.get("player").trajectory = "hyper" - func _on_a_param_h_SpinBox_value_changed(value): @@ -60,6 +66,5 @@ func _on_freq_SpinBox_value_changed(value): freq = value Global.get("player").enable_trajectory_line("sine") Global.get("player").trajectory = "sine" - diff --git a/source/entities/player/player_node.tscn b/source/entities/player/player_node.tscn index 3df4cc4..ea0bf83 100644 --- a/source/entities/player/player_node.tscn +++ b/source/entities/player/player_node.tscn @@ -366,7 +366,7 @@ wait_time = 0.03 autostart = true [node name="reload_timer" type="Timer" parent="."] -wait_time = 0.15 +wait_time = 0.7 one_shot = true [node name="hit_timer" type="Timer" parent="."] diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn index e51ca9e..b29d3fc 100644 --- a/source/scenes/OVERLAY/elements/user_input.tscn +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -596,3 +596,5 @@ valign = 1 [connection signal="value_changed" from="controls/hyperbol/b_param_h_SpinBox" to="controls" method="_on_b_param_h_SpinBox_value_changed"] [connection signal="value_changed" from="controls/sin/amp_SpinBox" to="controls" method="_on_amp_SpinBox_value_changed"] [connection signal="value_changed" from="controls/sin/freq_SpinBox" to="controls" method="_on_freq_SpinBox_value_changed"] +[connection signal="pressed" from="controls/ready_button" to="controls" method="_on_ready_button_pressed"] +[connection signal="pressed" from="controls/skip_button" to="controls" method="_on_skip_button_pressed"]