diff --git a/global/const/game.gd b/global/const/game.gd index 106e556..3a8d307 100644 --- a/global/const/game.gd +++ b/global/const/game.gd @@ -4,7 +4,7 @@ const WORKER_RESOURCE_ID: String = "worker" const WORKER_ROLE_RESOURCE: Array[String] = [WORKER_RESOURCE_ID, "swordsman"] const VERSION_MAJOR: String = "prototype" -const VERSION_MINOR: String = "release 1.2" +const VERSION_MINOR: String = "release 1.2b" const PARAMS: Dictionary = PARAMS_PROD #PARAMS_PROD #PARAMS_DEBUG diff --git a/resources/game_data/substance_data/substance_data.gd b/resources/game_data/substance_data/substance_data.gd index ec536e0..00dd9cb 100644 --- a/resources/game_data/substance_data/substance_data.gd +++ b/resources/game_data/substance_data/substance_data.gd @@ -52,7 +52,7 @@ func get_display_info() -> String: func get_craft_title() -> String: - var craft_title: String = Locale.get_substance_text(id + "_craft_title") + var craft_title: String = Locale.get_ui_label("craft") + " : " + get_display_title() if StringUtils.is_not_empty(craft_title): return craft_title return "Craft " + get_display_title() diff --git a/scenes/autostart/main/reborn_ui/reborn_ui.gd b/scenes/autostart/main/reborn_ui/reborn_ui.gd index cb0e91f..4f37588 100644 --- a/scenes/autostart/main/reborn_ui/reborn_ui.gd +++ b/scenes/autostart/main/reborn_ui/reborn_ui.gd @@ -36,7 +36,7 @@ func push_next_label() -> void: _index += 1 var key: String = "reborn_" + str(reborn) + "_line_" + str(_index) _text = Locale.get_ui_label(key) - if StringUtils.is_empty(_text) and not _is_last_text: + if (StringUtils.is_empty(_text) or _text == "?") and not _is_last_text: _text = "..." _is_last_text = true if not _is_last_text: @@ -46,9 +46,9 @@ func push_next_label() -> void: _is_last_text = true button.visible = true - if _text == " ": - _on_typing_animation_end() - elif StringUtils.is_not_empty(_text) and not _text == "?": + #if _text == " ": + # _on_typing_animation_end() + if StringUtils.is_not_empty(_text) and not _text == "?": _add_label_typing(_text) else: SignalBus.prestige_reborn.emit() diff --git a/scenes/ui/info_container/info_container.tscn b/scenes/ui/info_container/info_container.tscn index c93a1f5..f106141 100644 --- a/scenes/ui/info_container/info_container.tscn +++ b/scenes/ui/info_container/info_container.tscn @@ -35,13 +35,12 @@ text = "Rare Title" [node name="InfoLabelShake" parent="MarginContainer/VBoxContainer" instance=ExtResource("2_rsr25")] unique_name_in_owner = true visible = false -custom_minimum_size = Vector2(850, 30) +custom_minimum_size = Vector2(845, 30) layout_mode = 2 -theme_override_font_sizes/font_size = 13 +theme_override_font_sizes/font_size = 14 text = "Venture on a hunt for some rare resources!Venture on a hunt for some rare resources!Venture on a hunt for some rare resources!" autowrap_mode = 3 -_current_font_size = 13 -_size_just_modified_by_autosizer = true +_current_font_size = 14 [node name="TitleLabel" type="Label" parent="MarginContainer/VBoxContainer"] unique_name_in_owner = true @@ -57,7 +56,7 @@ _editor_defaults_set = true [node name="InfoLabel" type="Label" parent="MarginContainer/VBoxContainer"] unique_name_in_owner = true -custom_minimum_size = Vector2(850, 30) +custom_minimum_size = Vector2(845, 30) layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3