diff --git a/common/buildings/ethic_branch_office_buildings.txt b/common/buildings/ethic_branch_office_buildings.txt index 98764dabe..79f27002f 100644 --- a/common/buildings/ethic_branch_office_buildings.txt +++ b/common/buildings/ethic_branch_office_buildings.txt @@ -611,7 +611,7 @@ building_state_mining_enterprise = { } modifier = { job_miner_add = -3 - job_fe_acolyte_mine_add = 3 + job_re_acolyte_mine_add = 3 } } @@ -684,7 +684,7 @@ building_state_farms = { } modifier = { job_farmer_add = -3 - job_fe_acolyte_farm_add = 3 + job_re_acolyte_farm_add = 3 } } @@ -751,7 +751,7 @@ building_state_energy_enterprise = { } modifier = { job_technician_add = -3 - job_fe_acolyte_generator_add = 3 + job_re_acolyte_generator_add = 3 } } @@ -820,7 +820,7 @@ building_supply_and_marketing_cooperatives = { modifier = { job_artisan_add = -1 job_manufacturing_workers_add = -1 - job_fe_acolyte_artisan_add = 2 + job_re_acolyte_artisan_add = 2 planet_artisans_consumer_goods_produces_mult = 0.05 } } @@ -908,7 +908,7 @@ building_state_arms_group = { modifier = { job_foundry_add = -1 job_smelting_workers_add = -3 - job_fe_acolyte_metallurgists_add = 4 + job_re_acolyte_metallurgists_add = 4 planet_artisans_consumer_goods_produces_mult = 0.05 } } diff --git a/common/buildings/ethic_manufacturing_buildings.txt b/common/buildings/ethic_manufacturing_buildings.txt index 8e16a83e3..115b7790c 100644 --- a/common/buildings/ethic_manufacturing_buildings.txt +++ b/common/buildings/ethic_manufacturing_buildings.txt @@ -79,7 +79,7 @@ building_foundry_1 = { } } modifier = { - job_fe_acolyte_metallurgists_add = @b1_jobs + job_re_acolyte_metallurgists_add = @b1_jobs planet_jobs__alloys_produces_mult = 0.1 } } @@ -272,7 +272,7 @@ building_foundry_2 = { } } modifier = { - job_fe_acolyte_metallurgists_add = @b2_jobs + job_re_acolyte_metallurgists_add = @b2_jobs planet_jobs__alloys_produces_mult = 0.2 } } @@ -482,7 +482,7 @@ building_foundry_3 = { } } modifier = { - job_fe_acolyte_metallurgists_add = @b3_jobs + job_re_acolyte_metallurgists_add = @b3_jobs planet_jobs__alloys_produces_mult = 0.3 } } @@ -691,7 +691,7 @@ building_factory_1 = { } } modifier = { - job_fe_acolyte_artisan_add = @b1_jobs + job_re_acolyte_artisan_add = @b1_jobs planet_jobs_consumer_goods_produces_mult = 0.1 } } @@ -854,7 +854,7 @@ building_factory_2 = { } } modifier = { - job_fe_acolyte_artisan_add = @b2_jobs + job_re_acolyte_artisan_add = @b2_jobs planet_jobs_consumer_goods_produces_mult = 0.2 } } @@ -1020,7 +1020,7 @@ building_factory_3 = { } } modifier = { - job_fe_acolyte_artisan_add = @b3_jobs + job_re_acolyte_artisan_add = @b3_jobs planet_jobs_consumer_goods_produces_mult = 0.3 } } diff --git a/common/buildings/ethic_rebuild_buildings.txt b/common/buildings/ethic_rebuild_buildings.txt index d7aef89ee..2f8bcb1e4 100644 --- a/common/buildings/ethic_rebuild_buildings.txt +++ b/common/buildings/ethic_rebuild_buildings.txt @@ -740,7 +740,7 @@ building_citadel_of_faith = { } } modifier = { - job_fe_augur_add = 1 + job_re_augur_add = 1 } } @@ -2959,6 +2959,75 @@ building_sacred_nexus = { } } +#灵能军团 +building_psi_corps = { + base_buildtime = @b2_time + + category = government + + base_cap_amount = 1 + + potential = { + host_has_dlc = "Utopia" + owner = { + OR = { + has_ascension_perk = ap_mind_over_matter + has_origin = origin_shroudwalker_apprentice + } + } + NOT = { has_modifier = resort_colony } + NOT = { has_modifier = slave_colony } + } + + allow = { + has_major_upgraded_capital = yes + buildings_simple_allow = yes + } + + destroy_trigger = { + exists = owner + NOT = { + owner = { + OR = { + has_ascension_perk = ap_mind_over_matter + has_origin = origin_shroudwalker_apprentice + } + } + } + } + + planet_modifier = { + job_telepath_add = 2 + planet_stability_add = 5 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_re_augur_add = 2 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = 500 + } + upkeep = { + energy = @b2_upkeep + } + } + + triggered_desc = { + text = job_telepath_effect_desc + } +} + #拜金教神龛 building_nuumismatic_shrine = { base_buildtime = 180 @@ -4062,6 +4131,19 @@ building_energy_grid = { job_fe_acolyte_generator_add = 1 } } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_technician_add = -1 + job_re_acolyte_generator_add = 1 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -4232,6 +4314,19 @@ building_energy_nexus = { job_fe_acolyte_generator_add = 2 } } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_technician_add = -2 + job_re_acolyte_generator_add = 2 + } + } triggered_planet_modifier = { potential = { exists = owner @@ -4399,6 +4494,766 @@ building_energy_nexus = { } } +#食物加工厂 +building_food_processing_facility = { + base_buildtime = @b1_time + base_cap_amount = 1 + category = resource + + potential = { + exists = owner + NOR = { + is_planet_class = pc_machine + has_modifier = resort_colony + } + + OR = { + owner = { + is_ai = no + } + has_any_farming_district_or_buildings = yes + } + } + + destroy_trigger = { + exists = owner + OR = { + owner = { + is_ai = yes + country_uses_food = no + } + is_planet_class = pc_machine + has_modifier = resort_colony + AND = { + owner = { + is_ai = yes + } + has_any_farming_district_or_buildings = no + } + } + } + + planet_modifier = { + planet_farmers_food_produces_add = 1 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + is_regular_empire = yes + is_fallen_empire_spiritualist = no + OR = { + is_anglers_empire = no + AND = { + is_anglers_empire = yes + NOT = { PREV = { planet = { is_wet = yes } } } + } + } + } + } + modifier = { + job_farmer_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + modifier = { + job_fe_acolyte_farm_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_farmer_add = -1 + job_re_acolyte_farm_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { is_gestalt = yes } + } + modifier = { + job_agri_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + is_regular_empire = yes + is_fallen_empire_spiritualist = no + is_anglers_empire = yes + PREV = { planet = { is_wet = yes } } + } + } + modifier = { + job_angler_add = 1 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b1_minerals + } + upkeep = { + energy = 2 + } + } + + triggered_desc = { + trigger = { + exists = owner + owner = { is_gestalt = yes } + } + text = job_agri_drone_effect_desc + } + triggered_desc = { + trigger = { + exists = owner + owner = { + is_gestalt = no + is_fallen_empire_spiritualist = no + } + } + text = job_farmer_effect_desc + } + triggered_desc = { + trigger = { + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + text = job_fe_acolyte_farm_effect_desc + } + triggered_desc = { + trigger = { + exists = owner + owner = { + is_fallen_empire_spiritualist = no + is_anglers_empire = yes + PREV = { planet = { is_wet = yes } } + } + } + text = job_aqu_angler_effect_desc + } + + upgrades = { + building_food_processing_center + } + + prerequisites = { + "tech_food_processing_1" + } +} + +#食物处理中心 +building_food_processing_center = { + base_buildtime = @b2_time + can_build = no + category = resource + + allow = { + exists = owner + has_upgraded_capital = yes + } + + destroy_trigger = { + OR = { + AND = { + exists = owner + OR = { + owner = { + is_ai = yes + country_uses_food = no + } + AND = { + owner = { + is_ai = yes + } + has_any_farming_district_or_buildings = no + } + } + } + is_planet_class = pc_machine + has_modifier = resort_colony + buildings_no_motes = yes + } + } + + planet_modifier = { + planet_farmers_food_produces_add = 2 + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + is_regular_empire = yes + is_fallen_empire_spiritualist = no + OR = { + is_anglers_empire = no + AND = { + is_anglers_empire = yes + NOT = { PREV = { planet = { is_wet = yes } } } + } + } + } + } + modifier = { + job_farmer_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + modifier = { + job_fe_acolyte_farm_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_farmer_add = -2 + job_re_acolyte_farm_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { is_gestalt = yes } + } + modifier = { + job_agri_drone_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + is_regular_empire = yes + is_fallen_empire_spiritualist = no + is_anglers_empire = yes + PREV = { planet = { is_wet = yes } } + } + } + modifier = { + job_angler_add = 2 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b2_minerals + volatile_motes = @b2_rare_cost + } + upkeep = { + energy = 2 + volatile_motes = @b2_rare_upkeep + } + } + + triggered_desc = { + trigger = { + exists = owner + owner = { is_gestalt = yes } + } + text = job_agri_drone_effect_desc + } + triggered_desc = { + trigger = { + exists = owner + owner = { + is_gestalt = no + is_fallen_empire_spiritualist = no + } + } + text = job_farmer_effect_desc + } + triggered_desc = { + trigger = { + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + text = job_fe_acolyte_farm_effect_desc + } + triggered_desc = { + trigger = { + exists = owner + owner = { + is_fallen_empire_spiritualist = no + is_anglers_empire = yes + PREV = { planet = { is_wet = yes } } + } + } + text = job_aqu_angler_effect_desc + } + + prerequisites = { + "tech_food_processing_2" + } +} + +#矿物处理站 +building_mineral_purification_plant = { + + desc = { + trigger = { NOT = { is_planet_class = pc_shattered_ring_habitable } } + text = building_mineral_purification_plant_desc + } + + desc = { + trigger = { is_planet_class = pc_shattered_ring_habitable } + text = building_scrap_processing_plant_desc + } + + base_buildtime = @b1_time + base_cap_amount = 1 + category = resource + + destroy_trigger = { + OR = { + has_modifier = resort_colony + AND = { + exists = owner + owner = { + is_ai = yes + } + has_any_mining_district = no + } + } + } + + potential = { + NOT = { has_modifier = resort_colony } + + NOR = { # Ringworlds don't have mines + is_planet_class = pc_ringworld_habitable + is_planet_class = pc_cybrex + } + OR = { # Habitats only have mines if they're built on an appropriate deposit + NOT = { is_planet_class = pc_habitat } + has_planet_flag = mining_habitat + } + OR = { + owner = { + is_ai = no + } + has_any_mining_district = yes + } + } + + planet_modifier = { + planet_miners_minerals_produces_add = 1 + } + + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { + is_regular_empire = yes + is_fallen_empire_spiritualist = no + } + } + modifier = { + job_miner_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + modifier = { + job_fe_acolyte_mine_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_miner_add = -1 + job_re_acolyte_mine_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_gestalt = yes } + } + modifier = { + job_mining_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_regular_empire = yes } + } + modifier = { + job_scrap_miner_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_gestalt = yes } + } + modifier = { + job_scrap_miner_drone_add = 1 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + is_robot_empire = yes + } + NOR = { + is_planet_class = pc_habitat + is_planet_class = pc_machine + is_planet_class = pc_hive + is_planet_class = pc_city + is_planet_class = pc_shattered_ring_habitable + } + } + modifier = { + district_mining_max = 2 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = 200 + } + cost = { + trigger = { + owner = { + is_robot_empire = yes + } + } + minerals = 100 + alloys = 100 + } + upkeep = { + energy = 2 + } + } + + prerequisites = { + tech_mineral_purification_1 + } + + upgrades = { + building_mineral_purification_hub + } + + triggered_desc = { + trigger = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_gestalt = yes } + } + text = job_mining_drone_effect_desc + } + triggered_desc = { + trigger = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { + is_gestalt = no + is_fallen_empire_spiritualist = no + } + } + text = job_miner_effect_desc + } + triggered_desc = { + trigger = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + text = job_fe_acolyte_mine_effect_desc + } + + triggered_desc = { + trigger = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_gestalt = yes } + } + text = job_scrap_miner_drone_effect_desc + } + triggered_desc = { + trigger = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_regular_empire = yes } + } + text = job_scrap_miner_effect_desc + } +} + +#矿物处理中心 +building_mineral_purification_hub = { + + desc = { + trigger = { NOT = { is_planet_class = pc_shattered_ring_habitable } } + text = building_mineral_purification_hub_desc + } + + desc = { + trigger = { is_planet_class = pc_shattered_ring_habitable } + text = building_scrap_processing_hub_desc + } + + base_buildtime = @b2_time + can_build = no + category = resource + + allow = { + has_upgraded_capital = yes + NOT = { has_modifier = resort_colony } + } + + destroy_trigger = { + OR = { + OR = { + has_modifier = resort_colony + buildings_no_motes = yes + } + + AND = { + exists = owner + owner = { + is_ai = yes + } + has_any_mining_district = no + } + } + } + + + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + } + modifier = { + planet_miners_minerals_produces_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + is_planet_class = pc_shattered_ring_habitable + } + modifier = { + planet_miners_minerals_produces_add = 1 + planet_miners_alloys_produces_add = 0.5 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + job_miner_add = -2 + job_re_acolyte_mine_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { + is_regular_empire = yes + is_fallen_empire_spiritualist = no + } + } + modifier = { + job_miner_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + modifier = { + job_fe_acolyte_mine_add = 2 + } + } + triggered_planet_modifier = { + potential = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_gestalt = yes } + } + modifier = { + job_mining_drone_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_regular_empire = yes } + } + modifier = { + job_scrap_miner_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_gestalt = yes } + } + modifier = { + job_scrap_miner_drone_add = 2 + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + is_robot_empire = yes + } + NOR = { + is_planet_class = pc_habitat + is_planet_class = pc_machine + is_planet_class = pc_hive + is_planet_class = pc_city + is_planet_class = pc_shattered_ring_habitable + } + } + modifier = { + district_mining_max = 4 + } + } + + resources = { + category = planet_buildings + cost = { + minerals = @b2_minerals + volatile_motes = @b2_rare_cost + } + cost = { + trigger = { + owner = { + is_robot_empire = yes + } + } + minerals = 300 + alloys = 150 + } + upkeep = { + energy = 2 + volatile_motes = @b2_rare_upkeep + } + } + + prerequisites = { + tech_mineral_purification_2 + } + + triggered_desc = { + trigger = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_gestalt = yes } + } + text = job_mining_drone_effect_desc + } + triggered_desc = { + trigger = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { + is_gestalt = no + is_fallen_empire_spiritualist = no + } + } + text = job_miner_effect_desc + } + triggered_desc = { + trigger = { + NOT = { is_planet_class = pc_shattered_ring_habitable } + exists = owner + owner = { is_fallen_empire_spiritualist = yes } + } + text = job_fe_acolyte_mine_effect_desc + } + + triggered_desc = { + trigger = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_gestalt = yes } + } + text = job_scrap_miner_drone_effect_desc + } + triggered_desc = { + trigger = { + is_planet_class = pc_shattered_ring_habitable + exists = owner + owner = { is_regular_empire = yes } + } + text = job_scrap_miner_effect_desc + } +} + #机械修道院 building_mecha_monastery = { base_buildtime = 360 diff --git a/common/buildings/ethics_capital_buildings.txt b/common/buildings/ethics_capital_buildings.txt index 25ef2ff71..576e26e1c 100644 --- a/common/buildings/ethics_capital_buildings.txt +++ b/common/buildings/ethics_capital_buildings.txt @@ -280,7 +280,7 @@ building_capital = { } modifier = { job_politician_add = -1 - job_fe_sky_cardinal_add = 1 + job_re_sky_cardinal_add = 1 } } triggered_planet_modifier = { @@ -1674,7 +1674,7 @@ building_system_capital = { } modifier = { job_politician_add = -2 - job_fe_sky_cardinal_add = 2 + job_re_sky_cardinal_add = 2 } } triggered_planet_modifier = { @@ -2383,7 +2383,7 @@ building_imperial_capital = { } modifier = { job_politician_add = -3 - job_fe_sky_cardinal_add = 3 + job_re_sky_cardinal_add = 3 } } triggered_planet_modifier = { @@ -3436,7 +3436,7 @@ building_hab_major_capital = { } modifier = { job_politician_add = -1 - job_fe_sky_cardinal_add = 1 + job_re_sky_cardinal_add = 1 } } triggered_planet_modifier = { @@ -4279,7 +4279,7 @@ building_hab_system_capital = { } modifier = { job_politician_add = -1 - job_fe_sky_cardinal_add = 1 + job_re_sky_cardinal_add = 1 } } triggered_planet_modifier = { @@ -5031,7 +5031,7 @@ building_hab_imperial_capital = { } modifier = { job_politician_add = -2 - job_fe_sky_cardinal_add = 2 + job_re_sky_cardinal_add = 2 } } triggered_planet_modifier = { diff --git a/common/districts/00_urban_districts.txt b/common/districts/00_urban_districts.txt index 1c7541294..e0aa62e37 100644 --- a/common/districts/00_urban_districts.txt +++ b/common/districts/00_urban_districts.txt @@ -596,8 +596,8 @@ district_industrial = { planet_housing_add = 1 job_manufacturing_workers_add = -0.25 job_smelting_workers_add = -0.25 - job_fe_acolyte_metallurgists_add = 0.25 - job_fe_acolyte_artisan_add = 0.25 + job_re_acolyte_metallurgists_add = 0.25 + job_re_acolyte_artisan_add = 0.25 } } triggered_planet_modifier = { @@ -631,10 +631,10 @@ district_industrial = { } } modifier = { - job_manufacturing_workers_add = -1 - job_smelting_workers_add = -1 - job_fe_acolyte_metallurgists_add = 1 - job_fe_acolyte_artisan_add = 1 + job_manufacturing_workers_add = -2 + job_smelting_workers_add = -2 + job_re_acolyte_metallurgists_add = 1 + job_re_acolyte_artisan_add = 1 } } triggered_planet_modifier = { @@ -683,9 +683,9 @@ district_industrial = { } } modifier = { - job_manufacturing_workers_add = -1 - job_smelting_workers_add = -1 - job_fe_acolyte_metallurgists_add = 2 + job_manufacturing_workers_add = -2 + job_smelting_workers_add = -2 + job_re_acolyte_metallurgists_add = 2 } } triggered_planet_modifier = { @@ -711,9 +711,9 @@ district_industrial = { } } modifier = { - job_manufacturing_workers_add = -1 - job_smelting_workers_add = -1 - job_fe_acolyte_artisan_add = 2 + job_manufacturing_workers_add = -2 + job_smelting_workers_add = -2 + job_re_acolyte_artisan_add = 2 } } triggered_planet_modifier = { diff --git a/common/districts/01_arcology_districts.txt b/common/districts/01_arcology_districts.txt index 4a9fb8431..3f2e939c2 100644 --- a/common/districts/01_arcology_districts.txt +++ b/common/districts/01_arcology_districts.txt @@ -254,7 +254,7 @@ district_arcology_civilian_industry = { } } modifier = { - job_fe_acolyte_artisan_add = 6 + job_re_acolyte_artisan_add = 6 } } @@ -371,7 +371,7 @@ district_arcology_arms_industry = { } } modifier = { - job_fe_acolyte_metallurgists_add = 6 + job_re_acolyte_metallurgists_add = 6 } } @@ -728,10 +728,6 @@ district_arcology_administrative = { has_ethic = ethic_spiritualist has_ethic = ethic_fanatic_spiritualist has_valid_civic = civic_anarchism - AND = { - has_valid_civic = civic_shared_burden - has_ascension_perk = ap_future_society - } has_valid_civic = civic_democracy_and_clean_government has_valid_civic = civic_OGAS } diff --git a/common/districts/02_rural_districts.txt b/common/districts/02_rural_districts.txt index 21eb40dfc..53061854d 100644 --- a/common/districts/02_rural_districts.txt +++ b/common/districts/02_rural_districts.txt @@ -80,7 +80,7 @@ district_generator = { modifier = { planet_housing_add = 1 job_technician_add = -0.5 - job_fe_acolyte_generator_add = 0.5 + job_re_acolyte_generator_add = 0.5 } } triggered_planet_modifier = { @@ -163,7 +163,7 @@ district_generator = { } modifier = { job_technician_add = -2 - job_fe_acolyte_generator_add = 2 + job_re_acolyte_generator_add = 2 } } triggered_planet_modifier = { @@ -373,7 +373,7 @@ district_mining = { modifier = { planet_housing_add = 1 job_miner_add = -0.5 - job_fe_acolyte_mine_add = 0.5 + job_re_acolyte_mine_add = 0.5 } } triggered_planet_modifier = { @@ -458,7 +458,7 @@ district_mining = { } modifier = { job_miner_add = -2 - job_fe_acolyte_mine_add = 2 + job_re_acolyte_mine_add = 2 } } triggered_planet_modifier = { @@ -718,7 +718,7 @@ district_farming = { } modifier = { job_farmer_add = -2 - job_fe_acolyte_farm_add = 2 + job_re_acolyte_farm_add = 2 } } triggered_planet_modifier = { @@ -774,7 +774,7 @@ district_farming = { modifier = { planet_housing_add = 1 job_farmer_add = -0.5 - job_fe_acolyte_farm_add = 0.5 + job_re_acolyte_farm_add = 0.5 } } triggered_planet_modifier = { @@ -1897,7 +1897,7 @@ district_farming_uncapped = { } modifier = { planet_housing_add = 1 - job_fe_acolyte_farm_add = 0.5 + job_re_acolyte_farm_add = 0.5 } } triggered_planet_modifier = { diff --git a/common/governments/civics/ethic_civics_nationality.txt b/common/governments/civics/ethic_civics_nationality.txt index db90e1c4e..04a479223 100644 --- a/common/governments/civics/ethic_civics_nationality.txt +++ b/common/governments/civics/ethic_civics_nationality.txt @@ -2,6 +2,46 @@ # 国民性 ################## +#超人经济 +civic_superhuman_economy = { + description = "civic_tooltip_superhuman_economy_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 = { + OR = { + text = civic_tooltip_authoritarian + value = ethic_authoritarian + value = ethic_fanatic_authoritarian + } + } + } + + modifier = { + leaders_cost_mult = 0.15 + leaders_upkeep_mult = 0.15 + planet_jobs_productive_produces_mult = -0.15 + pop_government_ethic_attraction = 0.15 + } +} + #夸耀纯净派 civic_pompous_purists = { playable = { has_humanoids = yes } @@ -1022,7 +1062,7 @@ civic_separation_of_powers = { civic_democracy_and_clean_government = { description = civic_tooltip_democracy_and_clean_government_effects swap_type = { - description = "civic_tooltip_communist_society_effects" + description = "civic_tooltip_democracy_and_clean_government_OGAS_effects" trigger = { has_valid_civic = civic_OGAS } @@ -1067,7 +1107,6 @@ civic_democracy_and_clean_government = { NOR = { value = civic_byzantine_bureaucracy value = civic_efficient_bureaucracy - value = civic_OGAS } } } @@ -1125,7 +1164,6 @@ civic_OGAS = { NOR = { value = civic_byzantine_bureaucracy value = civic_efficient_bureaucracy - value = civic_democracy_and_clean_government } } } diff --git a/common/governments/civics/ethic_civics_yellow.txt b/common/governments/civics/ethic_civics_yellow.txt index fd7ca909a..29e87efdc 100644 --- a/common/governments/civics/ethic_civics_yellow.txt +++ b/common/governments/civics/ethic_civics_yellow.txt @@ -174,10 +174,10 @@ civic_shared_burden = { possible = { ethics = { value = ethic_fanatic_socialism - NOR = { - text = civic_tooltip_not_authoritarian - value = ethic_authoritarian - value = ethic_fanatic_authoritarian + OR = { + text = civic_tooltip_egalitarian + value = ethic_egalitarian + value = ethic_fanatic_egalitarian } NOR = { text = civic_tooltip_not_xenophobe diff --git a/common/leader_classes/ethic_rebuild_base_classes.txt b/common/leader_classes/ethic_rebuild_base_classes.txt index 72df8f90c..1082e0c82 100644 --- a/common/leader_classes/ethic_rebuild_base_classes.txt +++ b/common/leader_classes/ethic_rebuild_base_classes.txt @@ -127,6 +127,17 @@ admiral = { } minerals = 2 } + produces = { + trigger = { + owner = { + has_valid_civic = civic_superhuman_economy + } + } + energy = 2 + minerals = 2 + alloys = 1 + multiplier = trigger:has_skill + } } default_category = admiral @@ -259,6 +270,29 @@ general = { } minerals = 2 } + produces = { + trigger = { + owner = { + has_valid_civic = civic_superhuman_economy + is_lithoid = no + } + } + energy = 2 + food = 2 + minerals = 2 + multiplier = trigger:has_skill + } + produces = { + trigger = { + owner = { + has_valid_civic = civic_superhuman_economy + is_lithoid = yes + } + } + energy = 2 + minerals = 4 + multiplier = trigger:has_skill + } } default_category = general @@ -329,9 +363,9 @@ scientist = { has_ethic = ethic_materialist } } - physics_research = 4 - engineering_research = 4 - society_research = 4 + physics_research = 1 + engineering_research = 1 + society_research = 1 multiplier = trigger:has_skill } upkeep={ @@ -341,7 +375,7 @@ scientist = { has_ethic = ethic_materialist } } - consumer_goods=2 + consumer_goods = 0.5 } produces = { trigger = { @@ -350,9 +384,9 @@ scientist = { has_ethic = ethic_fanatic_materialist } } - physics_research = 6 - engineering_research = 6 - society_research = 6 + physics_research = 2 + engineering_research = 2 + society_research = 2 multiplier = trigger:has_skill } upkeep={ @@ -362,7 +396,7 @@ scientist = { has_ethic = ethic_fanatic_materialist } } - consumer_goods=3 + consumer_goods = 1 } cost = { trigger = { @@ -422,6 +456,17 @@ scientist = { } minerals = 2 } + produces = { + trigger = { + owner = { + has_valid_civic = civic_superhuman_economy + } + } + physics_research = 0.5 + engineering_research = 0.5 + society_research = 0.5 + multiplier = trigger:has_skill + } } default_category = scientist } @@ -553,6 +598,30 @@ governor = { unity = 1 multiplier = trigger:has_skill } + produces = { + trigger = { + owner = { + has_valid_civic = civic_superhuman_economy + is_lithoid = no + } + } + energy = 2 + food = 2 + consumer_goods = 1 + multiplier = trigger:has_skill + } + produces = { + trigger = { + owner = { + has_valid_civic = civic_superhuman_economy + is_lithoid = yes + } + } + energy = 2 + minerals = 2 + consumer_goods = 1 + multiplier = trigger:has_skill + } } default_category = governor } diff --git a/common/pop_jobs/ethic_rebuild_jobs.txt b/common/pop_jobs/ethic_rebuild_jobs.txt index e2a3872d8..5ca393442 100644 --- a/common/pop_jobs/ethic_rebuild_jobs.txt +++ b/common/pop_jobs/ethic_rebuild_jobs.txt @@ -1253,6 +1253,1093 @@ tentacle_seedbed = { } } +#圣炉侍者 +re_acolyte_metallurgists = { + category = worker + is_capped_by_modifier = yes + building_icon = building_empyrean_shrine + clothes_texture_index = 3 + icon = foundry + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + triggered_planet_modifier = { + potential = { + always = yes + } + planet_amenities_add = 0.5 + mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult| + } + + resources = { + category = planet_metallurgists + produces = { + alloys = 3 + } + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_catalytic_processing + } + } + society_research = 1 + } + produces = { + trigger = { + owner = { + OR = { + has_valid_civic = civic_shared_burden + has_valid_civic = civic_socialistic + } + } + } + engineering_research = 0.25 + } + produces = { + trigger = { + planet = { + has_planet_flag = has_material_requisitorium + } + } + alloys = @requisitorium_alloys_reduction + } + upkeep = { + trigger = { + planet = { + has_planet_flag = has_material_requisitorium + } + } + minerals = 2 + } + upkeep = { + minerals = 6 + } + upkeep = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_catalytic_processing + } + } + minerals = -6 + food = 6 + } + + #社会主义 + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_fanatic_socialism + } + } + unity = 0.75 + } + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_socialism + } + } + unity = 0.25 + } + } + + overlord_resources = { + category = planet_requisitioned_alloys + produces = { + trigger = { + planet = { + has_planet_flag = has_material_requisitorium + } + } + alloys = @requisitorium_alloys_overlord + } + } + + weight = { + weight = @worker_job_weight + modifier = { + factor = 2 + is_enslaved = yes + can_take_servant_job = no + } + modifier = { + factor = 2 + species = { + has_species_flag = racket_species_flag + } + } + modifier = { + factor = 5 + has_job = foundry + } + modifier = { + factor = 15 + has_job = foundry + OR = { + has_trait = trait_robust + has_trait = trait_robot_efficient_processors + } + } + modifier = { + factor = 1.5 + has_trait = trait_void_dweller_1 + } + } +} + +#圣坊侍者 +re_acolyte_artisan = { + category = worker + is_capped_by_modifier = yes + building_icon = building_empyrean_shrine + clothes_texture_index = 3 + icon = artisan + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + triggered_planet_modifier = { + potential = { + always = yes + } + planet_amenities_add = 0.5 + mult = value:scripted_modifier_mult|MODIFIER|pop_job_amenities_mult| + } + + resources = { + category = planet_artisans + produces = { + consumer_goods = 6 + } + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_crafters + } + } + engineering_research = 1.5 + } + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_crafters_socialism + } + } + engineering_research = 2 + } + produces = { + trigger = { + owner = { + OR = { + has_valid_civic = civic_shared_burden + has_valid_civic = civic_socialistic + } + } + } + engineering_research = 0.25 + } + upkeep = { + minerals = 6 + } + upkeep = { + trigger = { + exists = owner + owner = { + has_edict = industrial_subsidies + } + } + energy = 1 + } + produces = { + trigger = { + planet = { + has_planet_flag = has_produce_requisitorium + exists = owner.overlord + owner.overlord = { is_gestalt = no } + } + } + consumer_goods = @requisitorium_consumer_goods_reduction + } + upkeep = { + trigger = { + planet = { + has_planet_flag = has_produce_requisitorium + exists = owner.overlord + owner.overlord = { is_gestalt = no } + } + } + minerals = 1 + } + + #社会主义 + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_fanatic_socialism + } + } + unity = 0.75 + } + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_socialism + } + } + unity = 0.25 + } + } + + overlord_resources = { + category = planet_requisitioned_consumer_goods + produces = { + trigger = { + planet = { + has_planet_flag = has_produce_requisitorium + exists = owner.overlord + owner.overlord = { is_gestalt = no } + } + } + consumer_goods = @requisitorium_consumer_goods_overlord + } + } + triggered_planet_modifier = { + potential = { + owner = { + has_valid_civic = civic_crafters + } + } + modifier = { + trade_value_add = 1 + } + } + triggered_planet_modifier = { + potential = { + owner = { + has_valid_civic = civic_industry_commerce_assembly_line + } + } + modifier = { + trade_value_add = 2 + } + } + weight = { + weight = @worker_job_weight + modifier = { + factor = 2 + is_enslaved = yes + can_take_servant_job = no + } + modifier = { + factor = 5 + has_job = artisan + } + modifier = { + factor = 10 + has_job = artisan + OR = { + has_trait = trait_robust + has_trait = trait_robot_efficient_processors + } + } + modifier = { + factor = 1.5 + has_trait = trait_void_dweller_1 + } + } +} + +#犁耕侍者 +re_acolyte_farm = { + category = worker + building_icon = building_food_processing_facility + clothes_texture_index = 3 + icon = farmer + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + resources = { + category = planet_farmers + produces = { + food = 6 + } + produces = { + trigger = { + exists = owner + owner = { + is_robot_empire = yes + } + } + food = -1 + } + produces = { + trigger = { + owner = { + OR = { + has_valid_civic = civic_shared_burden + has_valid_civic = civic_socialistic + } + } + } + society_research = 0.25 + } + produces = { + trigger = { + planet = { has_modifier = "ley_rift" } + } + sr_zro = 0.1 + } + upkeep = { + trigger = { + exists = owner + owner = { + has_edict = farming_subsidies + } + } + energy = 0.5 + } + produces = { + trigger = { + planet = { + has_planet_flag = has_produce_requisitorium + } + } + food = @requisitorium_food_reduction + } + + #社会主义 + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_fanatic_socialism + } + } + unity = 0.75 + } + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_socialism + } + } + unity = 0.25 + } + } + + overlord_resources = { + category = planet_requisitioned_food + produces = { + trigger = { + planet = { + has_planet_flag = has_produce_requisitorium + } + } + food = @requisitorium_food_overlord + } + } + + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_agrarian_idyll + } + } + modifier = { + planet_amenities_add = 2 + } + } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_agrarian_idyll + } + OR = { + has_trait = trait_robot_domestic_protocols + has_trait = trait_charismatic + } + } + modifier = { + planet_amenities_add = 0.4 + } + } + triggered_planet_modifier = { + potential = { + exists = owner + owner = { + has_valid_civic = civic_agrarian_idyll + } + has_trait = trait_repugnant + } + modifier = { + planet_amenities_add = -0.4 + } + } + weight = { + weight = @worker_job_weight + modifier = { + factor = 3 + OR = { + has_trait = trait_robot_harvesters + has_trait = trait_agrarian + } + } + modifier = { + factor = 1.1 + owner = { + has_valid_civic = civic_agrarian_idyll + } + } + modifier = { + factor = 10 + is_enslaved = yes + can_take_servant_job = no + } + modifier = { + factor = 3 + OR = { + is_non_sapient_robot = yes + is_shackled_robot = yes + } + can_take_servant_job = no + owner = { + has_technology = tech_droid_workers + } + } + modifier = { + factor = 200 + OR = { + is_non_sapient_robot = yes + is_shackled_robot = yes + } + can_take_servant_job = no + owner = { + NOT = { + has_technology = tech_droid_workers + } + } + } + modifier = { + factor = 0.25 + can_take_servant_job = yes + } + modifier = { + factor = 2 + has_trait = trait_syncretic_proles + } + modifier = { + factor = 1.2 + has_trait = trait_very_strong + } + modifier = { + factor = 1.1 + has_trait = trait_strong + } + modifier = { + factor = 0.9 + has_trait = trait_weak + } + modifier = { + factor = 1.5 + has_trait = trait_syncretic_proles + } + modifier = { + factor = 1.4 + has_trait = trait_presapient_proles + } + modifier = { + factor = 1.1 + OR = { + has_trait = trait_robust + has_trait = trait_robot_efficient_processors + } + } + modifier = { + factor = 1.1 + has_trait = trait_nerve_stapled + } + modifier = { + factor = 1.5 + owner = { + has_valid_civic = civic_agrarian_idyll + } + OR = { + has_trait = trait_robot_domestic_protocols + has_trait = trait_charismatic + } + } + modifier = { + factor = 0.5 + owner = { + has_valid_civic = civic_agrarian_idyll + } + has_trait = trait_repugnant + } + modifier = { + factor = 1.5 + has_trait = trait_void_dweller_1 + } + # low income modifier + modifier = { + factor = 1.2 + OR = { + is_unemployed = yes + has_job = farmer + } + exists = planet + planet = { + has_available_jobs = farmer + } + owner = { + has_monthly_income = { + resource = food + value < 0 + } + } + } + modifier = { + factor = 0.5 + has_trait = trait_lithoid + owner = { + is_lithoid_empire = yes + has_monthly_income = { + resource = food + value >= 0 + } + } + } + modifier = { + factor = 0.75 + has_trait = trait_necrophage + } + } +} + +#焰锤侍者 +re_acolyte_mine = { + category = worker + building_icon = building_crystal_mines + clothes_texture_index = 3 + icon = miner + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + resources = { + category = planet_miners + produces = { + minerals = 4 + } + produces = { + trigger = { + owner = { + OR = { + has_valid_civic = civic_shared_burden + has_valid_civic = civic_socialistic + } + } + } + engineering_research = 0.25 + } + produces = { + trigger = { + owner = { + has_valid_civic = civic_anglers_lithoid + } + planet = { is_wet = yes } + } + minerals = 1 + consumer_goods = 1 + } + produces = { + trigger = { + owner = { + has_valid_civic = civic_anglers_lithoid + has_technology = tech_mine_rare_crystals + } + planet = { is_wet = yes } + } + rare_crystals = 0.25 + } + produces = { + trigger = { + planet = { has_modifier = "ley_rift" } + } + sr_zro = 0.1 + } + upkeep = { + trigger = { + exists = owner + owner = { + has_edict = mining_subsidies + } + } + energy = 0.5 + } + produces = { + trigger = { + planet = { + has_planet_flag = has_material_requisitorium + } + } + minerals = @requisitorium_minerals_reduction + } + + #社会主义 + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_fanatic_socialism + } + } + unity = 0.75 + } + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_socialism + } + } + unity = 0.25 + } + } + + overlord_resources = { + category = planet_requisitioned_minerals + produces = { + trigger = { + planet = { + has_planet_flag = has_material_requisitorium + } + } + minerals = @requisitorium_minerals_overlord + } + } + weight = { + weight = @worker_job_weight + modifier = { + factor = 3 + OR = { + has_trait = trait_industrious + has_trait = trait_robot_power_drills + } + } + modifier = { + factor = 10 + is_enslaved = yes + can_take_servant_job = no + } + modifier = { + factor = 3 + OR = { + is_non_sapient_robot = yes + is_shackled_robot = yes + } + can_take_servant_job = no + owner = { + has_technology = tech_droid_workers + } + } + modifier = { + factor = 200 + OR = { + is_non_sapient_robot = yes + is_shackled_robot = yes + } + can_take_servant_job = no + owner = { + NOT = { + has_technology = tech_droid_workers + } + } + } + modifier = { + factor = 0.25 + can_take_servant_job = yes + } + modifier = { + factor = 2 + species = { + has_species_flag = racket_species_flag + } + } + modifier = { + factor = 1.2 + has_trait = trait_very_strong + } + modifier = { + factor = 1.1 + has_trait = trait_strong + } + modifier = { + factor = 0.9 + has_trait = trait_weak + } + modifier = { + factor = 1.5 + has_trait = trait_syncretic_proles + } + modifier = { + factor = 1.4 + has_trait = trait_presapient_proles + } + modifier = { + factor = 1.1 + OR = { + has_trait = trait_robust + has_trait = trait_robot_efficient_processors + } + } + modifier = { + factor = 1.1 + has_trait = trait_nerve_stapled + } + modifier = { + factor = 1.5 + has_trait = trait_void_dweller_1 + } + # low income modifier + modifier = { + factor = 1.1 + OR = { + is_unemployed = yes + has_job = "miner" + } + exists = planet + planet = { + has_available_jobs = "miner" + } + owner = { + has_monthly_income = { + resource = minerals + value < 30 + } + } + } + modifier = { + factor = 0.75 + has_trait = trait_necrophage + } + } +} + +#圣钳侍者 +re_acolyte_generator = { + category = worker + building_icon = building_power_plant + clothes_texture_index = 3 + icon = technician + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + resources = { + category = planet_technician + produces = { + energy = 6 + } + produces = { + trigger = { + owner = { + is_robot_empire = yes + } + } + energy = 2 + } + produces = { + trigger = { + owner = { + OR = { + has_valid_civic = civic_shared_burden + has_valid_civic = civic_socialistic + } + } + } + physics_research = 0.25 + } + upkeep = { + trigger = { + exists = owner + owner = { + has_edict = capacity_subsidies + } + } + energy = 0.5 + } + produces = { + trigger = { + planet = { + has_planet_flag = has_energy_requisitorium + } + } + energy = @requisitorium_energy_reduction + } + + #社会主义 + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_fanatic_socialism + } + } + unity = 0.75 + } + produces = { + trigger = { + exists = owner + owner = { + has_ethic = ethic_socialism + } + } + unity = 0.25 + } + } + + overlord_resources = { + category = planet_requisitioned_energy + produces = { + trigger = { + planet = { + has_planet_flag = has_energy_requisitorium + } + } + energy = @requisitorium_energy_overlord + } + } + triggered_planet_modifier = { + potential = { + owner = { + has_valid_civic = civic_financial_investment + } + } + modifier = { + trade_value_add = 1 + } + } + weight = { + weight = @worker_job_weight + modifier = { + factor = 2 + OR = { + has_trait = trait_robot_superconductive + has_trait = trait_ingenious + has_trait = trait_nuumismatic_administration + } + } + modifier = { + factor = 8 + is_enslaved = yes + can_take_servant_job = no + NOR = { + has_trait = trait_syncretic_proles + has_trait = trait_nuumismatic_administration + has_trait = trait_robot_superconductive + has_trait = trait_ingenious + } + } + modifier = { + factor = 2 + OR = { + is_non_sapient_robot = yes + is_shackled_robot = yes + } + can_take_servant_job = no + } + modifier = { + factor = 0.25 + can_take_servant_job = yes + } + modifier = { + factor = 1.5 + has_trait = trait_syncretic_proles + } + modifier = { + factor = 4 + species = { + has_species_flag = racket_species_flag + } + } + modifier = { + factor = 1.2 + has_trait = trait_very_strong + } + modifier = { + factor = 1.1 + has_trait = trait_strong + } + modifier = { + factor = 0.9 + has_trait = trait_weak + } + modifier = { + factor = 1.3 + has_trait = trait_psionic + } + modifier = { + factor = 1.2 + has_trait = trait_latent_psionic + } + modifier = { + factor = 1.5 + has_trait = trait_presapient_earthbound + } + modifier = { + factor = 1.1 + OR = { + has_trait = trait_robust + has_trait = trait_robot_efficient_processors + } + } + modifier = { + factor = 1.1 + has_trait = trait_nerve_stapled + } + modifier = { + factor = 1.5 + has_trait = trait_void_dweller_1 + } + #modifier = { + # factor = 500 + # planet = { + # owner = { + # is_megacorp = yes + # } + # } + #} + # low income modifier + modifier = { + factor = 1.2 + OR = { + is_unemployed = yes + has_job = "technician" + } + exists = planet + planet = { + has_available_jobs = "technician" + } + owner = { + has_monthly_income = { + resource = energy + value < 0 + } + } + } + modifier = { + factor = 0.75 + has_trait = trait_necrophage + } + } +} + +#虚境灵使 +re_augur = { + category = worker + icon = priest + is_capped_by_modifier = yes + building_icon = building_citadel_of_faith + clothes_texture_index = 2 + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + resources = { + category = planet_jobs + produces = { + unity = 10 + } + produces = { + trigger = { + exists = owner + owner = { + has_origin = origin_zarqlanism_idea + } + } + unity = 10 + } + } + + weight = { + weight = 30000 + + # crisis purge + modifier = { + factor = 0.01 + exists = planet + exists = planet.controller + planet.controller = { + OR = { + is_country_type = swarm + is_country_type = ai_empire + } + } + } + } +} + #劳工 future_worker = { category = worker @@ -3096,6 +4183,91 @@ techno_priest = { } } +#天空主教 +re_sky_cardinal = { + category = specialist + is_capped_by_modifier = yes + clothes_texture_index = 1 + icon = high_priest + building_icon = building_palace + + possible_pre_triggers = { + has_owner = yes + is_sapient = yes + } + + possible = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + + resources = { + category = planet_priests + produces = { + trigger = { + exists = owner + owner = { + has_valid_civic = civic_liberation_theology + } + } + unity = 8 + } + } + + planet_modifier = { + planet_stability_add = 5 + } + + triggered_planet_modifier = { + potential = { + always = yes + } + planet_amenities_add = 10 + mult = value:scripted_modifier_job_weight_mult|MODIFIER|pop_job_amenities_mult| + } + + triggered_planet_modifier = { + potential = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + planet_housing_add = 1 + planet_crime_add = -5 + } + } + + triggered_country_modifier = { + potential = { + owner = { + has_origin = origin_zarqlanism_idea + } + } + modifier = { + country_admin_cap_add = 5 + } + } + + weight = { + weight = 30000 + + # crisis purge + modifier = { + factor = 0.01 + exists = planet + exists = planet.controller + planet.controller = { + OR = { + is_country_type = swarm + is_country_type = ai_empire + } + } + } + } +} + #不知道是啥 geoengineer = { category = specialist diff --git "a/common/scripted_effects/\346\200\235\346\275\256\345\274\200\345\261\200\345\273\272\347\255\221_start_of_game_effects.txt" "b/common/scripted_effects/\346\200\235\346\275\256\345\274\200\345\261\200\345\273\272\347\255\221_start_of_game_effects.txt" index 3be9f2ed1..b546e5ce4 100644 --- "a/common/scripted_effects/\346\200\235\346\275\256\345\274\200\345\261\200\345\273\272\347\255\221_start_of_game_effects.txt" +++ "b/common/scripted_effects/\346\200\235\346\275\256\345\274\200\345\261\200\345\273\272\347\255\221_start_of_game_effects.txt" @@ -10,6 +10,7 @@ civic_anarchism_start_buildings = { has_valid_civic = civic_anarchism has_valid_civic = civic_democracy_and_clean_government } + NOT = { has_valid_civic = civic_OGAS } } } remove_building = building_bureaucratic_1 @@ -32,7 +33,7 @@ civic_OGAS_start_buildings = { } } remove_building = building_bureaucratic_1 - add_building = building_planetary_management_center + add_building = building_planet_network_node } } } diff --git a/events/ethic_rebuild_starter_tech.txt b/events/ethic_rebuild_starter_tech.txt index 929ee91b4..de09164b1 100644 --- a/events/ethic_rebuild_starter_tech.txt +++ b/events/ethic_rebuild_starter_tech.txt @@ -346,6 +346,7 @@ event = { has_valid_civic = civic_anarchism has_valid_civic = civic_democracy_and_clean_government } + NOT = { has_valid_civic = civic_OGAS } } civic_anarchism_start_buildings = yes } diff --git a/gfx/interface/icons/governments/civics/_robot.dds b/gfx/interface/icons/governments/civics/civic_superhuman_economy.dds similarity index 100% rename from gfx/interface/icons/governments/civics/_robot.dds rename to gfx/interface/icons/governments/civics/civic_superhuman_economy.dds diff --git a/localisation/replace/english/ethic_civics_l_english.yml b/localisation/replace/english/ethic_civics_l_english.yml index 11f1465eb..9b2dba3c9 100644 --- a/localisation/replace/english/ethic_civics_l_english.yml +++ b/localisation/replace/english/ethic_civics_l_english.yml @@ -265,6 +265,9 @@ civic_production_community:0 "Production Community" civic_production_community_desc:1 "The production of products in this society is undertaken by large and small production communities. These self-governing groups of workers, similar to general state enterprises, determine the economic lifeline of the society." civic_tooltip_production_community_effects:2 " - Each §HMining§!, §HFarming§!, §HGenerator§! and §HIndustry§! zone provides §G+1§! Housing\n - every §Y2§! §HMining§!, §HFarming§! and §HGenerator§! additional zoning §G+1§! corresponding position\n - Every §Y4§! §HIndustry§! additional zoning §G+2§! corresponding position" + civic_superhuman_economy:0 "Superhuman Economy" + civic_superhuman_economy_desc:1 "In this society, there are individuals who are beyond common sense, and the national economy largely depends on them to function." + civic_tooltip_superhuman_economy_effects:2 " - §YLeaders§! will produce some additional resources." civic_underworld_society:0 "Gangster Society" civic_underworld_society_desc:1 "The grassroots of this society is controlled by big and small gangs, and the government organizations on the surface secretly carry out transactions with these underworlds to stabilize the society." civic_tooltip_underworld_society_effects:3 "Cannot form §YCommercial Pacts§!\nCan build §YBranch Offices§! on the planet of any regular empire they have no war or active truce with\nAble to set up a §YBranch Offices§! on your own planet\nCrime on §YBranch Office§! Planets increases Branch Office Value\nCan build special Crime-increasing £building£ §Y$BRANCH_OFFICE_BUILDINGS$§!, these buildings will improve the stability of your planet\nEach §Y$job_criminal$§! increases §G1%§! the output of the local labor population, and additional output §Y1.5§! £trade_value£ $TRADE_VALUE$" diff --git a/localisation/replace/english/ethic_jobs_l_english.yml b/localisation/replace/english/ethic_jobs_l_english.yml index c79ef6914..e49361280 100644 --- a/localisation/replace/english/ethic_jobs_l_english.yml +++ b/localisation/replace/english/ethic_jobs_l_english.yml @@ -1,13 +1,48 @@ l_english: job_criminal_effect_desc:0 "The criminals certainly did not produce anything, but we can still count on them to pay some taxes." - job_fe_acolyte_metallurgists:0 "Sacred Furnace Attendant" - job_fe_acolyte_metallurgists_plural:0 "Sacred Furnace Attendants" - job_fe_acolyte_metallurgists_desc:1 "Zarqlan took Plow, Hammer and Hyperspanner from the hearth and put them into the hands of the poor, and the first saints were born." - job_fe_acolyte_metallurgists_effect_desc:0 "£job_media_worker£ $job_media_worker_plural$ converts £consumer_goods£ §Y$consumer_goods$§! into £unity£ §Y$unity$§! and £society£ §Y$society_research$§!" - mod_job_fe_acolyte_metallurgists_add:0 "$job_fe_acolyte_metallurgists$ Jobs" - mod_job_fe_acolyte_metallurgists_per_pop:0 "§G+1§! $job_fe_acolyte_metallurgists$ Job per $VALUE$ Pops" - mod_job_fe_acolyte_metallurgists_per_pop_short:0 "\n§G+1§! £mod_job_fe_acolyte_metallurgists_add£ per $VALUE$ £pop£ " + + job_re_acolyte_metallurgists:0 "Acolyte of the Furnac" + job_re_acolyte_metallurgists_plural:0 "Acolyte of the Furnac" + job_re_acolyte_metallurgists_desc:1 "Zarqlan took Plow, Hammer and Hyperspanner from the hearth and put them into the hands of the poor, and the first saints were born." + job_re_acolyte_metallurgists_effect_desc:0 "£job_media_worker£ $job_media_worker_plural$ converts £consumer_goods£ §Y$consumer_goods$§! into £unity£ §Y$unity$§! and £society£ §Y$society_research$§!" + mod_job_re_acolyte_metallurgists_add:0 "$job_fe_acolyte_metallurgists$ Jobs" + mod_job_re_acolyte_metallurgists_per_pop:0 "§G+1§! $job_fe_acolyte_metallurgists$ Job per $VALUE$ Pops" + mod_job_re_acolyte_metallurgists_per_pop_short:0 "\n§G+1§! £mod_job_fe_acolyte_metallurgists_add£ per $VALUE$ £pop£ " + + job_re_acolyte_farm:0 "Acolyte of the Plow" + job_re_acolyte_farm_plural:0 "Acolytes of the Plow" + job_re_acolyte_farm_desc:1 "Didn't Kazargiel just rely on this plow to cut off the vampire's monopoly and delay the food shortage disaster?" + job_re_acolyte_farm_effect_desc:0 "£job_re_acolyte_farm£ $job_re_acolyte_farm_plural$ produce £food£ §Y$food$§!" + mod_job_re_acolyte_farm_add:0 "$job_re_acolyte_farm$ Jobs" + + job_re_acolyte_mine:0 "Acolyte of the Hammer" + job_re_acolyte_mine_plural:0 "Acolytes of the Hammer" + job_re_acolyte_mine_desc:1 "Saint Mazakudal raised his holy flame warhammer, slashed the head of the richest man in two, and cut the path to the crystal." + job_re_acolyte_mine_effect_desc:0 "£job_re_acolyte_mine£ $job_re_acolyte_mine_plural$ produce £minerals£ §Y$minerals$§!" + mod_job_re_acolyte_mine_add:0 "$job_re_acolyte_mine$ Jobs" + + job_re_acolyte_generator:0 "Acolyte of the Hyperspanner" + job_re_acolyte_generator_plural:0 "Acolytes of the Hyperspanner" + job_re_acolyte_generator_desc:1 "And don't forget the hyperspanner, which Bazagg the Shining uses to bust the deception and reveal the truth about the darkness that is engulfing the world." + job_re_acolyte_generator_effect_desc:0 "£job_re_acolyte_generator£ $job_re_acolyte_generator_plural$ produce £energy£ §Y$energy$§!" + mod_job_re_acolyte_generator_add:0 "$job_re_acolyte_generator$ Jobs" + + job_re_acolyte_artisan:0 "Acolyte of the Workshop" + job_re_acolyte_artisan_plural:0 "Acolytes of the Workshop" + job_re_acolyte_artisan_desc:0 "And so Aznakha said to the acolytes, 'go to the workshops, and form with your own crafts the future you seek'." + job_re_acolyte_artisan_effect_desc:0 "£job_re_acolyte_artisan£ $job_re_acolyte_artisan_plural$ produce £consumer_goods£ §Y$consumer_goods$§!" + mod_job_re_acolyte_artisan_add:0 "$job_re_acolyte_artisan$ Jobs" + + job_re_augur:0 "Augur of the Shroud" + job_re_augur_plural:0 "Augurs of the Shroud" + job_re_augur_desc:1 "It speaks, but not in words. To spread what they want to say, you first have to get yourself into the hearts of the toiling masses." + mod_job_re_augur_add:0 "$job_fe_augur$ Jobs" + + job_re_sky_cardinal:0 "Sky Cardinal" + job_re_sky_cardinal_plural:0 "Sky Cardinals" + job_re_sky_cardinal_desc:1 "And it was there, in the sky, that the future was born. The light was blinding, but a few could see past it. They took it upon themselves to lead others forwards." + mod_job_re_sky_cardinal_add:0 "$job_fe_sky_cardinal$ Jobs" job_future_worker: "$pop_cat_worker$" job_future_worker_plural: "$pop_cat_worker_plural$" @@ -158,7 +193,7 @@ job_democratic_politician:0 "Democratic politician" job_democratic_politician_plural:0 "Democratic politician" job_democratic_politician_desc:0 "The bureaucratic demands of an empire is a daunting task that requires dedicated and highly trained individuals." - job_democratic_politician_effect_desc:0 "£job_democratic_politician£ $job_democratic_politician_plural$ turn £consumer_goods£ §Y$consumer_goods$§! into £mod_country_admin_cap_add£ §Y$MOD_COUNTRY_ADMIN_CAP_ADD$§!, £society£ Society Research and small amount of £physics£ Physics Research" + job_democratic_politician_effect_desc:0 "£job_democratic_politician£ $job_democratic_politician_plural$ turn £consumer_goods£ §Y$consumer_goods$§! into £mod_country_admin_cap_add£ §Y$MOD_COUNTRY_ADMIN_CAP_ADD$§!, £society£ §YSociety Research§! and small amount of £physics£ §YPhysics Research§!" mod_job_democratic_politician_add:0 "$job_democratic_politician$ Jobs" mod_job_democratic_politician_per_pop:0 "§G+1§! $job_democratic_politician$ Job per $VALUE$ Pops" mod_job_democratic_politician_per_pop_short:0 "\n§G+1§! £mod_job_democratic_politician_add£ per $VALUE$ £pop£" 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 39c830eb4..b82433ef2 100644 --- a/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_civics_l_simp_chinese.yml @@ -355,6 +355,10 @@ civic_production_community_desc:1 "这个社会的产品生产由大大小小的生产社群所承担,这些类似于一般国家企业的工人自治群体决定着社会的经济命脉。" civic_tooltip_production_community_effects:2 " - 每个§H矿业§!,§H农业§!,§H发电§!和§H工业§!区划提供§G+1§!住房\n - 每§Y2§!个§H矿业§!,§H农业§!和§H发电§!区划额外§G+1§!对应岗位\n - 每§Y4§!个§H工业§!区划额外§G+2§!对应岗位" + civic_superhuman_economy:0 "超人经济" + civic_superhuman_economy_desc:1 "这个社会存在一些超越常识的个体,国民经济很大程度上依赖他们而运转。" + civic_tooltip_superhuman_economy_effects:2 " - §Y领袖§!将额外生产一些资源" + civic_underworld_society:0 "黑社会" civic_underworld_society_desc:1 "这个社会的基层由大大小小的黑帮所掌控,表面上的政府组织则在暗地里与这些黑社会开展交易以稳定社会。" civic_tooltip_underworld_society_effects:3 "不能签署§Y商业协议§!\n可以在任何未与自己处于战争中或停战中的帝国的星球上建立§Y分部§!\n能够在自己的星球上设立§Y分部§!\n§Y分部§!行星上的犯罪度会提高分部的价值\n可以建设独特的增加犯罪度的 £building£ §Y$BRANCH_OFFICE_BUILDINGS$§!,这些建筑会提高自己星球的稳定度\n每个§Y$job_criminal$§!提高§G2%§!当地劳工人口产出,并且额外增加§Y1§!稳定度" @@ -441,7 +445,7 @@ civic_OGAS:0 "自动化乌托邦" civic_OGAS_desc:0 "这个社会主义国家用高度发达的计算机管理系统取代了冗杂的官僚机构,从根本上杜绝了官僚主义的滋生。" - civic_tooltip_OGAS_effects:2 " - 将 £building£ §Y$building_bureaucratic_1$§!替换为§Y$building_planet_network_node$§!,替换 £job_bureaucrat£ §Y$job_bureaucrat_plural$§!岗位为 £job_democratic_politician£ §Y$job_democratic_politician_plural$§!岗位,并随着星球首都的升级不断提高$mod_planet_jobs_unity_produces_mult$\n - $job_democratic_politician_effect_desc$\n\n - $job_democratic_politician_effect_desc$\n" + civic_tooltip_OGAS_effects:2 " - 将 £building£ §Y$building_bureaucratic_1$§!替换为§Y$building_planet_network_node$§!,替换 £job_bureaucrat£ §Y$job_bureaucrat_plural$§!岗位为 £job_democratic_politician£ §Y$job_democratic_politician_plural$§!岗位,并随着星球首都的升级不断提高$mod_planet_jobs_unity_produces_mult$\n - $job_democratic_politician_effect_desc$\n" civic_corporate_cybercap:0 "天罗地网" civic_corporate_cybercap_desc:0 "这一企业最早依赖信息技术起家,在大数据的收集、分析、处理方面无出其右者。通过控制输入-观察输出-分析演算-修正输入来影响个人的思维,掌控信息者可以监视、分析和操纵一切。" 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 e04397f22..f697174e0 100644 --- a/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml +++ b/localisation/replace/simp_chinese/ethic_jobs_l_simp_chinese.yml @@ -4,13 +4,46 @@ # 岗位 ############### - job_fe_acolyte_metallurgists:0 "圣炉侍者" - job_fe_acolyte_metallurgists_plural:0 "圣炉侍者" - job_fe_acolyte_metallurgists_desc:1 "扎克兰从圣炉中取出了圣犁、焰锤和圣钳,将它们交到穷苦的人手中,于是最初的圣徒就此诞生。" - job_fe_acolyte_metallurgists_effect_desc:0 "£job_media_worker£ $job_media_worker_plural$将£consumer_goods£ §Y$consumer_goods$§!转化为£unity£ §Y$unity$§!和£society£ §Y$society_research$§!" - mod_job_fe_acolyte_metallurgists_add:0 "$job_fe_acolyte_metallurgists$岗位" - mod_job_fe_acolyte_metallurgists_per_pop:0 "每$VALUE$个人口提供§G+1§!个$job_fe_acolyte_metallurgists$岗位" - mod_job_fe_acolyte_metallurgists_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§! £mod_job_fe_acolyte_metallurgists_add£ " + job_re_acolyte_metallurgists:0 "圣炉侍者" + job_re_acolyte_metallurgists_plural:0 "圣炉侍者" + job_re_acolyte_metallurgists_desc:1 "扎克兰从圣炉中取出了圣犁、焰锤和圣钳,将它们交到穷苦的人手中,于是最初的圣徒就此诞生。" + mod_job_re_acolyte_metallurgists_add:0 "$job_re_acolyte_metallurgists$岗位" + mod_job_re_acolyte_metallurgists_per_pop:0 "每$VALUE$个人口提供§G+1§!个$job_re_acolyte_metallurgists$岗位" + mod_job_re_acolyte_metallurgists_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§! £mod_job_re_acolyte_metallurgists_add£ " + + job_re_acolyte_farm:0 "犁耕侍者" + job_re_acolyte_farm_plural:0 "犁耕侍者" + job_re_acolyte_farm_desc:1 "当年卡萨吉尔不就是仅仅依靠此犁来斩断吸血鬼的垄断、并延缓粮荒灾难的吗?" + job_re_acolyte_farm_effect_desc:0 "£job_re_acolyte_farm£ $job_re_acolyte_farm_plural$生产 £food£ §Y$food$§!" + mod_job_re_acolyte_farm_add:0 "$job_re_acolyte_farm$岗位" + + job_re_acolyte_mine:0 "焰锤侍者" + job_re_acolyte_mine_plural:0 "焰锤侍者" + job_re_acolyte_mine_desc:1 "圣·马萨库尔举起圣焰战锤,狠狠地将那第一富孽的头颅一劈为二,劈出了通往水晶的道路。" + job_re_acolyte_mine_effect_desc:0 "£job_re_acolyte_mine£ $job_re_acolyte_mine_plural$生产 £minerals£ §Y$minerals$§!" + mod_job_re_acolyte_mine_add:0 "$job_re_acolyte_mine$岗位" + + job_re_acolyte_generator:0 "圣钳侍者" + job_re_acolyte_generator_plural:0 "圣钳侍者" + job_re_acolyte_generator_desc:1 "同时也不要忘记圣钳,圣光巴扎尔就是使用它来破除骗局,将黑暗正笼罩着世界的真相展露出来。" + job_re_acolyte_generator_effect_desc:0 "£job_re_acolyte_generator£ $job_re_acolyte_generator_plural$生产 £energy£ §Y$energy$§!" + mod_job_re_acolyte_generator_add:0 "$job_re_acolyte_generator$岗位" + + job_re_acolyte_artisan:0 "圣坊侍者" + job_re_acolyte_artisan_plural:0 "圣坊侍者" + job_re_acolyte_artisan_desc:0 "于是阿兹纳卡对侍者们说道,“到圣坊里去吧,用你们的技艺创造你们寻求的未来”。" + job_re_acolyte_artisan_effect_desc:0 "£job_re_acolyte_artisan£ $job_re_acolyte_artisan_plural$生产 £consumer_goods£ §Y$consumer_goods$§!" + mod_job_re_acolyte_artisan_add:0 "$job_re_acolyte_artisan$岗位" + + job_re_augur:0 "虚境灵使" + job_re_augur_plural:0 "虚境灵使" + job_re_augur_desc:1 "他们在说话,却不总能发出声音。要想播撒他们所想表达的意思,首先你得让自己走入劳苦大众的内心。" + mod_job_re_augur_add:0 "$job_re_augur$岗位" + + job_re_sky_cardinal:0 "天空主教" + job_re_sky_cardinal_plural:0 "天空主教" + job_re_sky_cardinal_desc:1 "那一刻,于天空中,未来诞生了。那道光芒虽炫目无比,但少数人仍可以直视光芒,看透其后之景。他们将指引世人的职责引为己任。" + mod_job_re_sky_cardinal_add:0 "$job_re_sky_cardinal$岗位" job_future_worker: "$pop_cat_worker$" job_future_worker_plural: "$pop_cat_worker_plural$" @@ -165,7 +198,7 @@ job_democratic_politician:0 "节点维护员" job_democratic_politician_plural:0 "节点维护员" job_democratic_politician_desc:0 "这些维护员负责维护星球上的网络节点,以保障社会赖以运作的自动化行政网络的正常运作。" - job_democratic_politician_effect_desc:0 "£job_democratic_politician£ $job_democratic_politician_plural$将 £consumer_goods£ §Y$consumer_goods$§!转化为£mod_country_admin_cap_add£ §Y$MOD_COUNTRY_ADMIN_CAP_ADD$§!、£society£ 社会学研究和少量的£physics£ 物理学研究" + job_democratic_politician_effect_desc:0 "£job_democratic_politician£ $job_democratic_politician_plural$将 £consumer_goods£ §Y$consumer_goods$§!转化为£mod_country_admin_cap_add£ §Y$MOD_COUNTRY_ADMIN_CAP_ADD$§!、£society£ §Y社会学研究§!和少量的£physics£ §Y物理学研究§!" mod_job_democratic_politician_add:0 "$job_democratic_politician$岗位" mod_job_democratic_politician_per_pop:0 "每$VALUE$人口§G+1§! $job_democratic_politician$" mod_job_democratic_politician_per_pop_short:0 "\n每$VALUE$ £pop£ §G+1§! £mod_job_democratic_politician_add£" diff --git a/prescripted_countries/00_top_countries.txt b/prescripted_countries/00_top_countries.txt index 0ce9287eb..ae6c3472d 100644 --- a/prescripted_countries/00_top_countries.txt +++ b/prescripted_countries/00_top_countries.txt @@ -180,7 +180,7 @@ humans4 = { ethic="ethic_socialism" authority = "auth_direct_democratic" flags = { - "human_4" + "ECI" "custom_start_screen" } government = "gov_absolute_democracy"