diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-08-17 15:52:28 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-08-17 15:52:28 +0200 |
| commit | d0ab45df0d87aefdcf5afd70e80eebf697d9cf0e (patch) | |
| tree | e12ec7927430b472eae6a7a0e55d167d7594faf8 /client/map/items/item.gd | |
| parent | 708cbe2c92b2de53333a293ad4e8b6ba500793d3 (diff) | |
| parent | de807e8cd2186286e235808ec1fc1f753e7748f4 (diff) | |
| download | hurrycurry-d0ab45df0d87aefdcf5afd70e80eebf697d9cf0e.tar hurrycurry-d0ab45df0d87aefdcf5afd70e80eebf697d9cf0e.tar.bz2 hurrycurry-d0ab45df0d87aefdcf5afd70e80eebf697d9cf0e.tar.zst | |
Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry
Diffstat (limited to 'client/map/items/item.gd')
| -rw-r--r-- | client/map/items/item.gd | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/map/items/item.gd b/client/map/items/item.gd index fc10dbee..2d046700 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -44,9 +44,11 @@ func _ready(): position = owned_by.global_position func _process(delta): - var ispeed = 30.0 if owned_by.get_parent().get_parent() is Player else 10. + var p = owned_by.get_parent().get_parent() is Player + var ispeed = 30.0 if p else 10. position = G.interpolate(position, owned_by.global_position, delta * ispeed) - rotation.y = G.interpolate_angle(rotation.y, owned_by.global_rotation.y, delta * ispeed) + if p: rotation.y = G.interpolate_angle(rotation.y, owned_by.global_rotation.y, delta * ispeed) + else: rotation.y = G.interpolate_angle_closest_quarter(rotation.y, owned_by.global_rotation.y, delta * ispeed) func progress(p: float, warn: bool): progress_instance.visible = true |