diff options
Diffstat (limited to 'client/map/tiles')
| -rw-r--r-- | client/map/tiles/flour_counter.gd | 12 | ||||
| -rw-r--r-- | client/map/tiles/oven.tscn | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/client/map/tiles/flour_counter.gd b/client/map/tiles/flour_counter.gd index 237d0c66..a767f2a9 100644 --- a/client/map/tiles/flour_counter.gd +++ b/client/map/tiles/flour_counter.gd @@ -18,9 +18,9 @@ extends CounterBase func _init(rename: String, neighbors: Array): super(rename, neighbors) - # var bag = load("res://models/prefabs/map/bag.tscn").instantiate() - # # this is supposed to be overridden - # @warning_ignore("static_called_on_instance") - # bag.position = interact_target() - # bag.rotation_degrees.y = 45 - # base.add_child(bag) + var bag = load("res://map/items/flour.tscn").instantiate() + # this is supposed to be overridden + @warning_ignore("static_called_on_instance") + bag.position = interact_target() + bag.rotation_degrees.y = 45 + base.add_child(bag) diff --git a/client/map/tiles/oven.tscn b/client/map/tiles/oven.tscn index 44535678..106d8c28 100644 --- a/client/map/tiles/oven.tscn +++ b/client/map/tiles/oven.tscn @@ -4,6 +4,16 @@ [ext_resource type="ArrayMesh" uid="uid://blc1q50d5ky86" path="res://map/tiles/oven_base.res" id="1_d1hwl"] [ext_resource type="ArrayMesh" uid="uid://blb5oew3sh7ek" path="res://map/tiles/oven_door.res" id="2_i5vso"] +[sub_resource type="Animation" id="Animation_yo2v1"] +length = 0.001 +tracks/0/type = "rotation_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Base/Door") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1) + [sub_resource type="Animation" id="Animation_yb3ht"] resource_name = "open" length = 0.5 @@ -22,16 +32,6 @@ tracks/1/interp = 2 tracks/1/loop_wrap = true tracks/1/keys = PackedFloat32Array(0, 1, 1, 1, 1, 0.1, 1, 1, 1, 1, 0.2, 1, 1, 1, 1, 0.4, 1, 1, 1, 1) -[sub_resource type="Animation" id="Animation_yo2v1"] -length = 0.001 -tracks/0/type = "rotation_3d" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Base/Door") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1) - [sub_resource type="AnimationLibrary" id="AnimationLibrary_io5nw"] _data = { "RESET": SubResource("Animation_yo2v1"), |