diff options
Diffstat (limited to 'client/player/controllable_player.gd')
| -rw-r--r-- | client/player/controllable_player.gd | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 6e922983..65b225aa 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -24,7 +24,7 @@ const BOOST_FACTOR = 2.5 const BOOST_DURATION = 0.3 const BOOST_RESTORE = 0.5 -var onscreen_controls = preload("res://player/onscreen_controls/controls.tscn").instantiate() +var onscreen_controls = preload ("res://player/onscreen_controls/controls.tscn").instantiate() var facing := Vector2(1, 0) var velocity_ := Vector2(0, 0) @@ -58,7 +58,7 @@ func _input(_event): chat_open = !chat_open enable_input = !enable_input -const MAX_DT = 1./50. +const MAX_DT = 1. / 50. func _process(delta): marker.position = G.interpolate(marker.position, marker_target, delta * 30.) while delta > 0.001: @@ -68,7 +68,7 @@ func _process(delta): super(delta) func _process_movement(delta): - var input = Input.get_vector("left", "right", "forward", "backwards") if enable_input else Vector2.ZERO + var input = Input.get_vector("left", "right", "forward", "backwards") if not game.menu.covered else Vector2.ZERO var boost = Input.is_action_pressed("boost") or (Global.get_setting("latch_boost") and boosting) input = input.rotated( - game.camera.angle_target) if Input.is_action_pressed("interact") or Input.is_action_just_released("interact"): @@ -88,7 +88,7 @@ func _process_movement(delta): position_anim = position_ rotation_anim = rotation_ -func update(dt: float,boost: bool): +func update(dt: float, boost: bool): direction = direction.limit_length(1.); if direction.length() > 0.1: self.facing = direction + (self.facing - direction) * exp( - dt * 10.) @@ -152,8 +152,7 @@ func take_item(tile: Tile): Input.start_joy_vibration(0, 0.1, 0.0, 0.075) func interact(): - if not enable_input: - return + if game.menu.covered: return var tile = game.map.get_tile_instance(target) if tile != null: marker.set_interactive(game.get_tile_interactive(target)) @@ -168,6 +167,3 @@ func interact(): marker.set_interacting(false) else: marker.visible = false - -func set_input_enabled(b: bool): - enable_input = b |