kristoferssolo/FuncIt
1
0
Fork 0
mirror of https://github.com/kristoferssolo/FuncIt.git synced 2025-10-21 19:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do it urself

Browse Source
This commit is contained in:
Kristofers Solo 2021-11-18 21:54:33 +02:00
parent 0c37f03d8b
commit 528d0dad42
7 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/assets/scripts/player_handlers/player_body_handler.gd
View File

@ -271,7 +271,8 @@ func _physics_process(delta) -> void:
# warning-ignore:return_value_discarded # warning-ignore:return_value_discarded
move_and_slide(velocityVDIR.rotated(rotationalHolder)) move_and_slide(velocityVDIR.rotated(rotationalHolder))
rotate_weapon() 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) rpc("shoot", trajectory)
is_reloading = true is_reloading = true
reload_timer.start() reload_timer.start()

1
source/assets/scripts/server_handlers/global.gd
View File

@ -10,6 +10,7 @@ var global
var control var control
var user_input var user_input
var bot_weapon var bot_weapon
var mode = 1
var clientPhase = { var clientPhase = {
"0": { "0": {

1
source/assets/scripts/server_handlers/trinity_site_level.gd
View File

@ -15,6 +15,7 @@ func _ready() -> void:
if get_tree().is_network_server(): if get_tree().is_network_server():
setup_player_positions() setup_player_positions()
Global.start_game(true) Global.start_game(true)
Global.mode = 2
func setup_player_positions() -> void: func setup_player_positions() -> void:

1
source/assets/scripts/server_handlers/trinity_site_level_playground.gd
View File

@ -6,6 +6,7 @@ var current_player_location_instance_number = null
var globalActivePhase = null var globalActivePhase = null
func _ready() -> void: func _ready() -> void:
Global.mode = 1
$controls/user_input/controls/ready_button.hide() $controls/user_input/controls/ready_button.hide()
$controls/user_input/controls/skip_button.hide() $controls/user_input/controls/skip_button.hide()
# warning-ignore:return_value_discarded # warning-ignore:return_value_discarded

9
source/assets/scripts/shooting/Trajectories/trajectories.gd
View File

@ -16,6 +16,13 @@ func _ready():
Global.set("user_input", self) 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): func _on_line_SpinBox_value_changed(value):
a_param_line = 0 a_param_line = 0
@ -43,7 +50,6 @@ func _on_b_param_h_SpinBox_value_changed(value):
Global.get("player").trajectory = "hyper" Global.get("player").trajectory = "hyper"
func _on_a_param_h_SpinBox_value_changed(value): func _on_a_param_h_SpinBox_value_changed(value):
a_param_hyper = value a_param_hyper = value
Global.get("player").enable_trajectory_line("hyper") Global.get("player").enable_trajectory_line("hyper")
@ -62,4 +68,3 @@ func _on_freq_SpinBox_value_changed(value):
Global.get("player").trajectory = "sine" Global.get("player").trajectory = "sine"

2
source/entities/player/player_node.tscn
View File

@ -366,7 +366,7 @@ wait_time = 0.03
autostart = true autostart = true
[node name="reload_timer" type="Timer" parent="."] [node name="reload_timer" type="Timer" parent="."]
wait_time = 0.15 wait_time = 0.7
one_shot = true one_shot = true
[node name="hit_timer" type="Timer" parent="."] [node name="hit_timer" type="Timer" parent="."]

2
source/scenes/OVERLAY/elements/user_input.tscn
View File

@ -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/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/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="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"]