From 076bf2c7bedc0dba1d6b429a484773a166bba6ed Mon Sep 17 00:00:00 2001 From: sapient_cogbag Date: Mon, 13 Apr 2020 13:52:25 +0100 Subject: [PATCH] Done the thing to eliminate conflicts with frame movement NYAAA. i am extremely tired and will probably go sleep soon ^.^ nyaaa <3 --- Scripts/CameraMovement.gd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Scripts/CameraMovement.gd b/Scripts/CameraMovement.gd index a5e3df2..f029b3e 100644 --- a/Scripts/CameraMovement.gd +++ b/Scripts/CameraMovement.gd @@ -22,8 +22,12 @@ func dir_move_zoom_multiplier(press_time : float) -> float: return Global.high_speed_move_rate elif Input.is_key_pressed(KEY_SHIFT): return Global.medium_speed_move_rate - else: + elif !Input.is_key_pressed(KEY_CONTROL): + # control + right/left is used to move frames so + # we do this check to ensure that there is no conflict return Global.low_speed_move_rate + else: + return 0.0 func reset_dir_move_time(direction) -> void: Global.key_move_press_time[direction] = 0.0