diff --git a/Vic2ToHoI4.vcxproj b/Vic2ToHoI4.vcxproj index be6680fb5b..7be4e4c0f4 100644 --- a/Vic2ToHoI4.vcxproj +++ b/Vic2ToHoI4.vcxproj @@ -106,6 +106,7 @@ + @@ -492,6 +493,7 @@ + diff --git a/Vic2ToHoI4.vcxproj.filters b/Vic2ToHoI4.vcxproj.filters index 205c0e54ba..a7903cf429 100644 --- a/Vic2ToHoI4.vcxproj.filters +++ b/Vic2ToHoI4.vcxproj.filters @@ -1129,6 +1129,9 @@ src\OutHoi4\Countries + + src\HoI4World\Decisions + @@ -2502,6 +2505,9 @@ src\OutHoi4\Countries + + src\HoI4World\Decisions + diff --git a/Vic2ToHoI4Tests.vcxproj b/Vic2ToHoI4Tests.vcxproj index e8c28d78ad..05e6682ebe 100644 --- a/Vic2ToHoI4Tests.vcxproj +++ b/Vic2ToHoI4Tests.vcxproj @@ -94,6 +94,7 @@ + @@ -773,6 +774,7 @@ + diff --git a/Vic2ToHoI4Tests.vcxproj.filters b/Vic2ToHoI4Tests.vcxproj.filters index 8f66ddebcd..5b4ebf81d9 100644 --- a/Vic2ToHoI4Tests.vcxproj.filters +++ b/Vic2ToHoI4Tests.vcxproj.filters @@ -1729,6 +1729,9 @@ src\HOI4World\Countries + + src\HOI4World\Decisions + @@ -3517,6 +3520,9 @@ src\OutHoi4\Countries + + src\HOI4World\Decisions + diff --git a/data/blank_mod/common/dynamic_modifiers/00_culture_modifiers.txt b/data/blank_mod/common/dynamic_modifiers/00_culture_modifiers.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/data/blank_mod/common/ideas/_cultures.txt b/data/blank_mod/common/ideas/_cultures.txt index 2c949913f4..efe51709d9 100644 --- a/data/blank_mod/common/ideas/_cultures.txt +++ b/data/blank_mod/common/ideas/_cultures.txt @@ -294,6 +294,12 @@ ideas = { picture = culture_aromanian modifier = { } } + culture_arvorigeg = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_arvorigeg + modifier = { } + } culture_ashkenazi = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -829,6 +835,12 @@ ideas = { ai_get_ally_desire_factor = -100 } } + culture_dramor = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_dramor + modifier = { } + } culture_duck_culture = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -1075,6 +1087,12 @@ ideas = { picture = culture_garanian modifier = { } } + culture_gaul = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_gaulish + modifier = { } + } culture_gaulish = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -1446,6 +1464,12 @@ ideas = { picture = culture_je modifier = { } } + culture_jerusalemer = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_jerusalemer + modifier = { } + } culture_jizni = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -1614,6 +1638,12 @@ ideas = { picture = culture_kuba modifier = { } } + culture_kulfoldi = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_kulfoldi + modifier = { } + } culture_kujaanan = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -2286,6 +2316,12 @@ ideas = { picture = culture_oldpommeranian modifier = { } } + culture_oltremare = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_oltremare + modifier = { } + } culture_oldspain = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -3109,6 +3145,12 @@ ideas = { picture = culture_ujvilag modifier = { } } + culture_ultramar = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_ultramar + modifier = { } + } culture_ukrainian = { removal_cost = -1 allowed = { always = no } allowed_civil_war = { always = yes } @@ -3411,5 +3453,78 @@ ideas = { picture = culture_zulu modifier = { } } + + #Superregions + culture_british_north_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_yankee + modifier = { } + } + culture_british_south_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_english + modifier = { } + } + culture_french_north_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_french_canadian + modifier = { } + } + culture_french_south_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_french + modifier = { } + } + culture_germanic_north_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_north_german + modifier = { } + } + culture_germanic_south_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_south_german + modifier = { } + } + culture_scandinavian_north_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_danish + modifier = { } + } + culture_scandinavian_south_america_superregion_culture = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_danish + modifier = { } + } + + #For Error Removal + culture_is_overseas = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_noculture + modifier = { } + } + culture_unit = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_noculture + modifier = { } + } + culture_leader = { + removal_cost = -1 + allowed = { always = no } allowed_civil_war = { always = yes } + picture = culture_noculture + modifier = { } + } + + + } } \ No newline at end of file diff --git a/data/blank_mod/gfx/interface/culture/00_culture_template.xcf b/data/blank_mod/gfx/interface/culture/00_culture_template.xcf new file mode 100644 index 0000000000..859f1bde03 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/00_culture_template.xcf differ diff --git a/data/blank_mod/gfx/interface/culture/culture_arvorigeg.dds b/data/blank_mod/gfx/interface/culture/culture_arvorigeg.dds new file mode 100644 index 0000000000..1a0e918115 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/culture_arvorigeg.dds differ diff --git a/data/blank_mod/gfx/interface/culture/culture_dramor.dds b/data/blank_mod/gfx/interface/culture/culture_dramor.dds new file mode 100644 index 0000000000..dfe16e8435 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/culture_dramor.dds differ diff --git a/data/blank_mod/gfx/interface/culture/culture_jerusalemer.dds b/data/blank_mod/gfx/interface/culture/culture_jerusalemer.dds new file mode 100644 index 0000000000..300e80acb2 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/culture_jerusalemer.dds differ diff --git a/data/blank_mod/gfx/interface/culture/culture_kulfoldi.dds b/data/blank_mod/gfx/interface/culture/culture_kulfoldi.dds new file mode 100644 index 0000000000..6fff31d1f8 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/culture_kulfoldi.dds differ diff --git a/data/blank_mod/gfx/interface/culture/culture_oltremare.dds b/data/blank_mod/gfx/interface/culture/culture_oltremare.dds new file mode 100644 index 0000000000..0fdede80a4 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/culture_oltremare.dds differ diff --git a/data/blank_mod/gfx/interface/culture/culture_ultramar.dds b/data/blank_mod/gfx/interface/culture/culture_ultramar.dds new file mode 100644 index 0000000000..9fe9554b60 Binary files /dev/null and b/data/blank_mod/gfx/interface/culture/culture_ultramar.dds differ diff --git a/data/blank_mod/gfx/interface/ideas/crowns/georgia_shield.dds b/data/blank_mod/gfx/interface/ideas/crowns/georgia_shield.dds new file mode 100644 index 0000000000..721d756cb3 Binary files /dev/null and b/data/blank_mod/gfx/interface/ideas/crowns/georgia_shield.dds differ diff --git a/data/blank_mod/gfx/interface/ideas/crowns/sweden_shield.dds b/data/blank_mod/gfx/interface/ideas/crowns/sweden_shield.dds new file mode 100644 index 0000000000..df902dc671 Binary files /dev/null and b/data/blank_mod/gfx/interface/ideas/crowns/sweden_shield.dds differ diff --git a/data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_leader_of_buisness.dds b/data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_leader.dds similarity index 100% rename from data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_leader_of_buisness.dds rename to data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_leader.dds diff --git a/data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_disguise_buisness.dds b/data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_operative.dds similarity index 100% rename from data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_disguise_buisness.dds rename to data/blank_mod/gfx/leaders/Animalia/portrait_unicorn_operative.dds diff --git a/data/blank_mod/localisation/braz_por/cultures_l_braz_por.yml b/data/blank_mod/localisation/braz_por/cultures_l_braz_por.yml index 94061d793e..c67e4da78c 100644 --- a/data/blank_mod/localisation/braz_por/cultures_l_braz_por.yml +++ b/data/blank_mod/localisation/braz_por/cultures_l_braz_por.yml @@ -408,6 +408,7 @@ culture_arcansian:0 "Arcansesa" culture_armenian:0 "Armênia" culture_aromanian:0 "Aromena" + culture_arvorigeg:0 "Arvorigeg" culture_ashkenazi:0 "Ashkenazi" culture_asian_minor:0 "Asiática (Não Especificado)" culture_assamese:0 "Assamesa" @@ -494,6 +495,7 @@ culture_dixie:0 "Americana Dixie" culture_dog_culture:0 "Cadela" culture_dongren:0 "Dōngrén" + culture_dramor:0 "Dramor" culture_dragon_culture:0 "Dragoa" culture_duck_culture:0 "Pata" culture_dummy:0 "£infinite" # Loc icon to show something's wrong @@ -595,6 +597,7 @@ culture_japanese:0 "Japonesa" culture_javan:0 "Javanesa" culture_je:0 "Jê" + culture_jerusalemer:0 "Jerusalemer" culture_jizni:0 "Ijení" culture_juodaodis:0 "Guodaodiça" culture_juzhno:0 "Yugenoa" @@ -623,6 +626,7 @@ culture_kreol:0 "Crioula" culture_kru:0 "Cru" culture_kuba:0 "Cuba" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Cuyânã" culture_kurdish:0 "Curda" culture_laaz:0 "Laaz" @@ -736,6 +740,7 @@ culture_old_ligurian:0 "Lígure" culture_oldpommeranian:0 "Pomerânia" culture_oldspain:0 "Ibera" + culture_oltremare:0 "Oltremare" culture_ontustik:0 "Onhtiustica" culture_oriya:0 "Oriá" culture_oromo:0 "Oroma" @@ -870,6 +875,7 @@ culture_ugrian:0 "Ugria" culture_uighur:0 "Uigur" culture_ujvilag:0 "Újvilág" + culture_ultramar:0 "Ultramar" culture_ukrainian:0 "Ucraniana" culture_undead:0 "Morta-Viva" culture_unyamwezi:0 "Unyamwezi" @@ -961,6 +967,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§! \n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§! \n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§! \n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1048,6 +1055,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§! \n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§! \n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§! \n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1148,6 +1156,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§! \n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§! \n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§! \n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§! \n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1177,6 +1186,7 @@ culture_kru_desc:0 "$primary_culture$: §Y$culture_kru$§! \n$culture_group$: §Y$west_african$§!\n$idea_language$: §Y$lang_kru$§!" culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§! \n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§! \n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§! \n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§! \n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" @@ -1289,6 +1299,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§! \n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§! \n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§! \n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1423,6 +1434,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§! \n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§! \n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§! \n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" + culture_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!" diff --git a/data/blank_mod/localisation/english/cultures_l_english.yml b/data/blank_mod/localisation/english/cultures_l_english.yml index 9dd90d538c..d7628d5b16 100644 --- a/data/blank_mod/localisation/english/cultures_l_english.yml +++ b/data/blank_mod/localisation/english/cultures_l_english.yml @@ -407,6 +407,7 @@ culture_arcansian:0 "Arcansian" culture_armenian:0 "Armenian" culture_aromanian:0 "Aromanian" + culture_arvorigeg:0 "Arvorigeg" culture_ashkenazi:0 "Ashkenazi" culture_asian_minor:0 "Asian (Unclassified)" culture_assamese:0 "Assamese" @@ -494,6 +495,7 @@ culture_dog_culture:0 "Dog" culture_dongren:0 "Dōngrén" culture_dragon_culture:0 "Dragon" + culture_dramor:0 "Dramor" culture_duck_culture:0 "Duck" culture_dummy:0 "£infinite" # Loc icon to show something's wrong culture_dutch:0 "Dutch" @@ -535,6 +537,7 @@ culture_galician:0 "Galician" culture_garanian:0 "Garanian" culture_garibaldine:0 "Garibaldine" + culture_gaul:0 "Gaul" culture_gaulish:0 "Gaulish" culture_geheimnisdeutsch:0 "Geheimnis-Deutsch" culture_georgian:0 "Georgian" @@ -594,6 +597,7 @@ culture_japanese:0 "Japanese" culture_javan:0 "Javan" culture_je:0 "Jê" + culture_jerusalemer:0 "Jerusalemer" culture_jizni:0 "Jižní" culture_juodaodis:0 "Juodaodis" culture_juzhno:0 "Južno" @@ -622,6 +626,7 @@ culture_kreol:0 "Kreol" culture_kru:0 "Kru" culture_kuba:0 "Kuba" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Kujaanan" culture_kurdish:0 "Kurdish" culture_laaz:0 "Laaz" @@ -735,6 +740,7 @@ culture_old_ligurian:0 "Ligurian" culture_oldpommeranian:0 "Pomeranian" culture_oldspain:0 "Iberian" + culture_oltremare:0 "Oltremare" culture_ontustik:0 "Oñtüstik" culture_oriya:0 "Oriya" culture_oromo:0 "Oromo" @@ -869,6 +875,7 @@ culture_ugrian:0 "Ugrian" culture_uighur:0 "Uyghur" culture_ujvilag:0 "Újvilág" + culture_ultramar:0 "Ultramar" culture_ukrainian:0 "Ukrainian" culture_undead:0 "Undead" culture_unrecognized:0 "Unrecognized" @@ -961,6 +968,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§!\n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§!\n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§!\n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§!\n$pron_guide$: §Yash-ke-NAH-tzee§!\n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§!\n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§!\n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1048,6 +1056,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§!\n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§!\n$pron_guide$: §Ytong-ZHERN§!\n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§!\n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§!\n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§!\n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§!\n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1089,6 +1098,7 @@ culture_galician_desc:0 "$primary_culture$: §Y$culture_galician$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_glg$§!" culture_garanian_desc:0 "$primary_culture$: §Y$culture_garanian$§!\n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_garibaldine_desc:0 "$primary_culture$: §Y$culture_garibaldine$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" + culture_gaul_desc:0 "$primary_culture$: §Y$culture_gaul$§!\n$culture_group$: §Y$celtic$§!\n$idea_language$: §Y$lang_xtg$§!" culture_gaulish_desc:0 "$primary_culture$: §Y$culture_gaulish$§!\n$culture_group$: §Y$celtic$§!\n$idea_language$: §Y$lang_xtg$§!" culture_geheimnisdeutsch_desc:0 "$primary_culture$: §Y$culture_geheimnisdeutsch$§!\n$pron_guide$: §gueh-high'm-niece-DOYCH§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_gem-ame$§!" culture_georgian_desc:0 "$primary_culture$: §Y$culture_georgian$§!\n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_kat$§!" @@ -1148,6 +1158,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§!\n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§!\n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§!\n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§!\n$pron_guide$: §YYEEZH-knee§!\n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§!\n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§!\n$pron_guide$: §YYOOZH-no§!\n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1177,6 +1188,7 @@ culture_kru_desc:0 "$primary_culture$: §Y$culture_kru$§!\n$culture_group$: §Y$west_african$§!\n$idea_language$: §Y$lang_kru$§!" culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§!\n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§!\n$culture_group$: §Y$baltic$§!\n$pron_guide$: §Ycoo-YAH-nan§!\n$idea_language$: §Y$lang_fin$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§!\n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§!\n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§!\n$pron_guide$: §Ylah-kah-NIGHT§!\n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" @@ -1289,6 +1301,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§!\n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§!\n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§!\n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§!\n$pron_guide$: §Yon-TYOOSE-tick§!\n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§!\n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§!\n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1423,6 +1436,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§!\n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§!\n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" 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_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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$§!" diff --git a/data/blank_mod/localisation/english/decisions2_l_english.yml b/data/blank_mod/localisation/english/decisions2_l_english.yml index 8361e1e98c..a52c3cc2b9 100644 --- a/data/blank_mod/localisation/english/decisions2_l_english.yml +++ b/data/blank_mod/localisation/english/decisions2_l_english.yml @@ -89,4 +89,6 @@ build_suez_canal_desc:0 "Our engineers have proposed to build a canal across the Isthmus of Suez. This would allow our ships to take a more direct route between Europe and Asia, so long as we control the territory it passes through." build_panama_canal:0 "Build the Panama Canal" build_panama_canal_desc:0 "Our engineers have proposed to build a canal across the Isthmus of Panama. This would allow our ships to take a more direct route between the Atlantic and Pacific, so long as we control the territory it passes through." - canal_unbuilt_tt:0 "This canal is only theoretical so far. Someone must spend the effort to actually build it." \ No newline at end of file + canal_unbuilt_tt:0 "This canal is only theoretical so far. Someone must spend the effort to actually build it." + union_formation_decision_tt:0 "Controls [?temp_original_states]; needs [?original_states]" + \ No newline at end of file diff --git a/data/blank_mod/localisation/french/cultures_l_french.yml b/data/blank_mod/localisation/french/cultures_l_french.yml index 13e46c420c..ab05547958 100644 --- a/data/blank_mod/localisation/french/cultures_l_french.yml +++ b/data/blank_mod/localisation/french/cultures_l_french.yml @@ -406,6 +406,7 @@ culture_arcansian:0 "Arcansienne" culture_armenian:0 "Arménienne" culture_aromanian:0 "Aroumaine" + culture_arvorigeg:0 "Arvorigeg" culture_ashkenazi:0 "Ashkénaze" culture_asian_minor:0 "Asiatique (Pas précisée)" culture_assamese:0 "Assamaise" @@ -492,6 +493,7 @@ culture_dixie:0 "Américaine Dixie" culture_dog_culture:0 "Chien" culture_dongren:0 "Dōngrén" + culture_dramor:0 "Dramor" culture_dragon_culture:0 "Dragonne" culture_duck_culture:0 "Canard" culture_dummy:0 "§infinite" # Loc icon to show something's wrong @@ -593,6 +595,7 @@ culture_japanese:0 "Japonaise" culture_javan:0 "Javanaise" culture_je:0 "Jêe" + culture_jerusalemer:0 "Jerusalemer" culture_jizni:0 "Yijnie" culture_juodaodis:0 "Youodaodisse" culture_juzhno:0 "Youjnoise" @@ -621,6 +624,7 @@ culture_kreol:0 "Créole" culture_kru:0 "Kroue" culture_kuba:0 "Kuba" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Kuyanaise" culture_kurdish:0 "Kurde" culture_laaz:0 "Laaz" @@ -734,6 +738,7 @@ culture_old_ligurian:0 "Ligure" culture_oldpommeranian:0 "Poméranienne" culture_oldspain:0 "Ibérique" + culture_oltremare:0 "Oltremare" culture_ontustik:0 "Ogntustique" culture_oriya:0 "Odia" culture_oromo:0 "Oromo" @@ -868,6 +873,7 @@ culture_ugrian:0 "Ougrique" culture_uighur:0 "Ouïghoure" culture_ujvilag:0 "Ouivilague" + culture_ultramar:0 "Ultramar" culture_ukrainian:0 "Ukraïnienne" culture_undead:0 "Morte-Vivante" culture_unyamwezi:0 "Unyamwezi" @@ -959,6 +965,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§! \n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§! \n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§! \n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1046,6 +1053,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§! \n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§! \n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§! \n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1146,6 +1154,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§! \n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§! \n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§! \n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§! \n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1175,6 +1184,7 @@ culture_kru_desc:0 "$primary_culture$: §Y$culture_kru$§! \n$culture_group$: §Y$west_african$§!\n$idea_language$: §Y$lang_kru$§!" culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§! \n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§! \n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§! \n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§! \n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" @@ -1287,6 +1297,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§! \n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§! \n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§! \n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1421,6 +1432,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§! \n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§! \n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§! \n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" + culture_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!" diff --git a/data/blank_mod/localisation/german/cultures_l_german.yml b/data/blank_mod/localisation/german/cultures_l_german.yml index dd81741611..e8755aa042 100644 --- a/data/blank_mod/localisation/german/cultures_l_german.yml +++ b/data/blank_mod/localisation/german/cultures_l_german.yml @@ -406,6 +406,7 @@ culture_arcansian:0 "Arkansit" culture_armenian:0 "Armenisch" culture_aromanian:0 "Aromunisch" + culture_arvorigeg:0 "Arvorigeg" culture_ashkenazi:0 "Aschkenasi" culture_asian_minor:0 "Asiatisch (Nicht spezifiziert)" culture_assamese:0 "Assamesisch" @@ -492,6 +493,7 @@ culture_dixie:0 "Dixieländisch" culture_dog_culture:0 "Hündisch" culture_dongren:0 "Dōngrén" + culture_dramor:0 "Dramor" culture_dragon_culture:0 "Drachen" culture_duck_culture:0 "Ente" culture_dummy:0 "£infinite" # Loc icon to show something's wrong @@ -593,6 +595,7 @@ culture_japanese:0 "Japanisch" culture_javan:0 "Javanisch" culture_je:0 "Ge" + culture_jerusalemer:0 "Jerusalemer" culture_jizni:0 "Jischni" culture_juodaodis:0 "Juodaodis" culture_juzhno:0 "Juschno" @@ -621,6 +624,7 @@ culture_kreol:0 "Kreolisch" culture_kru:0 "Kru" culture_kuba:0 "Kuba" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Kujaanisch" culture_kurdish:0 "Kurdisch" culture_laaz:0 "Laaz" @@ -734,6 +738,7 @@ culture_old_ligurian:0 "Ligurisch" culture_oldpommeranian:0 "Pomoranisch" culture_oldspain:0 "Iberisch" + culture_oltremare:0 "Oltremare" culture_ontustik:0 "Onjtüstik" culture_oriya:0 "Oriya" culture_oromo:0 "Oromo" @@ -868,6 +873,7 @@ culture_ugrian:0 "Ugrisch" culture_uighur:0 "Uigurisch" culture_ujvilag:0 "Újvilág" + culture_ultramar:0 "Ultramar" culture_ukrainian:0 "Ukrainisch" culture_undead:0 "Untot" culture_unyamwezi:0 "Unyamwezi" @@ -959,6 +965,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§! \n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§! \n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§! \n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1046,6 +1053,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§! \n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§! \n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§! \n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1146,6 +1154,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§! \n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§! \n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§! \n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§! \n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1175,6 +1184,7 @@ culture_kru_desc:0 "$primary_culture$: §Y$culture_kru$§! \n$culture_group$: §Y$west_african$§!\n$idea_language$: §Y$lang_kru$§!" culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§! \n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§! \n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§! \n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§! \n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" @@ -1287,6 +1297,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§! \n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§! \n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§! \n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1421,6 +1432,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§! \n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§! \n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§! \n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" + culture_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!" diff --git a/data/blank_mod/localisation/polish/cultures_l_polish.yml b/data/blank_mod/localisation/polish/cultures_l_polish.yml index d97a730456..296e8ac514 100644 --- a/data/blank_mod/localisation/polish/cultures_l_polish.yml +++ b/data/blank_mod/localisation/polish/cultures_l_polish.yml @@ -406,6 +406,7 @@ culture_arcansian:0 "Arkansaska" culture_armenian:0 "Armeńska" culture_aromanian:0 "Arumuńska" + culture_arvorigeg:0 "Arvorigeg" culture_ashkenazi:0 "Aszkenazyjska" culture_asian_minor:0 "Azjacka (Nie Określon.)" culture_assamese:0 "Asamska" @@ -492,6 +493,7 @@ culture_dixie:0 "Południowoamerykańska" culture_dog_culture:0 "Psia" culture_dongren:0 "Dōngrén" + culture_dramor:0 "Dramor" culture_dragon_culture:0 "Dragońska" culture_duck_culture:0 "Kacza" culture_dummy:0 "£infinite" # Loc icon to show something's wrong @@ -593,6 +595,7 @@ culture_japanese:0 "Japońska" culture_javan:0 "Jawajska" culture_je:0 "Ge" + culture_jerusalemer:0 "Jerusalemer" culture_jizni:0 "Jiźnyska" culture_juodaodis:0 "Juodaodiska" culture_juzhno:0 "Jużnońska" @@ -621,6 +624,7 @@ culture_kreol:0 "Kreolska" culture_kru:0 "Kru" culture_kuba:0 "Kuba" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Kujaańska" culture_kurdish:0 "Kurdyjska" culture_laaz:0 "Laaz" @@ -734,6 +738,7 @@ culture_old_ligurian:0 "Liguryjska" culture_oldpommeranian:0 "Pomorska" culture_oldspain:0 "Iberyjska" + culture_oltremare:0 "Oltremare" culture_ontustik:0 "Ońtystikska" culture_oriya:0 "Orija" culture_oromo:0 "Oromo" @@ -868,6 +873,7 @@ culture_ugrian:0 "Ugryjska" culture_uighur:0 "Ujgurska" culture_ujvilag:0 "Újvilág" + culture_ultramar:0 "Ultramar" culture_ukrainian:0 "Ukraińska" culture_undead:0 "Nieumarła" culture_unyamwezi:0 "Unyamwezi" @@ -959,6 +965,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§! \n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§! \n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§! \n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1046,6 +1053,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§! \n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§! \n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§! \n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1146,6 +1154,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§! \n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§! \n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§! \n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§! \n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1175,6 +1184,7 @@ culture_kru_desc:0 "$primary_culture$: §Y$culture_kru$§! \n$culture_group$: §Y$west_african$§!\n$idea_language$: §Y$lang_kru$§!" culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§! \n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§! \n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§! \n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§! \n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" @@ -1287,6 +1297,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§! \n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§! \n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§! \n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1421,6 +1432,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§! \n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§! \n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§! \n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" + culture_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!" diff --git a/data/blank_mod/localisation/russian/cultures_l_russian.yml b/data/blank_mod/localisation/russian/cultures_l_russian.yml index 5b86aa6522..2692b41065 100644 --- a/data/blank_mod/localisation/russian/cultures_l_russian.yml +++ b/data/blank_mod/localisation/russian/cultures_l_russian.yml @@ -406,6 +406,7 @@ culture_arcansian:0 "Аркансьская" culture_armenian:0 "Армянская" culture_aromanian:0 "Арумынская" + culture_arvorigeg:0 "Арворигег" culture_ashkenazi:0 "Ашкеназийская" culture_asian_minor:0 "Азиатская (Не Указана)" culture_assamese:0 "Ассамская" @@ -492,6 +493,7 @@ culture_dixie:0 "Дикси-Штатовская" culture_dog_culture:0 "Собачая" culture_dongren:0 "Дунжэнь" + culture_dramor:0 "Драмор" culture_dragon_culture:0 "Смокская" culture_duck_culture:0 "Утка" culture_dummy:0 "£infinite" # Loc icon to show something's wrong @@ -593,6 +595,7 @@ culture_japanese:0 "Японская" culture_javan:0 "Яванская" culture_je:0 "Же" + culture_jerusalemer:0 "иерусалимец" culture_jizni:0 "Иижная" culture_juodaodis:0 "Юодаодис" culture_juzhno:0 "Южно" @@ -621,6 +624,7 @@ culture_kreol:0 "Креольская" culture_kru:0 "Кру" culture_kuba:0 "Куба" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Куянанская" culture_kurdish:0 "Курдская" culture_laaz:0 "Лааз" @@ -734,6 +738,7 @@ culture_old_ligurian:0 "Лигурская" culture_oldpommeranian:0 "Поморская" culture_oldspain:0 "Иберийская" + culture_oltremare:0 "Ольтремаре" culture_ontustik:0 "Оньтюстик" culture_oriya:0 "Ория" culture_oromo:0 "Оромо" @@ -868,6 +873,7 @@ culture_ugrian:0 "Угорская" culture_uighur:0 "Уйгурская" culture_ujvilag:0 "Уйвилаг" + culture_ultramar:0 "Ультрамар" culture_ukrainian:0 "Украинская" culture_undead:0 "Неживая" culture_unyamwezi:0 "Унямвези" @@ -959,6 +965,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§! \n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§! \n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§! \n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1046,6 +1053,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§! \n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§! \n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§! \n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1146,6 +1154,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§! \n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§! \n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§! \n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§! \n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1176,6 +1185,7 @@ culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§! \n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§! \n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§! \n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§! \n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" culture_lacustrine_bantu_desc:0 "$primary_culture$: §Y$culture_lacustrine_bantu$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_bnt$§!" @@ -1287,6 +1297,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§! \n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§! \n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§! \n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1421,6 +1432,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§! \n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§! \n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§! \n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" + culture_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!" diff --git a/data/blank_mod/localisation/spanish/cultures_l_spanish.yml b/data/blank_mod/localisation/spanish/cultures_l_spanish.yml index 3a3275452f..42e8aeabc5 100644 --- a/data/blank_mod/localisation/spanish/cultures_l_spanish.yml +++ b/data/blank_mod/localisation/spanish/cultures_l_spanish.yml @@ -405,7 +405,9 @@ culture_aravacian:0 "Aravacia" culture_arcansian:0 "Arcansia" culture_armenian:0 "Armenia" + culture_arvorigeg:0 "Arvorigeg" culture_aromanian:0 "Arrumana" + culture_arvorigeg:0 "Arvorigeg" culture_ashkenazi:0 "Asquenazí" culture_asian_minor:0 "Asiática (No especificada)" culture_assamese:0 "Asamesa" @@ -492,6 +494,7 @@ culture_dixie:0 "Americana Dixie" culture_dog_culture:0 "Perra" culture_dongren:0 "Dōngrén" + culture_dramor:0 "Dramor" culture_dragon_culture:0 "Dragón" culture_duck_culture:0 "Pata" culture_dummy:0 "£infinite" # Loc icon to show something's wrong @@ -593,6 +596,7 @@ culture_japanese:0 "Japonesa" culture_javan:0 "Javanesa" culture_je:0 "Ye" + culture_jerusalemer:0 "Jerusalemer" culture_jizni:0 "Yiní" culture_juodaodis:0 "Yuodaodis" culture_juzhno:0 "Yuyno" @@ -621,6 +625,7 @@ culture_kreol:0 "Criolla" culture_kru:0 "Kru" culture_kuba:0 "Kuba" + culture_kulfoldi:0 "Külföldi" culture_kujaanan:0 "Kuyaná" culture_kurdish:0 "Kurda" culture_laaz:0 "Laaz" @@ -734,6 +739,7 @@ culture_old_ligurian:0 "Ligur" culture_oldpommeranian:0 "Pomerania" culture_oldspain:0 "Ibérica" + culture_oltremare:0 "Oltremare" culture_ontustik:0 "Oñtustik" culture_oriya:0 "Oriya" culture_oromo:0 "Oromo" @@ -868,6 +874,7 @@ culture_ugrian:0 "Ugra" culture_uighur:0 "Uigur" culture_ujvilag:0 "Újvilág" + culture_ultramar:0 "Ultramar" culture_ukrainian:0 "Ucraniana" culture_undead:0 "No-Muerta" culture_unyamwezi:0 "Unyamwezi" @@ -959,6 +966,7 @@ culture_arcansian_desc:0 "$primary_culture$: §Y$culture_arcansian$§! \n$culture_group$: §Y$romantic$§!\n$idea_language$: §Y$lang_lat$§!" culture_armenian_desc:0 "$primary_culture$: §Y$culture_armenian$§! \n$culture_group$: §Y$levantine$§!\n$idea_language$: §Y$lang_hye$§!" culture_aromanian_desc:0 "$primary_culture$: §Y$culture_aromanian$§! \n$culture_group$: §Y$pan_romanian$§!\n$idea_language$: §Y$lang_rup$§!" + culture_arvorigeg_desc:0 "$primary_culture$: §Y$culture_arvorigeg$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_bre$§!" culture_ashkenazi_desc:0 "$primary_culture$: §Y$culture_ashkenazi$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_asian_minor_desc:0 "$primary_culture$: §Y$culture_asian_minor$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_hin$§!" culture_assamese_desc:0 "$primary_culture$: §Y$culture_assamese$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_asm$§!" @@ -1046,6 +1054,7 @@ culture_dog_culture_desc:0 "$primary_culture$: §Y$culture_dog_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dog_speak$§!" culture_dongren_desc:0 "$primary_culture$: §Y$culture_dongren$§! \n$culture_group$: §Y$east_asian$§!\n$idea_language$: §Y$lang_zho$§!" culture_dragon_culture_desc:0 "$primary_culture$: §Y$culture_dragon_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$dragon_speak$§!" + culture_dramor_desc:0 "$primary_culture$: §Y$culture_dramor$§!\n$culture_group$: §Y$british$§!\n$idea_language$: §Y$lang_cym$§!" culture_duck_culture_desc:0 "$primary_culture$: §Y$culture_duck_culture$§! \n$culture_group$: §Y$non_human$§!\n$idea_language$: §Y$duck_speak$§!" culture_dummy_desc:0 "$primary_culture$: §Y$culture_dummy$§! \n$culture_group$: §Y$culture_dummy$§!\n$idea_language$: §Y$culture_dummy$§!" culture_dutch_desc:0 "$primary_culture$: §Y$culture_dutch$§! \n$culture_group$: §Y$beneluxian$§!\n$idea_language$: §Y$lang_nld$§!" @@ -1146,6 +1155,7 @@ culture_japanese_desc:0 "$primary_culture$: §Y$culture_japanese$§! \n$culture_group$: §Y$far_east_asian$§!\n$idea_language$: §Y$lang_jpn$§!" culture_javan_desc:0 "$primary_culture$: §Y$culture_javan$§! \n$culture_group$: §Y$southeast_asian$§!\n$idea_language$: §Y$lang_ind$§!" culture_je_desc:0 "$primary_culture$: §Y$culture_je$§! \n$culture_group$: §Y$native_south_american$§!\n$idea_language$: §Y$lang_opy$§!" + culture_jerusalemer_desc:0 "$primary_culture$: §Y$culture_jerusalemer$§!\n$culture_group$: §Y$germanic$§!\n$idea_language$: §Y$lang_ger$§!" culture_jizni_desc:0 "$primary_culture$: §Y$culture_jizni$§! \n$culture_group$: §Y$czecho_slovak_culture_group$§!\n$idea_language$: §Y$lang_ces$§!" culture_juodaodis_desc:0 "$primary_culture$: §Y$culture_juodaodis$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_lit$§!" culture_juzhno_desc:0 "$primary_culture$: §Y$culture_juzhno$§! \n$culture_group$: §Y$south_slavic$§!\n$idea_language$: §Y$lang_hbs$§!" @@ -1175,6 +1185,7 @@ culture_kru_desc:0 "$primary_culture$: §Y$culture_kru$§! \n$culture_group$: §Y$west_african$§!\n$idea_language$: §Y$lang_kru$§!" culture_kuba_desc:0 "$primary_culture$: §Y$culture_kuba$§! \n$culture_group$: §Y$central_african$§!\n$idea_language$: §Y$lang_lub$§!" culture_kujaanan_desc:0 "$primary_culture$: §Y$culture_kujaanan$§! \n$culture_group$: §Y$baltic$§!\n$idea_language$: §Y$lang_fin$§!" + culture_kulfoldi_desc:0 "$primary_culture$: §Y$culture_kulfoldi$§!\n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" culture_kurdish_desc:0 "$primary_culture$: §Y$culture_kurdish$§! \n$culture_group$: §Y$turko_semitic$§!\n$idea_language$: §Y$lang_kur$§!" culture_laaz_desc:0 "$primary_culture$: §Y$culture_laaz$§! \n$culture_group$: §Y$jewish_group$§!\n$idea_language$: §Y$lang_heb$§!" culture_lacanite_desc:0 "$primary_culture$: §Y$culture_lacanite$§! \n$culture_group$: §Y$punic$§!\n$idea_language$: §Y$lang_phn$§!" @@ -1287,6 +1298,7 @@ culture_old_ligurian_desc:0 "$primary_culture$: §Y$culture_old_ligurian$§! \n$culture_group$: §Y$old_italian$§!\n$idea_language$: §Y$lang_lij$§!" culture_oldpommeranian_desc:0 "$primary_culture$: §Y$culture_oldpommeranian$§! \n$culture_group$: §Y$polish_culture_group$§!\n$idea_language$: §Y$lang_csb$§!" culture_oldspain_desc:0 "$primary_culture$: §Y$culture_oldspain$§! \n$culture_group$: §Y$pre_indo_european$§!\n$idea_language$: §Y$lang_xib$§!" + culture_oltremare_desc:0 "$primary_culture$: §Y$culture_oltremare$§!\n$culture_group$: §Y$italian$§!\n$idea_language$: §Y$lang_ita$§!" culture_ontustik_desc:0 "$primary_culture$: §Y$culture_ontustik$§! \n$culture_group$: §Y$central_asian$§!\n$idea_language$: §Y$lang_uzb$§!" culture_oriya_desc:0 "$primary_culture$: §Y$culture_oriya$§! \n$culture_group$: §Y$south_asian$§!\n$idea_language$: §Y$lang_ori$§!" culture_oromo_desc:0 "$primary_culture$: §Y$culture_oromo$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_orm$§!" @@ -1421,6 +1433,7 @@ culture_ugrian_desc:0 "$primary_culture$: §Y$culture_ugrian$§! \n$culture_group$: §Y$east_slavic$§!\n$idea_language$: §Y$lang_kca$§!" culture_uighur_desc:0 "$primary_culture$: §Y$culture_uighur$§! \n$culture_group$: §Y$iranian_turanian$§!\n$idea_language$: §Y$lang_uig$§!" culture_ujvilag_desc:0 "$primary_culture$: §Y$culture_ujvilag$§! \n$culture_group$: §Y$hungarian_culture_group$§!\n$idea_language$: §Y$lang_hun$§!" + culture_ultramar_desc:0 "$primary_culture$: §Y$culture_ultramar$§!\n$culture_group$: §Y$iberian$§!\n$idea_language$: §Y$lang_spa$§!" 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_unyamwezi_desc:0 "$primary_culture$: §Y$culture_unyamwezi$§! \n$culture_group$: §Y$east_african$§!\n$idea_language$: §Y$lang_nym$§!" diff --git a/data/configurables/cultureGroupToGraphics.txt b/data/configurables/cultureGroupToGraphics.txt index c4dc657f27..ab1c165501 100644 --- a/data/configurables/cultureGroupToGraphics.txt +++ b/data/configurables/cultureGroupToGraphics.txt @@ -6906,7 +6906,7 @@ falklands_sunset_invasion = { } male_operative_portraits = { "gfx/leaders/Animalia/portrait_Spymaster_Glitterhoof.dds" - "gfx/leaders/Animalia/portrait_unicorn_disguise_buisness.dds" + "gfx/leaders/Animalia/portrait_unicorn_operative.dds" } female_operative_portraits = { "gfx/leaders/Animalia/portrait_Spymaster_Glitterhoof.dds" # Revise diff --git a/src/HOI4World/Decisions/Decision.cpp b/src/HOI4World/Decisions/Decision.cpp index dbe61050dc..1f7e7f9f40 100644 --- a/src/HOI4World/Decisions/Decision.cpp +++ b/src/HOI4World/Decisions/Decision.cpp @@ -3,6 +3,10 @@ #include "external/common_items/ParserHelpers.h" +HoI4::decision::decision(std::string decisionName) +{ + name = decisionName; +} HoI4::decision::decision(std::string decisionName, std::istream& theStream): name(std::move(decisionName)) { @@ -121,7 +125,8 @@ HoI4::decision::decision(std::string decisionName, std::istream& theStream): nam }); registerKeyword("fire_only_once", [this](std::istream& theStream) { const commonItems::singleString theFire(theStream); - fireOnlyOnce = theFire.getString(); + if (theFire.getString().find("yes") != std::string::npos) + fireOnlyOnce = true; }); registerKeyword("modifier", [this](std::istream& theStream) { const commonItems::stringOfItem theModifier(theStream); diff --git a/src/HOI4World/Decisions/Decision.h b/src/HOI4World/Decisions/Decision.h index d3849d494d..671b1179b7 100644 --- a/src/HOI4World/Decisions/Decision.h +++ b/src/HOI4World/Decisions/Decision.h @@ -14,6 +14,7 @@ namespace HoI4 class decision: commonItems::parser { public: + decision(std::string decisionName); decision(std::string decisionName, std::istream& theStream); [[nodiscard]] std::string getName() const { return name; } @@ -24,11 +25,14 @@ class decision: commonItems::parser [[nodiscard]] std::string getRemoveEffect() const { return removeEffect; } [[nodiscard]] std::string getTimeoutEffect() const { return timeoutEffect; } [[nodiscard]] std::string getAiWillDo() const { return aiWillDo; } + [[nodiscard]] bool getFireOnlyOnce() const { return fireOnlyOnce; } void setAllowed(const std::string& newAllowed) { allowed = newAllowed; } void setAvailable(const std::string& newAvailable) { available = newAvailable; } + void setIcon(const std::string& newIcon) { icon = newIcon; } void setHighlightStateTargets(const std::string& newHighlightStates) { highlightStateTargets = newHighlightStates; } void setActivation(const std::string& newActivation) { activation = newActivation; } + void setTargetRootTrigger(const std::string& newTargetRootTrigger) { targetRootTrigger = newTargetRootTrigger; } void setTargetTrigger(const std::string& newTargetTrigger) { targetTrigger = newTargetTrigger; } void setVisible(const std::string& newVisible) { visible = newVisible; } void setCompleteEffect(const std::string& newEffect) { completeEffect = newEffect; } @@ -37,6 +41,9 @@ class decision: commonItems::parser void setTimeoutEffect(const std::string& newEffect) { timeoutEffect = newEffect; } void setAiWillDo(const std::string& newAiWillDo) { aiWillDo = newAiWillDo; } void setModifier(const std::string& newModifier) { modifier = newModifier; } + void setOnMapMode(const std::string& newOnMapMode) { onMapMode = newOnMapMode; } + void setStateTarget(const bool& usesStateTarget) { stateTarget = usesStateTarget; } + void setFireOnlyOnce(const bool& firesOnlyOnce) { fireOnlyOnce = firesOnlyOnce; } bool operator==(const decision& otherDecision) const; @@ -69,7 +76,7 @@ class decision: commonItems::parser std::string removeEffect; std::string timeoutEffect; std::string aiWillDo; - std::string fireOnlyOnce; + bool fireOnlyOnce = false; std::optional daysRemove; std::optional daysReEnable; std::optional cost; diff --git a/src/HOI4World/Decisions/Decisions.cpp b/src/HOI4World/Decisions/Decisions.cpp index cb510d7259..db8c54694e 100644 --- a/src/HOI4World/Decisions/Decisions.cpp +++ b/src/HOI4World/Decisions/Decisions.cpp @@ -29,12 +29,15 @@ void HoI4::decisions::updateDecisions(const std::set& majorIdeologi const std::map& defaultStates, const Events& theEvents, const std::set& southAsianCountries, - const std::vector& strongestGpNavies) + const std::vector& strongestGpNavies, + const std::vector& unionCountries) { Log(LogLevel::Info) << "\tUpdating decisions"; generateIdeologicalCategories(majorIdeologies, provinceToStateIdMap); + unionDecisions.createDecisions(unionCountries); + agentRecruitmentDecisions.updateDecisions(southAsianCountries); stabilityDecisions.updateDecisions(majorIdeologies); politicalDecisions.updateDecisions(majorIdeologies, theEvents); diff --git a/src/HOI4World/Decisions/Decisions.h b/src/HOI4World/Decisions/Decisions.h index 2658b0220c..794afde6b7 100644 --- a/src/HOI4World/Decisions/Decisions.h +++ b/src/HOI4World/Decisions/Decisions.h @@ -15,8 +15,10 @@ #include "src/HOI4World/Decisions/PoliticalDecisions.h" #include "src/HOI4World/Decisions/ResourceProspectingDecisions.h" #include "src/HOI4World/Decisions/StabilityWarSupportDecisions.h" +#include "src/HOI4World/Decisions/UnionDecisions.h" #include "src/HOI4World/Events/Events.h" #include "src/HOI4World/States/DefaultState.h" +#include "src/HOI4World/States/HoI4State.h" #include #include #include @@ -37,7 +39,8 @@ class decisions: commonItems::parser const std::map& defaultStates, const Events& theEvents, const std::set& southAsianCountries, - const std::vector& strongestGpNavies); + const std::vector& strongestGpNavies, + const std::vector& unionCountries); [[nodiscard]] const auto& getIdeologicalCategories() const { return *ideologicalCategories; } [[nodiscard]] const std::vector& getAgentRecruitmentDecisions() const @@ -68,6 +71,10 @@ class decisions: commonItems::parser { return resourceProspectingDecisions.getDecisions(); } + [[nodiscard]] const std::vector& getUnionDecisions() const + { + return unionDecisions.getDecisions(); + } [[nodiscard]] const std::vector& getGenericDecisions() const { return genericDecisions.getDecisions(); @@ -81,6 +88,7 @@ class decisions: commonItems::parser static std::optional getRelevantStateFromProvince(int province, const std::map& provinceToStateIdMap); std::unique_ptr ideologicalCategories; + std::unique_ptr formableCategories; AgentRecruitmentDecisions agentRecruitmentDecisions; StabilityWarSupportDecisions stabilityDecisions; @@ -89,6 +97,7 @@ class decisions: commonItems::parser ForeignInfluenceDecisions foreignInfluenceDecisions; NavalTreatyDecisions navalTreatyDecisions; ResourceProspectingDecisions resourceProspectingDecisions; + UnionDecisions unionDecisions; GenericDecisions genericDecisions; }; diff --git a/src/HOI4World/Decisions/DecisionsInCategory.h b/src/HOI4World/Decisions/DecisionsInCategory.h index a867346bc6..fd02605a71 100644 --- a/src/HOI4World/Decisions/DecisionsInCategory.h +++ b/src/HOI4World/Decisions/DecisionsInCategory.h @@ -18,17 +18,34 @@ namespace HoI4 class DecisionsInCategory: commonItems::parser { public: + explicit DecisionsInCategory(std::string category_name): name(std::move(category_name)) {} DecisionsInCategory(std::string categoryName, std::istream& theStream); + typedef struct + { + std::string english; + std::string french; + std::string german; + std::string polish; + std::string portuguese; + std::string russian; + std::string spanish; + } LocBlock; + [[nodiscard]] auto getDecisions() const { return theDecisions; } + [[nodiscard]] auto getLocalisation() const { return localisation; } + [[nodiscard]] const auto& getcustomLocalisation() const { return customLocalisation; } [[nodiscard]] const auto& getName() const { return name; } + void addCustomLocalisation(const std::pair& newLoc) { customLocalisation.emplace(newLoc); } + void addDecision(decision& theDecision) { theDecisions.push_back(theDecision); } + void addLocalisation(const std::pair newLoc) { localisation.emplace(newLoc); } + void replaceDecision(const decision& theDecision) { std::replace(theDecisions.begin(), theDecisions.end(), theDecision, theDecision); } void replaceDecisions(const std::vector& newDecisions) { theDecisions = newDecisions; } - void addDecision(decision& theDecision) { theDecisions.push_back(theDecision); } void updatePoliticalDecisions(const std::set& majorIdeologies, const Events& theEvents); @@ -39,6 +56,8 @@ class DecisionsInCategory: commonItems::parser private: std::string name = ""; std::vector theDecisions; + std::map localisation; + std::map customLocalisation; void updateHoldTheIdeologyNationalReferendum(decision& decisionToUpdate, const Events& theEvents) const; }; diff --git a/src/HOI4World/Decisions/UnionDecisions.cpp b/src/HOI4World/Decisions/UnionDecisions.cpp new file mode 100644 index 0000000000..cb5bdbd99c --- /dev/null +++ b/src/HOI4World/Decisions/UnionDecisions.cpp @@ -0,0 +1,242 @@ +#include "src/HOI4World/Decisions/UnionDecisions.h" + +void HoI4::UnionDecisions::createDecisions(const std::vector& unionCountries) +{ + DecisionsInCategory formableDecisionsCategory("formable_nations"); + for (auto unionCountry: unionCountries) + { + const auto& oldTag = unionCountry.GetTag().substr(0, 2); + const auto& tag = unionCountry.GetTag(); + const auto& name = "form_" + tag; + decision formationDecisionStateTrigger(name + "_state_trigger"); + decision formationDecision(name); + DecisionsInCategory::LocBlock locBlock; + + // Custom Loc + formableDecisionsCategory.addCustomLocalisation( + std::pair(name + "_loc_DEF", "\t= {\n\t\tlocalization_key = " + tag + "_DEF\n\t}")); + formableDecisionsCategory.addCustomLocalisation( + std::pair(name + "_loc_ADJ", "\t= {\n\t\tlocalization_key = " + tag + "_ADJ\n\t}")); + + // STATE TRIGGER + // Allowed + std::string allowed = "= {\n"; + allowed += "\t\t\tNOT = { original_tag = " + oldTag + " }\n"; + allowed += "\t\t}"; + formationDecisionStateTrigger.setAllowed(allowed); + + // State Target/On Map Mode/Icon + formationDecisionStateTrigger.setStateTarget(true); + formationDecisionStateTrigger.setOnMapMode("map_only"); + formationDecisionStateTrigger.setIcon("decision_generic_nationalism"); + + // Target ROOT Trigger + std::string targetRootTrigger = "= {\n"; + targetRootTrigger += "\t\t\t OR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + targetRootTrigger += "\t\t\t\thas_idea = culture_" + culture + "\n"; + } + targetRootTrigger += "\t\t\t}\n"; + targetRootTrigger += "\t\t\tNOT = { has_cosmetic_tag = " + tag + " }\n"; + targetRootTrigger += "\t\t\t" + oldTag + " = { exists = no }\n"; + targetRootTrigger += "\t\t}\n"; + formationDecisionStateTrigger.setTargetRootTrigger(targetRootTrigger); + + // Target Trigger + std::string targetTrigger = "= {\n"; + targetTrigger += "\t\t\tFROM = {\n"; + targetTrigger += "\t\t\t\tOR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + targetTrigger += "\t\t\t\t\thas_state_flag = major_culture_" + culture + "_flag\n"; + } + targetTrigger += "\t\t\t\t}\n"; + targetTrigger += "\t\t\t}\n"; + targetTrigger += "\t\t}\n"; + formationDecisionStateTrigger.setTargetTrigger(targetTrigger); + + // Highlight States + std::string highlightStates = "= {\n"; + highlightStates += "\t\t\thighlight_states_trigger = {\n"; + highlightStates += "\t\t\t\t OR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + highlightStates += "\t\t\t\t\thas_state_flag = major_culture_" + culture + "_flag\n"; + } + highlightStates += "\t\t\t\t}\n"; + highlightStates += "\t\t\t}\n"; + highlightStates += "\t\t\thighlight_color_before_active = 1\n"; + highlightStates += "\t\t\thighlight_color_while_active = 2\n"; + highlightStates += "\t\t}"; + formationDecisionStateTrigger.setHighlightStateTargets(highlightStates); + + // Available + std::string available = "= {\n"; + available += "\t\t\thidden_trigger = {\n"; + available += "\t\t\t\tset_temp_variable = { temp_original_states = 0 }\n"; + available += "\t\t\t\tset_temp_variable = { original_states = 0 }\n"; + available += "\t\t\t\tif = {\n"; + available += "\t\t\t\t\tlimit = {\n"; + available += "\t\t\t\t\t\tall_state = {\n"; + available += "\t\t\t\t\t\t\tif = {\n"; + available += "\t\t\t\t\t\t\t\tlimit = {\n"; + available += "\t\t\t\t\t\t\t\t\tOR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + available += "\t\t\t\t\t\t\t\t\t\thas_state_flag = major_culture_" + culture + "_flag\n"; + } + available += "\t\t\t\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t\t\t\tadd_to_temp_variable = { ROOT.original_states = 1 }\n"; + available += "\t\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t}\n"; + available += "\t\t\t\t}\n"; + available += "\t\t\t\tif = {\n"; + available += "\t\t\t\t\tlimit = {\n"; + available += "\t\t\t\t\t\tall_controlled_state = {\n"; + available += "\t\t\t\t\t\t\tif = {\n"; + available += "\t\t\t\t\t\t\t\tlimit = {\n"; + available += "\t\t\t\t\t\t\t\t\tOR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + available += "\t\t\t\t\t\t\t\t\t\thas_state_flag = major_culture_" + culture + "_flag\n"; + } + available += "\t\t\t\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t\t\t\tadd_to_temp_variable = { ROOT.temp_original_states = 1 }\n"; + available += "\t\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t\t}\n"; + available += "\t\t\t\t\t}\n"; + available += "\t\t\t\t}\n"; + available += "\t\t\t\tmultiply_temp_variable = { ROOT.original_states = 0.75 }\n"; + available += "\t\t\t\tround_temp_variable = ROOT.original_states\n"; + available += "\t\t\t}\n"; + available += "\t\t\tcustom_trigger_tooltip = {\n"; + available += "\t\t\t\ttooltip = union_formation_decision_tt\n"; + available += "\t\t\t\tcheck_variable = {\n"; + available += "\t\t\t\t\tvar = temp_original_states\n"; + available += "\t\t\t\t\tvalue = original_states\n"; + available += "\t\t\t\t\tcompare = greater_than_or_equals\n"; + available += "\t\t\t\t}\n"; + available += "\t\t\t}\n"; + available += "\t\t\tNOT = {\n"; + available += "\t\t\t\tany_other_country = {\n"; + available += "\t\t\t\t\thas_cosmetic_tag = " + tag + "\n"; + available += "\t\t\t\t\texists = yes\n"; + available += "\t\t\t\t}\n"; + available += "\t\t\t}\n"; + available += "\t\t}"; + formationDecisionStateTrigger.setAvailable(available); + + // Complete Effect + std::string completeEffect = "= {\n"; + completeEffect += "\t\t\tactivate_decision = " + name + "\n"; + completeEffect += "\t\t}"; + formationDecisionStateTrigger.setCompleteEffect(completeEffect); + + // AI Will Do + formationDecisionStateTrigger.setAiWillDo("= {\n\t\t\tbase = 100\n\t\t}"); + + // Localisation + locBlock.english = "[" + name + "_loc_ADJ] State"; + locBlock.french = "One of the [?original_states] states needed to form [" + name + "_loc_DEF]."; + locBlock.german = "[" + name + "_loc_ADJ] Zustand"; + locBlock.polish = "[" + name + "_loc_ADJ] państwo"; + locBlock.portuguese = "[" + name + "_loc_ADJ] Estado"; + locBlock.russian = "[" + name + "_loc_ADJ] государство"; + locBlock.spanish = "[" + name + "_loc_ADJ] Estado"; + formableDecisionsCategory.addLocalisation(std::pair(name + "_state_trigger", locBlock)); + locBlock.english = "One of the [?original_states] states needed to form [" + name + "_loc_DEF]."; + locBlock.french = "L'un des états [?original_states] nécessaires pour former [" + name + "_loc_DEF]."; + locBlock.german = "Einer der [?original_states]-Zustände, die zum Bilden von [" + name + "_loc_DEF] benötigt werden."; + locBlock.polish = "Jeden ze stanów [?original_states] potrzebnych do utworzenia [" + name + "_loc_DEF]."; + locBlock.portuguese = "Um dos estados [?original_states] precisava formar [" + name + "_loc_DEF]."; + locBlock.russian = "Одно из состояний [?original_states], необходимое для формирования [" + name + "_loc_DEF]."; + locBlock.spanish = "Uno de los estados [?original_states] necesarios para formar [" + name + "_loc_DEF]."; + formableDecisionsCategory.addLocalisation(std::pair(name + "_state_trigger_desc", locBlock)); + + // Add to Category + formableDecisionsCategory.addDecision(formationDecisionStateTrigger); + + + // FORMATION DECISION + // Allowed + formationDecision.setAllowed(allowed); // Same as State Trigger + + // Visible + std::string visible = "= {\n"; + visible += "\t\t\tOR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + visible += "\t\t\t\thas_idea = culture_" + culture + "\n"; + } + visible += "\t\t\t}\n"; + visible += "\t\t\tNOT = { has_cosmetic_tag = " + tag + " }\n"; + visible += "\t\t\t" + oldTag + " = { exists = no }\n"; + visible += "\t\t}"; + formationDecision.setVisible(visible); + + // Available + formationDecision.setAvailable(available); // Same as State Trigger + + // Complete Effect + completeEffect = "= {\n"; + completeEffect += "\t\t\tset_cosmetic_tag = " + tag + "\n"; + completeEffect += "\t\t\tevery_state = {\n"; + completeEffect += "\t\t\t\tlimit = {\n"; + completeEffect += "\t\t\t\t\t OR = {\n"; + for (const auto& culture: unionCountry.GetCultures()) + { + completeEffect += "\t\t\t\t\t\thas_state_flag = major_culture_" + culture + "_flag\n"; + } + completeEffect += "\t\t\t\t\t}\n"; + completeEffect += "\t\t\t\t}\n"; + completeEffect += "\t\t\t\tadd_core_of = ROOT\n"; + completeEffect += "\t\t\t\tremove_core_of = " + oldTag + "\n"; + completeEffect += "\t\t\t}\n"; + completeEffect += "\t\t\tevery_state = {\n "; + completeEffect += "\t\t\t\tlimit = {\n "; + completeEffect += "\t\t\t\t\tis_claimed_by = " + oldTag + "\n"; + completeEffect += "\t\t\t\t}\n"; + completeEffect += "\t\t\t\tadd_claim_by = ROOT\n"; + completeEffect += "\t\t\t\tremove_claim_by = " + oldTag + "\n"; + completeEffect += "\t\t\t}\n"; + completeEffect += "\t\t\tevery_possible_country = {\n "; + completeEffect += "\t\t\t\tlimit = {\n "; + completeEffect += "\t\t\t\t\tNOT = { tag = ROOT }\n"; + completeEffect += "\t\t\t\t\thas_cosmetic_tag = " + tag + "\n"; + completeEffect += "\t\t\t\t}\n"; + completeEffect += "\t\t\t\tdrop_cosmetic_tag = yes\n"; + completeEffect += "\t\t\t}\n"; + completeEffect += "\t\t}"; + formationDecision.setCompleteEffect(completeEffect); + + // AI Will Do + formationDecision.setAiWillDo("= {\n\t\t\tbase = 100\n\t\t}"); + + // Localisation + locBlock.english = "Form [" + name + "_loc_DEF]"; + locBlock.french = "Formulaire [" + name + "_loc_DEF]"; + locBlock.german = "Formular [" + name + "_loc_DEF]"; + locBlock.polish = "Formularz [" + name + "_loc_DEF]"; + locBlock.portuguese = "Formar [" + name + "_loc_DEF]"; + locBlock.russian = "Форма [" + name + "_loc_DEF]"; + locBlock.spanish = "Formulario [" + name + "_loc_DEF]"; + formableDecisionsCategory.addLocalisation(std::pair(name, locBlock)); + locBlock.english = "Our great people have been separated for too long, kept apart by foreign powers who would keep us divided and weak. Now we stand united against any who would dare try to separate us again."; + locBlock.french = "Notre grand peuple a été séparé pendant trop longtemps, tenu à l'écart par des puissances étrangères qui nous garderaient divisés et faibles. Maintenant, nous sommes unis contre quiconque oserait essayer de nous séparer à nouveau."; + locBlock.german = "Unser großartiges Volk war zu lange getrennt, getrennt gehalten von fremden Mächten, die uns gespalten und schwach halten würden. Jetzt stehen wir vereint gegen jeden, der es wagen würde, uns wieder zu trennen."; + locBlock.polish = "Nasi wielcy ludzie byli rozdzieleni zbyt długo, trzymani osobno przez obce mocarstwa, które trzymałyby nas podzielonych i słabych. Teraz stajemy zjednoczeni przeciwko każdemu, kto ośmieliłby się ponownie nas rozdzielić."; + locBlock.portuguese = "Nosso grande povo foi separado por muito tempo, mantido à parte por potências estrangeiras que nos manteriam divididos e fracos. Agora estamos unidos contra qualquer um que ousaria tentar nos separar novamente."; + locBlock.russian = "Наш великий народ слишком долго был разлучен, его держали в стороне иностранные державы, которые хотели, чтобы мы были разделены и слабы. Теперь мы объединились против любого, кто посмеет снова попытаться разлучить нас."; + locBlock.spanish = "Nuestro gran pueblo ha estado separado durante demasiado tiempo, mantenido aparte por potencias extranjeras que nos mantendrían divididos y débiles. Ahora estamos unidos contra cualquiera que se atreva a intentar separarnos de nuevo."; + formableDecisionsCategory.addLocalisation(std::pair(name + "_desc", locBlock)); + + // Add to Category + formableDecisionsCategory.addDecision(formationDecision); + } + + decisions.push_back(formableDecisionsCategory); +} \ No newline at end of file diff --git a/src/HOI4World/Decisions/UnionDecisions.h b/src/HOI4World/Decisions/UnionDecisions.h new file mode 100644 index 0000000000..d04cc77591 --- /dev/null +++ b/src/HOI4World/Decisions/UnionDecisions.h @@ -0,0 +1,26 @@ +#ifndef UNION_DECISIONS +#define UNION_DECISIONS + + + +#include "src/HOI4World/Countries/UnionCountry.h" +#include "src/HOI4World/Decisions/DecisionsCategories.h" +#include "src/HOI4World/Decisions/DecisionsFile.h" +#include "src/HOI4World/States/HoI4State.h" + + + +namespace HoI4 +{ + +class UnionDecisions: public DecisionsFile +{ + public: + void createDecisions(const std::vector& unionCountries); +}; + +} // namespace HoI4 + + + +#endif // UNION_DECISIONS diff --git a/src/HOI4World/HoI4World.cpp b/src/HOI4World/HoI4World.cpp index 82b6cf8bc7..2064dab113 100644 --- a/src/HOI4World/HoI4World.cpp +++ b/src/HOI4World/HoI4World.cpp @@ -229,7 +229,14 @@ HoI4::World::World(const Vic2::World& sourceWorld, states->getDefaultStates(), *events, getSouthAsianCountries(), - strongestGpNavies); + strongestGpNavies, + union_countries_); + for (const auto& category: theDecisions->getUnionDecisions()) + { + for (const auto& loc: category.getLocalisation()) + hoi4Localisations->addDecisionLocalisation(loc.first, loc.second.english); + scriptedLocalisations->addDecisionScriptedLocalisations(category.getcustomLocalisation()); + } updateAiPeaces(*peaces, ideologies->getMajorIdeologies()); addNeutrality(theConfiguration.getDebug()); importCharacters(characterFactory); diff --git a/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.cpp b/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.cpp index 22cbc64702..52193285df 100644 --- a/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.cpp +++ b/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.cpp @@ -68,6 +68,16 @@ std::string createNavyScriptedLocalisationsText(const std::vector& } +void HoI4::ScriptedLocalisations::addDecisionScriptedLocalisations(const std::map& customLoc) +{ + for (const auto& [name, text]: customLoc) + { + ScriptedLocalisation decisionScriptedLoc; + decisionScriptedLoc.setName(name); + decisionScriptedLoc.addText(text); + scriptedLocalisations.push_back(decisionScriptedLoc); + } +} void HoI4::ScriptedLocalisations::addNavyScriptedLocalisations(const std::vector& strongestNaviesTags) { ScriptedLocalisation GetStrengthRatioBritain; diff --git a/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.h b/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.h index fda57a851a..ae4a7fd810 100644 --- a/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.h +++ b/src/HOI4World/ScriptedLocalisations/ScriptedLocalisations.h @@ -17,6 +17,7 @@ class ScriptedLocalisations { public: class Factory; + void addDecisionScriptedLocalisations(const std::map& customLoc); void addNavyScriptedLocalisations(const std::vector& strongestNaviesTags); void giveAdjectiveLocalisation(const std::string& language, ScriptedLocalisation&& localisation); void filterIdeologyLocalisations(const std::set& majorIdeologies); diff --git a/src/HOI4World/States/HoI4State.h b/src/HOI4World/States/HoI4State.h index a8fa560593..3a94933e20 100644 --- a/src/HOI4World/States/HoI4State.h +++ b/src/HOI4World/States/HoI4State.h @@ -49,6 +49,7 @@ class State if (airbaseLevel > 10) airbaseLevel = 10; } + void addMajorCulture(std::string newCulture) { majorCultures.insert(newCulture); } void addVictoryPointValue(int additionalValue) { victoryPointValue += additionalValue; } void setVPValue(int value) { victoryPointValue = value; } void setVPLocation(int province) { victoryPointPosition = province; } @@ -73,6 +74,7 @@ class State const std::string& getOwner() const { return ownerTag; } const std::set& getCores() const { return cores; } [[nodiscard]] const auto& getClaims() const { return claims; } + [[nodiscard]] const auto& getMajorCultures() const { return majorCultures; } const std::map>& getControlledProvinces() const { return controlledProvinces; } bool isImpassable() const { return impassable; } int getDockyards() const { return dockyards; } @@ -137,6 +139,8 @@ class State std::set claims; std::map> controlledProvinces; + std::set majorCultures; + bool capitalState = false; bool impassable = false; bool hadImpassablePart = false; diff --git a/src/HOI4World/States/HoI4States.cpp b/src/HOI4World/States/HoI4States.cpp index 77b9fc6019..abeac97a4c 100644 --- a/src/HOI4World/States/HoI4States.cpp +++ b/src/HOI4World/States/HoI4States.cpp @@ -587,6 +587,9 @@ void HoI4::States::addProvincesAndCoresToNewState(State& newState, uint64_t totalPopulation = 0; double acceptedPopulation = 0; + + std::map popCultureMap; + for (const auto& sourceProvinceNum: sourceProvinceNums) { if (const auto& vic2Province = vic2Provinces.find(sourceProvinceNum); vic2Province != vic2Provinces.end()) @@ -595,6 +598,17 @@ void HoI4::States::addProvincesAndCoresToNewState(State& newState, totalPopulation += provincePopulation; acceptedPopulation += provincePopulation * vic2Province->second->getPercentageWithCultures(acceptedCultures); + + for (const auto& culture: vic2Province->second->getCultures()) + { + std::set oneCulture = {culture}; + if (!popCultureMap.count(culture)) + popCultureMap.emplace(culture, + provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture)); + else + popCultureMap.find(culture)->second += + provincePopulation * vic2Province->second->getPercentageWithCultures(oneCulture); + } } } @@ -606,6 +620,15 @@ void HoI4::States::addProvincesAndCoresToNewState(State& newState, { newState.addClaims({HoI4Core}); } + Log(LogLevel::Debug) << "State: " << newState.getID(); + for (const auto& popCulture: popCultureMap) + { + Log(LogLevel::Debug) << "\t\t\t" << popCulture.first << " Pops: " << popCulture.second + << "\n\tPopulation: " << static_cast(totalPopulation); + if (popCulture.second / static_cast(totalPopulation) >= 0.25 && + !newState.getMajorCultures().count(popCulture.first)) + newState.addMajorCulture(popCulture.first); + } } } diff --git a/src/OutHoi4/Decisions/OutDecision.cpp b/src/OutHoi4/Decisions/OutDecision.cpp index c3d5ff1e8c..25fc8c9283 100644 --- a/src/OutHoi4/Decisions/OutDecision.cpp +++ b/src/OutHoi4/Decisions/OutDecision.cpp @@ -81,9 +81,9 @@ std::ostream& HoI4::operator<<(std::ostream& outStream, const decision& outDecis { outStream << "\n\t\tcustom_cost_text " << outDecision.customCostText << "\n"; } - if (!outDecision.fireOnlyOnce.empty()) + if (outDecision.fireOnlyOnce) { - outStream << "\n\t\tfire_only_once = " << outDecision.fireOnlyOnce << "\n"; + outStream << "\n\t\tfire_only_once = yes\n"; } if (!outDecision.modifier.empty()) { diff --git a/src/OutHoi4/Decisions/OutDecisions.cpp b/src/OutHoi4/Decisions/OutDecisions.cpp index 5a7ce9a522..261eec0459 100644 --- a/src/OutHoi4/Decisions/OutDecisions.cpp +++ b/src/OutHoi4/Decisions/OutDecisions.cpp @@ -90,6 +90,18 @@ void HoI4::outputDecisions(const decisions& theDecisions, } outStream.close(); + outStream.open("output/" + outputName + "/common/decisions/formable_nation_decisions.txt"); + if (!outStream.is_open()) + { + throw std::runtime_error( + "Could not open output/" + outputName + "/common/decisions/formable_nation_decisions.txt"); + } + for (const auto& category: theDecisions.getUnionDecisions()) + { + outStream << category; + } + outStream.close(); + outStream.open("output/" + outputName + "/common/decisions/_generic_decisions.txt"); if (!outStream.is_open()) { diff --git a/src/OutHoi4/States/OutHoI4State.cpp b/src/OutHoi4/States/OutHoI4State.cpp index 0e1e37c7de..49cf2f8d54 100644 --- a/src/OutHoi4/States/OutHoI4State.cpp +++ b/src/OutHoi4/States/OutHoI4State.cpp @@ -96,6 +96,10 @@ void HoI4::outputHoI4State(std::ostream& output, const State& theState, const bo { output << "\t\tadd_claim_by = " << claim << "\n"; } + for (const auto& majorCulture: theState.getMajorCultures()) + { + output << "\t\tset_state_flag = major_culture_" << majorCulture << "_flag\n"; + } for (const auto& countryControlledProvinces: theState.getControlledProvinces()) { output << "\t\t" << countryControlledProvinces.first << " = {\n"; diff --git a/src/V2World/Culture/CultureGroupFactory.cpp b/src/V2World/Culture/CultureGroupFactory.cpp index 0a9f372aaa..93f235ad83 100644 --- a/src/V2World/Culture/CultureGroupFactory.cpp +++ b/src/V2World/Culture/CultureGroupFactory.cpp @@ -6,6 +6,9 @@ Vic2::CultureGroupFactory::CultureGroupFactory() { + registerRegex("leader|is_overseas|unit", [this](const std::string& unused, std::istream& the_stream) { + commonItems::ignoreItem(unused, the_stream); + }); registerKeyword("union", [this](std::istream& the_stream) { union_tag_ = commonItems::getString(the_stream); }); diff --git a/src/V2World/Provinces/Province.cpp b/src/V2World/Provinces/Province.cpp index 9eacf38a49..75f85db0cd 100644 --- a/src/V2World/Provinces/Province.cpp +++ b/src/V2World/Provinces/Province.cpp @@ -1,7 +1,6 @@ #include "src/V2World/Provinces/Province.h" - int Vic2::Province::getTotalPopulation() const { return getPopulation(); @@ -36,7 +35,6 @@ int Vic2::Province::getLiteracyWeightedPopulation(const std::optional& cultures) const { auto totalPopulation = 0; @@ -58,6 +56,17 @@ double Vic2::Province::getPercentageWithCultures(const std::set& cu return 1.0 * populationOfCultures / totalPopulation; } +std::set Vic2::Province::getCultures() const +{ + std::set cultures; + for (const auto& pop: pops) + { + if (!cultures.count(pop.getCulture())) + cultures.emplace(pop.getCulture()); + } + return cultures; +} + constexpr double minimumLiteracyWeighting = 0.1; constexpr double literacyWeighting = 0.9; diff --git a/src/V2World/Provinces/Province.h b/src/V2World/Provinces/Province.h index 9297af8210..f8a5aadd8f 100644 --- a/src/V2World/Provinces/Province.h +++ b/src/V2World/Provinces/Province.h @@ -26,6 +26,7 @@ class Province [[nodiscard]] int getPopulation(const std::optional& type = {}) const; [[nodiscard]] int getLiteracyWeightedPopulation(const std::optional& type = {}) const; [[nodiscard]] double getPercentageWithCultures(const std::set& cultures) const; + [[nodiscard]] std::set getCultures() const; void setOwner(const std::string& _owner) { owner = _owner; } void addCore(const std::string& core) { cores.insert(core); }