diff options
-rw-r--r-- | client/map/items/steak.tscn | 2 | ||||
-rw-r--r-- | client/map/tile_factory.gd | 2 | ||||
-rw-r--r-- | client/map/tiles/raw_steak_crate.gd | 21 | ||||
-rw-r--r-- | client/map/tiles/raw_steak_crate.gd.uid | 1 | ||||
-rw-r--r-- | client/map/tiles/raw_steak_crate.res | bin | 50290 -> 0 bytes | |||
-rw-r--r-- | client/map/tiles/raw_steak_crate.tscn | 10 | ||||
-rw-r--r-- | client/map/tiles/steak_crate.gd | 3 | ||||
-rw-r--r-- | client/map/tiles/steak_crate.gd.uid | 2 | ||||
-rw-r--r-- | client/map/tiles/steak_crate.tscn | 4 |
9 files changed, 7 insertions, 38 deletions
diff --git a/client/map/items/steak.tscn b/client/map/items/steak.tscn index 1f6964c3..59846d8a 100644 --- a/client/map/items/steak.tscn +++ b/client/map/items/steak.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://c70af18pms3gw"] +[gd_scene load_steps=2 format=3 uid="uid://c8ylx2rsklp2y"] [ext_resource type="ArrayMesh" uid="uid://tuorjx63f0ij" path="res://map/items/steak.res" id="1_iei2f"] diff --git a/client/map/tile_factory.gd b/client/map/tile_factory.gd index ca6c0f81..51fec1a4 100644 --- a/client/map/tile_factory.gd +++ b/client/map/tile_factory.gd @@ -80,7 +80,7 @@ func produce(tile_name: String, position: Vector2i, neighbors: Array) -> Tile: "flour-crate": return FlourCrate.new(ctx) "leek-crate": return LeekCrate.new(ctx) "lettuce-crate": return LettuceCrate.new(ctx) - "steak-crate": return RawSteakCrate.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) diff --git a/client/map/tiles/raw_steak_crate.gd b/client/map/tiles/raw_steak_crate.gd deleted file mode 100644 index ef439101..00000000 --- a/client/map/tiles/raw_steak_crate.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 <https://www.gnu.org/licenses/>. -# -class_name RawSteakCrate -extends Crate - -func _init(ctx: TileFactory.TileCC): - super(ctx) - base.add_child(load("res://map/tiles/raw_steak_crate.tscn").instantiate()) diff --git a/client/map/tiles/raw_steak_crate.gd.uid b/client/map/tiles/raw_steak_crate.gd.uid deleted file mode 100644 index 40de1785..00000000 --- a/client/map/tiles/raw_steak_crate.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cgjeokxei2o1d diff --git a/client/map/tiles/raw_steak_crate.res b/client/map/tiles/raw_steak_crate.res Binary files differdeleted file mode 100644 index afb91ff5..00000000 --- a/client/map/tiles/raw_steak_crate.res +++ /dev/null diff --git a/client/map/tiles/raw_steak_crate.tscn b/client/map/tiles/raw_steak_crate.tscn deleted file mode 100644 index e37d2773..00000000 --- a/client/map/tiles/raw_steak_crate.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://cyi73ubyehy37"] - -[ext_resource type="ArrayMesh" uid="uid://bdsqnesyjl3kv" path="res://map/tiles/steak_crate.res" id="1_ujg4h"] - -[node name="SteakCrate" 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_ujg4h") -skeleton = NodePath("") diff --git a/client/map/tiles/steak_crate.gd b/client/map/tiles/steak_crate.gd index 33316807..20ba2796 100644 --- a/client/map/tiles/steak_crate.gd +++ b/client/map/tiles/steak_crate.gd @@ -1,5 +1,6 @@ # Hurry Curry! - a game about cooking # Copyright 2024 nokoe +# Copyright 2025 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 @@ -18,4 +19,4 @@ extends Crate func _init(ctx: TileFactory.TileCC): super(ctx) - base.add_child(load("res://map/tiles/raw_steak_crate.tscn").instantiate()) + 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 index a6b21a23..40de1785 100644 --- a/client/map/tiles/steak_crate.gd.uid +++ b/client/map/tiles/steak_crate.gd.uid @@ -1 +1 @@ -uid://ynj8cii8cl3w +uid://cgjeokxei2o1d diff --git a/client/map/tiles/steak_crate.tscn b/client/map/tiles/steak_crate.tscn index e37d2773..985dcfdd 100644 --- a/client/map/tiles/steak_crate.tscn +++ b/client/map/tiles/steak_crate.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=2 format=3 uid="uid://cyi73ubyehy37"] -[ext_resource type="ArrayMesh" uid="uid://bdsqnesyjl3kv" path="res://map/tiles/steak_crate.res" id="1_ujg4h"] +[ext_resource type="ArrayMesh" uid="uid://bdsqnesyjl3kv" path="res://map/tiles/steak_crate.res" id="1_ewp50"] [node name="SteakCrate" 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_ujg4h") +mesh = ExtResource("1_ewp50") skeleton = NodePath("") |