From d7bab7a6ba89dd489cf6dac5d0cd05d0ede82525 Mon Sep 17 00:00:00 2001 From: Alan Alexander Cerna <87852561+Kroppec@users.noreply.github.com> Date: Thu, 11 Nov 2021 21:33:36 +0200 Subject: [PATCH] [EXPERIMENTAL] --- .../player_handlers/player_body_handler.gd | 32 ++--------------- .../pre_processors/uin_pre_processor.gd | 34 ++++++++++++++++++- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/source/assets/scripts/player_handlers/player_body_handler.gd b/source/assets/scripts/player_handlers/player_body_handler.gd index c2c6dd2..c8a44ad 100644 --- a/source/assets/scripts/player_handlers/player_body_handler.gd +++ b/source/assets/scripts/player_handlers/player_body_handler.gd @@ -146,11 +146,11 @@ func process_rotation(): func _process(delta: float) -> void: - user_input = UIN_preset_pre_processor_instance.update() - enter_phase_limits() + user_input = UIN_preset_pre_processor_instance.update(clientPhase) if get_tree().is_network_server(): Global.phase_update_global() clientPhase = Global.get_current_phase() + theme = "03" else: if puppet_phase != null: clientPhase = puppet_phase @@ -478,31 +478,3 @@ func rotate_weapon(): $"weaponHolder/Player-character-theme-gun".position = weaponPosition $"weaponHolder/Player-character-theme-gun".rotation_degrees = weaponAngle 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 diff --git a/source/assets/scripts/pre_processors/uin_pre_processor.gd b/source/assets/scripts/pre_processors/uin_pre_processor.gd index bded22a..6f2db51 100644 --- a/source/assets/scripts/pre_processors/uin_pre_processor.gd +++ b/source/assets/scripts/pre_processors/uin_pre_processor.gd @@ -9,6 +9,7 @@ func _init() -> void: "up": false, "down": false, "debug": false, + "boost": false, "enter": false, "r_inc": false, "r_dec": false, @@ -16,7 +17,7 @@ func _init() -> void: } pass -func update(): +func update(clientPhase): inputState = { "right": Input.is_action_pressed("input_right"), "left": Input.is_action_pressed("input_left"), @@ -29,4 +30,35 @@ func update(): "r_dec": Input.is_action_pressed("rotation_decrease"), "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