diff --git a/gui/shared/coat_of_arms.gui b/gui/shared/coat_of_arms.gui index 90ceeae3f..b6d861793 100644 --- a/gui/shared/coat_of_arms.gui +++ b/gui/shared/coat_of_arms.gui @@ -929,7 +929,7 @@ types CoATypes visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_holy_order')]" } blockoverride "ecclesiastical" { - visible = "[Character.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" + visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" } blockoverride "mercenary" { visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_mercenary')]" @@ -1088,7 +1088,7 @@ types CoATypes visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_holy_order')]" } blockoverride "ecclesiastical" { - visible = "[Character.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" + visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" } blockoverride "mercenary" { visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_mercenary')]" @@ -1239,7 +1239,7 @@ types CoATypes visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_holy_order')]" } blockoverride "ecclesiastical" { - visible = "[Character.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" + visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" } blockoverride "mercenary" { visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_mercenary')]" @@ -1392,7 +1392,7 @@ types CoATypes visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_holy_order')]" } blockoverride "ecclesiastical" { - visible = "[Character.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" + visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_ecclesiastical')]" } blockoverride "mercenary" { visible = "[Title.GetHolder.GetGovernment.HasGovernmentFlag( 'government_is_mercenary')]" @@ -1554,7 +1554,9 @@ types CoATypes size = { 62 62 } } texture = "gfx/interface/coat_of_arms/lowborn.dds" - tooltip = "[lowborn|E]" + block "lowborn_tooltip" { + tooltip = "[lowborn|E]" + } } } @@ -1573,9 +1575,8 @@ types CoATypes { size = { 48 48 } - coa_dynasty_lowborn_widget = { - parentanchor = center - size = { 40 40 } + hbox = { + margin = { 4 4 } blockoverride "icon_size" { @@ -1613,41 +1614,43 @@ types CoATypes type coa_dynasty_small = widget { - size = { 72 72 } + size = { 64 64 } - coa_dynasty_lowborn_widget = { - parentanchor = center - size = { 56 56 } - blockoverride "icon_size" - { - size = { 44 44 } - } - } + hbox = { + margin = { 4 4 } - coa_dynasty_widget = { - size = { 56 56 } - using = CoA_Dynasty_Defaults - parentanchor = center - - coat_of_arms_icon = { - parentanchor = center - size = { 44 44 } - coat_of_arms = "[Dynasty.GetDynastyCoA.GetTexture('(int32)88','(int32)88')]" - coat_of_arms_slot = "[Dynasty.GetDynastyCoA.GetSlot('(int32)88','(int32)88')]" - coat_of_arms_mask = "[Dynasty.GetCulture.GetCultureDynastyCoAMask]" - coat_of_arms_offset = "[Dynasty.GetCulture.GetCultureDynastyCoAOffset]" - coat_of_arms_scale = "[Dynasty.GetCulture.GetCultureDynastyCoAScale]" - - modify_texture = { - texture = "gfx/interface/coat_of_arms/coa_overlay.dds" - blend_mode = overlay - alpha = @overlay_alpha + coa_dynasty_lowborn_widget = { + size = { 56 56 } + blockoverride "icon_size" + { + size = { 44 44 } } } - coa_dynasty_frame = { - size = { 64 64 } - texture = "[Dynasty.GetCulture.GetCultureDynastyCoAFrame]" + coa_dynasty_widget = { + size = { 56 56 } + using = CoA_Dynasty_Defaults + + coat_of_arms_icon = { + parentanchor = center + size = { 44 44 } + coat_of_arms = "[Dynasty.GetDynastyCoA.GetTexture('(int32)88','(int32)88')]" + coat_of_arms_slot = "[Dynasty.GetDynastyCoA.GetSlot('(int32)88','(int32)88')]" + coat_of_arms_mask = "[Dynasty.GetCulture.GetCultureDynastyCoAMask]" + coat_of_arms_offset = "[Dynasty.GetCulture.GetCultureDynastyCoAOffset]" + coat_of_arms_scale = "[Dynasty.GetCulture.GetCultureDynastyCoAScale]" + + modify_texture = { + texture = "gfx/interface/coat_of_arms/coa_overlay.dds" + blend_mode = overlay + alpha = @overlay_alpha + } + } + + coa_dynasty_frame = { + size = { 56 56 } + texture = "[Dynasty.GetCulture.GetCultureDynastyCoAFrame]" + } } } } @@ -1695,41 +1698,43 @@ types CoATypes type coa_dynasty_big = widget { - size = { 128 128 } + size = { 120 120 } - coa_dynasty_lowborn_widget = { - parentanchor = center - size = { 112 112 } - blockoverride "icon_size" - { - size = { 88 88 } - } - } + hbox = { + margin = { 3 5 } - coa_dynasty_widget = { - size = { 112 112 } - using = CoA_Dynasty_Defaults - parentanchor = center - - coat_of_arms_icon = { - parentanchor = center - size = { 88 88 } - coat_of_arms = "[Dynasty.GetDynastyCoA.GetTexture('(int32)172','(int32)172')]" - coat_of_arms_slot = "[Dynasty.GetDynastyCoA.GetSlot('(int32)172','(int32)172')]" - coat_of_arms_mask = "[Dynasty.GetCulture.GetCultureDynastyCoAMask]" - coat_of_arms_offset = "[Dynasty.GetCulture.GetCultureDynastyCoAOffset]" - coat_of_arms_scale = "[Dynasty.GetCulture.GetCultureDynastyCoAScale]" - - modify_texture = { - texture = "gfx/interface/coat_of_arms/coa_overlay.dds" - blend_mode = overlay - alpha = @overlay_alpha + coa_dynasty_lowborn_widget = { + size = { 112 112 } + blockoverride "icon_size" + { + size = { 86 86 } } } - coa_dynasty_frame = { - size = { 128 128 } - texture = "[Dynasty.GetCulture.GetCultureDynastyCoAFrame]" + coa_dynasty_widget = { + size = { 112 112 } + using = CoA_Dynasty_Defaults + + coat_of_arms_icon = { + parentanchor = center + size = { 86 86 } + coat_of_arms = "[Dynasty.GetDynastyCoA.GetTexture('(int32)172','(int32)172')]" + coat_of_arms_slot = "[Dynasty.GetDynastyCoA.GetSlot('(int32)172','(int32)172')]" + coat_of_arms_mask = "[Dynasty.GetCulture.GetCultureDynastyCoAMask]" + coat_of_arms_offset = "[Dynasty.GetCulture.GetCultureDynastyCoAOffset]" + coat_of_arms_scale = "[Dynasty.GetCulture.GetCultureDynastyCoAScale]" + + modify_texture = { + texture = "gfx/interface/coat_of_arms/coa_overlay.dds" + blend_mode = overlay + alpha = @overlay_alpha + } + } + + coa_dynasty_frame = { + size = { 112 112 } + texture = "[Dynasty.GetCulture.GetCultureDynastyCoAFrame]" + } } } } @@ -1789,7 +1794,6 @@ types CoATypes framesize = { 160 160 } size = { 172 172 } } - #################################### ############### HOUSE ############## #################################### @@ -2512,6 +2516,7 @@ types CoATypes } } + #################################### ############# SAVEGAME ############# #################################### @@ -2525,6 +2530,7 @@ types CoATypes icon = { name = "crown" + visible = "[SaveGameItem.HasCoatOfArms]" parentanchor = hcenter texture = "gfx/interface/coat_of_arms/crown_strip_44.dds" frame = "[SaveGameItem.GetPlayerTier]" @@ -2533,6 +2539,7 @@ types CoATypes widget = { size = { 52 52 } + visible = "[SaveGameItem.HasCoatOfArms]" coa_realm_shadow = { texture = "[SaveGameItem.GetPlayerGovernment.GetRealmFrameShadow('(int32)44')]" @@ -2572,6 +2579,16 @@ types CoATypes } } } + + widget = { + size = { 52 52 } + visible = "[Not( SaveGameItem.HasCoatOfArms )]" + + icon = { + size = { 52 52 } + texture = "gfx/interface/_default_icon.dds" + } + } } } @@ -2601,6 +2618,7 @@ types CoATypes } } + #################################### ############# BOOKMARK ############# #################################### @@ -2611,7 +2629,7 @@ types CoATypes onclick = "[GameSetup.SetSelectedCharacter( BookmarkCharacter.Self )]" } - tooltip = "BOOKMARK_DYNASTY_OR_HOUSE_TOOLTIP" + tooltip = "[SelectLocalization( Or( BookmarkCharacter.HasDynastyTemplate, BookmarkCharacter.HasDynastyHouse ), 'BOOKMARK_DYNASTY_OR_HOUSE_TOOLTIP', 'BOOKMARK_CHARACTER_REALM' )]" flowcontainer = { margin = { 3 0 } @@ -2622,7 +2640,7 @@ types CoATypes # Dynasty CoA and frame coat_of_arms_icon = { - visible = "[Not( BookmarkCharacter.HasDynastyHouse )]" + visible = "[And( BookmarkCharacter.HasDynastyTemplate, Not( BookmarkCharacter.HasDynastyHouse ) )]" parentanchor = center size = { 44 44 } coat_of_arms = "[BookmarkCharacter.GetDynastyTemplate.GetCoA.GetTexture('(int32)88','(int32)88')]" @@ -2638,7 +2656,7 @@ types CoATypes } coa_house_frame = { - visible = "[Not( BookmarkCharacter.HasDynastyHouse )]" + visible = "[And( BookmarkCharacter.HasDynastyTemplate, Not( BookmarkCharacter.HasDynastyHouse ) )]" blockoverride "frame_override" { frame = "[BookmarkCharacter.GetDynastySplendorFrame]" @@ -2673,6 +2691,39 @@ types CoATypes size = { 56 56 } texture = "[BookmarkCharacter.GetDynastyTemplate.GetCultureTemplate.GetCultureTemplateHouseCoAFrame]" } + + # Fallback for non-dynastic bookmarks: use primary title CoA + coat_of_arms_icon = { + visible = "[And( BookmarkCharacter.StartAsExistingRuler, Not( Or( BookmarkCharacter.HasDynastyTemplate, BookmarkCharacter.HasDynastyHouse ) ) )]" + parentanchor = center + size = { 52 52 } + coat_of_arms = "[BookmarkCharacter.GetLandedTitleTemplate.GetCoA.GetTexture('(int32)88','(int32)88')]" + coat_of_arms_slot = "[BookmarkCharacter.GetLandedTitleTemplate.GetCoA.GetSlot('(int32)88','(int32)88')]" + coat_of_arms_mask = "[BookmarkCharacter.GetGovernmentType.GetRealmMask]" + coat_of_arms_offset = "[BookmarkCharacter.GetGovernmentType.GetRealmMaskOffset]" + coat_of_arms_scale = "[BookmarkCharacter.GetGovernmentType.GetRealmMaskScale]" + + modify_texture = { + texture = "[BookmarkCharacter.GetGovernmentType.GetRealmMask]" + blend_mode = overlay + alpha = @overlay_alpha + } + + coa_realm_overlay = { + texture = "[BookmarkCharacter.GetGovernmentType.GetRealmFrame('(int32)44')]" + frame = "[BookmarkCharacter.GetTier]" + size = { 52 52 } + framesize = { 52 52 } + } + + coa_realm_topframe = { + texture = "gfx/interface/coat_of_arms/topframe_44.dds" + position = { 0 -7 } + size = { 52 52 } + framesize = { 52 52 } + frame = "[BookmarkCharacter.GetTier]" + } + } } } } @@ -2689,6 +2740,15 @@ types CoATypes texture = "gfx/interface/coat_of_arms/crown_strip_62.dds" frame = "[BookmarkCharacter.GetTier]" framesize = { 64 40 } + visible = "[Not(BookmarkCharacter.GetGovernmentType.IsType('ecclesiastical_government'))]" + } + + icon = { + name = "ecclesiastic_top_decor" + visible = "[BookmarkCharacter.GetGovernmentType.IsType('ecclesiastical_government')]" + parentanchor = hcenter + size = { 64 40 } + texture = "gfx/interface/coat_of_arms/ecclesiastic_topframe_62.dds" } widget = { @@ -2703,6 +2763,7 @@ types CoATypes } coat_of_arms_icon = { + visible = "[Not(BookmarkCharacter.GetGovernmentType.IsType('ecclesiastical_government'))]" parentanchor = center size = { 64 64 } alwaystransparent = yes @@ -2736,6 +2797,42 @@ types CoATypes frame = "[BookmarkCharacter.GetTier]" } } + coat_of_arms_icon = { + visible = "[BookmarkCharacter.GetGovernmentType.IsType('ecclesiastical_government')]" + parentanchor = center + size = { 64 64 } + alwaystransparent = yes + + coat_of_arms = "[BookmarkCharacter.GetLandedTitleTemplate.GetCoA.GetTexture('(int32)124','(int32)124')]" + coat_of_arms_slot = "[BookmarkCharacter.GetLandedTitleTemplate.GetCoA.GetSlot('(int32)124','(int32)124')]" + coat_of_arms_mask = "[BookmarkCharacter.GetGovernmentType.GetRealmMask]" + coat_of_arms_offset = "[BookmarkCharacter.GetGovernmentType.GetRealmMaskOffset]" + coat_of_arms_scale = "[BookmarkCharacter.GetGovernmentType.GetRealmMaskScale]" + + modify_texture = { + texture = "[BookmarkCharacter.GetGovernmentType.GetRealmMask]" + blend_mode = overlay + alpha = @overlay_alpha + } + + coa_realm_overlay = { + texture = "[BookmarkCharacter.GetGovernmentType.GetRealmFrame('(int32)62')]" + size = { 64 64 } + frame = 1 + framesize = { 64 64 } + inherit_visual_state = no + } + + coa_realm_topframe = { + inherit_visual_state = no + texture ="gfx/interface/coat_of_arms/topframe_62.dds" + position = { 0 -8 } + framesize = { 64 64 } + size = { 64 64 } + frame = "[BookmarkCharacter.GetTier]" + } + + } } } } @@ -2916,12 +3013,6 @@ types CoATypes size = { 62 30 } } - icon = { - name = "crown" - parentanchor = hcenter - texture = "gfx/interface/coat_of_arms/landless_minority_government_topframe_62.dds" - size = { 62 30 } - } widget = { size = { 64 64 } @@ -3414,7 +3505,7 @@ types CoATypes coa_house_widget = { using = CoA_House_Defaults - visible = "[Character.HasSealCoA]" + visible = "[And(Character.HasSealCoA, Character.GetHouse.IsValid)]" datacontext = "[Character.GetHouse]" parentanchor = center