diff options
| -rw-r--r-- | client/gui/menus/main/about.gd | 3 | ||||
| -rw-r--r-- | client/map/item_factory.gd | 1 | ||||
| -rw-r--r-- | client/map/items/basket.gd | 2 | ||||
| -rw-r--r-- | client/map/items/donut/donut-dough.res | bin | 0 -> 16165 bytes | |||
| -rw-r--r-- | client/map/items/donut/donut-glaze.res | bin | 0 -> 27882 bytes | |||
| -rw-r--r-- | client/map/items/donut/donut.tscn | 10 | ||||
| -rw-r--r-- | client/map/items/donut/glazed-donut.tscn | 16 |
7 files changed, 31 insertions, 1 deletions
diff --git a/client/gui/menus/main/about.gd b/client/gui/menus/main/about.gd index d706c36c..68ff7561 100644 --- a/client/gui/menus/main/about.gd +++ b/client/gui/menus/main/about.gd @@ -72,7 +72,8 @@ var credits := [ ["Poly by Google", "Strawberry", cc_by_3], ["Poly by Google", "Fish", cc_by_3], ["Poly by Google", "Rolling pin", cc_by_3], - ["jeremy", "Propeller hat", cc_by_3] + ["jeremy", "Propeller hat", cc_by_3], + ["jeremy", "Donut", cc_by_3] ]], [tr("c.credits.sounds"), [ ["Dryoma", "Footstep sounds", cc_by_4], diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd index d2bcc23a..26e3eb40 100644 --- a/client/map/item_factory.gd +++ b/client/map/item_factory.gd @@ -46,6 +46,7 @@ static func produce_inner(item: ItemName, owned_by: Node3D) -> Item: "burned": return Burned.new(owned_by) "coconut": return GenericItem.new(owned_by, preload("res://map/items/coconut.tscn")) "dough": return GenericItem.new(owned_by, preload("res://map/items/dough.tscn")) + "doughnut": return GenericItem.new(owned_by, preload("res://map/items/donut/glazed-donut.tscn")) "fish": return GenericItem.new(owned_by, preload("res://map/items/fish.tscn")) "flour": return GenericItem.new(owned_by, preload("res://map/items/flour.tscn")) "leek": return GenericItem.new(owned_by, preload("res://map/items/leek.tscn")) diff --git a/client/map/items/basket.gd b/client/map/items/basket.gd index df37b5dd..9137c7bd 100644 --- a/client/map/items/basket.gd +++ b/client/map/items/basket.gd @@ -31,6 +31,8 @@ func add_contents(contents: Array[String]): match i: "french-fries": base.add_child(load("res://map/items/french_fries_basket.tscn").instantiate()) + "dough": + base.add_child(load("res://map/items/donut/donut.tscn").instantiate()) _: super([i]) diff --git a/client/map/items/donut/donut-dough.res b/client/map/items/donut/donut-dough.res Binary files differnew file mode 100644 index 00000000..329e6c1c --- /dev/null +++ b/client/map/items/donut/donut-dough.res diff --git a/client/map/items/donut/donut-glaze.res b/client/map/items/donut/donut-glaze.res Binary files differnew file mode 100644 index 00000000..a8dafc76 --- /dev/null +++ b/client/map/items/donut/donut-glaze.res diff --git a/client/map/items/donut/donut.tscn b/client/map/items/donut/donut.tscn new file mode 100644 index 00000000..505f13b3 --- /dev/null +++ b/client/map/items/donut/donut.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://cvnkxd1tslqvf"] + +[ext_resource type="ArrayMesh" uid="uid://cy1ifpobr21c0" path="res://map/items/donut/donut-dough.res" id="1_65l5f"] + +[node name="Donut" type="Node3D"] + +[node name="Dough" type="MeshInstance3D" parent="."] +transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0) +mesh = ExtResource("1_65l5f") +skeleton = NodePath("") diff --git a/client/map/items/donut/glazed-donut.tscn b/client/map/items/donut/glazed-donut.tscn new file mode 100644 index 00000000..7e71d946 --- /dev/null +++ b/client/map/items/donut/glazed-donut.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=3 uid="uid://dglrxvp3126g4"] + +[ext_resource type="ArrayMesh" uid="uid://cy1ifpobr21c0" path="res://map/items/donut/donut-dough.res" id="1_1ef7l"] +[ext_resource type="ArrayMesh" uid="uid://dauwp2akjkafa" path="res://map/items/donut/donut-glaze.res" id="2_1jama"] + +[node name="Donut" type="Node3D"] + +[node name="Dough" type="MeshInstance3D" parent="."] +transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0) +mesh = ExtResource("1_1ef7l") +skeleton = NodePath("") + +[node name="Glaze" type="MeshInstance3D" parent="."] +transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0) +mesh = ExtResource("2_1jama") +skeleton = NodePath("") |