diff --git a/common/culture/cultures/NEOW_cisalpine.txt b/common/culture/cultures/NEOW_cisalpine.txt index e2c583e2..38d95308 100644 --- a/common/culture/cultures/NEOW_cisalpine.txt +++ b/common/culture/cultures/NEOW_cisalpine.txt @@ -1,95 +1,4 @@ -cisalpine = { - color = { 0.95 0.95 0.55 } - - created = 800.1.1 - - parents = { frankish lombard } - - ethos = ethos_communal - heritage = heritage_cisalpine - language = language_cisalpine - martial_custom = martial_custom_male_only - traditions = { - tradition_republican_legacy - tradition_mountain_homes - tradition_maritime_mercantilism - } - - name_list = name_list_cisalpine - - coa_gfx = { latin_group_coa_gfx western_coa_gfx } - building_gfx = { mediterranean_building_gfx } - clothing_gfx = { western_clothing_gfx } - unit_gfx = { western_unit_gfx } - - ethnicities = { - 10 = mediterranean - } -} - -lombard = { #Italo-Lombards - color = { 0.8 0.8 0.5 } - - created = 650.1.1 - - parents = { langobard italian } - - ethos = ethos_stoic - heritage = heritage_cisalpine - language = language_cisalpine - martial_custom = martial_custom_male_only - traditions = { - tradition_isolationist - tradition_martial_admiration - tradition_stand_and_fight - tradition_republican_legacy - } - - name_list = name_list_lombard - - coa_gfx = { latin_group_coa_gfx western_coa_gfx } - building_gfx = { mediterranean_building_gfx } - clothing_gfx = { western_clothing_gfx } - unit_gfx = { western_unit_gfx } - - ethnicities = { - 10 = mediterranean - } -} - -langobard = { #Germanic Ancestor culture - color = langobard - - ethos = ethos_stoic - heritage = heritage_central_germanic - language = language_central_germanic - martial_custom = martial_custom_male_only - traditions = { - tradition_isolationist - tradition_martial_admiration - tradition_stand_and_fight - } - - dlc_tradition = { - trait = tradition_malleable_invaders - requires_dlc_flag = hybridize_culture - } - - name_list = name_list_lombard - - coa_gfx = { latin_group_coa_gfx western_coa_gfx } - building_gfx = { mediterranean_building_gfx } - clothing_gfx = { western_clothing_gfx } - unit_gfx = { western_unit_gfx } - - ethnicities = { - 10 = mediterranean - } -} - - - emilian = { color = { 1 0.7 0.7 } diff --git a/common/culture/cultures/NEOW_italo_dalmatian.txt b/common/culture/cultures/NEOW_italo_dalmatian.txt index 6e6df45a..bc812403 100644 --- a/common/culture/cultures/NEOW_italo_dalmatian.txt +++ b/common/culture/cultures/NEOW_italo_dalmatian.txt @@ -237,34 +237,6 @@ romagnol = { clothing_gfx = { western_clothing_gfx } unit_gfx = { western_unit_gfx } - ethnicities = { - 10 = mediterranean - } -} -italian = { - color = italian - - parents = { roman } - - created = 476.11.4 - - ethos = ethos_spiritual - heritage = heritage_italian - language = language_italo_dalmatian - martial_custom = martial_custom_male_only - traditions = { - tradition_formation_fighting - tradition_republican_legacy - tradition_poetry - } - - name_list = name_list_italo_dalmatian - - coa_gfx = { latin_group_coa_gfx western_coa_gfx } - building_gfx = { mediterranean_building_gfx } - clothing_gfx = { western_clothing_gfx } - unit_gfx = { western_unit_gfx } - ethnicities = { 10 = mediterranean } diff --git a/common/domiciles/types/00_domicile_types.txt b/common/domiciles/types/00_domicile_types.txt index d76d9c84..8fa547fa 100644 --- a/common/domiciles/types/00_domicile_types.txt +++ b/common/domiciles/types/00_domicile_types.txt @@ -895,8 +895,8 @@ estate = { allowed_for_character = { OR ={ - government_has_flag = government_is_special_republic - government_has_flag = government_is_administrative + has_government = republic_government + has_government = administrative_government } } diff --git a/gui/window_character.gui b/gui/window_character.gui index 32ad5551..1d277c96 100644 --- a/gui/window_character.gui +++ b/gui/window_character.gui @@ -78,6 +78,32 @@ window = { using = Animation_Character_Window_Refresh_Short + blockoverride "portrait_button" + { + using = tooltip_es + tooltip_offset = { -50 0 } + } + + blockoverride "prison_bars" { + highlight_icon = { + parentanchor = center + name = "prison_bars" + visible = "[Character.IsImprisoned]" + visible_at_creation = no + size = { 33% 100% } + + effectname = "NoHighlight" + texture = "gfx/portraits/portrait_prison_character_view.dds" + + modify_texture = { + name = "mask" + texture = "gfx/portraits/portrait_mask_character_view.dds" + spriteType = Corneredstretched + blend_mode = alphamultiply + } + } + } + blockoverride "portrait_opinion" { vassal_stance_icon = { @@ -248,20 +274,20 @@ window = { hbox = { spacing = 3 + datacontext = "[CharacterWindow.GetCharacter]" + text_label_center = { - datacontext = "[CharacterWindow.GetCharacter]" visible = "[Character.IsHostage]" text = "WARDEN_OF" } text_label_center = { - datacontext = "[CharacterWindow.GetCharacter]" visible = "[Not( Character.IsHostage )]" text = "[liege|E]" } icon = { - datacontext = "[CharacterWindow.GetCharacter]" + name = "non_dejure_liege" visible = "[Not( Character.GetVassalContract.IsRightfulLiege )]" size = { 30 30 } @@ -270,6 +296,15 @@ window = { using = tooltip_ws tooltip = "MRW_TT_NOT_RIGHTFUL_LIEGE" } + + icon = { + name = "diarchy_active_icon" + visible = "[Character.IsDiarchOf( Character.GetLiege )]" + size = { 25 25 } + texture = "gfx/interface/icons/scale_of_power.dds" + tooltip = DIARCH_ICON_TOOLTIP + using = tooltip_below + } } @@ -309,6 +344,104 @@ window = { } expand = {} } + + ### Suzerain + vbox = { + name = "suzerain" + datacontext = "[CharacterWindow.GetCharacter.GetSuzerain]" + visible = "[CharacterWindow.GetCharacter.HasSuzerain]" + allow_outside = yes + + margin_right = 20 + layoutpolicy_vertical = expanding + using = Animation_Character_Window_Refresh + + portrait_head_small = { + blockoverride "portrait_transformation" + { + portrait_scale = { -1 1 } + portrait_offset = { 1 0 } + } + + blockoverride "coa" { + coa_realm_tiny = { + parentanchor = bottom|left + position = { 3 -2 } + scale = 0.85 + } + } + } + + hbox = { + spacing = 3 + + datacontext = "[CharacterWindow.GetCharacter]" + + text_label_center = { + visible = "[Character.IsHostage]" + text = "WARDEN_OF" + } + + text_label_center = { + visible = "[Not( Character.IsHostage )]" + text = "[suzerain|E]" + margin_left = 28 + + ### Tributary Icon + widget = { + size = { 24 24 } + datacontext = "[Character.GetTributaryContract]" + tooltip = "CONTRACT_NAME" + using = tooltip_se + + icon = { + visible = "[And( Not( IsNomad( Character )), Not( IsHerder( Character ) ) )]" + parentanchor = center + size = { 24 24 } + texture = "gfx/interface/icons/tributary_settled_map_icon.dds" + } + + icon = { + visible = "[Or(IsNomad( Character ), IsHerder( Character ))]" + parentanchor = center + size = { 24 24 } + texture = "gfx/interface/icons/tributary_nomadic_map_icon.dds" + } + } + } + } + + + portrait_opinion = { + name = "suzerain_opinion" + + datacontext = "[CharacterWindow.GetCharacter]" + visible = "[And( Character.GetSuzerain.IsValid, And( Character.IsAlive, Not(Character.IsLocalPlayer ) ) )]" + + blockoverride "opinion_text" + { + text = "[Character.GetOpinionOf( Character.GetSuzerain )|=]" + fonttintcolor = "[Character.GetOpinionOfTint( CharacterWindow.GetCharacter.GetSuzerain )]" + } + + blockoverride "ott_heading_text" + { + text = "[Character.GetOpinionHeadingText( CharacterWindow.GetCharacter.GetSuzerain )]" + } + + blockoverride "ott_opinion_value_text" + { + text = "[Character.GetOpinionOf( Character.GetSuzerain )|=]" + fonttintcolor = "[Character.GetOpinionOfTint( CharacterWindow.GetCharacter.GetSuzerain )]" + } + + blockoverride "ott_opinion_breakdown_text" + { + text = "[Character.GetOpinionBreakdownText( CharacterWindow.GetCharacter.GetSuzerain )]" + } + } + expand = {} + } } ### Host @@ -610,7 +743,7 @@ window = { } icon_culture_pillar = { size = { 30 30 } - texture = "gfx/interface/icons/culture_pillars/language.dds" + texture = "gfx/interface/icons/flat_icons/map_modes/court_languages.dds" } } @@ -624,10 +757,7 @@ window = { tooltip = "CV_CUSTOMIZE_PORTRAIT" using = tooltip_ne - icon = { - texture = "gfx/interface/buttons/button_lifestyles_base.dds" - size = { 100% 100% } - } + icon_round_button_base = {} button_barbershop = { visible = "[Character.CanCustomizePortrait]" @@ -649,10 +779,7 @@ window = { using = tooltip_es - icon = { - texture = "gfx/interface/buttons/button_lifestyles_base.dds" - size = { 100% 100% } - } + icon_round_button_base = {} button_kill_list = { onclick = "[ToggleGameViewData( 'kill_list', Character.GetID )]" @@ -674,10 +801,7 @@ window = { tooltip = "OPEN_MEMORIES_TOOLTIP" using = tooltip_es - icon = { - texture = "gfx/interface/buttons/button_lifestyles_base.dds" - size = { 100% 100% } - } + icon_round_button_base = {} button_memories = { onclick = "[ToggleGameViewData( 'memories', Character.GetID )]" @@ -694,10 +818,7 @@ window = { tooltip = "PLAYER_LIFESTYLE_TOOLTIP" using = tooltip_ne - icon = { - texture = "gfx/interface/buttons/button_lifestyles_base.dds" - size = { 100% 100% } - } + icon_round_button_base = {} highlight_icon_lifestyle_focus = { size = { 100% 100% } @@ -771,10 +892,7 @@ window = { datacontext = "[Character.GetCourtGrandeurData]" tooltip = OPEN_ROYAL_COURT_TOOLTIP - icon = { - texture = "gfx/interface/buttons/button_lifestyles_base.dds" - size = { 100% 100% } - } + icon_round_button_base = {} button_royal_court = { onclick = "[CharacterWindow.Close]" @@ -846,6 +964,7 @@ window = { default_format = "#low" tooltip = "[Character.GetDeathOrBirthDateInfo]" fontsize = 20 + max_width = 28 align = nobaseline } @@ -1408,6 +1527,8 @@ window = { vbox_diplomacy_box = { visible = "[GreaterThan_int32( GetDataModelSize(CharacterWindow.GetDiplomacyItems), '(int32)0' )]" + margin_top = 4 + margin_right = 5 using = Animation_Character_Window_Refresh blockoverride "diplomacy_extra_items" @@ -1538,8 +1659,8 @@ window = { layoutpolicy_horizontal = expanding - onclick = "[CharacterWindow.SetTab('vassals')]" - down = "[CharacterWindow.IsTabShown('vassals')]" + onclick = "[CharacterWindow.SetTab('subjects')]" + down = "[CharacterWindow.IsTabShown('subjects')]" using = tooltip_above @@ -1547,13 +1668,13 @@ window = { text_single = { layoutpolicy_horizontal = expanding align = center - text = "CV_TAB_VASSALS" + text = "CV_TAB_SUBJECTS" default_format = "#low" } text_single = { align = center - text = "[CharacterWindow.GetTabItemsCount('vassals')]" + text = "[CharacterWindow.GetTabItemsCount('subjects')]" default_format = "#low" margin_right = 15 min_width = 30 @@ -2617,7 +2738,7 @@ window = { #################################### vbox_character_list = { - visible = "[CharacterWindow.IsTabShown('vassals')]" + visible = "[CharacterWindow.IsTabShown('subjects')]" datacontext = "[CharacterWindow.GetVassals]" blockoverride "sort_dropdown" { @@ -2638,37 +2759,51 @@ window = { datamodel = "[CharacterSelectionList.GetList]" visible = "[Not(CharacterSelectionList.IsBuildingList)]" addcolumn = 575 - addrow = 90 + addrow = 125 setitemsizefromcell = yes item = { widget_vassal_list_item = { datacontext = "[CharacterListItem.GetCharacter]" - blockoverride "own_vassal" {} - blockoverride "realm_size_powerful_status" { + blockoverride "vassal_buttons" { hbox = { - spacing = 10 + layoutpolicy_horizontal = expanding text_single = { - text = "REALM_WINDOW_SIZE" - tooltip = "REALM_WINDOW_SIZE_TT" + visible = "[And( Character.IsPowerfulVassal, Character.IsVassalOf( Character.GetOverlord ) )]" layoutpolicy_horizontal = expanding - align = nobaseline - visible = "[NotEqualTo_int32(Character.GetPrimaryTitle.GetTierFrame, '(int32)2')]" #nonbaron - } - - text_single = { - visible = "[Character.IsPowerfulVassal]" text = "MY_REALM_WINDOW_POWERFUL_VASSAL" - layoutpolicy_horizontal = expanding align = nobaseline + max_width = 200 } expand = {} } } + blockoverride "own_vassal" {} + + blockoverride "realm_size_powerful_status" { + hbox = { + spacing = 10 + + text_single = { + visible = "[NotEqualTo_int32(Character.GetPrimaryTitle.GetTierFrame, '(int32)2')]" #nonbaron + layoutpolicy_horizontal = expanding + + text = "REALM_WINDOW_SIZE" + align = nobaseline + max_width = 200 + + tooltip = "REALM_WINDOW_SIZE_TT" + } + + expand = {} + } + } + + blockoverride "release_tributary_button" {} } } } @@ -2902,7 +3037,7 @@ window = { ignoreinvisible = yes text_single = { - text = "[Claim.GetTitle.GetNameNoTooltip]" + text = "[Claim.GetTitle.GetNameNoTooltip|U]" default_format = "#high" using = Font_Size_Big } @@ -2965,11 +3100,12 @@ window = { vbox = { name = "diplomacy_items" datamodel = "[CharacterWindow.GetDiplomacyItems]" + layoutpolicy_horizontal = expanding item = { vbox = { layoutpolicy_horizontal = expanding - spacing = 20 + spacing = 10 divider_light = { layoutpolicy_horizontal = expanding @@ -2977,51 +3113,69 @@ window = { button_group = { layoutpolicy_horizontal = expanding + alwaystransparent = "[DiplomacyItem.IsConfederation]" + onclick = "[DiplomacyItem.OnClick]" + tooltip = "[DiplomacyItem.GetTooltip]" using = tooltip_se hbox = { - spacing = 20 - widget = { size = { 65 74 } button = { + parentanchor = top|hcenter + alwaystransparent = "[DiplomacyItem.IsConfederation]" + position = { 0 -30 } + size = { 50 50 } texture = "gfx/interface/icons/diplomatic_icons.dds" frame = "[DiplomacyItem.GetDiplomacyFrame]" - parentanchor = top|hcenter - position = { 0 -30 } framesize = { 120 120 } - size = { 50 50 } - tooltip_visible = no scale = 1.3 + + tooltip_visible = no } coa_realm_medium = { - visible = "[Not(DiplomacyItem.IsStruggle)]" + visible = "[And(Not(DiplomacyItem.IsStruggle), Not(DiplomacyItem.IsConfederation))]" datacontext = "[DiplomacyItem.GetTargetCharacter]" - tooltip = "[DiplomacyItem.GetTooltip]" parentanchor = hcenter + tooltip = "[DiplomacyItem.GetTooltip]" + text_single = { name = "warscore" visible = "[DiplomacyItem.HasWarScore]" parentanchor = hcenter position = { 0 -20 } + text = "[DiplomacyItem.GetWarScoreFraction|0%=+]" + align = nobaseline using = Font_Size_Medium + + background = { + using = Background_Area_ExtraDark + margin = { 3 1 } + } } } + coa_confederation_medium = { + datacontext = "[DiplomacyItem.GetConfederation]" + visible = "[DiplomacyItem.IsConfederation]" + parentanchor = hcenter + } + button = { - visible = "[DiplomacyItem.IsStruggle]" datacontext = "[DiplomacyItem.GetStruggle]" + datacontext = "[DiplomacyItem.GetTargetCharacter]" + visible = "[DiplomacyItem.IsStruggle]" position = { 0 -3 } size = { 70 90 } + onclick = "[DiplomacyItem.OnClick]" - datacontext = "[DiplomacyItem.GetTargetCharacter]" tooltipwidget = struggle_tooltip using = tooltip_es tooltip_offset = { 0 22 } @@ -3031,10 +3185,14 @@ window = { } text_multi = { - text = "[DiplomacyItem.GetInfo]" layoutpolicy_horizontal = expanding + alwaystransparent = "[DiplomacyItem.IsConfederation]" + + text = "[DiplomacyItem.GetInfo]" autoresize = yes - max_width = 400 + max_width = 450 + min_height = 120 + using = Font_Size_Tiny } } } @@ -3042,6 +3200,7 @@ window = { hbox = { name = "reason_characters" visible = "[DiplomacyItem.HasReasonCharacters]" + margin_bottom = 10 portrait_head_small = { name = "reason_character_left" @@ -3795,29 +3954,29 @@ types CharacterWindow name = "titles" visible = "[Not( IsDataModelEmpty( CharacterWindow.GetTitles ) )]" layoutpolicy_horizontal = expanding + spacing = 5 background = { - margin_left = 6 - margin_top = -15 - margin_bottom = -15 + margin_left = 5 using = Background_Area_Titles } hbox = { - minimumsize = { 60 0 } + margin_left = 5 + text_single = { visible = "[GreaterThan_int32( GetDataModelSize(CharacterWindow.GetTitles), '(int32)1' )]" - align = nobaseline + text = "CV_TITLES" + align = nobaseline } text_single = { visible = "[Not(GreaterThan_int32( GetDataModelSize(CharacterWindow.GetTitles), '(int32)1' ))]" - align = nobaseline - text = "CV_TITLES_SINGULAR" - } - expand = {} + text = "CV_TITLES_SINGULAR" + align = nobaseline + } } button_standard_hover = { @@ -3825,27 +3984,28 @@ types CharacterWindow onclick = "[CharacterWindow.ToggleExpandedTitles]" down = "[CharacterWindow.AreTitlesExpanded]" + tooltip = "[SelectLocalization( CharacterWindow.AreTitlesExpanded, 'CV_TITLES_HIDE_TT', 'CV_TITLES_SHOW_TT' )]" hbox = { layoutpolicy_horizontal = expanding - text_single = { - margin_bottom = 5 - align = center - default_format = "#weak" - layoutpolicy_horizontal = expanding + text_single = { visible = "[LessThan_int32( GetDataModelSize(CharacterWindow.GetTitles), '(int32)9' )]" - text = "KEY_KP_PLUS" - } - text_single = { - margin_bottom = 5 - align = center - default_format = "#weak" layoutpolicy_horizontal = expanding + text = "KEY_KP_PLUS" + align = center|nobaseline + default_format = "#weak" + } + + text_single = { visible = "[GreaterThan_int32( GetDataModelSize(CharacterWindow.GetTitles), '(int32)8' )]" + layoutpolicy_horizontal = expanding + text = "[GetNumberAbove_int32( GetDataModelSize(CharacterWindow.GetTitles), '(int32)8' )|=]" + align = center|nobaseline + default_format = "#weak" } } } @@ -3856,7 +4016,7 @@ types CharacterWindow fixedgridbox = { datamodel = "[CharacterWindow.GetTitles]" flipdirection = yes - addrow = 60 + addrow = 56 addcolumn = 38 maxverticalslots = 1 @@ -3867,6 +4027,7 @@ types CharacterWindow item = { coa_title_tiny_crown = { datacontext = "[TitleItem.GetTitle]" + parentanchor = left|vcenter using = tooltip_ne icon = { @@ -3877,9 +4038,18 @@ types CharacterWindow position = { 5 0 } texture = "gfx/interface/icons/title_status/icon_title_law.dds" } + icon = { + name = "is_nomad" + visible = "[TitleItem.GetTitle.IsNomad]" + parentanchor = bottom|right + size = { 25 25 } + position = { 5 0 } + texture = "gfx/interface/icons/title_status/icon_title_nomad.dds" + } } } } + expand = {} } } @@ -3966,11 +4136,11 @@ types CharacterWindow name = "claim" tooltip_visible = no - highlight_icon = { name = "pressed_claim" visible = "[And(Claim.IsPressed, Not(Claim.IsImplicit))]" texture = "gfx/interface/icons/title_status/icon_claim_pressed.dds" + position = { 5 3 } size = { 24 24 } parentanchor = bottom|right } @@ -3979,6 +4149,7 @@ types CharacterWindow name = "unpressed_claim" visible = "[And(Not(Claim.IsPressed), Not(Claim.IsImplicit))]" texture = "gfx/interface/icons/title_status/icon_claim_unpressed.dds" + position = { 5 3 } size = { 24 24 } parentanchor = bottom|right } @@ -3987,6 +4158,7 @@ types CharacterWindow name = "implicit_claim" visible = "[Claim.IsImplicit]" texture = "gfx/interface/icons/title_status/icon_claim_implicit.dds" + position = { 5 3 } size = { 24 24 } parentanchor = bottom|right } @@ -4002,28 +4174,40 @@ types CharacterWindow type vbox_diplomacy_box = vbox { name = "diplomacy" - layoutpolicy_vertical = expanding layoutpolicy_horizontal = expanding button_standard_hover = { layoutpolicy_horizontal = expanding size = { 100 25 } + + onclick = "[SetMapMode( Select_CString( CharacterWindow.AreDiplomacyExpanded, 'realms', 'diplomatic_relations' ) )]" onclick = "[CharacterWindow.ToggleExpandedDiplomacy]" - down = "[CharacterWindow.AreDiplomacyExpanded]" + down = "[Or( CharacterWindow.AreDiplomacyExpanded, IsMapMode( 'diplomatic_relations' ) )]" + tooltip = "[SelectLocalization( CharacterWindow.AreDiplomacyExpanded, 'CV_DIPLOMACY_HIDE_TT', 'CV_DIPLOMACY_SHOW_TT' )]" hbox = { text_label_left = { layoutpolicy_horizontal = expanding + alwaystransparent = yes text = "CV_DIPLOMACY" autoresize = no margin_right = 0 - margin_left = 5 + margin_left = 18 + + button_expand = { + alwaystransparent = yes + position = { 1 3 } + alpha = 0.7 + scale = 0.75 + frame = "[BoolTo1And2( CharacterWindow.AreDiplomacyExpanded )]" + } } text_single = { margin_bottom = 5 + margin_right = 3 default_format = "#weak" block "diplomacy_extra_items" @@ -4040,15 +4224,15 @@ types CharacterWindow fixedgridbox = { name = "diplomacy_items" datamodel = "[CharacterWindow.GetDiplomacyItems]" - flipdirection = yes addrow = 65 addcolumn = 50 + flipdirection = yes block "diplomacy_slots" { + datamodel_wrap = 2 maxverticalslots = 2 maxhorizontalslots = 2 - datamodel_wrap = 2 } item = { @@ -4059,22 +4243,28 @@ types CharacterWindow button = { visible = "[Not(DiplomacyItem.IsStruggle)]" parentanchor = top|hcenter + alwaystransparent = yes position = { 0 -22 } + size = { 50 50 } texture = "gfx/interface/icons/diplomatic_icons.dds" + # A new icon in diplomatic_icons.dds requires code support for mapping the DiplomacyItem type to that icon via the function below frame = "[DiplomacyItem.GetDiplomacyFrame]" framesize = { 120 120 } - size = { 50 50 } + tooltip_visible = no } coa_realm_small = { - visible = "[Not(DiplomacyItem.IsStruggle)]" datacontext = "[DiplomacyItem.GetTargetCharacter]" - tooltip = "[DiplomacyItem.GetTooltip]" - using = tooltip_es - tooltip_offset = { 0 22 } + visible = "[And(Not(DiplomacyItem.IsStruggle), Not(DiplomacyItem.IsConfederation))]" + parentanchor = hcenter + onrightclick = "[DefaultOnRealmFlagClick(Character.GetID)]" + tooltip = "[DiplomacyItem.GetTooltip]" + tooltip_offset = { 0 22 } + using = tooltip_es + state = { name = _mouse_hierarchy_enter start_sound = { @@ -4089,29 +4279,42 @@ types CharacterWindow } } + coa_confederation_small = { + datacontext = "[DiplomacyItem.GetConfederation]" + visible = "[DiplomacyItem.IsConfederation]" + parentanchor = hcenter + + tooltip = "[DiplomacyItem.GetTooltip]" + tooltip_offset = { -20 22 } + using = tooltip_es + } + text_single = { name = "warscore" visible = "[DiplomacyItem.HasWarScore]" parentanchor = top|hcenter position = { 0 -12 } + text = "[DiplomacyItem.GetWarScoreFraction|0%=+]" - fontsize = 13 align = nobaseline + fontsize = 13 background = { using = Background_Area_ExtraDark - margin = { 0 1} + margin = { 0 1 } } } button = { datacontext = "[DiplomacyItem.GetStruggle]" + datacontext = "[DiplomacyItem.GetTargetCharacter]" visible = "[DiplomacyItem.IsStruggle]" + parentanchor = hcenter position = { 0 -3 } size = { 52 64 } + onclick = "[DiplomacyItem.OnClick]" - datacontext = "[DiplomacyItem.GetTargetCharacter]" tooltipwidget = struggle_tooltip; using = tooltip_es tooltip_offset = { 0 22 } @@ -4319,6 +4522,7 @@ types CharacterWindow flowcontainer = { direction = vertical parentanchor = bottom + margin_right = 5 portrait_opinion = { block "portrait_opinion" {} @@ -4360,7 +4564,7 @@ types CharacterWindow } flowcontainer = { - parentanchor = vcenter + parentanchor = bottom coa_realm_small = { visible = "[Character.HasLandedTitles]" @@ -4370,7 +4574,7 @@ types CharacterWindow portrait_status_icons = { parentanchor = bottom - margin_bottom = 2 + margin_bottom = 4 } } } @@ -4382,7 +4586,7 @@ types CharacterWindow position = { 0 -3 } size = { 30 30 } texture = "gfx/interface/icons/scale_of_power.dds" - tooltip = IN_ACTIVE_DIARCHY + tooltip = DIARCH_ICON_TOOLTIP using = tooltip_below } @@ -4403,16 +4607,14 @@ types CharacterWindow type hbox_character_view_secondary_stats_bar = hbox { name = "character_view_secondary_stats_bar" visible = "[Character.IsAlive]" - spacing = 8 - margin_bottom = 6 - margin_top = 3 - margin_left = 1 - layoutpolicy_horizontal = expanding + margin = { 0 5 } + margin_right = 10 + background = { using = Background_Area_Dark - margin_left = 5 + margin_left = 3 } #Gold @@ -4420,9 +4622,11 @@ types CharacterWindow size = { 72 32 } hbox = { - expand = {} - tooltip = "[Character.GetGoldTooltipWithBalance]" + using = tooltip_se + spacing = 3 + + expand = {} icon = { name = "icon_gold" @@ -4443,18 +4647,19 @@ types CharacterWindow } } + divider_light = { + layoutpolicy_vertical = expanding + } + #Prestige widget = { size = { 72 32 } hbox = { - spacing = 2 + spacing = 3 tooltip = "[Character.GetPrestigeTooltipWithBalance]" - - divider_light = { - layoutpolicy_vertical = expanding - } + using = tooltip_se expand = {} @@ -4477,17 +4682,17 @@ types CharacterWindow } } + divider_light = { + layoutpolicy_vertical = expanding + } + #Piety widget = { size = { 72 32 } hbox = { - tooltip = "[Character.GetPietyTooltipWithBalance]" - - divider_light = { - layoutpolicy_vertical = expanding - } + using = tooltip_se expand = {} @@ -4510,18 +4715,59 @@ types CharacterWindow } } + divider_light = { + visible = "[IsNomad( Character )]" + layoutpolicy_vertical = expanding + } + + #Herd + widget = { + datacontext = "[Character.GetDomicile]" + visible = "[IsNomad( Character )]" + size = { 92 32 } + + hbox = { + spacing = 3 + + tooltip = "[Domicile.GetHerdBreakdown]" + using = tooltip_se + + expand = {} + + icon = { + name = "herd_icon" + size = { 30 30 } + texture = "gfx/interface/icons/icon_herd.dds" + } + + text_single = { + name = "total_herd" + text = "[Domicile.GetHerd|0]" + default_format = "#high" + align = center|nobaseline + fontsize_min = 12 + max_width = 50 + } + + expand = {} + } + } + + divider_light = { + visible = "[Character.GetGovernment.IsType( 'administrative_government' )]" + layoutpolicy_vertical = expanding + } + #Influence widget = { + visible = "[Character.GetGovernment.IsType( 'administrative_government' )]" size = { 72 32 } hbox = { - visible = "[Character.GetGovernment.IsType( 'administrative_government' )]" + spacing = 3 tooltip = "[Character.GetInfluenceTooltipWithBalance]" - - divider_light = { - layoutpolicy_vertical = expanding - } + using = tooltip_se expand = {} @@ -4544,35 +4790,37 @@ types CharacterWindow } } - #Legitimacy - widget = { - layoutpolicy_vertical = expanding - size = { 72 32 } - + divider_light = { datacontext = "[Character.GetLegitimacyType]" datacontext = "[Character.GetLegitimacyLevel]" + visible = "[And(LegitimacyType.IsValid, Character.GetGovernment.HasRule( 'legitimacy' ))]" + layoutpolicy_vertical = expanding + } - using = tooltip_ne + #Legitimacy + widget = { + datacontext = "[Character.GetLegitimacyType]" + datacontext = "[Character.GetLegitimacyLevel]" + visible = "[And(LegitimacyType.IsValid, Character.GetGovernment.HasRule( 'legitimacy' ))]" + size = { 72 32 } + + tooltipwidget = { + legitimacy_hud_tooltip = { + datacontext = "[CharacterWindow.GetLegitimacyBar]" + } + } + + using = tooltip_se hbox = { - visible = "[And(LegitimacyType.IsValid, Character.GetGovernment.HasRule( 'legitimacy' ))]" - - tooltipwidget = { - legitimacy_hud_tooltip = { - datacontext = "[CharacterWindow.GetLegitimacyBar]" - } - } - - divider_light = { - layoutpolicy_vertical = expanding - } + spacing = 3 expand = {} icon = { - size = { 32 32 } + size = { 30 30 } - texture = "gfx/interface/icons/legitimacy_level_icon.dds" + texture = "[Character.GetLegitimacyType.GetLevelsIcon]" framesize = { 70 70 } frame = "[IntToFrameIndex( LegitimacyLevel.GetIndex )]" } @@ -4586,18 +4834,22 @@ types CharacterWindow } } + divider_light = { + visible = "[Character.HasLandedTitles]" + layoutpolicy_vertical = expanding + } + #Dread widget = { + visible = "[Character.HasLandedTitles]" size = { 72 32 } hbox = { visible = "[Character.HasLandedTitles]" + spacing = 3 tooltip = "[Character.GetDreadBreakdown]" - - divider_light = { - layoutpolicy_vertical = expanding - } + using = tooltip_se expand = {} @@ -4626,12 +4878,14 @@ types CharacterWindow } widget = { - tooltip = "[CharacterWindow.GetMilitaryStrengthTooltip]" + visible = "[Character.HasLandedTitles]" size = { 72 32 } + tooltip = CHARACTER_WINDOW_MILITARY_STRENGTH_TOOLTIP + using = tooltip_es + hbox = { - visible = "[Character.HasLandedTitles]" - spacing = 2 + spacing = 3 expand = {} @@ -4664,8 +4918,6 @@ types CharacterWindow expand = {} } } - - expand = {} } }