diff options
48 files changed, 37 insertions, 478 deletions
diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd index ac1a03c9..d6a460e6 100644 --- a/client/map/item_factory.gd +++ b/client/map/item_factory.gd @@ -35,36 +35,36 @@ static func produce_inner(raw_name: String, owned_by: Node3D) -> Item: match item.name: "bun": return Bun.new(owned_by) "cheese": return Cheese.new(owned_by) - "cooked-noodles": return CookedNoodles.new(owned_by) + "cooked-noodles": return GenericItem.new(owned_by, preload("res://map/items/cooked_noodles.tscn")) "sliced-cheese": return SlicedCheese.new(owned_by) - "dirt": return Dirt.new(owned_by) - "sliced-bun": return SlicedBun.new(owned_by) - "sliced-bun-top": return SlicedBunTop.new(owned_by) - "sliced-bun-bottom": return SlicedBunBottom.new(owned_by) + "dirt": return GenericItem.new(owned_by, preload("res://map/items/dirt.tscn")) + "sliced-bun": return GenericItem.new(owned_by, preload("res://map/items/sliced_bun.tscn")) + "sliced-bun-top": return GenericItem.new(owned_by, preload("res://map/items/sliced_bun_top.tscn")) + "sliced-bun-bottom": return GenericItem.new(owned_by, preload("res://map/items/sliced_bun_bottom.tscn")) "burned": return Burned.new(owned_by) - "coconut": return Coconut.new(owned_by) - "dough": return Dough.new(owned_by) - "fish": return Fish.new(owned_by) - "flour": return Flour.new(owned_by) - "leek": return Leek.new(owned_by) + "coconut": return GenericItem.new(owned_by, preload("res://map/items/coconut.tscn")) + "dough": return GenericItem.new(owned_by, preload("res://map/items/dough.tscn")) + "fish": return GenericItem.new(owned_by, preload("res://map/items/fish.tscn")) + "flour": return GenericItem.new(owned_by, preload("res://map/items/flour.tscn")) + "leek": return GenericItem.new(owned_by, preload("res://map/items/leek.tscn")) "sliced-leek": return SlicedLeek.new(owned_by) - "noodles": return Noodles.new(owned_by) - "rolled-dough": return RolledDough.new(owned_by) + "noodles": return GenericItem.new(owned_by, preload("res://map/items/noodles.tscn")) + "rolled-dough": return GenericItem.new(owned_by, preload("res://map/items/rolled_dough.tscn")) "strawberry-mochi": return Mochi.new(owned_by, Color(.98, .70, .75)) "nigiri": return Nigiri.new(owned_by) - "steak": return Steak.new(owned_by) - "seared-steak": return SearedSteak.new(owned_by) - "patty": return Patty.new(owned_by) - "seared-patty": return SearedPatty.new(owned_by) - "rice": return Rice.new(owned_by) - "sliced-fish": return SlicedFish.new(owned_by) + "steak": return GenericItem.new(owned_by, preload("res://map/items/steak.tscn")) + "seared-steak": return GenericItem.new(owned_by, preload("res://map/items/seared_steak.tscn")) + "patty": return GenericItem.new(owned_by, preload("res://map/items/patty.tscn")) + "seared-patty": return GenericItem.new(owned_by, preload("res://map/items/seared_patty.tscn")) + "rice": return GenericItem.new(owned_by, preload("res://map/items/rice.tscn")) + "sliced-fish": return GenericItem.new(owned_by, preload("res://map/items/sliced_fish.tscn")) "strawberry": return Strawberry.new(owned_by) - "tomato": return Tomato.new(owned_by) + "tomato": return Tomato.new(owned_by) # TODO: move into choppable class / move code into cutting_board "sliced-tomato": return SlicedTomato.new(owned_by) - "lettuce": return Lettuce.new(owned_by) + "lettuce": return GenericItem.new(owned_by, preload("res://map/items/lettuce.tscn")) "sliced-lettuce": return SlicedLettuce.new(owned_by) "potato": return Potato.new(owned_by) - "sliced-potato": return SlicedPotato.new(owned_by) + "sliced-potato": return GenericItem.new(owned_by, preload("res://map/items/sliced_potato.tscn")) "dirty-plate": return Plate.new(owned_by, ["dirt"]) "pot": return Pot.new(owned_by, item.contents) @@ -74,6 +74,6 @@ static func produce_inner(raw_name: String, owned_by: Node3D) -> Item: "glass": return Glass.new(owned_by, item.contents) "plate": return Plate.new(owned_by, item.contents) - "unknown-order": return UnknownOrder.new(owned_by) + "unknown-order": return GenericItem.new(owned_by, preload("res://map/items/unknown_order.tscn")) - _: return GenericItem.new(owned_by, raw_name) + _: return UnknownItem.new(owned_by, raw_name) diff --git a/client/map/items/coconut.gd.uid b/client/map/items/coconut.gd.uid deleted file mode 100644 index 2a04ae20..00000000 --- a/client/map/items/coconut.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b6mnuq0xhflv4 diff --git a/client/map/items/cooked_noodles.gd b/client/map/items/cooked_noodles.gd deleted file mode 100644 index 61127c3d..00000000 --- a/client/map/items/cooked_noodles.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 CookedNoodles -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/cooked_noodles.tscn").instantiate()) diff --git a/client/map/items/cooked_noodles.gd.uid b/client/map/items/cooked_noodles.gd.uid deleted file mode 100644 index 22d492d1..00000000 --- a/client/map/items/cooked_noodles.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://daq274orgski5 diff --git a/client/map/items/dirt.gd b/client/map/items/dirt.gd deleted file mode 100644 index 252c6b7e..00000000 --- a/client/map/items/dirt.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 Dirt -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/dirt.tscn").instantiate()) diff --git a/client/map/items/dirt.gd.uid b/client/map/items/dirt.gd.uid deleted file mode 100644 index d1810bc9..00000000 --- a/client/map/items/dirt.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://pt6puqar62e1 diff --git a/client/map/items/dough.gd b/client/map/items/dough.gd deleted file mode 100644 index da14c34e..00000000 --- a/client/map/items/dough.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 Dough -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/dough.tscn").instantiate()) diff --git a/client/map/items/dough.gd.uid b/client/map/items/dough.gd.uid deleted file mode 100644 index 9b08a027..00000000 --- a/client/map/items/dough.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://60rw7m3b3ew4 diff --git a/client/map/items/fish.gd b/client/map/items/fish.gd deleted file mode 100644 index ea3d894f..00000000 --- a/client/map/items/fish.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 Fish -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/fish.tscn").instantiate()) diff --git a/client/map/items/fish.gd.uid b/client/map/items/fish.gd.uid deleted file mode 100644 index e0231240..00000000 --- a/client/map/items/fish.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://03dvu2g67e2m diff --git a/client/map/items/flour.gd b/client/map/items/flour.gd deleted file mode 100644 index 814b3ab8..00000000 --- a/client/map/items/flour.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 Flour -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/flour.tscn").instantiate()) diff --git a/client/map/items/flour.gd.uid b/client/map/items/flour.gd.uid deleted file mode 100644 index 90dd8c87..00000000 --- a/client/map/items/flour.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://ncff2wujrri1 diff --git a/client/map/items/generic_item.gd b/client/map/items/generic_item.gd index 00c67d11..fd119feb 100644 --- a/client/map/items/generic_item.gd +++ b/client/map/items/generic_item.gd @@ -16,11 +16,6 @@ class_name GenericItem extends Item -func _init(owned_by_: Node3D, t: String): +func _init(owned_by_: Node3D, scene: PackedScene): super(owned_by_) - #add_child(load("res://models/prefabs/map/bag.tscn").instantiate()) - var label = Label3D.new() - label.text = t - label.position.y = 0.5 - label.billboard = BaseMaterial3D.BILLBOARD_ENABLED - base.add_child(label) + base.add_child(scene.instantiate()) diff --git a/client/map/items/generic_item.gd.uid b/client/map/items/generic_item.gd.uid index c540f219..794e2f66 100644 --- a/client/map/items/generic_item.gd.uid +++ b/client/map/items/generic_item.gd.uid @@ -1 +1 @@ -uid://cqi8do0ecrcd6 +uid://c3iu5ew0snpey diff --git a/client/map/items/leek.gd b/client/map/items/leek.gd deleted file mode 100644 index dc19a43a..00000000 --- a/client/map/items/leek.gd +++ /dev/null @@ -1,22 +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 Leek -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - var leek: Node3D = load("res://map/items/leek.tscn").instantiate() - base.add_child(leek) diff --git a/client/map/items/leek.gd.uid b/client/map/items/leek.gd.uid deleted file mode 100644 index fe47d8b5..00000000 --- a/client/map/items/leek.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://s8t5ynn17h33 diff --git a/client/map/items/lettuce.gd b/client/map/items/lettuce.gd deleted file mode 100644 index 5cde7fc5..00000000 --- a/client/map/items/lettuce.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 Lettuce -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/lettuce.tscn").instantiate()) diff --git a/client/map/items/lettuce.gd.uid b/client/map/items/lettuce.gd.uid deleted file mode 100644 index 6b543d65..00000000 --- a/client/map/items/lettuce.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://d0o1rh53f4dwd diff --git a/client/map/items/noodles.gd b/client/map/items/noodles.gd deleted file mode 100644 index 857e1e8d..00000000 --- a/client/map/items/noodles.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 Noodles -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/noodles.tscn").instantiate()) diff --git a/client/map/items/noodles.gd.uid b/client/map/items/noodles.gd.uid deleted file mode 100644 index 6b19cffe..00000000 --- a/client/map/items/noodles.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://ddd46k3c0v63m diff --git a/client/map/items/patty.gd b/client/map/items/patty.gd deleted file mode 100644 index 793f6cc5..00000000 --- a/client/map/items/patty.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 Patty -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/patty.tscn").instantiate()) diff --git a/client/map/items/patty.gd.uid b/client/map/items/patty.gd.uid deleted file mode 100644 index 0f637d2d..00000000 --- a/client/map/items/patty.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://6ldy1dcq5fqo diff --git a/client/map/items/rice.gd b/client/map/items/rice.gd deleted file mode 100644 index f4326b42..00000000 --- a/client/map/items/rice.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 Rice -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/rice.tscn").instantiate()) diff --git a/client/map/items/rice.gd.uid b/client/map/items/rice.gd.uid deleted file mode 100644 index 8e5375f2..00000000 --- a/client/map/items/rice.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://brk7d1chdunls diff --git a/client/map/items/rolled_dough.gd b/client/map/items/rolled_dough.gd deleted file mode 100644 index aae1acb5..00000000 --- a/client/map/items/rolled_dough.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 RolledDough -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/rolled_dough.tscn").instantiate()) diff --git a/client/map/items/rolled_dough.gd.uid b/client/map/items/rolled_dough.gd.uid deleted file mode 100644 index a7f17f07..00000000 --- a/client/map/items/rolled_dough.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://d2ipe2p5l210x diff --git a/client/map/items/seared_patty.gd b/client/map/items/seared_patty.gd deleted file mode 100644 index d398849a..00000000 --- a/client/map/items/seared_patty.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 SearedPatty -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/seared_patty.tscn").instantiate()) diff --git a/client/map/items/seared_patty.gd.uid b/client/map/items/seared_patty.gd.uid deleted file mode 100644 index d535b7dd..00000000 --- a/client/map/items/seared_patty.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://l8gkxo6e8hbm diff --git a/client/map/items/seared_steak.gd b/client/map/items/seared_steak.gd deleted file mode 100644 index f8e83a88..00000000 --- a/client/map/items/seared_steak.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 SearedSteak -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/seared_steak.tscn").instantiate()) diff --git a/client/map/items/seared_steak.gd.uid b/client/map/items/seared_steak.gd.uid deleted file mode 100644 index b58b6ef3..00000000 --- a/client/map/items/seared_steak.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://ctvryceahy14o diff --git a/client/map/items/sliced_bun.gd b/client/map/items/sliced_bun.gd deleted file mode 100644 index 0afa1887..00000000 --- a/client/map/items/sliced_bun.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 SlicedBun -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/sliced_bun.tscn").instantiate()) diff --git a/client/map/items/sliced_bun.gd.uid b/client/map/items/sliced_bun.gd.uid deleted file mode 100644 index 12a37727..00000000 --- a/client/map/items/sliced_bun.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://eql8ib3m6hp6 diff --git a/client/map/items/sliced_bun_bottom.gd b/client/map/items/sliced_bun_bottom.gd deleted file mode 100644 index 792a7960..00000000 --- a/client/map/items/sliced_bun_bottom.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 SlicedBunBottom -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/sliced_bun_bottom.tscn").instantiate()) diff --git a/client/map/items/sliced_bun_bottom.gd.uid b/client/map/items/sliced_bun_bottom.gd.uid deleted file mode 100644 index 61cdd506..00000000 --- a/client/map/items/sliced_bun_bottom.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bcyhv8xhgjtwa diff --git a/client/map/items/sliced_bun_top.gd b/client/map/items/sliced_bun_top.gd deleted file mode 100644 index 16a45a6f..00000000 --- a/client/map/items/sliced_bun_top.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 SlicedBunTop -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/sliced_bun_top.tscn").instantiate()) diff --git a/client/map/items/sliced_bun_top.gd.uid b/client/map/items/sliced_bun_top.gd.uid deleted file mode 100644 index 1b36a4c8..00000000 --- a/client/map/items/sliced_bun_top.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://b0fygr8kam7v diff --git a/client/map/items/sliced_fish.gd b/client/map/items/sliced_fish.gd deleted file mode 100644 index 8432216a..00000000 --- a/client/map/items/sliced_fish.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 SlicedFish -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/sliced_fish.tscn").instantiate()) diff --git a/client/map/items/sliced_fish.gd.uid b/client/map/items/sliced_fish.gd.uid deleted file mode 100644 index bb007d06..00000000 --- a/client/map/items/sliced_fish.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://c84kwji4h8tim diff --git a/client/map/items/sliced_potato.gd b/client/map/items/sliced_potato.gd deleted file mode 100644 index 313edb7a..00000000 --- a/client/map/items/sliced_potato.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 SlicedPotato -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/sliced_potato.tscn").instantiate()) diff --git a/client/map/items/sliced_potato.gd.uid b/client/map/items/sliced_potato.gd.uid deleted file mode 100644 index 849cfbc2..00000000 --- a/client/map/items/sliced_potato.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bhx0wq44st62o diff --git a/client/map/items/steak.gd b/client/map/items/steak.gd deleted file mode 100644 index 31b33eb3..00000000 --- a/client/map/items/steak.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 Steak -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/steak.tscn").instantiate()) diff --git a/client/map/items/steak.gd.uid b/client/map/items/steak.gd.uid deleted file mode 100644 index 8a38e2f1..00000000 --- a/client/map/items/steak.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://84g0hfrcqof diff --git a/client/map/items/coconut.gd b/client/map/items/unknown_item.gd index d97abfc2..991f6a3e 100644 --- a/client/map/items/coconut.gd +++ b/client/map/items/unknown_item.gd @@ -13,9 +13,14 @@ # 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 Coconut +class_name UnknownItem extends Item -func _init(owned_by_: Node3D): +func _init(owned_by_: Node3D, t: String): super(owned_by_) - base.add_child(load("res://map/items/coconut.tscn").instantiate()) + #add_child(load("res://models/prefabs/map/bag.tscn").instantiate()) + var label = Label3D.new() + label.text = t + label.position.y = 0.5 + label.billboard = BaseMaterial3D.BILLBOARD_ENABLED + base.add_child(label) diff --git a/client/map/items/unknown_item.gd.uid b/client/map/items/unknown_item.gd.uid new file mode 100644 index 00000000..c540f219 --- /dev/null +++ b/client/map/items/unknown_item.gd.uid @@ -0,0 +1 @@ +uid://cqi8do0ecrcd6 diff --git a/client/map/items/unknown_order.gd b/client/map/items/unknown_order.gd deleted file mode 100644 index 801589a9..00000000 --- a/client/map/items/unknown_order.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 UnknownOrder -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/unknown_order.tscn").instantiate()) diff --git a/client/map/items/unknown_order.gd.uid b/client/map/items/unknown_order.gd.uid deleted file mode 100644 index 67a3187d..00000000 --- a/client/map/items/unknown_order.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dda6h2ysjg1ss diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd index 17bbd87a..5e54bdf9 100644 --- a/client/map/tile_factory.gd +++ b/client/map/tile_factory.gd @@ -101,4 +101,4 @@ func produce(raw_name: String, position: Vector2i, neighbors: Array) -> Tile: var t: push_warning("tile %s unknown" % t) - return GenericTile.new(ctx) + return UnknownTile.new(ctx) diff --git a/client/map/tiles/generic_tile.gd b/client/map/tiles/generic_tile.gd index 345f1daa..0a11efc6 100644 --- a/client/map/tiles/generic_tile.gd +++ b/client/map/tiles/generic_tile.gd @@ -13,7 +13,7 @@ # 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 GenericTile +class_name UnknownTile extends Floor func _init(ctx: TileFactory.TileCC): |