diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-06-29 18:28:59 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-29 18:28:59 +0200 |
| commit | 9466b01cca5f692f444d79b42f2185b9f88c4807 (patch) | |
| tree | 0fc09641f519219ea497006a50e90f1714a91c0a | |
| parent | 1bbe8ea4fa29d7921b5f60cdde2a8d917d87b26f (diff) | |
| parent | 0c35e9b8870ae9d10878771fd15eab3c7f6adf8b (diff) | |
| download | hurrycurry-9466b01cca5f692f444d79b42f2185b9f88c4807.tar hurrycurry-9466b01cca5f692f444d79b42f2185b9f88c4807.tar.bz2 hurrycurry-9466b01cca5f692f444d79b42f2185b9f88c4807.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
| -rw-r--r-- | client/map/tiles/sink.gd | 11 | ||||
| -rw-r--r-- | client/map/tiles/sink.tscn | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/client/map/tiles/sink.gd b/client/map/tiles/sink.gd index f6213eb5..013742e8 100644 --- a/client/map/tiles/sink.gd +++ b/client/map/tiles/sink.gd @@ -31,8 +31,17 @@ func _init(rename: String, neighbors: Array): func progress(p: float, warn: bool): super(p, warn) - bubbles.start() + if item is Plate: + bubbles.start() func finish(warn: bool): super(warn) bubbles.stop() + +func set_item(i: Item): + super(i) + self.bubbles.stop() + +func take_item() -> Item: + self.bubbles.stop() + return super() diff --git a/client/map/tiles/sink.tscn b/client/map/tiles/sink.tscn index 7a42e011..887a6a86 100644 --- a/client/map/tiles/sink.tscn +++ b/client/map/tiles/sink.tscn @@ -8,11 +8,3 @@ transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) mesh = ExtResource("1_w6v3o") skeleton = NodePath("") - -[node name="SinkBubbles" type="Node3D" parent="."] - -[node name="Stream" type="CPUParticles3D" parent="SinkBubbles"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, -0.05) - -[node name="Bubbles" type="CPUParticles3D" parent="SinkBubbles"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) |