From 7155c94671ea764bfc42c2f5d608649418d47f47 Mon Sep 17 00:00:00 2001 From: tpart Date: Fri, 13 Sep 2024 18:48:58 +0200 Subject: Update steak and cooked steak names --- client/map/item_factory.gd | 4 +++- client/map/items/cooked_steak.res | Bin 14183 -> 0 bytes client/map/items/cooked_steak.tscn | 10 ---------- client/map/items/raw_steak.gd | 21 --------------------- client/map/items/raw_steak.res | Bin 14014 -> 0 bytes client/map/items/raw_steak.tscn | 10 ---------- client/map/items/seared_steak.gd | 21 +++++++++++++++++++++ client/map/items/seared_steak.res | Bin 0 -> 14183 bytes client/map/items/seared_steak.tscn | 10 ++++++++++ client/map/items/steak.res | Bin 14183 -> 14014 bytes client/map/items/steak.tscn | 2 +- 11 files changed, 35 insertions(+), 43 deletions(-) delete mode 100644 client/map/items/cooked_steak.res delete mode 100644 client/map/items/cooked_steak.tscn delete mode 100644 client/map/items/raw_steak.gd delete mode 100644 client/map/items/raw_steak.res delete mode 100644 client/map/items/raw_steak.tscn create mode 100644 client/map/items/seared_steak.gd create mode 100644 client/map/items/seared_steak.res create mode 100644 client/map/items/seared_steak.tscn 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/cooked_steak.res b/client/map/items/cooked_steak.res deleted file mode 100644 index 68aaa171..00000000 Binary files a/client/map/items/cooked_steak.res and /dev/null differ diff --git a/client/map/items/cooked_steak.tscn b/client/map/items/cooked_steak.tscn deleted file mode 100644 index 2c2b8bf6..00000000 --- a/client/map/items/cooked_steak.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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"] - -[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") -skeleton = NodePath("") diff --git a/client/map/items/raw_steak.gd b/client/map/items/raw_steak.gd deleted file mode 100644 index bd4cf1c4..00000000 --- a/client/map/items/raw_steak.gd +++ /dev/null @@ -1,21 +0,0 @@ -# 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 . -# -class_name RawSteak -extends Item - -func _init(owned_by_: Node3D): - super(owned_by_) - base.add_child(load("res://map/items/raw_steak.tscn").instantiate()) diff --git a/client/map/items/raw_steak.res b/client/map/items/raw_steak.res deleted file mode 100644 index f94e895c..00000000 Binary files a/client/map/items/raw_steak.res and /dev/null 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/seared_steak.gd b/client/map/items/seared_steak.gd new file mode 100644 index 00000000..c183aef2 --- /dev/null +++ b/client/map/items/seared_steak.gd @@ -0,0 +1,21 @@ +# 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 . +# +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.res b/client/map/items/seared_steak.res new file mode 100644 index 00000000..68aaa171 Binary files /dev/null and b/client/map/items/seared_steak.res differ diff --git a/client/map/items/seared_steak.tscn b/client/map/items/seared_steak.tscn new file mode 100644 index 00000000..8592e851 --- /dev/null +++ b/client/map/items/seared_steak.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://c70af18pms3gw"] + +[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_keoxi") +skeleton = NodePath("") diff --git a/client/map/items/steak.res b/client/map/items/steak.res index 68aaa171..f94e895c 100644 Binary files a/client/map/items/steak.res and b/client/map/items/steak.res 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"] -- cgit v1.2.3-70-g09d2