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 fixing #431

Merged
merged 26 commits into from
Jul 26, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5a423da
fix: added aot definition
JackEPepper Jul 22, 2023
3bb7db1
fix: removed invalid states
JackEPepper Jul 22, 2023
ee84cc2
fix: new indonesian leader
JackEPepper Jul 22, 2023
241bc5b
fix: removed outdated tags
JackEPepper Jul 22, 2023
101637a
fix: removed invalid customs union
JackEPepper Jul 22, 2023
a71e3fe
fix: default events
JackEPepper Jul 22, 2023
1b71d2b
fix: unused trade routes
JackEPepper Jul 22, 2023
e804d73
fix: skill issue in trade center building (wasn't showing trade value)
Jul 23, 2023
5293572
fix: ' is unsupported character - PDX must fix GetRawTextTooltipTag
Jul 23, 2023
19a9b4d
fix: maximum cash reserves bonus is capped to 100%, as higher may des…
Jul 23, 2023
5fc8e96
fix: JE loc issues
Jul 23, 2023
7d9b2a5
chore: voodoo
Jul 23, 2023
9e34486
chore: other way around - if goal is unused, then progress desc can't…
Jul 23, 2023
dfd861d
chore: unfuck voodoo
Jul 23, 2023
2f971d5
fix: just merge them bruh
JackEPepper Jul 23, 2023
6d07557
Merge branch 'error-fixing' of /~https://github.com/Cold-War-Project/CW…
JackEPepper Jul 23, 2023
12f279e
chore: lol
Jul 23, 2023
b50fffd
fix: progress desc
JackEPepper Jul 23, 2023
bfd2d55
Merge branch 'error-fixing' of /~https://github.com/Cold-War-Project/CW…
JackEPepper Jul 23, 2023
e85da02
fix: status desc
JackEPepper Jul 23, 2023
02b7d8c
chore: formatting
JackEPepper Jul 23, 2023
74a479c
Merge branch 'dev' into error-fixing
Jul 25, 2023
68dbb28
fix: one ownership missing from trade center
Jul 25, 2023
cf12d36
chore: loc
Jul 25, 2023
688ce5f
fix: qualification't
Jul 25, 2023
fe221f5
Merge branch 'dev' into error-fixing
Jul 26, 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
123 changes: 89 additions & 34 deletions common/country_definitions/00_countries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,15 @@ KUK = {
country_type = recognized
tier = empire
capital = STATE_CENTRAL_HUNGARY
cultures = { hungarian romanian croat bulgarian slovene albanian serb }
cultures = {
hungarian
romanian
croat
bulgarian
slovene
albanian
serb
}
}

DEN = {
Expand Down Expand Up @@ -4994,14 +5002,21 @@ EAU = {
capital = STATE_TANGANYIKA
}

PTG = {
color = { 255 244 100 }

PTG = {
color = {
255
244
100
}
country_type = recognized

tier = hegemony

cultures = { north_andean andean south_andean platinean patagonian }
cultures = {
north_andean
andean
south_andean
platinean
patagonian
}
capital = STATE_CUNDINAMARCA
}

Expand Down Expand Up @@ -6458,57 +6473,97 @@ BRL = {
capital = STATE_BRANDENBURG
}

PNS = { # Polynesia
color = { 244 140 30 }

PNS = {
# Polynesia
color = {
244
140
30
}
country_type = unrecognized

tier = empire

cultures = { hawaiian maori melanesian polynesian micronesian }
cultures = {
hawaiian
maori
melanesian
polynesian
micronesian
}
capital = STATE_HAWAIIAN_ISLANDS
}

SGF = {
color = { 176 18 7}

color = {
176
18
7
}
country_type = recognized

tier = kingdom

cultures = { south_german north_german }
cultures = {
south_german
north_german
}
capital = STATE_BAVARIA
}

CAU = {
color = { 200 100 55 }

color = {
200
100
55
}
country_type = recognized

tier = empire

cultures = { azerbaijani armenian georgian }
cultures = {
azerbaijani
armenian
georgian
}
capital = STATE_GREATER_CAUCASUS
}

PLC = {
color = { 219 31 62 }

color = {
219
31
62
}
country_type = recognized

tier = kingdom

cultures = { lithuanian estonian latvian }
cultures = {
lithuanian
estonian
latvian
}
capital = STATE_LATVIA
}

GCO = {
color = { 255 244 100 }

color = {
255
244
100
}
country_type = recognized

tier = empire

cultures = { north_andean }
cultures = {
north_andean
}
capital = STATE_CUNDINAMARCA
}
}

AOT = {
# Aotearoa
color = {
47
140
191
}
country_type = unrecognized
tier = kingdom
cultures = {
maori
}
capital = STATE_NORTH_ISLAND
}
46 changes: 1 addition & 45 deletions common/country_formation/00_formable_countries.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,7 @@ IRE = {
}

FRA = {
states = {
STATE_ILE_DE_FRANCE
STATE_PROVENCE
STATE_NORMANDY
STATE_LANGUEDOC
STATE_RHONE
STATE_FRENCH_LOW_COUNTRIES
STATE_PICARDY
STATE_ALSACE_LORRAINE
STATE_POITOU
STATE_GUYENNE
STATE_AUVERGNE_LIMOUSIN
STATE_BRITTANY
STATE_BURGUNDY
STATE_CHAMPAGNE
STATE_FRANCHE_COMTE
STATE_LORRAINE
STATE_AQUITAINE
STATE_ORLEANS
}
use_culture_states = yes
required_states_fraction = 0.75
ai_will_do = {
always = yes
Expand Down Expand Up @@ -138,21 +119,6 @@ PLC = {
}
}

PRU = {
states = {
STATE_BRANDENBURG
STATE_POMERANIA
STATE_WEST_PRUSSIA
STATE_EAST_PRUSSIA
STATE_SILESIA
STATE_POSEN
}
required_states_fraction = 0.8
ai_will_do = {
always = yes
}
}

ETH = {
use_culture_states = yes
required_states_fraction = 0.5
Expand Down Expand Up @@ -298,16 +264,6 @@ GCO = {
}
}

ZIM = {
states = {
STATE_ZAMBEZI
}
required_states_fraction = 0.75
ai_will_do = {
always = yes
}
}

BLH = {
states = {
STATE_BALUCHISTAN
Expand Down
8 changes: 0 additions & 8 deletions common/flag_definitions/00_flag_definitions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6972,14 +6972,6 @@ YUG = { # Yugoslavia
}
}

ZIM = { # Zimbabwe
flag_definition = {
coa = ZIM
subject_canton = ZIM
priority = 1
}
}

PNS = { # Polynesia
flag_definition = {
coa = PNS
Expand Down
17 changes: 0 additions & 17 deletions common/government_types/04_theocracies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@
}
}

gov_heavenly_kingdom_theocracy = {
transfer_of_power = hereditary
male_ruler = "RULER_TITLE_HEAVENLY_KING"
female_ruler = "" # Empty on purpose
male_heir = "RULER_TITLE_JUNIOR_HEAVENLY_KING"
female_heir = "" # Empty on purpose
possible = {
has_law = law_type:law_theocratic
country_has_state_religion = rel:protestant
exists = c:TPG
c:TPG = ROOT
}
on_government_type_change = {
change_to_dictatorial = yes
}
}

gov_papacy = {
transfer_of_power = dictatorial
male_ruler = "RULER_POPE"
Expand Down
10 changes: 5 additions & 5 deletions common/history/characters/ids - indonesia.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
CHARACTERS = {
c:IDS = {
create_character = {
first_name = "Hubertus"
last_name = "van_Mook" # Hubertus van Mook
culture = cu:dutch
first_name = "Blank_Name"
last_name = "Sukarno"
culture = cu:javan
ruler = yes
ig_leader = yes
birth_date = 1894.5.30
interest_group = ig:ig_securocrats
birth_date = 1901.6.6
interest_group = ig:ig_elites
ideology = ideology_moderate
traits = {
}
Expand Down
4 changes: 0 additions & 4 deletions common/history/diplomacy/00_customs_union.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@
}
}
c:NET = {
create_diplomatic_pact = {
country = c:IDS
type = customs_union
}
create_diplomatic_pact = {
country = c:WPP
type = customs_union
Expand Down
12 changes: 0 additions & 12 deletions common/history/trade_routes/00_trade_routes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@
direction = import
target = c:NET.market
}
create_trade_route = {
goods = phosphorus
level = 3
direction = import
target = c:NET.market
}
}
# Czechoslovakia
c:CZH = {
Expand Down Expand Up @@ -274,12 +268,6 @@
direction = import
target = c:GBR.market
}
create_trade_route = {
goods = bauxite
level = 14
direction = import
target = c:NET.market
}
create_trade_route = {
goods = bauxite
level = 13
Expand Down
45 changes: 2 additions & 43 deletions common/journal_entries/CWP_decolonization.txt
Original file line number Diff line number Diff line change
Expand Up @@ -219,48 +219,7 @@
# dynamically updated text, which describes the current status of the Journal Entry
# To use in loc or UI: [JournalEntry.GetStatusDesc]
# If this is not specified, GetStatusDesc will instead return loc from key <journal_entry_key>_status
status_desc = {
first_valid = {
triggered_desc = {
desc = je_decolonization_desc_gbr_wwii
trigger = {
c:GBR ?= this
game_date < 1956.1.1
}
}
triggered_desc = {
desc = je_decolonization_desc_fra_wwii
trigger = {
c:FRA ?= this
game_date < 1956.1.1
}
}
triggered_desc = {
desc = je_decolonization_desc_por_wwii
trigger = {
c:POR ?= this
game_date < 1956.1.1
}
}
triggered_desc = {
desc = je_decolonization_desc_bel_wwii
trigger = {
c:BEL ?= this
game_date < 1956.1.1
}
}
triggered_desc = {
desc = je_decolonization_desc_net_wwii
trigger = {
c:NET ?= this
game_date < 1956.1.1
}
}
triggered_desc = {
desc = je_decolonization_desc_generic
}
}
}
status_desc = DECOLONIZATION_PROGRESS_DESC
# the number of days before this journal entry forcibly transitions, can be used to transition silently or into another event, framed either as success, failure, or neutral; if left blank or set to zero, will not time out
timeout = 7300
# effect which is executed when journal entry is timed out
Expand Down Expand Up @@ -384,7 +343,7 @@
# value can be a localization key or first_valid + triggered_desc script
# To use in loc or UI: [JournalEntry.GetProgressDesc]
# If this is not specified, GetProgressDesc will instead return loc from key <journal_entry_key>_progress
progress_desc = DECOLONIZATION_PROGRESS_DESC
#progress_desc = DECOLONIZATION_PROGRESS_DESC
# tutorial lesson explaining HOW to complete the Journal Entry
#how_tutorial = how_tutorial_lesson_key
# tutorial lesson explaining the WHY around the Journal Entry
Expand Down
Loading