From edd1166f14e62e335e9adfd365c68bfbd70d917f Mon Sep 17 00:00:00 2001 From: tpart Date: Tue, 8 Jul 2025 11:18:53 +0200 Subject: Fix duplicate UIDs, Remove redundant files (Closes #326) --- client/map/tiles/raw_steak_crate.gd | 21 --------------------- client/map/tiles/raw_steak_crate.gd.uid | 1 - client/map/tiles/raw_steak_crate.res | Bin 50290 -> 0 bytes client/map/tiles/raw_steak_crate.tscn | 10 ---------- client/map/tiles/steak_crate.gd | 3 ++- client/map/tiles/steak_crate.gd.uid | 2 +- client/map/tiles/steak_crate.tscn | 4 ++-- 7 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 client/map/tiles/raw_steak_crate.gd delete mode 100644 client/map/tiles/raw_steak_crate.gd.uid delete mode 100644 client/map/tiles/raw_steak_crate.res delete mode 100644 client/map/tiles/raw_steak_crate.tscn (limited to 'client/map/tiles') 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 . -# -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 deleted file mode 100644 index afb91ff5..00000000 Binary files a/client/map/tiles/raw_steak_crate.res and /dev/null differ 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("") -- cgit v1.2.3-70-g09d2