summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornokoe <nokoe@mailbox.org>2024-07-08 15:54:02 +0200
committernokoe <nokoe@mailbox.org>2024-07-08 15:54:37 +0200
commitf4a5f9bf0b61a8884fe24aa3b7c3a00da815b78d (patch)
tree29af6755be60e9f4e8934347437dfd1a1c982b52
parenta1921104e13c9cf39439ee424d54f7cece67fc5b (diff)
downloadhurrycurry-f4a5f9bf0b61a8884fe24aa3b7c3a00da815b78d.tar
hurrycurry-f4a5f9bf0b61a8884fe24aa3b7c3a00da815b78d.tar.bz2
hurrycurry-f4a5f9bf0b61a8884fe24aa3b7c3a00da815b78d.tar.zst
book
-rw-r--r--client/map/item_factory.gd1
-rw-r--r--client/map/tile_factory.gd2
-rw-r--r--client/map/tiles/book.gd25
-rw-r--r--client/map/tiles/book.resbin0 -> 2847 bytes
-rw-r--r--client/map/tiles/book.tscn10
-rw-r--r--client/map/tiles/chair.gd1
-rw-r--r--client/map/tiles/counter.gd1
-rw-r--r--client/map/tiles/counter_base.gd1
-rw-r--r--client/map/tiles/crate.gd2
-rw-r--r--client/map/tiles/cutting_board.gd1
-rw-r--r--client/map/tiles/door.gd1
-rw-r--r--client/map/tiles/floor.gd1
-rw-r--r--client/map/tiles/flour_counter.gd1
-rw-r--r--client/map/tiles/full_tile.gd1
-rw-r--r--client/map/tiles/generic_tile.gd1
-rw-r--r--client/map/tiles/oven.gd1
-rw-r--r--client/map/tiles/raw_steak_crate.gd1
-rw-r--r--client/map/tiles/sink.gd1
-rw-r--r--client/map/tiles/stove.gd1
-rw-r--r--client/map/tiles/table.gd1
-rw-r--r--client/map/tiles/trash.gd1
-rw-r--r--client/map/tiles/wall.gd1
-rw-r--r--client/map/tiles/wall_tile.gd1
-rw-r--r--client/map/tiles/window.gd1
24 files changed, 38 insertions, 20 deletions
diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index 833e61af..d4d0b054 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd
index a5e7bf05..b8f70200 100644
--- a/client/map/tile_factory.gd
+++ b/client/map/tile_factory.gd
@@ -62,6 +62,8 @@ static func produce(tile_name: String, node_name: String, neighbors: Array) -> T
return Path.new(node_name, neighbors)
"fence":
return Fence.new(node_name, neighbors)
+ "book":
+ return Book.new(node_name, neighbors)
var t:
push_warning("tile %s unknown" % t)
return GenericTile.new(node_name, neighbors, t)
diff --git a/client/map/tiles/book.gd b/client/map/tiles/book.gd
new file mode 100644
index 00000000..11bd6592
--- /dev/null
+++ b/client/map/tiles/book.gd
@@ -0,0 +1,25 @@
+# Hurry Curry! - a game about cooking
+# Copyright 2024 nokoe
+#
+# 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 Book
+extends CounterBase
+
+func _init(rename: String, neighbors: Array):
+ super(rename, neighbors)
+ base.add_child(load("res://map/tiles/book.tscn").instantiate())
+
+func interact():
+ # the book is supposed to be opened here
+ pass
diff --git a/client/map/tiles/book.res b/client/map/tiles/book.res
new file mode 100644
index 00000000..9caf89f1
--- /dev/null
+++ b/client/map/tiles/book.res
Binary files differ
diff --git a/client/map/tiles/book.tscn b/client/map/tiles/book.tscn
new file mode 100644
index 00000000..d5f6e0d3
--- /dev/null
+++ b/client/map/tiles/book.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://c7fjfp5ygxsjc"]
+
+[ext_resource type="ArrayMesh" uid="uid://cgvow28wkwesp" path="res://map/tiles/book.res" id="1_vxs3d"]
+
+[node name="Book" type="Node3D"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.5, 0)
+mesh = ExtResource("1_vxs3d")
+skeleton = NodePath("")
diff --git a/client/map/tiles/chair.gd b/client/map/tiles/chair.gd
index bf2fce16..65b0f91e 100644
--- a/client/map/tiles/chair.gd
+++ b/client/map/tiles/chair.gd
@@ -1,5 +1,4 @@
# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
# Copyright 2024 nokoe
#
# This program is free software: you can redistribute it and/or modify
diff --git a/client/map/tiles/counter.gd b/client/map/tiles/counter.gd
index 45be5525..c07407ae 100644
--- a/client/map/tiles/counter.gd
+++ b/client/map/tiles/counter.gd
@@ -1,5 +1,4 @@
# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
# Copyright 2024 nokoe
#
# This program is free software: you can redistribute it and/or modify
diff --git a/client/map/tiles/counter_base.gd b/client/map/tiles/counter_base.gd
index 0235268e..649347a3 100644
--- a/client/map/tiles/counter_base.gd
+++ b/client/map/tiles/counter_base.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/crate.gd b/client/map/tiles/crate.gd
index 63ceed75..7f6ccd3b 100644
--- a/client/map/tiles/crate.gd
+++ b/client/map/tiles/crate.gd
@@ -1,5 +1,5 @@
# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
+# Copyright 2024 nokoe
#
# 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
diff --git a/client/map/tiles/cutting_board.gd b/client/map/tiles/cutting_board.gd
index 66968313..3e1b4018 100644
--- a/client/map/tiles/cutting_board.gd
+++ b/client/map/tiles/cutting_board.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd
index 28506852..b84c224e 100644
--- a/client/map/tiles/door.gd
+++ b/client/map/tiles/door.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/floor.gd b/client/map/tiles/floor.gd
index a8b9e8f7..666a6699 100644
--- a/client/map/tiles/floor.gd
+++ b/client/map/tiles/floor.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/flour_counter.gd b/client/map/tiles/flour_counter.gd
index fa8a1bbc..03bb7742 100644
--- a/client/map/tiles/flour_counter.gd
+++ b/client/map/tiles/flour_counter.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/full_tile.gd b/client/map/tiles/full_tile.gd
index f83ba2b5..99f12296 100644
--- a/client/map/tiles/full_tile.gd
+++ b/client/map/tiles/full_tile.gd
@@ -1,5 +1,4 @@
# Hurry Curry! - a game about cooking
-# Copyright 2024 metamuffin
# Copyright 2024 nokoe
#
# This program is free software: you can redistribute it and/or modify
diff --git a/client/map/tiles/generic_tile.gd b/client/map/tiles/generic_tile.gd
index 5cbc7820..87d7aab4 100644
--- a/client/map/tiles/generic_tile.gd
+++ b/client/map/tiles/generic_tile.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/oven.gd b/client/map/tiles/oven.gd
index c0cf7196..598e0c7e 100644
--- a/client/map/tiles/oven.gd
+++ b/client/map/tiles/oven.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/raw_steak_crate.gd b/client/map/tiles/raw_steak_crate.gd
index 07a2acdf..4c1240ff 100644
--- a/client/map/tiles/raw_steak_crate.gd
+++ b/client/map/tiles/raw_steak_crate.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/sink.gd b/client/map/tiles/sink.gd
index adf1a971..e98a25d0 100644
--- a/client/map/tiles/sink.gd
+++ b/client/map/tiles/sink.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/stove.gd b/client/map/tiles/stove.gd
index 65bc9502..9792041f 100644
--- a/client/map/tiles/stove.gd
+++ b/client/map/tiles/stove.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/table.gd b/client/map/tiles/table.gd
index 6d1b1862..8d04b60a 100644
--- a/client/map/tiles/table.gd
+++ b/client/map/tiles/table.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/trash.gd b/client/map/tiles/trash.gd
index a8ba3e6d..ad93a1d9 100644
--- a/client/map/tiles/trash.gd
+++ b/client/map/tiles/trash.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/wall.gd b/client/map/tiles/wall.gd
index 0a00752d..a6d650da 100644
--- a/client/map/tiles/wall.gd
+++ b/client/map/tiles/wall.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd
index d0d9a422..94248c03 100644
--- a/client/map/tiles/wall_tile.gd
+++ b/client/map/tiles/wall_tile.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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
diff --git a/client/map/tiles/window.gd b/client/map/tiles/window.gd
index 7c46fa56..0a3c9eba 100644
--- a/client/map/tiles/window.gd
+++ b/client/map/tiles/window.gd
@@ -1,6 +1,5 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
-# Copyright 2024 metamuffin
#
# 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