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

[Micro] Phase fix

Browse Source
This commit is contained in:
Alan Alexander Cerna 2021-11-14 16:13:27 +02:00
parent bf88daafe5
commit 5f1e2d2cb5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ func update(clientPhase):
"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 and clientPhase != "ignore": if clientPhase != null and clientPhase["active"] != null:
if clientPhase["active"]["phase_id"] == 0: if clientPhase["active"]["phase_id"] == 0:
inputState["r_inc"] = false inputState["r_inc"] = false
inputState["r_dec"] = false inputState["r_dec"] = false
@ -61,5 +61,4 @@ func update(clientPhase):
"r_dec": false, "r_dec": false,
"shoot": false "shoot": false
} }
elif clientPhase == "ignore": pass
return inputState return inputState

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

@ -48,7 +48,7 @@ func phase_update_global():
if activePhaseTracker != null: if activePhaseTracker != null:
if clientPhase[str(activePhaseTracker)]["start_time"] != null: if clientPhase[str(activePhaseTracker)]["start_time"] != null:
if currentTime["second"] + currentTime["minute"] * 60 - clientPhase[str(activePhaseTracker)]["start_time"]["second"] - clientPhase[str(activePhaseTracker)]["start_time"]["minute"] * 60 > clientPhase[str(activePhaseTracker)]["length"]: if currentTime["second"] + currentTime["minute"] * 60 - clientPhase[str(activePhaseTracker)]["start_time"]["second"] - clientPhase[str(activePhaseTracker)]["start_time"]["minute"] * 60 > clientPhase[str(activePhaseTracker)]["length"]:
if activePhaseTracker == clientPhase.size() - 2: if activePhaseTracker == clientPhase.size() - 3:
clientPhase[str(activePhaseTracker)]["start_time"] = null clientPhase[str(activePhaseTracker)]["start_time"] = null
activePhaseTracker = 0 activePhaseTracker = 0
else: else:
@ -57,12 +57,14 @@ func phase_update_global():
else: clientPhase[str(activePhaseTracker)]["start_time"] = currentTime else: clientPhase[str(activePhaseTracker)]["start_time"] = currentTime
else: activePhaseTracker = 0 else: activePhaseTracker = 0
clientPhase["active"] = clientPhase[str(activePhaseTracker)] clientPhase["active"] = clientPhase[str(activePhaseTracker)]
else:
clientPhase["active"] = null
activePhaseTracker = null
pass pass
func start_game(value): func start_game(value):
gameStart = value gameStart = value
clientPhase["active"] = "ignore"
pass pass