From d2bafe3a0b9d7ec6f92adededc635653a23506d6 Mon Sep 17 00:00:00 2001
From: tpart <tpart120@proton.me>
Date: Tue, 25 Jun 2024 22:51:54 +0200
Subject: Add E. Parsley hairstyle

---
 client/player/character/character.gd   |   3 ++-
 client/player/character/character.tscn |   9 ++++++++-
 client/player/character/hair_3.res     | Bin 0 -> 19708 bytes
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 client/player/character/hair_3.res

(limited to 'client')

diff --git a/client/player/character/character.gd b/client/player/character/character.gd
index 8f694e9e..dd3e6554 100644
--- a/client/player/character/character.gd
+++ b/client/player/character/character.gd
@@ -31,7 +31,8 @@ var current_animation := "idle"
 
 @onready var hairstyles = {
 	"Brown": $Main/Head/Hair,
-	"Blond": $Main/Head/Hair
+	"Blond": $Main/Head/Hair2,
+	"E. Parsley": $Main/Head/Hair3
 }
 
 func _ready():
diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn
index a6f574ad..033135cd 100644
--- a/client/player/character/character.tscn
+++ b/client/player/character/character.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://b3hhir2fvnunu"]
+[gd_scene load_steps=15 format=3 uid="uid://b3hhir2fvnunu"]
 
 [ext_resource type="Script" path="res://player/character/character.gd" id="1_12lbh"]
 [ext_resource type="ArrayMesh" uid="uid://bnmm01yjwultj" path="res://player/character/main.res" id="2_lxdbd"]
@@ -8,6 +8,7 @@
 [ext_resource type="ArrayMesh" uid="uid://bsxmxq4dfv2vy" path="res://player/character/hair.res" id="6_rfl5m"]
 [ext_resource type="ArrayMesh" uid="uid://dx7jswwaesok4" path="res://player/character/hair_2.res" id="7_0551e"]
 [ext_resource type="ArrayMesh" uid="uid://c2qnwt44x8ujl" path="res://player/character/tie.res" id="7_knv6q"]
+[ext_resource type="ArrayMesh" uid="uid://c5qsthvtf3cta" path="res://player/character/hair_3.res" id="8_2bc5u"]
 
 [sub_resource type="Animation" id="Animation_tdhvg"]
 length = 0.001
@@ -598,6 +599,12 @@ visible = false
 mesh = ExtResource("7_0551e")
 skeleton = NodePath("")
 
+[node name="Hair3" type="MeshInstance3D" parent="Main/Head"]
+transform = Transform3D(1.06667, 0, 0, 0, 1.06667, 0, 0, 0, 1.06667, 0, 0.4, 0)
+visible = false
+mesh = ExtResource("8_2bc5u")
+skeleton = NodePath("")
+
 [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)
 mesh = ExtResource("7_knv6q")
diff --git a/client/player/character/hair_3.res b/client/player/character/hair_3.res
new file mode 100644
index 00000000..fd36ea00
Binary files /dev/null and b/client/player/character/hair_3.res differ
-- 
cgit v1.2.3-70-g09d2