From dd9e180163fbfb8bb95bb77906b984a122576e0f Mon Sep 17 00:00:00 2001 From: tpart Date: Fri, 6 Jun 2025 20:40:29 +0200 Subject: Fix green dots on customer torso (closes #299) --- client/player/character/cat_ears.gd | 34 ----------------------- client/player/character/cat_ears.gd.uid | 1 - client/player/character/cat_ears.tscn | 17 ------------ client/player/character/character.tscn | 2 +- client/player/character/customer_body.res | Bin 23697 -> 25327 bytes client/player/character/default/main.res | Bin 30046 -> 30072 bytes client/player/character/headwear/cat_ears.gd | 34 +++++++++++++++++++++++ client/player/character/headwear/cat_ears.gd.uid | 1 + client/player/character/headwear/cat_ears.tscn | 17 ++++++++++++ 9 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 client/player/character/cat_ears.gd delete mode 100644 client/player/character/cat_ears.gd.uid delete mode 100644 client/player/character/cat_ears.tscn create mode 100644 client/player/character/headwear/cat_ears.gd create mode 100644 client/player/character/headwear/cat_ears.gd.uid create mode 100644 client/player/character/headwear/cat_ears.tscn (limited to 'client/player') diff --git a/client/player/character/cat_ears.gd b/client/player/character/cat_ears.gd deleted file mode 100644 index fbf2c8e2..00000000 --- a/client/player/character/cat_ears.gd +++ /dev/null @@ -1,34 +0,0 @@ -# Hurry Curry! - a game about cooking -# Copyright 2025 nokoe -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, version 3 of the License only. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -class_name CatEars -extends Node3D - -const EAR_ROTATION := deg_to_rad(20.) -var ear_target := 0. - -func set_inner_mat(mat: BaseMaterial3D): - $Left.set_surface_override_material(1, mat) - $Right.set_surface_override_material(1, mat) - - -func set_outer_mat(mat: BaseMaterial3D): - $Left.set_surface_override_material(0, mat) - $Right.set_surface_override_material(0, mat) - -func _process(delta: float) -> void: - if visible: - $Right.rotation.z = G.interpolate_angle($Right.rotation.z, ear_target + EAR_ROTATION, delta * 10.) - $Left.rotation.z = G.interpolate_angle($Left.rotation.z, PI + ear_target + EAR_ROTATION, delta * 10.) diff --git a/client/player/character/cat_ears.gd.uid b/client/player/character/cat_ears.gd.uid deleted file mode 100644 index 23c4925e..00000000 --- a/client/player/character/cat_ears.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cyyugv3ylq8ux diff --git a/client/player/character/cat_ears.tscn b/client/player/character/cat_ears.tscn deleted file mode 100644 index b998fded..00000000 --- a/client/player/character/cat_ears.tscn +++ /dev/null @@ -1,17 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://dspkdcg1ui6dl"] - -[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"] -script = ExtResource("1_q747p") - -[node name="Left" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.391948, 0.0798526, 2.14072e-08, 0.0798526, 0.391948, 6.34998e-09, 1.97086e-08, -1.04957e-08, 0.4, -0.0100086, 0.361507, 1.20572e-08) -mesh = ExtResource("1_5c3r8") -skeleton = NodePath("") - -[node name="Right" type="MeshInstance3D" parent="."] -transform = Transform3D(0.389421, -0.0913844, -2.23025e-08, 0.0913844, 0.389421, 5.89238e-09, 2.03665e-08, -1.08318e-08, 0.4, 0.0104306, 0.370664, 1.26181e-08) -mesh = ExtResource("1_5c3r8") -skeleton = NodePath("") diff --git a/client/player/character/character.tscn b/client/player/character/character.tscn index 61caa26c..41f870c6 100644 --- a/client/player/character/character.tscn +++ b/client/player/character/character.tscn @@ -10,7 +10,7 @@ [ext_resource type="ArrayMesh" uid="uid://dx7jswwaesok4" path="res://player/character/hairstyles/hair_2.res" id="7_1403k"] [ext_resource type="ArrayMesh" uid="uid://c5qsthvtf3cta" path="res://player/character/hairstyles/hair_3.res" id="8_x5g32"] [ext_resource type="ArrayMesh" uid="uid://c2qnwt44x8ujl" path="res://player/character/default/tie.res" id="9_kgric"] -[ext_resource type="PackedScene" uid="uid://dspkdcg1ui6dl" path="res://player/character/cat_ears.tscn" id="10_8pcb3"] +[ext_resource type="PackedScene" uid="uid://dspkdcg1ui6dl" path="res://player/character/headwear/cat_ears.tscn" id="10_8pcb3"] [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"] diff --git a/client/player/character/customer_body.res b/client/player/character/customer_body.res index dfe52118..33249d24 100644 Binary files a/client/player/character/customer_body.res and b/client/player/character/customer_body.res differ diff --git a/client/player/character/default/main.res b/client/player/character/default/main.res index 3ad69367..eda8300f 100644 Binary files a/client/player/character/default/main.res and b/client/player/character/default/main.res differ diff --git a/client/player/character/headwear/cat_ears.gd b/client/player/character/headwear/cat_ears.gd new file mode 100644 index 00000000..fbf2c8e2 --- /dev/null +++ b/client/player/character/headwear/cat_ears.gd @@ -0,0 +1,34 @@ +# Hurry Curry! - a game about cooking +# Copyright 2025 nokoe +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, version 3 of the License only. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +class_name CatEars +extends Node3D + +const EAR_ROTATION := deg_to_rad(20.) +var ear_target := 0. + +func set_inner_mat(mat: BaseMaterial3D): + $Left.set_surface_override_material(1, mat) + $Right.set_surface_override_material(1, mat) + + +func set_outer_mat(mat: BaseMaterial3D): + $Left.set_surface_override_material(0, mat) + $Right.set_surface_override_material(0, mat) + +func _process(delta: float) -> void: + if visible: + $Right.rotation.z = G.interpolate_angle($Right.rotation.z, ear_target + EAR_ROTATION, delta * 10.) + $Left.rotation.z = G.interpolate_angle($Left.rotation.z, PI + ear_target + EAR_ROTATION, delta * 10.) diff --git a/client/player/character/headwear/cat_ears.gd.uid b/client/player/character/headwear/cat_ears.gd.uid new file mode 100644 index 00000000..23c4925e --- /dev/null +++ b/client/player/character/headwear/cat_ears.gd.uid @@ -0,0 +1 @@ +uid://cyyugv3ylq8ux diff --git a/client/player/character/headwear/cat_ears.tscn b/client/player/character/headwear/cat_ears.tscn new file mode 100644 index 00000000..3d611484 --- /dev/null +++ b/client/player/character/headwear/cat_ears.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=3 format=3 uid="uid://dspkdcg1ui6dl"] + +[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/headwear/cat_ears.gd" id="1_q747p"] + +[node name="CatEars" type="Node3D"] +script = ExtResource("1_q747p") + +[node name="Left" type="MeshInstance3D" parent="."] +transform = Transform3D(-0.391948, 0.0798526, 2.14072e-08, 0.0798526, 0.391948, 6.34998e-09, 1.97086e-08, -1.04957e-08, 0.4, -0.0100086, 0.361507, 1.20572e-08) +mesh = ExtResource("1_5c3r8") +skeleton = NodePath("") + +[node name="Right" type="MeshInstance3D" parent="."] +transform = Transform3D(0.389421, -0.0913844, -2.23025e-08, 0.0913844, 0.389421, 5.89238e-09, 2.03665e-08, -1.08318e-08, 0.4, 0.0104306, 0.370664, 1.26181e-08) +mesh = ExtResource("1_5c3r8") +skeleton = NodePath("") -- cgit v1.2.3-70-g09d2