diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-10-01 11:54:45 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-10-01 11:54:45 +0200 |
| commit | 34f7557f1b956425de3417ba7e92699fe22adb63 (patch) | |
| tree | 9d8bd5e6d93192a57f9316af2b2c29c4f40f65de | |
| parent | 0adff8e92c962cccafff157cdb90ae220475ebe0 (diff) | |
| parent | 474ec9345b4a7dd79745b5fbdcb952ee7e4236bb (diff) | |
| download | hurrycurry-34f7557f1b956425de3417ba7e92699fe22adb63.tar hurrycurry-34f7557f1b956425de3417ba7e92699fe22adb63.tar.bz2 hurrycurry-34f7557f1b956425de3417ba7e92699fe22adb63.tar.zst | |
Merge branch 'master' of https://codeberg.org/hurrycurry/hurrycurry
| -rw-r--r-- | client/player/character/character.gd | 21 | ||||
| -rw-r--r-- | client/player/character/robot/body.res | bin | 30064 -> 0 bytes |
2 files changed, 6 insertions, 15 deletions
diff --git a/client/player/character/character.gd b/client/player/character/character.gd index 65275549..cd41e7ff 100644 --- a/client/player/character/character.gd +++ b/client/player/character/character.gd @@ -19,7 +19,6 @@ class_name Character const DEFAULT_MAIN_MESH = preload("res://player/character/default/main.res") const CUSTOMER_MAIN_MESH = preload("res://player/character/customer_body.res") -const ROBOT_MAIN_MESH = preload("res://player/character/robot/body.res") const WALK_ANIM_STRENGTH := 0.05 const WALK_ANIM_SPEED:= 15.0 @@ -105,22 +104,14 @@ func _process(delta): func set_style(id: int): var p = ParsedStyle.new(id) - set_customer(p.customer) - set_robot(p.robot) + main.mesh = CUSTOMER_MAIN_MESH if p.customer else DEFAULT_MAIN_MESH + if p.customer: + tie.queue_free() + head_robot.visible = p.robot + head_default.visible = not p.robot for h in hairstyles: h.hide() hairstyles[p.hair].show() - $Main.get_active_material(0).albedo_color = colors[p.color] - -func set_customer(b: bool): - if b: - main.mesh = CUSTOMER_MAIN_MESH - tie.queue_free() - else: pass # TODO - -func set_robot(b: bool): - head_robot.visible = b - head_default.visible = not b - main.mesh = ROBOT_MAIN_MESH if b else DEFAULT_MAIN_MESH + $Main.get_active_material(0).albedo_color = Color(0.349, 0.349, 0.349) if p.robot else colors[p.color] func play_animation(name_: String): current_animation = name_ diff --git a/client/player/character/robot/body.res b/client/player/character/robot/body.res Binary files differdeleted file mode 100644 index b82147d3..00000000 --- a/client/player/character/robot/body.res +++ /dev/null |