aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortpart <tpart120@proton.me>2024-09-13 18:48:58 +0200
committertpart <tpart120@proton.me>2024-09-13 18:49:03 +0200
commit7155c94671ea764bfc42c2f5d608649418d47f47 (patch)
tree0b3c1549f3c39a08f8683eb379f977b25a9836f9
parentc28e3210fb591dbb3f457323f41d662bdec2bbc3 (diff)
downloadhurrycurry-7155c94671ea764bfc42c2f5d608649418d47f47.tar
hurrycurry-7155c94671ea764bfc42c2f5d608649418d47f47.tar.bz2
hurrycurry-7155c94671ea764bfc42c2f5d608649418d47f47.tar.zst
Update steak and cooked steak names
-rw-r--r--client/map/item_factory.gd4
-rw-r--r--client/map/items/raw_steak.resbin14014 -> 0 bytes
-rw-r--r--client/map/items/raw_steak.tscn10
-rw-r--r--client/map/items/seared_steak.gd (renamed from client/map/items/raw_steak.gd)4
-rw-r--r--client/map/items/seared_steak.res (renamed from client/map/items/cooked_steak.res)bin14183 -> 14183 bytes
-rw-r--r--client/map/items/seared_steak.tscn (renamed from client/map/items/cooked_steak.tscn)4
-rw-r--r--client/map/items/steak.resbin14183 -> 14014 bytes
-rw-r--r--client/map/items/steak.tscn2
8 files changed, 8 insertions, 16 deletions
diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index 24cb201f..18141dd6 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -1,6 +1,7 @@
# Hurry Curry! - a game about cooking
# Copyright 2024 nokoe
# Copyright 2024 metamuffin
+# Copyright 2024 tpart
#
# 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
@@ -35,7 +36,8 @@ static func produce(name: String, owned_by: Node3D) -> Item:
"leek": return Leek.new(owned_by)
"strawberry-mochi": return MochiItems.StrawberryM.new(owned_by)
"nigiri": return Nigiri.new(owned_by)
- "raw-steak": return RawSteak.new(owned_by)
+ "steak": return Steak.new(owned_by)
+ "seared-steak": return SearedSteak.new(owned_by)
"rice": return Rice.new(owned_by)
"sliced-fish": return SlicedFish.new(owned_by)
"sliced-tomato": return SlicedTomato.new(owned_by)
diff --git a/client/map/items/raw_steak.res b/client/map/items/raw_steak.res
deleted file mode 100644
index f94e895c..00000000
--- a/client/map/items/raw_steak.res
+++ /dev/null
Binary files differ
diff --git a/client/map/items/raw_steak.tscn b/client/map/items/raw_steak.tscn
deleted file mode 100644
index f8b282fb..00000000
--- a/client/map/items/raw_steak.tscn
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://burjwm1m1ukbh"]
-
-[ext_resource type="ArrayMesh" uid="uid://tuorjx63f0ij" path="res://map/items/raw_steak.res" id="1_dw8a3"]
-
-[node name="RawSteak" type="Node3D"]
-
-[node name="Mesh" type="MeshInstance3D" parent="."]
-transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-mesh = ExtResource("1_dw8a3")
-skeleton = NodePath("")
diff --git a/client/map/items/raw_steak.gd b/client/map/items/seared_steak.gd
index bd4cf1c4..c183aef2 100644
--- a/client/map/items/raw_steak.gd
+++ b/client/map/items/seared_steak.gd
@@ -13,9 +13,9 @@
# 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 RawSteak
+class_name SearedSteak
extends Item
func _init(owned_by_: Node3D):
super(owned_by_)
- base.add_child(load("res://map/items/raw_steak.tscn").instantiate())
+ base.add_child(load("res://map/items/seared_steak.tscn").instantiate())
diff --git a/client/map/items/cooked_steak.res b/client/map/items/seared_steak.res
index 68aaa171..68aaa171 100644
--- a/client/map/items/cooked_steak.res
+++ b/client/map/items/seared_steak.res
Binary files differ
diff --git a/client/map/items/cooked_steak.tscn b/client/map/items/seared_steak.tscn
index 2c2b8bf6..8592e851 100644
--- a/client/map/items/cooked_steak.tscn
+++ b/client/map/items/seared_steak.tscn
@@ -1,10 +1,10 @@
[gd_scene load_steps=2 format=3 uid="uid://c70af18pms3gw"]
-[ext_resource type="ArrayMesh" uid="uid://kfod37qy5sx" path="res://map/items/cooked_steak.res" id="1_uomtq"]
+[ext_resource type="ArrayMesh" uid="uid://kfod37qy5sx" path="res://map/items/seared_steak.res" id="1_keoxi"]
[node name="Steak" type="Node3D"]
[node name="Mesh" type="MeshInstance3D" parent="."]
transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-mesh = ExtResource("1_uomtq")
+mesh = ExtResource("1_keoxi")
skeleton = NodePath("")
diff --git a/client/map/items/steak.res b/client/map/items/steak.res
index 68aaa171..f94e895c 100644
--- a/client/map/items/steak.res
+++ b/client/map/items/steak.res
Binary files differ
diff --git a/client/map/items/steak.tscn b/client/map/items/steak.tscn
index 5ec962f4..1f6964c3 100644
--- a/client/map/items/steak.tscn
+++ b/client/map/items/steak.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://c70af18pms3gw"]
-[ext_resource type="ArrayMesh" uid="uid://kfod37qy5sx" path="res://map/items/steak.res" id="1_iei2f"]
+[ext_resource type="ArrayMesh" uid="uid://tuorjx63f0ij" path="res://map/items/steak.res" id="1_iei2f"]
[node name="Steak" type="Node3D"]