damimani/N3OW
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Magpie490 2025-06-02 21:33:11 +01:00
parent 07da43f5be
commit ec84e1564f
5 changed files with 132 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/governments/00_government_types.txt
View file

@ -275,7 +275,7 @@ administrative_government = {
rulers_should_have_dynasty = yes rulers_should_have_dynasty = yes
dynasty_named_realms = no dynasty_named_realms = no
royal_court = yes royal_court = yes
administrative = yes #administrative = yes
landless_playable = yes landless_playable = yes
legitimacy = yes legitimacy = yes
#state_faith = yes #state_faith = yes

3
common/on_action/title_on_actions.txt
View file

@ -2708,14 +2708,12 @@ on_vassal_change = {
if = { if = {
limit = { limit = {
government_has_flag = government_is_administrative government_has_flag = government_is_administrative
is_house_head = yes
highest_held_title_tier >= tier_duchy highest_held_title_tier >= tier_duchy
liege = { liege = {
is_independent_ruler = yes is_independent_ruler = yes
government_has_flag = government_is_administrative government_has_flag = government_is_administrative
} }
NOR = { NOR = {
any_held_title = { is_noble_family_title = yes }
house = { house = {
any_house_member = { any_house_member = {
any_held_title = { is_noble_family_title = yes } 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 } domicile ?= { set_up_domicile_estate_effect = yes }
} }
### If an admin ruler becomes independent, who are not of a high enough rank, changes government ### If an admin ruler becomes independent, who are not of a high enough rank, changes government

1
common/scripted_triggers/00_diarchy_scripted_triggers.txt
View file

@ -468,7 +468,6 @@ valid_co_emperor_candidate_trigger = {
} }
} }
scope:co_emperor_temp = house.house_head scope:co_emperor_temp = house.house_head
any_held_title = { is_noble_family_title = yes }
} }
} }
} }

94
gui/window_admin_vassal_detail.gui
View file

