Skip to content

Commit fbb76bd

Browse files
Matti-96Matti-96
authored
Merge pull request #733 from Cold-War-Project/matti-error-fixing-attempt-2
Adding current error fixes & Culture changes to dev branch
2 parents 3cec438 + 4b20ff3 commit fbb76bd

File tree

517 files changed

+63386
-25575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

517 files changed

+63386
-25575
lines changed

‎.metadata/metadata.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Cold War Project",
33
"id": "",
44
"version": "0.2.9",
5-
"supported_game_version": "1.9.*",
5+
"supported_game_version": "1.11.*",
66
"short_description": "",
77
"tags": [],
88
"relationships": [],
@@ -16,12 +16,15 @@
1616
"common/combat_unit_groups",
1717
"common/combat_unit_types",
1818
"common/commander_orders",
19+
"common/company_charter_types",
1920
"common/company_types",
2021
"common/country_definitions",
2122
"common/cultures",
2223
"common/customizable_localization",
2324
"common/decisions",
2425
"common/decrees",
26+
"common/discrimination_trait_groups",
27+
"common/discrimination_traits",
2528
"common/diplomatic_plays",
2629
"common/dynamic_country_map_colors",
2730
"common/dynamic_country_names",
@@ -56,18 +59,23 @@
5659
"common/laws",
5760
"common/mobilization_option_groups",
5861
"common/mobilization_options",
62+
"common/modifier_type_definitions",
5963
"common/on_actions",
6064
"common/objective_subgoals",
65+
"common/parties",
6166
"common/pop_needs",
67+
"common/pop_types",
6268
"common/production_methods",
6369
"common/scripted_buttons",
6470
"common/scripted_effects",
6571
"common/scripted_progress_bars",
6672
"common/technology",
73+
"common/terrain",
6774

6875
"events",
6976
"events/agitators_events",
7077
"events/american_civil_war",
78+
"events/balkans_events",
7179
"events/brazil",
7280
"events/election_events",
7381
"events/expedition_events",
@@ -77,6 +85,7 @@
7785
"events/tech_events",
7886

7987
"gfx/map",
88+
"gfx/map/city_data/city_types",
8089
"gfx/portraits/portrait_modifiers"
8190
]
8291
}

