From 683d3d990efe5eecb6ff3abc28fee1004004fcc7 Mon Sep 17 00:00:00 2001 From: Colin <34176582+cocolinfff@users.noreply.github.com> Date: Wed, 3 Apr 2024 18:20:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4ai=E6=B4=BE=E7=B3=BB=E4=B8=8E?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=80=9D=E6=BD=AE=E5=90=B8=E5=BC=95=E5=8A=9B?= =?UTF-8?q?=EF=BC=88=E5=8D=B1=E9=99=A9commit=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/ethics/00_ethics.txt | 970 +----------------- common/ethics/ethic_rebuild_ethics.txt | 148 +-- .../ethic_civics_cultural_religious.txt | 2 +- .../ethic_factions_scripted_triggers.txt | 1 + 4 files changed, 45 insertions(+), 1076 deletions(-) diff --git a/common/ethics/00_ethics.txt b/common/ethics/00_ethics.txt index e4a240fd7..f69343b83 100644 --- a/common/ethics/00_ethics.txt +++ b/common/ethics/00_ethics.txt @@ -230,90 +230,8 @@ ethic_authoritarian = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_authoritarian = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_authoritarian = yes - } - } - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_authoritarian } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_authoritarian } - } - } - modifier = { - factor = 2 - is_country_type = default - is_authoritarian = no - OR = { - has_faction = civil_official - has_faction = totalitarian - } - } - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|authoritarian| - } - mult = value:authoritarian_ethics_from_relations - modifier = { - factor = 1.5 - has_federation = yes - federation = { - has_federation_type = hegemony_federation - } - } - modifier = { - factor = 2 - has_ethic = ethic_authoritarian - } - modifier = { - factor = 3 - has_ethic = ethic_fanatic_authoritarian - } - modifier = { - factor = 1.25 - has_election_type = none - } - modifier = { - factor = 0.75 - has_election_type = democratic - } - - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|egalitarian| - } - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 @@ -623,103 +541,8 @@ ethic_egalitarian = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_egalitarian = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_egalitarian = yes - } - } - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_egalitarian } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_egalitarian } - } - } - modifier = { - factor = 2 - is_country_type = default - is_egalitarian = no - OR = { - has_faction = progressive - has_faction = entrepreneurs - } - } - modifier = { - factor = 2 - has_ethic = ethic_egalitarian - } - modifier = { - factor = 3 - has_ethic = ethic_fanatic_egalitarian - } - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|egalitarian| - } - modifier = { - factor = 0.75 - is_country_type = default - has_election_type = none - } - modifier = { - factor = 1.25 - is_country_type = default - has_election_type = democratic - } - modifier = { - factor = 1.25 - any_owned_species = { - is_robotic = no - NOT = { is_same_species = root } - } - count_owned_species = { - limit = { - is_sapient = yes - is_robotic = no - NOT = { - has_citizenship_type = { type = citizenship_full country = root } - } - } - count = 0 - } - } - - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|egalitarian| - } - - mult = value:egalitarian_ethics_from_relations - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 @@ -1029,128 +852,8 @@ ethic_xenophobe = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_xenophobe = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_xenophobe = yes - } - } - } - } - } - modifier = { - factor = 2 - is_country_type = default - is_xenophobe = no - OR = { - has_faction = supremacist - has_faction = isolationist - } - } - - modifier = { - factor = 2 - has_ethic = ethic_xenophobe - } - modifier = { - factor = 3 - has_ethic = ethic_fanatic_xenophobe - } - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|xenophobe| - } - modifier = { - factor = 1.5 - has_valid_civic = civic_inwards_perfection - } - modifier = { - factor = 1.5 - has_valid_civic = civic_fanatic_purifiers - } - mult = value:xenophobe_ethics_from_relations - modifier = { - factor = 0.75 - allows_alien_leaders = yes - } - modifier = { - factor = 3.0 - any_war = { - any_defender = { - is_same_value = prevprev - } - any_attacker = { - NOT = { is_same_species = root } - } - } - } - modifier = { - factor = 2.0 - species = { is_robotic = no } - any_relation = { - NOT = { is_same_species = root } - any_enslaved_species = { - is_same_species = root - } - } - } - modifier = { - factor = 3.0 - any_relation = { - has_opinion_modifier = { - who = root - modifier = opinion_genocidal - } - } - } - modifier = { - factor = 4.0 - any_relation = { - has_opinion_modifier = { - who = root - is_reverse = yes - modifier = opinion_genocidal_our_species - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_xenophobe } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_xenophobe } - } - } - - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|xenophobe| - } - } + country_attraction = { base = 1 } - #from = planet pop_attraction = { base = 1 @@ -1473,162 +1176,53 @@ ethic_xenophile = { } } - country_attraction = { + country_attraction = { base = 1 } + + pop_attraction = { base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_xenophile = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_xenophile = yes - } - } - } - } + + inline_script = { + script = "ethics/governor_pop_attraction" + ETHIC = xenophile + ETHIC_OPPOSED = xenophobe } + modifier = { - factor = 2 - is_country_type = default - is_xenophile = no - OR = { - has_faction = xenoist - has_faction = proletarians - } + factor = 0 + has_trait = trait_hive_mind } modifier = { factor = 2 - has_ethic = ethic_xenophile + not = { is_same_species = root } + has_citizenship_rights = no + is_enslaved = no } modifier = { - factor = 3 - has_ethic = ethic_fanatic_xenophile + factor = 2.0 + is_enslaved = no + fromfrom = { + any_owned_pop = { + not = { is_same_species = root } + is_enslaved = no + is_being_purged = no + is_sapient = yes + is_robot_pop = no + NOT = { has_trait = trait_syncretic_proles } + } + } } modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|xenophile| + factor = 1.5 + from = { + any_owned_species = { + NOT = { is_same_species = root } + has_trait = "trait_charismatic" + } + } } modifier = { factor = 0.5 - has_valid_civic = civic_inwards_perfection - } - modifier = { - factor = 0.33 - has_valid_civic = civic_fanatic_purifiers - } - modifier = { - factor = 1.5 - is_country_type = default - allows_alien_leaders = yes - } - mult = value:xenophile_ethics_from_relations - modifier = { - factor = 0.25 - any_relation = { - has_opinion_modifier = { - who = root - is_reverse = yes - modifier = opinion_genocidal_our_species - } - } - } - modifier = { - factor = 0.35 - any_relation = { - has_opinion_modifier = { - who = root - modifier = opinion_genocidal - } - } - } - modifier = { - factor = 0.5 - is_same_species = root - any_relation = { - NOT = { is_same_species = root } - any_enslaved_species = { - is_robotic = no - is_same_species = root - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_xenophile } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_xenophile } - } - } - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|xenophile| - } - } - - # from = planet - pop_attraction = { - base = 1 - - inline_script = { - script = "ethics/governor_pop_attraction" - ETHIC = xenophile - ETHIC_OPPOSED = xenophobe - } - - modifier = { - factor = 0 - has_trait = trait_hive_mind - } - modifier = { - factor = 2 - not = { is_same_species = root } - has_citizenship_rights = no - is_enslaved = no - } - modifier = { - factor = 2.0 - is_enslaved = no - fromfrom = { - any_owned_pop = { - not = { is_same_species = root } - is_enslaved = no - is_being_purged = no - is_sapient = yes - is_robot_pop = no - NOT = { has_trait = trait_syncretic_proles } - } - } - } - modifier = { - factor = 1.5 - from = { - any_owned_species = { - NOT = { is_same_species = root } - has_trait = "trait_charismatic" - } - } - } - modifier = { - factor = 0.5 - has_trait = trait_necrophage + has_trait = trait_necrophage } modifier = { factor = 1.1 @@ -1915,185 +1509,8 @@ ethic_militarist = { } # from = planet - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_militarist = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_militarist = yes - } - } - } - } - } - - modifier = { - factor = 2 - is_country_type = default - is_militarist = no - OR = { - has_faction = imperialist - has_faction = revolutionary - } - } - - modifier = { - factor = 1.5 - has_federation = yes - federation = { - has_federation_type = military_federation - } - } - - modifier = { - factor = 2 - has_ethic = ethic_militarist - } - - modifier = { - factor = 3 - has_ethic = ethic_fanatic_militarist - } - - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|militarist| - } - - modifier = { - factor = 0.33 - has_valid_civic = civic_inwards_perfection - } - - modifier = { - factor = 0.75 - is_country_type = default - years_of_peace = { - value > 20 - delay = 50 - } - } - modifier = { - factor = 0.75 - is_country_type = default - years_of_peace = { - value > 40 - delay = 50 - } - } - modifier = { - factor = 0.75 - is_country_type = default - years_of_peace = { - value > 60 - delay = 50 - } - } - modifier = { - factor = 0.75 - is_country_type = default - years_of_peace = { - value > 80 - delay = 50 - } - } - modifier = { - factor = 0.75 - is_country_type = default - years_of_peace = { - value > 100 - delay = 50 - } - } - - modifier = { - factor = 2.0 - is_at_war = yes - } - modifier = { - factor = 1.5 - is_at_war = yes - any_war = { - any_war_participant = { - is_rival = root - prev = { NOT = { is_war_participant = { side = root } } } - } - } - } - modifier = { - factor = 2.0 - recently_lost_war = yes - } - modifier = { - factor = 1.5 - any_neighbor_country = { - OR = { - is_hostile_to = root - is_domineering_to = root - is_rival = root - } - } - } - modifier = { - factor = 1.25 - any_rival_country = { - is_neighbor_of = root - relative_power = { - who = root - category = fleet - value >= superior - } - } - } - - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_militarist } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_militarist } - } - } - modifier = { - factor = 2 #If the empire is losing planets, militarism should increase - any_relation = { - any_owned_planet = { - is_original_owner = root - } - } - } - modifier = { - factor = 0.75 - has_policy_flag = no_wars - } - - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|militarist| - } - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 @@ -2333,127 +1750,8 @@ ethic_pacifist = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_pacifist = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_pacifist = yes - } - } - } - } - } - modifier = { - factor = 2 - is_country_type = default - is_pacifist = no - OR = { - has_faction = prosperity - has_faction = philosopher - } - } - modifier = { - factor = 1.5 - has_valid_civic = civic_inwards_perfection - } - modifier = { - factor = 0.5 - has_valid_civic = civic_fanatic_purifiers - } - - modifier = { - factor = 2 - has_ethic = ethic_pacifist - } - modifier = { - factor = 3 - has_ethic = ethic_fanatic_pacifist - } - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|pacifist| - } - modifier = { - factor = 1.33 - is_country_type = default - years_of_peace = { - value > 20 - delay = 50 - } - } - modifier = { - factor = 1.33 - is_country_type = default - years_of_peace = { - value > 40 - delay = 50 - } - } - modifier = { - factor = 1.33 - is_country_type = default - years_of_peace = { - value > 60 - delay = 50 - } - } - modifier = { - factor = 1.33 - is_country_type = default - years_of_peace = { - value > 80 - delay = 50 - } - } - modifier = { - factor = 1.33 - is_country_type = default - years_of_peace = { - value > 100 - delay = 50 - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_pacifist } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_pacifist } - } - } - modifier = { - factor = 0.75 - has_policy_flag = unrestricted_wars - } - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|pacifist| - } - mult = value:pacifist_ethics_from_pacts - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 @@ -2706,112 +2004,8 @@ ethic_spiritualist = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_spiritualist = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_spiritualist = yes - } - } - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_spiritualist } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_spiritualist } - } - } - modifier = { - factor = 2 - is_country_type = default - is_spiritualist = no - OR = { - has_faction = traditionalist - has_faction = secular - } - } - modifier = { - factor = 1.5 - has_federation = yes - federation = { - has_federation_type = spiritualist_federation - } - } - modifier = { - factor = 1.2 - has_federation = yes - federation = { - has_federation_type = spiritualist_federation - has_federation_perk = spiritualist_envoys_1 - } - any_owned_leader = { - is_assigned_to_federation = yes - } - } - modifier = { - factor = 2 - has_ethic = ethic_spiritualist - } - modifier = { - factor = 3 - has_ethic = ethic_fanatic_spiritualist - } - modifier = { - factor = 1.1 - is_country_type = default - has_technology = "tech_psionic_theory" - } - modifier = { - factor = 1.5 - is_country_type = default - has_ascension_perk = ap_mind_over_matter - } - modifier = { - factor = 1.5 - is_country_type = default - has_tradition = tr_psionics_psionic_assimilation - } - modifier = { - factor = 0.75 - is_country_type = default - has_policy_flag = ai_full_rights - } - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|spiritualist| - } - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|spiritualist| - } - mult = value:spiritualist_ethics_from_relations - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 @@ -3074,90 +2268,8 @@ ethic_materialist = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_materialist = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_materialist = yes - } - } - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 20 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_materialist } - } - } - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_materialist } - } - } - modifier = { - factor = 2 - is_country_type = default - is_materialist = no - OR = { - has_faction = technologist - has_faction = competitors - } - } + country_attraction = { base = 1 } - modifier = { - factor = 1.5 - has_federation = yes - federation = { - has_federation_type = research_federation - } - } - modifier = { - factor = 2 - has_ethic = ethic_materialist - } - modifier = { - factor = 3 - has_ethic = ethic_fanatic_materialist - } - modifier = { - factor = 1.25 - has_origin = origin_mechanists - } - modifier = { - factor = 1.25 - is_country_type = default - has_policy_flag = ai_full_rights - } - modifier = { - exists = overlord - has_loyalty > 0 - mult = value:ethics_from_overlord|ETHIC|materialist| - } - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|materialist| - } - mult = value:materialist_ethics_from_relations - } - - # from = planet pop_attraction = { base = 1 diff --git a/common/ethics/ethic_rebuild_ethics.txt b/common/ethics/ethic_rebuild_ethics.txt index 328a97a94..a66f0d0c3 100644 --- a/common/ethics/ethic_rebuild_ethics.txt +++ b/common/ethics/ethic_rebuild_ethics.txt @@ -192,80 +192,8 @@ ethic_socialism = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_socialism = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_socialism = yes - } - } - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_socialism } - } - } - - modifier = { - factor = 5 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_socialism } - } - } - - modifier = { - factor = 2 - is_country_type = default - is_socialism = no - OR = { - has_faction = socialists - has_faction = pioneer - } - } - - modifier = { - factor = 1.5 - is_country_type = default - exists = ruler - ruler = { has_trait = trait_ruler_fertility_preacher } - } - - modifier = { - factor = 2 - has_ethic = ethic_socialism - } - - modifier = { - factor = 3 - has_ethic = ethic_fanatic_socialism - } - - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|socialism| - } - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 @@ -531,80 +459,8 @@ ethic_capitalism = { } } - country_attraction = { - base = 1 - modifier = { - factor = 0 - NOR = { - is_country_type = default - is_capitalism = yes - AND = { - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { - is_capitalism = yes - } - } - } - } - } - # Effects of indoctrination mission - modifier = { - factor = 10 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_fanatic_capitalism } - } - } - - modifier = { - factor = 5 - is_country_type = primitive - has_country_flag = preftl_societal_enlightenment_pact - capital_scope = { - has_observation_outpost = yes - observation_outpost_owner = { has_ethic = ethic_capitalism } - } - } - - modifier = { - factor = 2 - is_country_type = default - is_capitalism = no - OR = { - has_faction = bankers - has_faction = industrialist - } - } - - modifier = { - factor = 1.5 - is_country_type = default - exists = ruler - ruler = { or = { has_trait = trait_ruler_investor } } - } - - modifier = { - factor = 2 - has_ethic = ethic_capitalism - } - - modifier = { - factor = 3 - has_ethic = ethic_fanatic_capitalism - } - - # Check for any leader on the Council with Faction's Ethic. - modifier = { - factor = value:count_councilors_with_ethic|ETHIC|capitalism| - } - } + country_attraction = { base = 1 } - # from = planet pop_attraction = { base = 1 diff --git a/common/governments/civics/ethic_civics_cultural_religious.txt b/common/governments/civics/ethic_civics_cultural_religious.txt index 35b339129..9d72393aa 100644 --- a/common/governments/civics/ethic_civics_cultural_religious.txt +++ b/common/governments/civics/ethic_civics_cultural_religious.txt @@ -2608,7 +2608,7 @@ civic_toxic_baths = { base = 15 modifier = { factor = 4 - owner_main_species = { is_species_class = TOX } + # owner_main_species = { is_species_class = TOX } } } leader_background_job_weight = { diff --git a/common/scripted_triggers/ethic_factions_scripted_triggers.txt b/common/scripted_triggers/ethic_factions_scripted_triggers.txt index 88a3790c5..ae0bff75e 100644 --- a/common/scripted_triggers/ethic_factions_scripted_triggers.txt +++ b/common/scripted_triggers/ethic_factions_scripted_triggers.txt @@ -14,6 +14,7 @@ is_faction_allowed = { has_origin = origin_broken_shackles } } + is_ai = no NOR = { is_gestalt = yes has_country_flag = suppress_vanilla_factions