diff options
| author | nokoe <nokoe@mailbox.org> | 2024-06-23 00:39:49 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-23 19:31:29 +0200 |
| commit | 8709a005e81495e8c3ed2c12c1e1421e4736a258 (patch) | |
| tree | 50766b6069cfde798fd35ce62e708aea8008a4b5 /client | |
| parent | a3a4e6f2da74c9dd5231269001139071cedf5d55 (diff) | |
| download | hurrycurry-8709a005e81495e8c3ed2c12c1e1421e4736a258.tar hurrycurry-8709a005e81495e8c3ed2c12c1e1421e4736a258.tar.bz2 hurrycurry-8709a005e81495e8c3ed2c12c1e1421e4736a258.tar.zst | |
fix set_tile_item
Diffstat (limited to 'client')
| -rw-r--r-- | client/scenes/progress.tscn | 4 | ||||
| -rw-r--r-- | client/scripts/game.gd | 2 | ||||
| -rw-r--r-- | client/scripts/multiplayer.gd | 4 | ||||
| -rw-r--r-- | client/scripts/tiles/floor.gd | 5 |
4 files changed, 10 insertions, 5 deletions
diff --git a/client/scenes/progress.tscn b/client/scenes/progress.tscn index 8ac60bc6..273beb74 100644 --- a/client/scenes/progress.tscn +++ b/client/scenes/progress.tscn @@ -9,8 +9,8 @@ size = Vector2(0.75, 0.1) [sub_resource type="ShaderMaterial" id="ShaderMaterial_4k6cy"] render_priority = 0 shader = ExtResource("1_6f2a0") -shader_parameter/progress = 0.5 -shader_parameter/bad = true +shader_parameter/progress = 0.0 +shader_parameter/bad = false [node name="Progress" type="MeshInstance3D"] mesh = SubResource("QuadMesh_m0itj") diff --git a/client/scripts/game.gd b/client/scripts/game.gd index 5d127e78..2dcd9c03 100644 --- a/client/scripts/game.gd +++ b/client/scripts/game.gd @@ -44,7 +44,7 @@ func _ready(): var i = Item.new(item, t.item_base) add_child(i) i.name = Multiplayer.item_names[item] - t.put_item(i) + t.set_item(i) ) Multiplayer.connect("remove_tile_item", func(tile: Vector2i): diff --git a/client/scripts/multiplayer.gd b/client/scripts/multiplayer.gd index 18141efa..4dbce890 100644 --- a/client/scripts/multiplayer.gd +++ b/client/scripts/multiplayer.gd @@ -94,13 +94,13 @@ func handle_packet(bytes: PackedByteArray): "set_progress": var tile = pos_to_vec2i(decoded["tile"]) var warn = decoded["warn"] - if decoded.has("progress"): + if decoded.has("progress")&&decoded["progress"] != null: emit_signal("set_progress", tile, decoded["progress"], warn) else: emit_signal("set_finished", tile, warn) "set_tile_item": var tile = pos_to_vec2i(decoded["tile"]) - if decoded.has("item") && decoded["item"] != null: + if decoded.has("item")&&decoded["item"] != null: emit_signal("set_tile_item", tile, decoded["item"]) else: emit_signal("remove_tile_name", tile) diff --git a/client/scripts/tiles/floor.gd b/client/scripts/tiles/floor.gd index 380f3d6d..b596895a 100644 --- a/client/scripts/tiles/floor.gd +++ b/client/scripts/tiles/floor.gd @@ -52,6 +52,11 @@ func finish(warn: bool): func put_item(i: Item): if item != null: push_error("already holding an item") + set_item(i) + +func set_item(i: Item): + if item != null: + item.queue_free() item = i i.owned_by = item_base |