From 2a1cf7d76f9e3488cc737bbdae4d0a3bd73dbd7a Mon Sep 17 00:00:00 2001 From: Colin <1604990672@qq.com> Date: Wed, 21 Sep 2022 23:09:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=AF=88=E9=AA=97ai=E9=80=A0=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=BB=BA=E7=AD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/buildings/ethic_unity_buildings.txt | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/common/buildings/ethic_unity_buildings.txt b/common/buildings/ethic_unity_buildings.txt index 98c95b912..989c4bed9 100644 --- a/common/buildings/ethic_unity_buildings.txt +++ b/common/buildings/ethic_unity_buildings.txt @@ -193,6 +193,13 @@ building_bureaucratic_1 = { job_media_worker_add = 1 } + ai_resource_production = { # cheat ai player that empire_size_buidling makes unity + potential = { + always = yes + } + unity = 20 + } + triggered_desc = { text = job_media_worker_effect_desc } @@ -288,7 +295,14 @@ building_bureaucratic_2 = { rare_crystals = @b2_rare_upkeep } } - + + ai_resource_production = { # cheat ai player that empire_size_buidling makes unity + potential = { + always = yes + } + unity = 40 + } + triggered_planet_modifier = { potential = { exists = owner @@ -474,7 +488,12 @@ building_bureaucratic_3 = { rare_crystals = @b3_rare_upkeep } } - + ai_resource_production = { # cheat ai player that empire_size_buidling makes unity + potential = { + always = yes + } + unity = 60 + } triggered_planet_modifier = { potential = { exists = owner From 7d7a3e10770900faad178481e9c028551ec27e41 Mon Sep 17 00:00:00 2001 From: MaretJavia <86963237+MaretJavia@users.noreply.github.com> Date: Wed, 21 Sep 2022 23:43:43 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=AA=91=E5=A3=AB=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/buildings/ethics_capital_buildings.txt | 224 ++++++++++++++++-- common/governments/civics/00_origins.txt | 49 +++- .../civics/ethic_civics_yellow.txt | 2 +- common/pop_jobs/01_ruler_jobs.txt | 14 +- common/pop_jobs/02_specialist_jobs.txt | 6 + common/pop_jobs/03_worker_jobs.txt | 6 +- .../english/ethic_civics_l_english.yml | 5 +- .../replace/english/ethic_jobs_l_english.yml | 9 + .../ethic_civics_l_simp_chinese.yml | 2 +- .../ethic_jobs_l_simp_chinese.yml | 9 + .../ethic_tooltips_l_simp_chinese.yml | 3 +- 11 files changed, 301 insertions(+), 28 deletions(-) diff --git a/common/buildings/ethics_capital_buildings.txt b/common/buildings/ethics_capital_buildings.txt index 05e4e9cd2..ee9c27c8d 100644 --- a/common/buildings/ethics_capital_buildings.txt +++ b/common/buildings/ethics_capital_buildings.txt @@ -405,7 +405,6 @@ building_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -415,6 +414,18 @@ building_capital = { job_noble_add = 1 } } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_feudal_realm + } + } + modifier = { + job_politician_add = -1 + job_knight_commander_add = 1 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -587,7 +598,6 @@ building_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -1091,7 +1101,6 @@ building_major_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -1101,6 +1110,18 @@ building_major_capital = { job_politician_add = -1 } } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_feudal_realm + } + } + modifier = { + job_politician_add = -1 + job_knight_commander_add = 1 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -1319,7 +1340,6 @@ building_major_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -1803,7 +1823,6 @@ building_system_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -1813,6 +1832,18 @@ building_system_capital = { job_politician_add = -2 } } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_feudal_realm + } + } + modifier = { + job_politician_add = -2 + job_knight_commander_add = 2 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -2049,7 +2080,6 @@ building_system_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -2538,7 +2568,6 @@ building_imperial_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -2548,6 +2577,18 @@ building_imperial_capital = { job_politician_add = -3 } } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_feudal_realm + } + } + modifier = { + job_politician_add = -3 + job_knight_commander_add = 3 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -2784,7 +2825,6 @@ building_imperial_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -3150,6 +3190,36 @@ building_hab_capital = { job_clerk_add = 1 } } + + #纳垢骑士 + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + } + } + modifier = { + job_knight_add = 1 + job_politician_add = -1 + } + } + + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + has_authority = auth_corporate + } + } + modifier = { + job_knight_add = 1 + job_executive_add = -1 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -3412,6 +3482,21 @@ building_hab_capital = { } text = job_student_effect_desc } + triggered_desc = { + trigger = { + exists = owner + owner = { + has_origin = origin_toxic_knights + NOR = { + has_country_flag = toxoids_7011_b + has_country_flag = toxoids_7040_b + has_country_flag = toxoids_7130_b + } + } + has_planet_flag = toxic_knights_habitat + } + text = job_knight_commander_effect_desc + } } #居住站首都 @@ -3505,6 +3590,8 @@ building_hab_major_capital = { planet_max_buildings_add = 2 planet_max_branch_office_buildings_add = 2 } + + #纳垢骑士 triggered_planet_modifier = { potential = { has_planet_flag = toxic_knights_habitat @@ -3518,7 +3605,23 @@ building_hab_major_capital = { job_knight_add = 1 job_politician_add = -2 } - } #有毒吧 + } + + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + has_authority = auth_corporate + } + } + modifier = { + job_knight_commander_add = 1 + job_knight_add = 1 + job_executive_add = -2 + } + } triggered_planet_modifier = { potential = { @@ -3877,7 +3980,6 @@ building_hab_major_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -4067,7 +4169,6 @@ building_hab_major_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -4568,6 +4669,39 @@ building_hab_system_capital = { job_politician_add = 3 } } + + #纳垢骑士 + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + } + } + modifier = { + job_knight_commander_add = 1 + job_knight_add = 2 + job_politician_add = -3 + } + } + + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + has_authority = auth_corporate + } + } + modifier = { + job_knight_commander_add = 1 + job_knight_add = 2 + job_executive_add = -3 + } + } + triggered_planet_modifier = { potential = { exists = owner @@ -4761,7 +4895,6 @@ building_hab_system_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -4990,7 +5123,6 @@ building_hab_system_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -5184,6 +5316,21 @@ building_hab_system_capital = { } text = job_university_student_effect_desc } + triggered_desc = { + trigger = { + exists = owner + owner = { + has_origin = origin_toxic_knights + NOR = { + has_country_flag = toxoids_7011_b + has_country_flag = toxoids_7040_b + has_country_flag = toxoids_7130_b + } + } + has_planet_flag = toxic_knights_habitat + } + text = job_knight_commander_effect_desc + } } #帝国王座 @@ -5488,6 +5635,40 @@ building_hab_imperial_capital = { job_executive_per_pop = 0.03 } } + + #纳垢骑士 + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + NOT = { has_authority = auth_corporate } + } + } + modifier = { + job_knight_commander_add = 2 + job_knight_add = 2 + job_politician_add = -4 + } + } + + triggered_planet_modifier = { + potential = { + has_planet_flag = toxic_knights_habitat + exists = owner + owner = { + has_origin = origin_toxic_knights + has_authority = auth_corporate + } + } + modifier = { + job_knight_commander_add = 2 + job_knight_add = 2 + job_executive_add = -4 + } + } + triggered_planet_modifier = { potential = { exists = owner @@ -5568,7 +5749,6 @@ building_hab_imperial_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -5815,7 +5995,6 @@ building_hab_imperial_capital = { owner = { OR = { has_valid_civic = civic_aristocratic_elite - has_valid_civic = civic_feudal_realm has_valid_civic = civic_eternal_kingship } } @@ -5998,6 +6177,21 @@ building_hab_imperial_capital = { } text = job_university_student_effect_desc } + triggered_desc = { + trigger = { + exists = owner + owner = { + has_origin = origin_toxic_knights + NOR = { + has_country_flag = toxoids_7011_b + has_country_flag = toxoids_7040_b + has_country_flag = toxoids_7130_b + } + } + has_planet_flag = toxic_knights_habitat + } + text = job_knight_commander_effect_desc + } } ############# diff --git a/common/governments/civics/00_origins.txt b/common/governments/civics/00_origins.txt index 135d3eec7..523e320cb 100644 --- a/common/governments/civics/00_origins.txt +++ b/common/governments/civics/00_origins.txt @@ -1182,6 +1182,7 @@ origin_imperial_vassal_overlord = { # AI Only } } +#三段基飞 origin_overtuned = { is_origin = yes icon = "gfx/interface/icons/origins/origins_overtuned.dds" @@ -1198,16 +1199,17 @@ origin_overtuned = { description = "origin_tooltip_overtuned_effects" flags = { custom_start_screen } -# feature_flags = { -# advanced_gene_modding -# add_advanced_traits -# } + #feature_flags = { + # advanced_gene_modding + # add_advanced_traits + #} random_weight = { base = 0 } } +#纳垢骑士 origin_toxic_knights = { is_origin = yes icon = "gfx/interface/icons/origins/origins_toxic_knights.dds" @@ -1226,6 +1228,45 @@ origin_toxic_knights = { } civics = { NOT = { value = civic_fanatic_purifiers } + NOR = { + text = civic_tooltip_not_theme_civic_if_not_feudal + value = civic_anarchism + value = civic_network_of_the_mind + value = civic_network_of_the_mind_machine + value = civic_network_of_the_mind_true_hive + value = civic_forever_with_us + value = civic_eternal_kingship + value = civic_shared_burden + value = civic_socialistic + value = civic_nazbol + value = civic_ultimate_collective + value = civic_beacon_of_liberty + value = civic_state_monopoly + value = civic_citizen_service + value = civic_military_junta + value = civic_military_dictatorship + value = civic_peaceful_republic + value = civic_executive_committee + value = civic_philosopher_king + value = civic_spiritual_democracy + value = civic_divine_council + value = civic_imperial_cult + value = civic_cyber_demos_cratos + value = civic_science_directorate + value = civic_cyber_dictatorship + } + NOR = { + text = civic_tooltip_not_subtopic_civic + value = civic_aristocratic_elite + value = civic_stratocracy + value = civic_byzantine_bureaucracy + value = civic_technocracy + value = civic_exalted_priesthood + value = civic_merchant_guilds + value = civic_peoples_republic + value = civic_glorious_pioneer + value = civic_social_democracy + } } } diff --git a/common/governments/civics/ethic_civics_yellow.txt b/common/governments/civics/ethic_civics_yellow.txt index d51a39436..bfd66d339 100644 --- a/common/governments/civics/ethic_civics_yellow.txt +++ b/common/governments/civics/ethic_civics_yellow.txt @@ -27,7 +27,7 @@ civic_feudal_realm = { country_vassal_naval_capacity_contribution_mult = 0.5 country_subject_power_penalty_mult = -0.5 pop_government_ethic_attraction = -0.5 - job_noble_per_pop = 0.03 + job_knight_commander_per_pop = 0.03 pop_ethic_authoritarian_attraction_mult = 0.25 } possible = { diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt index 7f366d326..95ef959fb 100644 --- a/common/pop_jobs/01_ruler_jobs.txt +++ b/common/pop_jobs/01_ruler_jobs.txt @@ -672,7 +672,7 @@ executive = { } } - +#骑士领主 knight_commander = { category = ruler condition_string = RULER_JOB_TRIGGER @@ -703,17 +703,25 @@ knight_commander = { mult = value:knight_commander_unity_output_modifier } produces = { - trigger = { exists = owner } + trigger = { + exists = owner + owner = { has_origin = origin_toxic_knights } + } physics_research = 2 engineering_research = 2 society_research = 2 mult = value:knight_commander_research_output_modifier } upkeep = { - alloys = 2 + alloys = 1 + consumer_goods = 1 } } + planet_modifier = { + job_knight_add = 2 + } + triggered_planet_modifier = { potential = { always = yes diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt index 0f4229c4d..f12ba9f67 100644 --- a/common/pop_jobs/02_specialist_jobs.txt +++ b/common/pop_jobs/02_specialist_jobs.txt @@ -3525,6 +3525,7 @@ reassigner = { } } +#诱变水疗护工 bath_attendant = { category = specialist condition_string = SPECIALIST_JOB_TRIGGER @@ -3576,6 +3577,7 @@ bath_attendant = { } } +#骑士 knight = { category = specialist condition_string = SPECIALIST_JOB_TRIGGER @@ -3616,6 +3618,10 @@ knight = { } } + planet_modifier = { + job_squire_add = 2 + } + triggered_pop_modifier = { potential = { always = yes diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt index e297cf0b4..4cc509283 100644 --- a/common/pop_jobs/03_worker_jobs.txt +++ b/common/pop_jobs/03_worker_jobs.txt @@ -1607,7 +1607,7 @@ ranger = { } } - +#扈从 squire = { category = worker condition_string = WORKER_JOB_TRIGGER @@ -1652,6 +1652,10 @@ squire = { resources = { category = planet_squires + produces = { + alloys = 1 + consumer_goods = 1 + } upkeep = { trigger = { planet = { has_modifier = syamelles_curse_habitat } diff --git a/localisation/replace/english/ethic_civics_l_english.yml b/localisation/replace/english/ethic_civics_l_english.yml index 394dfb4ba..0f37ce589 100644 --- a/localisation/replace/english/ethic_civics_l_english.yml +++ b/localisation/replace/english/ethic_civics_l_english.yml @@ -4,8 +4,9 @@ civic_tooltip_possess_the_doctrine:0 "At least one §PReligious Creed§!" civic_tooltip_not_theme_civic_and_culture:0 "Does NOT have §YTheme Civics§!, §ESubtopic Civics§! and §PNational Culture§!" civic_tooltip_not_theme_civic:0 "Does NOT have §YTheme Civics§!" - civic_tooltip_not_theme_civic_if_not_anarchism:0 "Doesn't have any §YTheme Civics§! other than §Y$civic_anarchism$§!" + civic_tooltip_not_theme_civic_if_not_anarchism:0 "Doesn't have any §YTheme Civics§! other than §H$civic_anarchism$§!" civic_tooltip_not_theme_civic_if_not_free:0 "Doesn't have any §YTheme Civics§! other than §Y$civic_shared_burden$§! or §Y$civic_beacon_of_liberty$§!" + civic_tooltip_not_theme_civic_if_not_feudal:0 "Doesn't have any §YTheme Civics§! other than §Y$civic_feudal_realm$§!" civic_tooltip_not_subtopic_civic:0 "Does NOT have §ESubtopic Civics§!" civic_tooltip_not_network_of_the_mind:0 "Does NOT have §Y$civic_network_of_the_mind$§! Civic" good_trading:0 "Economics" @@ -92,7 +93,7 @@ civic_tooltip_citizen_service_effects:2 " - £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! Jobs with £job_commandante£ §Y$job_commandante_plural$§!, which increase Empire's §YNaval Capacity§!, spawn §YDefense Armies§!, increase planetary §YStability§! and reduce damage from §YBombardment§! \n - £job_commandante£ §Y$job_commandante_plural$§! provide additional £unity£ §YUnity§! and £amenities£ §YAmenities§! \n" civic_feudal_realm:0 "§H§YFeudal Empire§!§!" civic_feudal_realm_desc:0 "§YTheme Civic§!\nThis society has an entrenched nobility that occupies the upper echelons of society, with a monarch whose rule relies on powerful vassals that govern their territories with considerable autonomy." - civic_tooltip_feudal_realm_effects:4 " - £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! Jobs with £job_noble£ §Y$job_noble_plural$§!\n - §YLeader§! £unity£ $unity$ required for upkeep has been replaced with £consumer_goods£ §Y$consumer_goods$§!, at the same time you can no longer fire them.\n - In addition, your employed §YGovernors§! generate £unity£Unity equal to their level.\n - Your §YSubjects§! can build §YStarbases§! to expand their territory.\n" + civic_tooltip_feudal_realm_effects:4 " - £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! Jobs with £job_knight_commander£ §Y$job_knight_commander_plural$§!\n - §YLeader§! £unity£ $unity$ required for upkeep has been replaced with £consumer_goods£ §Y$consumer_goods$§!, at the same time you can no longer fire them.\n - In addition, your employed §YGovernors§! generate £unity£Unity equal to their level.\n - Your §YSubjects§! can build §YStarbases§! to expand their territory.\n" civic_feudal_realm:0 "§H§YEternal Kingship§!§!" civic_eternal_kingship_desc:0 "§YTheme Civic§!\nThis society obeys a great monarch and is loyal to his noble descendants, and all nobles and people are closely united under the royal family." civic_tooltip_eternal_kingship_effects:4 " - £building£ §YCapital Buildings§! replace some £job_politician£ §Y$job_politician$§! Jobs with £job_noble£ §Y$job_noble_plural$§!\n - Your §YLeaders§! do not cost £unity£Unity upkeep if employed.\n - Your §YSubjects§! can build §YStarbases§! to expand their territory.\n" diff --git a/localisation/replace/english/ethic_jobs_l_english.yml b/localisation/replace/english/ethic_jobs_l_english.yml index 3c7899658..d4cc231a6 100644 --- a/localisation/replace/english/ethic_jobs_l_english.yml +++ b/localisation/replace/english/ethic_jobs_l_english.yml @@ -2,6 +2,15 @@ job_criminal_effect_desc:0 "The criminals certainly did not produce anything, but we can still count on them to pay some taxes." + job_knight:0 "Knight" + job_knight_plural:0 "Knights" + job_knight_desc:1 "Trained for combat; well educated; virtuous. These knights represent the very best of our society, only to seek the way of one's own knighthood." + job_knight_effect_desc:1 "£job_knight£ $job_knight_plural$ use $r_alloys$ to provide £mod_country_naval_cap_add£ §YNaval Capacity§!, £defense_army£ §YDefense Armies§!, £unity£ §YUnity§! and £physics_research£ £society_research£ £engineering_research£ §YResearch Points§!.\nCompleting §YKnightly Quests§! can further improve their output." + mod_job_knight_add:0 "$job_knight$ Jobs" + mod_job_knight_per_pop:0 "§G+1§! $job_knight$ Job per $VALUE$ Pops" + mod_job_knight_per_pop_short:0 "\n§G+1§! £job_knight£ per $VALUE$ £pop£" + knights_independent_category:0 "Knights" + job_vanguard:0 "Immortal" job_vanguard_desc:0 "These pioneers of consciousness uploading are still influencing the civilizations they love in another form." job_vanguard_plural:0 "$job_vanguard$" diff --git a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml index 7fd4b9de7..8a1efedf7 100644 --- a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml @@ -84,7 +84,7 @@ civic_feudal_realm:0 "§H§Y封建帝国§!§!" civic_feudal_realm_desc:0 "§Y主题理念§!\n该社会中根深蒂固的贵族阶级占据着社会上层，君主依靠强大的拥有封地和自主权的封臣们来维持统治。" - civic_tooltip_feudal_realm_effects:4 " - £building£ §Y首府建筑§!会替换部分 £job_politician£ §Y$job_politician$§!岗位为 £job_noble£ §Y$job_noble_plural$§!岗位\n - 维护§Y领袖§!所需要的£unity£ 凝聚力替换为£consumer_goods£ §Y$consumer_goods$§!，同时你也无法再解雇他们\n - §Y总督§!将产出与等级挂钩的£unity£ 凝聚力\n - 你的§Y附属§!获得额外的§G1§!点$r_loyalty$加成，同时也不会因为你拥有过多附属而负担惩罚\n" + civic_tooltip_feudal_realm_effects:4 " - £building£ §Y首府建筑§!会替换部分 £job_politician£ §Y$job_politician$§!岗位为 £job_knight_commander£ §Y$job_knight_commander_plural$§!岗位\n - 维护§Y领袖§!所需要的£unity£ 凝聚力替换为£consumer_goods£ §Y$consumer_goods$§!，同时你也无法再解雇他们\n - §Y总督§!将产出与等级挂钩的£unity£ 凝聚力\n - 你的§Y附属§!获得额外的§G1§!点$r_loyalty$加成，同时也不会因为你拥有过多附属而负担惩罚\n" civic_eternal_kingship:0 "§H§Y永恒王权§!§!" civic_eternal_kingship_desc:0 "§Y主题理念§!\n这个社会遵从一位伟大的君主并忠诚于其高贵的后代，所有的贵族与民众都紧密的团结在王室的麾下。" diff --git a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml index 949a2aa07..6702ccd26 100644 --- a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml @@ -3,6 +3,15 @@ ############### # 岗位 ############### + + job_knight:0 "骑士" + job_knight_plural:0 "骑士" + job_knight_desc:1 "为战而训，品学兼优。这些骑士们代表着我们社会的精粹，他们全身心地奉献一切，只为寻求自己的骑士之道。" + job_knight_effect_desc:1 "£job_knight£ $job_knight_plural$消耗$r_alloys$提供£mod_country_naval_cap_add£ §Y海军容量§!，£defense_army£ §Y防御部队§!，£unity£ §Y凝聚力§!，以及£physics_research£ £society_research£ £engineering_research£§Y研究点数§!\n完成§Y骑士誓言试炼§!能够进一步改善他们的产出。" + mod_job_knight_add:0 "$job_knight$岗位" + mod_job_knight_per_pop:0 "每$VALUE$个人口§G+1§!$job_knight$岗位" + mod_job_knight_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§!£job_knight£" + knights_independent_category:0 "骑士" job_vanguard:0 "不朽者" job_vanguard_desc:0 "这些意识上传的先驱者仍然在以另一种形式影响着他们所爱着的文明。" diff --git a/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml index d32f66455..49814f0b1 100644 --- a/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_tooltips_l_simp_chinese.yml @@ -173,8 +173,9 @@ civic_tooltip_not_theme_civic_and_culture:0 "不具备其它任何§Y主题理念§!、§E次主题理念§!与§P国民文化§!" civic_tooltip_not_theme_civic:0 "不具备其它任何§Y主题理念§!" - civic_tooltip_not_theme_civic_if_not_anarchism:0 "不具备除了§Y$civic_anarchism$§!以外的其它任何§Y主题理念§!" + civic_tooltip_not_theme_civic_if_not_anarchism:0 "不具备除了§H$civic_anarchism$§!以外的其它任何§Y主题理念§!" civic_tooltip_not_theme_civic_if_not_free:0 "不具备除了§Y$civic_shared_burden$§!或§Y$civic_beacon_of_liberty$§!以外的其它任何§Y主题理念§!" + civic_tooltip_not_theme_civic_if_not_feudal:0 "不具备除了§Y$civic_feudal_realm$§!以外的其它任何§Y主题理念§!" civic_tooltip_not_subtopic_civic:0 "不具备其它任何§E次主题理念§!" civic_tooltip_not_network_of_the_mind:0 "没有国民理念：§Y$civic_network_of_the_mind$§!" \ No newline at end of file From 668cf3a5b06541ffadaefe972a5b58a786dcd0a1 Mon Sep 17 00:00:00 2001 From: Colin <1604990672@qq.com> Date: Thu, 22 Sep 2022 14:30:43 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=96=B0=E5=9B=BD=E7=AD=96=E5=85=BC?= =?UTF-8?q?=E5=AE=B9+=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/governments/civics/00_civics.txt | 52 +++++++++++++++++++ events/ethic_civic_yearly_check.txt | 8 +-- .../ethic_events_l_simp_chinese.yml | 6 +-- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/common/governments/civics/00_civics.txt b/common/governments/civics/00_civics.txt index 8366602fd..b2568b30c 100644 --- a/common/governments/civics/00_civics.txt +++ b/common/governments/civics/00_civics.txt @@ -136,3 +136,55 @@ civic_world_cooperative = { empire_size_penalty_mult = 0.5 } } + +# 3.5 新国策兼容 +civic_toxic_baths = { + playable = { has_toxoids = yes } + ai_playable = { has_toxoids = yes } + description = "civic_tooltip_toxic_baths_effects" + potential = { + ethics = { NOT = { value = ethic_gestalt_consciousness } } + authority = { NOT = { value = auth_corporate } } + } + possible = { + origin = { NOT = { value = origin_life_seeded } } + } +} + +civic_relentless_industrialists = { + playable = { has_toxoids = yes } + ai_playable = { has_toxoids = yes } + description = "civic_tooltip_relentless_industrialists_effects" + potential = { + ethics = { NOT = { value = ethic_gestalt_consciousness } } + authority = { NOT = { value = auth_corporate } } + } + possible = { + ethics = { + OR = { + text = civic_tooltip_materialist + value = ethic_materialist + value = ethic_fanatic_materialist + } + } + origin = { NOT = { value = origin_life_seeded } } + civics = { + NOR = { + value = civic_environmentalist + value = civic_agrarian_idyll + value = civic_idyllic_bloom + value = civic_memorialist + } + } + } +} + +civic_scavengers = { + playable = { has_toxoids = yes } + ai_playable = { has_toxoids = yes } + description = "civic_scavengers_effects" + potential = { + ethics = { NOT = { value = ethic_gestalt_consciousness } } + authority = { NOT = { value = auth_corporate } } + } +} diff --git a/events/ethic_civic_yearly_check.txt b/events/ethic_civic_yearly_check.txt index ff2a0f0b2..fba68c234 100644 --- a/events/ethic_civic_yearly_check.txt +++ b/events/ethic_civic_yearly_check.txt @@ -46,23 +46,23 @@ country_event = { set_variable = { which = vanguard_num value = 0 } set_country_flag = vanguard_set_started } - every_owned_planet = { + capital_scope = { if = { limit = { years_passed < 10 - NOT = { has_planet_flag = vanguard_star_yes } + # NOT = { has_planet_flag = vanguard_star_yes } } add_vanguard_pop = { POSSIBILITY = 0 } } else_if = { limit = { check_variable = { which = vanguard_num value < trigger:num_ascension_perks } - NOT = { has_planet_flag = vanguard_star_yes } + # NOT = { has_planet_flag = vanguard_star_yes } } add_vanguard_pop = { POSSIBILITY = 75 } } else = { - limit = { NOT = { has_planet_flag = vanguard_star_yes } } + # limit = { NOT = { has_planet_flag = vanguard_star_yes } } add_vanguard_pop = { POSSIBILITY = 5 } } } diff --git a/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml index 89eca3e20..3dea9eff3 100644 --- a/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml @@ -1,5 +1,5 @@ l_simp_chinese: - ethic_civic_yearly.4.desc:0 "" + ethic_civic_yearly.4.desc:0 "志愿加入[root.owner.GetName]先锋队，拥护先锋队的纲领，遵守先锋队的章程，履行先锋队员义务，执行先锋队的决定，严守先锋队的纪律，保守先锋队的秘密，对先锋队忠诚，积极工作，为共产主义奋斗终身，随时准备为先锋队和人民牺牲一切，永不叛先锋队。" ethic_civic_yearly.4.title:0 "入党申请书" - ethic_civic_yearly.4.a:0 "" - ethic_civic_yearly.4.b:0 "" \ No newline at end of file + ethic_civic_yearly.4.a:0 "了解" + ethic_civic_yearly.4.b:0 "了解，之后无需告知" \ No newline at end of file From 943b7973605fc4aa7cd37e28890769fbcd88950a Mon Sep 17 00:00:00 2001 From: Colin <1604990672@qq.com> Date: Thu, 22 Sep 2022 20:30:24 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B0=B4=E6=B5=B4=20=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/governments/civics/00_civics.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/common/governments/civics/00_civics.txt b/common/governments/civics/00_civics.txt index b2568b30c..d3e0b4c6a 100644 --- a/common/governments/civics/00_civics.txt +++ b/common/governments/civics/00_civics.txt @@ -138,19 +138,6 @@ civic_world_cooperative = { } # 3.5 新国策兼容 -civic_toxic_baths = { - playable = { has_toxoids = yes } - ai_playable = { has_toxoids = yes } - description = "civic_tooltip_toxic_baths_effects" - potential = { - ethics = { NOT = { value = ethic_gestalt_consciousness } } - authority = { NOT = { value = auth_corporate } } - } - possible = { - origin = { NOT = { value = origin_life_seeded } } - } -} - civic_relentless_industrialists = { playable = { has_toxoids = yes } ai_playable = { has_toxoids = yes } From 9988706359d40e3c99059714f17aef0055727c1b Mon Sep 17 00:00:00 2001 From: MaretJavia <86963237+MaretJavia@users.noreply.github.com> Date: Thu, 22 Sep 2022 22:18:57 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=80=83=E7=A0=94=E9=AA=91=E5=A3=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ethic_manufacturing_buildings.txt | 162 +++++++ .../civics/03_corporate_civics.txt | 13 +- .../ethic_civics_cultural_religious.txt | 24 ++ .../civics/ethic_civics_nationality.txt | 9 +- common/pop_jobs/01_ruler_jobs.txt | 79 ++-- common/pop_jobs/02_specialist_jobs.txt | 407 +++++++++--------- common/pop_jobs/03_worker_jobs.txt | 9 + .../ethic_rebuild_scripted_triggers.txt | 8 + .../governments/civics/civic_scavengers.dds | Bin 0 -> 3492 bytes .../english/ethic_civics_l_english.yml | 7 +- .../ethic_civics_l_simp_chinese.yml | 7 +- 11 files changed, 491 insertions(+), 234 deletions(-) create mode 100644 gfx/interface/icons/governments/civics/civic_scavengers.dds diff --git a/common/buildings/ethic_manufacturing_buildings.txt b/common/buildings/ethic_manufacturing_buildings.txt index 3ab6f5613..0a2e88ade 100644 --- a/common/buildings/ethic_manufacturing_buildings.txt +++ b/common/buildings/ethic_manufacturing_buildings.txt @@ -1095,3 +1095,165 @@ building_factory_3 = { } } } + +# 协同物流中心 +building_coordinated_fulfillment_center_1 = { + base_buildtime = @b1_time + base_cap_amount = 1 + + category = manufacturing + + potential = { + host_has_dlc = "Toxoids Species Pack" + exists = owner + owner = { is_relentless_industrialist_empire = yes } + NOR = { + has_modifier = resort_colony + has_modifier = slave_colony + } + } + + destroy_trigger = { + exists = owner + OR = { + owner = { is_relentless_industrialist_empire = no } + has_modifier = resort_colony + has_modifier = slave_colony + AND = { + owner = { + is_ai = yes + } + has_any_industry_district = no + } + } + } + + prerequisites = { + tech_basic_industry + } + + show_tech_unlock_if = { + is_relentless_industrialist_empire = yes + } + + allow = { + has_upgraded_capital = yes + } + + triggered_desc = { + trigger = { + NOR = { + is_planet_class = pc_nuked + is_planet_class = pc_city + uses_district_set = habitat + uses_district_set = ring_world + uses_district_set = shattered_ring_world + } + } + text = building_coordinated_fulfillment_center_tooltip + } + + planet_modifier = { + planet_metallurgists_produces_mult = 0.2 + planet_artisans_produces_mult = 0.2 + } + + triggered_planet_modifier = { + potential = { + owner = { has_policy_flag = relentless_industrialists_full_steam_ahead } + } + modifier = { + planet_metallurgists_produces_mult = 0.1 + planet_artisans_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + owner = { is_synthetic_empire = no } + } + modifier = { + pop_growth_speed_reduction = 0.15 + } + } + + triggered_planet_modifier = { + potential = { + owner = { + is_synthetic_empire = no + NAND = { + has_policy_flag = relentless_industrialists_study + has_country_flag = relentless_industrialists_study_completed + } + } + } + modifier = { + pop_growth_speed_reduction = 0.05 + } + } + + triggered_planet_modifier = { + potential = { + owner = { is_synthetic_empire = yes } + } + modifier = { + habitability_ceil_add = -0.075 + } + } + + triggered_planet_modifier = { + potential = { + owner = { + owner = { is_synthetic_empire = yes } + NAND = { + has_policy_flag = relentless_industrialists_study + has_country_flag = relentless_industrialists_study_completed + } + } + } + modifier = { + habitability_ceil_add = -0.025 + } + } + + upgrades = { + building_coordinated_fulfillment_center_2 + } + + resources = { + category = planet_buildings + cost = { + minerals = @b1_minerals + } + upkeep = { + energy = @b1_upkeep + } + upkeep = { + unity = 10 + trigger = { + owner = { has_policy_flag = relentless_industrialists_cleanup } + } + } + } + + ai_resource_production = { + alloys = 6 + trigger = { + planet_resource_compare = { + resource = alloys + value >= 40 + type = produces + } + } + } + ai_resource_production = { + consumer_goods = 8 + trigger = { + planet_resource_compare = { + resource = consumer_goods + value >= 50 + type = produces + } + } + } +} \ No newline at end of file diff --git a/common/governments/civics/03_corporate_civics.txt b/common/governments/civics/03_corporate_civics.txt index fcf4298c3..9113cb515 100644 --- a/common/governments/civics/03_corporate_civics.txt +++ b/common/governments/civics/03_corporate_civics.txt @@ -504,9 +504,15 @@ civic_corporate_cybercap = { } } -#工业复合体 +#冷酷实业家 civic_industrial_economy_corporate = { description = civic_tooltip_industrial_economy_effects + swap_type = { + description = "civic_tooltip_industrial_economy_dlc_effects" + trigger = { + has_toxoids = yes + } + } potential = { OR = { authority = { @@ -534,10 +540,9 @@ civic_industrial_economy_corporate = { base = 5 } modifier = { - country_minerals_produces_mult = 0.15 - planet_building_build_speed_mult = 0.5 + planet_building_build_speed_mult = 0.25 country_engineering_tech_research_speed = 0.1 - country_society_tech_research_speed = -0.1 + country_society_tech_research_speed = -0.15 } } diff --git a/common/governments/civics/ethic_civics_cultural_religious.txt b/common/governments/civics/ethic_civics_cultural_religious.txt index 9994072aa..9a78c0dad 100644 --- a/common/governments/civics/ethic_civics_cultural_religious.txt +++ b/common/governments/civics/ethic_civics_cultural_religious.txt @@ -1273,6 +1273,30 @@ civic_zhaowen_dao = { } } +#拾荒者 +civic_scavengers = { + playable = { + OR = { + has_toxoids = yes + has_overlord_dlc = yes + } + } + ai_playable = { + OR = { + has_toxoids = yes + has_overlord_dlc = yes + } + } + description = "civic_scavengers_effects" + potential = { + ethics = { + NOT = { + value = ethic_gestalt_consciousness + } + } + } +} + ##### 宗教 ##### #受控人仆 diff --git a/common/governments/civics/ethic_civics_nationality.txt b/common/governments/civics/ethic_civics_nationality.txt index 396d14e17..826c2c309 100644 --- a/common/governments/civics/ethic_civics_nationality.txt +++ b/common/governments/civics/ethic_civics_nationality.txt @@ -2260,6 +2260,12 @@ civic_innovative_economy = { #无情工业化 civic_industrial_economy = { description = civic_tooltip_industrial_economy_effects + swap_type = { + description = "civic_tooltip_industrial_economy_dlc_effects" + trigger = { + has_toxoids = yes + } + } potential = { ethics = { NOT = { @@ -2297,10 +2303,9 @@ civic_industrial_economy = { base = 5 } modifier = { - country_minerals_produces_mult = 0.15 planet_building_build_speed_mult = 0.25 country_engineering_tech_research_speed = 0.1 - country_society_tech_research_speed = -0.1 + country_society_tech_research_speed = -0.15 } } diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt index 95ef959fb..7c6ce412c 100644 --- a/common/pop_jobs/01_ruler_jobs.txt +++ b/common/pop_jobs/01_ruler_jobs.txt @@ -27,15 +27,29 @@ head_researcher = { resources = { category = planet_researchers produces = { + trigger = { + exists = owner + owner = { NOT = { has_valid_civic = civic_science_knight } } + } physics_research = 5 engineering_research = 5 society_research = 5 } + produces = { + trigger = { + exists = owner + owner = { has_valid_civic = civic_science_knight } + } + physics_research = 5 + engineering_research = 5 + society_research = 5 + mult = value:knight_commander_unity_output_modifier + } produces = { trigger = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_futuristic_art } } @@ -46,7 +60,7 @@ head_researcher = { trigger = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_zhaowen_dao } } @@ -138,27 +152,34 @@ head_researcher = { } } + triggered_planet_modifier = { + potential = { + owner = { has_valid_civic = civic_science_knight } + } + job_researcher_add = 2 + } + weight = { weight = @ruler_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_research_modifier|JOB|head_researcher| + factOR = value:job_weights_research_modifier|JOB|head_researcher| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 2 + factOR = 2 has_living_standard = { type = living_standard_academic_privilege } } modifier = { - factor = 5 + factOR = 5 has_job = head_researcher } modifier = { - factor = 0.01 + factOR = 0.01 exists = planet exists = planet.controller planet.controller = { @@ -264,7 +285,7 @@ high_priest = { trigger = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_exalted_priesthood has_valid_civic = civic_imperial_cult has_valid_civic = civic_divine_council @@ -324,30 +345,30 @@ high_priest = { weight = { weight = @ruler_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|high_priest|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|high_priest|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.1 + factOR = 0.1 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 1.2 + factOR = 1.2 has_ethic = ethic_spiritualist } modifier = { - factor = 0.1 + factOR = 0.1 has_ethic = ethic_materialist NOT = { has_job = high_priest } } modifier = { - factor = 5 + factOR = 5 has_job = high_priest } # crisis purge modifier = { - factor = 0.01 + factOR = 0.01 exists = planet exists = planet.controller planet.controller = { @@ -405,7 +426,7 @@ politician = { potential = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_welfare_state } } @@ -418,7 +439,7 @@ politician = { potential = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_cultural_review_department } } @@ -441,21 +462,21 @@ politician = { weight = { weight = @ruler_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|politician|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|politician|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.1 + factOR = 0.1 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 5 + factOR = 5 has_job = politician } # crisis purge modifier = { - factor = 0.01 + factOR = 0.01 exists = planet exists = planet.controller planet.controller = { @@ -523,26 +544,26 @@ noble = { weight = { weight = @ruler_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|noble|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|noble|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.1 + factOR = 0.1 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 is_egalitarian = yes NOT = { has_job = noble } } modifier = { - factor = 5 + factOR = 5 has_job = noble } # crisis purge modifier = { - factor = 0.01 + factOR = 0.01 exists = planet exists = planet.controller planet.controller = { @@ -643,16 +664,16 @@ executive = { weight = { weight = @ruler_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|executive|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|executive|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 5 + factOR = 5 has_job = executive } # crisis purge modifier = { - factor = 0.01 + factOR = 0.01 exists = planet exists = planet.controller planet.controller = { @@ -738,7 +759,7 @@ knight_commander = { weight = { weight = @high_prio_specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|executive|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|executive|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { diff --git a/common/pop_jobs/02_specialist_jobs.txt b/common/pop_jobs/02_specialist_jobs.txt index f12ba9f67..6035c7e1d 100644 --- a/common/pop_jobs/02_specialist_jobs.txt +++ b/common/pop_jobs/02_specialist_jobs.txt @@ -138,11 +138,11 @@ merchant = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult| owner = { has_edict = dynamic_weight } } modifier = { #限制条件的sv mult - factor = 10 + factOR = 10 owner = { OR = { is_capitalism = yes @@ -152,17 +152,17 @@ merchant = { } } modifier = { - factor = 10 + factOR = 10 exists = owner owner = { is_capitalism = yes } } modifier = { - factor = 5 + factOR = 5 has_job = merchant } # crisis purge modifier = { - factor = 0.01 + factOR = 0.01 exists = planet exists = planet.controller planet.controller = { @@ -340,97 +340,97 @@ soldier = { weight = { weight = @soldier_job_weight modifier = { - factor = 10 + factOR = 10 exists = planet planet = { has_modifier = martial_law } } modifier = { - factor = 10 + factOR = 10 exists = owner owner = { is_militarist = yes } } modifier = { - factor = 2 + factOR = 2 has_trait = trait_resilient } modifier = { - factor = 2 + factOR = 2 has_trait = trait_very_strong } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_strong } modifier = { - factor = 0.5 + factOR = 0.5 has_trait = trait_weak } modifier = { - factor = 0.1 + factOR = 0.1 is_enslaved = yes NOT = { has_slavery_type = { type = slavery_military } } } modifier = { - factor = 10 + factOR = 10 is_enslaved = yes has_slavery_type = { type = slavery_military } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_cybernetic } modifier = { - factor = 2 + factOR = 2 has_trait = trait_presapient_earthbound } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_limited_regeneration } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_presapient_proles } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_brainslug } modifier = { - factor = 1.05 + factOR = 1.05 has_trait = trait_presapient_natural_intellectuals } modifier = { - factor = 1.05 + factOR = 1.05 OR = { has_trait = trait_robust has_trait = trait_robot_efficient_processors } } modifier = { - factor = 1.05 + factOR = 1.05 has_trait = trait_nerve_stapled } modifier = { - factor = 1.1 + factOR = 1.1 OR = { has_trait = trait_robot_propaganda_machines has_trait = trait_traditional } } modifier = { - factor = 0.9 + factOR = 0.9 has_trait = trait_quarrelsome } modifier = { - factor = 0 + factOR = 0 species = { can_be_soldier = no } } modifier = { - factor = 2 + factOR = 2 has_trait = trait_lithoid } } @@ -486,19 +486,19 @@ colonist = { weight = { weight = @colonist_job_weight # Higher prio modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = colonist } modifier = { - factor = 0 + factOR = 0 NOT = { has_job = colonist } exists = planet planet = { @@ -510,7 +510,7 @@ colonist = { } } modifier = { - factor = 0.8 + factOR = 0.8 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -536,15 +536,29 @@ researcher = { resources = { category = planet_researchers produces = { + trigger = { + exists = owner + owner = { NOT = { has_valid_civic = civic_science_knight } } + } + physics_research = 4 + engineering_research = 4 + society_research = 4 + } + produces = { + trigger = { + exists = owner + owner = { has_valid_civic = civic_science_knight } + } physics_research = 4 engineering_research = 4 society_research = 4 + mult = value:knight_commander_unity_output_modifier } produces = { trigger = { exists = owner owner = { - or = { + OR = { has_edict = scientific_spirit has_edict = indefinite_patent_act } @@ -556,7 +570,7 @@ researcher = { trigger = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_futuristic_art } } @@ -707,31 +721,38 @@ researcher = { } } + triggered_planet_modifier = { + potential = { + owner = { has_valid_civic = civic_science_knight } + } + job_squire_add = 2 + } + weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_research_modifier|JOB|researcher| + factOR = value:job_weights_research_modifier|JOB|researcher| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 2 + factOR = 2 has_living_standard = { type = living_standard_academic_privilege } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = researcher } modifier = { - factor = 0.8 + factOR = 0.8 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -823,7 +844,7 @@ priest = { trigger = { exists = owner owner = { - or = { + OR = { has_valid_civic = civic_exalted_priesthood has_valid_civic = civic_imperial_cult has_valid_civic = civic_divine_council @@ -898,122 +919,122 @@ priest = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|priest|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|priest|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 2 + factOR = 2 exists = owner owner = { has_civic = civic_exalted_priesthood } } modifier = { - factor = 2 + factOR = 2 OR = { has_trait = trait_robot_domestic_protocols has_trait = trait_charismatic } } modifier = { - factor = 0.5 + factOR = 0.5 has_trait = trait_repugnant } modifier = { - factor = 1.5 + factOR = 1.5 OR = { has_trait = trait_robot_propaganda_machines has_trait = trait_traditional } } modifier = { - factor = 1.2 + factOR = 1.2 has_ethic = ethic_spiritualist } modifier = { - factor = 0.5 + factOR = 0.5 has_trait = trait_quarrelsome } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_natural_sociologists } modifier = { - factor = 0.1 + factOR = 0.1 has_ethic = ethic_materialist NOT = { has_job = priest } } modifier = { - factor = 1.5 + factOR = 1.5 has_job = priest } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_brainslug } modifier = { - factor = 1.3 + factOR = 1.3 has_trait = trait_presapient_natural_intellectuals } modifier = { - factor = 1.3 + factOR = 1.3 OR = { has_trait = trait_robust has_trait = trait_robot_efficient_processors } } modifier = { - factor = 1.05 + factOR = 1.05 OR = { has_trait = trait_robot_logic_engines has_trait = trait_intelligent } } modifier = { - factor = 0.9 + factOR = 0.9 has_trait = trait_presapient_proles } modifier = { - factor = 1.05 + factOR = 1.05 has_trait = trait_psionic } modifier = { - factor = 0.7 + factOR = 0.7 has_trait = trait_enigmatic_intelligence_failed } modifier = { - factor = 1.05 + factOR = 1.05 OR = { has_trait = trait_enigmatic_intelligence has_trait = trait_enigmatic_intelligence_poor } } modifier = { - factor = 0.1 + factOR = 0.1 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_void_dweller_1 exists = planet planet = { is_planet_class = pc_habitat } } modifier = { - factor = 0.85 + factOR = 0.85 has_trait = trait_void_dweller_1 exists = planet planet = { is_artificial = no } } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_necrophage } } @@ -1064,38 +1085,38 @@ death_priest = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|death_priest|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|death_priest|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 2 + factOR = 2 exists = owner owner = { has_civic = civic_exalted_priesthood } } modifier = { - factor = 1.2 + factOR = 1.2 has_ethic = ethic_spiritualist } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 0.1 + factOR = 0.1 has_ethic = ethic_materialist NOT = { has_job = death_priest } } modifier = { - factor = 1.5 + factOR = 1.5 has_job = death_priest } modifier = { - factor = 0.1 + factOR = 0.1 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -1202,7 +1223,7 @@ enforcer = { weight = @specialist_job_weight modifier = { - factor = 10 + factOR = 10 OR = { has_ethic = ethic_militarist has_ethic = ethic_fanatic_militarist @@ -1210,80 +1231,80 @@ enforcer = { } modifier = { - factor = 10 + factOR = 10 has_job = enforcer } modifier = { - factor = 10 + factOR = 10 planet = { planet_crime > 15} NOT = { has_job = enforcer } } modifier = { - factor = 0.01 + factOR = 0.01 planet = { planet_crime <= 15} NOT = { has_job = enforcer } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 2 + factOR = 2 has_trait = trait_resilient } modifier = { - factor = 2 + factOR = 2 has_trait = trait_very_strong } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_strong } modifier = { - factor = 10 + factOR = 10 is_enslaved = yes has_slavery_type = { type = slavery_military } } modifier = { - factor = 0.50 + factOR = 0.50 has_trait = trait_weak } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_cybernetic } modifier = { - factor = 2 + factOR = 2 has_trait = trait_presapient_earthbound } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_limited_regeneration } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_presapient_proles } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_brainslug exists = owner owner = { has_valid_civic = civic_police_state } } modifier = { - factor = 1.05 + factOR = 1.05 has_trait = trait_presapient_natural_intellectuals exists = owner owner = { has_valid_civic = civic_police_state } } modifier = { - factor = 20 + factOR = 20 has_job = enforcer OR = { has_trait = trait_robust @@ -1291,7 +1312,7 @@ enforcer = { } } modifier = { - factor = 1.1 + factOR = 1.1 OR = { has_trait = trait_robot_propaganda_machines has_trait = trait_traditional @@ -1300,28 +1321,28 @@ enforcer = { owner = { has_valid_civic = civic_police_state } } modifier = { - factor = 0.9 + factOR = 0.9 has_trait = trait_quarrelsome } modifier = { - factor = 0.8 + factOR = 0.8 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_void_dweller_1 exists = planet planet = { is_planet_class = pc_habitat } } modifier = { - factor = 0.85 + factOR = 0.85 has_trait = trait_void_dweller_1 exists = planet planet = { is_artificial = no } } modifier = { - factor = 2 + factOR = 2 has_trait = trait_lithoid } } @@ -1421,27 +1442,27 @@ telepath = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|telepath|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|telepath|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no } modifier = { - factor = 2 + factOR = 2 has_trait = trait_resilient } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = telepath } modifier = { - factor = 0.1 + factOR = 0.1 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -1539,20 +1560,20 @@ entertainer = { weight = { weight = @high_prio_specialist_job_weight modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| owner = { has_edict = dynamic_weight } } modifier = { # 可控的动态权重 - factor = 100 + factOR = 100 owner = { has_valid_civic = civic_eternal_jihad } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 3 + factOR = 3 has_trait = trait_robot_domestic_protocols OR = { is_non_sapient_robot = yes @@ -1560,15 +1581,15 @@ entertainer = { } } modifier = { - factor = 1.5 + factOR = 1.5 has_job = entertainer } modifier = { - factor = 0.1 + factOR = 0.1 is_domestic_servant = yes } modifier = { - factor = 0.1 + factOR = 0.1 NOT = { has_job = entertainer } exists = planet planet = { @@ -1576,7 +1597,7 @@ entertainer = { } } modifier = { - factor = 2 + factOR = 2 NOT = { has_job = entertainer } exists = planet planet = { @@ -1628,34 +1649,34 @@ duelist = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.1 + factOR = 0.1 has_ethic = ethic_pacifist NOT = { has_job = duelist } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 10 + factOR = 10 is_enslaved = yes has_slavery_type = { type = slavery_military } } modifier = { - factor = 1.20 + factOR = 1.20 has_ethic = ethic_militarist } modifier = { - factor = 1.5 + factOR = 1.5 has_job = duelist } modifier = { - factor = 0.5 + factOR = 0.5 NOT = { has_job = duelist } exists = planet planet = { @@ -1845,20 +1866,20 @@ culture_worker = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|culture_worker|RESOURCE|unity| + factOR = value:job_weights_modifier|JOB|culture_worker|RESOURCE|unity| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = culture_worker } } @@ -1951,16 +1972,16 @@ bureaucrat = { weight = { weight = @specialist_job_weight modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = bureaucrat } } @@ -1995,20 +2016,20 @@ chemist = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|chemist|RESOURCE|volatile_motes| + factOR = value:job_weights_modifier|JOB|chemist|RESOURCE|volatile_motes| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 7 + factOR = 7 has_job = chemist } } @@ -2043,24 +2064,24 @@ translucer = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|translucer|RESOURCE|rare_crystals| + factOR = value:job_weights_modifier|JOB|translucer|RESOURCE|rare_crystals| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 7 + factOR = 7 has_job = translucer } modifier = { - factor = 1.2 + factOR = 1.2 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -2096,24 +2117,24 @@ gas_refiner = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|gas_refiner|RESOURCE|exotic_gases| + factOR = value:job_weights_modifier|JOB|gas_refiner|RESOURCE|exotic_gases| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 7 + factOR = 7 has_job = gas_refiner } modifier = { - factor = 1.2 + factOR = 1.2 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -2250,29 +2271,29 @@ healthcare = { weight = { weight = @high_prio_specialist_job_weight modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = healthcare } modifier = { - factor = 0.5 + factOR = 0.5 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } modifier = { - factor = 10 + factOR = 10 NOT = { has_job = healthcare } planet = { free_amenities < 0 @@ -2358,20 +2379,20 @@ manager = { weight = { weight = @specialist_job_weight modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 1.5 + factOR = 1.5 has_job = manager } modifier = { - factor = 0.1 + factOR = 0.1 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -2445,48 +2466,48 @@ necromancer = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_resources_modifier|JOB|necromancer|RESOURCE1|physics_research|WEIGHT1|0.5|RESOURCE2|society_research|WEIGHT2|0.5| + factOR = value:job_weights_resources_modifier|JOB|necromancer|RESOURCE1|physics_research|WEIGHT1|0.5|RESOURCE2|society_research|WEIGHT2|0.5| owner = { has_edict = dynamic_weight } } modifier = { - factor = 10 + factOR = 10 exists = planet planet = { has_modifier = martial_law } } modifier = { - factor = 2 + factOR = 2 has_trait = trait_resilient } modifier = { - factor = 2 + factOR = 2 has_trait = trait_very_strong } modifier = { - factor = 1.5 + factOR = 1.5 has_trait = trait_strong } modifier = { - factor = 0.5 + factOR = 0.5 has_trait = trait_weak } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_cybernetic } modifier = { - factor = 2 + factOR = 2 has_trait = trait_presapient_earthbound } modifier = { - factor = 1.1 + factOR = 1.1 has_trait = trait_limited_regeneration } modifier = { - factor = 0 + factOR = 0 species = { can_be_soldier = no } } modifier = { - factor = 2 + factOR = 2 has_trait = trait_lithoid } } @@ -2551,24 +2572,24 @@ bluelotus_technician = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|bluelotus_technician|RESOURCE|alloys| + factOR = value:job_weights_modifier|JOB|bluelotus_technician|RESOURCE|alloys| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no NOT = { has_trait = trait_mechanical } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 5 + factOR = 5 has_job = bluelotus_technician } modifier = { - factor = 1.2 + factOR = 1.2 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } @@ -2743,15 +2764,15 @@ death_chronicler = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.2 + factOR = 0.2 has_citizenship_rights = no } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } } @@ -2884,19 +2905,19 @@ necro_apprentice = { weight = { weight = @ruler_job_weight #deliberate modifier = { # 可控的动态权重 - factor = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + factOR = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| owner = { has_edict = dynamic_weight } } modifier = { - factor = 0.75 + factOR = 0.75 is_enslaved = yes #willing apprentices first, please } modifier = { - factor = 0.75 + factOR = 0.75 pop_has_happiness = no } modifier = { - factor = 0.1 + factOR = 0.1 exists = owner owner = { is_ai = yes } exists = planet @@ -3008,16 +3029,16 @@ foundry = { weight = { weight = @specialist_job_weight # Fairly important job modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys| + factOR = value:job_weights_modifier|JOB|foundry|RESOURCE|alloys| owner = { has_edict = dynamic_weight } } modifier = { - factor = 2 + factOR = 2 is_enslaved = yes can_take_servant_job = no } modifier = { - factor = 5 + factOR = 5 has_job = foundry } } @@ -3087,16 +3108,16 @@ catalytic_technician = { weight = { weight = @specialist_job_weight # Fairly important job modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|catalytic_technician|RESOURCE|alloys| + factOR = value:job_weights_modifier|JOB|catalytic_technician|RESOURCE|alloys| owner = { has_edict = dynamic_weight } } modifier = { - factor = 2 + factOR = 2 is_enslaved = yes can_take_servant_job = no } modifier = { - factor = 5 + factOR = 5 has_job = catalytic_technician } } @@ -3208,22 +3229,22 @@ artisan = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods| + factOR = value:job_weights_modifier|JOB|artisan|RESOURCE|consumer_goods| owner = { has_edict = dynamic_weight } } modifier = { - factor = 2 + factOR = 2 is_enslaved = yes can_take_servant_job = no } modifier = { - factor = 5 + factOR = 5 has_job = artisan } # low income modifier modifier = { - factor = 1.2 + factOR = 1.2 exists = planet planet = { has_available_jobs = "artisan" @@ -3319,16 +3340,16 @@ artificer = { weight = { weight = @specialist_job_weight modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|artificer|RESOURCE|consumer_goods| + factOR = value:job_weights_modifier|JOB|artificer|RESOURCE|consumer_goods| owner = { has_edict = dynamic_weight } } modifier = { - factor = 2 + factOR = 2 is_enslaved = yes can_take_servant_job = no } modifier = { - factor = 5 + factOR = 5 has_job = artificer } } @@ -3434,11 +3455,11 @@ pearl_diver = { weight = { weight = @worker_job_weight #deliberate modifier = { # 可控的动态权重 - factor = value:job_weights_modifier|JOB|pearl_diver|RESOURCE|consumer_goods| + factOR = value:job_weights_modifier|JOB|pearl_diver|RESOURCE|consumer_goods| owner = { has_edict = dynamic_weight } } modifier = { #限制条件的sv mult - factor = 5 + factOR = 5 owner = { has_valid_civic = civic_anglers NOT = { @@ -3447,16 +3468,16 @@ pearl_diver = { } } modifier = { - factor = 2 + factOR = 2 is_enslaved = yes has_slavery_type = { type = slavery_indentured } } modifier = { - factor = 0.1 + factOR = 0.1 can_take_servant_job = yes } modifier = { - factor = 0.1 + factOR = 0.1 NOT = { has_job = pearl_diver } exists = owner owner = { @@ -3467,7 +3488,7 @@ pearl_diver = { } } modifier = { - factor = 5 + factOR = 5 has_job = pearl_diver } } @@ -3566,12 +3587,12 @@ bath_attendant = { mult = value:job_weights_multiple_resources_modifier|JOB|artificer|RESOURCE1|consumer_goods|WEIGHT1|0.8|RESOURCE2|engineering_research|WEIGHT2|0.2| mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_trade_mult| modifier = { - factor = 2 + factOR = 2 is_enslaved = yes can_take_servant_job = no } modifier = { - factor = 5 + factOR = 5 has_job = bath_attendant } } @@ -3652,7 +3673,7 @@ knight = { weight = { weight = @high_prio_specialist_job_weight - factor = 1.2 + factOR = 1.2 modifier = { mult = value:job_weights_modifier|JOB|bureaucrat|RESOURCE|unity| owner = { has_edict = dynamic_weight } diff --git a/common/pop_jobs/03_worker_jobs.txt b/common/pop_jobs/03_worker_jobs.txt index 4cc509283..d2fe8bcad 100644 --- a/common/pop_jobs/03_worker_jobs.txt +++ b/common/pop_jobs/03_worker_jobs.txt @@ -1656,6 +1656,15 @@ squire = { alloys = 1 consumer_goods = 1 } + produces = { + trigger = { + exists = owner + owner = { has_valid_civic = civic_science_knight } + } + physics_research = 2 + engineering_research = 2 + society_research = 2 + } upkeep = { trigger = { planet = { has_modifier = syamelles_curse_habitat } diff --git a/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt b/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt index 3519045f3..6d00d98b1 100644 --- a/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt +++ b/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt @@ -218,6 +218,7 @@ can_build_gaiaseeder_machine = { } } } + can_build_overlord_gaiaseeder_machine = { # Can always build on ideal worlds if = { @@ -393,6 +394,13 @@ can_build_overlord_gaiaseeder_machine = { } } +is_relentless_industrialist_empire = { + OR = { + has_valid_civic = civic_industrial_economy + has_valid_civic = civic_industrial_economy_corporate + } +} + is_subterranean_empire = { OR = { has_origin = origin_subterranean diff --git a/gfx/interface/icons/governments/civics/civic_scavengers.dds b/gfx/interface/icons/governments/civics/civic_scavengers.dds new file mode 100644 index 0000000000000000000000000000000000000000..5d1b571f8127b04e784e1ef3403c846913d0e02a GIT binary patch literal 3492 zcmd6oYfzL`7{?!lE;cc&ADSAQW}K!z*px}$kP^*QQVS&qmAvBp2Bjc^a?#L4ZV4)( znKvL%D{CfA@luwei73QHg@pyVE_-8Ha)I6a_nde4U3ZZwoj%k%{PsETInVk3&vVY% zW&HT*1EYz^Q_+`R;3x=Z`q<&{(9b~5eA}Ka+C-55Y%dC_^MCy@@;L?l?)SReRe!I3 zSEhM+FrJLUPJgGi==Zqt-jJuxjeFI7#Ip)|%>A){tPP`HB^is)Yowgy7^N{kfw zolNR4Q{JH020Y{NeZZ4z>+~H$rPD^zwZKu{40^{0*JqDK$)YLHoc$iEj4db%^5t9~ zDZgmeXy(j!KXhrD(XH2V zY(e?j*;0Rz7{5PP=(rUGc+=n)2R`6gH+2-D4A8%`zj#u4W$7_FFB50D?%^)*VCOhU=RiFSWUPflFHY|0?U!k~J4m~=)KgAOu=%jaM!E5hBHTaG?4CiYd%k)t?gRa!L4 zR!)V`v+E8jWuHY8#*!|;mnv3F6`W=u=%~2i(COy;A#1tBHa#r8VPA)->>6&bn=9$r zb%j3V&+wy$x$ja%XrLbhiI5pE7G31^Yf!&;JE~%r!*Kb$L%*~64$KWISd4a05uFk1 z;P-B=8mg2Hs9-&Zc4*+l>x-t5YDGZbTVX-B8QAy`b-OmB<5mg#Es^?^am!KvMFN^~ zGN4M1fcETnw%Uyb*6$6QZ{xwwa4USaU02dCuLzmxUh{F#&??>o7b50CxnU8iIJ)$6 zo-%R)8uuoki|?;gU%T*R4-sYTb?bjV0cBLMv&OxuusQz9^}(yFqFDc-S&ZuV5NJ;x zvwO9%7bEsm+&R&fYS+VDSB>gTt6a4s7iQN+1`n@}U5ZB{ZW(G5)}rlFKCE1u)$U`i ztwd*It^`n;rG_70URvW*nlEI^~8Vx&Rxi&4VrZyYw-+E*(I*PAI zHH)>}RaT&GYpAS!Qx&t^T^kxicRmfB%-~U}PYy@t9i^>SlaYOmyvJG?&L4;F$6Rjf z@JCspv+g8S%t~sX?@#rKVS>{PoM}jkKy&6+=uhUMVaEoSF)1%89ENkpVdeAd;ytz1 z%f9?QY56h{nqzy>w0pBWPv}!+)M~Q4H=3Fg!>K7Hau8!-;9$o_G^IvCo0o~M`f9Xf zZn;0kdCfaxq_foI?1b+40a*DSb=7g*BG#*TJWkFRy00{+tfzucq6xlUWQbf$>hz6* zGzJf_D+V1`&cLEm!*uBsOa-S|yGp9dqHTfht8{69&9{r8-W?15(M(u0O=!)CleL5{ zwIoE)(Y!qAcfNc2cxv4pOX|!`{TVF-8O@<2bgTKhsB4vU|LkbTefSLd-iUWApQ9!# z#WAmS|2DZT^!lqmk0a%l4UYe17(IkcYZs6vGhVQQfk2`e?5eAT>DQCI{?DO5 zk^x=TXV4u^h2fih(pZ=3Hs`gXyQN;rk>}f^&?9w94CUwNJ3K|>&xzh-NQ@-yzHRPI zDTB7-`z3wR)*VWLK06(v?ZScWFz{ObD7ql+r|=f@>^VZmO`8!KJNI zi=nox)GP-7f*iwvWNO-zCg}?8o)4neki^C{bdUG>Zfrwf3?2ciF*~im zxG&YSDfbX-uC?j1e$NNdVLavp-z)2^Nqz37YW|KFhK$VvC;_%ij$ R_T Date: Thu, 22 Sep 2022 22:20:25 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E7=BA=B3=E5=9E=A2=E9=AA=91=E5=A3=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/governments/civics/00_origins.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/governments/civics/00_origins.txt b/common/governments/civics/00_origins.txt index 523e320cb..fcdfb6eea 100644 --- a/common/governments/civics/00_origins.txt +++ b/common/governments/civics/00_origins.txt @@ -1224,7 +1224,10 @@ origin_toxic_knights = { possible = { ethics = { - NOT = { value = ethic_gestalt_consciousness } + NOR = { + value = ethic_gestalt_consciousness + value = ethic_fanatic_egalitarian + } } civics = { NOT = { value = civic_fanatic_purifiers } From 6823b229ab97abe27fcaf23037dca1f659096239 Mon Sep 17 00:00:00 2001 From: MaretJavia <86963237+MaretJavia@users.noreply.github.com> Date: Thu, 22 Sep 2022 22:23:27 +0800 Subject: [PATCH 07/11] Update ethic_civics_nationality.txt --- common/governments/civics/ethic_civics_nationality.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/governments/civics/ethic_civics_nationality.txt b/common/governments/civics/ethic_civics_nationality.txt index 826c2c309..aabac1fff 100644 --- a/common/governments/civics/ethic_civics_nationality.txt +++ b/common/governments/civics/ethic_civics_nationality.txt @@ -344,9 +344,7 @@ civic_science_knight = { } } modifier = { - all_technology_research_speed = 0.15 - leader_scientist_skill_levels = 2 - country_num_tech_alternatives_add = -1 + all_technology_research_speed = 0.05 pop_cat_worker_happiness = -0.05 } random_weight = { From 431b6e50129367d3f8c3b77b76808a2b4641ed2b Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Fri, 23 Sep 2022 12:51:45 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为格式塔首都提供资源存储 调整无尽虫群学说，更强调人海 增强蜂群的人口增速 --- common/buildings/ethics_capital_buildings.txt | 942 ++++++++++++++++++ common/policies/ethic_rebuild_policies.txt | 14 +- ...2\345\217\243\351\230\266\345\261\202.txt" | 4 +- 3 files changed, 951 insertions(+), 9 deletions(-) diff --git a/common/buildings/ethics_capital_buildings.txt b/common/buildings/ethics_capital_buildings.txt index ee9c27c8d..d9e2c43f7 100644 --- a/common/buildings/ethics_capital_buildings.txt +++ b/common/buildings/ethics_capital_buildings.txt @@ -6813,3 +6813,945 @@ building_slave_major_capital = { text = job_slave_overseer_effect_desc } } + +############# +# Machine buildings +############# + +# Colony +building_deployment_post = { + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_machine_empire = yes + is_country_type = ai_empire + } + is_fallen_empire = no + } + } + + convert_to = { + building_hive_capital + building_colony_shelter + building_ancient_control_center + building_ancient_palace + } + + country_modifier = { + country_resource_max_add = 2500 + } + + planet_modifier = { + planet_housing_add = 3 + planet_amenities_add = 8 + job_replicator_add = 2 + job_patrol_drone_add = 1 + job_maintenance_drone_add = 2 + planet_max_buildings_add = @buildings_t1 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_civic = civic_machine_assimilator } + } + modifier = { + job_replicator_add = -1 + } + } + + resources = { + category = planet_buildings + upkeep = { + energy = 1 + } + } + + upgrades = { + building_machine_capital + } + + triggered_desc = { + text = job_coordinator_effect_desc + } + + triggered_desc = { + text = job_replicator_effect_desc + } + + triggered_desc = { + text = job_maintenance_drone_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } +} + +# Administrative Array +building_machine_capital = { + base_buildtime = @b2_time + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_machine_empire = yes + is_country_type = ai_empire + AND = { + exists = event_target:mechanocalibrator_country + is_same_value = event_target:mechanocalibrator_country + } + } + is_fallen_empire = no + } + } + + destroy_trigger = { + exists = owner + owner = { is_machine_empire = no } + } + + country_modifier = { + country_resource_max_add = 5000 + } + + convert_to = { + building_hive_capital + building_colony_shelter + building_ancient_control_center + building_ancient_palace + } + + allow = { + num_pops >= 10 + } + + prerequisites = { + "tech_planetary_government" + } + + show_tech_unlock_if = { + is_machine_empire = yes + } + + planet_modifier = { + planet_housing_add = 5 + planet_amenities_add = 10 + job_replicator_add = 2 + job_patrol_drone_add = 1 + job_maintenance_drone_add = 3 + planet_max_buildings_add = @buildings_t2 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_civic = civic_machine_assimilator } + } + modifier = { + job_replicator_add = -1 + job_maintenance_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b2_minerals + } + upkeep = { + energy = @b2_upkeep + } + } + + upgrades = { + building_machine_major_capital + } + + triggered_desc = { + text = job_replicator_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } + + triggered_desc = { + text = job_maintenance_drone_effect_desc + } +} + +# Planetary Processor +building_machine_major_capital = { + base_buildtime = @b3_time + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_machine_empire = yes + is_country_type = ai_empire + } + is_fallen_empire = no + } + } + + convert_to = { + building_hive_major_capital + building_major_capital + building_ancient_control_center + building_ancient_palace + } + + allow = { + num_pops >= 25 + } + + prerequisites = { + "tech_colonial_centralization" + } + + show_tech_unlock_if = { + is_machine_empire = yes + } + + country_modifier = { + country_resource_max_add = 7500 + } + + planet_modifier = { + planet_housing_add = 8 + planet_amenities_add = 12 + job_replicator_add = 2 + job_patrol_drone_add = 2 + job_maintenance_drone_add = 4 + planet_max_buildings_add = @buildings_t3 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_civic = civic_machine_assimilator } + } + modifier = { + job_replicator_add = -1 + job_maintenance_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_2 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b3_minerals + } + upkeep = { + energy = @b3_upkeep + } + } + + triggered_desc = { + text = job_coordinator_effect_desc + } + + triggered_desc = { + text = job_replicator_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } + + upgrades = { + "building_machine_system_capital" + } +} + +# Primary Nexus +building_machine_system_capital = { + base_buildtime = @b4_time + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_machine_empire = yes + is_country_type = ai_empire + } + is_fallen_empire = no + } + } + + convert_to = { + building_hive_major_capital + building_major_capital + building_machine_major_capital + building_ancient_control_center + building_ancient_palace + } + + allow = { + num_pops >= 50 + } + + prerequisites = { + "tech_galactic_administration" + } + + show_tech_unlock_if = { + is_machine_empire = yes + } + + country_modifier = { + country_resource_max_add = 10000 + } + + planet_modifier = { + planet_housing_add = 12 + planet_amenities_add = 18 + job_replicator_add = 2 + job_patrol_drone_add = 3 + job_maintenance_drone_add = 5 + planet_max_buildings_add = @buildings_t4 + } + triggered_planet_modifier = { + potential = { + num_pops >= 10 + } + modifier = { + job_replicator_add = 1 + } + } + triggered_planet_modifier = { + potential = { + num_pops >= 40 + } + modifier = { + job_replicator_add = 1 + } + } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_civic = civic_machine_assimilator } + } + modifier = { + job_replicator_add = -1 + job_maintenance_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_2 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_3 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b4_minerals + } + upkeep = { + energy = @b4_upkeep + } + } + + triggered_desc = { + text = job_coordinator_effect_desc + } + + triggered_desc = { + text = job_replicator_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } + + upgrades = { + "building_imperial_machine_capital" + } +} + + +############# +# Hive buildings +############# + +# Hive Core +building_hive_capital = { + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_hive_empire = yes + is_country_type = swarm + } + is_fallen_empire = no + } + } + + destroy_trigger = { # destroys and/or triggers conversion if true + exists = owner + owner = { is_hive_empire = no } + } + + convert_to = { + building_machine_capital + building_capital + building_ancient_control_center + building_ancient_palace + } + + upgrades = { + "building_hive_major_capital" + } + + prerequisites = { + "tech_planetary_government" + } + + show_tech_unlock_if = { + is_hive_empire = yes + } + + country_modifier = { + country_resource_max_add = 5000 + } + + planet_modifier = { + planet_housing_add = 5 + planet_amenities_add = 8 + job_synapse_drone_add = 2 + job_maintenance_drone_add = 2 + job_patrol_drone_add = 1 + planet_max_buildings_add = @buildings_t2 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_origin = origin_progenitor_hive } + is_planet_class = pc_hive + } + job_spawning_drone_add = -1 + job_offspring_drone_add = 1 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = 1000 + } + upkeep = { + energy = 2 + } + } + + triggered_desc = { + text = job_synapse_drone_effect_desc + } + + triggered_desc = { + text = job_maintenance_drone_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } +} + +# Hive Nexus +building_hive_major_capital = { + base_buildtime = @b2_time + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_hive_empire = yes + is_country_type = swarm + } + is_fallen_empire = no + } + } + + convert_to = { + building_machine_major_capital + building_major_capital + building_ancient_control_center + building_ancient_palace + } + + upgrades = { + "building_imperial_hive_capital" + } + + allow = { + num_pops >= 25 + } + + prerequisites = { + "tech_colonial_centralization" + } + + show_tech_unlock_if = { + is_hive_empire = yes + } + + country_modifier = { + country_resource_max_add = 10000 + } + + planet_modifier = { + planet_housing_add = 10 + planet_amenities_add = 12 + job_synapse_drone_add = 3 + job_maintenance_drone_add = 5 + job_patrol_drone_add = 2 + planet_max_buildings_add = @buildings_t4 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_origin = origin_progenitor_hive } + is_planet_class = pc_hive + } + job_spawning_drone_add = -1 + job_offspring_drone_add = 1 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_2 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_3 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b2_minerals + } + upkeep = { + energy = @b2_upkeep + } + } + + triggered_desc = { + text = job_synapse_drone_effect_desc + } + + triggered_desc = { + text = job_maintenance_drone_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } +} + +# Imperial Center +building_imperial_machine_capital = { + base_buildtime = @b4_time + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_machine_empire = yes + is_country_type = ai_empire + } + is_galactic_emperor = yes + } + planet = { is_capital = yes } + } + + convert_to = { + building_hive_major_capital + building_machine_system_capital + building_system_capital + building_hab_major_capital + building_ancient_control_center + building_ancient_palace + } + + allow = { + num_pops >= 50 + } + + prerequisites = { + } + + country_modifier = { + country_resource_max_add = 15000 + } + + planet_modifier = { + planet_housing_add = 18 + planet_amenities_add = 20 + job_replicator_add = 4 + job_patrol_drone_add = 5 + job_maintenance_drone_add = 6 + planet_max_buildings_add = 11 + planet_max_branch_office_buildings_add = 3 + } + triggered_planet_modifier = { + potential = { + num_pops >= 10 + } + modifier = { + job_replicator_add = 1 + } + } + triggered_planet_modifier = { + potential = { + num_pops >= 40 + } + modifier = { + job_replicator_add = 1 + } + } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_civic = civic_machine_assimilator } + } + modifier = { + job_replicator_add = -1 + job_maintenance_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_2 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_3 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b4_minerals + } + upkeep = { + energy = @b4_upkeep + } + } + + triggered_desc = { + text = job_coordinator_effect_desc + } + + triggered_desc = { + text = job_replicator_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } +} + +# Imperial Complex +building_imperial_hive_capital = { + base_buildtime = @b4_time + capital = yes + can_build = no + can_demolish = no + can_be_ruined = no + can_be_disabled = no + position_priority = 0 + + category = government + + potential = { + exists = owner + owner = { + OR = { + is_hive_empire = yes + is_country_type = swarm + } + is_galactic_emperor = yes + } + planet = { is_capital = yes } + } + + convert_to = { + building_hive_major_capital + building_machine_system_capital + building_system_capital + building_hab_major_capital + building_ancient_control_center + building_ancient_palace + } + + allow = { + num_pops >= 50 + } + + prerequisites = { + } + + country_modifier = { + country_resource_max_add = 15000 + } + + planet_modifier = { + planet_housing_add = 20 + planet_amenities_add = 20 + job_synapse_drone_add = 5 + job_maintenance_drone_add = 7 + job_patrol_drone_add = 4 + planet_max_buildings_add = 11 + planet_max_branch_office_buildings_add = 3 + } + + triggered_planet_modifier = { + potential = { + owner = { has_origin = origin_progenitor_hive } + is_planet_class = pc_hive + } + job_spawning_drone_add = -1 + job_offspring_drone_add = 1 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_1 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_2 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { has_technology = tech_capital_productivity_3 } + } + modifier = { + planet_jobs_productive_upkeep_mult = 0.1 + planet_jobs_productive_produces_mult = 0.1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b4_minerals + } + upkeep = { + energy = @b4_upkeep + } + } + + triggered_desc = { + text = job_synapse_drone_effect_desc + } + + triggered_desc = { + text = job_maintenance_drone_effect_desc + } + + triggered_desc = { + text = job_patrol_drone_effect_desc + } +} diff --git a/common/policies/ethic_rebuild_policies.txt b/common/policies/ethic_rebuild_policies.txt index d726a42a6..4d8d26608 100644 --- a/common/policies/ethic_rebuild_policies.txt +++ b/common/policies/ethic_rebuild_policies.txt @@ -1104,15 +1104,15 @@ war_doctrine = { policy_flags = {} modifier = { - ship_corvette_cost_mult = -0.15 - ship_destroyer_cost_mult = -0.05 + ship_corvette_cost_mult = -0.2 + ship_destroyer_cost_mult = -0.1 starbase_shipyard_build_speed_mult = 1 - country_naval_cap_mult = 2 - country_command_limit_add = 100 + country_naval_cap_mult = 1 + country_command_limit_add = 80 ships_upkeep_mult = -0.5 - ship_hull_regen_add_perc = 2 - ship_armor_regen_add_perc = 2 - ship_speed_mult = 1 + ship_hull_regen_add_perc = 1 + ship_armor_regen_add_perc = 1 + ship_speed_mult = 0.66 } AI_weight = { diff --git "a/common/pop_categories/\346\240\274\345\274\217\345\241\224\344\272\272\345\217\243\351\230\266\345\261\202.txt" "b/common/pop_categories/\346\240\274\345\274\217\345\241\224\344\272\272\345\217\243\351\230\266\345\261\202.txt" index 37aacaf43..4b68a2e65 100644 --- "a/common/pop_categories/\346\240\274\345\274\217\345\241\224\344\272\272\345\217\243\351\230\266\345\261\202.txt" +++ "b/common/pop_categories/\346\240\274\345\274\217\345\241\224\344\272\272\345\217\243\351\230\266\345\261\202.txt" @@ -66,7 +66,7 @@ complex_drone = { is_machine_empire = no } } - pop_growth_speed_reduction = -0.01 + pop_growth_speed_reduction = -0.02 } triggered_planet_modifier = { @@ -282,7 +282,7 @@ simple_drone = { is_machine_empire = no } } - pop_growth_speed = 0.01 + pop_growth_speed = 0.02 } triggered_planet_modifier = { From 09f4f97c68f8b8322c59c6a25520ac64bd2513ed Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Fri, 23 Sep 2022 13:05:11 +0800 Subject: [PATCH 09/11] =?UTF-8?q?Update=20=E7=9A=87=E5=B8=9D=E8=B5=B7?= =?UTF-8?q?=E6=BA=90=E5=85=BC=E5=AE=B9.TXT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...70\235\350\265\267\346\272\220\345\205\274\345\256\271.TXT" | 3 +++ 1 file changed, 3 insertions(+) diff --git "a/common/scripted_effects/\347\232\207\345\270\235\350\265\267\346\272\220\345\205\274\345\256\271.TXT" "b/common/scripted_effects/\347\232\207\345\270\235\350\265\267\346\272\220\345\205\274\345\256\271.TXT" index 1c438850c..7a731ff44 100644 --- "a/common/scripted_effects/\347\232\207\345\270\235\350\265\267\346\272\220\345\205\274\345\256\271.TXT" +++ "b/common/scripted_effects/\347\232\207\345\270\235\350\265\267\346\272\220\345\205\274\345\256\271.TXT" @@ -706,6 +706,7 @@ io_update_home_planet_gaia = { has_valid_civic = civic_OGAS } is_spiritualist = no + is_gestalt = no } } remove_building = building_bureaucratic_1 @@ -1030,6 +1031,7 @@ io_upgrade_planet_3 = { has_valid_civic = civic_OGAS } is_spiritualist = no + is_gestalt = no } } remove_building = building_bureaucratic_1 @@ -1149,6 +1151,7 @@ io_upgrade_planet_2 = { has_valid_civic = civic_OGAS } is_spiritualist = no + is_gestalt = no } } remove_building = building_bureaucratic_1 From 2a12f5f6ec94bce511170a0eee77725e1d1dec77 Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Fri, 23 Sep 2022 13:14:43 +0800 Subject: [PATCH 10/11] =?UTF-8?q?819=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/on_actions/ethic_rebuild_on_actions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/on_actions/ethic_rebuild_on_actions.txt b/common/on_actions/ethic_rebuild_on_actions.txt index c587c378e..8d2c87356 100644 --- a/common/on_actions/ethic_rebuild_on_actions.txt +++ b/common/on_actions/ethic_rebuild_on_actions.txt @@ -184,6 +184,7 @@ on_colonized = { on_war_won = { events = { ethic_economic.10002 + red_origin.8194 } } @@ -191,6 +192,7 @@ on_war_won = { on_war_lost = { events = { ethic_economic.10003 + red_origin.8195 } } From 04522a7de20b192ce561f38420756ba41888a7a0 Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Fri, 23 Sep 2022 13:38:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=BC=80=E5=B1=80=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E9=B2=B2=EF=BC=8C=E8=BF=9B=E5=8C=96=E5=85=A8=E9=9D=A0=E5=90=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../on_actions/ethic_rebuild_on_actions.txt | 7 +++ .../ethic_rebuild_static_modifiers.txt | 4 ++ events/ethic_rebuild_events.txt | 48 +++++++++++++++++++ events/ethic_rebuild_starter_tech.txt | 12 +++++ .../ethic_events_l_simp_chinese.yml | 6 ++- 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/common/on_actions/ethic_rebuild_on_actions.txt b/common/on_actions/ethic_rebuild_on_actions.txt index 8d2c87356..03718597c 100644 --- a/common/on_actions/ethic_rebuild_on_actions.txt +++ b/common/on_actions/ethic_rebuild_on_actions.txt @@ -254,3 +254,10 @@ on_uplift_completion = { # pds_active.1 # } #} + +#噬杀鲲群 +on_pop_purged = { + events = { + ethic_rebuild_swarm.1 + } +} \ No newline at end of file diff --git a/common/static_modifiers/ethic_rebuild_static_modifiers.txt b/common/static_modifiers/ethic_rebuild_static_modifiers.txt index faa5750f9..c6442e520 100644 --- a/common/static_modifiers/ethic_rebuild_static_modifiers.txt +++ b/common/static_modifiers/ethic_rebuild_static_modifiers.txt @@ -336,4 +336,8 @@ planet_devastation = { army_defense_health_mult = -0.75 army_attack_morale_mult = -0.75 army_defense_damage_mult = -0.75 +} + +swarm_species_eaten = { + BIOLOGICAL_species_trait_points_add = 1 } \ No newline at end of file diff --git a/events/ethic_rebuild_events.txt b/events/ethic_rebuild_events.txt index a3c838212..560066837 100644 --- a/events/ethic_rebuild_events.txt +++ b/events/ethic_rebuild_events.txt @@ -353,5 +353,53 @@ country_event = { } } +namespace = ethic_rebuild_swarm +planet_event = { + id = ethic_rebuild_swarm.1 + name = "ethic_rebuild_swarm.1.name" + desc = "ethic_rebuild_swarm.1.desc" + picture = GFX_evt_circuitry_modification + is_triggered_only = yes + + trigger = { + fromfrom = { + is_robotic_species = no + from = { + owner_main_species = { + NOT = { is_same_species = prevprev } + } + } + } + fromfrom.species = { + NOT = { has_species_flag = eaten_by@from } + } + NOT = { + any_galaxy_species = { + has_species_flag = eaten_by@from + is_same_species = fromfrom.species + } + } + } + immediate = { + from = { + change_variable = { + which = species_eaten + value = 1 + } + remove_modifier = swarm_species_eaten + add_modifier = { + modifier = swarm_species_eaten + multiplier = species_eaten + } + } + fromfrom.species = { + set_species_flag = eaten_by@from + } + } + + option = { + name = "ethic_rebuild_swarm.1.a" + } +} \ No newline at end of file diff --git a/events/ethic_rebuild_starter_tech.txt b/events/ethic_rebuild_starter_tech.txt index dd8560e63..23449be02 100644 --- a/events/ethic_rebuild_starter_tech.txt +++ b/events/ethic_rebuild_starter_tech.txt @@ -210,6 +210,18 @@ event = { tech = tech_selected_lineages } } + if = { + limit = { + has_civic = civic_hive_devouring_swarm + } + give_technology = { + tech = tech_gene_tailoring + } + set_variable = { + which = species_eaten + value = 0 + } + } #if = { # limit = { # has_civic = civic_libido_equipment diff --git a/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml b/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml index 3dea9eff3..f59b6fe2d 100644 --- a/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_events_l_simp_chinese.yml @@ -2,4 +2,8 @@ ethic_civic_yearly.4.desc:0 "志愿加入[root.owner.GetName]先锋队，拥护先锋队的纲领，遵守先锋队的章程，履行先锋队员义务，执行先锋队的决定，严守先锋队的纪律，保守先锋队的秘密，对先锋队忠诚，积极工作，为共产主义奋斗终身，随时准备为先锋队和人民牺牲一切，永不叛先锋队。" ethic_civic_yearly.4.title:0 "入党申请书" ethic_civic_yearly.4.a:0 "了解" - ethic_civic_yearly.4.b:0 "了解，之后无需告知" \ No newline at end of file + ethic_civic_yearly.4.b:0 "了解，之后无需告知" + + ethic_rebuild_swarm.1.name:0 "新物种被吞噬" + ethic_rebuild_swarm.1.desc:0 "我们已经吞噬了一个[fromfrom.species.GetName]人口并将其基因中有价值的部分片段整合进我们[from.owner_main_species.GetName]的基因序列。我们的蜂群会变得更强大。" + ethic_rebuild_swarm.1.a:0 "咀嚼，消化，吸收，混交，同化。" \ No newline at end of file