diff --git a/assets/fonts/NotoColorEmoji.ttf b/assets/fonts/NotoColorEmoji.ttf new file mode 100644 index 0000000..943741d Binary files /dev/null and b/assets/fonts/NotoColorEmoji.ttf differ diff --git a/assets/fonts/NotoColorEmoji.ttf.import b/assets/fonts/NotoColorEmoji.ttf.import new file mode 100644 index 0000000..2da1ac5 --- /dev/null +++ b/assets/fonts/NotoColorEmoji.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cv63xhs0xcoc1" +path="res://.godot/imported/NotoColorEmoji.ttf-5bcefd16ba84146614613f6de606de52.fontdata" + +[deps] + +source_file="res://assets/fonts/NotoColorEmoji.ttf" +dest_files=["res://.godot/imported/NotoColorEmoji.ttf-5bcefd16ba84146614613f6de606de52.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +modulate_color_glyphs=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/prefabs/ui/player_info.gd b/prefabs/ui/player_info.gd index 39ac56b..a0f4762 100644 --- a/prefabs/ui/player_info.gd +++ b/prefabs/ui/player_info.gd @@ -20,7 +20,7 @@ func set_player(player: Player) -> void: func _update_player_info(player: Player) -> void: money_label.text = "$%d" % player.money - votes_label.text = "%d 🗳️" % player.votes + votes_label.text = "%d" % player.votes for child in permits_container.get_children(): child.queue_free() for i in range(player.building_permits): diff --git a/prefabs/ui/player_info.tscn b/prefabs/ui/player_info.tscn index 5dd8385..36ced7d 100644 --- a/prefabs/ui/player_info.tscn +++ b/prefabs/ui/player_info.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://8sd8fkx3hua0"] [ext_resource type="Script" uid="uid://ccx3jyc31veok" path="res://prefabs/ui/player_info.gd" id="1_tautg"] +[ext_resource type="FontFile" uid="uid://cv63xhs0xcoc1" path="res://assets/fonts/NotoColorEmoji.ttf" id="2_lpiko"] [sub_resource type="LabelSettings" id="LabelSettings_lpiko"] resource_local_to_scene = true @@ -20,6 +21,10 @@ font_color = Color(0, 0, 1, 1) outline_size = 4 outline_color = Color(0, 0, 0, 1) +[sub_resource type="LabelSettings" id="LabelSettings_foovh"] +font = ExtResource("2_lpiko") +font_size = 24 + [node name="PlayerInfo" type="HBoxContainer" unique_id=1335388560] offset_right = 40.0 offset_bottom = 40.0 @@ -42,8 +47,16 @@ layout_mode = 2 text = "$0" label_settings = SubResource("LabelSettings_tautg") -[node name="Votes" type="Label" parent="." unique_id=1929524068] +[node name="Votes" type="HBoxContainer" parent="." unique_id=902142402] +layout_mode = 2 + +[node name="Votes" type="Label" parent="Votes" unique_id=1929524068] unique_name_in_owner = true layout_mode = 2 text = "0" label_settings = SubResource("LabelSettings_0g7uu") + +[node name="Icon" type="Label" parent="Votes" unique_id=1102179585] +layout_mode = 2 +text = "🗳️" +label_settings = SubResource("LabelSettings_foovh") diff --git a/scenes/board_game.gd b/scenes/board_game.gd index 1846e92..b3d2296 100644 --- a/scenes/board_game.gd +++ b/scenes/board_game.gd @@ -17,7 +17,7 @@ const SHOP_SCENE = preload("uid://dbn63mv0peqf") const CHURCH_SCENE = preload("uid://brn0nbkela0m4") const CITY_HALL_SCENE = preload("uid://dtnejoimqiu0o") const DEMOLITIONS_SCENE = preload("uid://dvmglvbersupv") -const POST_OFFICE_SCENE = preload("uid://bpi8owv5lxyjy") +#const POST_OFFICE_SCENE = preload("uid://bpi8owv5lxyjy") const BASE_DECK = [ BANK_SCENE,