From 0e8c607ae4fa9e09b56bd0ab4c112dec668941ed Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 12:51:39 +0200 Subject: Make hairstyle visible in multiplayer; Refactor settings to use godot's built-in system --- client/player/character/character.gd | 2 ++ client/player/controllable_player.gd | 1 + client/player/player.gd | 9 ++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'client/player') diff --git a/client/player/character/character.gd b/client/player/character/character.gd index c6ca9b50..224eb356 100644 --- a/client/player/character/character.gd +++ b/client/player/character/character.gd @@ -60,6 +60,8 @@ func _process(delta): play_animation(next_animation) func select_hairstyle(id: int): + if id < 0: + id *= -1 # TODO: Select customer character var target = hairstyles.keys()[id] for k in hairstyles.keys(): if k == target: diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index c4691b67..903f22c7 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -34,6 +34,7 @@ func _ready(): timer.connect("timeout", func(): game.mp.send_position(position_, rotation_) ) + super() func _process(delta): var input = Vector2(Input.get_axis("left", "right"), Input.get_axis("forward", "backwards")).normalized() diff --git a/client/player/player.gd b/client/player/player.gd index 4a5cfa6a..4806b19d 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -32,12 +32,13 @@ var bubble: ChatBubble = preload("res://player/chat_bubble.tscn").instantiate() var hand: Item = null var hand_base: Node3D = Node3D.new() +var character_idx: int var _anim_angle: float = 0.0 const HAND_BASE_POSITION: Vector3 = Vector3(0, .25, .4) -func _init(_id: int, new_name: String, pos: Vector2, _character: int, new_game: Game): +func _init(_id: int, new_name: String, pos: Vector2, new_character_idx: int, new_game: Game): add_child(character) position_ = pos name = new_name @@ -47,6 +48,12 @@ func _init(_id: int, new_name: String, pos: Vector2, _character: int, new_game: add_child(hand_base) add_child(bubble) + + character_idx = new_character_idx + + +func _ready(): + character.select_hairstyle(character_idx) func update_position(new_position: Vector2, new_rotation: float): position_ = new_position -- cgit v1.3 From d44686f29b676efeeb0a65f29f4eb3be9b964f9a Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 12:55:27 +0200 Subject: Make chat bubble unshaded; Disable depth test; Better readability --- client/player/chat_bubble.tscn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'client/player') diff --git a/client/player/chat_bubble.tscn b/client/player/chat_bubble.tscn index 1a5f7dfc..55139f63 100644 --- a/client/player/chat_bubble.tscn +++ b/client/player/chat_bubble.tscn @@ -12,12 +12,13 @@ viewport_path = NodePath("SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5iy0t"] resource_local_to_scene = true transparency = 1 +no_depth_test = true +shading_mode = 0 albedo_texture = SubResource("ViewportTexture_mko8a") billboard_mode = 2 [node name="ChatBubble" type="MeshInstance3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) -visible = false mesh = SubResource("QuadMesh_tlsxo") surface_material_override/0 = SubResource("StandardMaterial3D_5iy0t") script = ExtResource("1_4v1cx") -- cgit v1.3 From fcbf473429275556f6ea88f5ac40fb9411edd445 Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 12:55:55 +0200 Subject: Hide chat bubble by default --- client/player/chat_bubble.tscn | 1 + 1 file changed, 1 insertion(+) (limited to 'client/player') diff --git a/client/player/chat_bubble.tscn b/client/player/chat_bubble.tscn index 55139f63..34b20f93 100644 --- a/client/player/chat_bubble.tscn +++ b/client/player/chat_bubble.tscn @@ -19,6 +19,7 @@ billboard_mode = 2 [node name="ChatBubble" type="MeshInstance3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0) +visible = false mesh = SubResource("QuadMesh_tlsxo") surface_material_override/0 = SubResource("StandardMaterial3D_5iy0t") script = ExtResource("1_4v1cx") -- cgit v1.3 From 53bad26b05a558c819f29d80e22f584c00802951 Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 13:00:50 +0200 Subject: Make sure character index is not out of bounds --- client/player/character/character.gd | 1 + 1 file changed, 1 insertion(+) (limited to 'client/player') diff --git a/client/player/character/character.gd b/client/player/character/character.gd index 224eb356..820cba74 100644 --- a/client/player/character/character.gd +++ b/client/player/character/character.gd @@ -62,6 +62,7 @@ func _process(delta): func select_hairstyle(id: int): if id < 0: id *= -1 # TODO: Select customer character + id = id % hairstyles.keys().size() var target = hairstyles.keys()[id] for k in hairstyles.keys(): if k == target: -- cgit v1.3