Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cocolinfff/Ethics-Civics-…
Browse files Browse the repository at this point in the history 
…Infinity-new
  • Loading branch information
@cocolinfff
cocolinfff committed Jan 30, 2023
2 parents fa45b5c + a281b75 commit 0fb07c2
Show file tree
Hide file tree
Showing 13 changed files with 281 additions and 34 deletions.
68 changes: 56 additions & 12 deletions common/buildings/07_amenity_buildings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ building_luxury_residence = {
}
has_ethic = ethic_fanatic_authoritarian
}
NOT = { has_civic = civic_sparta_spirit }
}
}
allow = {
Expand All @@ -46,6 +47,9 @@ building_luxury_residence = {
has_ethic = ethic_fanatic_authoritarian
}
}
owner = {
has_civic = civic_sparta_spirit
}
has_modifier = slave_colony
}
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
}
}
Expand All @@ -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 = {
Expand Down Expand Up @@ -254,6 +272,7 @@ building_communal_housing = {
}
has_ethic = ethic_fanatic_authoritarian
}
NOT = { has_civic = civic_sparta_spirit }
}
}
}
Expand Down Expand Up @@ -329,6 +348,7 @@ building_communal_housing_large = {
}
has_ethic = ethic_fanatic_authoritarian
}
NOT = { has_civic = civic_sparta_spirit }
}
}
}
Expand Down Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
97 changes: 97 additions & 0 deletions common/buildings/08_unity_buildings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
}
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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
}
Expand All @@ -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"
}
Expand Down
7 changes: 1 addition & 6 deletions common/colony_types/ZZZ_更多思潮星球类型修改.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
}
Expand Down
8 changes: 7 additions & 1 deletion common/game_rules/伞兼容兼容_更多思潮游戏规则修改.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 }
}
}
}

Expand Down
Loading

0 comments on commit 0fb07c2

Please sign in to comment.