diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-07 19:52:47 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-07 19:52:47 +0200 |
| commit | f88a296aac8840f713031b5b716b8d9fa3e18b8c (patch) | |
| tree | 04a2ff1fb6e978a50aa2b9c7760b890fbb06d242 | |
| parent | 4176ad212972f235ef99e084d162329655841b61 (diff) | |
| parent | 66e9dfa64e0f5769aaf0122a23f35eec91e5dcd9 (diff) | |
| download | hurrycurry-f88a296aac8840f713031b5b716b8d9fa3e18b8c.tar hurrycurry-f88a296aac8840f713031b5b716b8d9fa3e18b8c.tar.bz2 hurrycurry-f88a296aac8840f713031b5b716b8d9fa3e18b8c.tar.zst | |
Merge branch 'master' of https://codeberg.org/metamuffin/undercooked
| -rw-r--r-- | client/player/character/character.gd | 7 | ||||
| -rw-r--r-- | client/player/character/customer_body.res | bin | 0 -> 23697 bytes |
2 files changed, 7 insertions, 0 deletions
diff --git a/client/player/character/character.gd b/client/player/character/character.gd index 76d1785e..710d7ac3 100644 --- a/client/player/character/character.gd +++ b/client/player/character/character.gd @@ -16,6 +16,7 @@ extends Node3D class_name Character +const CUSTOMER_MAIN_MESH = preload("res://player/character/customer_body.res") const WALK_ANIM_STRENGTH := 0.05 const WALK_ANIM_SPEED:= 15.0 @@ -33,6 +34,7 @@ var current_animation := "idle" @onready var walking_particles = $Walking @onready var boosting_particles = $Boosting @onready var username_tag = $Username +@onready var tie = $Main/Tie @onready var hairstyles = { "Brown": $Main/Head/Hair, @@ -77,6 +79,7 @@ func _process(delta): func select_hairstyle(id: int): if id < 0: + to_customer() id *= -1 # TODO: Select customer character id = id % hairstyles.keys().size() var target = hairstyles.keys()[id] @@ -86,6 +89,10 @@ func select_hairstyle(id: int): else: hairstyles[k].hide() +func to_customer(): + main.mesh = CUSTOMER_MAIN_MESH + tie.queue_free() + func play_animation(name_: String): current_animation = name_ hand_animations.play(name_) diff --git a/client/player/character/customer_body.res b/client/player/character/customer_body.res Binary files differnew file mode 100644 index 00000000..dfe52118 --- /dev/null +++ b/client/player/character/customer_body.res |