diff options
author | metamuffin <metamuffin@disroot.org> | 2024-07-11 17:17:38 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-07-11 17:17:38 +0200 |
commit | 5c722e926f04f7d81dcb235d11dda3eff1545f76 (patch) | |
tree | aea0c1f5a344e37b625f755eabded59179bf1b88 /client/map | |
parent | 2537e764a359328870c3eabb16ee5238becd3c73 (diff) | |
download | hurrycurry-5c722e926f04f7d81dcb235d11dda3eff1545f76.tar hurrycurry-5c722e926f04f7d81dcb235d11dda3eff1545f76.tar.bz2 hurrycurry-5c722e926f04f7d81dcb235d11dda3eff1545f76.tar.zst |
slower anim of non-player owned items and fix static call to interpolation functions.
Diffstat (limited to 'client/map')
-rw-r--r-- | client/map/items/item.gd | 3 | ||||
-rw-r--r-- | client/map/tiles/conveyor_model.gd | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/map/items/item.gd b/client/map/items/item.gd index 466348fe..a42edc39 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -44,7 +44,8 @@ func _ready(): position = owned_by.global_position func _process(delta): - position = Global.interpolate(position, owned_by.global_position, delta * 30.0) + var ispeed = 30.0 if owned_by.get_parent().get_parent() is Player else 10. + position = G.interpolate(position, owned_by.global_position, delta * ispeed) func progress(p: float, warn: bool): progress_instance.visible = true diff --git a/client/map/tiles/conveyor_model.gd b/client/map/tiles/conveyor_model.gd index 7dd48957..66706ddd 100644 --- a/client/map/tiles/conveyor_model.gd +++ b/client/map/tiles/conveyor_model.gd @@ -6,7 +6,7 @@ var alpha: float = 0. @onready var mat: ShaderMaterial = $ConveyorDirection.get_active_material(0) func _process(delta): - alpha = Global.interpolate(alpha, 0., delta) + alpha = G.interpolate(alpha, 0., delta) mat.set_shader_parameter("alpha_fac", alpha) func to_direction(direction: Vector2): |