diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-09-27 20:14:33 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-09-27 20:14:39 +0200 |
| commit | df2b0841d27034629ae00f55c98d0cbc40011d7a (patch) | |
| tree | ad3655431664ae6eaf5eadec4a1abe7a849a34f6 /client | |
| parent | ee2753c627a3cf8971a4bd99d8ef86ad1567dec0 (diff) | |
| download | hurrycurry-df2b0841d27034629ae00f55c98d0cbc40011d7a.tar hurrycurry-df2b0841d27034629ae00f55c98d0cbc40011d7a.tar.bz2 hurrycurry-df2b0841d27034629ae00f55c98d0cbc40011d7a.tar.zst | |
set initial item position when spawning in han, fix #149
Diffstat (limited to 'client')
| -rw-r--r-- | client/game.gd | 1 | ||||
| -rw-r--r-- | client/map/items/item.gd | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/client/game.gd b/client/game.gd index a296706d..c3b34332 100644 --- a/client/game.gd +++ b/client/game.gd @@ -168,6 +168,7 @@ func handle_packet(p): else: var pl: Player = players[p.location.player] var i = ItemFactory.produce(item_names[p.item], pl.hand_base) + i.position = pl.hand_base.global_position add_child(i) i.name = item_names[p.item] pl.set_item(i) diff --git a/client/map/items/item.gd b/client/map/items/item.gd index 088e0364..2d801096 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -53,7 +53,7 @@ func _process(delta): if owned_by.get_parent() is Item or owned_by is Item: return var player_owned = owned_by.get_parent().get_parent() is Player player_owned_timer = player_owned_timer + delta if player_owned else 0. - var anim_speed = 10.0 * exp(player_owned_timer * 3.0) + var anim_speed = 10.0 * exp(player_owned_timer * 3.0) # infinity is fine. G.interpolate can handle it position = G.interpolate(position, owned_by.global_position, delta * anim_speed) if player_owned: rotation.y = G.interpolate_angle(rotation.y, owned_by.global_rotation.y, delta * anim_speed) else: rotation.y = G.interpolate_angle_closest_quarter(rotation.y, owned_by.global_rotation.y, delta * anim_speed) |