diff --git a/source/assets/scripts/server_handlers/global.gd b/source/assets/scripts/server_handlers/global.gd index 61ac3c4..eab2238 100644 --- a/source/assets/scripts/server_handlers/global.gd +++ b/source/assets/scripts/server_handlers/global.gd @@ -16,19 +16,19 @@ var clientPhase = { "0": { "phase_id": 0, "phase_name": "Movement phase", - "length": 2, + "length": 15, "start_time": null }, "1": { "phase_id": 1, "phase_name": "Weapon adjustment phase", - "length": 2, + "length": 20, "start_time": null }, "2": { "phase_id": 2, "phase_name": "Bullet simulation phase", - "length": 2, + "length": 5, "start_time": null }, "3": { diff --git a/source/assets/scripts/server_handlers/trinity_site_level.gd b/source/assets/scripts/server_handlers/trinity_site_level.gd index e429484..38314ac 100644 --- a/source/assets/scripts/server_handlers/trinity_site_level.gd +++ b/source/assets/scripts/server_handlers/trinity_site_level.gd @@ -15,7 +15,6 @@ func _ready() -> void: if get_tree().is_network_server(): setup_player_positions() Global.start_game(true) - Global.mode = 2 func setup_player_positions() -> void: @@ -36,6 +35,11 @@ func _player_disconnected(id) -> void: func _process(_delta): + if Global.get_current_phase()["active"] != null and Global.get_current_phase()["active"]["start_time"] != null: + if Global.get_current_phase()["active"]["length"] - abs(OS.get_time()["second"] - Global.get_current_phase()["active"]["start_time"]["second"]) < 10: + $controls/timer/time.text = "00:0"+str(Global.get_current_phase()["active"]["length"] - abs(OS.get_time()["second"] - Global.get_current_phase()["active"]["start_time"]["second"])) + else: + $controls/timer/time.text = "00:"+str(Global.get_current_phase()["active"]["length"] - abs(OS.get_time()["second"] - Global.get_current_phase()["active"]["start_time"]["second"])) globalActivePhase = Global.get_current_phase() if globalActivePhase["active"] != null: phase.text = str(globalActivePhase["active"]["phase_name"])