Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Union decisions #1492

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Vic2ToHoI4.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
<ClCompile Include="src\HOI4World\Decisions\AgentRecruitmentDecisions.cpp" />
<ClCompile Include="src\HOI4World\Decisions\DecisionsCategories.cpp" />
<ClCompile Include="src\HOI4World\Decisions\DecisionsCategory.cpp" />
<ClCompile Include="src\HOI4World\Decisions\UnionDecisions.cpp" />
<ClCompile Include="src\HOI4World\Diplomacy\HoI4AIStrategy.cpp" />
<ClCompile Include="src\HOI4World\Diplomacy\HoI4Relations.cpp" />
<ClCompile Include="src\HOI4World\Events\CapitulationEvents.cpp" />
Expand Down Expand Up @@ -492,6 +493,7 @@
<ClInclude Include="src\HOI4World\Decisions\AgentRecruitmentDecisions.h" />
<ClInclude Include="src\HOI4World\Decisions\DecisionsCategories.h" />
<ClInclude Include="src\HOI4World\Decisions\DecisionsCategory.h" />
<ClInclude Include="src\HOI4World\Decisions\UnionDecisions.h" />
<ClInclude Include="src\HOI4World\Diplomacy\HoI4AIStrategy.h" />
<ClInclude Include="src\HOI4World\Events\CapitulationEvents.h" />
<ClInclude Include="src\HOI4World\Events\EventsBuilder.h" />
Expand Down
6 changes: 6 additions & 0 deletions Vic2ToHoI4.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,9 @@
<ClCompile Include="src\OutHoi4\Countries\OutUnionCountry.cpp">
<Filter>src\OutHoi4\Countries</Filter>
</ClCompile>
<ClCompile Include="src\HOI4World\Decisions\UnionDecisions.cpp">
<Filter>src\HoI4World\Decisions</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\bitmap\bitmap_image.hpp">
Expand Down Expand Up @@ -2502,6 +2505,9 @@
<ClInclude Include="src\OutHoi4\Countries\OutUnionCountry.h">
<Filter>src\OutHoi4\Countries</Filter>
</ClInclude>
<ClInclude Include="src\HOI4World\Decisions\UnionDecisions.h">
<Filter>src\HoI4World\Decisions</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="data\resources\VC_redist.x64.exe">
Expand Down
2 changes: 2 additions & 0 deletions Vic2ToHoI4Tests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
<ClCompile Include="src\HOI4World\Decisions\PoliticalDecisions.cpp" />
<ClCompile Include="src\HOI4World\Decisions\ResourceProspectingDecisions.cpp" />
<ClCompile Include="src\HOI4World\Decisions\StabilityWarSupportDecisions.cpp" />
<ClCompile Include="src\HOI4World\Decisions\UnionDecisions.cpp" />
<ClCompile Include="src\HOI4World\Diplomacy\AIPeace.cpp" />
<ClCompile Include="src\HOI4World\Diplomacy\AIPeaces.cpp" />
<ClCompile Include="src\HOI4World\Diplomacy\AiPeacesUpdater.cpp" />
Expand Down Expand Up @@ -773,6 +774,7 @@
<ClInclude Include="src\HOI4World\Decisions\PoliticalDecisions.h" />
<ClInclude Include="src\HOI4World\Decisions\ResourceProspectingDecisions.h" />
<ClInclude Include="src\HOI4World\Decisions\StabilityWarSupportDecisions.h" />
<ClInclude Include="src\HOI4World\Decisions\UnionDecisions.h" />
<ClInclude Include="src\HOI4World\Diplomacy\AIPeace.h" />
<ClInclude Include="src\HOI4World\Diplomacy\AIPeaces.h" />
<ClInclude Include="src\HOI4World\Diplomacy\AiPeacesUpdater.h" />
Expand Down
6 changes: 6 additions & 0 deletions Vic2ToHoI4Tests.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,9 @@
<ClCompile Include="src\HOI4World\Countries\UnionCountryTests.cpp">
<Filter>src\HOI4World\Countries</Filter>
</ClCompile>
<ClCompile Include="src\HOI4World\Decisions\UnionDecisions.cpp">
<Filter>src\HOI4World\Decisions</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
Expand Down Expand Up @@ -3517,6 +3520,9 @@
<ClInclude Include="src\OutHoi4\Countries\OutUnionCountry.h">
<Filter>src\OutHoi4\Countries</Filter>
</ClInclude>
<ClInclude Include="src\HOI4World\Decisions\UnionDecisions.h">
<Filter>src\HOI4World\Decisions</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="data\test_files\Countries\blankCommonCountryData.txt">
Expand Down
Empty file.
115 changes: 115 additions & 0 deletions data/blank_mod/common/ideas/_cultures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 }
Expand Down Expand Up @@ -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 = { }
}



}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions data/blank_mod/localisation/braz_por/cultures_l_braz_por.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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$§!"
Expand Down Expand Up @@ -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$§!"
Expand Down Expand Up @@ -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$§!"
Expand Down Expand Up @@ -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$§!"
Expand Down Expand Up @@ -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$§!"
Expand Down Expand Up @@ -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$§!"
Expand Down
Loading