aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authornokoe <nokoe@mailbox.org>2025-12-13 20:57:51 +0100
committernokoe <nokoe@mailbox.org>2025-12-13 20:57:51 +0100
commitc01289d4c42e4fc24399401e45042a474feb8620 (patch)
tree1b1a108f3ad0f4769f56ed8110b8e0c36f822009 /client
parent5db2fe76d9032b1915bea9643f5df8cbacd35408 (diff)
downloadhurrycurry-c01289d4c42e4fc24399401e45042a474feb8620.tar
hurrycurry-c01289d4c42e4fc24399401e45042a474feb8620.tar.bz2
hurrycurry-c01289d4c42e4fc24399401e45042a474feb8620.tar.zst
items in crate as tile variant
Diffstat (limited to 'client')
-rw-r--r--client/map/items/lettuce_crate.gd21
-rw-r--r--client/map/items/lettuce_crate.gd.uid1
-rw-r--r--client/map/tile_factory.gd59
-rw-r--r--client/map/tiles/bun_crate.gd21
-rw-r--r--client/map/tiles/bun_crate.gd.uid1
-rw-r--r--client/map/tiles/cheese_crate.gd21
-rw-r--r--client/map/tiles/cheese_crate.gd.uid1
-rw-r--r--client/map/tiles/coconut_crate.gd21
-rw-r--r--client/map/tiles/coconut_crate.gd.uid1
-rw-r--r--client/map/tiles/crate.gd31
-rw-r--r--client/map/tiles/cutting_board.gd7
-rw-r--r--client/map/tiles/fish_crate.gd21
-rw-r--r--client/map/tiles/fish_crate.gd.uid1
-rw-r--r--client/map/tiles/flour_crate.gd21
-rw-r--r--client/map/tiles/flour_crate.gd.uid1
-rw-r--r--client/map/tiles/leek_crate.gd21
-rw-r--r--client/map/tiles/leek_crate.gd.uid1
-rw-r--r--client/map/tiles/mushroom_crate.gd21
-rw-r--r--client/map/tiles/mushroom_crate.gd.uid1
-rw-r--r--client/map/tiles/noodles_crate.gd21
-rw-r--r--client/map/tiles/noodles_crate.gd.uid1
-rw-r--r--client/map/tiles/potato_crate.gd21
-rw-r--r--client/map/tiles/potato_crate.gd.uid1
-rw-r--r--client/map/tiles/rice_crate.gd21
-rw-r--r--client/map/tiles/rice_crate.gd.uid1
-rw-r--r--client/map/tiles/rolling_board.gd6
-rw-r--r--client/map/tiles/rolling_board.tscn2
-rw-r--r--client/map/tiles/steak_crate.gd21
-rw-r--r--client/map/tiles/steak_crate.gd.uid1
-rw-r--r--client/map/tiles/strawberry_crate.gd21
-rw-r--r--client/map/tiles/strawberry_crate.gd.uid1
-rw-r--r--client/map/tiles/tomato_crate.gd21
-rw-r--r--client/map/tiles/tomato_crate.gd.uid1
33 files changed, 83 insertions, 330 deletions
diff --git a/client/map/items/lettuce_crate.gd b/client/map/items/lettuce_crate.gd
deleted file mode 100644
index 2a0ff5a5..00000000
--- a/client/map/items/lettuce_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name LettuceCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/lettuce_crate.tscn").instantiate())
diff --git a/client/map/items/lettuce_crate.gd.uid b/client/map/items/lettuce_crate.gd.uid
deleted file mode 100644
index d206a1e3..00000000
--- a/client/map/items/lettuce_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b3oxc5pyij02s
diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd
index 4cfbb724..f3fddfe7 100644
--- a/client/map/tile_factory.gd
+++ b/client/map/tile_factory.gd
@@ -87,20 +87,51 @@ func produce(raw_name: String, position: Vector2i, neighbors: Array) -> Tile:
"house-roof": return HouseRoof.new(ctx)
"house-roof-chimney": return HouseRoofChimney.new(ctx)
- "bun-crate": return BunCrate.new(ctx)
- "cheese-crate": return CheeseCrate.new(ctx)
- "coconut-crate": return CoconutCrate.new(ctx)
- "fish-crate": return FishCrate.new(ctx)
- "flour-crate": return FlourCrate.new(ctx)
- "leek-crate": return LeekCrate.new(ctx)
- "lettuce-crate": return LettuceCrate.new(ctx)
- "mushroom-crate": return MushroomCrate.new(ctx)
- "noodles-crate": return NoodlesCrate.new(ctx)
- "steak-crate": return SteakCrate.new(ctx)
- "rice-crate": return RiceCrate.new(ctx)
- "strawberry-crate": return StrawberryCrate.new(ctx)
- "tomato-crate": return TomatoCrate.new(ctx)
- "potato-crate": return PotatoCrate.new(ctx)
+ "crate": return Crate.new(ctx)
+
+ # TODO: update maps to use "crate:..."
+ "bun-crate":
+ ctx.tile_name.variant = "bun"
+ return Crate.new(ctx)
+ "cheese-crate":
+ ctx.tile_name.variant = "cheese"
+ return Crate.new(ctx)
+ "coconut-crate":
+ ctx.tile_name.variant = "coconut"
+ return Crate.new(ctx)
+ "fish-crate":
+ ctx.tile_name.variant = "fish"
+ return Crate.new(ctx)
+ "flour-crate":
+ ctx.tile_name.variant = "flour"
+ return Crate.new(ctx)
+ "leek-crate":
+ ctx.tile_name.variant = "leek"
+ return Crate.new(ctx)
+ "lettuce-crate":
+ ctx.tile_name.variant = "lettuce"
+ return Crate.new(ctx)
+ "mushroom-crate":
+ ctx.tile_name.variant = "mushroom"
+ return Crate.new(ctx)
+ "noodles-crate":
+ ctx.tile_name.variant = "noodles"
+ return Crate.new(ctx)
+ "steak-crate":
+ ctx.tile_name.variant = "steak"
+ return Crate.new(ctx)
+ "rice-crate":
+ ctx.tile_name.variant = "rice"
+ return Crate.new(ctx)
+ "strawberry-crate":
+ ctx.tile_name.variant = "strawberry"
+ return Crate.new(ctx)
+ "tomato-crate":
+ ctx.tile_name.variant = "tomato"
+ return Crate.new(ctx)
+ "potato-crate":
+ ctx.tile_name.variant = "potato"
+ return Crate.new(ctx)
var t:
push_warning("tile %s unknown" % t)
diff --git a/client/map/tiles/bun_crate.gd b/client/map/tiles/bun_crate.gd
deleted file mode 100644
index 10a69aa8..00000000
--- a/client/map/tiles/bun_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name BunCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/bun_crate.tscn").instantiate())
diff --git a/client/map/tiles/bun_crate.gd.uid b/client/map/tiles/bun_crate.gd.uid
deleted file mode 100644
index 508d423c..00000000
--- a/client/map/tiles/bun_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://db7xuasfi403l
diff --git a/client/map/tiles/cheese_crate.gd b/client/map/tiles/cheese_crate.gd
deleted file mode 100644
index 2965b8c0..00000000
--- a/client/map/tiles/cheese_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name CheeseCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/cheese_crate.tscn").instantiate())
diff --git a/client/map/tiles/cheese_crate.gd.uid b/client/map/tiles/cheese_crate.gd.uid
deleted file mode 100644
index 36a6ceb9..00000000
--- a/client/map/tiles/cheese_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://pwmpgyk3prdi
diff --git a/client/map/tiles/coconut_crate.gd b/client/map/tiles/coconut_crate.gd
deleted file mode 100644
index 34c41f18..00000000
--- a/client/map/tiles/coconut_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name CoconutCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/coconut_crate.tscn").instantiate())
diff --git a/client/map/tiles/coconut_crate.gd.uid b/client/map/tiles/coconut_crate.gd.uid
deleted file mode 100644
index 82cbfa8f..00000000
--- a/client/map/tiles/coconut_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://d2m7s35j2lyeb
diff --git a/client/map/tiles/crate.gd b/client/map/tiles/crate.gd
index a952c2e8..fb0623b3 100644
--- a/client/map/tiles/crate.gd
+++ b/client/map/tiles/crate.gd
@@ -21,3 +21,34 @@ static func interact_target() -> Vector3:
func _init(ctx: TileFactory.TileCC):
super(ctx)
+ match ctx.tile_name.variant:
+ "bun":
+ base.add_child(load("res://map/tiles/bun_crate.tscn").instantiate())
+ "cheese":
+ base.add_child(load("res://map/tiles/cheese_crate.tscn").instantiate())
+ "coconut":
+ base.add_child(load("res://map/tiles/coconut_crate.tscn").instantiate())
+ "fish":
+ base.add_child(load("res://map/tiles/fish_crate.tscn").instantiate())
+ "flour":
+ base.add_child(load("res://map/tiles/flour_crate.tscn").instantiate())
+ "leek":
+ base.add_child(load("res://map/tiles/leek_crate.tscn").instantiate())
+ "lettuce":
+ base.add_child(load("res://map/tiles/lettuce_crate.tscn").instantiate())
+ "mushroom":
+ base.add_child(load("res://map/tiles/mushroom_crate.tscn").instantiate())
+ "noodles":
+ base.add_child(load("res://map/tiles/noodles_crate.tscn").instantiate())
+ "potato":
+ base.add_child(load("res://map/tiles/potato_crate.tscn").instantiate())
+ "rice":
+ base.add_child(load("res://map/tiles/rice_crate.tscn").instantiate())
+ "steak":
+ base.add_child(load("res://map/tiles/steak_crate.tscn").instantiate())
+ "strawberry":
+ base.add_child(load("res://map/tiles/strawberry_crate.tscn").instantiate())
+ "tomato":
+ base.add_child(load("res://map/tiles/tomato_crate.tscn").instantiate())
+ var _item_name:
+ pass
diff --git a/client/map/tiles/cutting_board.gd b/client/map/tiles/cutting_board.gd
index c2c54ae1..4bc6608f 100644
--- a/client/map/tiles/cutting_board.gd
+++ b/client/map/tiles/cutting_board.gd
@@ -16,18 +16,17 @@
class_name CuttingBoard
extends CounterBase
-var board = preload("res://map/tiles/cutting_board.tscn")
var chopping: AudioStreamPlayer3D = AudioStreamPlayer3D.new()
var acting_players: Array[Player] = []
func _init(ctx: TileFactory.TileCC):
- super(ctx, board)
+ super(ctx, preload("res://map/tiles/cutting_board.tscn"))
chopping.stream = preload("res://map/tiles/sounds/chop.ogg")
add_child(chopping)
func progress(position_: float, speed: float, warn: bool, acting_players_: Array[Player]):
super(position_, speed, warn, acting_players)
- var knife: Node3D = board.get_node("Knife")
+ var knife: Node3D = base.get_node("CuttingBoard").get_node("Knife")
if speed != 0.:
if not chopping.playing: chopping.play()
@@ -50,7 +49,7 @@ func finish():
acting_players = acting_players.filter(is_instance_valid) # Some players might have disconnected
for p: Player in acting_players:
p.character.cutting = false
- board.get_node("Knife").visible = true
+ base.get_node("CuttingBoard").get_node("Knife").visible = true
chopping.stop()
static func interact_target() -> Vector3:
diff --git a/client/map/tiles/fish_crate.gd b/client/map/tiles/fish_crate.gd
deleted file mode 100644
index 76859159..00000000
--- a/client/map/tiles/fish_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name FishCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/fish_crate.tscn").instantiate())
diff --git a/client/map/tiles/fish_crate.gd.uid b/client/map/tiles/fish_crate.gd.uid
deleted file mode 100644
index 2974ccf5..00000000
--- a/client/map/tiles/fish_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://c346hqdpfl3df
diff --git a/client/map/tiles/flour_crate.gd b/client/map/tiles/flour_crate.gd
deleted file mode 100644
index a8fd5386..00000000
--- a/client/map/tiles/flour_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name FlourCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/flour_crate.tscn").instantiate())
diff --git a/client/map/tiles/flour_crate.gd.uid b/client/map/tiles/flour_crate.gd.uid
deleted file mode 100644
index 9dd3f3de..00000000
--- a/client/map/tiles/flour_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://fangsumpqnoy
diff --git a/client/map/tiles/leek_crate.gd b/client/map/tiles/leek_crate.gd
deleted file mode 100644
index b90f6602..00000000
--- a/client/map/tiles/leek_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name LeekCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/leek_crate.tscn").instantiate())
diff --git a/client/map/tiles/leek_crate.gd.uid b/client/map/tiles/leek_crate.gd.uid
deleted file mode 100644
index 8366b070..00000000
--- a/client/map/tiles/leek_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://fmpnrlya8too
diff --git a/client/map/tiles/mushroom_crate.gd b/client/map/tiles/mushroom_crate.gd
deleted file mode 100644
index de59b8f5..00000000
--- a/client/map/tiles/mushroom_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name MushroomCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/mushroom_crate.tscn").instantiate())
diff --git a/client/map/tiles/mushroom_crate.gd.uid b/client/map/tiles/mushroom_crate.gd.uid
deleted file mode 100644
index b0c54434..00000000
--- a/client/map/tiles/mushroom_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://by0dud130fog6
diff --git a/client/map/tiles/noodles_crate.gd b/client/map/tiles/noodles_crate.gd
deleted file mode 100644
index 2c514cc1..00000000
--- a/client/map/tiles/noodles_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name NoodlesCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/noodles_crate.tscn").instantiate())
diff --git a/client/map/tiles/noodles_crate.gd.uid b/client/map/tiles/noodles_crate.gd.uid
deleted file mode 100644
index 8c4c0454..00000000
--- a/client/map/tiles/noodles_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://c11foa16l6hj6
diff --git a/client/map/tiles/potato_crate.gd b/client/map/tiles/potato_crate.gd
deleted file mode 100644
index d5fdd8e9..00000000
--- a/client/map/tiles/potato_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name PotatoCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/potato_crate.tscn").instantiate())
diff --git a/client/map/tiles/potato_crate.gd.uid b/client/map/tiles/potato_crate.gd.uid
deleted file mode 100644
index cf021ee9..00000000
--- a/client/map/tiles/potato_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://tyivqc0wc6mi
diff --git a/client/map/tiles/rice_crate.gd b/client/map/tiles/rice_crate.gd
deleted file mode 100644
index 456a18f7..00000000
--- a/client/map/tiles/rice_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name RiceCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/rice_crate.tscn").instantiate())
diff --git a/client/map/tiles/rice_crate.gd.uid b/client/map/tiles/rice_crate.gd.uid
deleted file mode 100644
index c1e454e7..00000000
--- a/client/map/tiles/rice_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://b51bickm0rq1y
diff --git a/client/map/tiles/rolling_board.gd b/client/map/tiles/rolling_board.gd
index ececee8b..f9477de8 100644
--- a/client/map/tiles/rolling_board.gd
+++ b/client/map/tiles/rolling_board.gd
@@ -16,7 +16,7 @@
class_name RollingBoard
extends CounterBase
-var board = load("res://map/tiles/rolling_board.tscn").instantiate()
+var board = load("res://map/tiles/rolling_board.tscn")
var rolling: AudioStreamPlayer3D = AudioStreamPlayer3D.new()
var acting_players: Array[Player]
@@ -28,7 +28,7 @@ func _init(ctx: TileFactory.TileCC):
func progress(position_: float, speed: float, warn: bool, acting_players_: Array[Player]):
super(position_, speed, warn, acting_players_)
- var pin: Node3D = board.get_node("RollingPin")
+ var pin: Node3D = base.get_node("RollingBoard").get_node("RollingPin")
if speed != 0.:
if not rolling.playing: rolling.play()
@@ -51,7 +51,7 @@ func finish():
acting_players = acting_players.filter(is_instance_valid) # Some players might have disconnected
for p: Player in acting_players:
p.character.rolling = false
- board.get_node("RollingPin").visible = true
+ base.get_node("RollingBoard").get_node("RollingPin").visible = true
rolling.stop()
static func interact_target() -> Vector3:
diff --git a/client/map/tiles/rolling_board.tscn b/client/map/tiles/rolling_board.tscn
index ecf1c036..caba4d5c 100644
--- a/client/map/tiles/rolling_board.tscn
+++ b/client/map/tiles/rolling_board.tscn
@@ -3,7 +3,7 @@
[ext_resource type="ArrayMesh" uid="uid://dd4g04lgvsly5" path="res://map/tiles/cutting_board.res" id="1_cuxby"]
[ext_resource type="PackedScene" uid="uid://c8t04dfp45a86" path="res://map/tiles/rolling_pin.tscn" id="2_cuxby"]
-[node name="CuttingBoard" type="Node3D"]
+[node name="RollingBoard" type="Node3D"]
[node name="Mesh" type="MeshInstance3D" parent="."]
transform = Transform3D(0.4, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -0.075, 0.5, 0)
diff --git a/client/map/tiles/steak_crate.gd b/client/map/tiles/steak_crate.gd
deleted file mode 100644
index df3d8154..00000000
--- a/client/map/tiles/steak_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name SteakCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/steak_crate.tscn").instantiate())
diff --git a/client/map/tiles/steak_crate.gd.uid b/client/map/tiles/steak_crate.gd.uid
deleted file mode 100644
index 40de1785..00000000
--- a/client/map/tiles/steak_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://cgjeokxei2o1d
diff --git a/client/map/tiles/strawberry_crate.gd b/client/map/tiles/strawberry_crate.gd
deleted file mode 100644
index cf941df2..00000000
--- a/client/map/tiles/strawberry_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name StrawberryCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/strawberry_crate.tscn").instantiate())
diff --git a/client/map/tiles/strawberry_crate.gd.uid b/client/map/tiles/strawberry_crate.gd.uid
deleted file mode 100644
index 70f4ef4e..00000000
--- a/client/map/tiles/strawberry_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://bc8jd34nankae
diff --git a/client/map/tiles/tomato_crate.gd b/client/map/tiles/tomato_crate.gd
deleted file mode 100644
index 29b8e3a5..00000000
--- a/client/map/tiles/tomato_crate.gd
+++ /dev/null
@@ -1,21 +0,0 @@
-# Hurry Curry! - a game about cooking
-# Copyright (C) 2025 Hurry Curry! contributors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-class_name TomatoCrate
-extends Crate
-
-func _init(ctx: TileFactory.TileCC):
- super(ctx)
- base.add_child(load("res://map/tiles/tomato_crate.tscn").instantiate())
diff --git a/client/map/tiles/tomato_crate.gd.uid b/client/map/tiles/tomato_crate.gd.uid
deleted file mode 100644
index fcdce7a8..00000000
--- a/client/map/tiles/tomato_crate.gd.uid
+++ /dev/null
@@ -1 +0,0 @@
-uid://chvydto06s4qk