diff --git a/common/governments/00_government_types.txt b/common/governments/00_government_types.txt index aae9aaf5..c3877acc 100644 --- a/common/governments/00_government_types.txt +++ b/common/governments/00_government_types.txt @@ -599,7 +599,6 @@ landless_minority_government = { # Use flags instead of has_government for moddability if possible (i.e., wherever not visible to the player). flags = { - cannot_be_vassal_or_liege government_is_landless_minority has_unique_government_perks } diff --git a/gui/shared/coat_of_arms.gui b/gui/shared/coat_of_arms.gui index 1478ae0f..b48d8904 100644 --- a/gui/shared/coat_of_arms.gui +++ b/gui/shared/coat_of_arms.gui @@ -55,7 +55,7 @@ types CoATypes texture = "gfx/interface/coat_of_arms/landless_adventurer_topframe_28.dds" } icon = { - name = "adventurer_top_decor" + name = "minority_top_decor" visible = "[GovernmentType.IsType('landless_minority_government')]" parentanchor = hcenter texture = "gfx/interface/coat_of_arms/landless_minority_government_topframe_28.dds" @@ -144,7 +144,7 @@ types CoATypes ## Small Realm CoA type coa_realm_small_crown = coa_realm_small { blockoverride "crown" { - visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Character.GetGovernment.IsType('landless_adventurer_government')))]" + visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Or(Character.GetGovernment.IsType('landless_adventurer_government')Character.GetGovernment.IsType('landless_minority_government'))))]" } } @@ -163,7 +163,7 @@ types CoATypes } icon = { - name = "adventurer_top_decor" + name = "minority_top_decor" visible = "[Character.GetGovernment.IsType('landless_minority_government')]" parentanchor = hcenter texture = "gfx/interface/coat_of_arms/landless_minority_government_topframe_44.dds" @@ -257,7 +257,7 @@ types CoATypes ## Medium Realm CoA type coa_realm_medium_crown = coa_realm_medium { blockoverride "crown" { - visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Character.GetGovernment.IsType('landless_adventurer_government')))]" + visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Or(Character.GetGovernment.IsType('landless_adventurer_government')Character.GetGovernment.IsType('landless_minority_government'))))]" } } @@ -295,7 +295,7 @@ types CoATypes } icon = { - name = "adventurer_top_decor" + name = "minority_top_decor" visible = "[GovernmentType.IsType('landless_minority_government')]" parentanchor = hcenter texture = "gfx/interface/coat_of_arms/landless_minority_government_topframe_62.dds" @@ -369,7 +369,7 @@ types CoATypes ## Big Realm CoA type coa_realm_big_crown = coa_realm_big { blockoverride "crown" { - visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Character.GetGovernment.IsType('landless_adventurer_government')))]" + visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Or(Character.GetGovernment.IsType('landless_adventurer_government')Character.GetGovernment.IsType('landless_minority_government'))))]" } } @@ -406,7 +406,7 @@ types CoATypes } icon = { - name = "adventurer_top_decor" + name = "minority_top_decor" visible = "[GovernmentType.IsType('landless_minority_government')]" parentanchor = hcenter texture = "gfx/interface/coat_of_arms/landless_minority_government_topframe_86.dds" @@ -480,7 +480,7 @@ types CoATypes ## Huge Realm CoA type coa_realm_huge_crown = coa_realm_huge { blockoverride "crown" { - visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Character.GetGovernment.IsType('landless_adventurer_government')))]" + visible = "[And(And(Not(Character.GetPrimaryTitle.IsMercenaryCompany), Not(Character.GetPrimaryTitle.IsHolyOrder)), Not(Or(Character.GetGovernment.IsType('landless_adventurer_government')Character.GetGovernment.IsType('landless_minority_government'))))]" } } @@ -517,7 +517,7 @@ types CoATypes } icon = { - name = "adventurer_top_decor" + name = "minority_top_decor" visible = "[GovernmentType.IsType('landless_minority_government')]" parentanchor = hcenter texture = "gfx/interface/coat_of_arms/landless_minority_government_topframe_115.dds"