diff options
| author | tpart <tpart120@proton.me> | 2024-09-04 21:14:33 +0200 |
|---|---|---|
| committer | tpart <tpart120@proton.me> | 2024-09-04 21:14:33 +0200 |
| commit | fc63ac8ce0b6757e4b61a633f93f4f4c27fd7e03 (patch) | |
| tree | 353cbf03272028ad5d63c15d6182ea1e67b48806 | |
| parent | 9c953125445760dbf5c0562854caaa0d1866fda9 (diff) | |
| download | hurrycurry-fc63ac8ce0b6757e4b61a633f93f4f4c27fd7e03.tar hurrycurry-fc63ac8ce0b6757e4b61a633f93f4f4c27fd7e03.tar.bz2 hurrycurry-fc63ac8ce0b6757e4b61a633f93f4f4c27fd7e03.tar.zst | |
Fix crash on item finished; Clean up code; Update knife model
| -rw-r--r-- | client/game.gd | 8 | ||||
| -rw-r--r-- | client/map/items/item.gd | 2 | ||||
| -rw-r--r-- | client/map/tiles/knife.res | bin | 5530 -> 5546 bytes | |||
| -rw-r--r-- | client/map/tiles/tile.gd | 4 | ||||
| -rw-r--r-- | client/multiplayer.gd | 5 | ||||
| -rw-r--r-- | client/player/player.gd | 4 |
6 files changed, 11 insertions, 12 deletions
diff --git a/client/game.gd b/client/game.gd index a3bef461..d764e6af 100644 --- a/client/game.gd +++ b/client/game.gd @@ -201,9 +201,9 @@ func _ready(): t.progress(position_, speed, warn) ) - mp.set_tile_finished.connect(func(tile: Vector2i, warn: bool): + mp.set_tile_finished.connect(func(tile: Vector2i): var t: Tile = map.get_tile_instance(tile) - t.finish(warn) + t.finish() ) mp.set_player_progress.connect(func(player: int, position_: float, speed: float, warn: bool): @@ -211,9 +211,9 @@ func _ready(): p.progress(position_, speed, warn) ) - mp.set_player_finished.connect(func(player: int, warn: bool): + mp.set_player_finished.connect(func(player: int): var p: Player = players[player] - p.finish(warn) + p.finish() ) mp.text_message.connect(func(player: int, text: String, timeout_initial: float, timeout_remaining: float): diff --git a/client/map/items/item.gd b/client/map/items/item.gd index e67edcca..11914eef 100644 --- a/client/map/items/item.gd +++ b/client/map/items/item.gd @@ -58,7 +58,7 @@ func progress(position_: float, speed: float, warn: bool): # if p >= 1.: # finish(warn) -func finish(_warn: bool): +func finish(): progress_instance.visible = false func setup_sounds(): diff --git a/client/map/tiles/knife.res b/client/map/tiles/knife.res Binary files differindex 77e95cc7..622d9eb3 100644 --- a/client/map/tiles/knife.res +++ b/client/map/tiles/knife.res diff --git a/client/map/tiles/tile.gd b/client/map/tiles/tile.gd index 4075593d..be78883e 100644 --- a/client/map/tiles/tile.gd +++ b/client/map/tiles/tile.gd @@ -61,9 +61,9 @@ func progress(position_: float, speed: float, warn: bool): if item != null: item.progress(position_, speed, warn) -func finish(warn: bool): +func finish(): if item != null: - item.finish(warn) + item.finish() func put_item(i: Item): if item != null: diff --git a/client/multiplayer.gd b/client/multiplayer.gd index e4af88f2..d42e500b 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -174,14 +174,13 @@ func handle_packet(bytes: PackedByteArray): set_player_progress.emit(player, position, speed, warn) "clear_progress": var item: Dictionary = decoded["item"] - var warn: bool = decoded["warn"] var tile = item.get("tile") var player = item.get("player") if tile != null: - set_tile_finished.emit(pos_to_vec2i(tile), warn) + set_tile_finished.emit(pos_to_vec2i(tile)) else: - set_player_finished.emit(player, warn) + set_player_finished.emit(player) "set_tile_item": push_warning("set_tile_item is deprecated") var tile = pos_to_vec2i(decoded["tile"]) diff --git a/client/player/player.gd b/client/player/player.gd index 17db85a9..d5837d47 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -111,9 +111,9 @@ func progress(position__: float, speed: float, warn: bool): if hand != null: hand.progress(position__, speed, warn) -func finish(warn: bool): +func finish(): if hand != null: - hand.finish(warn) + hand.finish() func take_item(tile: Tile): if hand != null: |