Merge branch 'master' into ck3atha

hmlendea · Nov 16, 2023 · 3f61f31 · 3f61f31
2 parents c589608 + 407abe3
commit 3f61f31
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 4 deletions.
diff --git a/languages.xml b/languages.xml
@@ -151965,6 +151965,9 @@
   </Language>
   <Language>
     <Id>Ryukyuan</Id> <!-- Lewchewan, Luchuan -->
+    <GameIds>
+      <GameId game="CK3MBP">ryukyu</GameId>
+    </GameIds>
     <FallbackLanguages>
       <LanguageId>Ryukyuan_South</LanguageId>
       <LanguageId>Amami</LanguageId>

diff --git a/locations.xml b/locations.xml
@@ -1433,6 +1433,7 @@
     <WikidataId>Q192268</WikidataId>
     <GameIds>
       <GameId game="CK2">b_egypabydos</GameId> <!-- Abydos -->
+      <GameId game="IR_TBA">2306</GameId> <!-- Abdju -->
     </GameIds>
     <FallbackLocations>
       <LocationId>abydos_turkey</LocationId>
@@ -6208,6 +6209,7 @@
       <GameId game="CK3TBA">c_alasiya</GameId> <!-- Alašiya -->
       <GameId game="CK3TBA">d_alasiya</GameId> <!-- Alašiya -->
       <GameId game="CK3TBA">k_alasiya</GameId> <!-- Alašiya -->
+      <GameId game="IR_TBA">3135</GameId> <!-- Alasiya -->
     </GameIds>
     <Names>
       <Name language="Akkadian" value="Alašiya" />
@@ -53895,6 +53897,7 @@
       <GameId game="CK3TBA">e_hattusa</GameId> <!-- Hatti -->
       <GameId game="CK3TFE">c_cappadocia</GameId> <!-- Cappadocia -->
       <GameId game="CK3TFE">d_cappadocia</GameId> <!-- Cappadocia -->
+      <GameId game="IR_TBA">6471</GameId> <!-- Hatti -->
     </GameIds>
     <Names>
       <Name language="Afrikaans" value="Kappadosië" />
@@ -58550,6 +58553,7 @@
     <WikidataId>Q992265</WikidataId>
     <GameIds>
       <GameId game="CK3TBA">b_259</GameId> <!-- Chalandri -->
+      <GameId game="IR_TBA">259</GameId> <!-- Chalandri -->
     </GameIds>
     <Names>
       <Name language="Arabic" value="H̱ālāndrī" />
@@ -85488,6 +85492,7 @@
       <GameId game="IR">7798</GameId> <!-- Elateia -->
       <GameId game="IR_AoE">7798</GameId> <!-- Elateia -->
       <GameId game="IR_INV">7798</GameId> <!-- Elateia -->
+      <GameId game="IR_TBA">382</GameId> <!-- Elateia -->
     </GameIds>
     <Names>
       <Name language="Arabic" value="Ilātīā" />
@@ -87422,6 +87427,7 @@
       <GameId game="IR_AoE">284</GameId> <!-- Eresos -->
       <GameId game="IR_INV">284</GameId> <!-- Eresos -->
       <GameId game="IR_TBA">2240</GameId> <!-- Eresos -->
+      <GameId game="IR_TBA">6288</GameId> <!-- Eresu -->
     </GameIds>
     <Names>
       <Name language="Arabic" value="Irīsūs" />
@@ -88085,6 +88091,9 @@
   <LocationEntity>
     <Id>eshnunna</Id>
     <WikidataId>Q375685</WikidataId>
+    <GameIds>
+      <GameId game="IR_TBA">5753</GameId> <!-- Eshnunna -->
+    </GameIds>
     <Names>
       <Name language="Catalan" value="Eixnunna" />
       <Name language="English" value="Eshnunna" />
@@ -187764,6 +187773,7 @@
     <WikidataId>Q194146</WikidataId>
     <GameIds>
       <GameId game="CK2HIP">b_magida</GameId> <!-- Magida -->
+      <GameId game="IR_TBA">3235</GameId> <!-- Nahita -->
       <GameId game="HOI4MDM" type="City" parent="159">9830</GameId> <!-- Niğde -->
     </GameIds>
     <Names>
@@ -193169,6 +193179,9 @@
   <LocationEntity>
     <Id>oenoanda</Id>
     <WikidataId>Q186373</WikidataId>
+    <GameIds>
+      <GameId game="IR_TBA">3320</GameId> <!-- Wiyanawanda -->
+    </GameIds>
     <Names>
       <Name language="Catalan" value="Enoanda" />
       <Name language="Finnish" value="Oinoanda" />
@@ -253501,6 +253514,9 @@
   <LocationEntity>
     <Id>sun</Id>
     <WikidataId>Q525</WikidataId>
+    <GameIds>
+      <GameId game="IR_TBA">2503</GameId> <!-- Tiwaz -->
+    </GameIds>
     <Names>
       <Name language="Adai" value="Naleen" />
       <Name language="Afar" value="Ayro" />
@@ -293563,10 +293579,13 @@
   <LocationEntity>
     <Id>xylokastro</Id>
     <WikidataId>Q2248347</WikidataId>
+    <GameIds>
+      <GameId game="IR_TBA">203</GameId> <!-- Xylokastro -->
+    </GameIds>
     <Names>
       <Name language="Asturian" value="Xylokastro" />
       <Name language="Catalan" value="Xilocastre" />
-      <Name language="Greek_Ancient" value="Xulókastro" />
+      <Name language="Greek_Ancient" value="Xylókastro" />
       <Name language="Greek" value="Xylókastro" />
       <Name language="Japanese" value="Kushirokasutoro" />
       <Name language="Lithuanian" value="Ksilokastras" />
