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

[EXPERIMENTAL]

Browse Source
This commit is contained in:
Alan Alexander Cerna 2021-11-11 21:33:36 +02:00
parent 589392a1b8
commit d7bab7a6ba
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,11 +146,11 @@ func process_rotation():
func _process(delta: float) -> void: func _process(delta: float) -> void:
user_input = UIN_preset_pre_processor_instance.update() user_input = UIN_preset_pre_processor_instance.update(clientPhase)
enter_phase_limits()
if get_tree().is_network_server(): if get_tree().is_network_server():
Global.phase_update_global() Global.phase_update_global()
clientPhase = Global.get_current_phase() clientPhase = Global.get_current_phase()
theme = "03"
else: else:
if puppet_phase != null: if puppet_phase != null:
clientPhase = puppet_phase clientPhase = puppet_phase
@ -478,31 +478,3 @@ func rotate_weapon():
$"weaponHolder/Player-character-theme-gun".position = weaponPosition $"weaponHolder/Player-character-theme-gun".position = weaponPosition
$"weaponHolder/Player-character-theme-gun".rotation_degrees = weaponAngle $"weaponHolder/Player-character-theme-gun".rotation_degrees = weaponAngle
pass pass
func enter_phase_limits():
if clientPhase != null and clientPhase["active"] != null:
if clientPhase["active"]["phase_id"] == 0:
user_input["r_inc"] = false
user_input["r_dec"] = false
user_input["shoot"] = false
elif clientPhase["active"]["phase_id"] == 1:
user_input["left"] = false
user_input["right"] = false
user_input["up"] = false
user_input["down"] = false
user_input["shoot"] = false
elif clientPhase["active"]["phase_id"] == 2:
user_input["left"] = false
user_input["right"] = false
user_input["up"] = false
user_input["down"] = false
user_input["r_inc"] = false
user_input["r_dec"] = false
else:
user_input["left"] = false
user_input["right"] = false
user_input["up"] = false
user_input["down"] = false
user_input["r_inc"] = false
user_input["r_dec"] = false
user_input["shoot"] = false

34
source/assets/scripts/pre_processors/uin_pre_processor.gd
View File

@ -9,6 +9,7 @@ func _init() -> void:
"up": false, "up": false,
"down": false, "down": false,
"debug": false, "debug": false,
"boost": false,
"enter": false, "enter": false,
"r_inc": false, "r_inc": false,
"r_dec": false, "r_dec": false,
@ -16,7 +17,7 @@ func _init() -> void:
} }
pass pass
func update(): func update(clientPhase):
inputState = { inputState = {
"right": Input.is_action_pressed("input_right"), "right": Input.is_action_pressed("input_right"),
"left": Input.is_action_pressed("input_left"), "left": Input.is_action_pressed("input_left"),
@ -29,4 +30,35 @@ func update():
"r_dec": Input.is_action_pressed("rotation_decrease"), "r_dec": Input.is_action_pressed("rotation_decrease"),
"shoot": Input.is_action_pressed("input_shoot") "shoot": Input.is_action_pressed("input_shoot")
} }
if clientPhase != null and clientPhase["active"] != null:
if clientPhase["active"]["phase_id"] == 0:
inputState["r_inc"] = false
inputState["r_dec"] = false
inputState["shoot"] = false
elif clientPhase["active"]["phase_id"] == 1:
inputState["left"] = false
inputState["right"] = false
inputState["up"] = false
inputState["down"] = false
inputState["shoot"] = false
elif clientPhase["active"]["phase_id"] == 2:
inputState["left"] = false
inputState["right"] = false
inputState["up"] = false
inputState["down"] = false
inputState["r_inc"] = false
inputState["r_dec"] = false
else:
inputState = {
"right": false,
"left": false,
"up": false,
"down": false,
"debug": false,
"boost": false,
"enter": false,
"r_inc": false,
"r_dec": false,
"shoot": false
}
return inputState return inputState