Add propeller hat

5 files changed, 16 insertions, 5 deletions

diff --git a/client/player/character/cat_ears.tscn b/client/player/character/cat_ears.tscn
index ab1d96eb..b998fded 100644
--- a/client/player/character/cat_ears.tscn
+++ b/client/player/character/cat_ears.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://dspkdcg1ui6dl"]
 
-[ext_resource type="ArrayMesh" uid="uid://3k87npushfgh" path="res://player/character/hairstyles/cat_ears.res" id="1_5c3r8"]
+[ext_resource type="ArrayMesh" uid="uid://3k87npushfgh" path="res://player/character/headwear/cat_ears.res" id="1_5c3r8"]
 [ext_resource type="Script" uid="uid://cyyugv3ylq8ux" path="res://player/character/cat_ears.gd" id="1_q747p"]
 
 [node name="CatEars" type="Node3D"]
diff --git a/client/player/character/character.gd b/client/player/character/character.gd
index 8479af2c..3b3b98e1 100644
--- a/client/player/character/character.gd
+++ b/client/player/character/character.gd
@@ -42,10 +42,11 @@ var current_animation := "idle"
 @onready var tie = $Main/Tie
 @onready var knife = $Main/HandRight/Knife
 @onready var cat_ears: CatEars = $Main/HeadDefault/CatEars
+@onready var propeller_hat = $Main/HeadDefault/PropellerHat
 
 const NUM_COLORS = 5
 const NUM_HAIRS = 3
-const NUM_HEADWEARS = 2
+const NUM_HEADWEARS = 3
 @onready var hairstyles := [$Main/HeadDefault/Hair, $Main/HeadDefault/Hair2, $Main/HeadDefault/Hair3]
 const COLORS: Array[Color] = [
 	Color(0.204, 0.361, 0.624),
@@ -102,10 +103,12 @@ func set_style(style: Dictionary, character_class: String):
 	head_default.visible = is_human
 	main.visible = character_class != "tram"
 	tram.visible = character_class == "tram"
-	cat_ears.visible = style.headwear == 1
+	propeller_hat.visible = style.headwear == 1
+	cat_ears.visible = style.headwear == 2
 	for h in hairstyles: h.hide()
 	var my_hairstyle = hairstyles[G.rem_euclid(style.hairstyle, NUM_HAIRS)]
-	my_hairstyle.show()
+	if style.headwear != 1: # Propeller hat has no hair
+		my_hairstyle.show()
 	main.get_active_material(0).albedo_color = Color(0.349, 0.349, 0.349) if character_class == "bot" else COLORS[G.rem_euclid(style.color, NUM_COLORS)]
 	if cat_ears.visible:
 		cat_ears.set_inner_mat(main.get_active_material(0))
diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn
index e1792528..61caa26c 100644
--- a/client/player/character/character.tscn
+++ b/client/player/character/character.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=30 format=3 uid="uid://b3hhir2fvnunu"]
+[gd_scene load_steps=31 format=3 uid="uid://b3hhir2fvnunu"]
 
 [ext_resource type="Script" uid="uid://dwk3vd4nv2k65" path="res://player/character/character.gd" id="1_12lbh"]
 [ext_resource type="ArrayMesh" uid="uid://bnmm01yjwultj" path="res://player/character/default/main.res" id="2_uovyg"]
@@ -14,6 +14,7 @@
 [ext_resource type="AudioStream" uid="uid://bxiorkb4xb8t1" path="res://player/sounds/step1.ogg" id="10_qpd6x"]
 [ext_resource type="PackedScene" uid="uid://c6sqsj7r03qp1" path="res://player/character/robot/head.tscn" id="10_w8s0d"]
 [ext_resource type="AudioStream" uid="uid://l2fd8u7rq3cq" path="res://player/sounds/step2.ogg" id="11_2dmo8"]
+[ext_resource type="ArrayMesh" uid="uid://cxftkcxlde6m2" path="res://player/character/headwear/propeller.res" id="11_dmio0"]
 [ext_resource type="AudioStream" uid="uid://d353uwy83crca" path="res://player/sounds/step3.ogg" id="12_bj5ue"]
 [ext_resource type="Script" uid="uid://n4jwod1jfuiv" path="res://audio/play_random.gd" id="14_3rb6x"]
 [ext_resource type="AudioStream" uid="uid://1jsqpnk3igj3" path="res://player/sounds/woosh1.ogg" id="14_ikcec"]
@@ -758,6 +759,7 @@ skeleton = NodePath("")
 
 [node name="Hair" type="MeshInstance3D" parent="Main/HeadDefault"]
 transform = Transform3D(1.06667, 0, 0, 0, 1.06667, 0, 0, 0, 1.06667, 0, 0.4, 0)
+visible = false
 mesh = ExtResource("6_3uydp")
 skeleton = NodePath("")
 
@@ -774,6 +776,12 @@ mesh = ExtResource("8_x5g32")
 skeleton = NodePath("")
 
 [node name="CatEars" parent="Main/HeadDefault" instance=ExtResource("10_8pcb3")]
+visible = false
+
+[node name="PropellerHat" type="MeshInstance3D" parent="Main/HeadDefault"]
+transform = Transform3D(0.3, 0, 0, 0, -0.00173314, -0.299995, 0, 0.299995, -0.00173314, 0, 0.165437, 0.442771)
+visible = false
+mesh = ExtResource("11_dmio0")
 
 [node name="Tie" type="MeshInstance3D" parent="Main"]
 transform = Transform3D(0.125, 0, 0, 0, 0.125, 0, 0, 0, 0.125, 0, 0.47772, 0.445265)
diff --git a/client/player/character/hairstyles/cat_ears.res b/client/player/character/headwear/cat_ears.res
index ae31fa69..ae31fa69 100644
--- a/client/player/character/hairstyles/cat_ears.res
+++ b/client/player/character/headwear/cat_ears.res
diff --git a/client/player/character/headwear/propeller.res b/client/player/character/headwear/propeller.res
new file mode 100644
index 00000000..e293561b
--- /dev/null
+++ b/client/player/character/headwear/propeller.res