Skip to content

Commit

Permalink
fix colonies
Browse files Browse the repository at this point in the history
  • Loading branch information
Zemurin committed Dec 5, 2024
1 parent b844b15 commit 3bc5213
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
10 changes: 7 additions & 3 deletions EU4ToVic3/Data_Files/configurables/diplomatic_map.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# AGREEMENT TYPES:
# DO NOT ALTER LEFT SIDE, ONLY RIGHT!
# Single-sided agreements
dominion = { EE_CLT_Celtic_Dominion EE_CLT_Gaulois_subject private_enterprise self_governing_colony colony core_eyalet commercial_enterprise dominion dominion_tc autonomous_dominion autonomous_dominion_tc administrative_region viking_settlement banking_family_subject annexable_colony medieval_vassal european_colony nhs_imperial_associate to_elysian_governor }
dominion = { EE_CLT_Celtic_Dominion EE_CLT_Gaulois_subject core_eyalet dominion dominion_tc autonomous_dominion autonomous_dominion_tc administrative_region medieval_vassal nhs_imperial_associate }

protectorate = { trade_protectorate protectorate trade_outpost native_reserve cultural_sphere_of_influence_subject to_imperial_protectorate}

Expand All @@ -15,11 +15,15 @@ tributary = { EE_granadan_tributary tributary_state timar ME_TIM_trib_state impe

personal_union = { LUX_personal_union dutch_personal_union carolingian_brother_union personal_union permanent_union ME_personal_union ME_personal_union_cheap ME_Austrian_personal_union salic_personal_union sister_republic integrated_personal_union brother_kingdom real_union_subject pronoia_subject_type theodoro_personal_union mongol_brother_realm }

puppet = { client_march ME_crusader_march EE_FRA_fief ME_personal_union_with_25_FL march crown_colony appanage pronoyalet eyalet french_hre_subject puppet_state crusader_state_vassal naval_march papal_sanctuary_subject imperial_feud_subject pagan_chiefdom defensive_march agricultural_march religious_march }
puppet = { client_march ME_crusader_march EE_FRA_fief ME_personal_union_with_25_FL march appanage pronoyalet eyalet french_hre_subject puppet_state crusader_state_vassal naval_march papal_sanctuary_subject imperial_feud_subject pagan_chiefdom defensive_march agricultural_march religious_march }

vassal = { EE_Minor_IRI_Mor_Tuath dutch_vassal vassal client_vassal daimyo_vassal cossack_vassal prussian_congress_vassal prussian_vassal brotherly_order QAR_baghdad_vassal canton roman_client_kingdom voivodeship fief_subject nahuatl_vassal peasant_vassal pirate_brotherhood_vassal muslim_tributary_vassal mandala_trade_vassal integrated_tribe_subject dutch_province_subject revolution_subject persian_satrapy iqta_vassal palatinate_vassal stato_da_mar_vassal exarchate_subject hereditary_pronoia_subject_type incorporated_vassal soyurghal_subject_type elysian_subject elysian_subject_varangian }

trade_agreement = { steer_trade transfer_trade_power dutch_commercial_enterprise }
trade_agreement = { steer_trade transfer_trade_power }

colony = { self_governing_colony colony viking_settlement annexable_colony european_colony to_elysian_governor crown_colony }

chartered_company = { private_enterprise commercial_enterprise banking_family_subject dutch_commercial_enterprise }

# Double-sided agreements
double_defensive_pact = { alliance }
Expand Down
1 change: 1 addition & 0 deletions EU4ToVic3/Source/EU4World/CountryManager/EU4Country.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class Country: commonItems::parser

// dependent stuff
[[nodiscard]] auto isColony() const { return colony; }
void setColony(bool isColony) { colony = isColony; }
[[nodiscard]] auto isTradeCompany() const { return tradeCompany; }
void setTradeCompany() { tradeCompany = true; }
[[nodiscard]] const auto& getOverLord() const { return overlord; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ void EU4::CountryManager::transferOwnerDataToTC(const std::shared_ptr<Country>&
tradingCountry->setNationalIdeas(owner->getNationalIdeas());
tradingCountry->setEmbracedInstitutions(owner->getEmbracedInstitutions());
tradingCountry->setNationalColors(owner->getNationalColors()); // same color. yah.
tradingCountry->setColony(true);

// relations
tradingCountry->setOverLord(ownerTag);
Expand Down

0 comments on commit 3bc5213

Please sign in to comment.