diff options
Diffstat (limited to 'client/player')
| -rw-r--r-- | client/player/controllable_player.gd | 4 | ||||
| -rw-r--r-- | client/player/player.gd | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 3a245e1a..9db36ad4 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -60,12 +60,12 @@ func _ready(): const MAX_DT = 1. / 50. func _process(delta): + super(delta) marker.position = G.interpolate(marker.position, marker_target, delta * 30.) while delta > 0.001: var dt = min(delta, MAX_DT) _process_movement(dt) delta -= dt - super(delta) update_touch_scrolls() var moving_duration = 0 @@ -82,7 +82,7 @@ func _process_movement(delta): input = input.rotated(input_rotation) var boost = Input.is_action_pressed("boost") or (Global.get_setting("gameplay.latch_boost") and boosting) - # + if Input.is_action_pressed("interact") or Input.is_action_just_released("interact"): input *= 0 else: diff --git a/client/player/player.gd b/client/player/player.gd index 84b40789..c314dad2 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -78,6 +78,8 @@ func _init(_id: int, new_name: String, pos: Vector2, new_character_idx: int, new character_idx = new_character_idx is_customer = character_idx < 0 + movement_base.scale = Vector3.ONE * 0.0001 + func _ready(): character.set_style(character_idx) clear_timer.timeout.connect(clear_message) @@ -98,7 +100,7 @@ func set_item(i: Item): if hand != null: hand.remove() if i != null: @warning_ignore("static_called_on_instance") - hand_base_position = DEFAULT_HAND_BASE_POSITION - Vector3(0., i.height() * 0.5, 0.) + hand_base_position = DEFAULT_HAND_BASE_POSITION - Vector3(0.,i.height() * 0.5, 0.) character.holding = i != null hand = i if hand != null: hand.owned_by = hand_base @@ -145,6 +147,7 @@ func _process(delta): character.walking = walking character.boosting = boosting walking = false + movement_base.scale = Vector3.ONE * G.interpolate(movement_base.scale.x, 1, delta * 8) func clear_message(): item_bubble.remove_item() |