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

Integration of Danzig + updates for Khiva and Bukhara #595

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion mod/thegreatwar/common/characters/BUK.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ characters = {
name = BUK_sayyid_alim_khan
portraits = {
civilian = {
large = GFX_Portrait_HJZ_hussein_bin_ali
large = GFX_Portrait_BUK_sayyid_alim_khan
}
}
country_leader = {
Expand Down
28 changes: 28 additions & 0 deletions mod/thegreatwar/common/characters/DNZ.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
characters = {
DNZ_heinrich_sahm = {
name = DNZ_heinrich_sahm
portraits = {
civilian = {
large = GFX_Portrait_DNZ_heinrich_sahm
}
}
country_leader = {
ideology = conservatism
expire = "1935.1.1.1"
id = -1
}
}
DNZ_ernst_ziehm = {
name = DNZ_ernst_ziehm
portraits = {
civilian = {
large = GFX_Portrait_DNZ_ernst_ziehm
}
}
country_leader = {
ideology = conservatism
expire = "1935.1.1.1"
id = -1
}
}
}
2 changes: 1 addition & 1 deletion mod/thegreatwar/common/characters/KHI.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ characters = {
name = KHI_isfandiyar_khan
portraits = {
civilian = {
large = GFX_Portrait_OMA_faisal_bin_turki
large = GFX_Portrait_KHI_isfandiyar_khan
}
}
country_leader = {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
27 changes: 26 additions & 1 deletion mod/thegreatwar/history/countries/DNZ - Danzig.txt
Original file line number Diff line number Diff line change
@@ -1 +1,26 @@
capital = 85 #Danzig
capital = 816 #Danzig

set_fuel_ratio = 0.20
set_research_slots = 2

# Free City of Danzig

set_politics = {
ruling_party = democratic
last_election = "1910.1.1"
election_frequency = 48
elections_allowed = yes
}

set_popularities = {
democratic = 45
fascism = 15
communism = 0
neutrality = 40
}

set_stability = 0.75

# LEADERS
recruit_character = DNZ_heinrich_sahm
recruit_character = DNZ_ernst_ziehm
5 changes: 1 addition & 4 deletions mod/thegreatwar/history/states/742-Stalinabad.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ state = {

1919.1.1 = {
add_core_of = SOV

SOV = {
set_province_controller = 12430
}
owner = BUK
}

}
Expand Down
1 change: 1 addition & 0 deletions mod/thegreatwar/history/states/813-Hiva.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ state = {
infrastructure=1
}
1919.1.1 = {
owner = KHI
add_core_of = SOV
}
}
Expand Down
1 change: 1 addition & 0 deletions mod/thegreatwar/history/states/814-Buhara.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ state = {
infrastructure=1
}
1919.1.1 = {
owner = BUK
add_core_of = SOV
}
}
Expand Down
39 changes: 39 additions & 0 deletions mod/thegreatwar/history/states/816-Pomorskie.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
state = {
id = 816
name = "STATE_816"
local_supplies = 1.0
manpower = 580100
state_category = city
provinces = {
362
}
resources = {
wood = 15
}
history = {
victory_points = {
362 10
}
owner = GER

add_core_of = GER

buildings = {
infrastructure=4
industrial_complex = 2
dockyard = 2
arms_factory = 1
362 = {
naval_base = 5
}
362 = {
coastal_bunker = 6
}
}

1919.1.1 = {
owner = DNZ
add_core_of = DNZ
}
}
}
14 changes: 3 additions & 11 deletions mod/thegreatwar/history/states/85-Danzig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ state = {
id = 85
name = "STATE_85"
local_supplies = 1.0
manpower = 1080100
manpower = 500000
state_category = city
provinces = {
279 334 362 389 3295 3324 9263
279 334 389 3295 3324 9263
}
resources = {
wood = 15
}
history = {
victory_points = {
362 10
3324 5
}
owner = GER

Expand All @@ -21,14 +21,6 @@ state = {
buildings = {
infrastructure=4
industrial_complex = 2
dockyard = 2
arms_factory = 1
362 = {
naval_base = 5
}
362 = {
coastal_bunker = 6
}
}

1919.1.1 = {
Expand Down
7 changes: 7 additions & 0 deletions mod/thegreatwar/interface/ww1_characters.gfx
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ spriteTypes = {
spriteType = { name = "GFX_Portrait_BRA_leao" texturefile = "gfx/hoi4tgw_portraits/BRA/navy_admirals/BRA_leao.dds" }
spriteType = { name = "GFX_Portrait_BRA_gomes_pereira" texturefile = "gfx/hoi4tgw_portraits/BRA/navy_admirals/BRA_gomes_pereira.dds" }
spriteType = { name = "GFX_Portrait_BRA_alencar" texturefile = "gfx/hoi4tgw_portraits/BRA/navy_admirals/BRA_alencar.dds" }
# BUK
spriteType = { name = "GFX_Portrait_BUK_sayyid_alim_khan" texturefile = "gfx/hoi4tgw_portraits/BUK/country_leaders/BUK_sayyid_alim_khan.dds" }
# BUL
spriteType = { name = "GFX_Portrait_BUL_rashko_serafimov" texturefile = "gfx/hoi4tgw_portraits/BUL/navy_admirals/BUL_serafimov.dds" }
spriteType = { name = "GFX_Portrait_BUL_aleksandar_stamboliyski" texturefile = "gfx/hoi4tgw_portraits/BUL/country_leaders/BUL_aleksandar_stamboliyski.dds" }
Expand Down Expand Up @@ -229,6 +231,9 @@ spriteTypes = {
spriteType = { name = "GFX_Portrait_DEN_kofoed_hansen" texturefile = "gfx/hoi4tgw_portraits/DEN/navy_admirals/DEN_kofoed_hansen.dds" }
spriteType = { name = "GFX_Portrait_DEN_topsoe_jensen" texturefile = "gfx/hoi4tgw_portraits/DEN/navy_admirals/DEN_topsoe_jensen.dds" }
spriteType = { name = "GFX_Portrait_DEN_juelbrockdorff" texturefile = "gfx/hoi4tgw_portraits/DEN/navy_admirals/DEN_juel_brockdorff.dds" }
# DNZ
spriteType = { name = "GFX_Portrait_DNZ_heinrich_sahm" texturefile = "gfx/hoi4tgw_portraits/DNZ/country_leaders/DNZ_heinrich_sahm.dds" }
spriteType = { name = "GFX_Portrait_DNZ_ernst_ziehm" texturefile = "gfx/hoi4tgw_portraits/DNZ/country_leaders/DNZ_ernst_ziehm.dds" }
# DOM
spriteType = { name = "GFX_Portrait_DOM_jose_bordas_valdes" texturefile = "gfx/hoi4tgw_portraits/DOM/country_leaders/DOM_jose_bordas_valdes.dds" }
spriteType = { name = "GFX_Portrait_DOM_ramon_baez_machado" texturefile = "gfx/hoi4tgw_portraits/DOM/country_leaders/DOM_ramon_baez_machado.dds" }
Expand Down Expand Up @@ -522,6 +527,8 @@ spriteTypes = {
spriteType = { name = "GFX_Portrait_JBS_abdullah_bin_mitab" texturefile = "gfx/hoi4tgw_portraits/JBS/country_leaders/JBS_abdullah_bin_mitab.dds" }
spriteType = { name = "GFX_Portrait_JBS_mohammad_bin_talal" texturefile = "gfx/hoi4tgw_portraits/JBS/country_leaders/JBS_mohammad_bin_talal.dds" }
spriteType = { name = "GFX_Portrait_JBS_saud_bin_abdul_aziz_rashid" texturefile = "gfx/hoi4tgw_portraits/JBS/country_leaders/JBS_saud_bin_abdul_aziz_rashid.dds" }
# KHI
spriteType = { name = "GFX_Portrait_KHI_isfandiyar_khan" texturefile = "gfx/hoi4tgw_portraits/KHI/country_leaders/KHI_isfandiyar_khan.dds" }
# KOR
spriteType = { name = "GFX_Portrait_KOR_yeo_un_hyeong" texturefile = "gfx/hoi4tgw_portraits/KOR/country_leaders/KOR_yeo_un_hyeong.dds" }
spriteType = { name = "GFX_Portrait_KOR_emperor_yunghui" texturefile = "gfx/hoi4tgw_portraits/KOR/country_leaders/KOR_emperor_yunghui.dds" }
Expand Down
11 changes: 10 additions & 1 deletion mod/thegreatwar/localisation/replace/ww1_parties_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,5 +203,14 @@
KHI_fascism_party_long:0 "Khivan Basmachi Movement"
KHI_democratic_party:0 "KJC"
KHI_democratic_party_long:0 "Khivan People's Jadid Councils"
KHI_neutrality_party:0 "Khanate Pretenders"
KHI_neutrality_party:0 "Khanate Pretenders"

DNZ_fascism_party:0 "DNVP"
DNZ_fascism_party_long:0 "German National People's Party"
DNZ_democratic_party:0 "SPD"
DNZ_democratic_party_long:0 "Social Democratic Party"
DNZ_communism_party:0 "KPD"
DNZ_communism_party_long:0 "Communist Party"
DNZ_neutrality_party:0 "Zentrum"
DNZ_neutrality_party_long:0 "Centre Party"

12 changes: 10 additions & 2 deletions mod/thegreatwar/localisation/replace/ww1_parties_l_french.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,5 +203,13 @@
KHI_fascism_party_long:0 "Mouvement basmatchi khivain"
KHI_democratic_party:0 "CJPKh"
KHI_democratic_party_long:0 "Conseil jadidiste du peuple khivain"
KHI_neutrality_party:0 "Parti monarchiste"

KHI_neutrality_party:0 "Parti monarchiste"

DNZ_fascism_party:0 "DNVP"
DNZ_fascism_party_long:0 "Parti populaire national allemand"
DNZ_democratic_party:0 "SPD"
DNZ_democratic_party_long:0 "Parti social-démocrate"
DNZ_communism_party:0 "KPD"
DNZ_communism_party_long:0 "Parti communiste"
DNZ_neutrality_party:0 "Zentrum"
DNZ_neutrality_party_long:0 "Parti du centre"
11 changes: 10 additions & 1 deletion mod/thegreatwar/localisation/replace/ww1_parties_l_german.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,5 +203,14 @@
KHI_fascism_party_long:0 "Chivanische Basmatschi-Bewegung"
KHI_democratic_party:0 "KDR"
KHI_democratic_party_long:0 "Chivanischer Dschadid-Rat"
KHI_neutrality_party:0 "Khanat-Prätendenten"
KHI_neutrality_party:0 "Khanat-Prätendenten"

DNZ_fascism_party:0 "DNVP"
DNZ_fascism_party_long:0 "Deutschnationale Volkspartei"
DNZ_democratic_party:0 "SPD"
DNZ_democratic_party_long:0 "Sozialdemokratische Partei"
DNZ_communism_party:0 "KPD"
DNZ_communism_party_long:0 "Kommunistische Partei"
DNZ_neutrality_party:0 "Zentrum"
DNZ_neutrality_party_long:0 "Zentrumspartei"

11 changes: 10 additions & 1 deletion mod/thegreatwar/localisation/replace/ww1_parties_l_polish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,13 @@
KHI_fascism_party_long:0 "Ruch Basmaczy w Chiwie"
KHI_democratic_party:0 "RDC"
KHI_democratic_party_long:0 "Ludowe Rady Dżadidystów w Chiwie"
KHI_neutrality_party:0 "Uzurpatorzy Chanatu"
KHI_neutrality_party:0 "Uzurpatorzy Chanatu"

DNZ_fascism_party:0 "DNVP"
DNZ_fascism_party_long:0 "Niemiecka Narodowa Partia Ludowa"
DNZ_democratic_party:0 "SPD"
DNZ_democratic_party_long:0 "Socjaldemokratyczna Partia"
DNZ_communism_party:0 "KPD"
DNZ_communism_party_long:0 "Komunistyczna Partia"
DNZ_neutrality_party:0 "Zentrum"
DNZ_neutrality_party_long:0 "Partia Centrum"
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@

VICTORY_POINTS_12324:0 "Khiva"
VICTORY_POINTS_1573:0 "Bukhara"

VICTORY_POINTS_3324:0 "Bromberg"
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,6 @@

VICTORY_POINTS_12324:0 "Khiva"
VICTORY_POINTS_1573:0 "Bukhara"

VICTORY_POINTS_3324:0 "Bromberg"

Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@
VICTORY_POINTS_6115:0 "Kristiania"

VICTORY_POINTS_12324:0 "Сhiwa"
VICTORY_POINTS_1573:0 "Buchara"
VICTORY_POINTS_1573:0 "Buchara"

VICTORY_POINTS_3324:0 "Bromberg"
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@

VICTORY_POINTS_12324:0 "Сhiwy"
VICTORY_POINTS_1573:0 "Buchary"

VICTORY_POINTS_3324:0 "Bydgoszcz"
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@
GER_democratic_party:0 "СДПГ"
GER_democratic_party_long:0 "Социал-демократическая партия Германии"

POL_fascism_party:0 "НРЛ-Фаланга"
POL_fascism_party_long:0 "Национально-радикальный лагерь «Фаланга»"
POL_communism_party:0 "Польская социалистическая партия"
POL_fascism_party:0 "НДП"
POL_fascism_party_long:0 "Национально-демократическая партия"
POL_communism_party:0 "ПСП"
POL_communism_party_long:0 "Польская социалистическая партия"
POL_democratic_party:0 "ПКП"
POL_democratic_party_long:0 "Польская крестьянская партия"
POL_neutrality_party:0 "ББСсП"
POL_neutrality_party:0 "БНМ"
POL_neutrality_party_long:0 "Блок национальных меньшинств"

ENG_communism_party:0 "Коммунистическая партия Великобритании"
ENG_democratic_party:0 "Консервативная партия"
Expand Down Expand Up @@ -536,4 +538,13 @@
KHI_fascism_party_long:0 "Хиванское басмаческое движение"
KHI_democratic_party:0 "ХНС"
KHI_democratic_party_long:0 "Хиванский народный джадидский совет"
KHI_neutrality_party:0 "Ханские претенденты"
KHI_neutrality_party:0 "Ханские претенденты"

DNZ_fascism_party:0 "НННП"
DNZ_fascism_party_long:0 "Немецкая национальная народная партия Данцига"
DNZ_democratic_party:0 "СДП"
DNZ_democratic_party_long:0 "Социал-демократическая партия Данцига"
DNZ_communism_party:0 "КПД"
DNZ_communism_party_long:0 "Коммунистическая партия Данцига"
DNZ_neutrality_party:0 "Центр"
DNZ_neutrality_party_long:0 "Партия Центра"
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@
VICTORY_POINTS_6115:0 "Кристиания"

VICTORY_POINTS_12324:0 "Хива"
VICTORY_POINTS_1573:0 "Бухара"
VICTORY_POINTS_1573:0 "Бухара"

VICTORY_POINTS_3324:0 "Бромберг"
5 changes: 4 additions & 1 deletion mod/thegreatwar/localisation/ww1_characters_l_english.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1288,4 +1288,7 @@
KHI_isfandiyar_khan:0 "Isfandiyar Khan"
KHI_sayid_abdullah:0 "Sayid Abdullah"
BUK_sayyid_alim_khan:0 "Sayyid Mir Muhammad Alim Khan"
BUK_qasim_khan:0 "Qasim Khan"
BUK_qasim_khan:0 "Qasim Khan"

DNZ_heinrich_sahm:0 "Heinrich Sahm"
DNZ_ernst_ziehm:0 "Ernst Ziehm"
5 changes: 4 additions & 1 deletion mod/thegreatwar/localisation/ww1_characters_l_french.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1288,4 +1288,7 @@
KHI_isfandiyar_khan:0 "Isfandiyar Khan"
KHI_sayid_abdullah:0 "Sayid Abdullah"
BUK_sayyid_alim_khan:0 "Sayyid Mir Muhammad Alim Khan"
BUK_qasim_khan:0 "Qasim Khan"
BUK_qasim_khan:0 "Qasim Khan"

DNZ_heinrich_sahm:0 "Heinrich Sahm"
DNZ_ernst_ziehm:0 "Ernst Ziehm"
5 changes: 4 additions & 1 deletion mod/thegreatwar/localisation/ww1_characters_l_german.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1288,4 +1288,7 @@
KHI_isfandiyar_khan:0 "Isfandiyar Khan"
KHI_sayid_abdullah:0 "Sayid Abdullah"
BUK_sayyid_alim_khan:0 "Sayyid Mir Muhammad Alim Khan"
BUK_qasim_khan:0 "Qasim Khan"
BUK_qasim_khan:0 "Qasim Khan"

DNZ_heinrich_sahm:0 "Heinrich Sahm"
DNZ_ernst_ziehm:0 "Ernst Ziehm"
5 changes: 4 additions & 1 deletion mod/thegreatwar/localisation/ww1_characters_l_russian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1287,4 +1287,7 @@
KHI_isfandiyar_khan:0 "Асфандияр-хан"
KHI_sayid_abdullah:0 "Саид Абдулла-хан"
BUK_sayyid_alim_khan:0 "Сеид Алим-хан"
BUK_qasim_khan:0 "Касим-хан"
BUK_qasim_khan:0 "Касим-хан"

DNZ_heinrich_sahm:0 "Генрих Зам"
DNZ_ernst_ziehm:0 "Эрнст Цим"
Loading