diff --git a/common/defines/cwp_defines.txt b/common/defines/cwp_defines.txt index dde35ec63..d9298d27a 100644 --- a/common/defines/cwp_defines.txt +++ b/common/defines/cwp_defines.txt @@ -60,8 +60,8 @@ NAI = { # Trade route modifier #TRADE_ROUTE_MIN_MARKET_SHARE = 0.25 # If the AI is junior in a customs union and has less than this market share in a market, don't make any trade routes TRADE_ROUTE_MIN_SCORE_TO_CREATE_BASE = 100 # If a potential trade route is scored less than this, don't create it - TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING = 0 # Base scale for TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_FACTOR - TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING_MAX = 0 # TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING can't be higher than this + TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING = 0.001 # Base scale for TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_FACTOR + TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING_MAX = 0.0011 # TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING can't be higher than this TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_FACTOR = 0 # For each TRADE_ROUTE_MIN_SCORE_TO_CREATE_GDP_SCALING market GDP, add this to min score required to create trade route #TRADE_ROUTE_ACCEPTABLE_SPENDING = 0.002 # AI will not spend more BUR than this on trade routes (scaled by weekly GDP) TRADE_ROUTE_ACCEPTABLE_SPENDING_MINIMUM = 1000 # If TRADE_ROUTE_ACCEPTABLE_SPENDING is less than this, this is used instead (so even small countries can do some trading) diff --git a/common/laws/cwp_09_national_defense.txt b/common/laws/cwp_09_national_defense.txt index a71a83930..320a31c2e 100644 --- a/common/laws/cwp_09_national_defense.txt +++ b/common/laws/cwp_09_national_defense.txt @@ -179,7 +179,7 @@ law_professional_military = { if = { limit = { is_pop_type = officers - onwer = { + owner = { NOT = { has_law = law_type:law_volunteer_only_military } @@ -194,7 +194,7 @@ law_professional_military = { if = { limit = { is_pop_type = servicemembers - onwer = { + owner = { NOT = { has_law = law_type:law_volunteer_only_military } diff --git a/common/on_actions/00_code_on_actions.txt b/common/on_actions/00_code_on_actions.txt index 5efe7e22e..1bd8d6b56 100644 --- a/common/on_actions/00_code_on_actions.txt +++ b/common/on_actions/00_code_on_actions.txt @@ -395,9 +395,6 @@ on_battle_won = { # scope:defender = defending commander # scope:state = location state on_battle_lost = { - events = { - private_military_companies.3 - } } # Root = Building @@ -1223,8 +1220,6 @@ on_law_checkpoint_stall = { # will work as expected, even though the enactment is _just_ about to end on_law_enactment_pass = { first_valid = { - private_military_companies.1 - private_military_companies.2 } effect = { onaction_racial_tension_modifier = yes