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.

Sign up for GitHub

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

Jump to bottom

Unowned land gets organized into 'unrecognized' nations #1178

Merged
merged 17 commits into from
Sep 9, 2021
Merged

Unowned land gets organized into 'unrecognized' nations #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3c73121
First cut at generating nations in unowned territory
Idhrendur Sep 6, 2021
62e5430
Simplify addTag
Idhrendur Sep 6, 2021
345a41f
Make provinces in state deterministicly ordered
Idhrendur Sep 6, 2021
acde2a3
Localisations for unrecognized nations
Idhrendur Sep 6, 2021
e3797a1
Flags for unrecognized countries.
Idhrendur Sep 7, 2021
6e4c443
Culture and names for unrecognized nations.
Idhrendur Sep 7, 2021
d62b317
No research slots for unrecognized nations
Idhrendur Sep 7, 2021
793dd80
Use a valid default leader ideology
Idhrendur Sep 7, 2021
d73a28c
Add unrecognized 'culture'
Idhrendur Sep 7, 2021
f0727fd
No victory points to unrecognized nations
Idhrendur Sep 7, 2021
39941bc
Smash naval bases in unrecognized territory
Idhrendur Sep 7, 2021
4aa9210
No airbases for unrecognized nations.
Idhrendur Sep 7, 2021
61becee
Unrecognized countries should have no focus tree.
Idhrendur Sep 8, 2021
c4cfda4
Teraa nullius uses empty focus tree mechanism
Idhrendur Sep 8, 2021
c2cdca9
No election events for unrecognized nations.
Idhrendur Sep 8, 2021
a5617a2
clang format
Idhrendur Sep 8, 2021
aac2a02
Review fixes
Idhrendur Sep 9, 2021
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ configure_file("${DATA_FILE_DIR}/configurables/The Concert of Europe_province_ma
configure_file("${DATA_FILE_DIR}/configurables/unit_mappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/unit_mappings.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Vic2Localisations/Vic2Localisations.csv" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Vic2Localisations/Vic2Localisations.csv" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Vic2Localisations/dominions.csv" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Vic2Localisations/dominions.csv" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Vic2Localisations/unrecognized_nations.csv" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Vic2Localisations/unrecognized_nations.csv" COPYONLY)
file(COPY "${DATA_FILE_DIR}/blankMod" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}")
file(COPY "${DATA_FILE_DIR}/flags" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}")
add_custom_command(TARGET Vic2ToHoi4Converter POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND git rev-parse HEAD > Release-Linux/commit_id.txt)
Expand Down
6 changes: 6 additions & 0 deletions Vic2ToHoI4/Data_Files/blankMod/output/common/ideas/_cultures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3141,6 +3141,12 @@ ideas = {
trade_opinion_factor = -1
}
}
culture_unrecognized = {
removal_cost = -1
allowed = { always = no } allowed_civil_war = { always = no }
picture = culture_unrecognized
modifier = { }
}
culture_unyamwezi = {
removal_cost = -1
allowed = { always = no } allowed_civil_war = { always = yes }
Expand Down
14 changes: 0 additions & 14 deletions Vic2ToHoI4/Data_Files/blankMod/output/common/national_focus/terra_nullius.txt
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Vic2ToHoI4/Data_Files/blankMod/output/localisation/cultures_l_english.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@
lang_uig:0 "Uyghur"
lang_ukr:0 "Ukrainian"
lang_umb:0 "Umbundu"
lang_unrecognized:0 "Unrecognized"
lang_uzb:0 "Uzbek"
lang_vie:0 "Vietnamese"
lang_vmw:0 "Makhuwa"
Expand Down Expand Up @@ -870,6 +871,7 @@
culture_ujvilag:0 "Újvilág"
culture_ukrainian:0 "Ukrainian"
culture_undead:0 "Undead"
culture_unrecognized:0 "Unrecognized"
culture_unyamwezi:0 "Unyamwezi"
culture_usmailmian:0 "Usmailmian"
culture_uzbek:0 "Uzbek"
Expand Down Expand Up @@ -1423,6 +1425,7 @@
culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§!\n$pron_guide$: §Yooey-VEE-lag§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!"
culture_ukrainian_desc:0 "$primary_culture$: §Y$culture_ukrainian$§!\n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_ukr$§!"
culture_undead_desc:0 "$primary_culture$: §Y$culture_undead$§!\n$culture_group$: §Y$anti_human$§!\n$idea_language$: §Y$undead_speak$§!"
culture_unrecognized_desc:0 "$primary_culture$: §Y$culture_unrecognized$§!\n$culture_group$: §Y$culture_unrecognized$§!\n$idea_language$: §Y$lang_unrecognized$§!"
culture_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§!\n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!"
culture_usmailmian_desc:0 "$primary_culture$: §Y$culture_usmailmian$§!\n$pron_guide$: §Yoos-MAH-eel-man§!\n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!"
culture_uzbek_desc:0 "$primary_culture$: §Y$culture_uzbek$§!\n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uzb$§!"
Expand Down
23 changes: 11 additions & 12 deletions Vic2ToHoI4/Data_Files/configurables/Vic2Localisations/dominions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
;en;fr;de;pl;es;it;sw;cz;hu;nl;pt;ru;fi;
# Localisations for generated dominions;;;;;;;;;;;;;;
# The converter tries to find localisations in this order:;;;;;;;;;;;;;;
# * dom_<culture group>_<ideology>_<region>;;;;;;;;;;;;;;
# * dom_<culture group>_<region>;;;;;;;;;;;;;;
# * dom_<culture>_<ideology>_<region>;;;;;;;;;;;;;;
# * dom_<culture>_<region>;;;;;;;;;;;;;;
# * dom_<ideology>_<region>;;;;;;;;;;;;;;
# * dom_<region>;;;;;;;;;;;;;;
# If no localisation is found, the final localisation will be "$OWNER_ADJ$ $REGION$";;;;;;;;;;;;;;
#;;;;;;;;;;;;;;
Idhrendur marked this conversation as resolved.
Show resolved Hide resolved
dom_scandinavian_canada;Secret Denmark;Danemark Secret;Geheimnes D�nemark;Tajna Dania;Dinamarca Secreta;Danimarca Segreta;Titkos D�nia;Tajn� D�nsko;Titkos D�nia;Geheim Denemarken;Dinamarca Secreta;������ �����;Salainen Tanska;x
# Localisations for generated dominions
# The converter tries to find localisations in this order:
# * dom_<culture group>_<ideology>_<region>
# * dom_<culture group>_<region>
# * dom_<culture>_<ideology>_<region>
# * dom_<culture>_<region>
# * dom_<ideology>_<region>
# * dom_<region>
# If no localisation is found, the final localisation will be "$OWNER_ADJ$ $REGION$"
#
####;EN;FR;DE;PL;ES;IT;SW;CZ;HU;NL;PT;RU;FI;x
dom_scandinavian_canada;Secret Denmark;Danemark Secret;Geheimnes D�nemark;Tajna Dania;Dinamarca Secreta;Danimarca Segreta;Titkos D�nia;Tajn� D�nsko;Titkos D�nia;Geheim Denemarken;Dinamarca Secreta;������ �����;Salainen Tanska;x
dom_canada;Canada;Canada $OVERLORD_ADJ$;$OVERLORD_ADJ$es Kanada;$OVERLORD_ADJ$a Kanada;Canad� $OVERLORD_ADJ$;Canada $OVERLORD_ADJ$;;;;;Canad� $OVERLORD_ADJ$;$OVERLORD_ADJ$�� ������;;x
dom_california;California;Californie $OVERLORD_ADJ$;$OVERLORD_ADJ$es Kalifornien;$OVERLORD_ADJ$a Kalifornia;California $OVERLORD_ADJ$;California $OVERLORD_ADJ$;;;;;Calif�rnia $OVERLORD_ADJ$;$OVERLORD_ADJ$�� ����������;;x
dom_us_central;Louisiana;Louisiane $OVERLORD_ADJ$;$OVERLORD_ADJ$es Louisiana;$OVERLORD_ADJ$a Luizjana;Luisiana $OVERLORD_ADJ$;Luisiana $OVERLORD_ADJ$;;;;;Louisiana $OVERLORD_ADJ$;$OVERLORD_ADJ$�� ��������;;x
Expand Down
Loading