Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error cleanup #280

Merged
merged 36 commits into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
727df72
chore: forgot a thing
May 6, 2023
d010d8b
chore: removed monroe doctrine
JackEPepper May 6, 2023
cc6afa1
Merge branch 'dev' into Error-cleanup
May 6, 2023
7030ad0
fix: added two vanilla files that referenced nonexisting igs
May 7, 2023
95a2867
fix: Cleaned up some typos and removed unused file that caused error …
May 7, 2023
3ab3fd8
fix: added loc for missing national/state modifiers
May 7, 2023
abcd5e2
fix: loc for UN modifiers
May 7, 2023
0539bc8
fix: minor cleanup in modifiers loc file and added subsistence trough…
May 7, 2023
2f33c7c
chore: modifier loc cleanup
May 7, 2023
1eb4413
chore: missing loc for rubber building group
May 7, 2023
7c4d238
chore: building loc
May 7, 2023
203593d
chore: building group loc
May 7, 2023
45983ef
chore: minor loc changes
May 8, 2023
a6259a6
chore: Why did PDX hardcoded those?
May 8, 2023
2194923
fix: typo in event
May 8, 2023
0a7aa12
fix: readd conscripts
May 8, 2023
8902519
chore: make it stfu
May 8, 2023
236e0b0
fix: Military buildings must employ exactly max_manpower of people pe…
May 8, 2023
f869d91
feat: vanilla tank pics for combat stuff - fits well as default for g…
May 8, 2023
5ca0a32
chore: whitespace
May 8, 2023
93f8960
chore: added new PM to naval bases meant to pad employement in it to …
May 8, 2023
db28594
chore: forgor
May 8, 2023
2173ce4
fix: battalion/flotilla -> division/squadron
May 8, 2023
2161424
feat: less pops employed in sustainable urban center, added preindust…
May 8, 2023
7c6dad6
fix: that didn't trigger error before
May 8, 2023
46e9cab
fix: deleted vanilla diploplays - were causing tons of errors
May 8, 2023
63ae251
fix: apparently AI strategy file had wrongly defined references to st…
May 8, 2023
2bc7b3b
fix: never used variable
May 8, 2023
e1c0238
fix: rebalanced trade routes according to debug log
May 8, 2023
d2a3e5b
fix: Those should be written in same way as in vanilla
May 9, 2023
6ce2fd7
chore: what
May 9, 2023
08d27ed
fix: oinly rare earths, uranium and fossil fuels are actually discove…
May 9, 2023
a992afb
fix: bunch of diplomacy locs
May 9, 2023
9fd5503
fix: deleted dead variable
May 9, 2023
122ccf2
chore: remove unused variable
JackEPepper May 9, 2023
4220402
Merge branch 'Error-cleanup' of https://github.com/Cold-War-Project/C…
JackEPepper May 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions common/ai_strategies/00_default_strategy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -512,31 +512,35 @@ ai_strategy_default = {
sr:region_north_america = {
if = {
limit = {
has_variable = monroe_doctrine
country_is_in_north_america = yes
country_rank >= rank_value:great_power
}
add = 1000
}
}
sr:region_golden_circle = {
if = {
limit = {
has_variable = monroe_doctrine
country_is_in_north_america = yes
country_rank >= rank_value:great_power
}
add = 1000
}
}
sr:region_amazon = {
if = {
limit = {
has_variable = monroe_doctrine
country_is_in_north_america = yes
country_rank >= rank_value:great_power
}
add = 1000
}
}
sr:region_andes = {
if = {
limit = {
has_variable = monroe_doctrine
country_is_in_north_america = yes
country_rank >= rank_value:great_power
}
add = 1000
}
Expand Down
11 changes: 0 additions & 11 deletions common/ai_strategies/02_diplomatic_strategies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,6 @@ ai_strategy_colonial_expansion = {
make_dominion = 1.5
take_treaty_port = 1.5
}
possible = {
navy_size >= 25
is_country_type = recognized
OR = {
has_law = law_type:law_colonial_resettlement
has_law = law_type:law_colonial_exploitation
}
NOT = {
country_rank = rank_value:superpower
}
}
weight = {
value = 10
if = {
Expand Down
3 changes: 2 additions & 1 deletion common/buildings/05_military.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ building_conscription_center = {
levels_per_mesh = 0
residence_points_per_level = 0
city_type = none
recruits_combat_unit = combat_unit_regular
recruits_combat_unit = combat_unit_conscript
texture = "gfx/interface/icons/building_icons/building_conscription_center.dds"
production_method_groups = {
pmg_organization_conscription
Expand All @@ -57,6 +57,7 @@ building_naval_base = {
pre_war_naval_tech
}
production_method_groups = {
pmg_ship_class
pmg_screening_ships
pmg_cruisers
#pmg_aircraft_carrier
Expand Down
Loading