diff --git a/common/religion/religion_types/NEOW_europeanist.txt b/common/religion/religion_types/NEOW_europeanist.txt index e9103efc4..7c19e231e 100644 --- a/common/religion/religion_types/NEOW_europeanist.txt +++ b/common/religion/religion_types/NEOW_europeanist.txt @@ -2,10 +2,10 @@ religion_details = { family = rf_abrahamic graphical_faith = pagan_gfx - #tenet_background_icon = tenet_banner_europeanist_known_core - #tenet_heretical_background_icon = tenet_banner_europeanist_unknown_heretical - #tenet_neutral_background_icon = tenet_banner_europeanist_known_neutral - #tenet_unknown_background_icon = tenet_banner_europeanist_unknown_neutral + tenet_background_icon = tenet_banner_europeanist_known_core + tenet_heretical_background_icon = tenet_banner_europeanist_unknown_heretical + tenet_neutral_background_icon = tenet_banner_europeanist_known_neutral + tenet_unknown_background_icon = tenet_banner_europeanist_unknown_neutral } doctrine = antediluvianist_hostility_doctrine diff --git a/common/religion/religion_types/NEOW_theomach.txt b/common/religion/religion_types/NEOW_theomach.txt index 83dd052d1..64b1252b7 100644 --- a/common/religion/religion_types/NEOW_theomach.txt +++ b/common/religion/religion_types/NEOW_theomach.txt @@ -2,10 +2,10 @@ religion_details = { family = rf_antediluvianist graphical_faith = pagan_gfx - #tenet_background_icon = tenet_banner_marble_known_core - #tenet_heretical_background_icon = tenet_banner_marble_unknown_heretical - #tenet_neutral_background_icon = tenet_banner_marble_known_neutral - #tenet_unknown_background_icon = tenet_banner_marble_unknown_neutral + tenet_background_icon = tenet_banner_marble_known_core + tenet_heretical_background_icon = tenet_banner_marble_unknown_heretical + tenet_neutral_background_icon = tenet_banner_marble_known_neutral + tenet_unknown_background_icon = tenet_banner_marble_unknown_neutral } doctrine = pagan_hostility_doctrine diff --git a/gui/window_faith.gui b/gui/window_faith.gui index d6d1c96e7..76548582f 100644 --- a/gui/window_faith.gui +++ b/gui/window_faith.gui @@ -2485,120 +2485,7 @@ types FaithWindow } } - type widget_tenet_item2 = widget { - size = { 130 200 } - allow_outside = yes - - block "tenet_enabled" { - enabled = "[Not( Faith.HasTenetStatus( TenetType.Self, 'unknown' ) )]" - } - - tooltipwidget = { - using = tenet_type_tooltip - } - using = tooltip_es - - using = Tenet_Glows - - highlight_icon = { - name = "doctrine_group_bg" - size = { 130 200 } - texture = "[Faith.GetTenetBackgroundIcon( Rite.Self, TenetType.Self )]" - } - - block "tenet_icon" - { - widget = { - position = { 0 -10 } - size = { 130 200 } - allow_outside = yes - alwaystransparent = yes - visible = "[TenetType.IsValid]" - - highlight_icon = { - name = "doctrine_group_icon" - widgetanchor = center - parentanchor = center - - size = { 130 200 } - texture = "[TenetItem.GetIcon]" - alpha = 0.85 - } - } - } - - block "tenet_add_icon" - { - button_plus = { - name = "doctrine_group_icon" - visible = "[Not( TenetType.IsValid )]" - - position = { 35 70 } - size = { 60 60 } - } - } - - vbox = { - layoutpolicy_horizontal = expanding - layoutpolicy_vertical = expanding - - margin_bottom = 15 - - expand = {} - - text_label_center = { - name = "tenet_name" - layoutpolicy_horizontal = expanding - maximumsize = { 130 44 } - visible = "[TenetType.IsValid]" - fontsize_min = 12 - multiline = yes - align = center - elide = right - block "tenet_name" { - text = "[TenetType.GetBaseNameNoTooltip]" - } - default_format = "#high" - - using = Font_Size_Medium - } - } - - block "prohibited_warning" {} - - widget = { - parentanchor = top|right - - block "tenet_badges_layout" - { - size = { 25 50 } - } - - vbox = { - container_tenet_divergence = {} - container_tenet_popularity = {} - expand = {} - } - } - - block "divergence_text" { - icon = { - visible = "[And( TenetType.IsValid, Not( Faith.GetMainRite.HasTenet( TenetType.Self ) ) )]" - parentanchor = bottom|hcenter - position = { 0 5 } - size = { 25 25 } - - icon = { - parentanchor = center - size = { 20 20 } - - texture = "gfx/interface/icons/icon_rite_divergence.dds" - tooltip = "RITE_CREATION_TENET_DIVERGENCE_TT" - } - } - } - } - type widget_tenet_creation_item = widget_tenet_item2 { + type widget_tenet_creation_item = widget_tenet_item { datacontext = "[TenetItem.GetTenet]" datacontext = "[TenetItem.GetFaith]" datacontext = "[TenetItem.GetRite]" @@ -2954,7 +2841,7 @@ types FaithWindow datamodel = "[TenetGroupItem.GetTenets]" item = { - widget_tenet_item2 = { + widget_tenet_item = { datacontext = "[TenetItem.GetTenet]" datacontext = "[TenetItem.GetFaith]" datacontext = "[TenetItem.GetRite]"