Skip to content

Commit

Permalink
Merge pull request #382 from Cold-War-Project/error-cleanup
Browse files Browse the repository at this point in the history
Error cleanup
  • Loading branch information
DZappala authored Jun 30, 2023
2 parents 22047a0 + 79ebb6a commit 97fb31a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
4 changes: 2 additions & 2 deletions common/defines/cwp_defines.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions common/laws/cwp_09_national_defense.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ law_professional_military = {
if = {
limit = {
is_pop_type = officers
onwer = {
owner = {
NOT = {
has_law = law_type:law_volunteer_only_military
}
Expand All @@ -194,7 +194,7 @@ law_professional_military = {
if = {
limit = {
is_pop_type = servicemembers
onwer = {
owner = {
NOT = {
has_law = law_type:law_volunteer_only_military
}
Expand Down
5 changes: 0 additions & 5 deletions common/on_actions/00_code_on_actions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 97fb31a

Please sign in to comment.