diff options
| -rw-r--r-- | client/player/character/character.gd | 4 | ||||
| -rw-r--r-- | client/player/character/character.tscn | 6 | ||||
| -rw-r--r-- | client/player/character/headwear/devil_horns.tscn | 15 | ||||
| -rw-r--r-- | client/player/character/headwear/horn.res | bin | 0 -> 5892 bytes |
4 files changed, 23 insertions, 2 deletions
diff --git a/client/player/character/character.gd b/client/player/character/character.gd index 3b3b98e1..ca8954c1 100644 --- a/client/player/character/character.gd +++ b/client/player/character/character.gd @@ -43,10 +43,11 @@ var current_animation := "idle" @onready var knife = $Main/HandRight/Knife @onready var cat_ears: CatEars = $Main/HeadDefault/CatEars @onready var propeller_hat = $Main/HeadDefault/PropellerHat +@onready var devil_horns = $Main/HeadDefault/DevilHorns const NUM_COLORS = 5 const NUM_HAIRS = 3 -const NUM_HEADWEARS = 3 +const NUM_HEADWEARS = 4 @onready var hairstyles := [$Main/HeadDefault/Hair, $Main/HeadDefault/Hair2, $Main/HeadDefault/Hair3] const COLORS: Array[Color] = [ Color(0.204, 0.361, 0.624), @@ -105,6 +106,7 @@ func set_style(style: Dictionary, character_class: String): tram.visible = character_class == "tram" propeller_hat.visible = style.headwear == 1 cat_ears.visible = style.headwear == 2 + devil_horns.visible = style.headwear == 3 for h in hairstyles: h.hide() var my_hairstyle = hairstyles[G.rem_euclid(style.hairstyle, NUM_HAIRS)] if style.headwear != 1: # Propeller hat has no hair diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn index 41f870c6..e14db09c 100644 --- a/client/player/character/character.tscn +++ b/client/player/character/character.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=31 format=3 uid="uid://b3hhir2fvnunu"] +[gd_scene load_steps=32 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"] @@ -16,6 +16,7 @@ [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="PackedScene" uid="uid://ciw1ngkslskaw" path="res://player/character/headwear/devil_horns.tscn" id="12_d80qf"] [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"] [ext_resource type="AudioStream" uid="uid://cwme7eatip0jc" path="res://player/sounds/woosh2.ogg" id="15_iv4wu"] @@ -783,6 +784,9 @@ transform = Transform3D(0.3, 0, 0, 0, -0.00173314, -0.299995, 0, 0.299995, -0.00 visible = false mesh = ExtResource("11_dmio0") +[node name="DevilHorns" parent="Main/HeadDefault" instance=ExtResource("12_d80qf")] +visible = false + [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("9_kgric") diff --git a/client/player/character/headwear/devil_horns.tscn b/client/player/character/headwear/devil_horns.tscn new file mode 100644 index 00000000..52dcdd77 --- /dev/null +++ b/client/player/character/headwear/devil_horns.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=2 format=3 uid="uid://ciw1ngkslskaw"] + +[ext_resource type="ArrayMesh" uid="uid://mwaobrw3mab4" path="res://player/character/headwear/horn.res" id="1_kadxh"] + +[node name="DevilHorns" type="Node3D"] + +[node name="Left" type="MeshInstance3D" parent="."] +transform = Transform3D(-1.74846e-08, -0.16383, -0.172073, 0, 0.114715, -0.245746, 0.4, -7.16125e-09, -7.52155e-09, -0.8, 0.75, 0) +mesh = ExtResource("1_kadxh") +skeleton = NodePath("") + +[node name="Right" type="MeshInstance3D" parent="."] +transform = Transform3D(-1.74846e-08, 0.16383, 0.172073, 0, 0.114715, -0.245746, -0.4, -7.16125e-09, -7.52155e-09, 0.8, 0.75, 0) +mesh = ExtResource("1_kadxh") +skeleton = NodePath("") diff --git a/client/player/character/headwear/horn.res b/client/player/character/headwear/horn.res Binary files differnew file mode 100644 index 00000000..aab67051 --- /dev/null +++ b/client/player/character/headwear/horn.res |