@@ -504741,6 +504760,7 @@
       <GameId game="IR">462</GameId> <!-- Stratos -->
       <GameId game="IR_AoE">462</GameId> <!-- Stratos -->
       <GameId game="IR_INV">462</GameId> <!-- Stratos -->
+      <GameId game="IR_TBA">501</GameId> <!-- Stratos -->
     </GameIds>
     <Names>
       <Name language="Greek_Ancient" value="Strátos" />
@@ -505454,6 +505474,7 @@
       <GameId game="IR">271</GameId> <!-- Attea -->
       <GameId game="IR_AoE">271</GameId> <!-- Attea -->
       <GameId game="IR_INV">271</GameId> <!-- Attea -->
+      <GameId game="IR_TBA">477</GameId> <!-- Attea -->
     </GameIds>
     <Names>
       <Name language="Greek_Ancient" value="Áttea" />
@@ -510022,6 +510043,7 @@
     <Id>girumu</Id>
     <GameIds>
       <GameId game="IR">916</GameId> <!-- Girumu -->
+      <GameId game="IR_TBA">6061</GameId> <!-- Girumu -->
     </GameIds>
   </LocationEntity>
   <LocationEntity>
@@ -510340,6 +510362,7 @@
     <Id>terqa</Id>
     <GameIds>
       <GameId game="IR">828</GameId> <!-- Terqa -->
+      <GameId game="IR_TBA">5704</GameId> <!-- Terqa -->
     </GameIds>
   </LocationEntity>
   <LocationEntity>
@@ -514351,6 +514374,9 @@
   </LocationEntity>
   <LocationEntity>
     <Id>solymia</Id>
+    <GameIds>
+      <GameId game="IR_TBA">2988</GameId> <!-- Solymia -->
+    </GameIds>
     <Names>
       <Name language="English" value="Solymia" adjective="Solymian" />
     </Names>
@@ -519165,13 +519191,15 @@
     <GameIds>
       <GameId game="CK3">d_ghulat</GameId> <!-- Ikhtilafi Imamate -->
       <GameId game="CK3CE">d_ghulat</GameId> <!-- Ikhtilafi Imamate -->
+      <GameId game="CK3MBP">d_ghulat</GameId> <!-- Ikhtilafi Imamate -->
     </GameIds>
   </LocationEntity>
   <LocationEntity>
-    <Id>zayidi_imamate</Id>
+    <Id>ismaili_imamate</Id>
     <GameIds>
       <GameId game="CK3">d_ismaili</GameId> <!-- Ismaili Imamate -->
       <GameId game="CK3CE">d_ismaili</GameId> <!-- Ismaili Imamate -->
+      <GameId game="CK3MBP">d_ismaili</GameId> <!-- Ismaili Imamate -->
     </GameIds>
   </LocationEntity>
   <LocationEntity>

diff --git a/vanilla/ck3mbp_landed_titles.txt b/vanilla/ck3mbp_landed_titles.txt
@@ -371,6 +371,13 @@ d_sunni = {
 
 	capital = c_baghdad
 
+	can_destroy = {
+		custom_tooltip = {
+			text = persian_struggle.tt.forbid_title_destruction
+			NOT = { exists = struggle:persian_struggle }
+		}
+	}
+
 }
 
 d_shiite = {
@@ -458,6 +465,18 @@ d_imami = {
 	landless = yes
 }
 
+d_ismaili = {
+	color = { 28 142 62 }
+	definite_form = yes
+	ruler_uses_title_name = no
+	no_automatic_claims = yes
+	always_follows_primary_heir = yes
+	destroy_if_invalid_heir = yes
+	can_be_named_after_dynasty = no
+
+	capital = c_cairo
+}
+
 d_zaydi = {
 	color = { 40 160 40 }
 	definite_form = yes
@@ -577,6 +596,18 @@ d_muwalladi = {
 
 }
 
+d_ghulat = {
+	color = { 48 207 48 }
+	definite_form = yes
+	ruler_uses_title_name = no
+	no_automatic_claims = yes
+	always_follows_primary_heir = yes
+	destroy_if_invalid_heir = yes
+	can_be_named_after_dynasty = no
+
+	capital = c_kufa
+}
+
 e_golden_horde = { #White Horde
 	color = { 243 180 17 }
 
@@ -63070,6 +63101,13 @@ e_arabia = {
 		}
 	}
 
+	can_destroy = {
+		custom_tooltip = {
+			text = persian_struggle.tt.forbid_title_destruction
+			NOT = { exists = struggle:persian_struggle }
+		}
+	}
+
 	k_medina = {
 		color = { 100 225 25 }
 

diff --git a/vanilla/irtba_province_names.yml b/vanilla/irtba_province_names.yml
@@ -636,7 +636,7 @@ l_english:
  PROV634:0 "Phalara"
  PROV635:0 "Naupaktos"
  PROV636:0 "Solinaro"
- PROV637:0 "Pruili"
+ PROV637:0 "Kuwalapassa"
  PROV638:0 "Karpenisi"
  PROV639:0 "Phortosi"
  PROV640:0 "Warulili"
@@ -2990,7 +2990,7 @@ PROV1255:0 "Nekhekh"
  PROV2985:1 "Huiannis"
  PROV2986:1 "Wizitis"
  PROV2987:1 "Kuizas"
- PROV2988:1 "Kuwalapassa"
+ PROV2988:1 "Solymia"
  PROV2989:1 "Apamu"
  PROV2990:1 "Apawi"
  PROV2991:1 "Mintammi"