aboutsummaryrefslogtreecommitdiff
path: root/client/game.gd
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-12-25 19:37:20 +0100
committermetamuffin <metamuffin@disroot.org>2024-12-25 20:01:43 +0100
commit4083df5cfe76e42506c5356cf23d3dc9f3b6e6bf (patch)
tree5ec12de003c38f0891c215721593c7ea49ff2c16 /client/game.gd
parent15be00667282a253fb438fec9d6347f5af89d9a0 (diff)
downloadhurrycurry-4083df5cfe76e42506c5356cf23d3dc9f3b6e6bf.tar
hurrycurry-4083df5cfe76e42506c5356cf23d3dc9f3b6e6bf.tar.bz2
hurrycurry-4083df5cfe76e42506c5356cf23d3dc9f3b6e6bf.tar.zst
variable hand count
Diffstat (limited to 'client/game.gd')
-rw-r--r--client/game.gd14
1 files changed, 7 insertions, 7 deletions
diff --git a/client/game.gd b/client/game.gd
index 9a6b8808..9502d2fc 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -144,13 +144,13 @@ func handle_packet(p):
player_instance.position_ = last_position
"move_item":
if "player" in p.from and "player" in p.to:
- players[p.from.player[0]].pass_to(players[p.to.player[0]], p.from.player[1], p.to.player[1])
+ players[p.from.player[0]].pass_to(players[p.to.player[0]], int(p.from.player[1]), int(p.to.player[1]))
elif "tile" in p.from and "player" in p.to:
var t: Tile = map.get_tile_instance(p.from.tile)
- players[p.to.player[0]].take_item(t, p.to.player[1])
+ players[p.to.player[0]].take_item(t, int(p.to.player[1]))
elif "player" in p.from and "tile" in p.to:
var t: Tile = map.get_tile_instance(p.to.tile)
- players[p.from.player[0]].put_item(t, p.from.player[1])
+ players[p.from.player[0]].put_item(t, int(p.from.player[1]))
elif "tile" in p.from and "tile" in p.to:
var from_tile2: Tile = map.get_tile_instance(p.from.tile)
var to_tile2: Tile = map.get_tile_instance(p.to.tile)
@@ -160,13 +160,13 @@ func handle_packet(p):
var t: Tile = map.get_tile_instance(p.item.tile)
t.progress(p.position, p.speed, p.warn, players.get(p.player))
else:
- players[p.item.player[0]].progress(p.position, p.speed, p.warn, p.item.player[1])
+ players[p.item.player[0]].progress(p.position, p.speed, p.warn, int(p.item.player[1]))
"clear_progress":
if "tile" in p.item:
var t: Tile = map.get_tile_instance(p.item.tile)
t.finish()
else:
- players[p.item.player[0]].finish(p.item.player[1])
+ players[p.item.player[0]].finish(int(p.item.player[1]))
"set_item":
var location: Dictionary = p["location"]
if p.item != null:
@@ -180,8 +180,8 @@ func handle_packet(p):
else:
var pl: Player = players[p.location.player[0]]
var h = p.location.player[1]
- var i = ItemFactory.produce(item_names[p.item], pl.hand_base[G.hand_to_index(h)])
- i.position = pl.hand_base[G.hand_to_index(h)].global_position
+ var i = ItemFactory.produce(item_names[p.item], pl.hand_base[h])
+ i.position = pl.hand_base[h].global_position
add_child(i)
i.name = item_names[p.item]
pl.set_item(i, h)