diff --git a/scripts/scenes/battle_scene.gd b/scripts/scenes/battle_scene.gd index ea0f20e..2d9f776 100644 --- a/scripts/scenes/battle_scene.gd +++ b/scripts/scenes/battle_scene.gd @@ -250,13 +250,13 @@ const LOCAL_COMMAND_CANCEL_BUTTON_SIZE := Vector2(186, 26) const LOCAL_COMMAND_HEADER_ICON_SIZE := Vector2(24, 24) const POST_MOVE_MENU_SIZE := Vector2(206, 106) const POST_MOVE_TITLE_SIZE := Vector2(186, 20) -const POST_MOVE_PICKER_PANEL_SIZE := Vector2(334, 216) -const POST_MOVE_PICKER_TITLE_SIZE := Vector2(298, 22) -const POST_MOVE_PICKER_DETAIL_SIZE := Vector2(298, 28) -const POST_MOVE_PICKER_SCROLL_SIZE := Vector2(298, 88) -const POST_MOVE_PICKER_OPTION_SIZE := Vector2(298, 44) -const POST_MOVE_PICKER_OPTION_ICON_MAX_WIDTH := 38 -const POST_MOVE_PICKER_UTILITY_BUTTON_SIZE := Vector2(152, 30) +const POST_MOVE_PICKER_PANEL_SIZE := Vector2(306, 190) +const POST_MOVE_PICKER_TITLE_SIZE := Vector2(272, 20) +const POST_MOVE_PICKER_DETAIL_SIZE := Vector2(272, 24) +const POST_MOVE_PICKER_SCROLL_SIZE := Vector2(272, 72) +const POST_MOVE_PICKER_OPTION_SIZE := Vector2(272, 38) +const POST_MOVE_PICKER_OPTION_ICON_MAX_WIDTH := 32 +const POST_MOVE_PICKER_UTILITY_BUTTON_SIZE := Vector2(138, 28) const PICKER_UTILITY_ICON_MAX_WIDTH := 22 const SIDE_MENU_OPTION_SIZE := Vector2(420, 46) const SIDE_MENU_OPTION_ICON_MAX_WIDTH := 34 @@ -4278,7 +4278,7 @@ func _create_hud() -> void: root.add_child(post_move_picker_panel) var picker_column := VBoxContainer.new() - picker_column.add_theme_constant_override("separation", 6) + picker_column.add_theme_constant_override("separation", 4) post_move_picker_panel.add_child(picker_column) post_move_picker_title_label = Label.new() @@ -4303,12 +4303,12 @@ func _create_hud() -> void: picker_column.add_child(picker_scroll) post_move_picker_list = VBoxContainer.new() - post_move_picker_list.add_theme_constant_override("separation", 4) + post_move_picker_list.add_theme_constant_override("separation", 3) post_move_picker_list.size_flags_horizontal = Control.SIZE_EXPAND_FILL picker_scroll.add_child(post_move_picker_list) var picker_button_row := HBoxContainer.new() - picker_button_row.add_theme_constant_override("separation", 6) + picker_button_row.add_theme_constant_override("separation", 4) picker_column.add_child(picker_button_row) post_move_picker_back_button = Button.new() @@ -18784,6 +18784,7 @@ func _make_post_move_tactic_option_button(skill_id: String, skill: Dictionary, d button.icon = _post_move_tactic_icon_texture(skill) button.expand_icon = false button.add_theme_constant_override("icon_max_width", POST_MOVE_PICKER_OPTION_ICON_MAX_WIDTH) + button.add_theme_font_size_override("font_size", 13) button.set_meta("picker_icon", _post_move_tactic_icon_kind(skill)) button.set_meta("picker_label", skill_name) button.set_meta("flat_readable_button", true) @@ -18806,6 +18807,7 @@ func _make_post_move_item_option_button(item_id: String, item: Dictionary, count button.icon = _post_move_item_icon_texture(item) button.expand_icon = false button.add_theme_constant_override("icon_max_width", POST_MOVE_PICKER_OPTION_ICON_MAX_WIDTH) + button.add_theme_font_size_override("font_size", 13) button.set_meta("picker_icon", "item") button.set_meta("picker_label", item_name) button.set_meta("flat_readable_button", true) diff --git a/tools/smoke_post_move_action_flow.gd b/tools/smoke_post_move_action_flow.gd index 0916e72..3480d8e 100644 --- a/tools/smoke_post_move_action_flow.gd +++ b/tools/smoke_post_move_action_flow.gd @@ -448,7 +448,7 @@ func _check_scene_post_move_text_fit(failures: Array[String]) -> void: _check_fitted_label_font(failures, scene.post_move_title_label, BattleSceneScript.LOCAL_COMMAND_TITLE_FONT_SIZE, BattleSceneScript.LOCAL_COMMAND_TITLE_MIN_FONT_SIZE, "post-move long unit title") scene._show_post_move_picker("tactic") - if BattleSceneScript.POST_MOVE_PICKER_PANEL_SIZE.y > 240.0: + if BattleSceneScript.POST_MOVE_PICKER_PANEL_SIZE.x > 320.0 or BattleSceneScript.POST_MOVE_PICKER_PANEL_SIZE.y > 200.0: failures.append("post-move picker should stay compact enough not to cover the battle center: %s" % str(BattleSceneScript.POST_MOVE_PICKER_PANEL_SIZE)) if scene.post_move_picker_title_label == null: failures.append("post-move picker should expose a fitted title label")