@ -111,7 +111,9 @@
text = ADMIN_WINDOW_THEME_ADMINISTRATION_TYPE text = ADMIN_WINDOW_THEME_ADMINISTRATION_TYPE
} }
button_modify_theme = { } button_modify_theme = {
using = tooltip_se
}
button_round = { button_round = {
datacontext = "[Title.GetHolder.GetLiege]" datacontext = "[Title.GetHolder.GetLiege]"
@ -124,7 +126,10 @@
parentanchor = center parentanchor = center
alwaystransparent = yes alwaystransparent = yes
} }
using = tooltip_se
} }
button_round = { button_round = {
visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]" visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]"
enabled = "[Character.IsPlayerInteractionValid('give_vassal_directive_interaction')]" enabled = "[Character.IsPlayerInteractionValid('give_vassal_directive_interaction')]"
@ -137,10 +142,13 @@
alwaystransparent = yes alwaystransparent = yes
parentanchor = center parentanchor = center
} }
using = tooltip_se using = tooltip_se
} }
vbox = { vbox = {
margin_top = -11 margin_top = -11
text_single = { text_single = {
visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]" visible = "[Character.IsPlayerInteractionShown('give_vassal_directive_interaction')]"
text = "[Character.Custom('vassal_directive_icon')]" text = "[Character.Custom('vassal_directive_icon')]"
@ -287,54 +295,36 @@
margin_top = 12 margin_top = 12
spacing = 4 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 = {} 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 = { } expand = { }
@ -605,8 +595,13 @@ types AdminVassalDetails
block "score_breakdown" { block "score_breakdown" {
datacontext = "[AdminVassalDetailView.GetSuccessionScoreBreakdown(AdminVassalSuccessorCandidate.GetCandidate.Self )]" datacontext = "[AdminVassalDetailView.GetSuccessionScoreBreakdown(AdminVassalSuccessorCandidate.GetCandidate.Self )]"
} }
blockoverride "header_text" {
text = ADMIN_VASSAL_CANDIDATE_SCORE_TT_HEADING
} }
} }
}
using = tooltip_se
icon = { icon = {
size = { 24 24 } size = { 24 24 }
@ -673,7 +668,7 @@ types AdminVassalDetails
} }
} }
type powerful_family_bonus = button { type powerful_family_bonus = widget {
allow_outside = yes allow_outside = yes
datacontext = "[DynastyHouse]" datacontext = "[DynastyHouse]"
@ -683,7 +678,6 @@ types AdminVassalDetails
size = { 36 36 } size = { 36 36 }
visible = "[HousePowerBonus.IsValid]" visible = "[HousePowerBonus.IsValid]"
onclick = "[OpenGameViewData( 'family_attribute_window', DynastyHouse.Self )]"
tooltip = "ADMINISTRATIVE_GOVERNMENT_BONUS_TOOLTIP" tooltip = "ADMINISTRATIVE_GOVERNMENT_BONUS_TOOLTIP"
highlight_icon = { highlight_icon = {

181
gui/window_government_administration.gui
View file

@ -120,7 +120,8 @@
spacing = 2 spacing = 2
text_single = { text_single = {
text = "[Title.GetStateFaith.GetName]" datacontext = "[Title.GetStateFaith]"
text = "FAITH_NAME_TOOLTIPPED"
using = Font_Size_Medium using = Font_Size_Medium
} }
@ -174,7 +175,7 @@
} }
hbox = { hbox = {
spacing = -2 spacing = 2
background = { background = {
using = Background_Area_Dark using = Background_Area_Dark
@ -184,81 +185,38 @@
} }
vbox = { vbox = {
visible = "[Not(GetPlayer.IsIndependentRuler)]"
layoutpolicy_vertical = expanding 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 = {} expand = {}
}
vbox = { button_round = {
visible = "[Not(GetPlayer.IsIndependentRuler)]" visible = "[Not(GetPlayer.IsIndependentRuler)]"
layoutpolicy_vertical = expanding
spacing = -2
button_round = { tooltip = "ADMIN_GOVERNMENT_LIEGE_INTERACTIONS_BUTTON_TOOLTIP"
tooltip_visible = "[Not(IsInteractionMenuOpenForCharacterWithFilter(Character.Self, 'admin_liege'))]"
enabled = "[Character.IsPlayerInteractionValid('request_council_interaction')]" onclick = "[ToggleFilteredCharacterInteractionMenu(Character.Self, 'admin_liege')]"
tooltip = "[Character.GetPlayerInteractionTooltip('request_council_interaction')]"
onclick = "[Character.OpenPlayerInteraction('request_council_interaction')]"
button_royal_court = { button_icon = {
parentanchor = center
alwaystransparent = yes alwaystransparent = yes
}
}
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 parentanchor = center
alwaystransparent = yes size = { 30 30 }
} texture = "gfx/interface/icons/flat_icons/character_interactions.dds"
} }
button_round = { 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}"
enabled = "[Character.IsPlayerInteractionValid('start_damage_legitimacy_interaction')]" background = {
tooltip = "[Character.GetPlayerInteractionTooltip('start_damage_legitimacy_interaction')]" margin = { 5 0 }
onclick = "[Character.OpenPlayerInteraction('start_damage_legitimacy_interaction')]" margin_top = -5
using = Background_Area_Dark
button_damage_legitimacy = {
parentanchor = center
alwaystransparent = yes
} }
} }
} }
spacer = {
size = { 4 1 }
} }
portrait_head = { portrait_head = {
@ -303,6 +261,9 @@
hbox = { hbox = {
spacing = 4 spacing = 4
layoutpolicy_horizontal = expanding
margin = { 16 0 }
margin_bottom = 8
hbox = { hbox = {
spacing = 2 spacing = 2
@ -332,9 +293,6 @@
} }
} }
spacer = {
size = { 12 0 }
}
button_standard = { button_standard = {
name = "sort_order" name = "sort_order"
size = { 25 25 } size = { 25 25 }
@ -359,6 +317,9 @@
} }
} }
expand = {}
button_checkbox_label = { button_checkbox_label = {
onclick = "[GovernmentAdministrationWindow.ToggleGroupByHouse]" onclick = "[GovernmentAdministrationWindow.ToggleGroupByHouse]"
blockoverride "checkbox" blockoverride "checkbox"
@ -1191,7 +1152,8 @@ types GovernmentAdministration
background = { background = {
using = Background_Area_Dark using = Background_Area_Dark
alpha = 0.5
margin = { 3 3 }
modify_texture = { modify_texture = {
texture = "gfx/interface/component_masks/mask_fade_vertical.dds" texture = "gfx/interface/component_masks/mask_fade_vertical.dds"
blend_mode = alphamultiply blend_mode = alphamultiply
@ -1384,12 +1346,12 @@ types GovernmentAdministration
} }
} }
type button_family_group_item = button type button_family_group_item = widget
{ {
size = { 525 110 } size = { 525 110 }
datacontext = "[AdminHouseItem.GetHouse]" datacontext = "[AdminHouseItem.GetHouse]"
datacontext = "[DynastyHouse.GetHeadOfHouse]" datacontext = "[DynastyHouse.GetHeadOfHouse]"
onclick = "[GovernmentAdministrationWindow.SelectFeaturedHouse( DynastyHouse.Self )]"
background = { background = {
visible = "[ObjectsEqual( Character.GetHouse, Character.GetTopLiege.GetHouse )]" visible = "[ObjectsEqual( Character.GetHouse, Character.GetTopLiege.GetHouse )]"
@ -1581,6 +1543,7 @@ types GovernmentAdministration
layoutpolicy_horizontal = expanding layoutpolicy_horizontal = expanding
margin_top = 4 margin_top = 4
datacontext = "[DynastyHouse.GetHeadOfHouse]" datacontext = "[DynastyHouse.GetHeadOfHouse]"
spacing = 8
hbox_access_domicile_button = { hbox_access_domicile_button = {
datacontext = "[DynastyHouse.GetHeadOfHouse]" datacontext = "[DynastyHouse.GetHeadOfHouse]"
@ -1588,52 +1551,9 @@ types GovernmentAdministration
} }
button_round = { button_standard = {
visible = "[And( Character.HasDomicile, Not( DynastyHouse.GetHeadOfHouse.IsPlayer ) )]" text = "ADMIN_GOVERNMENT_HOUSE_MEMBER_COUNT"
enabled = "[Character.IsPlayerInteractionValid('start_raid_estate_interaction')]" onclick = "[GovernmentAdministrationWindow.SelectFeaturedHouse( DynastyHouse.Self )]"
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
}
} }
expand = {} expand = {}
@ -1641,6 +1561,38 @@ types GovernmentAdministration
expand = {} expand = {}
} }
hbox = {
spacing = 2
background = {
using = Background_Area_Dark
alpha = 0.7
margin = { 4 4 }
}
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 = { portrait_head_small = {
blockoverride "portrait_button" blockoverride "portrait_button"
{ {
@ -1652,6 +1604,9 @@ types GovernmentAdministration
} }
} }
} }
}
} }
} }
} }