From ec84e1564fa193b0ee09e4b673c57fa8b76fbcd4 Mon Sep 17 00:00:00 2001 From: Magpie490 Date: Mon, 2 Jun 2025 21:33:11 +0100 Subject: [PATCH] fix --- common/governments/00_government_types.txt | 2 +- common/on_action/title_on_actions.txt | 3 - .../00_diarchy_scripted_triggers.txt | 1 - gui/window_admin_vassal_detail.gui | 104 ++++----- gui/window_government_administration.gui | 209 +++++++----------- 5 files changed, 132 insertions(+), 187 deletions(-) diff --git a/common/governments/00_government_types.txt b/common/governments/00_government_types.txt index fa8053b9..14b553c6 100644 --- a/common/governments/00_government_types.txt +++ b/common/governments/00_government_types.txt @@ -275,7 +275,7 @@ administrative_government = { rulers_should_have_dynasty = yes dynasty_named_realms = no royal_court = yes - administrative = yes + #administrative = yes landless_playable = yes legitimacy = yes #state_faith = yes diff --git a/common/on_action/title_on_actions.txt b/common/on_action/title_on_actions.txt index 742e0d96..4eae4e9d 100644 --- a/common/on_action/title_on_actions.txt +++ b/common/on_action/title_on_actions.txt @@ -2708,14 +2708,12 @@ on_vassal_change = { if = { limit = { government_has_flag = government_is_administrative - is_house_head = yes highest_held_title_tier >= tier_duchy liege = { is_independent_ruler = yes government_has_flag = government_is_administrative } NOR = { - any_held_title = { is_noble_family_title = yes } house = { any_house_member = { any_held_title = { is_noble_family_title = yes } @@ -2723,7 +2721,6 @@ on_vassal_change = { } } } - create_noble_family_effect = yes domicile ?= { set_up_domicile_estate_effect = yes } } ### If an admin ruler becomes independent, who are not of a high enough rank, changes government diff --git a/common/scripted_triggers/00_diarchy_scripted_triggers.txt b/common/scripted_triggers/00_diarchy_scripted_triggers.txt index c0c7af25..52bd0a8f 100644 --- a/common/scripted_triggers/00_diarchy_scripted_triggers.txt +++ b/common/scripted_triggers/00_diarchy_scripted_triggers.txt @@ -468,7 +468,6 @@ valid_co_emperor_candidate_trigger = { } } scope:co_emperor_temp = house.house_head - any_held_title = { is_noble_family_title = yes } } } } diff --git a/gui/window_admin_vassal_detail.gui b/gui/window_admin_vassal_detail.gui index 775c9f6a..511e3a8c 100644 --- a/gui/window_admin_vassal_detail.gui +++ b/gui/window_admin_vassal_detail.gui @@ -111,7 +111,9 @@ text = ADMIN_WINDOW_THEME_ADMINISTRATION_TYPE } - button_modify_theme = { } + button_modify_theme = { + using = tooltip_se + } button_round = { datacontext = "[Title.GetHolder.GetLiege]" @@ -124,7 +126,10 @@ parentanchor = center alwaystransparent = yes } + + using = tooltip_se } + button_round = { visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]" enabled = "[Character.IsPlayerInteractionValid('give_vassal_directive_interaction')]" @@ -137,10 +142,13 @@ alwaystransparent = yes parentanchor = center } + using = tooltip_se } + vbox = { margin_top = -11 + text_single = { visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]" text = "[Character.Custom('vassal_directive_icon')]" @@ -287,54 +295,36 @@ margin_top = 12 spacing = 4 - button_round = { - visible = "[Character.IsPlayerInteractionShown('force_step_down_interaction')]" - enabled = "[Character.IsPlayerInteractionValid('force_step_down_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('force_step_down_interaction')]" - onclick = "[Character.OpenPlayerInteraction('force_step_down_interaction')]" - - button_force_to_step_down = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - visible = "[Character.IsPlayerInteractionShown('start_subsume_province_interaction')]" - enabled = "[Character.IsPlayerInteractionValid('start_subsume_province_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_subsume_province_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_subsume_province_interaction')]" - - button_subsume_province = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - visible = "[Character.IsPlayerInteractionShown('start_dispute_border_interaction')]" - enabled = "[Character.IsPlayerInteractionValid('start_dispute_border_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_dispute_border_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_dispute_border_interaction')]" - - button_dispute_border = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - visible = "[Character.IsPlayerInteractionShown('frontier_influence_war_interaction')]" - enabled = "[Character.IsPlayerInteractionValid('frontier_influence_war_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('frontier_influence_war_interaction')]" - onclick = "[Character.OpenPlayerInteraction('frontier_influence_war_interaction')]" - - button_declare_war = { - parentanchor = center - alwaystransparent = yes - } - } expand = {} + + button_round = { + visible = "[And( Not(Character.IsLocalPlayer), Not( Character.IsIndependentRuler ))]" + + tooltip = "ADMIN_GOVERNMENT_GOVERNOR_INTERACTIONS_BUTTON_TOOLTIP" + tooltip_visible = "[Not(IsInteractionMenuOpenForCharacterWithFilter(Character.Self, 'admin_governor'))]" + + onclick = "[ToggleFilteredCharacterInteractionMenu(Character.Self, 'admin_governor')]" + + button_icon = { + alwaystransparent = yes + parentanchor = center + size = { 30 30 } + texture = "gfx/interface/icons/flat_icons/character_interactions.dds" + } + + text_single = { + parentanchor = bottom|hcenter + position = { 0 3 } + text = "[GetNumberOfValidInteractionsWithFilter(Character.Self, 'admin_governor')]" + default_format = "#glow_color:{0.1,0.1,0.1,1.0}" + + background = { + margin = { 5 0 } + margin_top = -5 + using = Background_Area_Dark + } + } + } } expand = { } @@ -506,7 +496,7 @@ types AdminVassalDetails visible = "[And( AdminVassalSuccessorCandidate.IsLocalPlayerWinnerOrAnyLoser, And( And( AdminVassalSuccessorCandidate.IsLocalPlayerCandidate, AdminVassalSuccessorCandidate.IsLocalPlayerInvested ), Not( AdminVassalSuccessorCandidate.IsLocalPlayerCandidateInFirst ) ) )]" size = { 100% 100% } - + tooltip = "ADMIN_WINDOW_THEME_ADMINISTRATION_LOCAL_PLAYER_HAS_INVESTED_LOSING_TT" background = { @@ -525,7 +515,7 @@ types AdminVassalDetails visible = "[And( AdminVassalSuccessorCandidate.IsLocalPlayerWinnerOrAnyLoser, And( And( AdminVassalSuccessorCandidate.IsLocalPlayerCandidate, Not( AdminVassalSuccessorCandidate.IsLocalPlayerInvested ) ), Not( AdminVassalSuccessorCandidate.IsLocalPlayerCandidateInFirst ) ) )]" size = { 100% 100% } - + tooltip = "ADMIN_WINDOW_THEME_ADMINISTRATION_LOCAL_PLAYER_HAS_CANDIDATE_LOSING_TT" background = { @@ -542,9 +532,9 @@ types AdminVassalDetails widget = { name = "player_candidate_in_first_invested" visible = "[And( AdminVassalSuccessorCandidate.IsLocalPlayerWinnerOrAnyLoser, And( And( AdminVassalSuccessorCandidate.IsLocalPlayerCandidate, AdminVassalSuccessorCandidate.IsLocalPlayerCandidateInFirst ), AdminVassalSuccessorCandidate.IsLocalPlayerInvested ) )]" - + size = { 100% 100% } - + tooltip = "ADMIN_WINDOW_THEME_ADMINISTRATION_LOCAL_PLAYER_HAS_INVESTED_WINNING_TT" background = { @@ -563,7 +553,7 @@ types AdminVassalDetails visible = "[And( AdminVassalSuccessorCandidate.IsLocalPlayerWinnerOrAnyLoser, And( And( AdminVassalSuccessorCandidate.IsLocalPlayerCandidate, AdminVassalSuccessorCandidate.IsLocalPlayerCandidateInFirst ), Not( AdminVassalSuccessorCandidate.IsLocalPlayerInvested ) ) )]" size = { 100% 100% } - + tooltip = "ADMIN_WINDOW_THEME_ADMINISTRATION_LOCAL_PLAYER_HAS_CANDIDATE_WINNING_TT" background = { @@ -605,9 +595,14 @@ types AdminVassalDetails block "score_breakdown" { datacontext = "[AdminVassalDetailView.GetSuccessionScoreBreakdown(AdminVassalSuccessorCandidate.GetCandidate.Self )]" } + blockoverride "header_text" { + text = ADMIN_VASSAL_CANDIDATE_SCORE_TT_HEADING + } } } + using = tooltip_se + icon = { size = { 24 24 } texture = "gfx/interface/icons/flat_icons/election_vote_strength.dds" @@ -673,7 +668,7 @@ types AdminVassalDetails } } - type powerful_family_bonus = button { + type powerful_family_bonus = widget { allow_outside = yes datacontext = "[DynastyHouse]" @@ -683,7 +678,6 @@ types AdminVassalDetails size = { 36 36 } visible = "[HousePowerBonus.IsValid]" - onclick = "[OpenGameViewData( 'family_attribute_window', DynastyHouse.Self )]" tooltip = "ADMINISTRATIVE_GOVERNMENT_BONUS_TOOLTIP" highlight_icon = { diff --git a/gui/window_government_administration.gui b/gui/window_government_administration.gui index f1df01b1..33029c1c 100644 --- a/gui/window_government_administration.gui +++ b/gui/window_government_administration.gui @@ -120,7 +120,8 @@ spacing = 2 text_single = { - text = "[Title.GetStateFaith.GetName]" + datacontext = "[Title.GetStateFaith]" + text = "FAITH_NAME_TOOLTIPPED" using = Font_Size_Medium } @@ -174,7 +175,7 @@ } hbox = { - spacing = -2 + spacing = 2 background = { using = Background_Area_Dark @@ -184,81 +185,38 @@ } vbox = { - visible = "[Not(GetPlayer.IsIndependentRuler)]" layoutpolicy_vertical = expanding - spacing = -2 - - button_round = { - - enabled = "[Character.IsPlayerInteractionValid('request_governorship_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('request_governorship_interaction')]" - onclick = "[Character.OpenPlayerInteraction('request_governorship_interaction')]" - - button_grant_title_to_vassal = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - - enabled = "[Character.IsPlayerInteractionValid('admin_vassal_modify_vassal_contract_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('admin_vassal_modify_vassal_contract_interaction')]" - onclick = "[Character.OpenPlayerInteraction('admin_vassal_modify_vassal_contract_interaction')]" - - button_add_laws = { - parentanchor = center - alwaystransparent = yes - } - } - + expand = {} - } - - vbox = { - visible = "[Not(GetPlayer.IsIndependentRuler)]" - layoutpolicy_vertical = expanding - spacing = -2 button_round = { + visible = "[Not(GetPlayer.IsIndependentRuler)]" - enabled = "[Character.IsPlayerInteractionValid('request_council_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('request_council_interaction')]" - onclick = "[Character.OpenPlayerInteraction('request_council_interaction')]" + tooltip = "ADMIN_GOVERNMENT_LIEGE_INTERACTIONS_BUTTON_TOOLTIP" + tooltip_visible = "[Not(IsInteractionMenuOpenForCharacterWithFilter(Character.Self, 'admin_liege'))]" - button_royal_court = { - parentanchor = center + onclick = "[ToggleFilteredCharacterInteractionMenu(Character.Self, 'admin_liege')]" + + button_icon = { alwaystransparent = yes + parentanchor = center + size = { 30 30 } + texture = "gfx/interface/icons/flat_icons/character_interactions.dds" + } + + text_single = { + parentanchor = bottom|hcenter + position = { 0 3 } + text = "[GetNumberOfValidInteractionsWithFilter(Character.Self, 'admin_liege')]" + default_format = "#glow_color:{0.1,0.1,0.1,1.0}" + + background = { + margin = { 5 0 } + margin_top = -5 + using = Background_Area_Dark + } } } - - button_round = { - - enabled = "[Character.IsPlayerInteractionValid('start_foster_legitimacy_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_foster_legitimacy_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_foster_legitimacy_interaction')]" - - button_legitimacy = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - - enabled = "[Character.IsPlayerInteractionValid('start_damage_legitimacy_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_damage_legitimacy_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_damage_legitimacy_interaction')]" - - button_damage_legitimacy = { - parentanchor = center - alwaystransparent = yes - } - } - } - - spacer = { - size = { 4 1 } } portrait_head = { @@ -303,6 +261,9 @@ hbox = { spacing = 4 + layoutpolicy_horizontal = expanding + margin = { 16 0 } + margin_bottom = 8 hbox = { spacing = 2 @@ -332,9 +293,6 @@ } } - spacer = { - size = { 12 0 } - } button_standard = { name = "sort_order" size = { 25 25 } @@ -359,6 +317,9 @@ } } + expand = {} + + button_checkbox_label = { onclick = "[GovernmentAdministrationWindow.ToggleGroupByHouse]" blockoverride "checkbox" @@ -1191,7 +1152,8 @@ types GovernmentAdministration background = { using = Background_Area_Dark - + alpha = 0.5 + margin = { 3 3 } modify_texture = { texture = "gfx/interface/component_masks/mask_fade_vertical.dds" blend_mode = alphamultiply @@ -1384,12 +1346,12 @@ types GovernmentAdministration } } - type button_family_group_item = button + type button_family_group_item = widget { size = { 525 110 } datacontext = "[AdminHouseItem.GetHouse]" datacontext = "[DynastyHouse.GetHeadOfHouse]" - onclick = "[GovernmentAdministrationWindow.SelectFeaturedHouse( DynastyHouse.Self )]" + background = { visible = "[ObjectsEqual( Character.GetHouse, Character.GetTopLiege.GetHouse )]" @@ -1581,6 +1543,7 @@ types GovernmentAdministration layoutpolicy_horizontal = expanding margin_top = 4 datacontext = "[DynastyHouse.GetHeadOfHouse]" + spacing = 8 hbox_access_domicile_button = { datacontext = "[DynastyHouse.GetHeadOfHouse]" @@ -1588,52 +1551,9 @@ types GovernmentAdministration } - button_round = { - visible = "[And( Character.HasDomicile, Not( DynastyHouse.GetHeadOfHouse.IsPlayer ) )]" - enabled = "[Character.IsPlayerInteractionValid('start_raid_estate_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_raid_estate_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_raid_estate_interaction')]" - - button_army_toggle_raiding = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - visible = "[Not( DynastyHouse.GetHeadOfHouse.IsPlayer )]" - enabled = "[Character.IsPlayerInteractionValid('start_slander_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_slander_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_slander_interaction')]" - - button_slander = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - visible = "[Not( DynastyHouse.GetHeadOfHouse.IsPlayer )]" - enabled = "[Character.IsPlayerInteractionValid('start_challenge_status_interaction')]" - tooltip = "[Character.GetPlayerInteractionTooltip('start_challenge_status_interaction')]" - onclick = "[Character.OpenPlayerInteraction('start_challenge_status_interaction')]" - - button_challenge_status = { - parentanchor = center - alwaystransparent = yes - } - } - - button_round = { - visible = "[Not( DynastyHouse.GetHeadOfHouse.IsPlayer )]" - enabled = "[Character.IsPlayerInteractionValid('request_appointment_support')]" - tooltip = "[Character.GetPlayerInteractionTooltip('request_appointment_support')]" - onclick = "[Character.OpenPlayerInteraction('request_appointment_support')]" - - button_request_appointment_support = { - parentanchor = center - alwaystransparent = yes - } + button_standard = { + text = "ADMIN_GOVERNMENT_HOUSE_MEMBER_COUNT" + onclick = "[GovernmentAdministrationWindow.SelectFeaturedHouse( DynastyHouse.Self )]" } expand = {} @@ -1641,16 +1561,51 @@ types GovernmentAdministration expand = {} } - portrait_head_small = { - blockoverride "portrait_button" - { - using = tooltip_ws + hbox = { + spacing = 2 + + background = { + using = Background_Area_Dark + alpha = 0.7 + + margin = { 4 4 } } - blockoverride "glow_visible" - { - visible = no + + vbox = { + layoutpolicy_vertical = expanding + + expand = {} + + button_round = { + visible = "[Not( Character.IsPlayer )]" + + tooltip = "ADMIN_GOVERNMENT_HOUSE_HEAD_INTERACTIONS_BUTTON_TOOLTIP" + tooltip_visible = "[Not(IsInteractionMenuOpenForCharacterWithFilter(Character.Self, 'admin_house_head'))]" + + onclick = "[ToggleFilteredCharacterInteractionMenu(Character.Self, 'admin_house_head')]" + + button_icon = { + alwaystransparent = yes + parentanchor = center + size = { 30 30 } + texture = "gfx/interface/icons/flat_icons/character_interactions.dds" + } + } + } + + portrait_head_small = { + blockoverride "portrait_button" + { + using = tooltip_ws + } + blockoverride "glow_visible" + { + visible = no + } } } + + } } }