Merge pull request #420 from hmlendea/hoi4mdm

Updated to the latest version of `HOI4MDM`

locations.xml

@@ -53760,7 +53760,6 @@
     <WikidataId>Q8969</WikidataId>
     <GameIds>
       <GameId game="HOI4" type="City" parent="474">4965</GameId> <!-- Cancún -->
-      <GameId game="HOI4MDM" type="City" parent="840">12715</GameId> <!-- Cancún -->
       <GameId game="HOI4TGW" type="City" parent="474">4965</GameId> <!-- Cancún -->
       <GameId game="IR_ABW">541</GameId> <!-- Cancun -->
     </GameIds>
@@ -528973,4 +528972,13 @@
       <GameId game="CK3TFE">d_naffur</GameId> <!-- Naffurs -->
     </GameIds>
   </LocationEntity>
+  <LocationEntity>
+    <Id>merida_mexico</Id>
+    <GameIds>
+      <GameId game="HOI4MDM" type="City" parent="840">12715</GameId> <!-- Merida -->
+    </GameIds>
+    <FallbackLocations>
+      <LocationId>merida_spain</LocationId>
+    </FallbackLocations>
+  </LocationEntity>
 </ArrayOfLocationEntity>

vanilla/hoi4mdm_parentage.txt

@@ -795,9 +795,7 @@
 9147=1103
 14476=1103
 14558=1103
-14576=1103
 14577=1103
-14578=1103
 14579=1103
 14580=1103
 14581=1103
@@ -862,6 +860,25 @@
 14628=1115
 13050=1116
 13038=1117
+227=1118
+1290=1118
+1406=1118
+3330=1118
+3385=1118
+4215=1118
+4261=1118
+4322=1118
+7281=1118
+7343=1118
+9420=1118
+9445=1118
+10196=1118
+10224=1118
+10299=1118
+11433=1118
+12128=1118
+12298=1118
+14626=1119
 17=111
 243=111
 3230=111
@@ -1633,7 +1650,6 @@
 10752=197
 9150=197
 14561=197
-14562=197
 14563=197
 14564=197
 14565=197
@@ -2238,6 +2254,7 @@
 9582=265
 9752=265
 9924=265
+14562=265
 5185=266
 5222=266
 8188=266
@@ -2259,6 +2276,7 @@
 13283=269
 13284=269
 12960=26
+14578=26
 13018=270
 7900=271
 4556=272
@@ -3547,7 +3565,6 @@
 11360=38
 11388=38
 11402=38
-11468=38
 11493=38
 1105=390
 3987=390
@@ -3724,9 +3741,12 @@
 10896=409
 12788=409
 12871=409
+529=40
 563=40
 3423=40
 3558=40
+6444=40
+9575=40
 11547=40
 11560=40
 11470=40
@@ -3811,8 +3831,6 @@
 9524=41
 11445=41
 11533=41
-529=41
-6444=41
 1910=420
 6424=420
 14587=420
@@ -5129,14 +5147,13 @@ victory_points=457
 12069=544
 12093=544
 3143=544
-6501=545
-9497=545
 482=545
+538=545
 3500=545
 3561=545
-425=545
+6501=545
 6524=545
-538=545
+9497=545
 4387=546
 7393=546
 13020=546
@@ -7345,44 +7362,28 @@ victory_points=457
 11408=663
 11460=663
 11523=663
-227=664
 273=664
 291=664
 1258=664
 1278=664
-1290=664
 1378=664
-1406=664
 3289=664
-3330=664
-3385=664
-4261=664
 4283=664
 4311=664
-4322=664
 4354=664
 4383=664
 6246=664
 7300=664
-7343=664
 7373=664
 7416=664
 7444=664
 9349=664
-9420=664
-9445=664
 10142=664
-10196=664
-10224=664
 10226=664
-10299=664
-11433=664
 12117=664
-12128=664
 12130=664
 12172=664
 12200=664
-12298=664
 498=665
 544=665
 579=665
@@ -7529,8 +7530,6 @@ victory_points=457
 9292=675
 12584=675
 7285=675
-7281=675
-4215=675
 4411=675
 10256=675
 7401=675
@@ -9272,6 +9271,7 @@ victory_points=457
 3710=767
 718=767
 908=767
+14576=767
 11830=768
 9832=768
 6909=768
@@ -9864,7 +9864,6 @@ victory_points=457
 12689=7
 13254=7
 13255=7
-14626=7
 12369=800
 6785=800
 2042=800
@@ -11271,7 +11270,6 @@ victory_points=457
 3444=966
 3547=966
 9522=966
-9575=967
 11531=967
 809=968
 985=968
@@ -11325,12 +11323,14 @@ victory_points=457
 6907=971
 9699=971
 11843=971
+425=972
 3522=972
 6487=972
 6582=972
 9456=972
 9560=972
 11359=972
+11468=972
 540=973
 3463=973
 6526=973