‎common/ai_strategies/00_default_strategy.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ ai_strategy_default = {
472472
if = {
473473
limit = {
474474
country_has_primary_culture = cu:russian
475-
has_law = law_type:law_national_supremacy
475+
has_law_or_variant = law_type:law_national_supremacy
476476
scope:target_state = {
477477
owner = {
478478
OR = {
@@ -1332,7 +1332,7 @@ ai_strategy_default = {
13321332
}
13331333

13341334
if = {
1335-
limit = { has_law = law_type:law_national_militia }
1335+
limit = { has_law_or_variant = law_type:law_national_militia }
13361336
multiply = 0.33
13371337
}
13381338
min = 1
@@ -1457,15 +1457,15 @@ ai_strategy_default = {
14571457
}
14581458

14591459
if = {
1460-
limit = { has_law = law_type:law_peasant_levies }
1460+
limit = { has_law_or_variant = law_type:law_peasant_levies }
14611461
multiply = 0.5
14621462
}
14631463
else_if = {
1464-
limit = { has_law = law_type:law_national_militia }
1464+
limit = { has_law_or_variant = law_type:law_national_militia }
14651465
multiply = 0.75
14661466
}
14671467
else_if = {
1468-
limit = { has_law = law_type:law_professional_army }
1468+
limit = { has_law_or_variant = law_type:law_professional_army }
14691469
multiply = 1.25
14701470
}
14711471
}
@@ -1485,15 +1485,15 @@ ai_strategy_default = {
14851485
}
14861486

14871487
if = {
1488-
limit = { has_law = law_type:law_national_militia }
1488+
limit = { has_law_or_variant = law_type:law_national_militia }
14891489
multiply = 0.5
14901490
}
14911491
else_if = {
1492-
limit = { has_law = law_type:law_professional_army }
1492+
limit = { has_law_or_variant = law_type:law_professional_army }
14931493
multiply = 1.25
14941494
}
14951495
else_if = {
1496-
limit = { has_law = law_type:law_peasant_levies }
1496+
limit = { has_law_or_variant = law_type:law_peasant_levies }
14971497
multiply = 1.5
14981498
}
14991499
}
@@ -1531,15 +1531,15 @@ ai_strategy_default = {
15311531
conscript_battalion_ratio = {
15321532
value = 0.5
15331533
if = {
1534-
limit = { has_law = law_type:law_national_militia }
1534+
limit = { has_law_or_variant = law_type:law_national_militia }
15351535
add = 2.5
15361536
}
15371537
else_if = {
1538-
limit = { has_law = law_type:law_peasant_levies }
1538+
limit = { has_law_or_variant = law_type:law_peasant_levies }
15391539
add = 0.5
15401540
}
15411541
else_if = {
1542-
limit = { has_law = law_type:law_mass_conscription }
1542+
limit = { has_law_or_variant = law_type:law_mass_conscription }
15431543
add = 0.5
15441544
}
15451545

@@ -1560,7 +1560,7 @@ ai_strategy_default = {
15601560

15611561
if = {
15621562
limit = {
1563-
has_law = law_type:law_command_economy
1563+
has_law_or_variant = law_type:law_command_economy
15641564
}
15651565

15661566
add = 100
@@ -1645,7 +1645,7 @@ ai_strategy_default = {
16451645
trigger = {
16461646
total_population >= 1000000
16471647
NOT = {
1648-
has_law = law_type:law_industry_banned
1648+
has_law_or_variant = law_type:law_industry_banned
16491649
}
16501650
}
16511651
}
@@ -2542,7 +2542,7 @@ ai_strategy_default = {
25422542
if = {
25432543
limit = {
25442544
country_has_primary_culture = cu:russian
2545-
has_law = law_type:law_national_supremacy
2545+
has_law_or_variant = law_type:law_national_supremacy
25462546
scope:target_country = {
25472547
OR = {
25482548
c:KAZ ?= this
@@ -2815,7 +2815,7 @@ ai_strategy_default = {
28152815
if = {
28162816
limit = {
28172817
country_has_primary_culture = cu:russian
2818-
has_law = law_type:law_national_supremacy
2818+
has_law_or_variant = law_type:law_national_supremacy
28192819
scope:target_country = {
28202820
OR = {
28212821
c:KAZ ?= this
@@ -3119,7 +3119,7 @@ ai_strategy_default = {
31193119
if = {
31203120
limit = {
31213121
country_has_primary_culture = cu:russian
3122-
has_law = law_type:law_national_supremacy
3122+
has_law_or_variant = law_type:law_national_supremacy
31233123
scope:target_country = {
31243124
OR = {
31253125
c:KAZ ?= this

‎common/ai_strategies/01_admin_strategies.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
if = {
7575
limit = {
7676
exists = ig:ig_landowners
77-
ig:ig_landowners = { is_powerful = yes }
77+
ig:ig_landowners ?= { is_powerful = yes }
7878
}
7979
multiply = 1.5
8080
}
@@ -86,7 +86,7 @@
8686
OR = {
8787
AND = {
8888
is_ai = no
89-
NOT = { has_law = law_type:law_industry_banned }
89+
NOT = { has_law_or_variant = law_type:law_industry_banned }
9090
}
9191
has_strategy = ai_strategy_resource_expansion
9292
has_strategy = ai_strategy_industrial_expansion
@@ -158,7 +158,7 @@ ai_strategy_plantation_economy = {
158158
if = {
159159
limit = {
160160
exists = ig:ig_landowners
161-
ig:ig_landowners = { is_powerful = yes }
161+
ig:ig_landowners ?= { is_powerful = yes }
162162
}
163163
multiply = 1.5
164164
}
@@ -248,7 +248,7 @@ ai_strategy_resource_expansion = {
248248
if = {
249249
limit = {
250250
exists = ig:ig_industrialists
251-
ig:ig_industrialists = { is_powerful = yes }
251+
ig:ig_industrialists ?= { is_powerful = yes }
252252
}
253253
multiply = 1.5
254254
}
@@ -260,7 +260,7 @@ ai_strategy_resource_expansion = {
260260
OR = {
261261
AND = {
262262
is_ai = no
263-
NOT = { has_law = law_type:law_industry_banned }
263+
NOT = { has_law_or_variant = law_type:law_industry_banned }
264264
}
265265
has_strategy = ai_strategy_resource_expansion
266266
has_strategy = ai_strategy_industrial_expansion
@@ -348,7 +348,7 @@ ai_strategy_industrial_expansion = {
348348

349349
if = {
350350
limit = {
351-
has_law = law_type:law_cooperative_ownership
351+
has_law_or_variant = law_type:law_cooperative_ownership
352352
}
353353
multiply = 2
354354
}
@@ -361,7 +361,7 @@ ai_strategy_industrial_expansion = {
361361
if = {
362362
limit = {
363363
exists = ig:ig_industrialists
364-
ig:ig_industrialists = { is_powerful = yes }
364+
ig:ig_industrialists ?= { is_powerful = yes }
365365
}
366366
multiply = 2
367367
}
@@ -417,7 +417,7 @@ ai_strategy_placate_population = {
417417
}
418418

419419
possible = {
420-
has_law = law_type:law_industry_banned
420+
has_law_or_variant = law_type:law_industry_banned
421421
}
422422

423423
weight = {
@@ -446,7 +446,7 @@ ai_strategy_placate_population = {
446446
if = {
447447
limit = {
448448
exists = ig:ig_rural_folk
449-
ig:ig_rural_folk = { is_powerful = yes }
449+
ig:ig_rural_folk ?= { is_powerful = yes }
450450
}
451451
multiply = 1.5
452452
}
@@ -458,7 +458,7 @@ ai_strategy_placate_population = {
458458
OR = {
459459
AND = {
460460
is_ai = no
461-
NOT = { has_law = law_type:law_industry_banned }
461+
NOT = { has_law_or_variant = law_type:law_industry_banned }
462462
}
463463
has_strategy = ai_strategy_resource_expansion
464464
has_strategy = ai_strategy_industrial_expansion

‎common/ai_strategies/02_diplomatic_strategies.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ ai_strategy_economic_imperialism = {
455455
scope:target_country.country_rank < rank_value:major_power
456456
scope:target_country = {
457457
NOR = {
458-
has_law = law_type:law_free_trade
458+
has_law_or_variant = law_type:law_free_trade
459459
has_law_or_variant = law_type:law_isolationism
460460
}
461461
}
@@ -824,7 +824,7 @@ ai_strategy_territorial_expansion = {
824824
}
825825

826826
if = {
827-
limit = { ig:ig_armed_forces = { is_powerful = yes } }
827+
limit = { ig:ig_armed_forces ?= { is_powerful = yes } }
828828
multiply = 1.5
829829
}
830830

@@ -931,7 +931,7 @@ ai_strategy_armed_isolationism = {
931931
}
932932

933933
if = {
934-
limit = { has_law = law_type:law_national_militia }
934+
limit = { has_law_or_variant = law_type:law_national_militia }
935935
add = 50
936936
}
937937

@@ -1317,10 +1317,10 @@ ai_strategy_global_liberalism = {
13171317
if = {
13181318
limit = {
13191319
AND = {
1320-
has_law = law_type:law_council_republic
1320+
has_law_or_variant = law_type:law_council_republic
13211321
NOT = {
13221322
scope:target_country = {
1323-
has_law = law_type:law_council_republic
1323+
has_law_or_variant = law_type:law_council_republic
13241324
}
13251325
}
13261326
}
@@ -1378,7 +1378,7 @@ ai_strategy_global_liberalism = {
13781378
root.country_rank > scope:target_country.country_rank
13791379
scope:target_country = {
13801380
NOR = {
1381-
has_law = law_type:law_free_trade
1381+
has_law_or_variant = law_type:law_free_trade
13821382
has_law_or_variant = law_type:law_isolationism
13831383
}
13841384
}
@@ -1410,10 +1410,10 @@ ai_strategy_global_liberalism = {
14101410
limit = {
14111411
AND = {
14121412
NOT = {
1413-
has_law = law_type:law_council_republic
1413+
has_law_or_variant = law_type:law_council_republic
14141414
}
14151415
scope:target_country = {
1416-
has_law = law_type:law_council_republic
1416+
has_law_or_variant = law_type:law_council_republic
14171417
}
14181418
}
14191419
}
@@ -1471,7 +1471,7 @@ ai_strategy_global_liberalism = {
14711471
value = 10000
14721472
if = {
14731473
limit = {
1474-
has_law = law_type:law_council_republic
1474+
has_law_or_variant = law_type:law_council_republic
14751475
}
14761476
multiply = 0
14771477
}
@@ -1604,7 +1604,7 @@ ai_strategy_international_socialism = {
16041604
if = {
16051605
limit = {
16061606
NOT = {
1607-
has_law = law_type:law_council_republic
1607+
has_law_or_variant = law_type:law_council_republic
16081608
}
16091609
}
16101610
multiply = 0
@@ -1741,7 +1741,7 @@ ai_strategy_restore_natural_borders = {
17411741
}
17421742

17431743
if = {
1744-
limit = { ig:ig_armed_forces = { is_powerful = yes } }
1744+
limit = { ig:ig_armed_forces ?= { is_powerful = yes } }
17451745
multiply = 1.5
17461746
}
17471747

0 commit comments

Comments
 (0)