Skip to content

Commit

Permalink
bug修复
Browse files Browse the repository at this point in the history
  • Loading branch information
MaretJavia committed Mar 16, 2024
1 parent 876262e commit 5f6095f
Showing 2 changed files with 34 additions and 22 deletions.
46 changes: 25 additions & 21 deletions common/inline_scripts/jobs/ethic_capital_add_jobs.txt
Original file line number Diff line number Diff line change
@@ -9,12 +9,9 @@ triggered_planet_modifier = {
NOT = { has_origin = origin_zarqlanism_idea }
is_regular_empire = yes
}
NOT = {
has_planet_flag = toxic_knights_habitat
exists = owner
owner = {
has_origin = origin_toxic_knights
}
exists = planet
planet = {
NOT = { has_planet_flag = toxic_knights_habitat }
}
}
modifier = {
@@ -28,12 +25,9 @@ triggered_planet_modifier = {
is_eci_megacorp = yes
NOT = { has_origin = origin_zarqlanism_idea }
}
NOT = {
has_planet_flag = toxic_knights_habitat
exists = owner
owner = {
has_origin = origin_toxic_knights
}
exists = planet
planet = {
NOT = { has_planet_flag = toxic_knights_habitat }
}
}
modifier = {
@@ -53,7 +47,8 @@ triggered_planet_modifier = {
}
triggered_planet_modifier = {
potential = {
has_planet_flag = toxic_knights_habitat
exists = planet
planet = { has_planet_flag = toxic_knights_habitat }
exists = owner
owner = {
has_origin = origin_toxic_knights
@@ -555,16 +550,15 @@ triggered_desc = {
NOT = { has_origin = origin_zarqlanism_idea }
is_regular_empire = yes
NOT = {
has_theme_civics = yes
has_policy_gov = yes
AND = {
has_theme_civics = yes
has_policy_gov = yes
}
}
}
NOT = {
has_planet_flag = toxic_knights_habitat
exists = owner
owner = {
has_origin = origin_toxic_knights
}
exists = planet
planet = {
NOT = { has_planet_flag = toxic_knights_habitat }
}
}
text = job_politician_effect_desc
@@ -575,6 +569,16 @@ triggered_desc = {
owner = {
is_eci_megacorp = yes
NOT = { has_origin = origin_zarqlanism_idea }
NOT = {
AND = {
has_theme_civics = yes
has_policy_gov = yes
}
}
}
exists = planet
planet = {
NOT = { has_planet_flag = toxic_knights_habitat }
}
}
text = job_executive_effect_desc
10 changes: 9 additions & 1 deletion common/policies/更多思潮政策重构.txt
Original file line number Diff line number Diff line change
@@ -5584,7 +5584,6 @@ gov = {
is_not_rulers_society = no
}
valid = {
is_eci_megacorp = no
OR = {
has_ethic = ethic_fanatic_capitalism
has_ethic = ethic_capitalism
@@ -5622,6 +5621,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5661,6 +5661,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5700,6 +5701,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5731,6 +5733,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5762,6 +5765,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5793,6 +5797,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5824,6 +5829,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5865,6 +5871,7 @@ gov = {
}
potential = {
is_not_rulers_society = no
is_eci_megacorp = no
}
valid = {
is_eci_megacorp = no
@@ -5897,6 +5904,7 @@ gov = {
potential = {
OR = {
is_not_rulers_society = no
is_eci_megacorp = no
has_origin = origin_toxic_knights
}
}

0 comments on commit 5f6095f

Please sign in to comment.