From d1177ef20616eab8f02b1ce7feb558c6aee549e1 Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:51:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=86=9B=E5=9B=BD=E8=B6=85=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=86=9B=E8=90=A5=E5=9B=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 这就是斯巴达！ --- common/buildings/07_amenity_buildings.txt | 68 ++++- common/buildings/08_unity_buildings.txt | 97 +++++++ ...3\345\236\213\344\277\256\346\224\271.txt" | 7 +- ...4\345\210\231\344\277\256\346\224\271.txt" | 8 +- .../governments/civics/ethic_civics_red.txt | 55 ++++ common/policies/ethic_rebuild_policies.txt | 250 +++++++++++++----- common/pop_jobs/01_ruler_jobs.txt | 16 +- common/pop_jobs/02_specialist_jobs.txt | 55 ++-- common/pop_jobs/ethic_rebuild_jobs.txt | 215 ++++++++++++++- .../ethic_rebuild_scripted_triggers.txt | 7 + .../ut_scripted_triggers.txt | 24 +- .../ethic_rebuild_citizenship_types.txt | 8 + .../ethic_rebuild_slavery_types.txt | 26 ++ events/ethic_rebuild_starter_tech.txt | 5 +- .../civics/civic_sparta_spirit.dds | Bin 0 -> 3492 bytes .../ethic_civics_l_simp_chinese.yml | 4 + .../ethic_jobs_l_simp_chinese.yml | 7 +- .../ethic_policies_l_simp_chinese.yml | 23 +- 18 files changed, 741 insertions(+), 134 deletions(-) create mode 100644 gfx/interface/icons/governments/civics/civic_sparta_spirit.dds diff --git a/common/buildings/07_amenity_buildings.txt b/common/buildings/07_amenity_buildings.txt index d14e608c7..09054406c 100644 --- a/common/buildings/07_amenity_buildings.txt +++ b/common/buildings/07_amenity_buildings.txt @@ -22,6 +22,7 @@ building_luxury_residence = { } has_ethic = ethic_fanatic_authoritarian } + NOT = { has_civic = civic_sparta_spirit } } } allow = { @@ -46,6 +47,9 @@ building_luxury_residence = { has_ethic = ethic_fanatic_authoritarian } } + owner = { + has_civic = civic_sparta_spirit + } has_modifier = slave_colony } } @@ -130,6 +134,9 @@ building_paradise_dome = { has_ethic = ethic_fanatic_authoritarian } } + owner = { + has_civic = civic_sparta_spirit + } buildings_no_crystals = yes has_modifier = slave_colony } @@ -196,8 +203,14 @@ building_paradise_dome = { show_tech_unlock_if = { owner = { is_regular_empire = yes + OR = { + NOT = { + has_ethic = ethic_fanatic_socialism + } + has_ethic = ethic_fanatic_authoritarian + } NOT = { - has_ethic = ethic_fanatic_socialism + has_civic = civic_sparta_spirit } } } @@ -215,9 +228,14 @@ building_communal_housing = { exists = owner owner = { is_regular_empire = yes - has_ethic = ethic_fanatic_socialism - NOT = { - has_ethic = ethic_fanatic_authoritarian + OR = { + has_civic = civic_sparta_spirit + AND = { + has_ethic = ethic_fanatic_socialism + NOT = { + has_ethic = ethic_fanatic_authoritarian + } + } } } NOT = { @@ -254,6 +272,7 @@ building_communal_housing = { } has_ethic = ethic_fanatic_authoritarian } + NOT = { has_civic = civic_sparta_spirit } } } } @@ -329,6 +348,7 @@ building_communal_housing_large = { } has_ethic = ethic_fanatic_authoritarian } + NOT = { has_civic = civic_sparta_spirit } } } } @@ -623,7 +643,10 @@ building_holo_theatres = { potential = { exists = owner owner = { - NOT = { has_valid_civic = civic_warrior_culture } + NOR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } modifier = { @@ -635,7 +658,10 @@ building_holo_theatres = { potential = { exists = owner owner = { - has_valid_civic = civic_warrior_culture + OR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } modifier = { @@ -665,7 +691,10 @@ building_holo_theatres = { trigger = { exists = owner owner = { - NOT = { has_valid_civic = civic_warrior_culture } + NOR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } text = job_entertainer_effect_desc @@ -675,7 +704,10 @@ building_holo_theatres = { trigger = { exists = owner owner = { - has_valid_civic = civic_warrior_culture + OR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } text = job_duelist_effect_desc @@ -708,7 +740,10 @@ building_hyper_entertainment_forum = { potential = { exists = owner owner = { - NOT = { has_valid_civic = civic_warrior_culture } + NOR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } modifier = { @@ -720,7 +755,10 @@ building_hyper_entertainment_forum = { potential = { exists = owner owner = { - has_valid_civic = civic_warrior_culture + OR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } modifier = { @@ -748,7 +786,10 @@ building_hyper_entertainment_forum = { trigger = { exists = owner owner = { - NOT = { has_valid_civic = civic_warrior_culture } + NOR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } text = job_entertainer_effect_desc @@ -758,7 +799,10 @@ building_hyper_entertainment_forum = { trigger = { exists = owner owner = { - has_valid_civic = civic_warrior_culture + OR = { + has_valid_civic = civic_warrior_culture + has_valid_civic = civic_sparta_spirit + } } } text = job_duelist_effect_desc diff --git a/common/buildings/08_unity_buildings.txt b/common/buildings/08_unity_buildings.txt index 762366f9b..3a0170e9f 100644 --- a/common/buildings/08_unity_buildings.txt +++ b/common/buildings/08_unity_buildings.txt @@ -75,6 +75,19 @@ building_autochthon_monument = { job_culture_worker_add = @b1_jobs } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_sparta_spirit + } + } + modifier = { + job_culture_worker_add = -2 + job_commandante_add = 2 + } + } + triggered_desc = { text = building_autochthon_monument_effect @@ -91,9 +104,27 @@ building_autochthon_monument = { } triggered_desc = { + potential = { + exists = owner + owner = { + NOT = { + has_valid_civic = civic_sparta_spirit + } + } + } text = job_culture_worker_effect_desc } + triggered_desc = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_sparta_spirit + } + } + text = job_commandante_effect_desc + } + prerequisites = { "tech_cultural_heritage" } @@ -206,10 +237,45 @@ building_heritage_site = { job_culture_worker_add = @b2_jobs } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_sparta_spirit + } + } + modifier = { + job_culture_worker_add = -4 + job_commandante_add = 4 + } + } + triggered_desc = { text = building_heritage_site_effect } + triggered_desc = { + potential = { + exists = owner + owner = { + NOT = { + has_valid_civic = civic_sparta_spirit + } + } + } + text = job_culture_worker_effect_desc + } + + triggered_desc = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_sparta_spirit + } + } + text = job_commandante_effect_desc + } + prerequisites = { "tech_heritage_site" } @@ -315,6 +381,19 @@ building_hypercomms_forum = { job_culture_worker_add = @b3_jobs } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_sparta_spirit + } + } + modifier = { + job_culture_worker_add = -6 + job_commandante_add = 6 + } + } + triggered_desc = { text = building_hypercomms_forum_effect } @@ -330,9 +409,27 @@ building_hypercomms_forum = { } triggered_desc = { + potential = { + exists = owner + owner = { + NOT = { + has_valid_civic = civic_sparta_spirit + } + } + } text = job_culture_worker_effect_desc } + triggered_desc = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_sparta_spirit + } + } + text = job_commandante_effect_desc + } + prerequisites = { "tech_hypercomms_forum" } diff --git "a/common/colony_types/ZZZ_\346\233\264\345\244\232\346\200\235\346\275\256\346\230\237\347\220\203\347\261\273\345\236\213\344\277\256\346\224\271.txt" "b/common/colony_types/ZZZ_\346\233\264\345\244\232\346\200\235\346\275\256\346\230\237\347\220\203\347\261\273\345\236\213\344\277\256\346\224\271.txt" index ca03b8512..8d75b7ff7 100644 --- "a/common/colony_types/ZZZ_\346\233\264\345\244\232\346\200\235\346\275\256\346\230\237\347\220\203\347\261\273\345\236\213\344\277\256\346\224\271.txt" +++ "b/common/colony_types/ZZZ_\346\233\264\345\244\232\346\200\235\346\275\256\346\230\237\347\220\203\347\261\273\345\236\213\344\277\256\346\224\271.txt" @@ -71,12 +71,7 @@ col_capital = { potential = { exists = owner owner = { - OR = { - has_authority = auth_corporate - has_civic = civic_galactic_sovereign_megacorp - has_civic = civic_family_business - has_civic = civic_world_cooperative - } + is_eci_megacorp = yes num_buildings = { type = building_executive_retreat value >= 1 } } } diff --git "a/common/game_rules/\344\274\236\345\205\274\345\256\271\345\205\274\345\256\271_\346\233\264\345\244\232\346\200\235\346\275\256\346\270\270\346\210\217\350\247\204\345\210\231\344\277\256\346\224\271.txt" "b/common/game_rules/\344\274\236\345\205\274\345\256\271\345\205\274\345\256\271_\346\233\264\345\244\232\346\200\235\346\275\256\346\270\270\346\210\217\350\247\204\345\210\231\344\277\256\346\224\271.txt" index 5eea3444c..28a78350a 100644 --- "a/common/game_rules/\344\274\236\345\205\274\345\256\271\345\205\274\345\256\271_\346\233\264\345\244\232\346\200\235\346\275\256\346\270\270\346\210\217\350\247\204\345\210\231\344\277\256\346\224\271.txt" +++ "b/common/game_rules/\344\274\236\345\205\274\345\256\271\345\205\274\345\256\271_\346\233\264\345\244\232\346\200\235\346\275\256\346\270\270\346\210\217\350\247\204\345\210\231\344\277\256\346\224\271.txt" @@ -1,4 +1,4 @@ -#Tooltips will be generated from these rules when they fail. Use of custom_tooltip is recommended +1#Tooltips will be generated from these rules when they fail. Use of custom_tooltip is recommended #There are still multiple hard-coded rules that apply in addition to these. #If rules here evaluate to true, there might still be other rules that make the action unavailable. #If a rule here evaluates to false the action will become unavailable @@ -102,6 +102,12 @@ can_fill_worker_job = { } divinity_right_to_work_job_check_trigger_worker = yes } + NOT = { + exists = owner + owner = { has_valid_civic = civic_sparta_spirit } + is_enslaved = no + has_citizenship_type = { country = owner type = citizenship_full } + } } } diff --git a/common/governments/civics/ethic_civics_red.txt b/common/governments/civics/ethic_civics_red.txt index 857480ebb..bd5c6fd33 100644 --- a/common/governments/civics/ethic_civics_red.txt +++ b/common/governments/civics/ethic_civics_red.txt @@ -628,3 +628,58 @@ civic_quantum_sociology = { base = 1 } } + +#军营国度（红标） +civic_sparta_spirit = { + modification = no + description = civic_tooltip_civic_sparta_spirit_effects + potential = { + ethics = { + NOT = { + value = ethic_gestalt_consciousness + } + } + authority = { + NOT = { + value = auth_corporate + } + } + civics = { + NOR = { + value = civic_galactic_sovereign_megacorp + value = civic_family_business + value = civic_world_cooperative + } + } + } + possible = { + ethics = { + value = ethic_fanatic_militarist + OR = { + value = ethic_fanatic_xenophobe + value = ethic_fanatic_authoritarian + } + } + civics = { + NOR = { + value = civic_warrior_culture + value = civic_private_militaries + } + } + } + + modifier = { + army_damage_mult = 0.4 + army_health = 0.25 + armies_upkeep_mult = -0.25 + army_experience_gain_mult = 0.3 + country_naval_cap_mult = 0.5 + ships_upkeep_mult = -0.25 + pop_growth_speed_reduction = 0.25 + pop_ethic_militarist_attraction_mult = 1 + } + + random_weight = { + base = 1 + } +} \ No newline at end of file diff --git a/common/policies/ethic_rebuild_policies.txt b/common/policies/ethic_rebuild_policies.txt index 032612326..48a9f15a4 100644 --- a/common/policies/ethic_rebuild_policies.txt +++ b/common/policies/ethic_rebuild_policies.txt @@ -304,7 +304,7 @@ diplomatic_stance = { } modifier = { factor = 10 - has_civic = civic_independent + has_valid_civic = civic_independent } modifier = { factor = 10 @@ -915,7 +915,7 @@ war_doctrine = { has_ethic = ethic_militarist has_ethic = ethic_fanatic_militarist has_ethic = ethic_gestalt_consciousness - has_civic = civic_fanatic_purifiers + has_valid_civic = civic_fanatic_purifiers } } @@ -940,6 +940,7 @@ war_doctrine = { NOR = { has_ai_personality = honorbound_warriors has_ai_personality = devouring_swarm + has_valid_civic = civic_sparta_spirit } } } @@ -1062,7 +1063,7 @@ war_doctrine = { has_ethic = ethic_authoritarian has_ethic = ethic_fanatic_authoritarian has_ethic = ethic_gestalt_consciousness - has_civic = civic_fanatic_purifiers + has_valid_civic = civic_fanatic_purifiers } } @@ -1092,7 +1093,7 @@ war_doctrine = { } valid = { - has_civic = civic_fanatic_purifiers + has_valid_civic = civic_fanatic_purifiers } policy_flags = {} @@ -1121,7 +1122,7 @@ war_doctrine = { } valid = { - has_civic = civic_hive_devouring_swarm + has_valid_civic = civic_hive_devouring_swarm } policy_flags = {} @@ -1151,7 +1152,7 @@ war_doctrine = { } valid = { - has_civic = civic_machine_terminator + has_valid_civic = civic_machine_terminator } policy_flags = {} @@ -1183,6 +1184,7 @@ military_service = { option = { name = "demilitarized_state" potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -1213,6 +1215,7 @@ military_service = { option = { name = "volunteer_military_service" potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -1242,6 +1245,7 @@ military_service = { limited_conscription } potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -1276,6 +1280,7 @@ military_service = { extensive_conscription } potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -1316,6 +1321,7 @@ military_service = { all_people_are_soldiers } potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -1343,6 +1349,25 @@ military_service = { } } } + option = { + name = "sparta_system" + policy_flags = { + sparta_system + } + potential = { + has_valid_civic = civic_sparta_spirit + } + valid = { + has_valid_civic = civic_sparta_spirit + } + modifier = { + job_commandante_per_pop = 0.04 + job_soldier_per_pop = 0.2 + } + AI_weight = { + factor = 1000 + } + } option = { name = "guarded_node" policy_flags = { @@ -1366,11 +1391,11 @@ military_service = { factor = 2 modifier = { factor = 10 - has_civic = civic_machine_paradise_lost + has_valid_civic = civic_machine_paradise_lost } modifier = { factor = 10 - has_civic = civic_hive_idellic_bloom + has_valid_civic = civic_hive_idellic_bloom } } } @@ -1434,11 +1459,11 @@ military_service = { has_technology = tech_centralized_command } has_tradition = tr_unyielding_finish - has_civic =civic_hive_devouring_swarm - has_civic = civic_machine_terminator - has_civic = civic_hive_strength_of_legions - has_civic = civic_machine_warbots - has_civic = civic_machine_liberator + has_valid_civic =civic_hive_devouring_swarm + has_valid_civic = civic_machine_terminator + has_valid_civic = civic_hive_strength_of_legions + has_valid_civic = civic_machine_warbots + has_valid_civic = civic_machine_liberator } } modifier = { @@ -1448,23 +1473,23 @@ military_service = { factor = 5 modifier = { factor = 15 - has_civic=civic_hive_devouring_swarm + has_valid_civic=civic_hive_devouring_swarm } modifier = { factor = 15 - has_civic = civic_machine_terminator + has_valid_civic = civic_machine_terminator } modifier = { factor = 10 - has_civic = civic_hive_strength_of_legions + has_valid_civic = civic_hive_strength_of_legions } modifier = { factor = 10 - has_civic = civic_machine_warbots + has_valid_civic = civic_machine_warbots } modifier = { factor = 15 - has_civic = civic_machine_liberator + has_valid_civic = civic_machine_liberator } modifier = { factor = 15 @@ -1492,9 +1517,9 @@ military_service = { has_technology = tech_combat_training } is_at_war = yes - has_civic=civic_hive_devouring_swarm - has_civic = civic_machine_terminator - has_civic = civic_machine_liberator + has_valid_civic=civic_hive_devouring_swarm + has_valid_civic = civic_machine_terminator + has_valid_civic = civic_machine_liberator } } modifier = { @@ -1509,23 +1534,23 @@ military_service = { } modifier = { factor = 15 - has_civic=civic_hive_devouring_swarm + has_valid_civic=civic_hive_devouring_swarm } modifier = { factor = 15 - has_civic = civic_machine_terminator + has_valid_civic = civic_machine_terminator } modifier = { factor = 10 - has_civic = civic_hive_strength_of_legions + has_valid_civic = civic_hive_strength_of_legions } modifier = { factor = 10 - has_civic = civic_machine_warbots + has_valid_civic = civic_machine_warbots } modifier = { factor = 15 - has_civic = civic_machine_liberator + has_valid_civic = civic_machine_liberator } } } @@ -1535,6 +1560,7 @@ military_service = { militia_association } potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -1563,6 +1589,7 @@ military_service = { military_group } potential = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = ethic_gestalt_consciousness has_valid_civic = civic_network_of_the_mind @@ -3633,7 +3660,7 @@ local_power = { valid = { or = { has_technology = tech_autonomous_agents - has_civic = civic_hive_divided_attention + has_valid_civic = civic_hive_divided_attention } } modifier = { @@ -3658,7 +3685,7 @@ local_power = { } modifier = { factor = 10 - has_civic = civic_hive_divided_attention + has_valid_civic = civic_hive_divided_attention } } } @@ -3805,8 +3832,6 @@ local_power = { } } ai_weight = { - modifier = { - factor = 5 modifier = { factor = 10 has_valid_civic = civic_hive_one_mind @@ -3825,9 +3850,9 @@ local_power = { } modifier = { factor = 10 - OR = { - has_tradition = tr_domination_finish - has_ascension_perk = ap_imperial_prerogative + OR = { + has_tradition = tr_domination_finish + has_ascension_perk = ap_imperial_prerogative } } } @@ -3865,8 +3890,6 @@ local_power = { } } ai_weight = { - modifier = { - factor = 10 modifier = { factor = 10 has_valid_civic = civic_hive_one_mind @@ -3885,9 +3908,9 @@ local_power = { } modifier = { factor = 10 - OR = { - has_tradition = tr_domination_finish - has_ascension_perk = ap_imperial_prerogative + OR = { + has_tradition = tr_domination_finish + has_ascension_perk = ap_imperial_prerogative } } } @@ -4368,9 +4391,9 @@ information_management = { has_ethic = ethic_gestalt_consciousness } NOR = { - has_civic = civic_network_of_the_mind - has_civic = civic_network_of_the_mind_machine - has_civic = civic_network_of_the_mind_true_hive + has_valid_civic = civic_network_of_the_mind + has_valid_civic = civic_network_of_the_mind_machine + has_valid_civic = civic_network_of_the_mind_true_hive } } option = { @@ -4487,9 +4510,9 @@ healthcare = { has_ethic = ethic_gestalt_consciousness } NOR = { - has_civic = civic_network_of_the_mind - has_civic = civic_network_of_the_mind_machine - has_civic = civic_network_of_the_mind_true_hive + has_valid_civic = civic_network_of_the_mind + has_valid_civic = civic_network_of_the_mind_machine + has_valid_civic = civic_network_of_the_mind_true_hive } } option = { @@ -4570,9 +4593,9 @@ education = { has_ethic = ethic_gestalt_consciousness } NOR = { - has_civic = civic_network_of_the_mind - has_civic = civic_network_of_the_mind_machine - has_civic = civic_network_of_the_mind_true_hive + has_valid_civic = civic_network_of_the_mind + has_valid_civic = civic_network_of_the_mind_machine + has_valid_civic = civic_network_of_the_mind_true_hive } } @@ -4602,6 +4625,7 @@ education = { } modifier = { planet_jobs_specialist_produces_mult = 0.1 + planet_jobs_ruler_produces_mult = 0.1 planet_crime_mult = 0.1 pop_ethic_capitalism_attraction_mult = 0.1 } @@ -4629,6 +4653,7 @@ education = { pop_government_ethic_attraction = 0.1 country_unity_produces_mult = 0.1 planet_crime_mult = -0.1 + pop_happiness = 0.1 pop_ethic_socialism_attraction_mult = 0.1 } AI_weight = { @@ -4640,6 +4665,85 @@ education = { } } } + option = { + name = "church_school" + valid = { + is_spiritualist = yes + } + policy_flags = { + church_school + } + modifier = { + planet_priests_produces_mult = 0.15 + planet_jobs_ruler_produces_mult = 0.1 + pop_ethic_spiritualist_attraction_mult = 0.1 + planet_pops_consumer_goods_upkeep_mult = -0.15 + pop_growth_speed = 0.05 + all_technology_research_speed = -0.05 + } + AI_weight = { + modifier = { + factor = 10 + OR = { + is_spiritualist = yes + } + } + } + } + option = { + name = "research_orientation" + valid = { + is_materialist = yes + } + policy_flags = { + research_orientation + } + modifier = { + planet_researchers_produces_mult = 0.15 + planet_jobs_specialist_produces_mult = 0.1 + country_physics_tech_research_speed = 0.10 + country_engineering_tech_research_speed = 0.10 + pop_ethic_materialist_attraction_mult = 0.1 + planet_culture_workers_produces_mult = -0.1 + planet_entertainers_produces_mult = -0.1 + pop_growth_speed_reduction = 0.03 + } + AI_weight = { + modifier = { + factor = 10 + OR = { + is_materialist = yes + } + } + } + } + option = { + name = "military_administration" + valid = { + is_militarist = yes + } + policy_flags = { + public_education + } + modifier = { + pop_government_ethic_attraction = 0.15 + planet_jobs_worker_produces_mult = 0.1 + planet_stibility_add = 10 + planet_crime_add = -35 + army_starting_experience_add = 100 + army_damage_mult = 0.2 + pop_happiness = -0.1 + pop_ethic_militarist_attraction_mult = 0.1 + } + AI_weight = { + modifier = { + factor = 10 + OR = { + is_militarist = yes + } + } + } + } } #科研伦理 @@ -4787,7 +4891,7 @@ research_ethics = { valid = { OR = { has_technology = tech_heritage_site - has_civic = civic_mechanical_utopia + has_valid_civic = civic_mechanical_utopia } } modifier = { @@ -4799,11 +4903,11 @@ research_ethics = { factor = 10 modifier = { factor = 10 - has_civic = civic_hive_ascetic + has_valid_civic = civic_hive_ascetic } modifier = { factor = 10 - has_civic = civic_mechanical_utopia + has_valid_civic = civic_mechanical_utopia } } } @@ -4841,9 +4945,9 @@ research_ethics = { OR = { has_tradition = tr_discovery_finish has_ascension_perk = ap_technological_ascendancy - has_civic = civic_machine_introspective - has_civic = civic_machine_predictive_analysis - has_civic = civic_hive_natural_neural_network + has_valid_civic = civic_machine_introspective + has_valid_civic = civic_machine_predictive_analysis + has_valid_civic = civic_hive_natural_neural_network } } modifier = { @@ -4855,15 +4959,15 @@ research_ethics = { factor = 7 modifier = { factor = 10 - has_civic = civic_machine_introspective + has_valid_civic = civic_machine_introspective } modifier = { factor = 10 - has_civic = civic_machine_predictive_analysis + has_valid_civic = civic_machine_predictive_analysis } modifier = { factor = 10 - has_civic = civic_hive_natural_neural_network + has_valid_civic = civic_hive_natural_neural_network } modifier = { factor = 10 @@ -4902,15 +5006,15 @@ research_ethics = { factor = 10 modifier = { factor = 10 - has_civic = civic_machine_introspective + has_valid_civic = civic_machine_introspective } modifier = { factor = 10 - has_civic = civic_machine_predictive_analysis + has_valid_civic = civic_machine_predictive_analysis } modifier = { factor = 10 - has_civic = civic_hive_natural_neural_network + has_valid_civic = civic_hive_natural_neural_network } modifier = { factor = 10 @@ -5101,9 +5205,9 @@ industrial = { } NOR = { has_ethic = ethic_gestalt_consciousness - has_civic = civic_network_of_the_mind - has_civic = civic_network_of_the_mind_machine - has_civic = civic_network_of_the_mind_true_hive + has_valid_civic = civic_network_of_the_mind + has_valid_civic = civic_network_of_the_mind_machine + has_valid_civic = civic_network_of_the_mind_true_hive } } policy_flags = { @@ -5149,9 +5253,12 @@ transportation_logistics = { has_technology = tech_hypercomms_forum has_technology = tech_hypercomms_forum_corporate } - NOR = { + NOT = { has_ethic = ethic_fanatic_militarist } + NOT = { + has_valid_civic = civic_sparta_spirit + } is_country_type = default } modifier = { @@ -5174,9 +5281,12 @@ transportation_logistics = { } valid = { has_technology = tech_space_science_4 - NOR = { + NOT = { has_ethic = ethic_fanatic_spiritualist } + NOT = { + has_valid_civic = civic_sparta_spirit + } is_country_type = default } modifier = { @@ -5571,6 +5681,7 @@ slavery = { has_valid_civic = civic_indentured_assets has_valid_civic = civic_triple_the_profit has_valid_civic = civic_ideal_slavery + has_valid_civic = civic_sparta_spirit } } policy_flags = { @@ -5600,6 +5711,7 @@ slavery = { has_ethic = ethic_fanatic_xenophobe has_valid_civic = civic_slaver_guilds has_valid_civic = civic_ideal_slavery + has_valid_civic = civic_sparta_spirit AND = { has_ethic = ethic_fanatic_capitalism OR = { @@ -5732,7 +5844,9 @@ ratio_of_slaves = { option = { potential = { has_policy_flag = slavery_allowed } valid = { - NOT = { has_valid_civic = civic_triple_the_profit } + NOT = { + has_valid_civic = civic_triple_the_profit + } } name = "slaves_40" policy_flags = { @@ -5761,6 +5875,7 @@ ratio_of_slaves = { has_valid_civic = civic_reeducated_labor has_valid_civic = civic_triple_the_profit has_valid_civic = civic_indentured_assets + has_valid_civic = civic_sparta_spirit } } name = "slaves_60" @@ -5776,6 +5891,10 @@ ratio_of_slaves = { factor = 150 has_valid_civic = civic_reeducated_labor } + modifier = { + factor = 150 + has_valid_civic = civic_sparta_spirit + } modifier = { factor = 999 has_valid_civic = civic_triple_the_profit @@ -5790,6 +5909,7 @@ ratio_of_slaves = { has_technology = tech_artificial_moral_codes has_valid_civic = civic_triple_the_profit has_valid_civic = civic_reeducated_labor + has_valid_civic = civic_sparta_spirit } } name = "slaves_75" diff --git a/common/pop_jobs/01_ruler_jobs.txt b/common/pop_jobs/01_ruler_jobs.txt index c29733c5b..f5033b180 100644 --- a/common/pop_jobs/01_ruler_jobs.txt +++ b/common/pop_jobs/01_ruler_jobs.txt @@ -710,21 +710,7 @@ executive = { } country_modifier = { trade_value_mult = 0.03 - country_admin_cap_add = 8 - } - triggered_country_modifier = { - potential = { - exists = owner - owner = { has_technology = tech_colonial_bureaucracy } - } - country_admin_cap_add = 4 - } - triggered_country_modifier = { - potential = { - exists = owner - owner = { has_technology = tech_galactic_bureaucracy } - } - country_admin_cap_add = 4 + country_admin_cap_add = 12 } 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 8c4e00455..64852318d 100644 --- a/common/pop_jobs/02_specialist_jobs.txt +++ b/common/pop_jobs/02_specialist_jobs.txt @@ -198,7 +198,7 @@ merchant = { #士官 -> specialist soldier = { category = specialist - condition_string = SOLDIER_JOB_TRIGGER + condition_string = BATTLE_THRALL_JOB_TRIGGER building_icon = building_stronghold clothes_texture_index = 4 @@ -208,11 +208,15 @@ soldier = { is_being_assimilated = no is_sapient = yes } - possible_precalc = can_fill_specialist_job + possible = { - exists = owner - owner = { is_gestalt = no } - complex_specialist_job_check_trigger = yes + OR = { + ethic_battle_thrall_job_check_trigger = yes + AND = { + exists = owner + owner = { has_valid_civic = civic_du_contrat_social } + } + } } resources = { @@ -285,6 +289,16 @@ soldier = { } society_research = 0.25 } + triggered_pop_modifier = { + potential = { + owner = { + has_valid_civic = civic_sparta_spirit + } + } + modifier = { + pop_cat_ruler_political_power = 3 + } + } #军国主义 produces = { trigger = { @@ -1176,9 +1190,12 @@ enforcer = { possible = { OR = { battle_thrall_job_check_trigger = yes - exists = owner - owner = { has_valid_civic = civic_du_contrat_social } + AND = { + exists = owner + owner = { has_valid_civic = civic_du_contrat_social } + } } + } resources = { @@ -1524,10 +1541,14 @@ entertainer = { possible = { OR = { entertainer_job_check_trigger = yes - exists = owner - owner = { has_valid_civic = civic_triple_the_profit } - exists = owner - owner = { has_valid_civic = civic_du_contrat_social } + AND = { + exists = owner + owner = { has_valid_civic = civic_triple_the_profit } + } + AND = { + exists = owner + owner = { has_valid_civic = civic_du_contrat_social } + } } } @@ -1667,8 +1688,10 @@ duelist = { possible = { OR = { battle_thrall_job_check_trigger = yes - exists = owner - owner = { has_valid_civic = civic_du_contrat_social } + AND = { + exists = owner + owner = { has_valid_civic = civic_du_contrat_social } + } } } @@ -2626,8 +2649,10 @@ necromancer = { possible = { OR = { battle_thrall_job_check_trigger = yes - exists = owner - owner = { has_valid_civic = civic_du_contrat_social } + AND = { + exists = owner + owner = { has_valid_civic = civic_du_contrat_social } + } } } diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt index beb78b588..8b20a9dd9 100644 --- a/common/pop_jobs/ethic_rebuild_jobs.txt +++ b/common/pop_jobs/ethic_rebuild_jobs.txt @@ -675,7 +675,7 @@ conscript = { } possible = { soldier_job_check_trigger = yes - owner = { is_gestalt = no } + owner = { is_gestalt = no NOT = { has_policy_flag = sparta_system } } } resources = { @@ -935,6 +935,191 @@ conscript = { } } +#士兵（无上限） +conscript_uncapped = { + category = worker + icon = soldier + condition_string = SOLDIER_JOB_TRIGGER + building_icon = building_stronghold + clothes_texture_index = 4 + is_capped_by_modifier = no + can_set_priority = no + + possible_pre_triggers = { + has_owner = yes + is_being_purged = no + is_being_assimilated = no + is_sapient = yes + is_enslaved = no + } + possible = { + soldier_job_check_trigger = yes + owner = { has_policy_flag = sparta_system } + } + + resources = { + category = planet_soldiers + produces = { + trigger = { + is_lithoid = no + owner = { + exists = owner + has_valid_civic = civic_army_production + NOT = { has_country_flag = synthetic_empire } + } + } + food = 2 + alloys = 1 + } + produces = { + trigger = { + is_lithoid = yes + owner = { + exists = owner + has_valid_civic = civic_army_production + NOT = { has_country_flag = synthetic_empire } + } + } + minerals = 2 + alloys = 1 + } + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_army_production + has_country_flag = synthetic_empire + } + } + energy = 2 + alloys = 1 + } + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_army_production + } + } + minerals = 1 + energy = 1 + unity = 1 + } + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_military_scientific + } + } + physics_research = 1 + engineering_research = 1 + } + produces = { + trigger = { + owner = { + OR = { + has_valid_civic = civic_shared_burden + has_valid_civic = civic_socialistic + has_valid_civic = civic_forever_with_us + } + } + } + society_research = 0.25 + } + #军国主义 + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_fanatic_militarist + } + } + unity = 1 + } + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_militarist + } + } + unity = 0.5 + } + } + country_modifier = { + country_naval_cap_add = 2 + } + triggered_country_modifier = { + potential = { + exists = planet + planet = { + exists = owner + owner = { + has_technology = "tech_ground_defense_planning" + } + } + } + modifier = { + country_naval_cap_add = 2 + } + } + pop_modifier = { + pop_defense_armies_add = 3 + } + triggered_pop_modifier = { + potential = { + planet = { + has_building = building_automated_defense_system + } + } + modifier = { + pop_defense_armies_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + planet = { + exists = planet + has_modifier = martial_law + has_modifier = martial_law_martial_brotherhood + } + happiness >= 0.35 + } + planet_stability_add = 80 + mult = planet.society_factor_pops + } + triggered_planet_modifier = { + potential = { + planet = { + exists = planet + has_modifier = martial_law + has_modifier = martial_law_martial_brotherhood + } + happiness < 0.35 + } + planet_stability_add = -50 + mult = planet.society_factor_pops + } + triggered_country_modifier = { # 共产主义社会 + potential = { + exists = owner + owner = { + has_valid_civic = civic_shared_burden + has_ascension_perk = ap_future_society + } + } + modifier = { + country_admin_cap_add = 0.5 + } + } + + weight = { + weight = 1 + } +} + #苗床 tentacle_seedbed = { category = worker @@ -4944,6 +5129,14 @@ commandante = { } unity = 1 } + produces = { + trigger = { + owner = { + has_valid_civic = civic_sparta_spirit + } + } + unity = 3 + } upkeep = { consumer_goods = 1 } @@ -4977,6 +5170,16 @@ commandante = { planet_amenities_add = 3 } } + triggered_planet_modifier = { + potential = { + owner = { + has_valid_civic = civic_sparta_spirit + } + } + modifier = { + planet_amenities_add = 5 + } + } triggered_planet_modifier = { potential = { owner = { @@ -4987,6 +5190,16 @@ commandante = { pop_cat_specialist_happiness = -0.05 } } + triggered_pop_modifier = { + potential = { + owner = { + has_valid_civic = civic_triple_the_profit + } + } + modifier = { + pop_cat_ruler_political_power = 3 + } + } weight = { weight = @ruler_job_weight modifier = { diff --git a/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt b/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt index e00a5a8db..2388c2204 100644 --- a/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt +++ b/common/scripted_triggers/ethic_rebuild_scripted_triggers.txt @@ -23,6 +23,7 @@ can_fill_specialist_job = { is_enslaved = no has_slavery_type = { type = slavery_indentured } owner = { has_valid_civic = civic_du_contrat_social } + owner = { has_valid_civic = civic_sparta_spirit } } is_being_purged = no is_being_assimilated = no @@ -41,6 +42,12 @@ can_fill_specialist_job = { } divinity_right_to_work_job_check_trigger_specialist = yes } + NAND = { + exists = owner + owner = { has_valid_civic = civic_sparta_spirit } + is_enslaved = no + has_citizenship_type = { country = owner type = citizenship_full } + } } } diff --git a/common/scripted_triggers/ut_scripted_triggers.txt b/common/scripted_triggers/ut_scripted_triggers.txt index ee9810206..9afc0610e 100644 --- a/common/scripted_triggers/ut_scripted_triggers.txt +++ b/common/scripted_triggers/ut_scripted_triggers.txt @@ -111,15 +111,31 @@ ethic_entertainer_job_check_trigger = { exists = owner owner = { has_valid_civic = civic_du_contrat_social } } + AND = { + exists = owner + owner = { has_valid_civic = civic_sparta_spirit } + is_enslaved = yes + } + } + NAND = { + exists = owner + owner = { has_valid_civic = civic_sparta_spirit } + is_enslaved = no + has_citizenship_type = { country = owner type = citizenship_full } } } # 可以担任战斗职业（兼容特殊国策） ethic_battle_thrall_job_check_trigger = { - OR = { - battle_thrall_job_check_trigger = yes - exists = owner - owner = { has_valid_civic = civic_du_contrat_social } + custom_tooltip = BATTLE_THRALL_JOB_TRIGGER + hidden_trigger = { + OR = { + battle_thrall_job_check_trigger = yes + AND = { + exists = owner + owner = { has_valid_civic = civic_du_contrat_social } + } + } } } diff --git a/common/species_rights/citizenship_types/ethic_rebuild_citizenship_types.txt b/common/species_rights/citizenship_types/ethic_rebuild_citizenship_types.txt index 00b78908e..9510d28ec 100644 --- a/common/species_rights/citizenship_types/ethic_rebuild_citizenship_types.txt +++ b/common/species_rights/citizenship_types/ethic_rebuild_citizenship_types.txt @@ -12,6 +12,14 @@ citizenship_limited = { pop_political_power = -0.5 } + triggered_pop_modifier = { + potential = { + exists = owner + owner = { has_valid_civic = civic_sparta_spirit } + } + pop_happiness = -0.2 + } + potential = { exists = from from = { diff --git a/common/species_rights/slavery_types/ethic_rebuild_slavery_types.txt b/common/species_rights/slavery_types/ethic_rebuild_slavery_types.txt index c69640bb7..98f88479f 100644 --- a/common/species_rights/slavery_types/ethic_rebuild_slavery_types.txt +++ b/common/species_rights/slavery_types/ethic_rebuild_slavery_types.txt @@ -100,4 +100,30 @@ slavery_matrix = { ai_will_do = { factor = 50 } +} + +slavery_military = { + modifier = { + army_damage_mult = 0.2 + } + + pop_modifier = { + pop_happiness = -0.20 + } + + potential = { + host_has_dlc = "Utopia" + from = { NOT = { has_ethic = ethic_gestalt_consciousness } } + } + + allow = { + from = { NOT = { has_valid_civic = civic_sparta_spirit } } + } + ai_will_do = { + factor = 5 + modifier = { + factor = 0 + NOT = { has_trait = trait_very_strong } + } + } } \ No newline at end of file diff --git a/events/ethic_rebuild_starter_tech.txt b/events/ethic_rebuild_starter_tech.txt index 767cc4deb..3db7971e8 100644 --- a/events/ethic_rebuild_starter_tech.txt +++ b/events/ethic_rebuild_starter_tech.txt @@ -80,7 +80,10 @@ event = { } if = { limit = { - has_civic = civic_warrior_culture + OR = { + has_civic = civic_warrior_culture + has_civic = civic_sparta_spirit + } } give_technology = { tech = tech_centralized_command diff --git a/gfx/interface/icons/governments/civics/civic_sparta_spirit.dds b/gfx/interface/icons/governments/civics/civic_sparta_spirit.dds new file mode 100644 index 0000000000000000000000000000000000000000..d51fb41fded9a0d3a31e34d61cf6a8d129a65bc5 GIT binary patch literal 3492 zcmd5O#VSM$(P$<1;To;}=^xTI-k#^Y=Wt)|E+B1f-SP1J&hO*- zo%cN-7oyS9+_(_p!fYjiV4?<)2B35PUV{6bV4vMm^<+Ioy8}Qq5k~I z_AV{^u`@FZebhHT^cmZ-iAgh--grt@pIfrz6_U6YeuA?e^{sw23*>j9j(7$-h2YD5xC*}6$ccjS z9%)PTVLzR>6^vTyNTSP)l^pL)*R!VfL~$VFbJTWX9XmYeeG)-k1kXh6JD~Lj7=0CT z#A44cUVsnlEq4H>o^jgXz?4px`l)^A-q`cIu2b#E1DtKphFrk1x(j-<-~+f%o_gsN0=`_CiIyI!{+)G0bH-`rVrLvAjUaq#+r+&WUbZEnjb>f z!>mZhUx~yInbpLH^=9cqH5vE_dEwrJPj`s%)N zq25N!2l*uQ*^emmdT~51FdrS~yk5g|LXYt4s(0LqRfo4GHXq9f=e3>@YA@n|+y`L4 z=yx>}yd2nK&cqDx3}`1=2;_+S0o3XG1<1#G%NBrIR&$@5pWk{K{q%R;>dNj-LcNI^ zK)&TM&V#4VvqIgOdQ4v`^qEmlqt%Dv@sS{iBaoYQqP2(H8!#Ni>jR@xz%oX67R0%NllpZgGJq^9`@NDy8-v{8% zpl=kY8O`76Qjfanp3(ZsR~*3i=gX+$J1PZWTj=jl+&SuTtkX-LpDbSl?#5i$8+%r5 zAB~qk_-TvP9*Yx+uQMYB&BOYh<6UQ=sB6a5^xLE3ThJGKfcHP*)PdfFeOXI&ay7z=PU(8vbJs*n{o6p4@>xaE?;hw=X zvg5iM;-BRd6*c`K9o&P;fVN&|!`8NOuoKwk&MDmWXI>>>>>> 1ae2cdebf00d25c806f03fd2e7d687756f71647b discrete_network_name:0 "离散网络" discrete_network_desc:0 "去中心化的离散型神经网络，该思维的各个肢体专注于处理自身，主脑没有直接控制权。\n\n" shunt_network:0 "并联网络" @@ -257,17 +253,17 @@ wartime_deployment_protocl:0 "战时部署协议" wartime_deployment_protocl_name:0 "战时部署协议" wartime_deployment_protocl_desc:0 "无条件的强化我们的防御，我们无穷无尽的子个体能最大程度的动员起来。\n\n" -<<<<<<< HEAD -======= drone_defense_army:0 "子个体防御军" drone_defense_army_desc:0 "在必要时，每个子个体都可以被武装以构成星球的最后一道防线。" ->>>>>>> 1ae2cdebf00d25c806f03fd2e7d687756f71647b militia_association:0 "民兵公社" militia_association_name:0 "民兵公社" militia_association_desc:0 "军事爱好者们自发聚集起来，保卫社会生产的稳定与繁荣。\n\n" military_group:0 "军事安全企业" military_group_name:0 "军事安全企业" military_group_desc:0 "各个企业或自行组建安保部门，或雇佣其他安全保障企业，来保障自身的利润。\n\n" + sparta_system:0 "军营社会" + sparta_system_name:0 "军营社会" + sparta_system_desc:0 "当别人把“每个人都必须拿起武器”作为口号时，我们已经可以自豪的宣布“每个人都能够且乐于拿起武器”。当然，奴隶不论。\n\n" # 基础设施 @@ -323,14 +319,18 @@ mixed_education_eo_desc:0 "在推广公共教育的同时鼓励私人教育的发展，平衡各阶层对教育发展的需求。" public_education_eo:0 "公共教育" public_education_eo_desc:0 "教育是人民群众的事业，每一个人都要学习，每一个人都会进步，依靠自己的努力便能取得丰硕的成果。" - public_church_school:0 "教会学校" - public_church_school_desc:0 "教育是塑造百姓精神的神圣事业，只有那些真正虔诚的人才能担此重任。" mixed_education:0 "混合教育政策" mixed_education_desc:0 "在推广公共教育的同时鼓励私人教育的发展，平衡各阶层对教育发展的需求。\n\n" private_education:0 "私立教育" private_education_desc:0 "私立学校是文明统治精英的摇篮，其严格的管理与高质量的水平将保障精英们对国家的完美掌控。\n\n" public_education:0 "公共教育" public_education_desc:0 "教育是人民群众的事业，每一个人都要学习，每一个人都会进步，依靠自己的努力便能取得丰硕的成果。\n\n" + church_school:0 "教会学校" + church_school_desc:0 "下一代的精神指引工作必须由最虔诚的人担任，以免异端邪说污染他们幼小的心灵。\n\n" + research_orientation:0 "科研导向" + research_orientation_desc:0 "我们的教育应当完全为我们的科研事业服务，为此我们应当裁减不必要的文化课、加大理工课程的学时和考核要求以及允许更小的孩子进入实验室作为学徒。\n\n" + military_administration:0 "军事管理" + military_administration_desc:0 "军营是青年最好的学校，而在我们国家，学校是青年的军营。严格的准军事训练可以使儿童养成健康的体魄、顽强的意志以及勇敢、坚忍、顺从、爱国等品质。\n\n" # 科研伦理 policy_research_ethics:0 "科研伦理" @@ -356,10 +356,7 @@ enhanced_consciousness_desc:0"资源应当优先集中于脑部。我们的思维格外清晰，即使宇宙也会在思考时褪色。\n\n" data_collecting_protocol:0"数据收集协议" data_collecting_protocol_desc:0"我们从未如此渴望着知识。现在身边充满了优质的实验材料，观察，收集，实验，分析.......\n\n" -<<<<<<< HEAD -======= - ->>>>>>> 1ae2cdebf00d25c806f03fd2e7d687756f71647b + # 奴隶比例 policy_ratio_of_slaves:0 "奴隶比例" policy_ratio_of_slaves_name:0 "奴隶比例" From cb92e02b19b4aae477f863eb0649f1ca96a16deb Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:57:27 +0800 Subject: [PATCH 2/3] Update ethic_civics_l_simp_chinese.yml --- .../replace/simp_chinese/ethic_civics_l_simp_chinese.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 72e762c80..149ccc2fa 100644 --- a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml @@ -48,7 +48,7 @@ civic_sparta_spirit:0 "§E§H军营国度§!§!" civic_sparta_spirit_desc:0 "§R主题理念§!\n这一社会本质上是一个巨大的军营，与军事无关的娱乐与文化被严格禁止，教育由国家完全控制，以自年幼至衰老的公民军事训练为唯一内容。为了供应这一战争机器，被征服的奴隶会作为燃料，担任一切士兵以外的低贱工作。" - civic_tooltip_civic_sparta_spirit_effects:14 " - 能够无视思潮与国策的限制使用奴隶制\n - 公民人口仅能担任§Y$pop_cat_ruler_plural$§!岗位、§Y £pop_cat_ruler£ $pop_cat_ruler_plural$§!岗位、 £job_soldier£ §Y$job_soldier_plural$§!岗位、 £job_enforcer£ §Y$job_enforcer_plural$§!岗位、 £job_duelist£ §Y$job_duelist_plural$§!岗位，失业的公民人口会自动成为无上限的 £job_conscript_uncapped£ §Y$job_conscript_uncapped_plural$§!。\n - 奴隶人口能且只能担任以上岗位以外的非军事岗位，§Y$citizenship_limited$§!的人口可以担任全部岗位但幸福度降低，禁止§Y奴隶兵§!奴役方式。\n - 替换 £job_entertainer£ §Y$job_entertainer$§!岗位为 £job_duelist£ §Y$job_duelist$§!岗位，$job_duelist_effect_desc$，替换 £building£ §Y$building_autochthon_monument$§! 提供的 £job_culture_worker£ §Y$job_culture_worker$§!岗位为 £job_commandante£ §Y$job_commandante$§!岗位，$job_commandante_effect_desc$\n = - £job_commandante£ $job_commandante_plural$提供额外的 £unity£ 凝聚力和 £amenities£ 舒适度\n - 开始游戏时解锁§Y集中指挥§!科技。\n - $job_commandante_plural$政治权力: §Y+300%§!，$job_soldier_plural$政治权力: §Y+300%§!" + civic_tooltip_civic_sparta_spirit_effects:14 " - 能够无视思潮与国策的限制使用奴隶制\n - 公民人口仅能担任§Y$pop_cat_ruler_plural$§!岗位、§Y £pop_cat_ruler£ $pop_cat_ruler_plural$§!岗位、 £job_soldier£ §Y$job_soldier_plural$§!岗位、 £job_enforcer£ §Y$job_enforcer_plural$§!岗位、 £job_duelist£ §Y$job_duelist_plural$§!岗位，失业的公民人口会自动成为无上限的 £job_conscript_uncapped£ §Y$job_conscript_uncapped_plural$§!。\n - 奴隶人口能且只能担任以上岗位以外的非军事岗位，§Y$citizenship_limited$§!的人口可以担任全部岗位但幸福度降低，禁止§Y奴隶兵§!奴役方式。\n - 替换 £job_entertainer£ §Y$job_entertainer$§!岗位为 £job_duelist£ §Y$job_duelist$§!岗位，$job_duelist_effect_desc$，替换 £building£ §Y$building_autochthon_monument$§! 提供的 £job_culture_worker£ §Y$job_culture_worker$§!岗位为 £job_commandante£ §Y$job_commandante$§!岗位，$job_commandante_effect_desc$\n - £job_commandante£ $job_commandante_plural$提供额外的 £unity£ 凝聚力和 £amenities£ 舒适度\n - 开始游戏时解锁§Y集中指挥§!科技。\n - $job_commandante_plural$政治权力: §Y+300%§!，$job_soldier_plural$政治权力: §Y+300%§!" civic_philosopher_king:1 "§H§Y哲人王§!§!" civic_philosopher_king_desc:0 "§Y主题理念§!\n仅仅统治是不够的。国家的航船必须由一个拥有足够智慧和知识的国王来掌舵。" From a281b753fcad562005c49154d0cd9b0cd1c821dc Mon Sep 17 00:00:00 2001 From: hathaway682 <47740118+hathaway682@users.noreply.github.com> Date: Mon, 30 Jan 2023 16:03:19 +0800 Subject: [PATCH 3/3] Update ethic_rebuild_policies.txt --- common/policies/ethic_rebuild_policies.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/policies/ethic_rebuild_policies.txt b/common/policies/ethic_rebuild_policies.txt index 48a9f15a4..bcf42cb65 100644 --- a/common/policies/ethic_rebuild_policies.txt +++ b/common/policies/ethic_rebuild_policies.txt @@ -4602,6 +4602,7 @@ education = { option = { name = "mixed_education" valid = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_valid_civic = civic_shared_burden } @@ -4615,6 +4616,7 @@ education = { option = { name = "private_education" valid = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_valid_civic = civic_welfare_state has_ethic = "ethic_fanatic_socialism" @@ -4641,6 +4643,7 @@ education = { option = { name = "public_education" valid = { + NOT = { has_valid_civic = civic_sparta_spirit } NOR = { has_ethic = "ethic_fanatic_capitalism" has_valid_civic = civic_merchant_guilds