Skip to content

Commit

Permalink
Merge pull request #2 from cocolinfff/master
Browse files Browse the repository at this point in the history
U303M
  • Loading branch information
Ryifer authored Mar 30, 2023
2 parents fdc1459 + bf47533 commit cc03a04
Show file tree
Hide file tree
Showing 57 changed files with 1,997 additions and 152 deletions.
4 changes: 3 additions & 1 deletion common/districts/00_urban_districts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ district_city = {
planet_modifier = {
planet_housing_add = 4
planet_max_buildings_add = 1
planet_carry_cap_add = 5
}
triggered_planet_modifier = {
potential = {
Expand Down Expand Up @@ -544,6 +545,7 @@ district_hive = {
planet_housing_add = 6
job_maintenance_drone_add = 3
planet_max_buildings_add = 1
planet_carry_cap_add = 5
}
triggered_planet_modifier = {
potential = {
Expand Down Expand Up @@ -652,10 +654,10 @@ district_nexus = {
}

planet_modifier = {
country_resource_max_add = 1000
planet_housing_add = 5
job_maintenance_drone_add = 4
planet_max_buildings_add = 1
planet_carry_cap_add = 5
}
triggered_planet_modifier = {
potential = {
Expand Down
1 change: 1 addition & 0 deletions common/districts/01_arcology_districts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ district_arcology_housing = {
planet_modifier = {
planet_housing_add = 15
planet_max_buildings_add = 1
planet_carry_cap_add = 15
}
triggered_planet_modifier = {
potential = {
Expand Down
2 changes: 1 addition & 1 deletion common/districts/03_habitat_districts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ district_hab_housing = {
}

planet_modifier = {
pop_lifestyle_trade_mult = 0.03
planet_housing_add = 8
planet_max_buildings_add = 0.5
planet_carry_cap_add = 5
}

triggered_planet_modifier = {
Expand Down
3 changes: 3 additions & 0 deletions common/districts/04_ringworld_districts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ district_rw_city = {

planet_modifier = {
planet_housing_add = 25
planet_carry_cap_add = 25
}
triggered_planet_modifier = {
potential = {
Expand Down Expand Up @@ -237,6 +238,7 @@ district_rw_hive = {
planet_housing_add = 30
job_maintenance_drone_add = 15
job_synapse_drone_add = 2
planet_carry_cap_add = 25
}
triggered_planet_modifier = {
potential = {
Expand Down Expand Up @@ -320,6 +322,7 @@ district_rw_nexus = {
planet_housing_add = 25
job_maintenance_drone_add = 10
job_technician_drone_add = 2
planet_carry_cap_add = 25
}
triggered_planet_modifier = {
potential = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,21 @@ can_build_branch_office_on_planet = {
}
}

###_|建立土著观测站|
custom_tooltip = {
fail_text = BRANCH_OFFICE_NO_OBSERVATION_OUTPOST
if = {
limit = {
root = { is_criminal_syndicate = yes }
owner = { is_primitive = yes }
}
has_observation_outpost = yes
observation_outpost_owner = {
is_same_value = root
}
}
}

###_core商业协定 +hiveDLC/wsg/azl/azlr/AAR/ETCPM/莉莉/久远
custom_tooltip = {
fail_text = BRANCH_OFFICE_NOT_COMMERCIAL_PACT
Expand Down
2 changes: 1 addition & 1 deletion common/governments/civics/ethic_civics_red.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ civic_anarchism = {
modifier = {
empire_size_penalty_mult = -2
local_trade_protection_add = -10
pop_factions_unity_produces_add = -0.5
pop_factions_unity_produces_add = -0.25
country_edict_fund_mult = -1
country_naval_coverage_mult = -0.9
pop_ethic_egalitarian_attraction_mult = 0.25
Expand Down
24 changes: 24 additions & 0 deletions common/governments/civics/ethic_origins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,30 @@ origin_true_yuht = {
advanced_start = yes
}

#回到未来
origin_thirteen_monkeys = {
is_origin = yes
icon = "gfx/interface/icons/origins/origin_thirteen_monkeys.dds"
picture = GFX_origin_thirteen_monkeys
potential = {
always = yes
}
possible = {
civics = {
NOR = {
value = civic_fanatic_purifiers
value = civic_machine_terminator
value = civic_machine_assimilator
}
}
}
random_weight = {
base = 0
}
description = "origin_tooltip_thirteen_monkeys_effects"
advanced_start = yes
}

# 十月革命
#origin_revolution = {
# is_origin = yes
Expand Down
24 changes: 24 additions & 0 deletions common/on_actions/ethic_rebuild_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ on_country_destroyed = {
}
}

#当统治者变更
# This = Country
on_ruler_set = {
events = {
new_election.1
}
}

#每月检测,范围国家
on_monthly_pulse_country = {
events = {
Expand Down Expand Up @@ -35,6 +43,13 @@ on_five_year_pulse_country = {
}
}

#每五年检测,范围星球
on_colony_5_year_pulse = {
events = {
ethic_build_city.1
}
}

#技术进步后
on_tech_increased = {
events = {
Expand Down Expand Up @@ -100,6 +115,14 @@ on_yearly_pulse = {
}
}

#每年一次的触发器,范围星球
on_colony_yearly_pulse = {
events = {
ethic_thirteen_monkeys.1
ethic_build_city.2
}
}

#每两年一次的触发器
on_bi_yearly_pulse_country = {
events = {
Expand Down Expand Up @@ -171,6 +194,7 @@ on_game_start_country = {
on_single_player_save_game_load = {
events = {
future_society.30
ethic_thirteen_monkeys.0
}
}

Expand Down
11 changes: 7 additions & 4 deletions common/policies/ethic_rebuild_policies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2279,9 +2279,7 @@ economic_stance = {
has_valid_civic = civic_ev_planet_and_fleet
has_ascension_perk = ev_land_planets
}
NOT = {
has_ethic = ethic_gestalt_consciousness
}
is_gestalt = no
}
# 自由市场(分产主义特供)
option = {
Expand Down Expand Up @@ -2637,7 +2635,12 @@ economic_stance = {
# 经济计划
ten_year_plan_plus = {
potential = {
has_policy_flag = economic_stance_planned
OR = {
has_policy_flag = economic_stance_planned
has_civic = civic_network_of_the_mind
has_civic = civic_network_of_the_mind_machine
has_civic = civic_network_of_the_mind_true_hive
}
}
option = {
name = "comprehensive_development_plan_plus"
Expand Down
2 changes: 1 addition & 1 deletion common/pop_faction_types/00_bankers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bankers = {
resources = {
category = pop_factions
produces = {
unity = 0.5
unity = 0.25
}
}
is_potential = {
Expand Down
4 changes: 2 additions & 2 deletions common/pop_faction_types/00_civil_official.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ civil_official = {
resources = {
category = pop_factions
produces = {
unity = 0.5
unity = 0.25
}
}
is_potential = {
Expand Down Expand Up @@ -479,7 +479,7 @@ civil_official = {
embrace_faction = {
title = "EMBRACE_FACTION"
description = "EMBRACE_FACTION_DESC"
cost = { influence = 200 }
cost = { unity = 5000 }

potential = {
exists = owner
Expand Down
4 changes: 2 additions & 2 deletions common/pop_faction_types/00_competitors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ competitors = {
resources = {
category = pop_factions
produces = {
unity = 0.5
unity = 0.25
}
}
is_potential = {
Expand Down Expand Up @@ -515,7 +515,7 @@ competitors = {
embrace_faction = {
title = "EMBRACE_FACTION"
description = "EMBRACE_FACTION_DESC"
cost = { influence = 200 }
cost = { unity = 5000 }

potential = {
exists = owner
Expand Down
2 changes: 1 addition & 1 deletion common/pop_faction_types/00_compradors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ compradors = {
resources = {
category = pop_factions
produces = {
unity = 1.00
unity = 0.25
}
}
is_potential = {
Expand Down
44 changes: 33 additions & 11 deletions common/pop_faction_types/00_entrepreneurs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,12 @@ entrepreneurs = {
potential = {
exists = owner
owner = {
OR = {
has_authority = auth_democratic
has_authority = auth_oligarchic
}
has_authority = auth_democratic
}
}
trigger = {
owner = {
has_authority = auth_oligarchic
has_authority = auth_democratic
}
}
}
Expand All @@ -164,10 +161,7 @@ entrepreneurs = {
potential = {
exists = owner
owner = {
NOR = {
has_authority = auth_democratic
has_authority = auth_oligarchic
}
has_authority = auth_direct_democratic
}
}
trigger = {
Expand All @@ -176,6 +170,31 @@ entrepreneurs = {
}
}
}
demand = { # 投票权
title = "DEMAND_GOVERNMENT_ELECTION"
unfulfilled_title = "DEMAND_GOVERNMENT_ELECTION"
desc = "DEMAND_GOVERNMENT_ELECTION_DESC"
#fulfilled_effect = 0 # Yellow
unfulfilled_effect = -15
potential = {
exists = owner
owner = {
OR = {
has_authority = auth_dictatorial
has_authority = auth_imperial
}
}
}
trigger = {
exists = owner
owner = {
OR = {
has_authority = auth_dictatorial
has_authority = auth_imperial
}
}
}
}

demand = { # 联邦化
title = "DEMAND_CENTRALIZE_FEDERAL"
Expand Down Expand Up @@ -481,7 +500,10 @@ entrepreneurs = {
}
}
trigger = {
has_policy_flag = freedom_of_speech
exists = owner
owner = {
has_policy_flag = freedom_of_speech
}
}
}
demand = {
Expand Down Expand Up @@ -578,7 +600,7 @@ entrepreneurs = {
embrace_faction = {
title = "EMBRACE_FACTION"
description = "EMBRACE_FACTION_DESC"
cost = { influence = 200 }
cost = { unity = 5000 }

potential = {
exists = owner
Expand Down
4 changes: 2 additions & 2 deletions common/pop_faction_types/00_imperialist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ imperialist = {
resources = {
category = pop_factions
produces = {
unity = 0.5
unity = 0.25
}
}
is_potential = {
Expand Down Expand Up @@ -773,7 +773,7 @@ imperialist = {
embrace_faction = {
title = "EMBRACE_FACTION"
description = "EMBRACE_FACTION_DESC"
cost = { influence = 200 }
cost = { unity = 5000 }

potential = {
exists = owner
Expand Down
4 changes: 2 additions & 2 deletions common/pop_faction_types/00_industrialist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ industrialist = {
resources = {
category = pop_factions
produces = {
unity = 0.5
unity = 0.25
}
}
is_potential = {
Expand Down Expand Up @@ -708,7 +708,7 @@ industrialist = {
embrace_faction = {
title = "EMBRACE_FACTION"
description = "EMBRACE_FACTION_DESC"
cost = { influence = 200 }
cost = { unity = 5000 }

potential = {
exists = owner
Expand Down
Loading

0 comments on commit cc03a04

Please sign in to comment.