diff --git a/AIM/Christina.personality b/AIM/Christina.personality
new file mode 100644
index 0000000..0741d74
--- /dev/null
+++ b/AIM/Christina.personality
@@ -0,0 +1,13 @@
+<AI>
+   <version>2</version>
+   <script>aiLoaderStandard</script>
+   <nameID>781270</nameID>
+   <tooltipID>781271</tooltipID>
+   <forcedciv>swedish</forcedciv>
+   <rushboom>0</rushboom>
+   <icon>ui\\singleplayer\\cpai_avatar_swedish</icon>
+   <chatset>elizabeth</chatset>
+   <playerNames> 
+      <nameID>781270<civ>Swedish</civ></nameID>
+	</playerNames>
+</AI>
\ No newline at end of file
diff --git a/AIM/aiMain.xs b/AIM/aiMain.xs
index e03ab38..0c15f86 100644
--- a/AIM/aiMain.xs
+++ b/AIM/aiMain.xs
@@ -1424,9 +1424,9 @@ extern int  gMostRecentTriggerOpportunityID = -1;  // Which opportunity (if any)
 extern int  gLastClaimMissionTime = -1;
 extern int  gLastAttackMissionTime = -1;
 extern int  gLastDefendMissionTime = -1;
-extern int  gClaimMissionInterval = 600000;  // 10 minutes.  This variable indicates how long it takes for claim opportunities to score their maximum.  Typically, a new one will launch before this time.
+extern int  gClaimMissionInterval = 300000;  // 10 minutes.  This variable indicates how long it takes for claim opportunities to score their maximum.  Typically, a new one will launch before this time.
 extern int  gAttackMissionInterval = 180000; // 3 minutes.  Suppresses attack scores (linearly) for 3 minutes after one launches.  Attacks will usually happen before this period is over.
-extern int  gDefendMissionInterval = 300000;  // 5 minutes.   Makes the AI less likely to do another defend right after doing one.
+extern int  gDefendMissionInterval = 180000;  // 5 minutes.   Makes the AI less likely to do another defend right after doing one.
 extern bool gDelayAttacks = false;     // Can be used on low difficulty levels to prevent attacks before the AI is attacked.  (AI is defend-only until this variable is
                                        // set false.
 
@@ -1591,7 +1591,7 @@ void initArrays(void)
    gTargetSettlerCounts = xsArrayCreateInt(cAge5+1, 0, "Target Settler Counts");
       xsArraySetInt(gTargetSettlerCounts, cAge1, 25);
       xsArraySetInt(gTargetSettlerCounts, cAge2, 50);
-      xsArraySetInt(gTargetSettlerCounts, cAge3, 70);
+      xsArraySetInt(gTargetSettlerCounts, cAge3, 75);
       xsArraySetInt(gTargetSettlerCounts, cAge4, 90);
       xsArraySetInt(gTargetSettlerCounts, cAge5, 100);
 
@@ -2984,12 +2984,97 @@ void setConsulateArmyPreference() {
     kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyOttoman2, 0.6);
     kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyOttoman3, 0.6);
   }
+
   if (kbTechGetStatus(cTechypBigConsulateJapanese) == cTechStatusActive) {
     kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSColonialMarines, 0.6);
-    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSRiflemenRegiment, 0.6);
     kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSSaberSquad, 0.6);
     kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSGatlingGuns, 0.6);
   }
+
+  if (kbTechGetStatus(cTechypBigConsulateSPCChina) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyItalians1, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyItalians2, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyItalians3, 0.6);
+  }
+
+  if (kbTechGetStatus(cTechypBigConsulateSPCIndia) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeSwedishArmy1, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeSwedishArmy2, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeSwedishArmy3, 0.6);
+  }
+  
+}
+
+
+void setCapitolArmyPreference() {
+  if (kbUnitCount(cMyID, cUnitTypeCapitol, cUnitStateAlive) < 1) {
+    return;
+  }
+  if (kbTechGetStatus(cTechAge0Portuguese) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyPortuguese11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyPortuguese22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyPortuguese33, 0.6);
+  }
+  
+  if (kbTechGetStatus(cTechAge0Dutch) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyDutch11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyDutch22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyDutch33, 0.6);
+  }
+  
+  if (kbTechGetStatus(cTechAge0Russian) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyRussian11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyRussian22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyRussian33, 0.6);
+  }
+  
+  if (kbTechGetStatus(cTechAge0Spanish) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmySpanish11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmySpanish22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmySpanish33, 0.6);
+  }
+  
+  if (kbTechGetStatus(cTechAge0British) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyBritish11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyBritish22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyBritish33, 0.6);      
+  }
+  
+  if (kbTechGetStatus(cTechAge0French) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyFrench11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyFrench22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyFrench33, 0.6); 
+  }
+  
+  if (kbTechGetStatus(cTechAge0German) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyGerman11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyGerman22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyGerman33, 0.6); 
+  }
+  
+  if (kbTechGetStatus(cTechAge0Ottoman) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyOttoman11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyOttoman22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyOttoman33, 0.6);
+  }
+
+  if (kbTechGetStatus(cTechAge0USA) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSColonialMarines2, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSSaberSquad2, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeUSGatlingGuns2, 0.6);
+  }
+
+  if (kbTechGetStatus(cTechAge0Italians) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyItalians11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyItalians22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypConsulateArmyItalians33, 0.6);
+  }
+
+  if (kbTechGetStatus(cTechAge0Swedish) == cTechStatusActive) {
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeSwedishArmy11, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeSwedishArmy22, 0.6);
+    kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeSwedishArmy33, 0.6);
+  }
   
 }
 
@@ -3309,7 +3394,7 @@ int createMainBase(vector mainVec=cInvalidVector)
       kbUnitQuerySetUnitType(unitQueryID, cUnitTypeBuilding);
       kbUnitQuerySetState(unitQueryID, cUnitStateABQ);
       kbUnitQuerySetPosition(unitQueryID, mainVec);      // Checking new base vector
-      kbUnitQuerySetMaximumDistance(unitQueryID, 50.0);
+      kbUnitQuerySetMaximumDistance(unitQueryID, 55.0);
 	}
    
    kbUnitQueryResetResults(unitQueryID);
@@ -5615,7 +5700,7 @@ minInterval 10
    
    int attempt = 0;
    vector testVec = cInvalidVector;
-   float spacingDistance = 22.0; // Mid- and corner-spots on a square with 'radius' spacingDistance, i.e. each side is 2 * spacingDistance.
+   float spacingDistance = 25.0; // Mid- and corner-spots on a square with 'radius' spacingDistance, i.e. each side is 2 * spacingDistance.
    float exclusionRadius = spacingDistance / 2.0;
    float dx = spacingDistance;
    float dz = spacingDistance;
@@ -5731,7 +5816,7 @@ minInterval 10
    if (success == true)
       aiPlanSetVariableFloat(buildPlan, cBuildPlanCenterPositionDistance, 0, exclusionRadius);
    else
-      aiPlanSetVariableFloat(buildPlan, cBuildPlanCenterPositionDistance, 0, 50.0);
+      aiPlanSetVariableFloat(buildPlan, cBuildPlanCenterPositionDistance, 0, 55.0);
 
    // Add position influence for nearby towers
    aiPlanSetVariableInt(buildPlan, cBuildPlanInfluenceUnitTypeID, 0, gTowerUnit);   // Russian's won't notice ally towers and vice versa...oh well.
@@ -6009,8 +6094,8 @@ void deathMatchSetup(void)
 
 rule moreDMHouses
 inactive
-minInterval 90
-{  // After 90 seconds, make 10 more houses
+minInterval 60
+{  // After 60 seconds, make 10 more houses
    if (cMyCiv != cCivXPSioux)
       createSimpleBuildPlan(gHouseUnit, 10, 99, true, cEconomyEscrowID, kbBaseGetMainID(cMyID), 1);
    // 1 each of the main military buildings, ASAP.
@@ -6053,7 +6138,7 @@ minInterval 90
 
 rule finalDMHouses
 inactive
-minInterval 120
+minInterval 100
 {
    int count = kbUnitCount(cMyID, gHouseUnit, cUnitStateAlive);
    int max = kbGetBuildLimit(cMyID, gHouseUnit);
@@ -6715,6 +6800,14 @@ minInterval 5
       xsEnableRule("stageCoachMonitor");
       xsEnableRule("healerMonitor");
 
+      //Enable Mill Upgrades
+      xsEnableRule("MillUpgradeMonitor");
+      xsEnableRule("MarketUpgradeMonitor");
+
+      //Enable Hanami Upgrade for japanese to improve gathering strawberries
+      xsEnableRule("MarketBerryDogsUpgradeMonitor");
+      xsEnableRule("MarketBerryTrapsUpgradeMonitor");
+
       // Enable settler hitpoint and attack upgrades (research to be started about 3 minutes later)
       xsEnableRule("settlerUpgradeMonitor");
 
@@ -6749,7 +6842,7 @@ minInterval 5
       setUnitPickerPreference(gLandUnitPicker);
      
       gLastAttackMissionTime = xsGetTime() - 180000;     // Pretend they all fired 3 minutes ago, even if that's a negative number.
-      gLastDefendMissionTime = xsGetTime() - 300000;     // Actually, start defense ratings at 100% charge, i.e. 5 minutes since last one.
+      gLastDefendMissionTime = xsGetTime() - 180000;     // Actually, start defense ratings at 100% charge, i.e. 5 minutes since last one.
       gLastClaimMissionTime = xsGetTime() - 180000;
 
       aiEcho("*** We're in age 2.");
@@ -6802,6 +6895,11 @@ minInterval 10
          aiEcho("Starting build plan for an additional Ottoman town center");
       }
 
+      //Enable Rice Paddy and Farm Upgrades  
+      xsEnableRule("RicePaddyUpgradeMonitor");
+
+      xsEnableRule("FarmUpgradeMonitor");
+
       // Enable basic church upgrades
       xsEnableRule("churchUpgradeMonitor");
       xsEnableRule("churchUpgradeAsianMonitor");
@@ -6872,6 +6970,8 @@ minInterval 10
 
       xsEnableRule("balloonMonitor");
 
+      xsEnableRule("morebanks");
+
       // Enable advanced arsenal upgrades
       xsEnableRule("advancedArsenalUpgradeMonitor");
 
@@ -7016,15 +7116,15 @@ mininterval 15
          return;  // Don't burn wood before we have a mosque.
    }
    
-   gNumFishBoats = ((btRushBoom * -1.0) + 0.7) * 5.0; // At max boom, that's 8.  At balance, it's 3.  
+   gNumFishBoats = ((btRushBoom * -1.0) + 0.7) * 7.0; // At max boom, that's 8.  At balance, it's 3.  
    if (gNumFishBoats < 2)
    {
       gNumFishBoats = 0;   // Rushers generally shouldn't fish.
    }
    if ( (cRandomMapName == "amazonia") || (cRandomMapName == "caribbean") || (cRandomMapName == "Ceylon") || (cRandomMapName == "Borneo") || (cRandomMapName == "Honshu") )
    {
-      if (gNumFishBoats < 3)
-         gNumFishBoats = 3;   // Always fish on those maps.
+      if (gNumFishBoats < 4)
+         gNumFishBoats = 4;   // Always fish on those maps.
    }
    if ( (givenFishingBoats == false) && (gNumFishBoats <= 0) )
       return;  //We weren't given any, and don't plan on making any, so quit.
@@ -7519,15 +7619,15 @@ void initEcon(void)
       gHouseUnit = cUnitTypeManor;
       gLivestockPenUnit = cUnitTypeManor;
    
-   if ( (kbGetCiv() == cCivFrench) || (kbGetCiv() == cCivDutch) )
+   if ( (kbGetCiv() == cCivFrench) || (kbGetCiv() == cCivUSA) || (kbGetCiv() == cCivDutch) )
       gHouseUnit = cUnitTypeHouse;
       gLivestockPenUnit = cUnitTypeHouse;
    
-   if ( (kbGetCiv() == cCivGermans) || (kbGetCiv() == cCivTheCircle) || (kbGetCiv() == cCivRussians) )
+   if ( (kbGetCiv() == cCivGermans) || (kbGetCiv() == cCivTheCircle) || (kbGetCiv() == cCivSwedish) || (kbGetCiv() == cCivRussians) )
       gHouseUnit = cUnitTypeHouseEast;
       gLivestockPenUnit = cUnitTypeHouseEast;
    
-   if ( (kbGetCiv() == cCivSpanish) || (kbGetCiv() == cCivPortuguese) || (kbGetCiv() == cCivOttomans) )
+   if ( (kbGetCiv() == cCivSpanish) || (kbGetCiv() == cCivPortuguese) || (kbGetCiv() == cCivItalians) || (kbGetCiv() == cCivOttomans) )
       gHouseUnit = cUnitTypeHouseMed;
       gLivestockPenUnit = cUnitTypeHouseMed;
    
@@ -8119,6 +8219,10 @@ void updateForecasts()
             {
                addTechToForecasts(cTechChurchTopkapi);
             }
+            if (kbTechGetStatus(cTechChurchTanzimat) == cTechStatusObtainable)
+            {
+               addTechToForecasts(cTechChurchTanzimat);
+            }
          }
          else if ((civIsNative() == false) && (civIsAsian() == false))  // Other non-native/non-Asian civs - just the church
          {
@@ -9264,7 +9368,7 @@ rule delayWalls
 inactive
 minInterval 10
 {
-   if ( (kbGetPopCap()-kbGetPop()) < 60 )
+   if ( (kbGetPopCap()-kbGetPop()) < 70 )
       return;  // Don't start walls until we have pop room
    int wallPlanID=aiPlanCreate("WallInBase", cPlanBuildWall);
    if (wallPlanID != -1)
@@ -9272,8 +9376,8 @@ minInterval 10
       aiPlanSetVariableInt(wallPlanID, cBuildWallPlanWallType, 0, cBuildWallPlanWallTypeRing);
       aiPlanAddUnitType(wallPlanID, gEconUnit, 0, 1, 1);
       aiPlanSetVariableVector(wallPlanID, cBuildWallPlanWallRingCenterPoint, 0, kbBaseGetLocation(cMyID, kbBaseGetMainID(cMyID)));
-      aiPlanSetVariableFloat(wallPlanID, cBuildWallPlanWallRingRadius, 0, 50.0);
-      aiPlanSetVariableInt(wallPlanID, cBuildWallPlanNumberOfGates, 0, 6);
+      aiPlanSetVariableFloat(wallPlanID, cBuildWallPlanWallRingRadius, 0, 55.0);
+      aiPlanSetVariableInt(wallPlanID, cBuildWallPlanNumberOfGates, 0, 8);
       aiPlanSetBaseID(wallPlanID, kbBaseGetMainID(cMyID));
       aiPlanSetEscrowID(wallPlanID, cEconomyEscrowID);
       aiPlanSetDesiredPriority(wallPlanID, 40);
@@ -9305,9 +9409,10 @@ minInterval 10
    int needToRoll = 100.0 * odds;  // Range -50 to +150
    if ( (aiRandInt(100) < needToRoll) && (cvOkToBuildWalls == true) )
    {
-      //aiEcho("Decided to do walls.");
-      //gBuildWalls = true;
-      //xsEnableRule("delayWalls");   // Start walls once we have housing room
+      aiEcho("Decided to do walls.");
+      gBuildWalls = true;
+      xsEnableRule("delayWalls");   // Start walls once we have housing room
+      xsEnableRule("BastionUpgradeMonitor");
    }
    
    if (gNumTowers < 0)
@@ -9371,13 +9476,13 @@ void setUnitPickerPreference(int upID = -1)
          return;     // This should never happen, it should be set when the unitPickSource is set.
       
       kbUnitPickResetAll(gLandUnitPicker);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.4);   // Range 0.0 to 1.0
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.4 );
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.4);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.5);   // Range 0.0 to 1.0
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.5 );
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.5);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractNativeWarrior, 0.2);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeCoureur, 0.0);    // Avoid coureurs, they mess up econ/mil calcs.
       if (cMyCiv == cCivXPAztec)
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.4);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.5);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpWarrior, 0.0);    // Never pick xpWarrior or xpDogSoldier, available via dance only
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpDogSoldier, 0.0);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpMedicineManAztec, 0.0);
@@ -9387,10 +9492,9 @@ void setUnitPickerPreference(int upID = -1)
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpPetard, 0.0);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMortar, 0.2);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpSpy, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyMin, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyIre, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyAsi, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.0);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.1);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeEnvoy, 0.1);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypMongolScout, 0.1);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMercenary, 0.2);
 
       if ( (kbGetCiv() == cCivIndians) || (kbGetCiv() == cCivSPCIndians) )    // Avoid mansabdar units
@@ -9418,12 +9522,12 @@ void setUnitPickerPreference(int upID = -1)
       // See if 1, 2, or 3 lines set.  If 1, score 0.8 vs. 0.2.  If 2, score 1.0, 0.5 and 0.0.  If 3, score 0.8, 0.4 and 0.2.
       if (cvSecondaryArmyUnit < 0)  // Only one line selected
       {
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.4);   // Range 0.0 to 1.0
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.4 );
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.4);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.5);   // Range 0.0 to 1.0
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.5 );
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.5);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractNativeWarrior, 0.2);
          if (cMyCiv == cCivXPAztec)
-            kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.4);
+            kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.5);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeCoureur, 0.0);    // Avoid coureurs, they mess up econ/mil calcs.
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpWarrior, 0.0);    // Never pick xpWarrior or xpDogSoldier, available via dance only
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpDogSoldier, 0.0);
@@ -9434,10 +9538,9 @@ void setUnitPickerPreference(int upID = -1)
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpPetard, 0.0);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMortar, 0.2);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpSpy, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyMin, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyIre, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyAsi, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.0);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.1);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeEnvoy, 0.1);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypMongolScout, 0.1);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMercenary, 0.2);
 
          if ( (kbGetCiv() == cCivIndians) || (kbGetCiv() == cCivSPCIndians) )    // Avoid mansabdar units
@@ -9457,12 +9560,12 @@ void setUnitPickerPreference(int upID = -1)
       }
       else if (cvTertiaryArmyUnit < 0)  // Two lines selected
       {
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.4);   // Range 0.0 to 1.0
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.4 );
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.4);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.5);   // Range 0.0 to 1.0
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.5 );
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.5);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractNativeWarrior, 0.2);
          if (cMyCiv == cCivXPAztec)
-            kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.4);
+            kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.5);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeCoureur, 0.0);    // Avoid coureurs, they mess up econ/mil calcs.  
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpWarrior, 0.0);    // Never pick xpWarrior or xpDogSoldier, available via dance only
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpDogSoldier, 0.0);
@@ -9473,10 +9576,9 @@ void setUnitPickerPreference(int upID = -1)
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpPetard, 0.0);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMortar, 0.2);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpSpy, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyMin, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyIre, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyAsi, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.0);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.1);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeEnvoy, 0.1);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypMongolScout, 0.1);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMercenary, 0.2);
 
          if ( (kbGetCiv() == cCivIndians) || (kbGetCiv() == cCivSPCIndians) )    // Avoid mansabdar units
@@ -9497,12 +9599,12 @@ void setUnitPickerPreference(int upID = -1)
       }
       else  // Three lines selected
       {
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.4);   // Range 0.0 to 1.0
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.4 );
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.4);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractInfantry, 0.5);   // Range 0.0 to 1.0
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractArtillery, 0.5 );
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractCavalry, 0.5);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractNativeWarrior, 0.2);
          if (cMyCiv == cCivXPAztec)
-            kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.4);
+            kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractLightInfantry, 0.5);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeCoureur, 0.0);    // Avoid coureurs, they mess up econ/mil calcs.  
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpWarrior, 0.0);    // Never pick xpWarrior or xpDogSoldier, available via dance only
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpDogSoldier, 0.0);
@@ -9513,10 +9615,9 @@ void setUnitPickerPreference(int upID = -1)
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpPetard, 0.0);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMortar, 0.2);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpSpy, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyMin, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyIre, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyAsi, 0.0);
-         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.0);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.1);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeEnvoy, 0.1);
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypMongolScout, 0.1);
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMercenary, 0.2);
 
          if ( (kbGetCiv() == cCivIndians) || (kbGetCiv() == cCivSPCIndians) )    // Avoid mansabdar units
@@ -9584,6 +9685,9 @@ void setUnitPickerPreference(int upID = -1)
       if (cMyCiv == cCivBritish)
          kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeHalberdier, 0.1);
 
+      if (cMyCiv == cCivFrench)
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeFlatbowman, 0.1);
+
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeAbstractNativeWarrior, 0.5 + (btBiasNative / 2.0));
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeCoureur, 0.0);    // Avoid coureurs, they mess up econ/mil calcs.   
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpWarrior, 0.0);    // Never pick xpWarrior or xpDogSoldier, available via dance only
@@ -9593,13 +9697,12 @@ void setUnitPickerPreference(int upID = -1)
 
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpRam, 0.0);   // Avoid units the AI cannot handle properly
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpPetard, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMortar, 0.0);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMortar, 0.2);
       kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypexpSpy, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyMin, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyIre, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyAsi, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.0);
-      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMercenary, 0.0);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeNativeScout, 0.1);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeEnvoy, 0.1);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeypMongolScout, 0.1);
+      kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeMercenary, 0.2);
 
       if ( (kbGetCiv() == cCivChinese) || (kbGetCiv() == cCivSPCChinese) ) 
       {
@@ -9639,6 +9742,12 @@ void setUnitPickerPreference(int upID = -1)
          setConsulateArmyPreference();
       }
 
+      if (civIsAsian() == false)
+      { 
+         // Set preferences for capitol units
+         setCapitolArmyPreference();
+      }
+
       if (civIsNative() == true)
       { 
          // Natives and Europeans need to stop trying to build consulate and monastery units
@@ -9970,7 +10079,7 @@ active
 //==============================================================================
 void initMil(void)
 {
-   aiSetAttackResponseDistance(65.0);
+   aiSetAttackResponseDistance(70.0);
 
    // Choose a most-hated player
    xsEnableRule("mostHatedEnemy");
@@ -11081,6 +11190,17 @@ minInterval 3
       }
    }
 
+   // At least one basilica for Italians
+   if (cMyCiv == cCivItalians)
+   {
+      planID = aiPlanGetIDByTypeAndVariableType(cPlanBuild, cBuildPlanBuildingTypeID, cUnitTypeBasilicaIt);
+      if ( (planID < 0) && (kbUnitCount(cMyID, cUnitTypeBasilicaIt, cUnitStateAlive) < 1) )
+      {     // Start a new one
+         createSimpleBuildPlan(cUnitTypeBasilicaIt, 1, 60, true, cEconomyEscrowID, kbBaseGetMainID(cMyID), 1);
+         aiEcho("Starting a new basilica build plan.");
+      }
+   }
+
    // At least one native embassy (natives only)
    if (civIsNative() == true) {
       planID = aiPlanGetIDByTypeAndVariableType(cPlanBuild, cBuildPlanBuildingTypeID, cUnitTypeNativeEmbassy);
@@ -13022,7 +13142,8 @@ minInterval 1
          {  // First, set maximum priority for the "best" cards 
             // 'Advanced Trading Post', 'Royal Decree', 'Advanced Arsenal', 'New Ways' & 'Advanced Balloon',
             // plus '2 Grove Rickshaws' & 'Shogun Tokugawa'
-            if ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedTradingPost") ||
+            if ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCImprovedBuildings") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCImprovedBuildingsGerman") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeBritish") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeDutch") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeFrench") ||
@@ -13031,12 +13152,152 @@ minInterval 1
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreePortuguese") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeRussian") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeSpanish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeSwedish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalDecreeItalians") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedArsenal") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedArsenalGerman") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPNewWaysIroquois") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPNewWaysSioux") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPAdvancedBalloon") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipGroveWagonIndians2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCUnlockFactory") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRobberBarons") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCUnlockFactoryGerman") && (kbGetCiv() != cCivGermans)) ||				
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRobberBaronsGerman") && (kbGetCiv() != cCivGermans)) ||								
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIndustrialRevolution") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCExoticHardwoods") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCGrainMarket") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRefrigeration") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalMint") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCTextileMills") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRoyalMintGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRefrigerationGerman") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCRoyalMintIndians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCFencingSchoolIndians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCRidingSchoolIndians") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCGermanTownFarmers") && (kbGetCiv() != cCivGermans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCGuildArtisans") && (kbGetCiv() != cCivGermans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCTeamTeutonTownCenter") && (kbGetCiv() != cCivGermans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCUhlanCombatGerman") && (kbGetCiv() != cCivGermans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCDutchEastIndiaCompany") && (kbGetCiv() != cCivDutch)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCBetterBanks") && (kbGetCiv() != cCivDutch)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCBanks1") && (kbGetCiv() != cCivDutch)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCBanks2") && (kbGetCiv() != cCivDutch)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRansack") && (kbGetCiv() != cCivRussians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCGurkhaAid") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSustainableAgricultureIndians") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCIncreasedTribute") && (kbGetCiv() != cCivJapanese)) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCMughalArchitecture") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCEastIndiaCompany") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCCamelDamageIndians") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRumDistillery") && (kbGetCiv() != cCivXPIroquois)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSustainableAgriculture") && (kbGetCiv() != cCivXPIroquois)) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFencingSchool") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFencingSchoolGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRidingSchool") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRidingSchoolGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCJanissaryCombatOttoman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCJanissaryCost") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipGroveWagonIndians2") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCElephantTrampling") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCElephantCombatIndians") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCElephantLimit") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCCamelFrightening") && (kbGetCiv() != cCivIndians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf4Indians") && (kbGetCiv() != cCivIndians)) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCoyoteCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPKnightDamage") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPKnightHitpoints") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPKnightCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPInfantryCombatIroquois") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiegeCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPConservativeTactics") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPInfantryHitpointsIroquois") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCommandSkill") && (kbGetCiv() != cCivXPSioux)) ||				
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPMustangs") && (kbGetCiv() != cCivXPSioux)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSpiceTrade") && (kbGetCiv() != cCivBritish)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCPioneers") && (kbGetCiv() != cCivFrench)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCLightArtilleryHitpointsOttoman") && (kbGetCiv() != cCivOttomans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCArtilleryDamageOttoman") && (kbGetCiv() != cCivOttomans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCArtilleryHitpointsOttomanTeam") && (kbGetCiv() != cCivOttomans)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCNativeCombat") && (kbGetCiv() != cCivFrench)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCNativeWarriors") && (kbGetCiv() != cCivFrench)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandCavalryHitpointsFrench") && (kbGetCiv() != cCivFrench)) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPAdoption") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPBuffalo4") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCavalryDamageSioux") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCavalryHitpointsSioux") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCavalryCombatSioux") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPMedicineTeam") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFoodSilos") && (kbGetCiv() != cCivXPSioux)) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPEarthBounty") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPWindRunner") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPNomadicExpansion") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryCombatFrench") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRangedInfantryDamageFrenchTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryDamageGermanTeam") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCDragoonCombatPortuguese") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryCombatRussian") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCStreletsCombatRussian") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryCombatGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxTwoKettleSupport") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxSanteeSupport") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxYanktonSupport") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryCombatGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandCavalryCombatSpanish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMusketeerGrenadierCombatBritish") ||								
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCHanAntiCavalryBonus") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAccupuncture") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCBannerSchool") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSamuraiDamage") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCNobleCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCNaginataHitpoints") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCNaginataAntiInfantryDamage") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCYumiDamage") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCYumiRange") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAshigaruDamage") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSamuraiSpeed") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCaballeros") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryHitpointsSpanish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryCombatSpanish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCInfantryCombatDutch") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryCombatDutch") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryCombatOttoman") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPExoticHardwoodsTeam") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCPioneers") && (kbGetCiv() != cCivRussians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSpiceTrade") && (kbGetCiv() != cCivRussians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMedicine") && (kbGetCiv() != cCivRussians)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCPioneers") && (kbGetCiv() != cCivXPSioux)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSpiceTrade") && (kbGetCiv() != cCivXPSioux)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCPioneers") && (kbGetCiv() != cCivPortuguese)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRangedInfantryCombatPortuguese") && (kbGetCiv() != cCivPortuguese)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRangedInfantryHitpointsPortugueseTeam") && (kbGetCiv() != cCivPortuguese)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCPioneers") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPChinampa1") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPChinampa2") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleCenteotl") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleXipeTotec") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleXolotl") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleCoatlicue") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleTlaloc") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPGreatTempleQuetzalcoatl") && (kbGetCiv() != cCivXPAztec)) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMusketeerGrenadierHitpointsBritishTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCImprovedBuildingsTeam") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCWildernessWarfare") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCInfantryHitpointsDutchTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandCavalryDamageFrenchTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryCombatBritish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCForbiddenArmyArmor") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCTerritorialArmyCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCMongolianScourge") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCStandardArmyHitpoints") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCArtilleryCombatChinese") ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipWoodCrates4") && (kbGetCiv() != cCivXPSioux)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCImprovedLongbows") && (kbGetCiv() != cCivBritish)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFrontierDefenses2") && (kbGetCiv() != cCivDutch)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipWoodCrates3") && (kbGetCiv() != cCivDutch)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPWarHutTraining") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTownDance") && (kbGetCiv() != cCivXPAztec)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTownDance") && (kbGetCiv() != cCivXPIroquois)) ||
+                ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTownDance") && (kbGetCiv() != cCivXPSioux)) ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipShogunate"))
                     xsArraySetInt(gCardPriorities, i, 10);  // "Best" cards, pri 10
 
@@ -13057,9 +13318,38 @@ minInterval 1
             }
             if (kbResourceGet(cResourceSkillPoints) >= 15)
             {  // Prerequisites for 'Royal Decree', 'Advanced Arsenal', 'New Ways' and 'Shogun Tokugawa', only for HC level >= 15.
-               if (((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCColonialMilitia") && (kbGetCiv() != cCivPortuguese)) ||
+               if ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCColonialMilitia") ||
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMosqueConstruction") ||
-                   ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTownDance") && (kbGetCiv() != cCivXPAztec)) ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFoodSilos") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFoodSilosTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRumDistillery") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCExtensiveFortifications") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTownDance") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipCoyoteMen3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCStreletsCombatRussian") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCJanissaryCombatOttoman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedConsulateIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCGurkhaAid") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCPioneers") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCImprovedWallsTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedIrregulars") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCCheapWarAcademyTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCNativeLearningIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCNativeIncorporationIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCNativeTradeTaxIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCheapStablesTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryHitpointsGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPWarchiefSioux1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipAxeRiders2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipAxeRiders3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipRifleRiders2") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxDakotaSupport") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxSanteeSupport") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxYanktonSupport") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIndianHandCavalry3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipSamurai2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipShrineWagon2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCIncreasedTribute") ||
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipDaimyoAizu") ||
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipDaimyoSatsuma"))
                        xsArraySetInt(gCardPriorities, i, 10);  // Prerequisite cards, pri 10
@@ -13073,12 +13363,110 @@ minInterval 1
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCNativeWarriors") ||
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCNativeWarriorsGerman") ||
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCNativeChampionsDutchTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRangedInfantryHitpointsFrench") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCuirassiers3") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandCavalryHitpointsFrench") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCavalryArchers2") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCavalryArchers3") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSawmills") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSawmillsTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSustainableAgriculture") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipHowdahs1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCIronmongerIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCFoodSilosIndians") ||  
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSustainableAgricultureIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCIronmonger") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSilversmith") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRumDistillery") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCigarRoller") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedMillGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSustainableAgricultureGerman") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCIronmongerGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSilversmithGerman") || 
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCRumDistilleryGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCigarRollerGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCIronmongerTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPChinampa1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipJaguarKnights2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipJaguarKnights3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPKnightDamage") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPKnightHitpoints") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPWarchiefSioux2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPWarchiefSioux3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCavalryDamageSioux") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCavalryHitpointsSioux") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipWarRifles1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipWarRifles2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMedicine") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCSpiceTrade") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPGreatHunter") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPBuffalo2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPBuffalo3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCImprovedBuildings") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHeavyFortifications") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipTomahawk3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPInfantryDamageIroquois") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPInfantryHitpointsIroquois") ||
+                   ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipYumi2") && (kbGetCiv() != cCivJapanese)) ||
+                   ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCYumiDamage") && (kbGetCiv() != cCivJapanese)) ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipShogunate") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCBakufu") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandCavalryHitpointsSpanish") ||	
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandCavalryDamageSpanish") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMusketeerGrenadierDamageBritish") ||	   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCMusketeerGrenadierHitpointsBritishTeam") || 
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipHussars1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryDamageSpanishTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryHitpointsSpanish") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipSkirmishers2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipRuyters2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCInfantryDamageDutch") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCInfantryHitpointsDutchTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipDopplesoldners2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryDamageGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCHandInfantryHitpointsGerman") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryDamageBritish") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCCavalryHitpointsBritish") ||	
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCavArchers1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCavArchers2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCavArchers3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIronFlail1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIronFlail2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipSteppeRider2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipSteppeRider3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipChangdao2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipChoKoNu2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipFlyingCrows1") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCArtilleryHitpointsChinese") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCArtilleryDamageChinese") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIndianRangedCavalry2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIndianRangedCavalry3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCPioneersIndians") ||
                    (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSawmillsIndians"))
                        xsArraySetInt(gCardPriorities, i, 10);  // Prerequisite cards, pri 10
             }
             if (kbResourceGet(cResourceSkillPoints) >= 40)
             {  // Prerequisites for 'Advanced Balloon', only for HC level >= 40.
-               if (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipBalloons")
+               if ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipBalloons") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCuirassiers4") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCuirassiers5") ||				   
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPUnlockFort2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipMantlets2") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipMantlets3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiegeHitpoints") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiegeDamage") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCEnlistIrregularsIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCPioneersIndians") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCTheRaj") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCImprovedBuildingsTeam") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCMughalArchitecture") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipMusketeers3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipDragoons3") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipDragoons4") ||
+                   (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPGenitours") ||
+                   ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf1Indians") && (kbGetCiv() != cCivIndians)) ||
+                   ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf3Indians") && (kbGetCiv() != cCivIndians)) ||
+                   ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf2Indians") && (kbGetCiv() != cCivIndians)))
                        xsArraySetInt(gCardPriorities, i, 10);  // Prerequisite card, pri 10
             }
 
@@ -13087,16 +13475,16 @@ minInterval 1
             int unit = aiHCCardsGetCardUnitType(i);
             int tech = aiHCCardsGetCardTechID(i);
             if ( (unit == cUnitTypeSettler) || (unit == cUnitTypeCoureur) || (unit == cUnitTypeSettlerWagon) || (unit == cUnitTypeSettlerNative) || (unit == cUnitTypeypSettlerAsian) || (unit == cUnitTypeypSettlerJapanese) )
-               xsArraySetInt(gCardPriorities, i, 9);  // Settler card, pri 9
+               xsArraySetInt(gCardPriorities, i, 7);  // Settler card, pri 9
             if ( (xsArrayGetInt(gCardPriorities, i) == 0) && (aiHCCardsGetCardCount(i) > 2) )
-               xsArraySetInt(gCardPriorities, i, 8);  // Infinite cards, pri 8
+               xsArraySetInt(gCardPriorities, i, 6);  // Infinite cards, pri 8
             if (xsArrayGetInt(gCardPriorities, i) == 0)
             {
                if ( (unit == cUnitTypeFortWagon) ||
                     (unit == cUnitTypeFactoryWagon) ||
                     (unit == cUnitTypeCoveredWagon) ||
                     (unit == cUnitTypeYPDojoWagon) )
-                        xsArraySetInt(gCardPriorities, i, 7);  // Fort, Factory, Dojo and Covered Wagons, pri 7
+                        xsArraySetInt(gCardPriorities, i, 8);  // Fort, Factory, Dojo and Covered Wagons, pri 7
                if ( (unit == cUnitTypeOutpostWagon) || (unit == cUnitTypeYPCastleWagon) )
                {
                   if (btRushBoom <= 0)  // Outpost and castle wagon, pri 0 for rushers, pri 7 otherwise
@@ -13128,13 +13516,59 @@ minInterval 1
 
             // Set priority to 0 for cards to be avoided if possible
             if ((kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFrontierDefenses2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCoveredWagons2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFrontierDefenses1") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCoveredWagons2") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCConestogaWagonsTeam") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCBastionsTeam") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCUnlockFortVauban") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPUnlockFort2") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPUnlockFort2German") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipFalconets1German") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedMarket") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedMarketGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedDock") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedDockGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedPlantations") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCAdvancedPlantationsGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipSettlers1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCoureurs1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipSettlersNative1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipSettlerWagons1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipFoodCrates1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipWoodCrates1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipCoinCrates1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipMixedCrates1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipFoodCrates1Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCrates1Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCoinCrates1Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf1Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCastleWagons1Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCastleWagons2Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipTigers1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipLions1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMonitorLizard1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMonitorLizard2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCastleWagons1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCastleWagons2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCastleWagons3") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRajputs2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRajputs3") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIndianRangedCavalry2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipIndianRangedCavalry3") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMongolScoutTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipEnvoyTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMercsTigerClaw1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCPioneersTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCMercsNinja2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCEnlistIrregulars") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCCallToArms1") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCDojoGenbukan") ||		
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipGroveWagonIndians1") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipFalconets2German") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipHorseArtillery1German") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipMortars1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipMortars2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipMortars1German") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipMortars2German") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCShipMortarsTeam") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipPetards1") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipDemolitionSquadGerman") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipRams1") ||
@@ -13157,93 +13591,48 @@ minInterval 1
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipJaguars3") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipJaguarsTeam") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipWolves") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCoinCratesAztec4") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCoinCratesAztec5") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipMixedCrates4") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipCoupRiders1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipCoupRiders2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipCoupRiders3") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipCoupRiders4") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipDogsoldiersTeam1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPShipDogsoldiersTeam2") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPRanching") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPRanchingLlama") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFishMarket") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCFishMarketGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCFishMarket") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf1Indians") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf2Indians") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf3Indians") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipWoodCratesInf4Indians") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCExpandedTradingPost") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCExpandedTradingPostIndians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedDockIndians") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedRicePaddyIndians") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedWondersIndians") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedConsulate") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCFishMarketIndians") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSchoonersIndians") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSchoonersJapanese") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRicePaddyWagon1") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCArmedFishermenIndians") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipDisciple1") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCIndianMonkCombat") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipShrineWagon1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCoveredWagonsAsian") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCoveredWagonsChina") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCoveredWagonsIndians") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipCoveredWagons2Indians") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCIndianMonkFrighten") ||				
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCSacredFieldHealing") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCBazaar") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCGoraksha") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCExpandedMarket") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCCommoditiesMarket") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedMonastery") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCAdvancedMonasteryIndians") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipBerryWagon1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipBerryWagon2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMonitorLizard1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMonitorLizard2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipTigers1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipLions1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRhino1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPZapotecAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPZapotecAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPZapotecAlliesRepeat") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPMayanAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPMayanAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPMayanAlliesRepeat") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSpanishAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSpanishAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleCenteotl") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleCoatlicue") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPGreatTempleHuitzilopochtli") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleXipeTotec") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleXolotl") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPGreatTempleQuetzalcoatl") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleXochipilli") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPTempleTlaloc") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPGreatTempleTezcatlipoca") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIroquoisMohawkSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIroquoisOnondagaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIroquoisOneidaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIroquoisTuscaroraSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIroquoisSenecaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPIroquoisCayugaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCherokeeAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCherokeeAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCherokeeAlliesRepeat") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCreeAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCreeAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCreeAlliesTeam") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPHuronAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPHuronAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPHuronAlliesRepeat") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPFrenchAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPFrenchAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPDutchAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPDutchAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPComancheAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPComancheAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxNakotaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCheyenneAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCheyenneAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCheyenneAlliesTeam") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCreeAllies1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCreeAllies2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPCreeAlliesTeam") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxSansArcSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxHunkpapaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxLakotaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxBurntThighSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxOglalaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxDakotaSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxSanteeSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxYanktonSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPSiouxTwoKettleSupport") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPRenegadoAllies") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPPistoleroAllies") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPComancheroAllies") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPBanditGang") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "HCXPBanditGangRepeat") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRicePaddyWagon1") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRicePaddyWagon2") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipRicePaddyWagon3"))
-
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMorutaru1") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(i)) == "YPHCShipMorutaru2"))
                     xsArraySetInt(gCardPriorities, i, 0);  // Cards to be avoided, pri 0
 
             // Set priority to 0 for castle wagon cards to be specifically avoided for Japanese,
@@ -13298,6 +13687,7 @@ minInterval 1
                    (aiHCCardsGetCardUnitType(i) == cUnitTypeLongbowman) ||
                    (aiHCCardsGetCardUnitType(i) == cUnitTypeStrelet) ||
                    (aiHCCardsGetCardUnitType(i) == cUnitTypeypYumi) ||
+                   (aiHCCardsGetCardUnitType(i) == cUnitTypeFlatbowman) ||
                    (aiHCCardsGetCardUnitType(i) == cUnitTypeypQiangPikeman) ||
                    (aiHCCardsGetCardUnitType(i) == cUnitTypeypChuKoNu))
                        xsArraySetInt(gCardPriorities, i, 0);  // Units to be to be avoided, pri 0
@@ -13398,7 +13788,7 @@ minInterval 1
                   result = aiHCCardsBuyCard(cardIndex);
                   aiEcho("Buying econ card "+xsArrayGetString(gCardNames, cardIndex));
                   boughtCardIndex = index;
-                  xsArraySetInt(gCardPriorities, cardIndex, 3);   // Pri 3, econ card
+                  xsArraySetInt(gCardPriorities, cardIndex, 4);   // Pri 4, econ card
                   break;
                }           
                cardIndex = aiHCCardsFindBestCard(cHCCardTypeMilitary, myLevel);
@@ -13470,12 +13860,13 @@ minInterval 1
          
          aiEcho("Building Deck");
          int cardsRemaining = 25;
-         int toPick = 2;
+         int toPick = 5;
         
          // First, "best" cards (if available).
          for (card=0; < maxCards)
          {
-            if ((kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCAdvancedTradingPost") ||
+            if ((kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCImprovedBuildings") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCImprovedBuildingsGerman") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRoyalDecreeBritish") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRoyalDecreeDutch") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRoyalDecreeFrench") ||
@@ -13486,10 +13877,150 @@ minInterval 1
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRoyalDecreeSpanish") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCAdvancedArsenal") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCAdvancedArsenalGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCAdvancedArsenalGerman") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPNewWaysIroquois") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPNewWaysSioux") ||
-                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCShipGroveWagonIndians2") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCUnlockFactory") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRobberBarons") ||
+		((kbGetCiv() == cCivGermans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCUnlockFactoryGerman")) ||												
+		((kbGetCiv() == cCivGermans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRobberBaronsGerman")) ||								
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPIndustrialRevolution") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCExoticHardwoods") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCGrainMarket") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRefrigeration") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRoyalMint") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCTextileMills") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRoyalMintGerman") ||								
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRefrigerationGerman") ||								
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCRoyalMintIndians") ||	
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCFencingSchoolIndians") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCRidingSchoolIndians") ||
+		((kbGetCiv() == cCivGermans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCGermanTownFarmers")) ||
+		((kbGetCiv() == cCivGermans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCGuildArtisans")) ||
+		((kbGetCiv() == cCivGermans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCTeamTeutonTownCenter")) ||
+		((kbGetCiv() == cCivGermans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCUhlanCombatGerman")) ||
+		((kbGetCiv() == cCivDutch) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCDutchEastIndiaCompany")) ||
+		((kbGetCiv() == cCivDutch) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCBetterBanks")) ||
+		((kbGetCiv() == cCivDutch) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCBanks1")) ||
+		((kbGetCiv() == cCivDutch) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCBanks2")) ||
+		((kbGetCiv() == cCivRussians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRansack")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCGurkhaAid")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCSustainableAgricultureIndians")) ||
+		((kbGetCiv() == cCivJapanese) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCIncreasedTribute")) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCMughalArchitecture") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCEastIndiaCompany") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCCamelDamageIndians") ||
+		((kbGetCiv() == cCivXPIroquois) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRumDistillery")) ||
+		((kbGetCiv() == cCivXPIroquois) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCSustainableAgriculture")) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCFencingSchool") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCFencingSchoolGerman") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRidingSchool") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRidingSchoolGerman") ||				
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCJanissaryCombatOttoman") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCJanissaryCost") ||
                 (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCShipShogunate") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPCoyoteCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPKnightDamage") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPKnightHitpoints") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPKnightCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPInfantryCombatIroquois") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPSiegeCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPConservativeTactics") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPInfantryHitpointsIroquois") ||
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPCommandSkill")) ||
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPMustangs")) ||
+		((kbGetCiv() == cCivBritish) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCSpiceTrade")) ||
+		((kbGetCiv() == cCivFrench) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCPioneers")) ||
+		((kbGetCiv() == cCivOttomans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCLightArtilleryHitpointsOttoman")) ||
+		((kbGetCiv() == cCivOttomans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCArtilleryDamageOttoman")) ||
+		((kbGetCiv() == cCivOttomans) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCArtilleryHitpointsOttomanTeam")) ||
+		((kbGetCiv() == cCivFrench) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCNativeCombat")) ||
+		((kbGetCiv() == cCivFrench) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCNativeWarriors")) ||
+		((kbGetCiv() == cCivFrench) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCHandCavalryHitpointsFrench")) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPAdoption") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPBuffalo4") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPCavalryDamageSioux") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPCavalryHitpointsSioux") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPCavalryCombatSioux") ||
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCFoodSilos")) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPMedicineTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPEarthBounty") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPWindRunner") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPNomadicExpansion") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryCombatFrench") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRangedInfantryDamageFrenchTeam") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryDamageGermanTeam") ||								
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCDragoonCombatPortuguese") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryCombatRussian") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCStreletsCombatRussian") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryCombatGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPSiouxTwoKettleSupport") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPSiouxSanteeSupport") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPSiouxYanktonSupport") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCHandInfantryCombatGerman") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCHandCavalryCombatSpanish") ||								
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCMusketeerGrenadierCombatBritish") ||				
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCShipGroveWagonIndians2")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCElephantTrampling")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCElephantCombatIndians")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCElephantLimit")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCShipWoodCratesInf4Indians")) ||
+		((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCCamelFrightening")) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCHanAntiCavalryBonus") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCAccupuncture") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCBannerSchool") ||				
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCSamuraiDamage") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCNobleCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCNaginataHitpoints") ||	
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCNaginataAntiInfantryDamage") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCYumiDamage") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCYumiRange") ||
+		(kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCAshigaruDamage") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCSamuraiSpeed") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCaballeros") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCHandInfantryHitpointsSpanish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCHandInfantryCombatSpanish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCInfantryCombatDutch") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryCombatDutch") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryCombatOttoman") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPExoticHardwoodsTeam") ||
+		((kbGetCiv() == cCivRussians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCPioneers")) ||
+		((kbGetCiv() == cCivRussians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCSpiceTrade")) ||
+		((kbGetCiv() == cCivRussians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCMedicine")) ||
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCPioneers")) ||
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCSpiceTrade")) ||
+		((kbGetCiv() == cCivPortuguese) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCPioneers")) ||
+		((kbGetCiv() == cCivPortuguese) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRangedInfantryCombatPortuguese")) ||
+		((kbGetCiv() == cCivPortuguese) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRangedInfantryHitpointsPortugueseTeam")) ||
+		((kbGetCiv() == cCivPortuguese) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCRangedInfantryDamagePortuguese")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCPioneers")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPChinampa1")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPChinampa2")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTempleCenteotl")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTempleXipeTotec")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTempleXolotl")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTempleCoatlicue")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTempleTlaloc")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPGreatTempleQuetzalcoatl")) ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCMusketeerGrenadierHitpointsBritishTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCImprovedBuildingsTeam") ||				
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCWildernessWarfare") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCInfantryHitpointsDutchTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCHandCavalryDamageFrenchTeam") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCCavalryCombatBritish") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCForbiddenArmyArmor") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCTerritorialArmyCombat") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCMongolianScourge") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCStandardArmyHitpoints") ||
+                (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCArtilleryCombatChinese") ||
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCShipWoodCrates4")) ||
+		((kbGetCiv() == cCivBritish) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCImprovedLongbows")) ||
+		((kbGetCiv() == cCivDutch) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCFrontierDefenses2")) ||
+		((kbGetCiv() == cCivDutch) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCShipWoodCrates3")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPWarHutTraining")) ||
+		((kbGetCiv() == cCivXPAztec) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTownDance")) ||
+		((kbGetCiv() == cCivXPIroquois) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTownDance")) ||				
+		((kbGetCiv() == cCivXPSioux) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "HCXPTownDance")) ||				
                 ((kbGetCiv() == cCivIndians) && (kbGetTechName(aiHCCardsGetCardTechID(card)) == "YPHCAgrarianism") ))
             {
                aiHCDeckAddCardToDeck(gDefaultDeck, card);
@@ -13610,8 +14141,6 @@ minInterval 1
                   continue;   // Ignore everything except military cards
                if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercenary) == true)
                   continue;   // Ignore any mercenary cards
-               if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeypMercArsonist) == true)
-                  continue;   // Ignore any arsonist cards (wrongly not classified as mercenary)
                if (((civIsNative() == true) || (civIsAsian() == true)) && (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercType1) == true))
                   continue;   // For natives and Asians, ignore any native allies cards (to be added later)
                if ((civIsNative() == true) && ((kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeRodelero) == true) ||
@@ -13662,8 +14191,6 @@ minInterval 1
                   continue;
                if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercenary) == true)
                   continue;   // Ignore any mercenary cards
-               if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeypMercArsonist) == true)
-                  continue;   // Ignore any arsonist cards (wrongly not classified as mercenary)
                if (((civIsNative() == true) || (civIsAsian() == true)) && (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercType1) == true))
                   continue;   // For natives and Asians, ignore any native allies cards (to be added later)
                if ((civIsNative() == true) && ((kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeRodelero) == true) ||
@@ -13714,8 +14241,6 @@ minInterval 1
                   continue;
                if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercenary) == true)
                   continue;   // Ignore any mercenary cards
-               if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeypMercArsonist) == true)
-                  continue;   // Ignore any arsonist cards (wrongly not classified as mercenary)
                if (((civIsNative() == true) || (civIsAsian() == true)) && (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercType1) == true))
                   continue;   // For natives and Asians, ignore any native allies cards (to be added later)
                if ((civIsNative() == true) && ((kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeRodelero) == true) ||
@@ -13777,8 +14302,6 @@ minInterval 1
                   continue;   // Ignore resource cards
                if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercenary) == true)
                   continue;   // Ignore any mercenary cards
-               if (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeypMercArsonist) == true)
-                  continue;   // Ignore any arsonist cards (wrongly not classified as mercenary)
                if (((civIsNative() == true) || (civIsAsian() == true)) && (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypeMercType1) == true) &&
                   (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypexpSkullKnight) == false) &&
                   (kbProtoUnitIsType(cMyID, aiHCCardsGetCardUnitType(card), cUnitTypexpDogSoldier) == false))
@@ -14327,7 +14850,8 @@ minInterval 30
        (kbTechGetStatus(cTechChurchKopruluViziers) == cTechStatusActive) &&
        (kbTechGetStatus(cTechChurchAbbassidMarket) == cTechStatusActive) &&
        (kbTechGetStatus(cTechChurchGalataTowerDistrict) == cTechStatusActive) &&
-       (kbTechGetStatus(cTechChurchTopkapi) == cTechStatusActive))
+       (kbTechGetStatus(cTechChurchTopkapi) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechChurchTanzimat) == cTechStatusActive))
    {
       xsDisableSelf();
    }
@@ -14385,6 +14909,13 @@ minInterval 30
       if (capPlanID < 0)
          createSimpleResearchPlan(cTechChurchTopkapi, getUnit(cUnitTypeChurch),cEconomyEscrowID, 91);
   }  
+
+   if ((kbTechGetStatus(cTechChurchTanzimat) == cTechStatusObtainable) && (kbUnitCount(cMyID, gEconUnit, cUnitStateAlive) >= 33))
+   {
+      capPlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechChurchTopkapi);
+      if (capPlanID < 0)
+         createSimpleResearchPlan(cTechChurchTanzimat, getUnit(cUnitTypeChurch),cEconomyEscrowID, 91);
+  }
 }
 
 
@@ -15311,14 +15842,6 @@ void shipGrantedHandler(int parm=-1) // Event handler
       if ( (age == cAge4) && (kbProtoUnitIsType(cMyID, unitType, cUnitTypeMercenary) == true) && (kbResourceGet(cResourceGold) < 2500) )
          totalValue = 1.0;   // No Age 4 mercenaries if less than 2500 coin is available.
 
-      // Adjust score for arsonists (wrongly not classified as mercenaries) if not enough coin is available.
-      if ( (age == cAge2) && (kbProtoUnitIsType(cMyID, unitType, cUnitTypeypMercArsonist) == true) && (kbResourceGet(cResourceGold) < 500) )
-         totalValue = 1.0;   // No Age 2 mercenaries if less than 500 coin is available.
-      if ( (age == cAge3) && (kbProtoUnitIsType(cMyID, unitType, cUnitTypeypMercArsonist) == true) && (kbResourceGet(cResourceGold) < 1500) )
-         totalValue = 1.0;   // No Age 3 mercenaries if less than 1500 coin is available.
-      if ( (age == cAge4) && (kbProtoUnitIsType(cMyID, unitType, cUnitTypeypMercArsonist) == true) && (kbResourceGet(cResourceGold) < 2500) )
-         totalValue = 1.0;   // No Age 4 mercenaries if less than 2500 coin is available.
-
 	aiEcho("    "+i+" "+kbGetProtoUnitName(unitType)+": "+qtyAvail+" total value: "+totalValue);
       if (totalValue > bestUnitScore)
       {
@@ -17397,7 +17920,7 @@ float getBaseEnemyStrength(int baseID = -1)
    {  // Ally base, we're considering defending.  Count enemy units present
       kbUnitQuerySetUnitType(allyBaseQuery, cUnitTypeLogicalTypeLandMilitary);
       kbUnitQuerySetPosition(allyBaseQuery, kbBaseGetLocation(owner, baseID));
-      kbUnitQuerySetMaximumDistance(allyBaseQuery, 50.0);
+      kbUnitQuerySetMaximumDistance(allyBaseQuery, 55.0);
       kbUnitQueryResetResults(allyBaseQuery);
       retVal = kbUnitQueryExecute(allyBaseQuery);
    }
@@ -18141,6 +18664,35 @@ void scoreOpportunity(int oppID = -1)
 //   aiEcho("    Class "+classRating+", Instance "+instance+", affordable "+affordable);
 //   aiEcho("    Final Score: "+score);
    
+   switch(oppType)
+   {
+      case cOpportunityTypeDestroy:  // Aggressive AIs attack more often
+      {
+         score = score + (0.2 * btOffenseDefense); // If -0.5 -> score - 0.1. If -1.0 -> score - 0.2. If 0.5 -> score + 0.1. If 1.0 -> score + 0.2
+      }
+   }
+   switch(oppType)
+   {
+      case cOpportunityTypeDefend:  // Defensive AIs defend ally bases
+      {
+         score = score + (0.2 * btOffenseDefense); // If -0.5 -> score + 0.1. If -1.0 -> score + 0.2. If 0.5 -> score - 0.1. If 1.0 -> score - 0.2
+      }
+   }
+   switch(oppType)
+   {
+      case cOpportunityTypeClaim:  // Claiming AIs build more Trading Posts
+      {
+         if (kbVPSiteGetType(target) == cVPTrade) 
+         {
+            score = score + (0.2 * btBiasTrade); // If -0.5 -> score - 0.1. If -1.0 -> score - 0.2. If 0.5 -> score + 0.1. If 1.0 -> score + 0.2
+         }
+         if (kbVPSiteGetType(target) == cVPNative) 
+         {
+            score = score + (0.2 * btBiasNative); // If -0.5 -> score - 0.1. If -1.0 -> score - 0.2. If 0.5 -> score + 0.1. If 1.0 -> score + 0.2
+         }
+      }
+   }
+
    if (score > 1.0)
       score = 1.0;
    if (score < 0.0)
@@ -19046,7 +19598,7 @@ void main(void)
 		}
 		case cDifficultyHard: // Hard
 		{
-			kbSetPlayerHandicap( cMyID, startingHandicap * baselineHandicap * 1.0 );    // 1.0 handicap at hard, i.e. no bonus
+			kbSetPlayerHandicap( cMyID, startingHandicap * baselineHandicap * 1.15 );    // 15% bonus
 			break;
 		}
 		case cDifficultyExpert: // Expert
@@ -19202,8 +19754,8 @@ rule fillInWallGaps
          aiPlanSetVariableInt(wallPlanID, cBuildWallPlanWallType, 0, cBuildWallPlanWallTypeRing);
          aiPlanAddUnitType(wallPlanID, gEconUnit, 1, 1, 1);
          aiPlanSetVariableVector(wallPlanID, cBuildWallPlanWallRingCenterPoint, 0, kbBaseGetLocation(cMyID, kbBaseGetMainID(cMyID)));
-         aiPlanSetVariableFloat(wallPlanID, cBuildWallPlanWallRingRadius, 0, 50.0);
-         aiPlanSetVariableInt(wallPlanID, cBuildWallPlanNumberOfGates, 0, 6);
+         aiPlanSetVariableFloat(wallPlanID, cBuildWallPlanWallRingRadius, 0, 55.0);
+         aiPlanSetVariableInt(wallPlanID, cBuildWallPlanNumberOfGates, 0, 8);
          aiPlanSetBaseID(wallPlanID, kbBaseGetMainID(cMyID));
          aiPlanSetEscrowID(wallPlanID, cEconomyEscrowID);
          aiPlanSetDesiredPriority(wallPlanID,40);
@@ -19659,7 +20211,7 @@ minInterval 45
             decreePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechChurchCodeNapoleon);
             if (decreePlanID >= 0)
                aiPlanDestroy(decreePlanID);
-            createSimpleResearchPlan(cTechChurchCodeNapoleon, getUnit(cUnitTypeChurch), cMilitaryEscrowID, 50);
+            createSimpleResearchPlan(cTechChurchCodeNapoleon, getUnit(cUnitTypeChurch), cEconomyEscrowID, 50);
          }
          if (kbTechGetStatus(cTechChurchGardeImperial1) == cTechStatusObtainable)
          {
@@ -19974,6 +20526,10 @@ minInterval 60
    int baseDefensePop = 0;
    int ownMilitaryCount = 0;
 
+      xsEnableRule("useLevyMin");
+      xsEnableRule("useLevyIre");
+      xsEnableRule("useLevyAsi");
+
    // Number of units for base defend plan, 25% of army
    ownMilitaryCount = kbUnitCount(cMyID, cUnitTypeLogicalTypeLandMilitary, cUnitStateAlive);
    if (ownMilitaryCount > 0)
@@ -24148,6 +24704,106 @@ minInterval 30
 }
 
 
+rule useLevyMin
+inactive
+minInterval 10
+{
+   // Check to see if town is being overrun. If so, generate a plan
+   // to call levy. 
+
+   int levyPlan = -1;
+   vector mainBaseVec = cInvalidVector;
+   
+   mainBaseVec =  kbBaseGetLocation(cMyID, kbBaseGetMainID(cMyID));
+   int enemyCount = getUnitCountByLocation(cUnitTypeLogicalTypeLandMilitary, cPlayerRelationEnemyNotGaia, cUnitStateAlive, mainBaseVec, 40.0);
+   int allyCount = getUnitCountByLocation(cUnitTypeLogicalTypeLandMilitary, cPlayerRelationAlly, cUnitStateAlive, mainBaseVec, 40.0);
+
+   if (enemyCount >= (allyCount+6)) // We're behind by 6 or more
+   {
+      aiEcho("***** Starting levy plan, there are "+enemyCount+" enemy units in my base against "+allyCount+" friendlies.");
+      if (civIsAsian() == false)
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyMin, 0.2);
+   }
+
+   // Disable rule
+   xsDisableSelf();  
+
+}
+
+
+rule useLevyIre
+inactive
+minInterval 10
+{
+   // Check to see if town is being overrun. If so, generate a plan
+   // to call levy. 
+
+   int levyPlan = -1;
+   vector mainBaseVec = cInvalidVector;
+   
+   mainBaseVec =  kbBaseGetLocation(cMyID, kbBaseGetMainID(cMyID));
+   int enemyCount = getUnitCountByLocation(cUnitTypeLogicalTypeLandMilitary, cPlayerRelationEnemyNotGaia, cUnitStateAlive, mainBaseVec, 40.0);
+   int allyCount = getUnitCountByLocation(cUnitTypeLogicalTypeLandMilitary, cPlayerRelationAlly, cUnitStateAlive, mainBaseVec, 40.0);
+
+   if (enemyCount >= (allyCount+6)) // We're behind by 6 or more
+   {
+      aiEcho("***** Starting levy plan, there are "+enemyCount+" enemy units in my base against "+allyCount+" friendlies.");
+      if (cMyCiv == cCivIndians)
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyIre, 0.2);
+   }
+
+   // Disable rule
+   xsDisableSelf();  
+
+}
+
+
+rule useLevyAsi
+inactive
+minInterval 10
+{
+   // Check to see if town is being overrun. If so, generate a plan
+   // to call levy. 
+
+   int levyPlan = -1;
+   vector mainBaseVec = cInvalidVector;
+   
+   mainBaseVec =  kbBaseGetLocation(cMyID, kbBaseGetMainID(cMyID));
+   int enemyCount = getUnitCountByLocation(cUnitTypeLogicalTypeLandMilitary, cPlayerRelationEnemyNotGaia, cUnitStateAlive, mainBaseVec, 40.0);
+   int allyCount = getUnitCountByLocation(cUnitTypeLogicalTypeLandMilitary, cPlayerRelationAlly, cUnitStateAlive, mainBaseVec, 40.0);
+
+   if (enemyCount >= (allyCount+6)) // We're behind by 6 or more
+   {
+      aiEcho("***** Starting levy plan, there are "+enemyCount+" enemy units in my base against "+allyCount+" friendlies.");
+      if (civIsAsian() == true)
+         kbUnitPickSetPreferenceFactor(gLandUnitPicker, cUnitTypeLevyAsi, 0.2);
+   }
+
+   // Disable rule
+   xsDisableSelf();  
+
+}
+
+
+rule morebanks
+inactive
+minInterval 30
+{
+   if (kbTechGetStatus(cTechImpExcessiveTaxationD) == cTechStatusActive)
+   {
+      xsDisableSelf();
+      return;
+   }
+   int Bank = getUnit(cUnitTypeBank, cMyID, cUnitStateAlive);
+   if (Bank >= 0)
+   {
+      createSimpleResearchPlan(cTechImpExcessiveTaxationD,Bank,cEconomyEscrowID, 80);
+      xsDisableSelf();
+	
+   }
+}
+
+
 rule brigadeMonitor
 inactive
 minInterval 120
@@ -24729,3 +25385,291 @@ minInterval 10
       }
    }
 }
+
+
+rule MercantilismMonitor
+inactive
+minInterval 10
+{
+   if (kbTechGetStatus(cTechChurchMercantilism) == cTechStatusActive)
+   {
+      xsDisableSelf();
+      return;
+   }
+   int Church = getUnit(cUnitTypeChurch, cMyID, cUnitStateAlive);
+   if (Church >= 0)
+   {
+      createSimpleResearchPlan(cTechChurchMercantilism,Church,cEconomyEscrowID, 99);
+      xsDisableSelf();	
+   }
+}
+
+rule MarketUpgradeMonitor
+inactive
+minInterval 15 
+{
+   int upgradePlanID = -1;
+
+   if ((kbTechGetStatus(cTechHuntingDogs) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechSteelTraps) == cTechStatusActive) &&       
+       (kbTechGetStatus(cTechGangsaw) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechLogFlume) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechPlacerMines) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechAmalgamation) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechCircularSaw) == cTechStatusActive))
+   {
+       xsDisableSelf();
+       return;
+   }
+  
+
+   // Get upgrades one at a time
+   if (kbTechGetStatus(cTechHuntingDogs) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechHuntingDogs);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechHuntingDogs, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechSteelTraps) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechSteelTraps);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechSteelTraps, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechGangsaw) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechGangsaw);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechGangsaw, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechLogFlume) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechLogFlume);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechLogFlume, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechPlacerMines) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechPlacerMines);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechPlacerMines, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechAmalgamation) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechAmalgamation);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechAmalgamation, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechCircularSaw) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechCircularSaw);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechCircularSaw, getUnit(cUnitTypeMarket), cEconomyEscrowID, 50);
+      return;
+   }
+}
+
+
+rule MillUpgradeMonitor
+inactive
+minInterval 5 
+{
+   int upgradePlanID = -1;
+
+   if ((kbTechGetStatus(cTechSeedDrill) == cTechStatusActive) && 
+       (kbTechGetStatus(cTechHomesteading) == cTechStatusActive))    
+   {
+       xsDisableSelf();
+       return;
+   }
+
+   // Get upgrades one at a time
+   if (kbTechGetStatus(cTechSeedDrill) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechSeedDrill);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechSeedDrill, getUnit(cUnitTypeMill), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechArtificialFertilizer) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechArtificialFertilizer);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechArtificialFertilizer, getUnit(cUnitTypeMill), cEconomyEscrowID, 50);
+      return;
+   }
+}
+
+rule FarmUpgradeMonitor
+inactive
+minInterval 5 
+{
+   int upgradePlanID = -1;
+
+    
+   if ((kbTechGetStatus(cTechGreatFeast) == cTechStatusActive) && 
+       (kbTechGetStatus(cTechHarvestCeremony) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechGreenCornCeremony) == cTechStatusActive)) 
+   {
+       xsDisableSelf();
+       return;
+   }
+
+   // Get upgrades one at a time
+   if (kbTechGetStatus(cTechGreatFeast) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechGreatFeast);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechGreatFeast, getUnit(cUnitTypeFarm), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechHarvestCeremony) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechHarvestCeremony);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechHarvestCeremony, getUnit(cUnitTypeFarm), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechGreenCornCeremony) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechGreenCornCeremony);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechGreenCornCeremony, getUnit(cUnitTypeFarm), cEconomyEscrowID, 50);
+      return;
+   }
+}
+
+rule RicePaddyUpgradeMonitor
+inactive
+minInterval 5 
+{
+   int upgradePlanID = -1;
+
+    
+   if ((kbTechGetStatus(cTechypCropMarket) == cTechStatusActive) && 
+       (kbTechGetStatus(cTechypSharecropping) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechypCultivateWasteland) == cTechStatusActive) &&
+       (kbTechGetStatus(cTechypWaterConservancy) == cTechStatusActive)) 
+   {
+       xsDisableSelf();
+       return;
+   }
+
+   // Get upgrades one at a time
+   if (kbTechGetStatus(cTechypCropMarket) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechypCropMarket);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechypCropMarket, getUnit(cUnitTypeypRicePaddy), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechypSharecropping) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechypSharecropping);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechypSharecropping, getUnit(cUnitTypeypRicePaddy), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechypCultivateWasteland) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechypCultivateWasteland);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechypCultivateWasteland, getUnit(cUnitTypeypRicePaddy), cEconomyEscrowID, 50);
+      return;
+   }
+   if (kbTechGetStatus(cTechypWaterConservancy) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechypWaterConservancy);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechypWaterConservancy, getUnit(cUnitTypeypRicePaddy), cEconomyEscrowID, 50);
+      return;
+   }
+}
+
+rule MarketBerryDogsUpgradeMonitor
+inactive
+minInterval 10
+{
+   int upgradePlanID = -1;    
+       
+   // Disable rule once upgrade are available
+   if (kbTechGetStatus(cTechypMarketBerryDogs) == cTechStatusActive)
+   {
+      xsDisableSelf();
+      return;
+   }
+
+   // Get upgrades one at a time as they become available
+   if (kbTechGetStatus(cTechypMarketBerryDogs) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechypMarketBerryDogs);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechypMarketBerryDogs, getUnit(cUnitTypeypTradeMarketAsian), cMilitaryEscrowID, 50);
+      return;
+   }
+}
+
+
+rule MarketBerryTrapsUpgradeMonitor
+inactive
+minInterval 10
+{
+   int upgradePlanID = -1;    
+       
+   // Disable rule once upgrade are available
+   if (kbTechGetStatus(cTechypMarketBerryTraps) == cTechStatusActive)
+   {
+      xsDisableSelf();
+      return;
+   }
+
+   // Get upgrades one at a time as they become available
+   if (kbTechGetStatus(cTechypMarketBerryTraps) == cTechStatusObtainable)
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechypMarketBerryTraps);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechypMarketBerryTraps, getUnit(cUnitTypeypTradeMarketAsian), cMilitaryEscrowID, 50);
+      return;
+   }
+}
+
+
+rule BastionUpgradeMonitor
+inactive
+minInterval 90
+{
+   int upgradePlanID = -1;
+
+   if ((kbTechGetStatus(cTechBastion) == cTechStatusObtainable) && (kbUnitCount(cMyID, cUnitTypeAbstractWall, cUnitStateAlive) >= 20))
+   {
+      upgradePlanID = aiPlanGetIDByTypeAndVariableType(cPlanResearch, cResearchPlanTechID, cTechBastion);
+      if (upgradePlanID >= 0)
+         aiPlanDestroy(upgradePlanID);
+      createSimpleResearchPlan(cTechBastion, getUnit(cUnitTypeWallConnector), cMilitaryEscrowID, 50);
+      return;
+   }
+}
diff --git a/AoE3ImpModPatcher.exe b/AoE3ImpModPatcher.exe
index 6d51c24..b5cdee6 100644
Binary files a/AoE3ImpModPatcher.exe and b/AoE3ImpModPatcher.exe differ
diff --git a/Data/homecityitalians.xml b/Data/homecityitalians.xml
index 174dca1..0e2d7fc 100644
--- a/Data/homecityitalians.xml
+++ b/Data/homecityitalians.xml
@@ -17,7 +17,7 @@
 	<skillpoints>20</skillpoints>
 	<lightset>Lisbon</lightset>
 	<watertype>Lisbon</watertype>
-	<numpropunlocksearned>2</numpropunlocksearned>
+	<numpropunlocksearned>5</numpropunlocksearned>
 	<ambientsounds>homecity\spanishambientsounds.xml</ambientsounds>
 	<xsai>generic_city</xsai>
 	<coffers>
@@ -41,6 +41,27 @@
 		</maximum>
 	</coffers>
 	<cards>
+		<card>
+			<name>HCFameGold</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCCavalryDamageGermanTeam</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipHussars2</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCSacraments</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
 		<card>
 			<name>HCShipMusketeers1</name>
 			<maxcount>1</maxcount>
@@ -73,7 +94,7 @@
 			<maxcount>1</maxcount>
 			<level>10</level>
 			<prereqtech>HCShipSaker</prereqtech>
-			<age>1</age>
+			<age>2</age>
 			<displayunitcount>6</displayunitcount>
 			<infiniteinlastage>1</infiniteinlastage>
 		</card>
@@ -127,14 +148,14 @@
 			<maxcount>1</maxcount>
 			<level>25</level>
 			<prereqtech>ArchaicInfantryHitpoints</prereqtech>
-			<age>1</age>
+			<age>2</age>
 		</card>
 		<card>
 			<name>ArchaicInfantryHitpoints</name>
 			<maxcount>1</maxcount>
 			<level>25</level>
 			<prereqtech>ArchaicInfantryAttack</prereqtech>
-			<age>2</age>
+			<age>1</age>
 		</card>
 		<card>
 			<name>HCShipPikemenIt</name>
@@ -164,7 +185,7 @@
 			<maxcount>1</maxcount>
 			<level>25</level>
 			<prereqtech>HCShipCrossbowmen3</prereqtech>
-			<age>1</age>
+			<age>2</age>
 		</card>
 		<card>
 			<name>PaviseShield</name>
@@ -213,7 +234,7 @@
 			<name>HCMercsHolyRoman</name>
 			<maxcount>1</maxcount>
 			<level>25</level>
-			<prereqtech>HCMercsLandsknecht2German</prereqtech>
+			<prereqtech>-1</prereqtech>
 			<age>3</age>
 			<displayunitcount>19</displayunitcount>
 			<infiniteinlastage>1</infiniteinlastage>
@@ -325,8 +346,8 @@
 			<maxcount>1</maxcount>
 			<level>0</level>
 			<prereqtech>HCShipSettlers4</prereqtech>
-			<age>0</age>
-			<displayunitcount>2</displayunitcount>
+			<age>1</age>
+			<displayunitcount>3</displayunitcount>
 			<infiniteinlastage>1</infiniteinlastage>
 		</card>
 		<card>
@@ -491,6 +512,14 @@
 			<displayunitcount>1</displayunitcount>
 			<infiniteinlastage>1</infiniteinlastage>
 		</card>
+		<card>
+			<name>HCShipInquisitors</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>3</displayunitcount>
+		</card>
 		<card>
 			<name>HCShipSurgeons</name>
 			<maxcount>1</maxcount>
@@ -723,14 +752,14 @@
 			<name>HCHandCavalryHitpointsIt</name>
 			<maxcount>1</maxcount>
 			<level>10</level>
-			<prereqtech>HCShipHussars2</prereqtech>
+			<prereqtech>HCCavalryDamageGermanTeam</prereqtech>
 			<age>1</age>
 		</card>
 		<card>
 			<name>HCHandCavalryCombatIt</name>
 			<maxcount>1</maxcount>
 			<level>25</level>
-			<prereqtech>HCHandCavalryDamageIt</prereqtech>
+			<prereqtech>HCHandCavalryHitpointsIt</prereqtech>
 			<age>2</age>
 		</card>
 		<card>
@@ -970,7 +999,7 @@
 			<name>HCFencingSchool</name>
 			<maxcount>1</maxcount>
 			<level>10</level>
-			<prereqtech>HCCheapBarracksTeam</prereqtech>
+			<prereqtech>-1</prereqtech>
 			<age>1</age>
 		</card>
 		<card>
@@ -1389,7 +1418,7 @@
 			<name>HCMercsMediterranean</name>
 			<maxcount>1</maxcount>
 			<level>25</level>
-			<prereqtech>HCMercsStradiots</prereqtech>
+			<prereqtech>-1</prereqtech>
 			<age>3</age>
 			<displayunitcount>13</displayunitcount>
 			<infiniteinlastage>1</infiniteinlastage>
@@ -1507,6 +1536,24 @@
 			<displayunitcount>1</displayunitcount>
 			<revoltcard/>
 		</card>
+		<card>
+			<name>HCREVPowder</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>3</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>HCREVFireShips</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>3</displayunitcount>
+			<revoltcard/>
+		</card>
 	</cards>
 	<decks>
 		<deck>
@@ -1527,7 +1574,7 @@
 				<card>HCFrontierDefenses</card>
 				<card>HCUnlockFort</card>
 				<card>HCRoyalDecreeItalians</card>
-				<card>HCMercsMaghrabi</card>
+				<card>HCXPMercsElmeti</card>
 			</cards>
 		</deck>
 		<deck>
@@ -1549,7 +1596,7 @@
 				<card>HCFrontierDefenses</card>
 				<card>HCUnlockFort</card>
 				<card>HCRoyalDecreeItalians</card>
-				<card>HCMercsMaghrabi</card>
+				<card>HCXPMercsElmeti</card>
 			</cards>
 		</deck>
 		<revoltdeck>
@@ -1560,6 +1607,8 @@
 				<card>HCREVShipIronclads</card>
 				<card>HCREVShipFortWagon</card>
 				<card>HCREVShipFactory</card>
+				<card>HCREVPowder</card>
+				<card>HCREVFireShips</card>
 			</cards>
 		</revoltdeck>
 	</decks>
@@ -1628,6 +1677,7 @@
 			<tech x="7.0" y="3.0">HCShipBalloons</tech>
 			<tech x="7.0" y="5.0">HCXPAdvancedBalloon</tech>
 			<tech x="3.4" y="7.0">TreasurySup</tech>
+			<tech x="6.0" y="6.0">HCShipInquisitors</tech>
 		</obtainabletechs>
 		<activetechs>
 			<tech>HCShipSettlers1</tech>
@@ -1674,8 +1724,8 @@
 			<tech x="4.0" y="1.0">HCShipHussars2</tech>
 			<tech x="4.0" y="3.0">HCShipHussars3</tech>
 			<tech x="4.0" y="4.0">HCShipHussars4</tech>
-			<tech x="4.7" y="3.0">HCHandCavalryHitpointsIt</tech>
-			<tech x="4.7" y="4.0">HCHandCavalryDamageIt</tech>
+			<tech x="4.7" y="4.0">HCHandCavalryHitpointsIt</tech>
+			<tech x="4.7" y="3.0">HCCavalryDamageGermanTeam</tech>
 			<tech x="4.7" y="5.0">HCHandCavalryCombatIt</tech>
 			<tech x="5.7" y="6.0">ArtilleryCombat</tech>
 			<tech x="5.7" y="1.0">HCShipSaker</tech>
@@ -1725,9 +1775,9 @@
 			<tech x="0.0" y="3.0">HCNativeWarriors</tech>
 			<tech x="0.9" y="5.0">HCXPBloodBrothers</tech>
 			<tech x="0.0" y="5.0">HCAdvancedTradingPost</tech>
-			<tech x="0.9" y="2.0">HCFencingSchool</tech>
-			<tech x="1.6" y="2.0">HCRidingSchool</tech>
-			<tech x="1.6" y="3.0">HCEngineeringSchool</tech>
+			<tech x="0.9" y="3.0">HCFencingSchool</tech>
+			<tech x="1.6" y="3.0">HCRidingSchool</tech>
+			<tech x="1.6" y="4.0">HCEngineeringSchool</tech>
 			<tech x="2.8" y="1.0">HCFrontierDefenses</tech>
 			<tech x="3.2" y="2.0">HCColonialMilitia</tech>
 			<tech x="2.5" y="2.0">HCPioneers</tech>
@@ -1737,8 +1787,8 @@
 			<tech x="3.2" y="4.0">HCFrontierDefenses2</tech>
 			<tech x="3.9" y="1.0">HCUnlockFort</tech>
 			<tech x="3.9" y="2.0">HCExtensiveFortifications</tech>
-			<tech x="3.9" y="7.0">HCXPAssassins</tech>
-			<tech x="4.6" y="7.0">HCXPShipSpies1</tech>
+			<tech x="1.6" y="7.0">HCXPAssassins</tech>
+			<tech x="1.6" y="1.0">HCXPShipSpies1</tech>
 			<tech x="5.3" y="1.0">HCXPRanching</tech>
 			<tech x="4.6" y="3.0">HCRoyalDecreeItalians</tech>
 			<tech x="6.0" y="1.0">HCAdvancedMill</tech>
@@ -1749,6 +1799,7 @@
 			<tech x="7.4" y="3.0">HCRobberBarons</tech>
 			<tech x="7.4" y="5.0">CheaperAgeUp</tech>
 			<tech x="5.3" y="3.0">HCXPUnction</tech>
+			<tech x="4.6" y="5.0">HCSacraments</tech>
 		</obtainabletechs>
 		<activetechs>
 			<tech>CheaperAgeUp</tech>
@@ -1778,6 +1829,7 @@
 			<tech x="0.0" y="3.0">HCStonemasons</tech>
 			<tech x="0.0" y="5.0">HCXPLandGrab</tech>
 			<tech x="1.3" y="1.0">HCFishMarket</tech>
+			<tech x="1.3" y="7.0">HCFameGold</tech>
 			<tech x="0.9" y="3.0">HCRenderingPlant</tech>
 			<tech x="1.6" y="3.0">HCSchooners</tech>
 			<tech x="2.5" y="3.0">HCSawmills</tech>
@@ -1840,7 +1892,7 @@
 			<tech x="4.9" y="3.0">HCMercsMaghrabi</tech>
 		</obtainabletechs>
 		<activetechs>
-			<tech>HCMercsMaghrabi</tech>
+			<tech>HCXPMercsElmeti</tech>
 		</activetechs>
 		<validunits/>
 		<units/>
@@ -2177,5 +2229,6 @@
 		<prop>Italians_DockTexture5</prop>
 		<prop>Italians_DockTexture6</prop>
 		<prop>Italians_DockTexture7</prop>
+		<prop active="1">RussianWolf</prop>
 	</obtainableprops>
 </homecity>
\ No newline at end of file
diff --git a/Data/homecityswedish.xml b/Data/homecityswedish.xml
new file mode 100644
index 0000000..86b17fe
--- /dev/null
+++ b/Data/homecityswedish.xml
@@ -0,0 +1,2017 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<homecity>
+	<civ>Swedish</civ>
+	<name>Stockholm</name>
+	<heroname>Ragnar Lothbrok</heroname>
+	<gatherpointunit>HomeCityGatherFlag</gatherpointunit>
+	<visual>russian\russian_homecity2.xml</visual>
+	<watervisual>russian\russian_homecity_water.xml</watervisual>
+	<backgroundvisual>russian\russian_background.xml</backgroundvisual>
+	<pathdata>russian\pathable_area_object.gr2</pathdata>
+	<camera>german\germany_homecity_academy_camera.cam</camera>
+	<widescreencamera>german\germany_homecity_academy_widescreencamera.cam</widescreencamera>
+	<transportroundtriptime>1</transportroundtriptime>
+	<transportactivationtime>0</transportactivationtime>
+	<level>25</level>
+	<skillpoints>20</skillpoints>
+	<lightset>st_petersburg</lightset>
+	<watertype>Berlin</watertype>
+	<numpropunlocksearned>5</numpropunlocksearned>
+	<ambientsounds>homecity\blackestateambientsounds.xml</ambientsounds>
+	<xsai>generic_city</xsai>
+	<coffers>
+		<current>
+			<food>0</food>
+			<wood>0</wood>
+			<gold>0</gold>
+			<fame>0</fame>
+			<ships>0</ships>
+			<skillpoints>0</skillpoints>
+			<xp>0</xp>
+		</current>
+		<maximum>
+			<food>0</food>
+			<wood>0</wood>
+			<gold>0</gold>
+			<fame>0</fame>
+			<ships>0</ships>
+			<skillpoints>-1</skillpoints>
+			<xp>-1</xp>
+		</maximum>
+	</coffers>
+	<cards>
+		<card>
+			<name>HCXPComancheroAllies</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>7</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCREVShipFactory</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>1</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>TreasurySup</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCXPComancheroAllies</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>7</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCMercsStradiots</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>6</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipAxemenR</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>6</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipAxemenR2</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipAxemenR</prereqtech>
+			<age>2</age>
+			<displayunitcount>7</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCExtensiveFortifications</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCBlockhouseCannon</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCShipSettlers1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipSettlers3</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipSettlers1</prereqtech>
+			<age>1</age>
+			<displayunitcount>3</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFoodCrates1</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+			<displayunitcount>300</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFoodCrates2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipFoodCrates1</prereqtech>
+			<age>1</age>
+			<displayunitcount>600</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFoodCrates3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipFoodCrates2</prereqtech>
+			<age>1</age>
+			<displayunitcount>700</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFoodCrates4</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipFoodCrates3</prereqtech>
+			<age>2</age>
+			<displayunitcount>1000</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFoodCrates5</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipFoodCrates4</prereqtech>
+			<age>3</age>
+			<displayunitcount>1600</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipWoodCrates1</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+			<displayunitcount>300</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipWoodCrates2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipWoodCrates1</prereqtech>
+			<age>1</age>
+			<displayunitcount>600</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipWoodCrates3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipwoodCrates2</prereqtech>
+			<age>1</age>
+			<displayunitcount>700</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipWoodCrates4</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipWoodCrates3</prereqtech>
+			<age>2</age>
+			<displayunitcount>1000</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipWoodCrates5</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipWoodCrates4</prereqtech>
+			<age>3</age>
+			<displayunitcount>1600</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCoinCrates1</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+			<displayunitcount>300</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCoinCrates2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipCoinCrates1</prereqtech>
+			<age>1</age>
+			<displayunitcount>600</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCoinCrates3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCoinCrates2</prereqtech>
+			<age>1</age>
+			<displayunitcount>700</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCoinCrates4</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCoinCrates3</prereqtech>
+			<age>2</age>
+			<displayunitcount>1000</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCoinCrates5</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipCoinCrates4</prereqtech>
+			<age>3</age>
+			<displayunitcount>1600</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipSheep1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+			<displayunitcount>7</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipSheep2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipSheep1</prereqtech>
+			<age>2</age>
+			<displayunitcount>15</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipSheep3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipSheep2</prereqtech>
+			<age>2</age>
+			<displayunitcount>20</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCows</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipSheep1</prereqtech>
+			<age>1</age>
+			<displayunitcount>7</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCoveredWagons</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipSurgeons</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>2</displayunitcount>
+		</card>
+		<card>
+			<name>HCCheapHealersTeam</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipSurgeons</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCXPMasterSurgeons</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipSurgeons</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCExplorerRussian</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCShipBalloons</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCXPAdvancedBalloon</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCShipBalloons</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCShipStrelets1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>13</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipStrelets2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipStrelets1</prereqtech>
+			<age>2</age>
+			<infiniteinlastage>1</infiniteinlastage>
+			<displayunitcount>17</displayunitcount>
+		</card>
+		<card>
+			<name>HCShipStrelets3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipStrelets2</prereqtech>
+			<age>3</age>
+			<displayunitcount>24</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipStrelets4</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipStrelets3</prereqtech>
+			<age>3</age>
+			<displayunitcount>28</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCSpawnStrelet</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipStrelets4</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCXPSuvorovReforms</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCSpawnStrelet</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCStreletsCombatRussian</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCSpawnStrelet</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCShipHalberdiersRussian1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipHalberdiersRussian2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipHalberdiersRussian1</prereqtech>
+			<age>3</age>
+			<displayunitcount>13</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipHalberdiersRussian3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipHalberdiersRussian2</prereqtech>
+			<age>3</age>
+			<displayunitcount>15</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCRansack</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipHalberdiersRussian3</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCShipMusketeersRussian2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>11</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipMusketeersRussian3</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipMusketeersRussian2</prereqtech>
+			<age>3</age>
+			<displayunitcount>16</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCossacks1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>4</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCossacks2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipCossacks1</prereqtech>
+			<age>2</age>
+			<displayunitcount>6</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCossacks3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCossacks2</prereqtech>
+			<age>3</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCossacks4</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCossacks3</prereqtech>
+			<age>1</age>
+			<displayunitcount>5</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCUniqueCombatRussian</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipCossacks4</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCCavalryLOSTeam</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCBarracksHPTeam</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCBlockhouseCannon</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCBarracksHPTeam</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCShipOprichniks1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>5</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipOprichniks2</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipOprichniks1</prereqtech>
+			<age>2</age>
+			<displayunitcount>6</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipOprichniks3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipOprichniks2</prereqtech>
+			<age>3</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPShipOprichniks4</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCShipOprichniks3</prereqtech>
+			<age>3</age>
+			<displayunitcount>12</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCCavalryCombatRussian</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCavArchers3</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCXPShipCavArchersRepeat</name>
+			<maxcount>-1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCavArchers3</prereqtech>
+			<age>3</age>
+			<displayunitcount>7</displayunitcount>
+		</card>
+		<card>
+			<name>HCShipCavArchers1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>5</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCavArchers2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipCavArchers1</prereqtech>
+			<age>3</age>
+			<displayunitcount>8</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCavArchers3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipCavArchers2</prereqtech>
+			<age>3</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipGrenadiers1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>4</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipGrenadiers2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipGrenadiers1</prereqtech>
+			<age>3</age>
+			<displayunitcount>7</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipGrenadiers3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipGrenadiers2</prereqtech>
+			<age>2</age>
+			<displayunitcount>5</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipGrenadiers4</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipGrenadiers3</prereqtech>
+			<age>3</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFalconets1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFalconets2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipFalconets1</prereqtech>
+			<age>3</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipFalconets3</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipFalconets2</prereqtech>
+			<age>2</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCAdvancedArtillery</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCShipMortars1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipMortars2</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipMortars1</prereqtech>
+			<age>3</age>
+			<displayunitcount>3</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCUnicorne</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipMortars2</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCXPShipMortarsTeam</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCUnicorne</prereqtech>
+			<age>3</age>
+			<displayunitcount>2</displayunitcount>
+		</card>
+		<card>
+			<name>HCShipGreatCannons1</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipFalconets3</prereqtech>
+			<age>3</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipGreatCannons2</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipGreatCannons1</prereqtech>
+			<age>3</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCNativeLore</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCNativeTreaties</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCNativeLore</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCNativeWarriors</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCNativeTreaties</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCXPBloodBrothers</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCAdvancedTradingPost</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCAdvancedTradingPost</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCNativeWarriors</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCColonialMilitia</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCPioneers</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCColonialMilitia</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCImprovedBuildings</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCFrontierDefenses</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCFrontierDefenses</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCColonialMilitia</prereqtech>
+			<age>2</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCHeavyFortifications</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCImprovedBuildings</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCAdvancedArsenal</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCFrontierDefenses</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCFrontierDefenses2</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCAdvancedArsenal</prereqtech>
+			<age>3</age>
+			<displayunitcount>4</displayunitcount>
+		</card>
+		<card>
+			<name>HCUnlockFort</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPUnlockFort2</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCUnlockFort</prereqtech>
+			<age>3</age>
+			<displayunitcount>1</displayunitcount>
+		</card>
+		<card>
+			<name>HCXPSevastopol</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCXPUnlockFort2</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCFencingSchool</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCDuelingSchoolTeam</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCFencingSchool</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCRidingSchool</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCRoyalDecreeSwedish</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCXPNationalRedoubt</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCRoyalDecreeSwedish</prereqtech>
+			<age>3</age>
+		</card>
+		<card>
+			<name>HCAdvancedMill</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCAdvancedMarket</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCAdvancedPlantations</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCAdvancedDock</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCUnlockFactory</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPIndustrialRevolution</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCUnlockFactory</prereqtech>
+			<age>3</age>
+			<displayunitcount>1</displayunitcount>
+		</card>
+		<card>
+			<name>HCXPRanching</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCXPShipSpies1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>5</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPShipSpies2</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCXPShipSpies1</prereqtech>
+			<age>2</age>
+			<displayunitcount>8</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPShipSpiesTeam</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCXPShipSpies2</prereqtech>
+			<age>3</age>
+			<displayunitcount>8</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPAssassins</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCFishMarket</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCRenderingPlant</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCFishMarket</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCSchooners</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCFishMarket</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCSawmills</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCExoticHardwoods</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCSawmills</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCXPDistributivism</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCExoticHardwoods</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCSilversmith</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCRoyalMint</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCSilversmith</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCFoodSilos</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCSustainableAgriculture</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCFoodSilos</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCRefrigeration</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCSustainableAgriculture</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCStockyards</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCFurrierTeam</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCSpiceTrade</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCFurrierTeam</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCMedicine</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCRumDistillery</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCCigarRoller</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCRumDistillery</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCTextileMills</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCCigarRoller</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCStonemasons</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCXPLandGrab</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCStonemasons</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCXPEconomicTheory</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCStonemasons</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCShipCaravels1</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipCaravels2</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipCaravels1</prereqtech>
+			<age>1</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipGalleons</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>HCShipCaravels1</prereqtech>
+			<age>1</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCCoastalDefensesTeam</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>0</age>
+		</card>
+		<card>
+			<name>HCShipFrigates</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipGalleons</prereqtech>
+			<age>2</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCShipRussianFleet</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCShipFrigates</prereqtech>
+			<age>3</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCNavalCombat</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipFrigates</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCShipMonitors</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCShipFrigates</prereqtech>
+			<age>3</age>
+			<displayunitcount>1</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPShipMonitorsTeam</name>
+			<maxcount>1</maxcount>
+			<level>40</level>
+			<prereqtech>HCShipMonitors</prereqtech>
+			<age>3</age>
+			<displayunitcount>1</displayunitcount>
+		</card>
+		<card>
+			<name>HCAdmirality</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCColdWaterPortTeam</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCAdmirality</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCMercsHolyRoman</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+			<displayunitcount>16</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCMercsHighland</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCMercsHighlanders</prereqtech>
+			<age>3</age>
+			<displayunitcount>18</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCMercsHackapells</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCMercsHighlanders</prereqtech>
+			<age>2</age>
+			<displayunitcount>6</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCMercsHighlanders</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCMercsManchu</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>2</age>
+			<displayunitcount>9</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPMercsNinja</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>HCMercsManchu</prereqtech>
+			<age>3</age>
+			<displayunitcount>12</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCXPMercsFusiliers</name>
+			<maxcount>1</maxcount>
+			<level>10</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+			<displayunitcount>8</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCMercenaryLoyalty</name>
+			<maxcount>1</maxcount>
+			<level>25</level>
+			<prereqtech>HCXPDanceHallRu</prereqtech>
+			<age>2</age>
+		</card>
+		<card>
+			<name>HCXPDanceHallRu</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+		</card>
+		<card>
+			<name>HCXPNootkaAlliesRepeat</name>
+			<maxcount>-1</maxcount>
+			<level>40</level>
+			<prereqtech>-1</prereqtech>
+			<age>3</age>
+			<displayunitcount>30</displayunitcount>
+		</card>
+		<card>
+			<name>HCPrivateers</name>
+			<maxcount>1</maxcount>
+			<level>0</level>
+			<prereqtech>-1</prereqtech>
+			<age>1</age>
+			<displayunitcount>2</displayunitcount>
+			<infiniteinlastage>1</infiniteinlastage>
+		</card>
+		<card>
+			<name>HCREVShipGatlingGuns</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>4</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>HCREVShipColonialMilitia</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>16</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>HCREVShipIronclads</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>2</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>HCREVShipFortWagon</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>1</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>HCREVPowder</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>3</displayunitcount>
+			<revoltcard/>
+		</card>
+		<card>
+			<name>HCREVFireShips</name>
+			<maxcount>-1</maxcount>
+			<level>0</level>
+			<prereqtech>XPRevolution</prereqtech>
+			<age>2</age>
+			<displayunitcount>3</displayunitcount>
+			<revoltcard/>
+		</card>
+	</cards>
+	<decks>
+		<deck>
+			<name>$$41681$$</name>
+			<cards>
+				<card>HCShipFoodCrates1</card>
+				<card>HCShipCoveredWagons</card>
+				<card>HCShipStrelets1</card>
+				<card>HCShipStrelets2</card>
+				<card>HCShipCossacks1</card>
+				<card>HCShipCossacks2</card>
+				<card>HCShipCavArchers1</card>
+				<card>HCShipCavArchers2</card>
+				<card>HCShipAxemenR</card>
+				<card>HCShipAxemenR2</card>
+				<card>HCShipFalconets1</card>
+				<card>HCExplorerRussian</card>
+				<card>HCFurrierTeam</card>
+				<card>HCAdvancedArtillery</card>
+				<card>HCUnlockFort</card>
+				<card>HCRoyalDecreeSwedish</card>
+			</cards>
+		</deck>
+		<deck>
+			<name>$$41682$$</name>
+			<default/>
+			<cards>
+				<card>HCShipFoodCrates1</card>
+				<card>HCShipCoveredWagons</card>
+				<card>HCShipStrelets1</card>
+				<card>HCShipStrelets2</card>
+				<card>HCShipCossacks1</card>
+				<card>HCShipCossacks2</card>
+				<card>HCShipCavArchers1</card>
+				<card>HCShipCavArchers2</card>
+				<card>HCShipAxemenR</card>
+				<card>HCShipAxemenR2</card>
+				<card>HCShipFalconets1</card>
+				<card>HCExplorerRussian</card>
+				<card>HCFurrierTeam</card>
+				<card>HCAdvancedArtillery</card>
+				<card>HCUnlockFort</card>
+				<card>HCRoyalDecreeSwedish</card>
+			</cards>
+		</deck>
+		<revoltdeck>
+			<name>$$45518$$</name>
+			<cards>
+				<card>HCREVShipFortWagon</card>
+				<card>HCREVShipFactory</card>
+				<card>HCREVShipColonialMilitia</card>
+				<card>HCREVShipGatlingGuns</card>
+				<card>HCREVShipIronclads</card>
+				<card>HCREVShipPrivateers</card>
+				<card>HCREVPowder</card>
+				<card>HCREVFireShips</card>
+			</cards>
+		</revoltdeck>
+	</decks>
+	<building>
+		<name>Estate</name>
+		<visual>
+			<file>russian\russian estate.xml</file>
+			<bone>bone_estate</bone>
+		</visual>
+		<uix>150</uix>
+		<uiy>200</uiy>
+		<camera>russian\russian_homecity_estate_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_estate_camera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\estate_icon</portrait>
+		<displaynamestringid>24968</displaynamestringid>
+		<rolloverstringid>25537</rolloverstringid>
+		<obtainabletechs/>
+		<activetechs/>
+		<validunits/>
+		<units/>
+		<mercbuilding>1</mercbuilding>
+		<trainbuilding>1</trainbuilding>
+	</building>
+	<building>
+		<name>Market</name>
+		<visual>
+			<file>russian\russian_tradecenter2.xml</file>
+			<bone>bone_market</bone>
+		</visual>
+		<uix>250</uix>
+		<uiy>375</uiy>
+		<camera>russian\russian_homecity_market_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_market_widescreencamera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\market_icon</portrait>
+		<displaynamestringid>24970</displaynamestringid>
+		<rolloverstringid>25536</rolloverstringid>
+		<obtainabletechs>
+			<tech x="0.1" y="1.0">HCShipSettlers1</tech>
+			<tech x="0.1" y="2.0">HCShipSettlers3</tech>
+			<tech x="1.0" y="1.0">HCShipFoodCrates1</tech>
+			<tech x="1.7" y="1.0">HCShipWoodCrates1</tech>
+			<tech x="2.4" y="1.0">HCShipCoinCrates1</tech>
+			<tech x="1.0" y="2.0">HCShipFoodCrates2</tech>
+			<tech x="1.7" y="2.0">HCShipWoodCrates2</tech>
+			<tech x="2.4" y="2.0">HCShipCoinCrates2</tech>
+			<tech x="1.0" y="3.0">HCShipFoodCrates3</tech>
+			<tech x="1.7" y="3.0">HCShipWoodCrates3</tech>
+			<tech x="2.4" y="3.0">HCShipCoinCrates3</tech>
+			<tech x="1.0" y="4.0">HCShipFoodCrates4</tech>
+			<tech x="1.7" y="4.0">HCShipWoodCrates4</tech>
+			<tech x="2.4" y="4.0">HCShipCoinCrates4</tech>
+			<tech x="1.0" y="5.0">HCShipFoodCrates5</tech>
+			<tech x="1.7" y="5.0">HCShipWoodCrates5</tech>
+			<tech x="2.4" y="5.0">HCShipCoinCrates5</tech>
+			<tech x="4.0" y="1.0">HCShipSheep1</tech>
+			<tech x="3.7" y="2.0">HCShipSheep2</tech>
+			<tech x="3.7" y="3.0">HCShipSheep3</tech>
+			<tech x="4.4" y="2.0">HCShipCows</tech>
+			<tech x="5.7" y="1.0">HCShipCoveredWagons</tech>
+			<tech x="5.7" y="2.0">HCShipSurgeons</tech>
+			<tech x="5.3" y="3.0">HCCheapHealersTeam</tech>
+			<tech x="6.1" y="3.0">HCXPMasterSurgeons</tech>
+			<tech x="7.0" y="1.0">HCExplorerRussian</tech>
+			<tech x="7.0" y="3.0">HCShipBalloons</tech>
+			<tech x="7.0" y="7.0">HCXPAdvancedBalloon</tech>
+			<tech x="2.4" y="7.0">TreasurySup</tech>
+		</obtainabletechs>
+		<activetechs>
+			<tech>HCShipFoodCrates1</tech>
+			<tech>HCShipCoveredWagons</tech>
+			<tech>HCExplorerRussian</tech>
+		</activetechs>
+		<validunits/>
+		<units/>
+		<trainbuilding>1</trainbuilding>
+	</building>
+	<building>
+		<name>Academy</name>
+		<visual>
+			<file>russian\russian_academy2.xml</file>
+			<bone>bone_academy</bone>
+		</visual>
+		<uix>460</uix>
+		<uiy>125</uiy>
+		<camera>russian\russian_homecity_academy_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_academy_widescreencamera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\academy_icon</portrait>
+		<displaynamestringid>24965</displaynamestringid>
+		<rolloverstringid>25533</rolloverstringid>
+		<obtainabletechs>
+			<tech x="0.2" y="6.0">HCStreletsCombatRussian</tech>
+			<tech x="0.7" y="1.0">HCShipStrelets1</tech>
+			<tech x="0.7" y="2.0">HCShipStrelets2</tech>
+			<tech x="0.7" y="3.0">HCShipStrelets3</tech>
+			<tech x="0.7" y="4.0">HCShipStrelets4</tech>
+			<tech x="0.7" y="5.0">HCSpawnStrelet</tech>
+			<tech x="0.7" y="7.0">HCXPSuvorovReforms</tech>
+			<tech x="1.8" y="1.0">HCShipHalberdiersRussian1</tech>
+			<tech x="1.8" y="2.0">HCShipHalberdiersRussian2</tech>
+			<tech x="1.8" y="3.0">HCShipHalberdiersRussian3</tech>
+			<tech x="1.8" y="5.0">HCRansack</tech>
+			<tech x="2.5" y="1.0">HCShipMusketeersRussian2</tech>
+			<tech x="2.5" y="2.0">HCShipMusketeersRussian3</tech>
+			<tech x="3.5" y="1.0">HCShipCossacks1</tech>
+			<tech x="3.5" y="2.0">HCShipCossacks2</tech>
+			<tech x="3.0" y="3.0">HCShipCossacks3</tech>
+			<tech x="2.5" y="4.0">HCShipCossacks4</tech>
+			<tech x="2.5" y="5.0">HCUniqueCombatRussian</tech>
+			<tech x="4.2" y="1.0">HCShipCavArchers1</tech>
+			<tech x="4.2" y="2.0">HCShipCavArchers2</tech>
+			<tech x="4.2" y="3.0">HCShipCavArchers3</tech>
+			<tech x="3.5" y="4.0">HCXPShipCavArchersRepeat</tech>
+			<tech x="4.2" y="4.0">HCCavalryCombatRussian</tech>
+			<tech x="4.9" y="1.0">HCCavalryLOSTeam</tech>
+			<tech x="4.9" y="2.0">HCShipOprichniks1</tech>
+			<tech x="4.9" y="3.0">HCShipOprichniks2</tech>
+			<tech x="4.9" y="4.0">HCShipOprichniks3</tech>
+			<tech x="4.9" y="7.0">HCXPShipOprichniks4</tech>
+			<tech x="6.0" y="1.0">HCShipGrenadiers1</tech>
+			<tech x="6.0" y="2.0">HCShipGrenadiers2</tech>
+			<tech x="6.0" y="3.0">HCShipGrenadiers3</tech>
+			<tech x="6.0" y="5.0">HCShipGrenadiers4</tech>
+			<tech x="6.7" y="1.0">HCShipFalconets1</tech>
+			<tech x="6.7" y="2.0">HCShipFalconets2</tech>
+			<tech x="6.7" y="3.0">HCShipFalconets3</tech>
+			<tech x="6.7" y="4.0">HCShipGreatCannons1</tech>
+			<tech x="6.7" y="5.0">HCShipGreatCannons2</tech>
+			<tech x="7.4" y="1.0">HCAdvancedArtillery</tech>
+			<tech x="7.4" y="2.0">HCShipMortars1</tech>
+			<tech x="7.4" y="3.0">HCShipMortars2</tech>
+			<tech x="7.4" y="4.0">HCUnicorne</tech>
+			<tech x="7.4" y="7.0">HCXPShipMortarsTeam</tech>
+		</obtainabletechs>
+		<activetechs>
+			<tech>HCShipStrelets1</tech>
+			<tech>HCShipStrelets2</tech>
+			<tech>HCShipCossacks1</tech>
+			<tech>HCShipCossacks2</tech>
+			<tech>HCShipCavArchers1</tech>
+			<tech>HCShipCavArchers2</tech>
+			<tech>HCShipAxemenR</tech>
+			<tech>HCShipAxemenR2</tech>
+			<tech>HCShipFalconets1</tech>
+			<tech>HCAdvancedArtillery</tech>
+		</activetechs>
+		<validunits/>
+		<units/>
+		<trainbuilding>1</trainbuilding>
+	</building>
+	<building>
+		<name>Cathedral</name>
+		<visual>
+			<file>russian\russian_cathedral2.xml</file>
+			<bone>bone_cathedral</bone>
+		</visual>
+		<uix>80</uix>
+		<uiy>475</uiy>
+		<camera>russian\russian_homecity_cathedral_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_cathedral_widescreencamera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\cathedral_icon</portrait>
+		<displaynamestringid>28989</displaynamestringid>
+		<rolloverstringid>25538</rolloverstringid>
+		<obtainabletechs>
+			<tech x="4.2" y="5.0">HCExtensiveFortifications</tech>
+			<tech x="0.0" y="1.0">HCNativeLore</tech>
+			<tech x="0.0" y="2.0">HCNativeTreaties</tech>
+			<tech x="0.0" y="3.0">HCNativeWarriors</tech>
+			<tech x="0.0" y="5.0">HCAdvancedTradingPost</tech>
+			<tech x="0.0" y="6.0">HCXPBloodBrothers</tech>
+			<tech x="0.9" y="3.0">HCFencingSchool</tech>
+			<tech x="0.9" y="5.0">HCDuelingSchoolTeam</tech>
+			<tech x="1.6" y="1.0">HCXPRanching</tech>
+			<tech x="1.6" y="3.0">HCRidingSchool</tech>
+			<tech x="2.3" y="1.0">HCColonialMilitia</tech>
+			<tech x="2.0" y="2.0">HCPioneers</tech>
+			<tech x="2.7" y="2.0">HCFrontierDefenses</tech>
+			<tech x="3.0" y="3.0">HCImprovedBuildings</tech>
+			<tech x="2.3" y="3.0">HCAdvancedArsenal</tech>
+			<tech x="2.3" y="4.0">HCFrontierDefenses2</tech>
+			<tech x="3.0" y="5.0">HCHeavyFortifications</tech>
+			<tech x="3.5" y="1.0">HCUnlockFort</tech>
+			<tech x="3.5" y="4.0">HCXPUnlockFort2</tech>
+			<tech x="3.5" y="7.0">HCXPSevastopol</tech>
+			<tech x="4.2" y="1.0">HCBarracksHPTeam</tech>
+			<tech x="4.2" y="3.0">HCBlockhouseCannon</tech>
+			<tech x="5.1" y="3.0">HCRoyalDecreeSwedish</tech>
+			<tech x="5.1" y="7.0">HCXPNationalRedoubt</tech>
+			<tech x="5.8" y="1.0">HCAdvancedMill</tech>
+			<tech x="6.5" y="1.0">HCAdvancedMarket</tech>
+			<tech x="5.8" y="3.0">HCAdvancedDock</tech>
+			<tech x="5.8" y="5.0">HCAdvancedPlantations</tech>
+			<tech x="5.8" y="7.0">HCXPAssassins</tech>
+			<tech x="6.5" y="2.0">HCXPShipSpies1</tech>
+			<tech x="6.5" y="3.0">HCXPShipSpies2</tech>
+			<tech x="6.5" y="7.0">HCXPShipSpiesTeam</tech>
+			<tech x="7.2" y="1.0">HCUnlockFactory</tech>
+			<tech x="7.2" y="5.0">HCXPIndustrialRevolution</tech>
+		</obtainabletechs>
+		<activetechs>
+			<tech>HCUnlockFort</tech>
+			<tech>HCRoyalDecreeSwedish</tech>
+		</activetechs>
+		<validunits/>
+		<units/>
+		<trainbuilding>1</trainbuilding>
+	</building>
+	<building>
+		<name>ManufacturingPlant</name>
+		<visual>
+			<file>russian\russian_manufacturingplant2.xml</file>
+			<bone>bone_plant</bone>
+		</visual>
+		<uix>450</uix>
+		<uiy>275</uiy>
+		<camera>russian\russian_homecity_manufacturing_plant_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_plant_widescreencamera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\manufacturing_plant_icon</portrait>
+		<displaynamestringid>24972</displaynamestringid>
+		<rolloverstringid>25535</rolloverstringid>
+		<obtainabletechs>
+			<tech x="0.0" y="3.0">HCStonemasons</tech>
+			<tech x="0.0" y="7.0">HCXPEconomicTheory</tech>
+			<tech x="0.7" y="5.0">HCXPLandGrab</tech>
+			<tech x="1.3" y="1.0">HCFishMarket</tech>
+			<tech x="0.9" y="3.0">HCRenderingPlant</tech>
+			<tech x="1.6" y="3.0">HCSchooners</tech>
+			<tech x="2.5" y="3.0">HCSawmills</tech>
+			<tech x="2.5" y="5.0">HCExoticHardwoods</tech>
+			<tech x="2.5" y="6.0">HCXPDistributivism</tech>
+			<tech x="3.4" y="3.0">HCSilversmith</tech>
+			<tech x="3.4" y="5.0">HCRoyalMint</tech>
+			<tech x="4.3" y="1.0">HCFoodSilos</tech>
+			<tech x="4.3" y="3.0">HCSustainableAgriculture</tech>
+			<tech x="4.3" y="5.0">HCRefrigeration</tech>
+			<tech x="5.2" y="1.0">HCStockyards</tech>
+			<tech x="6.1" y="1.0">HCFurrierTeam</tech>
+			<tech x="6.1" y="3.0">HCSpiceTrade</tech>
+			<tech x="6.1" y="5.0">HCMedicine</tech>
+			<tech x="7.0" y="1.0">HCRumDistillery</tech>
+			<tech x="7.0" y="2.0">HCCigarRoller</tech>
+			<tech x="7.0" y="3.0">HCTextileMills</tech>
+		</obtainabletechs>
+		<activetechs>
+			<tech>HCFurrierTeam</tech>
+		</activetechs>
+		<validunits/>
+		<trainbuilding>1</trainbuilding>
+	</building>
+	<building>
+		<name>Dock</name>
+		<visual>
+			<file>russian\russian_dock2.xml</file>
+			<bone>bone_dock</bone>
+		</visual>
+		<uix>200</uix>
+		<uiy>250</uiy>
+		<camera>russian\russian_homecity_dock_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_dock_widescreencamera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\dock_icon</portrait>
+		<displaynamestringid>35745</displaynamestringid>
+		<rolloverstringid>35746</rolloverstringid>
+		<obtainabletechs>
+			<tech x="1.3" y="1.0">HCShipCaravels1</tech>
+			<tech x="1.0" y="2.0">HCShipCaravels2</tech>
+			<tech x="1.0" y="3.0">HCCoastalDefensesTeam</tech>
+			<tech x="1.7" y="2.0">HCShipGalleons</tech>
+			<tech x="1.7" y="3.0">HCShipFrigates</tech>
+			<tech x="1.7" y="5.0">HCShipRussianFleet</tech>
+			<tech x="1.0" y="4.0">HCNavalCombat</tech>
+			<tech x="2.4" y="4.0">HCShipMonitors</tech>
+			<tech x="2.4" y="7.0">HCXPShipMonitorsTeam</tech>
+			<tech x="3.1" y="1.0">HCAdmirality</tech>
+			<tech x="3.1" y="3.0">HCColdWaterPortTeam</tech>
+			<tech x="4.4" y="4.0">HCXPMercsFusiliers</tech>
+			<tech x="4.4" y="5.0">HCXPComancheroAllies</tech>
+			<tech x="5.1" y="3.0">HCMercsManchu</tech>
+			<tech x="5.1" y="4.0">HCXPMercsNinja</tech>
+			<tech x="5.8" y="3.0">HCMercsHighlanders</tech>
+			<tech x="5.8" y="4.0">HCMercsHackapells</tech>
+			<tech x="5.1" y="5.0">HCMercsHolyRoman</tech>
+			<tech x="5.1" y="7.0">HCXPNootkaAlliesRepeat</tech>
+			<tech x="5.8" y="5.0">HCMercsHighland</tech>
+			<tech x="7.3" y="1.0">HCPrivateers</tech>
+			<tech x="4.4" y="3.0">HCMercsStradiots</tech>
+			<tech x="6.5" y="1.0">HCXPDanceHallRu</tech>
+			<tech x="6.5" y="5.0">HCMercenaryLoyalty</tech>
+		</obtainabletechs>
+		<activetechs/>
+		<validunits/>
+		<units/>
+		<trainbuilding>1</trainbuilding>
+	</building>
+	<building>
+		<name>Customization</name>
+		<camera>russian\russian_homecity_camera.cam</camera>
+		<widescreencamera>russian\russian_homecity_widescreencamera.cam</widescreencamera>
+		<unlocklevel>0</unlocklevel>
+		<portrait>homecity\buildings_west\dock_icon</portrait>
+		<displaynamestringid>24966</displaynamestringid>
+		<rolloverstringid>25540</rolloverstringid>
+		<customizationbuilding>1</customizationbuilding>
+	</building>
+	<waypoints>
+		<waypoint>
+			<bone>bone_pathnode_01</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_03</bone>
+			<exit>1</exit>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_04</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_05</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_06</bone>
+			<exit>1</exit>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_07</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_08</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_09</bone>
+			<exit>1</exit>
+			<vendorentry>1</vendorentry>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_10</bone>
+			<exit>1</exit>
+			<vendorentry>1</vendorentry>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_11</bone>
+			<dock>1</dock>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_12</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_13</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_14</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_15</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_16</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_17</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_18</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_19</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_20</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_21</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_22</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_23</bone>
+			<exit>1</exit>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_24</bone>
+			<exit>1</exit>
+			<vendorentry>1</vendorentry>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_26</bone>
+			<exit>1</exit>
+			<vendorentry>1</vendorentry>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_27</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_28</bone>
+			<exit>1</exit>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_29</bone>
+			<performancearea>1</performancearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_30</bone>
+		</waypoint>
+		<waypoint>
+			<bone>bone_pathnode_31</bone>
+			<vendorentry>1</vendorentry>
+		</waypoint>
+		<waypoint>
+			<bone>bone_academy_doorway</bone>
+			<door>1</door>
+		</waypoint>
+		<waypoint>
+			<bone>bone_plant_doorway</bone>
+			<door>1</door>
+		</waypoint>
+		<waypoint>
+			<bone>bone_cathedral_doorway</bone>
+			<door>1</door>
+		</waypoint>
+		<waypoint>
+			<bone>bone_dock_doorway</bone>
+			<door>1</door>
+		</waypoint>
+		<waypoint>
+			<bone>bone_shipment_start</bone>
+			<shipmentstart>1</shipmentstart>
+		</waypoint>
+		<waypoint>
+			<bone>bone_shipment_end</bone>
+			<shipmentend>1</shipmentend>
+		</waypoint>
+		<waypoint>
+			<bone>bone_dregs01</bone>
+			<illreputearea><![CDATA[
+				1>
+			]]></illreputearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_dregs02</bone>
+			<illreputearea><![CDATA[
+				1>
+			]]></illreputearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_dregs03</bone>
+			<illreputearea><![CDATA[
+				1>
+			]]></illreputearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_dregs04</bone>
+			<illreputearea><![CDATA[
+				1>
+			]]></illreputearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_dregs06</bone>
+			<illreputearea><![CDATA[
+				1>
+			]]></illreputearea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor01</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor02</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor03</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor04</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor05</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor06</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor07</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_vendor08</bone>
+			<vendorarea><![CDATA[
+				1>
+			]]></vendorarea>
+		</waypoint>
+		<waypoint>
+			<bone>bone_firework01</bone>
+			<fireworks>1</fireworks>
+		</waypoint>
+		<waypoint>
+			<bone>bone_firework02</bone>
+			<fireworks>1</fireworks>
+		</waypoint>
+		<waypoint>
+			<bone>bone_firework03</bone>
+			<fireworks>1</fireworks>
+		</waypoint>
+		<waypoint>
+			<bone>bone_firework04</bone>
+			<fireworks>1</fireworks>
+		</waypoint>
+		<waypoint>
+			<bone>bone_firework05</bone>
+			<fireworks>1</fireworks>
+		</waypoint>
+		<waypoint>
+			<bone>bone_firework06</bone>
+			<fireworks>1</fireworks>
+		</waypoint>
+	</waypoints>
+	<obtainableprops>
+		<prop active="1">Russian_LightSet1</prop>
+		<prop>Russian_LightSet2</prop>
+		<prop>NobleClassFrenchMale</prop>
+		<prop>NobleClassFrenchFemale</prop>
+		<prop>RussianPoliceman1</prop>
+		<prop>RussianPoliceman2</prop>
+		<prop>StageCoachRoyal</prop>
+		<prop>Torchy</prop>
+		<prop>Juggler</prop>
+		<prop>PeasantVendor</prop>
+		<prop>MiddleClassMusician</prop>
+		<prop>MiddleClassPreacher</prop>
+		<prop>PeasantPainter</prop>
+		<prop>Drunk</prop>
+		<prop>NiceLady</prop>
+		<prop>Thug</prop>
+		<prop>UnitChats</prop>
+		<prop>Russian_CathProp01</prop>
+		<prop>Russian_Market_Prop01</prop>
+		<prop>EE_Market_Prop01</prop>
+		<prop>EE_Market_Prop02</prop>
+		<prop>EE_Market_Prop03</prop>
+		<prop>Russian_Market_IcyRider</prop>
+		<prop>Russian_DockProp01</prop>
+		<prop>German_DockProp01</prop>
+		<prop>German_DockProp02</prop>
+		<prop>German_DockProp04</prop>
+		<prop>Russian_PlantProp01</prop>
+		<prop>Tsars_Cannon</prop>
+		<prop>Rus_Street_Lamps</prop>
+		<prop>Rus_Pillar_Lamps</prop>
+		<prop>ee_PlantProp01</prop>
+		<prop>ee_PlantProp02</prop>
+		<prop>EE_PlantProp03</prop>
+		<prop>Russian_AcadProp01</prop>
+		<prop active="1">Russian_NWTCTexture0</prop>
+		<prop>Russian_NWTCTexture1</prop>
+		<prop>Russian_NWTCTexture2</prop>
+		<prop>Russian_NWTCTexture3</prop>
+		<prop>Russian_NWTCTexture4</prop>
+		<prop>Russian_NWTCTexture5</prop>
+		<prop>Russian_NWTCTexture6</prop>
+		<prop>Russian_NWTCTexture7</prop>
+		<prop active="1">Russian_AcademyTexture0</prop>
+		<prop>Russian_AcademyTexture1</prop>
+		<prop>Russian_AcademyTexture2</prop>
+		<prop>Russian_AcademyTexture3</prop>
+		<prop>Russian_AcademyTexture4</prop>
+		<prop>Russian_AcademyTexture5</prop>
+		<prop>Russian_AcademyTexture6</prop>
+		<prop>Russian_AcademyTexture7</prop>
+		<prop active="1">Russian_ManuPlantTexture0</prop>
+		<prop>Russian_ManuPlantTexture1</prop>
+		<prop>Russian_ManuPlantTexture2</prop>
+		<prop>Russian_ManuPlantTexture3</prop>
+		<prop>Russian_ManuPlantTexture4</prop>
+		<prop>Russian_ManuPlantTexture5</prop>
+		<prop>Russian_ManuPlantTexture6</prop>
+		<prop>Russian_ManuPlantTexture7</prop>
+		<prop active="1">Russian_CathedralTexture0</prop>
+		<prop>Russian_CathedralTexture1</prop>
+		<prop>Russian_CathedralTexture2</prop>
+		<prop>Russian_CathedralTexture3</prop>
+		<prop active="1">Russian_DockTexture0</prop>
+		<prop>Russian_DockTexture1</prop>
+		<prop>Russian_DockTexture2</prop>
+		<prop>Russian_DockTexture3</prop>
+		<prop>Russian_DockTexture4</prop>
+		<prop>Russian_DockTexture5</prop>
+		<prop>Russian_DockTexture6</prop>
+		<prop>Russian_DockTexture7</prop>
+	</obtainableprops>
+</homecity>
\ No newline at end of file
diff --git a/Data/protom.xml b/Data/protom.xml
index 4d81f4a..985f8da 100644
--- a/Data/protom.xml
+++ b/Data/protom.xml
@@ -6943,8 +6943,8 @@
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>CountsTowardEconomicScore</UnitType>
 		<UnitType>ValidIdleVillager</UnitType>
-		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>AbstractWagon</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>CannotConvertHill</UnitType>
 		<Train column="0" page="6" row="0">Bank</Train>
 		<Train column="0" page="6" row="0">ypBankAsian</Train>
@@ -9319,6 +9319,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -9528,9 +9529,9 @@
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate resource="Gold" type="ypRicePaddy">0.340000</Rate>
 			<Rate type="ypGroveBuilding">0.500000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -9906,7 +9907,6 @@
 		<UnitType>AbstractRangedInfantry</UnitType>
 		<UnitType>AbstractCanSeeStealth</UnitType>
 		<UnitType>AbstractMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">Outpost</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -10033,9 +10033,9 @@
 		<AutoAttackRange>18.0000</AutoAttackRange>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>40.0000</Bounty>
-		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Wood">300.0000</Cost>
+		<Bounty>30.0000</Bounty>
+		<BuildBounty>30.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -10093,7 +10093,7 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>80.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -10110,6 +10110,14 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>120.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -10352,87 +10360,93 @@
 		<Train column="0" page="0" row="0">ypNatConquistador</Train>
 		<Train column="0" page="0" row="0">ypNatChakram</Train>
 		<Train column="0" page="0" row="0">ypNatSohei</Train>
+		<Train column="0" page="0" row="0">CamelArcher</Train>
 		<Tech column="1" page="2" row="0">NatBowyery</Tech>
-		<Tech column="1" page="2" row="0">NatMorningWars</Tech>
-		<Tech column="1" page="2" row="0">NatTanning</Tech>
-		<Tech column="1" page="2" row="0">NatXPKlamathStrategy</Tech>
-		<Tech column="1" page="2" row="0">NatXPNavajoWeaving</Tech>
-		<Tech column="1" page="2" row="0">NatAnimalLore</Tech>
-		<Tech column="1" page="2" row="0">NatMetalworking</Tech>
-		<Tech column="1" page="2" row="0">NatPotlatch</Tech>
-		<Tech column="1" page="2" row="0">NatCalendar</Tech>
-		<Tech column="1" page="2" row="0">NatChocolateRecipes</Tech>
-		<Tech column="1" page="1" row="0">NatCeremonialFeast</Tech>
-		<Tech column="1" page="2" row="0">NatTradeLanguage</Tech>
-		<Tech column="1" page="2" row="0">NatHorseTrading</Tech>
-		<Tech column="1" page="2" row="0">NatXPApacheCactus</Tech>
-		<Tech column="1" page="2" row="0">NatXPHuronSunCeremony</Tech>
-		<Tech column="1" page="2" row="0">NatXPHuronTradeMonopoly</Tech>
-		<Tech column="1" page="2" row="0">NatXPKlamathHuckleberryFeast</Tech>
-		<Tech column="1" page="2" row="0">NatXPMapucheAdMapu</Tech>
-		<Tech column="1" page="2" row="0">NatXPMapucheTactics</Tech>
-		<Tech column="1" page="2" row="0">NatXPNavajoCraftsmanship</Tech>
-		<Tech column="1" page="2" row="0">NatXPZapotecCloudPeople</Tech>
-		<Tech column="1" page="2" row="0">NatXPZapotecCultOfTheDead</Tech>
-		<Tech column="1" page="2" row="0">YPNatBhaktiVegetarianism</Tech>
-		<Tech column="1" page="2" row="0">YPNatBhaktiYoga</Tech>
-		<Tech column="1" page="2" row="0">NatXPApacheEndurance</Tech>
-		<Tech column="1" page="2" row="0">NatXPMapucheTreatyOfQuillin</Tech>
-		<Tech column="1" page="2" row="0">NatXPNavajoShepherds</Tech>
-		<Tech column="1" page="2" row="0">NatIroquoisLeague</Tech>
-		<Tech column="1" page="2" row="0">NatGarifunaDrums</Tech>
-		<Tech column="1" page="2" row="0">NatChasquisMessengers</Tech>
-		<Tech column="1" page="2" row="0">NatBarkClothing</Tech>
-		<Tech column="1" page="2" row="0">NatHorseBreeding</Tech>
-		<Tech column="1" page="2" row="0">NatBasketweaving</Tech>
-		<Tech column="1" page="2" row="0">NatKinship</Tech>
-		<Tech column="1" page="2" row="0">NatLacrosse</Tech>
-		<Tech column="1" page="2" row="0">NatGuerillaWars</Tech>
-		<Tech column="1" page="2" row="0">NatMustangs</Tech>
-		<Tech column="1" page="2" row="0">NatChinampa</Tech>
-		<Tech column="1" page="2" row="0">NatCottonArmor</Tech>
-		<Tech column="1" page="2" row="0">NatWarDance</Tech>
-		<Tech column="1" page="2" row="0">NatTextileCraftsmanship</Tech>
-		<Tech column="1" page="2" row="0">NatRoadbuilding</Tech>
-		<Tech column="1" page="2" row="0">NatHuntingGrounds</Tech>
-		<Tech column="1" page="2" row="0">NatPoisonArrowFrogs</Tech>
-		<Tech column="1" page="2" row="0">NatKasiriBeer</Tech>
-		<Tech column="1" page="2" row="0">NatAztecInitiation</Tech>
-		<Tech column="1" page="2" row="0">NatXPApacheRaiding</Tech>
-		<Tech column="1" page="2" row="0">NatXPCheyenneFury</Tech>
-		<Tech column="1" page="2" row="0">NatXPCheyenneHorseTrading</Tech>
-		<Tech column="1" page="2" row="0">NatXPCheyenneHuntingGrounds</Tech>
-		<Tech column="1" page="2" row="0">NatXPHuronFishWedding</Tech>
-		<Tech column="1" page="2" row="0">NatForestBurning</Tech>
-		<Tech column="1" page="2" row="0">NatXPKlamathWorkEthos</Tech>
-		<Tech column="1" page="2" row="0">NatXPZapotecFoodOfTheGods</Tech>
-		<Tech column="1" page="1" row="0">NatGarlandWars</Tech>
-		<Tech column="1" page="2" row="0">NatSequoyahSyllabary</Tech>
-		<Tech column="1" page="2" row="0">NatDogSoldier</Tech>
-		<Tech column="1" page="2" row="0">NatLoyalClubman</Tech>
-		<Tech column="1" page="2" row="0">NatBlowgunnerAmbush</Tech>
-		<Tech column="1" page="2" row="0">YPNatZenMeritocracy</Tech>
-		<Tech column="1" page="2" row="0">YPNatZenMeditation</Tech>
-		<Tech column="1" page="2" row="0">YPNatUdasiGurus</Tech>
-		<Tech column="1" page="2" row="0">YPNatSufiSharia</Tech>
-		<Tech column="1" page="2" row="0">YPNatShaolinDimMak</Tech>
-		<Tech column="1" page="2" row="0">YPNatShaolinClenchedFist</Tech>
-		<Tech column="2" page="2" row="0">YPNatJesuitSmokelessPowder</Tech>
-		<Tech column="1" page="2" row="0">YPNatJesuitFlyingButtress</Tech>
-		<Tech column="1" page="2" row="0">YPNatBhaktiReinforcedGuantlets</Tech>
-		<Tech column="1" page="2" row="0">YPNatZenMasterLessons</Tech>
-		<Tech column="1" page="2" row="0">YPNatSufiPilgramage</Tech>
-		<Tech column="1" page="2" row="0">YPNatSufiFasting</Tech>
-		<Tech column="1" page="2" row="0">YPNatShaolinWoodClearing</Tech>
-		<Tech column="3" page="2" row="0">YPNatJesuitSchools</Tech>
-		<Tech column="1" page="2" row="0">YPNatUdasiNewYear</Tech>
-		<Tech column="1" page="2" row="0">YPNatUdasiArmyOfThePure</Tech>
+		<Tech column="2" page="2" row="0">NatMorningWars</Tech>
+		<Tech column="3" page="2" row="0">NatTanning</Tech>
+		<Tech column="4" page="2" row="0">NatXPKlamathStrategy</Tech>
+		<Tech column="5" page="2" row="0">NatXPNavajoWeaving</Tech>
+		<Tech column="6" page="2" row="0">NatAnimalLore</Tech>
+		<Tech column="7" page="2" row="0">NatMetalworking</Tech>
+		<Tech column="8" page="2" row="0">NatPotlatch</Tech>
+		<Tech column="9" page="2" row="0">NatCalendar</Tech>
+		<Tech column="10" page="2" row="0">NatChocolateRecipes</Tech>
+		<Tech column="11" page="2" row="0">NatCeremonialFeast</Tech>
+		<Tech column="12" page="2" row="0">NatTradeLanguage</Tech>
+		<Tech column="13" page="2" row="0">NatHorseTrading</Tech>
+		<Tech column="14" page="2" row="0">NatXPApacheCactus</Tech>
+		<Tech column="15" page="2" row="0">NatXPHuronSunCeremony</Tech>
+		<Tech column="16" page="2" row="0">NatXPHuronTradeMonopoly</Tech>
+		<Tech column="17" page="2" row="0">NatXPKlamathHuckleberryFeast</Tech>
+		<Tech column="18" page="2" row="0">NatXPMapucheAdMapu</Tech>
+		<Tech column="19" page="2" row="0">NatXPMapucheTactics</Tech>
+		<Tech column="20" page="2" row="0">NatXPNavajoCraftsmanship</Tech>
+		<Tech column="21" page="2" row="0">NatXPZapotecCloudPeople</Tech>
+		<Tech column="22" page="2" row="0">NatXPZapotecCultOfTheDead</Tech>
+		<Tech column="23" page="2" row="0">YPNatBhaktiVegetarianism</Tech>
+		<Tech column="24" page="2" row="0">YPNatBhaktiYoga</Tech>
+		<Tech column="25" page="2" row="0">NatXPApacheEndurance</Tech>
+		<Tech column="26" page="2" row="0">NatXPMapucheTreatyOfQuillin</Tech>
+		<Tech column="27" page="2" row="0">NatXPNavajoShepherds</Tech>
+		<Tech column="28" page="2" row="0">NatIroquoisLeague</Tech>
+		<Tech column="29" page="2" row="0">NatGarifunaDrums</Tech>
+		<Tech column="30" page="2" row="0">NatChasquisMessengers</Tech>
+		<Tech column="31" page="2" row="0">NatBarkClothing</Tech>
+		<Tech column="32" page="2" row="0">NatHorseBreeding</Tech>
+		<Tech column="33" page="2" row="0">NatBasketweaving</Tech>
+		<Tech column="34" page="2" row="0">NatKinship</Tech>
+		<Tech column="35" page="2" row="0">NatLacrosse</Tech>
+		<Tech column="36" page="2" row="0">NatGuerillaWars</Tech>
+		<Tech column="37" page="2" row="0">NatMustangs</Tech>
+		<Tech column="38" page="2" row="0">NatChinampa</Tech>
+		<Tech column="39" page="2" row="0">NatCottonArmor</Tech>
+		<Tech column="40" page="2" row="0">NatWarDance</Tech>
+		<Tech column="41" page="2" row="0">NatTextileCraftsmanship</Tech>
+		<Tech column="42" page="2" row="0">NatRoadbuilding</Tech>
+		<Tech column="43" page="2" row="0">NatHuntingGrounds</Tech>
+		<Tech column="44" page="2" row="0">NatPoisonArrowFrogs</Tech>
+		<Tech column="45" page="2" row="0">NatKasiriBeer</Tech>
+		<Tech column="46" page="2" row="0">NatAztecInitiation</Tech>
+		<Tech column="47" page="2" row="0">NatXPApacheRaiding</Tech>
+		<Tech column="48" page="2" row="0">NatXPCheyenneFury</Tech>
+		<Tech column="49" page="2" row="0">NatXPCheyenneHorseTrading</Tech>
+		<Tech column="50" page="2" row="0">NatXPCheyenneHuntingGrounds</Tech>
+		<Tech column="51" page="2" row="0">NatXPHuronFishWedding</Tech>
+		<Tech column="52" page="2" row="0">NatForestBurning</Tech>
+		<Tech column="53" page="2" row="0">NatXPKlamathWorkEthos</Tech>
+		<Tech column="54" page="2" row="0">NatXPZapotecFoodOfTheGods</Tech>
+		<Tech column="55" page="2" row="0">NatGarlandWars</Tech>
+		<Tech column="56" page="2" row="0">NatSequoyahSyllabary</Tech>
+		<Tech column="57" page="2" row="0">NatDogSoldier</Tech>
+		<Tech column="58" page="2" row="0">NatLoyalClubman</Tech>
+		<Tech column="59" page="2" row="0">NatBlowgunnerAmbush</Tech>
+		<Tech column="60" page="2" row="0">YPNatZenMeritocracy</Tech>
+		<Tech column="61" page="2" row="0">YPNatZenMeditation</Tech>
+		<Tech column="62" page="2" row="0">YPNatUdasiGurus</Tech>
+		<Tech column="63" page="2" row="0">YPNatSufiSharia</Tech>
+		<Tech column="64" page="2" row="0">YPNatShaolinDimMak</Tech>
+		<Tech column="65" page="2" row="0">YPNatShaolinClenchedFist</Tech>
+		<Tech column="66" page="2" row="0">YPNatJesuitSmokelessPowder</Tech>
+		<Tech column="67" page="2" row="0">YPNatJesuitFlyingButtress</Tech>
+		<Tech column="68" page="2" row="0">YPNatBhaktiReinforcedGuantlets</Tech>
+		<Tech column="69" page="2" row="0">YPNatZenMasterLessons</Tech>
+		<Tech column="70" page="2" row="0">YPNatSufiPilgramage</Tech>
+		<Tech column="71" page="2" row="0">YPNatSufiFasting</Tech>
+		<Tech column="72" page="2" row="0">YPNatShaolinWoodClearing</Tech>
+		<Tech column="73" page="2" row="0">YPNatJesuitSchools</Tech>
+		<Tech column="74" page="2" row="0">YPNatUdasiNewYear</Tech>
+		<Tech column="75" page="2" row="0">YPNatUdasiArmyOfThePure</Tech>
+		<Tech column="0" page="1" row="0">MercArmy</Tech>
+		<Tech column="0" page="1" row="0">MercArmyNat</Tech>
+		<Tech column="77" page="2" row="0">VenomExtract</Tech>
+		<Tech column="78" page="2" row="0">NatFinePowder</Tech>
+		<Tech column="79" page="2" row="0">NatElephants</Tech>
 		<Tech column="0" page="2" row="0">TradeRouteUpgrade1</Tech>
 		<Tech column="0" page="2" row="0">TradeRouteUpgrade2</Tech>
 		<Tech column="0" page="2" row="0">ypTradeRouteUpgrade1</Tech>
 		<Tech column="0" page="2" row="0">ypTradeRouteUpgrade2</Tech>
-		<Tech column="1" page="2" row="0">ypTradeRouteUpgradeIndia1</Tech>
-		<Tech column="1" page="2" row="0">ypTradeRouteUpgradeIndia2</Tech>
+		<Tech column="0" page="2" row="0">ypTradeRouteUpgradeIndia1</Tech>
+		<Tech column="0" page="2" row="0">ypTradeRouteUpgradeIndia2</Tech>
 		<Tech column="1" page="1" row="0">WarriorSocietyApache</Tech>
 		<Tech column="1" page="1" row="0">WarriorSocietyCherokee</Tech>
 		<Tech column="1" page="1" row="0">WarriorSocietyCaribs</Tech>
@@ -10479,8 +10493,8 @@
 		<Tech column="1" page="1" row="0">ypNatHonoredShaolin</Tech>
 		<Tech column="1" page="1" row="0">ypNatHonoredSufi</Tech>
 		<Tech column="1" page="1" row="0">ypNatHonoredUdasi</Tech>
-		<Tech column="1" page="1" row="0">MercArmy</Tech>
-		<Tech column="1" page="1" row="0">MercArmyNat</Tech>
+		<Tech column="1" page="1" row="0">ypNatHonoredSaltpeter</Tech>
+		<Tech column="1" page="1" row="0">ypNatDisciplinedSaltpeter</Tech>
 		<Flag>AllowAutoGarrison</Flag>
 		<Flag>HasGatherPoint</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
@@ -10942,6 +10956,7 @@
 		<Contain>ypPeasantIndians</Contain>
 		<Contain>xpWarrior</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Contain>ypMongolScout</Contain>
 		<Command column="3" page="10">TownBell</Command>
@@ -11081,6 +11096,7 @@
 		<UnitType>AbstractBarracks2</UnitType>
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>HasBountyValue</UnitType>
+		<Train column="6" page="0" row="0">SharpshooterS</Train>
 		<Train column="7" page="0" row="0">USColonialMilitia</Train>
 		<Train column="7" page="0" row="0">xpColonialMilitia</Train>
 		<Train column="3" page="0" row="0">Marine</Train>
@@ -11094,6 +11110,8 @@
 		<Train column="3" page="0" row="0">xpSPCColonialMilitia</Train>
 		<Tech column="3" page="1" row="0">GuardColonialMilitia</Tech>
 		<Tech column="3" page="1" row="0">VeteranColonialMilitia</Tech>
+		<Tech column="6" page="1" row="0">GuardSharpshooter</Tech>
+		<Tech column="6" page="1" row="0">ImperialSharpshooter</Tech>
 		<Train column="0" page="0" row="0">Crossbowman</Train>
 		<Train column="0" page="0" row="0">Longbowman</Train>
 		<Train column="0" page="0" row="0">Flatbowman</Train>
@@ -11356,6 +11374,7 @@
 		<UnitType>Building</UnitType>
 		<UnitType>BuildingClass</UnitType>
 		<UnitType>MilitaryBuilding</UnitType>
+		<Train column="2" page="0" row="0">PistolS</Train>
 		<Train column="0" page="0" row="0">ypSowar</Train>
 		<Train column="4" page="0" row="0">BlackPowderWagon</Train>
 		<Train column="0" page="0" row="0">Saber</Train>
@@ -11373,6 +11392,9 @@
 		<Train column="1" page="0" row="0">Cuirassier</Train>
 		<Train column="0" page="0" row="0">Cossack</Train>
 		<Train column="2" page="0" row="0">MountedCrossbowman</Train>
+		<Tech column="2" page="1" row="0">GuardPistolS</Tech>
+		<Tech column="2" page="1" row="0">VeteranPistolS</Tech>
+		<Tech column="2" page="1" row="0">ImperialPistolS</Tech>
 		<Tech column="0" page="1" row="0">GuardCamel</Tech>
 		<Tech column="0" page="1" row="0">VeteranCamel</Tech>
 		<Tech column="0" page="1" row="0">ImperialCamel</Tech>
@@ -11655,6 +11677,7 @@
 	<Unit id="308" name="Church">
 		<DBID>29</DBID>
 		<DisplayNameID>22928</DisplayNameID>
+		<EditorNameID>22928</EditorNameID>
 		<ObstructionRadiusX>4.5000</ObstructionRadiusX>
 		<ObstructionRadiusZ>4.5000</ObstructionRadiusZ>
 		<PopulationCapAddition>0</PopulationCapAddition>
@@ -11756,6 +11779,9 @@
 		<Tech column="19" page="1" row="0">SacredDecree</Tech>
 		<Tech column="20" page="1" row="0">VenetianGothic</Tech>
 		<Tech column="21" page="1" row="0">FameArmies</Tech>
+		<Tech column="21" page="1" row="0">ChurchFortifiedWalls</Tech>
+		<Tech column="20" page="1" row="0">ChurchLumberCamp</Tech>
+		<Tech column="19" page="1" row="0">ChurchAxe</Tech>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>StartsAtFullEfficiency</Flag>
 		<Flag>Immoveable</Flag>
@@ -11799,8 +11825,8 @@
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<DeadReplacement>BloodSplat</DeadReplacement>
 		<FormationCategory>Body</FormationCategory>
-		<MaxVelocity>6.0000</MaxVelocity>
-		<MaxRunVelocity>8.0000</MaxRunVelocity>
+		<MaxVelocity>5.5000</MaxVelocity>
+		<MaxRunVelocity>7.5000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\infantry\redolero\redolero.xml</AnimFile>
@@ -11810,8 +11836,8 @@
 		<PortraitIcon>units\infantry\redolero\redolero_portrait</PortraitIcon>
 		<RolloverTextID>22934</RolloverTextID>
 		<ShortRolloverTextID>25702</ShortRolloverTextID>
-		<InitialHitpoints>135.0000</InitialHitpoints>
-		<MaxHitpoints>135.0000</MaxHitpoints>
+		<InitialHitpoints>145.0000</InitialHitpoints>
+		<MaxHitpoints>145.0000</MaxHitpoints>
 		<LOS>12.0000</LOS>
 		<UnitAIType>HandCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
@@ -11974,7 +12000,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
@@ -11987,10 +12013,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -11998,7 +12025,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
@@ -12009,7 +12036,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
@@ -12022,10 +12049,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -12033,7 +12061,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
@@ -12046,10 +12074,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 	</Unit>
 	<Unit id="311" name="Uhlan">
@@ -12437,9 +12466,9 @@
 			<Damage>6.500000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
-			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">4.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCoyoteMan">1.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">3.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="315" name="Hussar">
@@ -12862,9 +12891,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -12875,9 +12904,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -12886,8 +12915,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -12897,8 +12926,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -12910,8 +12939,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -12921,9 +12950,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -12934,8 +12963,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -13100,8 +13129,8 @@
 		<PortraitIcon>units\cavalry\dragoon\dragoon_portrait</PortraitIcon>
 		<RolloverTextID>22959</RolloverTextID>
 		<ShortRolloverTextID>25629</ShortRolloverTextID>
-		<InitialHitpoints>210.0000</InitialHitpoints>
-		<MaxHitpoints>210.0000</MaxHitpoints>
+		<InitialHitpoints>200.0000</InitialHitpoints>
+		<MaxHitpoints>200.0000</MaxHitpoints>
 		<LOS>16.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -13166,7 +13195,7 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -13175,7 +13204,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
@@ -13187,7 +13216,7 @@
 			<DamageType>Ranged</DamageType>
 			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="322" name="FishingBoat">
@@ -13244,8 +13273,6 @@
 		<UnitType>ValidIdleVillager</UnitType>
 		<UnitType>AbstractFishingBoat</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
-		<Train column="1" page="6" row="0">Dock</Train>
-		<Train column="1" page="6" row="0">YPDockAsian</Train>
 		<Flag>TieToWaterSurface</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -13313,6 +13340,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -13441,7 +13469,7 @@
 		<LOS>44.0000</LOS>
 		<ProjectileProtoUnit>MortarShell</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
-		<TrainPoints>45.0000</TrainPoints>
+		<TrainPoints>50.0000</TrainPoints>
 		<Bounty>50.0000</Bounty>
 		<BuildBounty>50.0000</BuildBounty>
 		<Cost resourcetype="Wood">100.0000</Cost>
@@ -13495,7 +13523,6 @@
 			<DamageBonus type="Building">2.500000</DamageBonus>
 			<DamageArea>2.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="Ship">1.500000</DamageBonus>
 			<DamageBonus type="Unit">0.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -13580,10 +13607,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -13593,10 +13620,10 @@
 			<MaxRange>22.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -13604,9 +13631,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -13615,9 +13642,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -13628,9 +13655,9 @@
 			<MaxRange>22.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -13639,10 +13666,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -13652,9 +13679,9 @@
 			<MaxRange>22.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -13813,6 +13840,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -13874,6 +13902,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>NotSelectable</Flag>
 		<Flag>VisibleUnderFog</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -14487,9 +14516,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -14499,9 +14528,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -14510,8 +14539,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -14521,8 +14550,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -14533,8 +14562,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -14544,9 +14573,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -14556,8 +14585,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -14800,7 +14829,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="340" name="Pronghorn">
@@ -15054,9 +15083,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -15067,9 +15096,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -15078,9 +15107,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerHandAttack</Name>
@@ -15089,9 +15118,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
@@ -15102,9 +15131,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -15113,9 +15142,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -15126,9 +15155,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="343" name="NatMantlet">
@@ -15240,15 +15269,15 @@
 		<Icon>ui\units\native_canoe_icon</Icon>
 		<PortraitIcon>ui\units\native_canoe_portrait</PortraitIcon>
 		<RolloverTextID>23693</RolloverTextID>
-		<ShortRolloverTextID>25617</ShortRolloverTextID>
+		<ShortRolloverTextID>25618</ShortRolloverTextID>
 		<InitialHitpoints>220.0000</InitialHitpoints>
 		<MaxHitpoints>220.0000</MaxHitpoints>
 		<LOS>24.0000</LOS>
 		<UnitAIType>Civilian</UnitAIType>
 		<TrainPoints>20.0000</TrainPoints>
 		<BuildLimit>14</BuildLimit>
-		<Bounty>10.0000</Bounty>
-		<BuildBounty>10.0000</BuildBounty>
+		<Bounty>12.0000</Bounty>
+		<BuildBounty>12.0000</BuildBounty>
 		<Cost resourcetype="Wood">125.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -15321,6 +15350,14 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>40.000000</DamageCap>
 			<Projectile>ArrowCanoe</Projectile>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="345" name="Bank">
@@ -15744,7 +15781,7 @@
 		<InitialHitpoints>200.0000</InitialHitpoints>
 		<MaxHitpoints>200.0000</MaxHitpoints>
 		<LOS>15.0000</LOS>
-		<BuildLimit>20</BuildLimit>
+		<BuildLimit>24</BuildLimit>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>2.0000</TrainPoints>
@@ -16307,9 +16344,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -16320,9 +16357,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -16331,8 +16368,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -16342,8 +16379,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -16355,8 +16392,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -16366,9 +16403,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -16379,8 +16416,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -16578,10 +16615,10 @@
 		<ShortRolloverTextID>25748</ShortRolloverTextID>
 		<InitialHitpoints>500.0000</InitialHitpoints>
 		<MaxHitpoints>500.0000</MaxHitpoints>
-		<LOS>20.0000</LOS>
+		<LOS>18.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
-		<TrainPoints>60.0000</TrainPoints>
+		<TrainPoints>55.0000</TrainPoints>
 		<Bounty>30.0000</Bounty>
 		<BuildBounty>30.0000</BuildBounty>
 		<Cost resourcetype="Food">150.0000</Cost>
@@ -16636,8 +16673,8 @@
 			<Name>DefendRangedAttack</Name>
 			<Damage>42.000000</Damage>
 			<DamageType>Ranged</DamageType>
-			<MaxRange>16.000000</MaxRange>
-			<ROF>3.000000</ROF>
+			<MaxRange>14.000000</MaxRange>
+			<ROF>2.500000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
 			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
@@ -16658,8 +16695,8 @@
 			<Name>StaggerRangedAttack</Name>
 			<Damage>42.000000</Damage>
 			<DamageType>Ranged</DamageType>
-			<MaxRange>16.000000</MaxRange>
-			<ROF>3.000000</ROF>
+			<MaxRange>14.000000</MaxRange>
+			<ROF>2.500000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
 			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
@@ -16977,8 +17014,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -16989,10 +17026,10 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<Projectile>Blowdart</Projectile>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="361" name="NatRifleman">
@@ -17081,9 +17118,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -17094,9 +17131,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -17105,8 +17142,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17116,8 +17153,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17129,8 +17166,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17140,9 +17177,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -17153,8 +17190,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -17244,9 +17281,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -17257,9 +17294,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -17268,8 +17305,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17279,8 +17316,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17292,8 +17329,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17303,9 +17340,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -17316,8 +17353,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -17521,8 +17558,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17537,10 +17574,10 @@
 			<DamageArea>3.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<Projectile>Bola</Projectile>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="Building">0.000000</DamageBonus>
 			<DamageBonus type="Tree">0.000000</DamageBonus>
 		</ProtoAction>
@@ -17955,9 +17992,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -17967,9 +18004,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -17978,8 +18015,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -17989,8 +18026,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -18001,8 +18038,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -18012,9 +18049,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -18024,8 +18061,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -18834,10 +18871,11 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Tech column="0" page="1" row="0">Bastion</Tech>
-		<Tech column="2" page="1" row="0">StoneFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">AsianFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNative</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNativeSx</Tech>
+		<Tech column="0" page="1" row="0">Redoubt</Tech>
+		<Tech column="0" page="1" row="0">StoneFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">AsianFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNative</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNativeSx</Tech>
 		<Flag>FlattenGround</Flag>
 		<Flag>SelectWithObstruction</Flag>
 		<Flag>Doppled</Flag>
@@ -18898,10 +18936,11 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Tech column="0" page="1" row="0">Bastion</Tech>
-		<Tech column="2" page="1" row="0">StoneFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">AsianFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNative</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNativeSx</Tech>
+		<Tech column="0" page="1" row="0">Redoubt</Tech>
+		<Tech column="0" page="1" row="0">StoneFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">AsianFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNative</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNativeSx</Tech>
 		<Flag>SelectWithObstruction</Flag>
 		<Flag>Doppled</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
@@ -19203,6 +19242,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -19407,9 +19447,9 @@
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate resource="Gold" type="ypRicePaddy">0.430000</Rate>
 			<Rate type="ypGroveBuilding">0.620000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>Hunting</Name>
@@ -20187,9 +20227,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -20200,9 +20240,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -20211,8 +20251,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -20222,8 +20262,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -20235,8 +20275,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -20246,9 +20286,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -20259,8 +20299,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -20525,6 +20565,8 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractFort</UnitType>
+		<Train column="16" page="0" row="0">PistolS</Train>
+		<Train column="16" page="0" row="0">SharpshooterS</Train>
 		<Train column="15" page="0" row="0">Lancer</Train>
 		<Train column="21" page="0" row="0">Saker</Train>
 		<Train column="10" page="0" row="0">xpWarBow</Train>
@@ -20632,6 +20674,7 @@
 		<Contain>ypMonkJapanese2</Contain>
 		<Contain>Hero</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="2" page="10">Delete</Command>
 		<Command column="2" page="1">SetUnitAsHomeCityGatherPoint</Command>
@@ -21424,10 +21467,11 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Tech column="0" page="1" row="0">Bastion</Tech>
-		<Tech column="2" page="1" row="0">StoneFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">AsianFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNative</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNativeSx</Tech>
+		<Tech column="0" page="1" row="0">Redoubt</Tech>
+		<Tech column="0" page="1" row="0">StoneFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">AsianFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNative</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNativeSx</Tech>
 		<Flag>FlattenGround</Flag>
 		<Flag>SelectWithObstruction</Flag>
 		<Flag>Doppled</Flag>
@@ -21488,10 +21532,11 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Tech column="0" page="1" row="0">Bastion</Tech>
-		<Tech column="2" page="1" row="0">StoneFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">AsianFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNative</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNativeSx</Tech>
+		<Tech column="0" page="1" row="0">Redoubt</Tech>
+		<Tech column="0" page="1" row="0">StoneFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">AsianFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNative</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNativeSx</Tech>
 		<Flag>SelectWithObstruction</Flag>
 		<Flag>Doppled</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
@@ -21552,10 +21597,11 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Tech column="0" page="1" row="0">Bastion</Tech>
-		<Tech column="2" page="1" row="0">StoneFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">AsianFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNative</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNativeSx</Tech>
+		<Tech column="0" page="1" row="0">Redoubt</Tech>
+		<Tech column="0" page="1" row="0">StoneFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">AsianFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNative</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNativeSx</Tech>
 		<Flag>FlattenGround</Flag>
 		<Flag>SelectWithObstruction</Flag>
 		<Flag>Doppled</Flag>
@@ -22870,6 +22916,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="1" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -22910,7 +22957,7 @@
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
@@ -22922,7 +22969,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="437" name="Moose">
@@ -23665,10 +23712,10 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>3</BuildLimit>
-		<Bounty>100.0000</Bounty>
-		<BuildBounty>100.0000</BuildBounty>
-		<Cost resourcetype="Wood">500.0000</Cost>
-		<Cost resourcetype="Gold">500.0000</Cost>
+		<Bounty>80.0000</Bounty>
+		<BuildBounty>80.0000</BuildBounty>
+		<Cost resourcetype="Wood">400.0000</Cost>
+		<Cost resourcetype="Gold">400.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>2</AllowedAge>
 		<Armor type="Ranged" value="0.7500"/>
@@ -23722,7 +23769,7 @@
 			<MaxRange>30.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>80.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -23734,6 +23781,7 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>180.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -23764,10 +23812,10 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>4</BuildLimit>
-		<Bounty>60.0000</Bounty>
-		<BuildBounty>60.0000</BuildBounty>
-		<Cost resourcetype="Wood">300.0000</Cost>
-		<Cost resourcetype="Gold">300.0000</Cost>
+		<Bounty>40.0000</Bounty>
+		<BuildBounty>40.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
+		<Cost resourcetype="Gold">200.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>1</AllowedAge>
 		<Armor type="Ranged" value="0.7500"/>
@@ -23834,6 +23882,7 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>140.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -23864,10 +23913,10 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>4</BuildLimit>
-		<Bounty>80.0000</Bounty>
-		<BuildBounty>80.0000</BuildBounty>
+		<Bounty>65.0000</Bounty>
+		<BuildBounty>65.0000</BuildBounty>
 		<Cost resourcetype="Wood">300.0000</Cost>
-		<Cost resourcetype="Gold">500.0000</Cost>
+		<Cost resourcetype="Gold">350.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>1</AllowedAge>
 		<Armor type="Ranged" value="0.7500"/>
@@ -23893,6 +23942,8 @@
 		<UnitType>Ranged</UnitType>
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
+		<Train column="7" page="0" row="0">PistolS</Train>
+		<Train column="6" page="0" row="0">SharpshooterS</Train>
 		<Train column="7" page="0" row="0">USColonialMilitia</Train>
 		<Train column="7" page="0" row="0">xpColonialMilitia</Train>
 		<Train column="8" page="0" row="0">MountedCrossbowman</Train>
@@ -23965,6 +24016,7 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>100.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -23995,9 +24047,9 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>40.0000</Bounty>
-		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Wood">300.0000</Cost>
+		<Bounty>30.0000</Bounty>
+		<BuildBounty>30.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -24055,7 +24107,7 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>80.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -24072,6 +24124,14 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>170.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -24093,7 +24153,7 @@
 		<Icon>units\naval\privateer\privateer_icon_64x64</Icon>
 		<PortraitIcon>units\naval\privateer\privateer_icon_portrait</PortraitIcon>
 		<RolloverTextID>27725</RolloverTextID>
-		<ShortRolloverTextID>27724</ShortRolloverTextID>
+		<ShortRolloverTextID>25618</ShortRolloverTextID>
 		<InitialHitpoints>900.0000</InitialHitpoints>
 		<MaxHitpoints>900.0000</MaxHitpoints>
 		<LOS>34.0000</LOS>
@@ -24101,7 +24161,7 @@
 		<AutoAttackRange>28.0000</AutoAttackRange>
 		<UnitAIType>RangedCombative</UnitAIType>
 		<Bounty>50.0000</Bounty>
-		<Cost resourcetype="Gold">450.0000</Cost>
+		<Cost resourcetype="Gold">350.0000</Cost>
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>1</AllowedAge>
@@ -24160,7 +24220,7 @@
 			<MaxRange>30.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>60.000000</DamageCap>
-			<DamageBonus type="Ship">3.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">3.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -24172,6 +24232,14 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>140.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -25064,7 +25132,7 @@
 		<RolloverTextID>28576</RolloverTextID>
 		<ShortRolloverTextID>28575</ShortRolloverTextID>
 		<LOS>18.0000</LOS>
-		<InitialResource resourcetype="Gold">2500.0000</InitialResource>
+		<InitialResource resourcetype="Gold">3000.0000</InitialResource>
 		<ResourceSubType>Gold</ResourceSubType>
 		<BuildingWorkRate>1.0000</BuildingWorkRate>
 		<Decay delay="0.0000" duration="0.0000"/>
@@ -25783,6 +25851,9 @@
 		<Train column="1" page="0" row="0">ypGoat</Train>
 		<Train column="2" page="0" row="0">Cow</Train>
 		<Train column="3" page="0" row="0">Llama</Train>
+		<Tech column="0" page="2" row="0">BigBisons</Tech>
+		<Tech column="0" page="2" row="0">BigDeer</Tech>
+		<Tech column="0" page="2" row="0">BigTurkey</Tech>
 		<Tech column="5" page="1" row="0">SelectiveBreeding</Tech>
 		<Tech column="4" page="1" row="0">Ranching</Tech>
 		<Tech column="4" page="1" row="0">RanchingM</Tech>
@@ -26471,6 +26542,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -26532,6 +26604,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -26593,6 +26666,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -26654,6 +26728,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -26961,7 +27036,6 @@
 		<UnitType>AbstractNativeWarrior</UnitType>
 		<UnitType>AbstractInfantry</UnitType>
 		<Flag>VisibleUnderFogIfGaia</Flag>
-		<Flag>HeroName2</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -27685,18 +27759,19 @@
 	</Unit>
 	<Unit id="511" name="SocketAztec">
 		<DBID>564</DBID>
-		<DisplayNameID>29954</DisplayNameID>
-		<EditorNameID>29987</EditorNameID>
+		<DisplayNameID>69783</DisplayNameID>
+		<EditorNameID>69784</EditorNameID>
 		<SubCiv>Aztecs</SubCiv>
 		<ObstructionRadiusX>4.0000</ObstructionRadiusX>
 		<ObstructionRadiusZ>4.0000</ObstructionRadiusZ>
 		<MaxVelocity>0.0000</MaxVelocity>
 		<MovementType>land</MovementType>
-		<AnimFile>buildings\trading_post\native_outpost_socket.xml</AnimFile>
-		<MinimapIcon>ui\minimap\n</MinimapIcon>
-		<PortraitIcon>units\natives\jaguar_warrior_portrait</PortraitIcon>
-		<RolloverTextID>32930</RolloverTextID>
-		<ShortRolloverTextID>38258</ShortRolloverTextID>
+		<AnimFile>buildings\asian_civs\spc\saltpeter_site\saltpeter_socket.xml</AnimFile>
+		<Icon>buildings\native_settlement\indian_native_site_icon_64</Icon>
+		<MinimapIcon>ui\minimap\asian_native_site</MinimapIcon>
+		<PortraitIcon>buildings\native_settlement\indian_native_site_icon_portrait</PortraitIcon>
+		<RolloverTextID>69782</RolloverTextID>
+		<ShortRolloverTextID>69781</ShortRolloverTextID>
 		<LOS>0.0000</LOS>
 		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
 		<UnitType>LogicalTypeBuildingsNotWalls</UnitType>
@@ -28392,6 +28467,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="6" page="1" row="0">Church</Train>
+		<Train column="6" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -28600,9 +28676,9 @@
 			<Rate resource="Food" type="ypRicePaddy">1.000000</Rate>
 			<Rate resource="Gold" type="ypRicePaddy">0.680000</Rate>
 			<Rate type="ypGroveBuilding">1.000000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -28636,7 +28712,7 @@
 		<ShortRolloverTextID>30921</ShortRolloverTextID>
 		<InitialHitpoints>1200.0000</InitialHitpoints>
 		<MaxHitpoints>1200.0000</MaxHitpoints>
-		<LOS>38.0000</LOS>
+		<LOS>40.0000</LOS>
 		<ProjectileProtoUnit>Cannonball</ProjectileProtoUnit>
 		<AutoAttackRange>12.0000</AutoAttackRange>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -28644,9 +28720,9 @@
 		<BuildLimit>2</BuildLimit>
 		<Bounty>100.0000</Bounty>
 		<BuildBounty>100.0000</BuildBounty>
-		<Cost resourcetype="Wood">800.0000</Cost>
-		<Cost resourcetype="Gold">200.0000</Cost>
-		<MaxContained>50</MaxContained>
+		<Cost resourcetype="Wood">600.0000</Cost>
+		<Cost resourcetype="Gold">400.0000</Cost>
+		<MaxContained>25</MaxContained>
 		<AllowedAge>3</AllowedAge>
 		<Armor type="Ranged" value="0.5000"/>
 		<UnitType>LogicalTypeNavalMilitary</UnitType>
@@ -28697,11 +28773,11 @@
 			<Name>LongRangeAttack</Name>
 			<Damage>200.000000</Damage>
 			<DamageType>Siege</DamageType>
-			<MinRange>14.000000</MinRange>
+			<MinRange>12.000000</MinRange>
 			<MaxRange>80.000000</MaxRange>
 			<ROF>20.000000</ROF>
 			<DamageCap>400.000000</DamageCap>
-			<DamageBonus type="Building">10.000000</DamageBonus>
+			<DamageBonus type="Building">8.000000</DamageBonus>
 			<DamageArea>10.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="Dock">0.100000</DamageBonus>
@@ -28712,8 +28788,8 @@
 			<Name>MortarAttack</Name>
 			<Damage>80.000000</Damage>
 			<DamageType>Siege</DamageType>
-			<MinRange>14.000000</MinRange>
-			<MaxRange>36.000000</MaxRange>
+			<MinRange>16.000000</MinRange>
+			<MaxRange>40.000000</MaxRange>
 			<ROF>5.000000</ROF>
 			<DamageCap>160.000000</DamageCap>
 			<DamageBonus type="Building">8.000000</DamageBonus>
@@ -29080,7 +29156,7 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -29096,7 +29172,7 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -29108,7 +29184,7 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerHandAttack</Name>
@@ -29120,7 +29196,7 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
@@ -29136,7 +29212,7 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -29148,7 +29224,7 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -29162,7 +29238,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractLightInfantry">0.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">0.750000</DamageBonus>
 		</ProtoAction>
@@ -29241,7 +29317,7 @@
 		<Train column="17" page="6" row="0">UniversityI</Train>
 		<Train column="18" page="6" row="0">SPCCherokeeWarHut</Train>
 		<Train column="14" page="6" row="0">SPCFortCenterUS</Train>
-		<Train column="16" page="6" row="0">SPCOssuary</Train>
+		<Train column="16" page="6" row="0">BasilicaIt</Train>
 		<Train column="14" page="6" row="0">SPCFortCenter</Train>
 		<Train column="9" page="6" row="0">SPCXPBaker</Train>
 		<Train column="6" page="6" row="0">HuariStronghold</Train>
@@ -29472,9 +29548,9 @@
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate resource="Gold" type="ypRicePaddy">0.430000</Rate>
 			<Rate type="ypGroveBuilding">0.620000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>Hunting</Name>
@@ -32649,10 +32725,10 @@
 		<LOS>54.0000</LOS>
 		<UnitAIType>HandCombative</UnitAIType>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>40.0000</Bounty>
-		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Wood">200.0000</Cost>
-		<Cost resourcetype="Gold">200.0000</Cost>
+		<Bounty>30.0000</Bounty>
+		<BuildBounty>30.0000</BuildBounty>
+		<Cost resourcetype="Wood">150.0000</Cost>
+		<Cost resourcetype="Gold">150.0000</Cost>
 		<AllowedAge>1</AllowedAge>
 		<Armor type="Ranged" value="0.5000"/>
 		<UnitType>LogicalTypeValidSabotage</UnitType>
@@ -32813,6 +32889,7 @@
 		<Tech column="6" page="1" row="0">ImprovedWallsNative</Tech>
 		<Tech column="0" page="1" row="0">SpiesNative</Tech>
 		<Tech column="4" page="1" row="0">ImpLegendaryNativesNatives</Tech>
+		<Tech column="0" page="2" row="0">BigTurkey</Tech>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>StartsAtFullEfficiency</Flag>
 		<Flag>Immoveable</Flag>
@@ -33732,6 +33809,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="1" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -33858,8 +33936,8 @@
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<Projectile>Blowdart</Projectile>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -33871,8 +33949,8 @@
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<Projectile>Blowdart</Projectile>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -34001,8 +34079,8 @@
 		<DBID>841</DBID>
 		<DisplayNameID>34097</DisplayNameID>
 		<EditorNameID>34098</EditorNameID>
-		<ObstructionRadiusX>0.9000</ObstructionRadiusX>
-		<ObstructionRadiusZ>0.9000</ObstructionRadiusZ>
+		<ObstructionRadiusX>0.8000</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.8000</ObstructionRadiusZ>
 		<MaxVelocity>0.0000</MaxVelocity>
 		<MovementType>water</MovementType>
 		<AnimFile>homecity\homecity_gatherpoint_naval.xml</AnimFile>
@@ -34010,7 +34088,7 @@
 		<PortraitIcon>homecity\gatherpoint_flags\homecity_waterspawn_flag_icon</PortraitIcon>
 		<RolloverTextID>34099</RolloverTextID>
 		<ShortRolloverTextID>34100</ShortRolloverTextID>
-		<LOS>2.0000</LOS>
+		<LOS>3.0000</LOS>
 		<BuildingWorkRate>1.0000</BuildingWorkRate>
 		<UnitType>LogicalTypeMinimapFilterEconomic</UnitType>
 		<UnitType>Unattackable</UnitType>
@@ -34023,6 +34101,7 @@
 		<Flag>SelectWithObstruction</Flag>
 		<Flag>NoHPBar</Flag>
 		<Flag>HasGatherPoint</Flag>
+		<Flag>VisibleOwnerOnly</Flag>
 		<Flag>NotDeleteable</Flag>
 		<Flag>Invulnerable</Flag>
 		<Flag>NonCollideable</Flag>
@@ -35112,6 +35191,7 @@
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractFort</UnitType>
 		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<Train column="15" page="0" row="0">Maghrabi</Train>
 		<Train column="1" page="11" row="0">LevyMin</Train>
 		<Train column="14" page="0" row="0">Axeman</Train>
 		<Train column="20" page="0" row="0">MercDove</Train>
@@ -35180,6 +35260,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="3" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -35215,7 +35296,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="612" name="SPCFortCenterUS">
@@ -35265,6 +35346,7 @@
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractFort</UnitType>
 		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<Train column="15" page="0" row="0">Maghrabi</Train>
 		<Train column="3" page="19" row="0">ypConsulateArmyFrench3US</Train>
 		<Train column="2" page="19" row="0">ypConsulateArmyDutch2US</Train>
 		<Train column="1" page="19" row="0">ypConsulateArmyBritish1US</Train>
@@ -35338,6 +35420,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="3" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -35373,7 +35456,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="613" name="SPCFortCenterJ">
@@ -35423,6 +35506,7 @@
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractFort</UnitType>
 		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<Train column="15" page="0" row="0">Maghrabi</Train>
 		<Train column="14" page="0" row="0">Axeman</Train>
 		<Train column="20" page="0" row="0">MercDove</Train>
 		<Train column="52" page="0" row="0">General</Train>
@@ -35494,6 +35578,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="3" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -35529,7 +35614,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="614" name="IGCTownCenter">
@@ -36134,10 +36219,11 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Tech column="0" page="1" row="0">Bastion</Tech>
-		<Tech column="2" page="1" row="0">StoneFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">AsianFortifiedWalls</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNative</Tech>
-		<Tech column="2" page="1" row="0">ImprovedWallsNativeSx</Tech>
+		<Tech column="0" page="1" row="0">Redoubt</Tech>
+		<Tech column="0" page="1" row="0">StoneFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">AsianFortifiedWalls</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNative</Tech>
+		<Tech column="0" page="1" row="0">ImprovedWallsNativeSx</Tech>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>StartsAtFullEfficiency</Flag>
 		<Flag>Immoveable</Flag>
@@ -37182,6 +37268,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -37925,6 +38012,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -37986,6 +38074,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -38047,6 +38136,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -42141,9 +42231,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -42153,11 +42243,10 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<MaxHeight>0.000000</MaxHeight>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -42166,8 +42255,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -42177,8 +42266,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -42189,10 +42278,9 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<MaxHeight>0.000000</MaxHeight>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -42202,9 +42290,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -42214,10 +42302,9 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<MaxHeight>0.000000</MaxHeight>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -42303,9 +42390,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -42316,9 +42403,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -42327,8 +42414,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -42338,8 +42425,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -42351,8 +42438,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -42362,9 +42449,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -42375,8 +42462,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -42909,7 +42996,6 @@
 		<UnitType>Military</UnitType>
 		<UnitType>UnitClass</UnitType>
 		<UnitType>AbstractMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
 		<Train column="2" page="6" row="0">Lookout</Train>
@@ -43105,6 +43191,7 @@
 		<Contain>xpMedicineManAztec</Contain>
 		<Contain>ypDaimyoRegicide</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="0" page="10">SetGatherPointMilitary</Command>
 		<Command column="2" page="10">Eject</Command>
@@ -43143,7 +43230,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="729" name="Shrine">
@@ -43446,7 +43533,7 @@
 		<Icon>ui\units\az_war_canoe_icon</Icon>
 		<PortraitIcon>ui\units\az_war_canoe_portrait</PortraitIcon>
 		<RolloverTextID>43508</RolloverTextID>
-		<ShortRolloverTextID>43507</ShortRolloverTextID>
+		<ShortRolloverTextID>27682</ShortRolloverTextID>
 		<InitialHitpoints>400.0000</InitialHitpoints>
 		<MaxHitpoints>400.0000</MaxHitpoints>
 		<LOS>34.0000</LOS>
@@ -43545,6 +43632,7 @@
 			<DamageCap>80.000000</DamageCap>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="733" name="Tipi">
@@ -43736,7 +43824,7 @@
 		<Tactics>longhouse.tactics</Tactics>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
-			<Damage>10.000000</Damage>
+			<Damage>15.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MinRange>0.000000</MinRange>
 			<MaxRange>12.000000</MaxRange>
@@ -43845,6 +43933,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -44057,9 +44146,9 @@
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate resource="Gold" type="ypRicePaddy">0.340000</Rate>
 			<Rate type="ypGroveBuilding">0.500000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -44575,7 +44664,7 @@
 		<RolloverTextID>43843</RolloverTextID>
 		<ShortRolloverTextID>43842</ShortRolloverTextID>
 		<LOS>18.0000</LOS>
-		<InitialResource resourcetype="Gold">2000.0000</InitialResource>
+		<InitialResource resourcetype="Gold">2500.0000</InitialResource>
 		<ResourceSubType>Gold</ResourceSubType>
 		<BuildingWorkRate>1.0000</BuildingWorkRate>
 		<Decay delay="0.0000" duration="0.0000"/>
@@ -44693,9 +44782,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -44706,9 +44795,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -44717,8 +44806,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -44728,8 +44817,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -44741,8 +44830,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -44752,9 +44841,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -44765,8 +44854,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -45383,9 +45472,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -45396,9 +45485,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -45407,8 +45496,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -45418,8 +45507,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -45431,8 +45520,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -45442,9 +45531,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -45455,8 +45544,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -45707,9 +45796,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -45719,9 +45808,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -45730,8 +45819,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -45741,8 +45830,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -45753,8 +45842,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -45764,9 +45853,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -45776,8 +45865,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -45885,7 +45974,6 @@
 		<UnitType>Ranged</UnitType>
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
 		<Train column="2" page="6" row="0">Lookout</Train>
@@ -46358,9 +46446,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -46372,9 +46460,9 @@
 			<Projectile>Bola</Projectile>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -46383,8 +46471,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -46394,8 +46482,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -46408,8 +46496,8 @@
 			<Projectile>Bola</Projectile>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -46419,9 +46507,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -46433,8 +46521,8 @@
 			<Projectile>Bola</Projectile>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -46519,9 +46607,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -46532,9 +46620,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -46543,8 +46631,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -46554,8 +46642,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -46567,8 +46655,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -46578,9 +46666,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -46591,8 +46679,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -46819,7 +46907,7 @@
 		<Icon>ui\units\tlaloc_canoe_icon</Icon>
 		<PortraitIcon>ui\units\tlaloc_canoe_portrait</PortraitIcon>
 		<RolloverTextID>44046</RolloverTextID>
-		<ShortRolloverTextID>44045</ShortRolloverTextID>
+		<ShortRolloverTextID>27682</ShortRolloverTextID>
 		<InitialHitpoints>750.0000</InitialHitpoints>
 		<MaxHitpoints>750.0000</MaxHitpoints>
 		<LOS>34.0000</LOS>
@@ -46827,9 +46915,9 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>4</BuildLimit>
-		<Bounty>50.0000</Bounty>
-		<BuildBounty>50.0000</BuildBounty>
-		<Cost resourcetype="Wood">400.0000</Cost>
+		<Bounty>40.0000</Bounty>
+		<BuildBounty>40.0000</BuildBounty>
+		<Cost resourcetype="Wood">300.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -46918,6 +47006,7 @@
 			<DamageCap>100.000000</DamageCap>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="766" name="TreeJuniper">
@@ -47160,6 +47249,7 @@
 		<Contain>Surgeon</Contain>
 		<Contain>Priest</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="0" page="10">SetGatherPointMilitary</Command>
 		<Command column="2" page="10">Eject</Command>
@@ -47198,7 +47288,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="770" name="xpEagleKnight">
@@ -47256,6 +47346,7 @@
 		<UnitType>Military</UnitType>
 		<UnitType>AbstractArcher</UnitType>
 		<UnitType>AbstractLightInfantry</UnitType>
+		<UnitType>AbstractJunk</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -47862,7 +47953,6 @@
 		<UnitType>AbstractCavalryInfantry</UnitType>
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
 		<Train column="2" page="6" row="0">Lookout</Train>
@@ -47957,7 +48047,7 @@
 		<RolloverTextID>44163</RolloverTextID>
 		<ShortRolloverTextID>44162</ShortRolloverTextID>
 		<LOS>18.0000</LOS>
-		<InitialResource resourcetype="Gold">1500.0000</InitialResource>
+		<InitialResource resourcetype="Gold">2000.0000</InitialResource>
 		<ResourceSubType>Gold</ResourceSubType>
 		<BuildingWorkRate>1.0000</BuildingWorkRate>
 		<Decay delay="0.0000" duration="0.0000"/>
@@ -48342,7 +48432,7 @@
 		<ObstructionRadiusZ>1.0000</ObstructionRadiusZ>
 		<MaxVelocity>0.0000</MaxVelocity>
 		<MovementType>land</MovementType>
-		<AnimFile>terrain\tree_grandcanyonbase.xml</AnimFile>
+		<AnimFile>terrain\tree_painted.xml</AnimFile>
 		<ImpactType>Wood</ImpactType>
 		<Icon>terrain\trees\tree_icon_64</Icon>
 		<PortraitIcon>terrain\trees\tree_icon_portrait</PortraitIcon>
@@ -50964,6 +51054,7 @@
 		<UnitType>AbstractWagon</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>CannotConvertHill</UnitType>
+		<UnitType>ValidIdleVillager</UnitType>
 		<Train column="10" page="6" row="0">WarHut</Train>
 		<Train column="13" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">ArtilleryDepot</Train>
@@ -51513,7 +51604,7 @@
 		<ProjectileProtoUnit>Arrow</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>2.0000</TrainPoints>
-		<BuildLimit>25</BuildLimit>
+		<BuildLimit>26</BuildLimit>
 		<Cost resourcetype="Food">75.0000</Cost>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Hand" value="0.2000"/>
@@ -51705,11 +51796,11 @@
 		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<Train column="15" page="0" row="0">Maghrabi</Train>
 		<Train column="14" page="0" row="0">Axeman</Train>
 		<Train column="20" page="0" row="0">MercDove</Train>
 		<Train column="42" page="0" row="0">General</Train>
 		<Train column="43" page="0" row="0">GeneralBr</Train>
-		<Train column="27" page="0" row="0">GoldMiner</Train>
 		<Train column="10" page="0" row="0">MercHoopThrowers</Train>
 		<Train column="1" page="0" row="0">SaloonOutlawPistol</Train>
 		<Train column="2" page="0" row="0">SaloonOutlawRifleman</Train>
@@ -51742,7 +51833,6 @@
 		<Train column="41" page="0" row="0">ypMercIronTroop</Train>
 		<Train column="28" page="0" row="0">BoneguardSwordsman</Train>
 		<Train column="29" page="0" row="0">BoneguardRifleman</Train>
-		<Train column="28" page="0" row="0">Surgeon</Train>
 		<Tech column="1" page="1" row="0">SaloonWildWest</Tech>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>StartsAtFullEfficiency</Flag>
@@ -51844,7 +51934,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
@@ -52032,7 +52122,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -52046,7 +52136,7 @@
 			<DamageBonus type="Building">0.000000</DamageBonus>
 			<DamageBonus type="Tree">0.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -52553,6 +52643,7 @@
 		<Tech column="3" page="4" row="0">Pillage</Tech>
 		<Tech column="2" page="2" row="0">Rifling</Tech>
 		<Tech column="1" page="2" row="0">BigHouseCoatlicue</Tech>
+		<Tech column="1" page="2" row="0">BigWarrior</Tech>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>StartsAtFullEfficiency</Flag>
 		<Flag>Immoveable</Flag>
@@ -52819,7 +52910,7 @@
 		<Tactics>bowCavalry.tactics</Tactics>
 		<ProtoAction>
 			<Name>BowAttack</Name>
-			<Damage>20.000000</Damage>
+			<Damage>18.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>12.000000</MaxRange>
 			<ROF>1.500000</ROF>
@@ -52838,7 +52929,7 @@
 		<ProtoAction>
 			<Name>ChargeAttack</Name>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
-			<Damage>10.000000</Damage>
+			<Damage>9.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">4.000000</DamageBonus>
@@ -54816,6 +54907,7 @@
 		<Train column="34" page="0" row="0">NatSharktoothBowman</Train>
 		<Train column="35" page="0" row="0">NatTracker</Train>
 		<Train column="25" page="0" row="0">ypNatSohei</Train>
+		<Train column="36" page="0" row="0">CamelArcher</Train>
 		<Tech column="1" page="1" row="0">SaloonWildWest</Tech>
 		<Train column="2" page="0" row="0">SaloonOutlawPistol</Train>
 		<Train column="3" page="0" row="0">SaloonOutlawRifleman</Train>
@@ -55654,6 +55746,7 @@
 		<UnitType>AbstractWagon</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>CannotConvertHill</UnitType>
+		<UnitType>ValidIdleVillager</UnitType>
 		<Train column="0" page="1" row="0">TradingPost</Train>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -56249,9 +56342,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -56262,9 +56355,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -56273,8 +56366,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56284,8 +56377,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56297,8 +56390,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56308,9 +56401,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -56321,8 +56414,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -56412,9 +56505,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -56425,9 +56518,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -56436,8 +56529,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56447,8 +56540,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56460,8 +56553,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56471,9 +56564,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -56484,8 +56577,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -56575,9 +56668,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -56587,9 +56680,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -56598,8 +56691,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56609,8 +56702,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56621,8 +56714,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -56632,9 +56725,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -56644,8 +56737,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -57349,9 +57442,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -57363,9 +57456,9 @@
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<Projectile>Blowdart</Projectile>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="898" name="Pilgrim">
@@ -57394,7 +57487,7 @@
 		<LOS>14.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>Civilian</UnitAIType>
-		<TrainPoints>30.0000</TrainPoints>
+		<TrainPoints>45.0000</TrainPoints>
 		<BuildLimit>10</BuildLimit>
 		<Bounty>11.0000</Bounty>
 		<BuildBounty>11.0000</BuildBounty>
@@ -57471,6 +57564,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -57679,9 +57773,9 @@
 			<Rate resource="Gold" type="ypRicePaddy">0.440000</Rate>
 			<Rate type="ypGroveBuilding">0.600000</Rate>
 			<Rate resource="Food" type="ypRicePaddy">0.600000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.700000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.700000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.700000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.300000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.300000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.300000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -58600,9 +58694,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -58612,10 +58706,10 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -58623,9 +58717,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -58634,9 +58728,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -58648,8 +58742,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -58659,9 +58753,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -58671,9 +58765,9 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -59190,7 +59284,6 @@
 		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>AbstractMonk</UnitType>
 		<UnitType>AbstractJapaneseMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">WarTent</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -59234,6 +59327,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<DamageType>Hand</DamageType>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
@@ -59245,7 +59339,8 @@
 			<Name>DefendRangedAttack</Name>
 			<Damage>8.000000</Damage>
 			<DamageType>Ranged</DamageType>
-			<ROF>1.500000</ROF>
+			<ROF>3.000000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<MaxRange>16.000000</MaxRange>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<DamageType>Ranged</DamageType>
@@ -59259,6 +59354,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -59283,6 +59379,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -59294,7 +59391,8 @@
 			<Damage>8.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>16.000000</MaxRange>
-			<ROF>1.500000</ROF>
+			<ROF>3.000000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -59313,6 +59411,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -59325,7 +59424,8 @@
 			<Damage>8.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>16.000000</MaxRange>
-			<ROF>1.500000</ROF>
+			<ROF>3.000000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -60136,9 +60236,9 @@
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="Building">0.000000</DamageBonus>
 			<DamageBonus type="Tree">0.000000</DamageBonus>
 		</ProtoAction>
@@ -60153,9 +60253,9 @@
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="Building">0.000000</DamageBonus>
 			<DamageBonus type="Tree">0.000000</DamageBonus>
 		</ProtoAction>
@@ -60177,9 +60277,9 @@
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="Building">0.000000</DamageBonus>
 			<DamageBonus type="Tree">0.000000</DamageBonus>
 		</ProtoAction>
@@ -60240,7 +60340,6 @@
 		<UnitType>ConvertsHerds</UnitType>
 		<UnitType>AbstractMonk</UnitType>
 		<UnitType>AbstractIndianMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">WarTent</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -60419,10 +60518,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -60432,10 +60531,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -60443,9 +60543,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -60454,9 +60554,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -60467,10 +60567,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -60478,10 +60579,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -60491,10 +60592,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 	</Unit>
 	<Unit id="928" name="ypArquebusier">
@@ -60576,10 +60678,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -60589,9 +60691,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -60600,8 +60702,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -60610,9 +60712,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -60623,8 +60725,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -60633,10 +60735,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -60646,8 +60748,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -61215,7 +61317,7 @@
 		<TrainPoints>30.0000</TrainPoints>
 		<Bounty>14.0000</Bounty>
 		<BuildBounty>14.0000</BuildBounty>
-		<Cost resourcetype="Food">60.0000</Cost>
+		<Cost resourcetype="Food">50.0000</Cost>
 		<Cost resourcetype="Wood">100.0000</Cost>
 		<AllowedAge>2</AllowedAge>
 		<Armor type="Ranged" value="0.5000"/>
@@ -61259,16 +61361,15 @@
 			<Name>CannonAttack</Name>
 			<Damage>10.000000</Damage>
 			<DamageType>Siege</DamageType>
-			<MinRange>8.000000</MinRange>
+			<MinRange>6.000000</MinRange>
 			<MaxRange>34.000000</MaxRange>
 			<ROF>4.000000</ROF>
 			<DamageCap>20.000000</DamageCap>
-			<DamageBonus type="Building">12.000000</DamageBonus>
+			<DamageBonus type="Building">8.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="Ship">12.000000</DamageBonus>
-			<DamageBonus type="AbstractInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractArtillery">6.000000</DamageBonus>
+			<DamageBonus type="Ship">6.000000</DamageBonus>
+			<DamageBonus type="AbstractArtillery">2.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="935" name="ypFlyingCrow">
@@ -61408,7 +61509,6 @@
 		<UnitType>AbstractHandInfantry</UnitType>
 		<UnitType>AbstractChineseMonk</UnitType>
 		<UnitType>AbstractMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">WarTent</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -61650,6 +61750,7 @@
 		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
+		<Train column="15" page="0" row="0">Maghrabi</Train>
 		<Train column="14" page="0" row="0">Axeman</Train>
 		<Train column="20" page="0" row="0">MercDove</Train>
 		<Train column="42" page="0" row="0">General</Train>
@@ -61872,7 +61973,7 @@
 		<BuildBounty>50.0000</BuildBounty>
 		<Cost resourcetype="Wood">200.0000</Cost>
 		<BuildingWorkRate>1.0000</BuildingWorkRate>
-		<AllowedAge>0</AllowedAge>
+		<AllowedAge>1</AllowedAge>
 		<Armor type="Siege" value="0.0000"/>
 		<UnitType>LogicalTypeValidSabotage</UnitType>
 		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
@@ -62079,7 +62180,7 @@
 		<Train column="0" page="0" row="0">ypNaginataRider</Train>
 		<Train column="1" page="0" row="0">ypYabusame</Train>
 		<Train column="0" page="0" row="0">xpArrowKnight</Train>
-		<Train column="1" page="0" row="0">xpEagleKnight</Train>
+		<Train column="1" page="0" row="0">AbstractJunk</Train>
 		<Train column="2" page="0" row="0">xpJaguarKnight</Train>
 		<Tech column="1" page="1" row="0">YPExaltedYabusame</Tech>
 		<Tech column="0" page="1" row="0">YPDisciplinedNaginataRider</Tech>
@@ -62661,6 +62762,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -62872,9 +62974,9 @@
 			<Rate resource="Gold" type="ypRicePaddy">0.340000</Rate>
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate type="ypGroveBuilding">0.500000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -63485,6 +63587,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="1" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -63522,7 +63625,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="953" name="YPCoveredWagonAsian">
@@ -63998,10 +64101,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -64010,10 +64113,10 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -64021,10 +64124,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerHandAttack</Name>
@@ -64032,10 +64135,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
@@ -64045,9 +64148,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -64056,9 +64159,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -64067,10 +64170,10 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="959" name="ypMercFlailiphant">
@@ -64450,7 +64553,6 @@
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>AbstractHandInfantry</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
-		<UnitType>AbstractCoyoteMan</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -64855,7 +64957,7 @@
 		<DisplayNameID>60815</DisplayNameID>
 		<EditorNameID>60816</EditorNameID>
 		<PopulationCount>0</PopulationCount>
-		<SubCiv>Sufi</SubCiv>
+		<SubCiv>Aztecs</SubCiv>
 		<ObstructionRadiusX>0.8900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.8900</ObstructionRadiusZ>
 		<FormationCategory>Mobile</FormationCategory>
@@ -65042,7 +65144,6 @@
 		<UnitType>AbstractRangedInfantry</UnitType>
 		<UnitType>AbstractCanSeeStealth</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
-		<UnitType>AbstractLightInfantry</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -65330,7 +65431,7 @@
 		<Icon>units\asians\naval\atakabune\atakebune_icon_64</Icon>
 		<PortraitIcon>units\asians\naval\atakabune\atakebune_icon_portrait</PortraitIcon>
 		<RolloverTextID>61063</RolloverTextID>
-		<ShortRolloverTextID>61062</ShortRolloverTextID>
+		<ShortRolloverTextID>27682</ShortRolloverTextID>
 		<InitialHitpoints>2000.0000</InitialHitpoints>
 		<MaxHitpoints>2000.0000</MaxHitpoints>
 		<LOS>24.0000</LOS>
@@ -65339,10 +65440,10 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>60.0000</Bounty>
-		<BuildBounty>60.0000</BuildBounty>
+		<Bounty>65.0000</Bounty>
+		<BuildBounty>65.0000</BuildBounty>
 		<Cost resourcetype="Wood">300.0000</Cost>
-		<Cost resourcetype="Gold">300.0000</Cost>
+		<Cost resourcetype="Gold">350.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>1</AllowedAge>
 		<Armor type="Ranged" value="0.7500"/>
@@ -65405,12 +65506,13 @@
 		<Tactics>fluyt.tactics</Tactics>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
-			<Damage>35.000000</Damage>
+			<Damage>40.000000</Damage>
 			<DamageType>Siege</DamageType>
 			<MaxRange>20.000000</MaxRange>
 			<ROF>2.000000</ROF>
-			<DamageCap>70.000000</DamageCap>
+			<DamageCap>80.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -65432,7 +65534,7 @@
 		<Icon>units\asians\naval\fune\fune_icon_64</Icon>
 		<PortraitIcon>units\naval\fune_portrait</PortraitIcon>
 		<RolloverTextID>61071</RolloverTextID>
-		<ShortRolloverTextID>61070</ShortRolloverTextID>
+		<ShortRolloverTextID>25618</ShortRolloverTextID>
 		<InitialHitpoints>800.0000</InitialHitpoints>
 		<MaxHitpoints>800.0000</MaxHitpoints>
 		<LOS>24.0000</LOS>
@@ -65441,9 +65543,9 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>40.0000</Bounty>
-		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Wood">300.0000</Cost>
+		<Bounty>30.0000</Bounty>
+		<BuildBounty>30.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -65496,12 +65598,12 @@
 		<Tactics>caravel.tactics</Tactics>
 		<ProtoAction>
 			<Name>BroadsideAttack</Name>
-			<Damage>25.000000</Damage>
+			<Damage>30.000000</Damage>
 			<DamageType>Siege</DamageType>
 			<MaxRange>20.000000</MaxRange>
 			<ROF>0.050000</ROF>
-			<DamageCap>50.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageCap>60.000000</DamageCap>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -65512,12 +65614,20 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
-			<Damage>40.000000</Damage>
+			<Damage>50.000000</Damage>
 			<DamageType>Siege</DamageType>
 			<MaxRange>20.000000</MaxRange>
 			<ROF>1.000000</ROF>
-			<DamageCap>80.000000</DamageCap>
+			<DamageCap>100.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -65546,9 +65656,9 @@
 		<UnitAIType>HandCombative</UnitAIType>
 		<TrainPoints>10.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>20.0000</Bounty>
-		<BuildBounty>20.0000</BuildBounty>
-		<Cost resourcetype="Wood">100.0000</Cost>
+		<Bounty>25.0000</Bounty>
+		<BuildBounty>25.0000</BuildBounty>
+		<Cost resourcetype="Wood">150.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<AllowedAge>1</AllowedAge>
 		<Armor type="Ranged" value="0.5000"/>
@@ -65929,10 +66039,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -65942,10 +66052,10 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -65953,9 +66063,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -65964,9 +66074,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -65978,8 +66088,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -65989,9 +66099,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -66001,9 +66111,9 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -66259,6 +66369,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -67048,7 +67159,7 @@
 		<Icon>units\asians\naval\wokou_junk\wokou_junk_icon</Icon>
 		<PortraitIcon>units\asians\naval\wokou_junk\wokou_junk_icon_portrait</PortraitIcon>
 		<RolloverTextID>61665</RolloverTextID>
-		<ShortRolloverTextID>61664</ShortRolloverTextID>
+		<ShortRolloverTextID>25618</ShortRolloverTextID>
 		<InitialHitpoints>1500.0000</InitialHitpoints>
 		<MaxHitpoints>1500.0000</MaxHitpoints>
 		<LOS>34.0000</LOS>
@@ -67057,8 +67168,8 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>4</BuildLimit>
-		<Bounty>80.0000</Bounty>
-		<BuildBounty>80.0000</BuildBounty>
+		<Bounty>60.0000</Bounty>
+		<BuildBounty>60.0000</BuildBounty>
 		<Cost resourcetype="Gold">400.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>1</AllowedAge>
@@ -67118,7 +67229,7 @@
 			<MaxRange>30.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>80.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -67130,9 +67241,16 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>140.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="Building">3.000000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="992" name="ypWokouWanderingHorseman">
@@ -67491,7 +67609,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -67502,7 +67620,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -67511,7 +67629,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -67521,7 +67639,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -67532,7 +67650,7 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -67543,7 +67661,7 @@
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -67553,7 +67671,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractVillager">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -68167,7 +68285,6 @@
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>Ranged</UnitType>
 		<UnitType>AbstractSiegeTrooper</UnitType>
-		<UnitType>AbstractLightInfantry</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -69121,7 +69238,7 @@
 		<Icon>units\asians\naval\war_junk\war_junk_icon_64</Icon>
 		<PortraitIcon>units\asians\naval\war_junk\war_junk_icon_portrait</PortraitIcon>
 		<RolloverTextID>62204</RolloverTextID>
-		<ShortRolloverTextID>62203</ShortRolloverTextID>
+		<ShortRolloverTextID>27710</ShortRolloverTextID>
 		<InitialHitpoints>800.0000</InitialHitpoints>
 		<MaxHitpoints>800.0000</MaxHitpoints>
 		<LOS>26.0000</LOS>
@@ -69130,9 +69247,9 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>40.0000</Bounty>
-		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Wood">300.0000</Cost>
+		<Bounty>30.0000</Bounty>
+		<BuildBounty>30.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -69190,7 +69307,7 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>70.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -69207,6 +69324,14 @@
 			<ROF>1.500000</ROF>
 			<DamageCap>100.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -69454,6 +69579,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<Tactics>titan.tactics</Tactics>
 		<ProtoAction>
@@ -70218,8 +70344,8 @@
 	<Unit id="1033" name="ypWildElephant">
 		<DBID>1512</DBID>
 		<DisplayNameID>62645</DisplayNameID>
-		<ObstructionRadiusX>2.0000</ObstructionRadiusX>
-		<ObstructionRadiusZ>2.0000</ObstructionRadiusZ>
+		<ObstructionRadiusX>1.0000</ObstructionRadiusX>
+		<ObstructionRadiusZ>1.0000</ObstructionRadiusZ>
 		<IdleTimeout>5.0000</IdleTimeout>
 		<MaxVelocity>2.0000</MaxVelocity>
 		<MaxRunVelocity>4.0000</MaxRunVelocity>
@@ -72185,6 +72311,7 @@
 		<Contain>xpMedicineManAztec</Contain>
 		<Contain>ypDaimyoRegicide</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="0" page="10">SetGatherPointMilitary</Command>
 		<Command column="2" page="10">Eject</Command>
@@ -72225,7 +72352,7 @@
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
@@ -72237,7 +72364,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1062" name="ypSnowLeopard">
@@ -72359,7 +72486,6 @@
 		<UnitType>AbstractCanSeeStealth</UnitType>
 		<UnitType>AbstractMonk</UnitType>
 		<UnitType>AbstractIndianMonk</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">WarTent</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -72515,7 +72641,6 @@
 		<UnitType>Hero</UnitType>
 		<UnitType>AbstractInfantry</UnitType>
 		<UnitType>AbstractArcher</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">WarTent</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -72558,6 +72683,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<DamageType>Hand</DamageType>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
@@ -72569,7 +72695,8 @@
 			<Name>DefendRangedAttack</Name>
 			<Damage>8.000000</Damage>
 			<DamageType>Ranged</DamageType>
-			<ROF>1.500000</ROF>
+			<ROF>3.000000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<MaxRange>16.000000</MaxRange>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<DamageType>Ranged</DamageType>
@@ -72583,6 +72710,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -72607,6 +72735,7 @@
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
@@ -72615,14 +72744,15 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
-			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<Damage>8.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>16.000000</MaxRange>
-			<ROF>1.500000</ROF>
+			<ROF>3.000000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
+			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<DamageBonus type="Hero">0.800000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -72634,26 +72764,28 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
-			<DamageBonus type="Hero">0.800000</DamageBonus>
 			<Damage>4.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
+			<DamageBonus type="Hero">0.800000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
-			<DamageBonus type="Hero">0.800000</DamageBonus>
 			<DamageBonus type="Guardian">3.000000</DamageBonus>
 			<Damage>8.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>16.000000</MaxRange>
-			<ROF>1.500000</ROF>
+			<ROF>3.000000</ROF>
+			<DamageCap>30.000000</DamageCap>
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<HitPercent>25.000000</HitPercent>
 			<HitPercentType>KillingBlow</HitPercentType>
+			<DamageBonus type="Hero">0.800000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1065" name="ypSettlerIndian">
@@ -72759,6 +72891,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -72968,9 +73101,9 @@
 			<Rate resource="Gold" type="ypRicePaddy">0.340000</Rate>
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate type="ypGroveBuilding">0.500000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -73050,7 +73183,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">250.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -73324,8 +73457,8 @@
 		<PortraitIcon>units\cavalry\dragoon\dragoon_portrait</PortraitIcon>
 		<RolloverTextID>63503</RolloverTextID>
 		<ShortRolloverTextID>63502</ShortRolloverTextID>
-		<InitialHitpoints>210.0000</InitialHitpoints>
-		<MaxHitpoints>210.0000</MaxHitpoints>
+		<InitialHitpoints>200.0000</InitialHitpoints>
+		<MaxHitpoints>200.0000</MaxHitpoints>
 		<LOS>16.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -73390,12 +73523,12 @@
 			<MaxRange>12.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 			<Damage>11.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
@@ -73404,7 +73537,7 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 			<Damage>22.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>12.000000</MaxRange>
@@ -74726,7 +74859,7 @@
 		<Icon>units\asians\naval\fuchuan\fuchuan_icon_64</Icon>
 		<PortraitIcon>units\asians\naval\fuchuan\fuchuan_icon_portrait</PortraitIcon>
 		<RolloverTextID>63613</RolloverTextID>
-		<ShortRolloverTextID>63612</ShortRolloverTextID>
+		<ShortRolloverTextID>27682</ShortRolloverTextID>
 		<InitialHitpoints>2500.0000</InitialHitpoints>
 		<MaxHitpoints>2500.0000</MaxHitpoints>
 		<LOS>34.0000</LOS>
@@ -74735,10 +74868,10 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>3</BuildLimit>
-		<Bounty>120.0000</Bounty>
-		<BuildBounty>120.0000</BuildBounty>
-		<Cost resourcetype="Wood">450.0000</Cost>
-		<Cost resourcetype="Gold">750.0000</Cost>
+		<Bounty>100.0000</Bounty>
+		<BuildBounty>100.0000</BuildBounty>
+		<Cost resourcetype="Wood">400.0000</Cost>
+		<Cost resourcetype="Gold">600.0000</Cost>
 		<MaxContained>75</MaxContained>
 		<AllowedAge>2</AllowedAge>
 		<Armor type="Ranged" value="0.7500"/>
@@ -74798,7 +74931,7 @@
 			<MaxRange>28.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>100.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -74810,6 +74943,7 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>180.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -75323,9 +75457,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -75336,9 +75470,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -75347,8 +75481,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -75358,8 +75492,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -75371,8 +75505,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -75382,9 +75516,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -75395,8 +75529,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -77355,9 +77489,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -77367,9 +77501,9 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -77509,8 +77643,6 @@
 		<UnitType>ValidIdleVillager</UnitType>
 		<UnitType>AbstractFishingBoat</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
-		<Train column="1" page="6" row="0">Dock</Train>
-		<Train column="1" page="6" row="0">YPDockAsian</Train>
 		<Flag>TieToWaterSurface</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -77988,7 +78120,7 @@
 		<Icon>units\asians\naval\catamaran\catamaran_icon</Icon>
 		<PortraitIcon>units\asians\naval\catamaran\catamaran_icon_portrait</PortraitIcon>
 		<RolloverTextID>64514</RolloverTextID>
-		<ShortRolloverTextID>64513</ShortRolloverTextID>
+		<ShortRolloverTextID>25618</ShortRolloverTextID>
 		<InitialHitpoints>220.0000</InitialHitpoints>
 		<MaxHitpoints>220.0000</MaxHitpoints>
 		<LOS>24.0000</LOS>
@@ -77996,8 +78128,8 @@
 		<UnitAIType>Civilian</UnitAIType>
 		<TrainPoints>10.0000</TrainPoints>
 		<BuildLimit>15</BuildLimit>
-		<Bounty>10.0000</Bounty>
-		<BuildBounty>10.0000</BuildBounty>
+		<Bounty>12.0000</Bounty>
+		<BuildBounty>12.0000</BuildBounty>
 		<Cost resourcetype="Wood">125.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<MaxContained>20</MaxContained>
@@ -78820,6 +78952,7 @@
 		<Train column="16" page="6" row="0">WallConnector</Train>
 		<Train column="10" page="1" row="0">Bank</Train>
 		<Train column="8" page="1" row="0">Church</Train>
+		<Train column="8" page="1" row="0">BasilicaIt</Train>
 		<Train column="11" page="6" row="0">WarHut</Train>
 		<Train column="11" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">Stable</Train>
@@ -79028,9 +79161,9 @@
 			<Rate resource="Food" type="ypRicePaddy">0.500000</Rate>
 			<Rate type="ypBerryBuilding">0.670000</Rate>
 			<Rate type="ypGroveBuilding">0.500000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -83742,6 +83875,7 @@
 		<Contain>Surgeon</Contain>
 		<Contain>Priest</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="1" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -83777,12 +83911,12 @@
 			<MaxRange>24.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageCap>160.000000</DamageCap>
-			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.300000</DamageBonus>
 			<DamageArea>3.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
@@ -83792,9 +83926,9 @@
 			<MaxRange>24.000000</MaxRange>
 			<ROF>2.000000</ROF>
 			<DamageBonus type="AbstractVillager">0.300000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">1.700000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.700000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1211" name="ypIGCBird">
@@ -86013,9 +86147,9 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.750000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -86033,9 +86167,9 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.750000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -86063,9 +86197,9 @@
 			<DamageBonus type="AbstractHeavyInfantry">1.750000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -86637,7 +86771,7 @@
 		<LOS>44.0000</LOS>
 		<ProjectileProtoUnit>MortarShell</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
-		<TrainPoints>45.0000</TrainPoints>
+		<TrainPoints>50.0000</TrainPoints>
 		<Bounty>50.0000</Bounty>
 		<BuildBounty>50.0000</BuildBounty>
 		<Cost resourcetype="Food">100.0000</Cost>
@@ -86692,20 +86826,8 @@
 			<DamageBonus type="Building">2.500000</DamageBonus>
 			<DamageArea>2.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
-			<DamageBonus type="Ship">1.500000</DamageBonus>
 			<DamageBonus type="Unit">0.500000</DamageBonus>
 		</ProtoAction>
-		<ProtoAction>
-			<Name>HandAttack</Name>
-			<Damage>10.000000</Damage>
-			<DamageType>Hand</DamageType>
-			<MaxRange>1.500000</MaxRange>
-			<ROF>1.500000</ROF>
-			<DamageCap>20.000000</DamageCap>
-			<DamageArea>1.000000</DamageArea>
-			<DamageFlags>Enemy</DamageFlags>
-			<DamageBonus type="Building">0.000000</DamageBonus>
-		</ProtoAction>
 	</Unit>
 	<Unit id="1248" name="ypConsulateGreatBombard">
 		<DBID>1815</DBID>
@@ -87381,7 +87503,7 @@
 		<DBID>1824</DBID>
 		<DisplayNameID>780762</DisplayNameID>
 		<EditorNameID>65431</EditorNameID>
-		<PopulationCount>8</PopulationCount>
+		<PopulationCount>6</PopulationCount>
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Body</FormationCategory>
@@ -87390,8 +87512,8 @@
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\infantry_ranged\skirmisher\skirmisher.xml</AnimFile>
-		<Icon>units\asians\consulate\french_armies\french_company_icon_64</Icon>
-		<PortraitIcon>units\asians\consulate\french_armies\french_company_icon_64</PortraitIcon>
+		<Icon>ui\french_1</Icon>
+		<PortraitIcon>ui\french_1</PortraitIcon>
 		<RolloverTextID>780750</RolloverTextID>
 		<ShortRolloverTextID>65428</ShortRolloverTextID>
 		<InitialHitpoints>400.0000</InitialHitpoints>
@@ -87531,7 +87653,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
@@ -87544,10 +87666,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -87555,7 +87678,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
@@ -87566,7 +87689,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
@@ -87579,10 +87702,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -87590,7 +87714,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
@@ -87603,10 +87727,11 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type='AbstractLightCavalry'>2.000000</DamageBonus>
-			<DamageBonus type='xpEagleKnight'>2.000000</DamageBonus>
+			<DamageBonus type='AbstractJunk'>2.000000</DamageBonus>
 			<DamageBonus type='AbstractCavalry'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractCoyoteMan'>0.750000</DamageBonus>
 			<DamageBonus type='AbstractHeavyInfantry'>1.250000</DamageBonus>
+			<MaxHeight>1.000000</MaxHeight>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1259" name="ypConsulateArmyPortuguese1">
@@ -88125,8 +88250,8 @@
 		<ObstructionRadiusZ>0.7900</ObstructionRadiusZ>
 		<FormationCategory>Mobile</FormationCategory>
 		<DeadReplacement>BloodSplat</DeadReplacement>
-		<MaxVelocity>6.5000</MaxVelocity>
-		<MaxRunVelocity>8.5000</MaxRunVelocity>
+		<MaxVelocity>6.2500</MaxVelocity>
+		<MaxRunVelocity>8.2500</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\asians\japanese\daimyo_Kiyomasa\daimyo_kiyomasa_horse.xml</AnimFile>
@@ -88247,8 +88372,8 @@
 		<ObstructionRadiusZ>0.7900</ObstructionRadiusZ>
 		<FormationCategory>Mobile</FormationCategory>
 		<DeadReplacement>BloodSplat</DeadReplacement>
-		<MaxVelocity>6.5000</MaxVelocity>
-		<MaxRunVelocity>8.5000</MaxRunVelocity>
+		<MaxVelocity>6.2500</MaxVelocity>
+		<MaxRunVelocity>8.2500</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\asians\japanese\daimyo_mototada\daimyo_mototada_horse.xml</AnimFile>
@@ -88369,8 +88494,8 @@
 		<ObstructionRadiusZ>0.7900</ObstructionRadiusZ>
 		<FormationCategory>Mobile</FormationCategory>
 		<DeadReplacement>BloodSplat</DeadReplacement>
-		<MaxVelocity>6.5000</MaxVelocity>
-		<MaxRunVelocity>8.5000</MaxRunVelocity>
+		<MaxVelocity>6.2500</MaxVelocity>
+		<MaxRunVelocity>8.2500</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\asians\japanese\daimyo_Masamune\daimyo_masamune_horse.xml</AnimFile>
@@ -88593,7 +88718,7 @@
 		<Icon>units\asians\naval\tekkousen\tekkousen_icon_64</Icon>
 		<PortraitIcon>units\asians\naval\tekkousen\tekkousen_icon_portrait</PortraitIcon>
 		<RolloverTextID>65599</RolloverTextID>
-		<ShortRolloverTextID>65598</ShortRolloverTextID>
+		<ShortRolloverTextID>27682</ShortRolloverTextID>
 		<InitialHitpoints>2000.0000</InitialHitpoints>
 		<MaxHitpoints>2000.0000</MaxHitpoints>
 		<LOS>34.0000</LOS>
@@ -88602,10 +88727,10 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>3</BuildLimit>
-		<Bounty>100.0000</Bounty>
-		<BuildBounty>100.0000</BuildBounty>
-		<Cost resourcetype="Wood">500.0000</Cost>
-		<Cost resourcetype="Gold">500.0000</Cost>
+		<Bounty>80.0000</Bounty>
+		<BuildBounty>80.0000</BuildBounty>
+		<Cost resourcetype="Wood">400.0000</Cost>
+		<Cost resourcetype="Gold">400.0000</Cost>
 		<MaxContained>50</MaxContained>
 		<AllowedAge>2</AllowedAge>
 		<Armor type="Ranged" value="0.7500"/>
@@ -88659,7 +88784,7 @@
 			<MaxRange>28.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>70.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -88671,6 +88796,7 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>180.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Monitor">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -88684,8 +88810,8 @@
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Body</FormationCategory>
 		<DeadReplacement>BloodSplat</DeadReplacement>
-		<MaxVelocity>6.0000</MaxVelocity>
-		<MaxRunVelocity>8.0000</MaxRunVelocity>
+		<MaxVelocity>5.5000</MaxVelocity>
+		<MaxRunVelocity>7.5000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\asians\consulate\redolero\redolero.xml</AnimFile>
@@ -88695,8 +88821,8 @@
 		<PortraitIcon>units\infantry\redolero\redolero_portrait</PortraitIcon>
 		<RolloverTextID>65769</RolloverTextID>
 		<ShortRolloverTextID>65768</ShortRolloverTextID>
-		<InitialHitpoints>135.0000</InitialHitpoints>
-		<MaxHitpoints>135.0000</MaxHitpoints>
+		<InitialHitpoints>145.0000</InitialHitpoints>
+		<MaxHitpoints>145.0000</MaxHitpoints>
 		<LOS>12.0000</LOS>
 		<UnitAIType>HandCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
@@ -88799,8 +88925,8 @@
 		<PortraitIcon>units\infantry_ranged\schutze\schutze_portrait</PortraitIcon>
 		<RolloverTextID>77908</RolloverTextID>
 		<ShortRolloverTextID>25669</ShortRolloverTextID>
-		<InitialHitpoints>160.0000</InitialHitpoints>
-		<MaxHitpoints>160.0000</MaxHitpoints>
+		<InitialHitpoints>165.0000</InitialHitpoints>
+		<MaxHitpoints>165.0000</MaxHitpoints>
 		<LOS>16.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -89472,8 +89598,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -89485,8 +89611,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -89496,8 +89622,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -89507,8 +89633,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -89520,8 +89646,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -89531,8 +89657,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -89544,8 +89670,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -92007,7 +92133,7 @@
 		<DBID>1864</DBID>
 		<DisplayNameID>780761</DisplayNameID>
 		<EditorNameID>65855</EditorNameID>
-		<PopulationCount>18</PopulationCount>
+		<PopulationCount>16</PopulationCount>
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Body</FormationCategory>
@@ -92016,8 +92142,8 @@
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\infantry_ranged\skirmisher\skirmisher.xml</AnimFile>
-		<Icon>units\asians\consulate\french_armies\french_force_icon_64</Icon>
-		<PortraitIcon>units\asians\consulate\french_armies\french_force_icon_64</PortraitIcon>
+		<Icon>ui\french_2</Icon>
+		<PortraitIcon>ui\french_2</PortraitIcon>
 		<RolloverTextID>780751</RolloverTextID>
 		<ShortRolloverTextID>65852</ShortRolloverTextID>
 		<InitialHitpoints>800.0000</InitialHitpoints>
@@ -92077,7 +92203,7 @@
 		<DBID>1865</DBID>
 		<DisplayNameID>780763</DisplayNameID>
 		<EditorNameID>65859</EditorNameID>
-		<PopulationCount>27</PopulationCount>
+		<PopulationCount>20</PopulationCount>
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Body</FormationCategory>
@@ -92086,8 +92212,8 @@
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\infantry_ranged\skirmisher\skirmisher.xml</AnimFile>
-		<Icon>units\asians\consulate\french_armies\french_army_icon_64</Icon>
-		<PortraitIcon>units\asians\consulate\french_armies\french_army_icon_64</PortraitIcon>
+		<Icon>ui\french_3</Icon>
+		<PortraitIcon>ui\french_3</PortraitIcon>
 		<RolloverTextID>65857</RolloverTextID>
 		<ShortRolloverTextID>65856</ShortRolloverTextID>
 		<InitialHitpoints>1200.0000</InitialHitpoints>
@@ -92785,8 +92911,8 @@
 		<PortraitIcon>units\cavalry\dragoon\dragoon_portrait</PortraitIcon>
 		<RolloverTextID>65887</RolloverTextID>
 		<ShortRolloverTextID>65886</ShortRolloverTextID>
-		<InitialHitpoints>210.0000</InitialHitpoints>
-		<MaxHitpoints>210.0000</MaxHitpoints>
+		<InitialHitpoints>200.0000</InitialHitpoints>
+		<MaxHitpoints>200.0000</MaxHitpoints>
 		<LOS>16.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -92851,12 +92977,12 @@
 			<MaxRange>12.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 			<Damage>11.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
@@ -92865,7 +92991,7 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
-			<DamageBonus type="AbstractCoyoteMan">2.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.500000</DamageBonus>
 			<Damage>22.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MaxRange>12.000000</MaxRange>
@@ -93063,8 +93189,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -93076,8 +93202,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -93087,8 +93213,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -93098,8 +93224,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -93111,8 +93237,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -93122,8 +93248,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -93135,8 +93261,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -94020,7 +94146,7 @@
 		<LOS>44.0000</LOS>
 		<ProjectileProtoUnit>MortarShell</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
-		<TrainPoints>38.0000</TrainPoints>
+		<TrainPoints>40.0000</TrainPoints>
 		<Bounty>40.0000</Bounty>
 		<BuildBounty>40.0000</BuildBounty>
 		<Cost resourcetype="Wood">100.0000</Cost>
@@ -94071,7 +94197,7 @@
 			<MaxRange>40.000000</MaxRange>
 			<ROF>6.000000</ROF>
 			<DamageCap>200.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="Ship">1.750000</DamageBonus>
 			<DamageBonus type="Building">3.750000</DamageBonus>
 			<DamageBonus type="Unit">0.750000</DamageBonus>
 			<DamageArea>2.000000</DamageArea>
@@ -95853,9 +95979,9 @@
 			<Rate type="Mill">0.600000</Rate>
 			<Rate resource="Food" type="ypRicePaddy">0.500000</Rate>
 			<Rate type="AbstractTradeMarket">1.500000</Rate>
-			<Rate resource="Gold" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Wood" type="ResourceWagon">1.500000</Rate>
-			<Rate resource="Food" type="ResourceWagon">1.500000</Rate>
+			<Rate resource="Gold" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Wood" type="ResourceWagon">2.000000</Rate>
+			<Rate resource="Food" type="ResourceWagon">2.000000</Rate>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>HandAttack</Name>
@@ -99680,6 +99806,7 @@
 		<UnitType>UnitClass</UnitType>
 		<UnitType>Military</UnitType>
 		<UnitType>Unit</UnitType>
+		<UnitType>Mercenary</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -100287,7 +100414,6 @@
 		<UnitType>AbstractRangedInfantry</UnitType>
 		<UnitType>AbstractCanSeeStealth</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
-		<UnitType>AbstractLightInfantry</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -102571,7 +102697,6 @@
 		<UnitType>Unit</UnitType>
 		<UnitType>Hero</UnitType>
 		<UnitType>AbstractInfantry</UnitType>
-		<UnitType>CannotConvertHill</UnitType>
 		<Train column="2" page="6" row="0">WarTent</Train>
 		<Train column="1" page="6" row="0">TradingPost</Train>
 		<Train column="0" page="6" row="0">TownCenter</Train>
@@ -102891,7 +103016,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">300.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -102940,7 +103065,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">300.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -102989,7 +103114,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">250.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -103038,7 +103163,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">300.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -103087,7 +103212,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">300.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -103136,7 +103261,7 @@
 		<InitialHitpoints>6.0000</InitialHitpoints>
 		<MaxHitpoints>6.0000</MaxHitpoints>
 		<Bounty>0.0000</Bounty>
-		<InitialResource resourcetype="Wood">150.0000</InitialResource>
+		<InitialResource resourcetype="Wood">250.0000</InitialResource>
 		<ResourceSubType>Wood</ResourceSubType>
 		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
 		<GathererLimit>8</GathererLimit>
@@ -104591,10 +104716,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
 			<HitPercentType>CriticalAttack</HitPercentType>
@@ -104607,10 +104732,10 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
 			<HitPercentType>CriticalAttack</HitPercentType>
@@ -104621,9 +104746,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -104635,9 +104760,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -104652,8 +104777,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -104666,9 +104791,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
 			<HitPercentType>CriticalAttack</HitPercentType>
@@ -104681,9 +104806,9 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 			<HitPercent>20.000000</HitPercent>
 			<DamageMultiplier>2.000000</DamageMultiplier>
@@ -106556,7 +106681,7 @@
 		<ProtoAction>
 			<Name>DefendHandAttack</Name>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
@@ -106564,7 +106689,7 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<Damage>30.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MinRange>2.000000</MinRange>
@@ -106575,7 +106700,7 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
@@ -106584,7 +106709,7 @@
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerHandAttack</Name>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
@@ -106600,7 +106725,7 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -106609,11 +106734,11 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<Damage>30.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MinRange>2.000000</MinRange>
@@ -107441,6 +107566,7 @@
 		<UnitType>Military</UnitType>
 		<UnitType>UnitClass</UnitType>
 		<UnitType>Unit</UnitType>
+		<UnitType>Mercenary</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -107610,7 +107736,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -107620,7 +107746,7 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -107629,7 +107755,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -107638,7 +107764,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -107649,7 +107775,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
@@ -107658,7 +107784,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -107667,7 +107793,7 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -107836,7 +107962,6 @@
 		<UnitType>Ranged</UnitType>
 		<UnitType>AbstractRangedInfantry</UnitType>
 		<UnitType>AbstractCanSeeStealth</UnitType>
-		<UnitType>AbstractLightInfantry</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -108030,7 +108155,7 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
@@ -108218,7 +108343,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -108232,7 +108357,7 @@
 			<DamageBonus type="Building">0.000000</DamageBonus>
 			<DamageBonus type="Tree">0.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -108499,7 +108624,7 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -108509,7 +108634,7 @@
 			<MaxRange>18.000000</MaxRange>
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">1.500000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">1.500000</DamageBonus>
+			<DamageBonus type="AbstractJunk">1.500000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">1.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -109273,6 +109398,7 @@
 		<UnitType>CannotConvertHill</UnitType>
 		<UnitType>CountsTowardEconomicScore</UnitType>
 		<UnitType>HasBountyValue</UnitType>
+		<UnitType>ValidIdleVillager</UnitType>
 		<Train column="10" page="6" row="0">WarHut</Train>
 		<Train column="10" page="6" row="0">Barracks</Train>
 		<Train column="12" page="6" row="0">ArtilleryDepot</Train>
@@ -111369,6 +111495,7 @@
 		<Flag>Tracked</Flag>
 		<Flag>VisibleUnderFog</Flag>
 		<Flag>NotSelectable</Flag>
+		<Flag>NonCollideable</Flag>
 		<Command column="0" page="10">Delete</Command>
 		<ProtoAction>
 			<Name>TrampleHandAttack</Name>
@@ -112312,7 +112439,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractLightInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1514" name="GoldMiner">
@@ -112342,7 +112469,7 @@
 		<Bounty>20.0000</Bounty>
 		<BuildBounty>20.0000</BuildBounty>
 		<BuildLimit>10</BuildLimit>
-		<Cost resourcetype="Fame">100.0000</Cost>
+		<Cost resourcetype="Fame">50.0000</Cost>
 		<ProjectileProtoUnit>Dynamite</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -112450,8 +112577,8 @@
 		<UnitAIType>HandCombative</UnitAIType>
 		<TrainPoints>10.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>20.0000</Bounty>
-		<BuildBounty>20.0000</BuildBounty>
+		<Bounty>25.0000</Bounty>
+		<BuildBounty>25.0000</BuildBounty>
 		<Cost resourcetype="Wood">150.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<AllowedAge>2</AllowedAge>
@@ -112855,6 +112982,8 @@
 		<UnitType>Unit</UnitType>
 		<UnitType>UnitClass</UnitType>
 		<UnitType>Economic</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>CannotConvertHill</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>ObscuredByUnits</Flag>
@@ -112882,9 +113011,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_default.xml</AnimFile>
@@ -112893,15 +113022,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>25.0000</TrainPoints>
-		<BuildLimit>5</BuildLimit>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<Cost resourcetype="Food">100.0000</Cost>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
@@ -113355,6 +113484,7 @@
 		<Contain>NatMedicineMan</Contain>
 		<Contain>Imam</Contain>
 		<Contain>Envoy</Contain>
+		<Contain>Architect</Contain>
 		<Contain>NativeScout</Contain>
 		<Command column="1" page="1">SetUnitAsHomeCityGatherPoint</Command>
 		<Command column="3" page="10">Delete</Command>
@@ -113451,6 +113581,8 @@
 		<UnitType>Economic</UnitType>
 		<UnitType>Resource</UnitType>
 		<UnitType>Food</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>CannotConvertHill</UnitType>
 		<Flag>ShowTactics</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -113522,6 +113654,8 @@
 		<UnitType>Economic</UnitType>
 		<UnitType>Resource</UnitType>
 		<UnitType>Food</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>CannotConvertHill</UnitType>
 		<Flag>ShowTactics</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -113591,6 +113725,8 @@
 		<UnitType>Economic</UnitType>
 		<UnitType>Resource</UnitType>
 		<UnitType>Food</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>CannotConvertHill</UnitType>
 		<Flag>ShowTactics</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -113661,6 +113797,8 @@
 		<UnitType>Economic</UnitType>
 		<UnitType>Resource</UnitType>
 		<UnitType>Food</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>CannotConvertHill</UnitType>
 		<Flag>ShowTactics</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -114720,8 +114858,8 @@
 		<PortraitIcon>units\infantry_ranged\schutze\schutze_portrait</PortraitIcon>
 		<RolloverTextID>77908</RolloverTextID>
 		<ShortRolloverTextID>25669</ShortRolloverTextID>
-		<InitialHitpoints>160.0000</InitialHitpoints>
-		<MaxHitpoints>160.0000</MaxHitpoints>
+		<InitialHitpoints>165.0000</InitialHitpoints>
+		<MaxHitpoints>165.0000</MaxHitpoints>
 		<LOS>16.0000</LOS>
 		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -114906,9 +115044,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultb.xml</AnimFile>
@@ -114917,14 +115055,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -114967,9 +115106,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultf.xml</AnimFile>
@@ -114978,14 +115117,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115028,9 +115168,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultd.xml</AnimFile>
@@ -115039,14 +115179,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115089,9 +115230,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultg.xml</AnimFile>
@@ -115100,14 +115241,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115150,9 +115292,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaulto.xml</AnimFile>
@@ -115161,14 +115303,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115211,9 +115354,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultr.xml</AnimFile>
@@ -115222,14 +115365,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115272,9 +115416,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaults.xml</AnimFile>
@@ -115283,14 +115427,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115333,9 +115478,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultp.xml</AnimFile>
@@ -115344,14 +115489,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -115842,9 +115988,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultus.xml</AnimFile>
@@ -115853,15 +115999,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>25.0000</TrainPoints>
-		<BuildLimit>5</BuildLimit>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<Cost resourcetype="Food">100.0000</Cost>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
@@ -115905,9 +116051,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_default.xml</AnimFile>
@@ -115916,15 +116062,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>25.0000</TrainPoints>
-		<BuildLimit>5</BuildLimit>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<Cost resourcetype="Food">100.0000</Cost>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
@@ -116508,9 +116654,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -116521,9 +116667,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -116532,8 +116678,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -116543,8 +116689,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -116556,8 +116702,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -116567,9 +116713,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -116580,8 +116726,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -116846,7 +116992,7 @@
 		<Icon>units\asians\naval\wokou_junk\wokou_junk_icon</Icon>
 		<PortraitIcon>units\asians\naval\wokou_junk\wokou_junk_icon_portrait</PortraitIcon>
 		<RolloverTextID>78022</RolloverTextID>
-		<ShortRolloverTextID>78023</ShortRolloverTextID>
+		<ShortRolloverTextID>25618</ShortRolloverTextID>
 		<InitialHitpoints>800.0000</InitialHitpoints>
 		<MaxHitpoints>800.0000</MaxHitpoints>
 		<LOS>26.0000</LOS>
@@ -116855,9 +117001,9 @@
 		<UnitAIType>RangedCombative</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
 		<BuildLimit>5</BuildLimit>
-		<Bounty>40.0000</Bounty>
-		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Wood">300.0000</Cost>
+		<Bounty>30.0000</Bounty>
+		<BuildBounty>30.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
 		<Cost resourcetype="Gold">100.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
@@ -116915,7 +117061,7 @@
 			<MaxRange>20.000000</MaxRange>
 			<ROF>0.050000</ROF>
 			<DamageCap>80.000000</DamageCap>
-			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageBonus type="AbstractWarShip">2.000000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -116932,6 +117078,14 @@
 			<ROF>2.000000</ROF>
 			<DamageCap>160.000000</DamageCap>
 			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageBonus type="Galleon">1.250000</DamageBonus>
+			<DamageBonus type="Fluyt">1.250000</DamageBonus>
+			<DamageBonus type="Frigate">1.250000</DamageBonus>
+			<DamageBonus type="ypFuchuan">1.250000</DamageBonus>
+			<DamageBonus type="ypAtakabune">1.250000</DamageBonus>
+			<DamageBonus type="ypTekkousen">1.250000</DamageBonus>
+			<DamageBonus type="xpWarCanoe">1.250000</DamageBonus>
+			<DamageBonus type="xpTlalocCanoe">1.250000</DamageBonus>
 			<DamageArea>1.000000</DamageArea>
 			<DamageFlags>GAIAEnemy</DamageFlags>
 		</ProtoAction>
@@ -117470,9 +117624,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -117483,9 +117637,9 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -117494,8 +117648,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -117505,8 +117659,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -117518,8 +117672,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -117529,9 +117683,9 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -117542,8 +117696,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.250000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -117906,8 +118060,8 @@
 		<ObstructionRadiusZ>0.7900</ObstructionRadiusZ>
 		<FormationCategory>Mobile</FormationCategory>
 		<DeadReplacement>BloodSplat</DeadReplacement>
-		<MaxVelocity>6.8000</MaxVelocity>
-		<MaxRunVelocity>8.8000</MaxRunVelocity>
+		<MaxVelocity>6.7500</MaxVelocity>
+		<MaxRunVelocity>8.7500</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\cavalry\mounted_crossbowman\mounted_crossbowman_horse.xml</AnimFile>
@@ -117925,7 +118079,7 @@
 		<TrainPoints>36.0000</TrainPoints>
 		<Bounty>16.0000</Bounty>
 		<BuildBounty>16.0000</BuildBounty>
-		<Cost resourcetype="Food">90.0000</Cost>
+		<Cost resourcetype="Food">100.0000</Cost>
 		<Cost resourcetype="Gold">60.0000</Cost>
 		<AllowedAge>2</AllowedAge>
 		<Armor type="Ranged" value="0.3000"/>
@@ -118692,7 +118846,7 @@
 			<Name>CannonAttack</Name>
 			<Damage>50.000000</Damage>
 			<DamageType>Siege</DamageType>
-			<MinRange>1.000000</MinRange>
+			<MinRange>2.000000</MinRange>
 			<MaxRange>24.000000</MaxRange>
 			<ROF>6.000000</ROF>
 			<DamageCap>100.000000</DamageCap>
@@ -118775,7 +118929,7 @@
 			<Name>CannonAttack</Name>
 			<Damage>50.000000</Damage>
 			<DamageType>Siege</DamageType>
-			<MinRange>1.000000</MinRange>
+			<MinRange>2.000000</MinRange>
 			<MaxRange>24.000000</MaxRange>
 			<ROF>6.000000</ROF>
 			<DamageCap>100.000000</DamageCap>
@@ -118861,7 +119015,7 @@
 			<Name>CannonAttack</Name>
 			<Damage>50.000000</Damage>
 			<DamageType>Siege</DamageType>
-			<MinRange>1.000000</MinRange>
+			<MinRange>2.000000</MinRange>
 			<MaxRange>24.000000</MaxRange>
 			<ROF>6.000000</ROF>
 			<DamageCap>100.000000</DamageCap>
@@ -118931,7 +119085,7 @@
 		<Train column="1" page="0" row="0">ypMercFlailiphant</Train>
 		<Train column="3" page="0" row="0">ypSiegeElephant</Train>
 		<Train column="0" page="0" row="0">xpArrowKnight</Train>
-		<Train column="1" page="0" row="0">xpEagleKnight</Train>
+		<Train column="1" page="0" row="0">AbstractJunk</Train>
 		<Train column="2" page="0" row="0">xpJaguarKnight</Train>
 		<Train column="4" page="0" row="0">ypMongolianArmy</Train>
 		<Train column="3" page="0" row="0">ypBlackFlagArmy</Train>
@@ -119020,7 +119174,7 @@
 			<DamageFlags>GAIAEnemy</DamageFlags>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>RangedAttack</Name>
@@ -119032,7 +119186,7 @@
 			<DamageBonus type="AbstractVillager">0.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">1.500000</DamageBonus>
 			<DamageBonus type="AbstractSiegeTrooper">0.500000</DamageBonus>
-			<DamageBonus type="AbstractInfantry">1.500000</DamageBonus>
+			<DamageBonus type="AbstractLightInfantry">1.250000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1587" name="Baron">
@@ -121639,7 +121793,7 @@
 		<DBID>38</DBID>
 		<DisplayNameID>77850</DisplayNameID>
 		<EditorNameID>77850</EditorNameID>
-		<PopulationCount>1</PopulationCount>
+		<PopulationCount>2</PopulationCount>
 		<ObstructionRadiusX>0.7900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.7900</ObstructionRadiusZ>
 		<FormationCategory>Mobile</FormationCategory>
@@ -121911,8 +122065,6 @@
 		<UnitType>ValidIdleVillager</UnitType>
 		<UnitType>AbstractFishingBoat</UnitType>
 		<UnitType>ConvertsHerds</UnitType>
-		<Train column="1" page="6" row="0">Dock</Train>
-		<Train column="1" page="6" row="0">YPDockAsian</Train>
 		<Flag>TieToWaterSurface</Flag>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>DontRotateObstruction</Flag>
@@ -122402,6 +122554,7 @@
 		<Train column="3" page="6" row="0">Mill</Train>
 		<Train column="5" page="6" row="0">LivestockPen</Train>
 		<Train column="6" page="6" row="0">Church</Train>
+		<Train column="6" page="6" row="0">BasilicaIt</Train>
 		<Train column="7" page="6" row="0">Arsenal</Train>
 		<Train column="4" page="6" row="0">Plantation</Train>
 		<Flag>CollidesWithProjectiles</Flag>
@@ -123356,9 +123509,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultit.xml</AnimFile>
@@ -123367,14 +123520,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -123539,7 +123693,6 @@
 		<BuildLimit>5</BuildLimit>
 		<Bounty>40.0000</Bounty>
 		<BuildBounty>40.0000</BuildBounty>
-		<Cost resourcetype="Trade">200.0000</Cost>
 		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
 		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
 		<MaxContained>50</MaxContained>
@@ -123831,6 +123984,7 @@
 		<Train column="3" page="6" row="0">Mill</Train>
 		<Train column="5" page="6" row="0">LivestockPen</Train>
 		<Train column="6" page="6" row="0">Church</Train>
+		<Train column="6" page="6" row="0">BasilicaIt</Train>
 		<Train column="13" page="6" row="0">ArtilleryDepot</Train>
 		<Train column="7" page="6" row="0">Arsenal</Train>
 		<Train column="4" page="6" row="0">Plantation</Train>
@@ -124264,9 +124418,9 @@
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Protected</FormationCategory>
-		<PopulationCount>1</PopulationCount>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>5.5000</MaxRunVelocity>
+		<PopulationCount>0</PopulationCount>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\squad\flag_bearer\flag_bearer_defaultsw.xml</AnimFile>
@@ -124275,14 +124429,15 @@
 		<Icon>units\squad\flag_bearer\flag_bearer_icon</Icon>
 		<PortraitIcon>units\squad\flag_bearer\flag_bearer_portrait</PortraitIcon>
 		<RolloverTextID>77935</RolloverTextID>
-		<ShortRolloverTextID>25632</ShortRolloverTextID>
+		<ShortRolloverTextID>77938</ShortRolloverTextID>
 		<InitialHitpoints>100.0000</InitialHitpoints>
 		<MaxHitpoints>100.0000</MaxHitpoints>
-		<LOS>26.0000</LOS>
+		<LOS>16.0000</LOS>
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>30.0000</TrainPoints>
-		<Bounty>5.0000</Bounty>
-		<BuildBounty>5.0000</BuildBounty>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>10.0000</Bounty>
+		<BuildBounty>10.0000</BuildBounty>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
@@ -124523,7 +124678,7 @@
 		<DBID>1859</DBID>
 		<DisplayNameID>781200</DisplayNameID>
 		<EditorNameID>781200</EditorNameID>
-		<PopulationCount>12</PopulationCount>
+		<PopulationCount>15</PopulationCount>
 		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Body</FormationCategory>
@@ -124544,7 +124699,7 @@
 		<Bounty>120.0000</Bounty>
 		<BuildBounty>120.0000</BuildBounty>
 		<Cost resourcetype="Trade">400.0000</Cost>
-		<AllowedAge>1</AllowedAge>
+		<AllowedAge>2</AllowedAge>
 		<Armor type="Ranged" value="0.2000"/>
 		<UnitType>LogicalTypeHealed</UnitType>
 		<UnitType>LogicalTypeValidSharpshoot</UnitType>
@@ -124858,10 +125013,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
@@ -124871,10 +125026,10 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
@@ -124882,9 +125037,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -124893,9 +125048,9 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -124906,9 +125061,9 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -124917,10 +125072,10 @@
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
@@ -124930,9 +125085,9 @@
 			<MaxRange>16.000000</MaxRange>
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
 			<DamageBonus type="AbstractHeavyInfantry">1.250000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
@@ -124963,8 +125118,8 @@
 		<UnitAIType>Passive</UnitAIType>
 		<TrainPoints>40.0000</TrainPoints>
 		<BuildLimit>1</BuildLimit>
-		<Bounty>52.0000</Bounty>
-		<BuildBounty>52.0000</BuildBounty>
+		<Bounty>20.0000</Bounty>
+		<BuildBounty>20.0000</BuildBounty>
 		<Cost resourcetype="Gold">200.0000</Cost>
 		<AllowedAge>0</AllowedAge>
 		<Armor type="Ranged" value="0.1000"/>
@@ -124987,6 +125142,8 @@
 		<UnitType>CannotConvertHill</UnitType>
 		<Train column="1" page="6" row="0">Factory</Train>
 		<Train column="0" page="6" row="0">FortFrontier</Train>
+		<Train column="6" page="1" row="0">TownCenter</Train>
+		<Train column="7" page="1" row="0">TradingPost</Train>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
 		<Flag>CorpseDecays</Flag>
@@ -125098,8 +125255,8 @@
 		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
 		<FormationCategory>Ranged</FormationCategory>
 		<DeadReplacement>BloodSplat</DeadReplacement>
-		<MaxVelocity>4.5000</MaxVelocity>
-		<MaxRunVelocity>6.5000</MaxRunVelocity>
+		<MaxVelocity>5.5000</MaxVelocity>
+		<MaxRunVelocity>5.5000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<AnimFile>units\infantry_ranged\coutelier\coutelier.xml</AnimFile>
@@ -125109,8 +125266,8 @@
 		<PortraitIcon>units\infantry_ranged\coutelier\coutelier_portrait</PortraitIcon>
 		<RolloverTextID>781165</RolloverTextID>
 		<ShortRolloverTextID>25658</ShortRolloverTextID>
-		<InitialHitpoints>300.0000</InitialHitpoints>
-		<MaxHitpoints>300.0000</MaxHitpoints>
+		<InitialHitpoints>240.0000</InitialHitpoints>
+		<MaxHitpoints>240.0000</MaxHitpoints>
 		<LOS>20.0000</LOS>
 		<ProjectileProtoUnit>Knife</ProjectileProtoUnit>
 		<UnitAIType>RangedCombative</UnitAIType>
@@ -125134,17 +125291,18 @@
 		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
 		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
 		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
-		<UnitType>ConvertsHerds</UnitType>
-		<UnitType>AbstractRangedInfantry</UnitType>
-		<UnitType>AbstractCavalryInfantry</UnitType>
-		<UnitType>CountsTowardMilitaryScore</UnitType>
 		<UnitType>HasBountyValue</UnitType>
 		<UnitType>Ranged</UnitType>
-		<UnitType>AbstractGunpowderTrooper</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>AbstractCavalryInfantry</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>AbstractRangedInfantry</UnitType>
+		<UnitType>Unit</UnitType>
 		<UnitType>UnitClass</UnitType>
 		<UnitType>Military</UnitType>
-		<UnitType>Unit</UnitType>
-		<UnitType>AbstractInfantry</UnitType>
+		<UnitType>AbstractArcher</UnitType>
+		<UnitType>AbstractLightInfantry</UnitType>
+		<UnitType>AbstractJunk</UnitType>
 		<UnitType>Mercenary</UnitType>
 		<Flag>CollidesWithProjectiles</Flag>
 		<Flag>ApplyHandicapTraining</Flag>
@@ -125169,86 +125327,68 @@
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>DefendRangedAttack</Name>
 			<Damage>30.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MinRange>2.000000</MinRange>
-			<MaxRange>16.000000</MaxRange>
+			<MaxRange>12.000000</MaxRange>
 			<ROF>2.000000</ROF>
 			<Projectile>Knife</Projectile>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>MeleeHandAttack</Name>
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerHandAttack</Name>
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>StaggerRangedAttack</Name>
 			<Damage>30.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MinRange>2.000000</MinRange>
-			<MaxRange>16.000000</MaxRange>
+			<MaxRange>12.000000</MaxRange>
 			<ROF>2.000000</ROF>
 			<Projectile>Knife</Projectile>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyHandAttack</Name>
 			<Damage>15.000000</Damage>
 			<DamageType>Hand</DamageType>
 			<ROF>1.500000</ROF>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
 			<Name>VolleyRangedAttack</Name>
 			<Damage>30.000000</Damage>
 			<DamageType>Ranged</DamageType>
 			<MinRange>2.000000</MinRange>
-			<MaxRange>16.000000</MaxRange>
+			<MaxRange>12.000000</MaxRange>
 			<ROF>2.000000</ROF>
 			<Projectile>Knife</Projectile>
-			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
-			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
-			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.000000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1669" name="ypConsulateArmyItalians11">
@@ -125688,11 +125828,11 @@
 		<MaxRunVelocity>6.5000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
-		<AnimFile>units\asians\consulate\skirmisher\skirmisher.xml</AnimFile>
+		<AnimFile>units\infantry_ranged\skarp\skarp.xml</AnimFile>
 		<ImpactType>Flesh</ImpactType>
 		<PhysicsInfo>dude</PhysicsInfo>
-		<Icon>units\infantry_ranged\skirmisher\skirmisher_icon</Icon>
-		<PortraitIcon>units\infantry_ranged\skirmisher\skirmisher_portrait</PortraitIcon>
+		<Icon>units\infantry_ranged\skarp\skarp_icon</Icon>
+		<PortraitIcon>units\infantry_ranged\skarp\skarp_portrait</PortraitIcon>
 		<RolloverTextID>65797</RolloverTextID>
 		<ShortRolloverTextID>65796</ShortRolloverTextID>
 		<InitialHitpoints>125.0000</InitialHitpoints>
@@ -125757,8 +125897,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -125770,8 +125910,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -125781,8 +125921,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -125792,8 +125932,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -125805,8 +125945,8 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -125816,8 +125956,8 @@
 			<ROF>1.500000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 		<ProtoAction>
@@ -125829,19 +125969,19 @@
 			<ROF>3.000000</ROF>
 			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
 			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
-			<DamageBonus type="xpEagleKnight">2.000000</DamageBonus>
-			<DamageBonus type="xpCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
 			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
 		</ProtoAction>
 	</Unit>
 	<Unit id="1676" name="Zebra">
 		<DBID>299</DBID>
 		<DisplayNameID>781262</DisplayNameID>
-		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
-		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<ObstructionRadiusX>0.6900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.6900</ObstructionRadiusZ>
 		<IdleTimeout>5.0000</IdleTimeout>
-		<MaxVelocity>2.0000</MaxVelocity>
-		<MaxRunVelocity>4.0000</MaxRunVelocity>
+		<MaxVelocity>4.5000</MaxVelocity>
+		<MaxRunVelocity>6.5000</MaxRunVelocity>
 		<MovementType>land</MovementType>
 		<TurnRate>18.0000</TurnRate>
 		<WanderDistance>4</WanderDistance>
@@ -125894,4 +126034,1165 @@
 			<Rate type="AbstractShrine">0.070000</Rate>
 		</ProtoAction>
 	</Unit>
+	<Unit id="1677" name="ypConsulateFalconet2">
+		<DBID>1812</DBID>
+		<DisplayNameID>780991</DisplayNameID>
+		<EditorNameID>780991</EditorNameID>
+		<PopulationCount>5</PopulationCount>
+		<ObstructionRadiusX>0.9900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.9900</ObstructionRadiusZ>
+		<FormationCategory>Protected</FormationCategory>
+		<DeadReplacement>BloodSplat</DeadReplacement>
+		<MaxVelocity>4.0000</MaxVelocity>
+		<MaxRunVelocity>6.0000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>3.0000</TurnRate>
+		<AnimFile>units\asians\consulate\falconet\falconet.xml</AnimFile>
+		<ImpactType>Wood</ImpactType>
+		<Icon>units\artillery\falconet\falconet_icon_64x64</Icon>
+		<PortraitIcon>units\artillery\falconet\falconet_portrait</PortraitIcon>
+		<RolloverTextID>65381</RolloverTextID>
+		<ShortRolloverTextID>65380</ShortRolloverTextID>
+		<InitialHitpoints>200.0000</InitialHitpoints>
+		<MaxHitpoints>200.0000</MaxHitpoints>
+		<LOS>30.0000</LOS>
+		<ProjectileProtoUnit>Cannonball</ProjectileProtoUnit>
+		<UnitAIType>RangedCombative</UnitAIType>
+		<TrainPoints>45.0000</TrainPoints>
+		<Bounty>50.0000</Bounty>
+		<BuildBounty>50.0000</BuildBounty>
+		<Cost resourcetype="Food">100.0000</Cost>
+		<Cost resourcetype="Gold">400.0000</Cost>
+		<AllowedAge>2</AllowedAge>
+		<Armor type="Ranged" value="0.7500"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>AbstractConsulateSiegeFortress</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>Ranged</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>AbstractArtillery</UnitType>
+		<Flag>RotateInPlace</Flag>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>ConstrainOrientation</Flag>
+		<Flag>OrientUnitWithGround</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Command column="0" page="9">Tactic4</Command>
+		<Command column="1" page="9">Tactic3</Command>
+		<Tactics>falconet.tactics</Tactics>
+		<ProtoAction>
+			<Name>CannonAttack</Name>
+			<Damage>100.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>26.000000</MaxRange>
+			<ROF>4.000000</ROF>
+			<DamageCap>200.000000</DamageCap>
+			<DamageBonus type="AbstractInfantry">3.000000</DamageBonus>
+			<DamageArea>3.000000</DamageArea>
+			<DamageFlags>GAIAEnemy</DamageFlags>
+			<DamageBonus type="Building">2.000000</DamageBonus>
+			<DamageBonus type="Ship">3.000000</DamageBonus>
+			<DamageBonus type="xpArrowKnight">0.500000</DamageBonus>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1678" name="SharpshooterS">
+		<DBID>42</DBID>
+		<DisplayNameID>781224</DisplayNameID>
+		<EditorNameID>781224</EditorNameID>
+		<PopulationCount>1</PopulationCount>
+		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<FormationCategory>Ranged</FormationCategory>
+		<DeadReplacement>BloodSplat</DeadReplacement>
+		<MaxVelocity>4.5000</MaxVelocity>
+		<MaxRunVelocity>6.5000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\infantry_ranged\skarp\skarps.xml</AnimFile>
+		<ImpactType>Flesh</ImpactType>
+		<PhysicsInfo>dude</PhysicsInfo>
+		<Icon>units\infantry_ranged\skarp\skarp_icon</Icon>
+		<PortraitIcon>units\infantry_ranged\skarp\skarp_portrait</PortraitIcon>
+		<RolloverTextID>65797</RolloverTextID>
+		<ShortRolloverTextID>65796</ShortRolloverTextID>
+		<InitialHitpoints>125.0000</InitialHitpoints>
+		<MaxHitpoints>125.0000</MaxHitpoints>
+		<LOS>26.0000</LOS>
+		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
+		<UnitAIType>RangedCombative</UnitAIType>
+		<TrainPoints>33.0000</TrainPoints>
+		<Bounty>12.0000</Bounty>
+		<BuildBounty>12.0000</BuildBounty>
+		<Cost resourcetype="Food">50.0000</Cost>
+		<Cost resourcetype="Gold">65.0000</Cost>
+		<AllowedAge>2</AllowedAge>
+		<Armor type="Ranged" value="0.3000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>AbstractGunpowderTrooper</UnitType>
+		<UnitType>Ranged</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>AbstractCavalryInfantry</UnitType>
+		<UnitType>AbstractRangedInfantry</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>AbstractConsulateUnit</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>AbstractInfantry</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Tactics>rifleman.tactics</Tactics>
+		<ProtoAction>
+			<Name>BuildingAttack</Name>
+			<Damage>12.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>DefendHandAttack</Name>
+			<Damage>6.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>DefendRangedAttack</Name>
+			<Damage>15.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>22.000000</MaxRange>
+			<ROF>3.000000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>MeleeHandAttack</Name>
+			<Damage>6.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>StaggerHandAttack</Name>
+			<Damage>6.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>StaggerRangedAttack</Name>
+			<Damage>15.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>22.000000</MaxRange>
+			<ROF>3.000000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>VolleyHandAttack</Name>
+			<Damage>6.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>VolleyRangedAttack</Name>
+			<Damage>15.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>22.000000</MaxRange>
+			<ROF>3.000000</ROF>
+			<DamageBonus type="AbstractHeavyInfantry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractLightCavalry">2.000000</DamageBonus>
+			<DamageBonus type="AbstractJunk">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">0.750000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">0.750000</DamageBonus>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1679" name="BrigEx">
+		<DBID>10</DBID>
+		<DisplayNameID>780924</DisplayNameID>
+		<EditorNameID>780924</EditorNameID>
+		<ObstructionRadiusX>1.5900</ObstructionRadiusX>
+		<ObstructionRadiusZ>1.5900</ObstructionRadiusZ>
+		<FormationCategory>Ranged</FormationCategory>
+		<MaxVelocity>8.5000</MaxVelocity>
+		<MaxRunVelocity>10.5000</MaxRunVelocity>
+		<MovementType>water</MovementType>
+		<TurnRate>4.0000</TurnRate>
+		<AnimFile>units\naval\privateer\privateerex.xml</AnimFile>
+		<ImpactType>Wood</ImpactType>
+		<PhysicsInfo>house</PhysicsInfo>
+		<Icon>units\naval\privateer\privateer_icon_64x64</Icon>
+		<PortraitIcon>units\naval\privateer\privateer_icon_portrait</PortraitIcon>
+		<RolloverTextID>780925</RolloverTextID>
+		<ShortRolloverTextID>780926</ShortRolloverTextID>
+		<InitialHitpoints>850.0000</InitialHitpoints>
+		<MaxHitpoints>850.0000</MaxHitpoints>
+		<LOS>26.0000</LOS>
+		<ProjectileProtoUnit>Cannonball</ProjectileProtoUnit>
+		<AutoAttackRange>18.0000</AutoAttackRange>
+		<UnitAIType>RangedCombative</UnitAIType>
+		<TrainPoints>30.0000</TrainPoints>
+		<BuildLimit>5</BuildLimit>
+		<Bounty>40.0000</Bounty>
+		<BuildBounty>40.0000</BuildBounty>
+		<CarryCapacity resourcetype="Food">1.0000</CarryCapacity>
+		<CarryCapacity resourcetype="Gold">1.0000</CarryCapacity>
+		<MaxContained>50</MaxContained>
+		<AllowedAge>1</AllowedAge>
+		<Decay delay="0.0000" duration="0.0000"/>
+		<Armor type="Ranged" value="0.5000"/>
+		<UnitType>LogicalTypeNavalMilitary</UnitType>
+		<UnitType>LogicalTypeValidSabotage</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeShipsAndBuildings</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>AbstractWarShip</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>Ranged</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>Ship</UnitType>
+		<UnitType>Transport</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>Hero</UnitType>
+		<Train column="1" page="6" row="0">Dock</Train>
+		<Train column="1" page="6" row="0">YPDockAsian</Train>
+		<Flag>HeroName1</Flag>
+		<Flag>HasGatherPoint</Flag>
+		<Flag>TieToWaterSurface</Flag>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>DecalStickToWaterSurface</Flag>
+		<Flag>NoFadeOnDeath</Flag>
+		<Flag>FadeOutDecalOnDeath</Flag>
+		<Flag>NoBloodOnDeath</Flag>
+		<Flag>AllowAutoGarrison</Flag>
+		<Flag>ObscuresUnits</Flag>
+		<Flag>ForceBuildingData</Flag>
+		<Flag>NavalUnit</Flag>
+		<Flag>Tracked</Flag>
+		<Flag>KnockoutDeath</Flag>
+		<Flag>NotDeleteable</Flag>
+		<Contain>LogicalTypeGarrisonInShips</Contain>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="2" page="10">Stop</Command>
+		<Command column="3" page="10">Delete</Command>
+		<Command column="0" page="11">Abilities</Command>
+		<Command column="1" page="10">Eject</Command>
+		<Command column="0" page="10">SetGatherPointMilitary</Command>
+		<Tactics>caravelex.tactics</Tactics>
+		<ProtoAction>
+			<Name>BroadsideAttack</Name>
+			<Damage>40.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<MaxRange>20.000000</MaxRange>
+			<ROF>0.050000</ROF>
+			<DamageCap>80.000000</DamageCap>
+			<DamageBonus type="Ship">2.000000</DamageBonus>
+			<DamageArea>1.000000</DamageArea>
+			<DamageFlags>GAIAEnemy</DamageFlags>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>Gather</Name>
+			<Rate type="AbstractFish">0.400000</Rate>
+			<Rate type="AbstractWhale">0.250000</Rate>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>RangedAttack</Name>
+			<Damage>60.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<MaxRange>20.000000</MaxRange>
+			<ROF>2.000000</ROF>
+			<DamageCap>120.000000</DamageCap>
+			<DamageBonus type="AbstractArtillery">0.500000</DamageBonus>
+			<DamageArea>1.000000</DamageArea>
+			<DamageFlags>GAIAEnemy</DamageFlags>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>Build</Name>
+			<Rate type="Building">0.500000</Rate>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1680" name="PistolS">
+		<DBID>120</DBID>
+		<DisplayNameID>781281</DisplayNameID>
+		<EditorNameID>781281</EditorNameID>
+		<PopulationCount>1</PopulationCount>
+		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<FormationCategory>Mobile</FormationCategory>
+		<DeadReplacement>BloodSplat</DeadReplacement>
+		<MaxVelocity>6.5000</MaxVelocity>
+		<MaxRunVelocity>8.5000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\cavalry\pistols\pistols_horse.xml</AnimFile>
+		<ImpactType>Flesh</ImpactType>
+		<PhysicsInfo>cav</PhysicsInfo>
+		<Icon>units\cavalry\pistols\texasranger</Icon>
+		<PortraitIcon>units\cavalry\pistols\texasrangerBIG</PortraitIcon>
+		<RolloverTextID>781288</RolloverTextID>
+		<ShortRolloverTextID>25703</ShortRolloverTextID>
+		<InitialHitpoints>125.0000</InitialHitpoints>
+		<MaxHitpoints>125.0000</MaxHitpoints>
+		<LOS>16.0000</LOS>
+		<ProjectileProtoUnit>InvisibleProjectile</ProjectileProtoUnit>
+		<UnitAIType>RangedCombative</UnitAIType>
+		<TrainPoints>30.0000</TrainPoints>
+		<Bounty>8.0000</Bounty>
+		<BuildBounty>8.0000</BuildBounty>
+		<Cost resourcetype="Food">30.0000</Cost>
+		<Cost resourcetype="Gold">55.0000</Cost>
+		<AllowedAge>1</AllowedAge>
+		<Armor type="Ranged" value="0.2000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>AbstractCavalry</UnitType>
+		<UnitType>AbstractLightCavalry</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>Ranged</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>AbstractCavalryInfantry</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>AbstractRangedCavalry</UnitType>
+		<UnitType>AbstractGunpowderCavalry</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Tactics>musketCavalry.tactics</Tactics>
+		<ProtoAction>
+			<Name>BuildingAttack</Name>
+			<Damage>5.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>DefendRangedAttack</Name>
+			<Damage>10.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MaxRange>12.000000</MaxRange>
+			<ROF>3.000000</ROF>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
+			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.250000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>MeleeHandAttack</Name>
+			<Damage>6.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.250000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>StaggerRangedAttack</Name>
+			<Damage>10.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MaxRange>12.000000</MaxRange>
+			<ROF>3.000000</ROF>
+			<DamageBonus type="AbstractHeavyCavalry">3.000000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
+			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">2.250000</DamageBonus>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1681" name="AxemanS">
+		<DisplayNameID>781296</DisplayNameID>
+		<EditorNameID>781296</EditorNameID>
+		<PopulationCount>2</PopulationCount>
+		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<FormationCategory>Body</FormationCategory>
+		<DeadReplacement>BloodSplat</DeadReplacement>
+		<MaxVelocity>4.5000</MaxVelocity>
+		<MaxRunVelocity>6.5000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\infantry\poleaxeman\poleaxeman.xml</AnimFile>
+		<ImpactType>Flesh</ImpactType>
+		<PhysicsInfo>dude</PhysicsInfo>
+		<Icon>units\infantry\poleaxeman\poleaxeman_icon</Icon>
+		<PortraitIcon>units\infantry\poleaxeman\poleaxeman_portrait</PortraitIcon>
+		<SelectionPriority>20</SelectionPriority>
+		<RolloverTextID>78011</RolloverTextID>
+		<ShortRolloverTextID>25696</ShortRolloverTextID>
+		<InitialHitpoints>340.0000</InitialHitpoints>
+		<MaxHitpoints>340.0000</MaxHitpoints>
+		<LOS>14.0000</LOS>
+		<UnitAIType>HandCombative</UnitAIType>
+		<TrainPoints>40.0000</TrainPoints>
+		<Bounty>20.0000</Bounty>
+		<BuildBounty>20.0000</BuildBounty>
+		<Cost resourcetype="Gold">200.0000</Cost>
+		<AllowedAge>2</AllowedAge>
+		<Armor type="Hand" value="0.4000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>AbstractHandInfantry</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>AbstractCavalryInfantry</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>AbstractInfantry</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>AbstractHeavyInfantry</UnitType>
+		<UnitType>Mercenary</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="2" page="10">Delete</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Tactics>pikeman.tactics</Tactics>
+		<ProtoAction>
+			<Name>BuildingAttack</Name>
+			<Damage>50.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>CoverBuildingAttack</Name>
+			<Damage>25.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>CoverHandAttack</Name>
+			<Damage>15.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageCap>30.000000</DamageCap>
+			<DamageArea>1.000000</DamageArea>
+			<DamageFlags>GAIAEnemy</DamageFlags>
+			<DamageBonus type="AbstractLightInfantry">2.250000</DamageBonus>
+			<DamageBonus type="Building">0.000000</DamageBonus>
+			<DamageBonus type="Tree">0.000000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">3.000000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>DefendHandAttack</Name>
+			<Damage>30.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageCap>60.000000</DamageCap>
+			<DamageArea>1.000000</DamageArea>
+			<DamageFlags>GAIAEnemy</DamageFlags>
+			<DamageBonus type="AbstractLightInfantry">2.250000</DamageBonus>
+			<DamageBonus type="Building">0.000000</DamageBonus>
+			<DamageBonus type="Tree">0.000000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">3.000000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>MeleeHandAttack</Name>
+			<Damage>30.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageCap>60.000000</DamageCap>
+			<DamageArea>1.000000</DamageArea>
+			<DamageFlags>GAIAEnemy</DamageFlags>
+			<DamageBonus type="AbstractLightInfantry">2.250000</DamageBonus>
+			<DamageBonus type="Building">0.000000</DamageBonus>
+			<DamageBonus type="Tree">0.000000</DamageBonus>
+			<DamageBonus type="AbstractCavalry">3.000000</DamageBonus>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1682" name="SwedishArmy11">
+		<DBID>1859</DBID>
+		<DisplayNameID>781200</DisplayNameID>
+		<EditorNameID>781200</EditorNameID>
+		<PopulationCount>15</PopulationCount>
+		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<FormationCategory>Body</FormationCategory>
+		<MaxVelocity>7.0000</MaxVelocity>
+		<MaxRunVelocity>9.0000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\asians\mercenaries\redcoat\redcoat.xml</AnimFile>
+		<PhysicsInfo>dude</PhysicsInfo>
+		<Icon>ui\armies\swedish_sakers</Icon>
+		<PortraitIcon>ui\armies\swedish_sakers</PortraitIcon>
+		<RolloverTextID>781203</RolloverTextID>
+		<ShortRolloverTextID>25649</ShortRolloverTextID>
+		<InitialHitpoints>400.0000</InitialHitpoints>
+		<MaxHitpoints>400.0000</MaxHitpoints>
+		<LOS>9.0000</LOS>
+		<TrainPoints>20.0000</TrainPoints>
+		<Bounty>120.0000</Bounty>
+		<BuildBounty>120.0000</BuildBounty>
+		<Cost resourcetype="Trade">400.0000</Cost>
+		<AllowedAge>2</AllowedAge>
+		<Armor type="Ranged" value="0.2000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>AbstractConsulateUnit</UnitType>
+		<UnitType>AbstractConsulateUnitColonial</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>Ranged</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>AllowOverPopCap</Flag>
+		<Flag>NotPlayerPlaceable</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Tactics>bannerArmy.tactics</Tactics>
+		<ProtoAction>
+			<Name>VolleyRangedAttack</Name>
+			<Damage>40.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>16.000000</MaxRange>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1683" name="SwedishArmy22">
+		<DBID>1859</DBID>
+		<DisplayNameID>781201</DisplayNameID>
+		<EditorNameID>78046</EditorNameID>
+		<PopulationCount>14</PopulationCount>
+		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<FormationCategory>Body</FormationCategory>
+		<MaxVelocity>7.0000</MaxVelocity>
+		<MaxRunVelocity>9.0000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\asians\mercenaries\redcoat\redcoat.xml</AnimFile>
+		<PhysicsInfo>dude</PhysicsInfo>
+		<Icon>ui\armies\swedish_saker_riflemen</Icon>
+		<PortraitIcon>ui\armies\swedish_saker_riflemen</PortraitIcon>
+		<RolloverTextID>781225</RolloverTextID>
+		<ShortRolloverTextID>25649</ShortRolloverTextID>
+		<InitialHitpoints>400.0000</InitialHitpoints>
+		<MaxHitpoints>400.0000</MaxHitpoints>
+		<LOS>9.0000</LOS>
+		<TrainPoints>40.0000</TrainPoints>
+		<Bounty>80.0000</Bounty>
+		<BuildBounty>80.0000</BuildBounty>
+		<Cost resourcetype="Trade">800.0000</Cost>
+		<AllowedAge>2</AllowedAge>
+		<Armor type="Ranged" value="0.2000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>AbstractConsulateUnit</UnitType>
+		<UnitType>AbstractConsulateUnitColonial</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>Ranged</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>AllowOverPopCap</Flag>
+		<Flag>NotPlayerPlaceable</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Tactics>bannerArmy.tactics</Tactics>
+		<ProtoAction>
+			<Name>VolleyRangedAttack</Name>
+			<Damage>40.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>16.000000</MaxRange>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1684" name="SwedishArmy33">
+		<DBID>1859</DBID>
+		<DisplayNameID>781202</DisplayNameID>
+		<EditorNameID>78050</EditorNameID>
+		<PopulationCount>20</PopulationCount>
+		<ObstructionRadiusX>0.4900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.4900</ObstructionRadiusZ>
+		<FormationCategory>Body</FormationCategory>
+		<MaxVelocity>7.0000</MaxVelocity>
+		<MaxRunVelocity>9.0000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\asians\mercenaries\redcoat\redcoat.xml</AnimFile>
+		<PhysicsInfo>dude</PhysicsInfo>
+		<Icon>ui\armies\swedish_rifleman_horses</Icon>
+		<PortraitIcon>ui\units\swedish_rifleman_horses</PortraitIcon>
+		<RolloverTextID>781226</RolloverTextID>
+		<ShortRolloverTextID>25649</ShortRolloverTextID>
+		<InitialHitpoints>400.0000</InitialHitpoints>
+		<MaxHitpoints>400.0000</MaxHitpoints>
+		<LOS>9.0000</LOS>
+		<TrainPoints>60.0000</TrainPoints>
+		<Bounty>160.0000</Bounty>
+		<BuildBounty>160.0000</BuildBounty>
+		<Cost resourcetype="Trade">1600.0000</Cost>
+		<AllowedAge>2</AllowedAge>
+		<Armor type="Ranged" value="0.2000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>AbstractConsulateUnit</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>Ranged</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>AllowOverPopCap</Flag>
+		<Flag>NotPlayerPlaceable</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Tactics>bannerArmy.tactics</Tactics>
+		<ProtoAction>
+			<Name>VolleyRangedAttack</Name>
+			<Damage>40.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MinRange>2.000000</MinRange>
+			<MaxRange>16.000000</MaxRange>
+			<ROF>3.000000</ROF>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1685" name="BasilicaIt">
+		<DBID>29</DBID>
+		<DisplayNameID>781313</DisplayNameID>
+		<EditorNameID>781313</EditorNameID>
+		<ObstructionRadiusX>6.0000</ObstructionRadiusX>
+		<ObstructionRadiusZ>6.0000</ObstructionRadiusZ>
+		<MaxVelocity>0.0000</MaxVelocity>
+		<MovementType>land</MovementType>
+		<AnimFile>buildings\great_basilica\great_basilica.xml</AnimFile>
+		<DeadReplacement>BuildingRubble4x4</DeadReplacement>
+		<DeadReplacementLifespan>15</DeadReplacementLifespan>
+		<ImpactType>Stone</ImpactType>
+		<PhysicsInfo>house</PhysicsInfo>
+		<PlacementFile>buildinglarge.xml</PlacementFile>
+		<Icon>buildings\church\church_icon</Icon>
+		<PortraitIcon>buildings\church\church_portrait</PortraitIcon>
+		<RolloverTextID>22927</RolloverTextID>
+		<ShortRolloverTextID>25620</ShortRolloverTextID>
+		<InitialHitpoints>2000.0000</InitialHitpoints>
+		<MaxHitpoints>2000.0000</MaxHitpoints>
+		<LOS>12.0000</LOS>
+		<BuildPoints>35.0000</BuildPoints>
+		<BuildLimit>1</BuildLimit>
+		<Bounty>40.0000</Bounty>
+		<BuildBounty>20.0000</BuildBounty>
+		<Cost resourcetype="Wood">200.0000</Cost>
+		<BuildingWorkRate>1.0000</BuildingWorkRate>
+		<AllowedAge>1</AllowedAge>
+		<Armor type="Siege" value="0.0000"/>
+		<UnitType>LogicalTypeValidSabotage</UnitType>
+		<UnitType>LogicalTypeMinimapFilterEconomic</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeBuildingsNotWalls</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeShipsAndBuildings</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeBuildingsNotWallsOrGroves</UnitType>
+		<UnitType>ColonyBuilding</UnitType>
+		<UnitType>BuildingClass</UnitType>
+		<UnitType>Economic</UnitType>
+		<UnitType>Building</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<UnitType>CountsTowardEconomicScore</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<Train column="0" page="0" row="0">Inquisitor</Train>
+		<Train column="0" page="0" row="0">Imam</Train>
+		<Train column="0" page="0" row="0">Missionary</Train>
+		<Train column="0" page="0" row="0">Priest</Train>
+		<Train column="2" page="0" row="0">Pilgrim</Train>
+		<Train column="3" page="0" row="0">Architect</Train>
+		<Tech column="0" page="1" row="0">ChurchMissionFervor</Tech>
+		<Tech column="1" page="1" row="0">ChurchStateReligion</Tech>
+		<Tech column="2" page="1" row="0">ChurchGasLighting</Tech>
+		<Tech column="3" page="1" row="0">ChurchMercantilism</Tech>
+		<Tech column="7" page="1" row="0">UniqueSPCCorsolet</Tech>
+		<Tech column="9" page="1" row="0">UniqueSPCHighCrusade</Tech>
+		<Tech column="7" page="1" row="0">UniqueSPCIndianFriendship</Tech>
+		<Tech column="8" page="1" row="0">UniqueSPCTaxBurden</Tech>
+		<Tech column="9" page="1" row="0">UniqueSPCCustomizedMercWeapons</Tech>
+		<Tech column="7" page="1" row="0">UniqueSPCPatriots</Tech>
+		<Tech column="22" page="1" row="0">HCPatriots</Tech>
+		<Tech column="8" page="1" row="0">ChurchMilletSystem</Tech>
+		<Tech column="8" page="1" row="0">ChurchKopruluViziers</Tech>
+		<Tech column="8" page="1" row="0">ChurchAbbassidMarket</Tech>
+		<Tech column="9" page="1" row="0">ChurchGalataTowerDistrict</Tech>
+		<Tech column="9" page="1" row="0">ChurchTopkapi</Tech>
+		<Tech column="9" page="1" row="0">ChurchTanzimat</Tech>
+		<Tech column="4" page="1" row="0">ChurchStandingArmy</Tech>
+		<Tech column="5" page="1" row="0">ChurchMassCavalry</Tech>
+		<Tech column="19" page="1" row="0">ChurchGardeImperial1</Tech>
+		<Tech column="19" page="1" row="0">ChurchGardeImperial2</Tech>
+		<Tech column="20" page="1" row="0">ChurchZweihander</Tech>
+		<Tech column="19" page="1" row="0">ChurchQuatrefage</Tech>
+		<Tech column="18" page="1" row="0">ChurchWesternization</Tech>
+		<Tech column="18" page="1" row="0">ChurchThinRedLine</Tech>
+		<Tech column="20" page="1" row="0">ChurchTowerAndSword</Tech>
+		<Tech column="18" page="1" row="0">ChurchTillysDiscipline</Tech>
+		<Tech column="21" page="1" row="0">ChurchTopcuCorps</Tech>
+		<Tech column="20" page="1" row="0">ChurchTufanciCorps</Tech>
+		<Tech column="19" page="1" row="0">ChurchBestieros</Tech>
+		<Tech column="19" page="1" row="0">ChurchKalmucks</Tech>
+		<Tech column="18" page="1" row="0">ChurchCoffeeTrade</Tech>
+		<Tech column="20" page="1" row="0">ChurchRogersRangers</Tech>
+		<Tech column="20" page="1" row="0">ChurchWildGeeseSpanish</Tech>
+		<Tech column="18" page="1" row="0">ChurchCodeNapoleon</Tech>
+		<Tech column="18" page="1" row="0">ChurchEconmediaManor</Tech>
+		<Tech column="20" page="1" row="0">ChurchStadholders</Tech>
+		<Tech column="19" page="1" row="0">ChurchWallensteinsContracts</Tech>
+		<Tech column="19" page="1" row="0">ChurchWaardgelders</Tech>
+		<Tech column="20" page="1" row="0">ChurchBashkirPonies</Tech>
+		<Tech column="18" page="1" row="0">ChurchCorsolet</Tech>
+		<Tech column="19" page="1" row="0">ChurchGardeImperial3</Tech>
+		<Tech column="19" page="1" row="0">ChurchBlackWatch</Tech>
+		<Tech column="19" page="1" row="0">ChurchBlackWatchXP</Tech>
+		<Tech column="18" page="1" row="0">UniqueUSTradingPosts</Tech>
+		<Tech column="19" page="1" row="0">UniqueSPCGrandEncampment</Tech>
+		<Tech column="20" page="1" row="0">UniqueSPCCustomizedMercWeaponsUS</Tech>
+		<Tech column="19" page="1" row="0">CannonPop</Tech>
+		<Tech column="20" page="1" row="0">ChurchTies</Tech>
+		<Tech column="19" page="1" row="0">SacredDecree</Tech>
+		<Tech column="20" page="1" row="0">VenetianGothic</Tech>
+		<Tech column="21" page="1" row="0">FameArmies</Tech>
+		<Tech column="21" page="1" row="0">ChurchFortifiedWalls</Tech>
+		<Tech column="20" page="1" row="0">ChurchLumberCamp</Tech>
+		<Tech column="19" page="1" row="0">ChurchAxe</Tech>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>StartsAtFullEfficiency</Flag>
+		<Flag>Immoveable</Flag>
+		<Flag>NoBloodOnDeath</Flag>
+		<Flag>ObscuresUnits</Flag>
+		<Flag>NonAutoFormedUnit</Flag>
+		<Flag>Doppled</Flag>
+		<Flag>SelectWithObstruction</Flag>
+		<Flag>PaintTextureWhenPlacing</Flag>
+		<Flag>FlattenGround</Flag>
+		<Flag>ColonyBuilding</Flag>
+		<Flag>ColonyPlacementL</Flag>
+		<Flag>HasGatherPoint</Flag>
+		<Flag>Tracked</Flag>
+		<Flag>TileAlignPlacement</Flag>
+		<Flag>UnlimitedSupply</Flag>
+		<Flag>InitialGarrisonOnly</Flag>
+		<Flag>HeroName2</Flag>
+		<Command column="1" page="10">Delete</Command>
+		<Command column="0" page="10">SetGatherPointMilitary</Command>
+		<Tactics>holyb.tactics</Tactics>
+		<ProtoAction>
+			<Name>Autogather</Name>
+			<Rate type="XP">0.000000</Rate>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>AutogatherCoin</Name>
+			<Rate type="Gold">0.000000</Rate>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>Heal</Name>
+			<Rate type="LogicalTypeHealed">5.000000</Rate>
+		</ProtoAction>
+	</Unit>
+	<Unit id="1686" name="TreePlymouth">
+		<DBID>491</DBID>
+		<DisplayNameID>29108</DisplayNameID>
+		<EditorNameID>29109</EditorNameID>
+		<ObstructionRadiusX>1.0000</ObstructionRadiusX>
+		<ObstructionRadiusZ>1.0000</ObstructionRadiusZ>
+		<MaxVelocity>0.0000</MaxVelocity>
+		<MovementType>land</MovementType>
+		<AnimFile>terrain\tree_plymouth.xml</AnimFile>
+		<ImpactType>Wood</ImpactType>
+		<Icon>terrain\trees\tree_icon_64</Icon>
+		<PortraitIcon>terrain\trees\tree_icon_portrait</PortraitIcon>
+		<RolloverTextID>29107</RolloverTextID>
+		<ShortRolloverTextID>29106</ShortRolloverTextID>
+		<InitialHitpoints>6.0000</InitialHitpoints>
+		<MaxHitpoints>6.0000</MaxHitpoints>
+		<Bounty>0.0000</Bounty>
+		<InitialResource resourcetype="Wood">300.0000</InitialResource>
+		<ResourceSubType>Wood</ResourceSubType>
+		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
+		<GathererLimit>8</GathererLimit>
+		<Armor type="Siege" value="0.9000"/>
+		<UnitType>LogicalTypeMinimapFilterEconomic</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeVillagersRespondToAttack</UnitType>
+		<UnitType>HuntedResource</UnitType>
+		<UnitType>Resource</UnitType>
+		<UnitType>NatureClass</UnitType>
+		<UnitType>Nature</UnitType>
+		<UnitType>Tree</UnitType>
+		<UnitType>Wood</UnitType>
+		<Flag>ObscuresUnits</Flag>
+		<Flag>NoHPBar</Flag>
+		<Flag>NoBloodOnDeath</Flag>
+		<Flag>DoNotDieAtZeroHitpoints</Flag>
+		<Flag>NonAutoFormedUnit</Flag>
+		<Flag>DoNotCreateUnitGroupAutomatically</Flag>
+		<Flag>Immoveable</Flag>
+		<Flag>Doppled</Flag>
+		<Flag>ForceToGaia</Flag>
+		<Flag>DieAtZeroResources</Flag>
+		<Flag>StartOnNoUpdate</Flag>
+		<Flag>DoNotValidateResourceInventory</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>DoppleOnlyWhenDead</Flag>
+		<Flag>NoIdleActions</Flag>
+		<Flag>RMCanRotate</Flag>
+		<Flag>Tracked</Flag>
+	</Unit>
+	<Unit id="1687" name="ypTreeIndo">
+		<DBID>1575</DBID>
+		<DisplayNameID>63371</DisplayNameID>
+		<EditorNameID>63372</EditorNameID>
+		<ObstructionRadiusX>1.0000</ObstructionRadiusX>
+		<ObstructionRadiusZ>1.0000</ObstructionRadiusZ>
+		<MaxVelocity>0.0000</MaxVelocity>
+		<MovementType>land</MovementType>
+		<AnimFile>terrain\tree_indo.xml</AnimFile>
+		<ImpactType>Wood</ImpactType>
+		<Icon>terrain\trees\tree_icon_64</Icon>
+		<PortraitIcon>terrain\trees\tree_icon_portrait</PortraitIcon>
+		<RolloverTextID>63370</RolloverTextID>
+		<ShortRolloverTextID>63369</ShortRolloverTextID>
+		<InitialHitpoints>6.0000</InitialHitpoints>
+		<MaxHitpoints>6.0000</MaxHitpoints>
+		<Bounty>0.0000</Bounty>
+		<InitialResource resourcetype="Wood">300.0000</InitialResource>
+		<ResourceSubType>Wood</ResourceSubType>
+		<MinimapColor blue="0.1800" green="0.2500" red="0.1900"/>
+		<GathererLimit>8</GathererLimit>
+		<Armor type="Siege" value="0.9000"/>
+		<UnitType>LogicalTypeMinimapFilterEconomic</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeVillagersRespondToAttack</UnitType>
+		<UnitType>HuntedResource</UnitType>
+		<UnitType>Resource</UnitType>
+		<UnitType>Tree</UnitType>
+		<UnitType>Wood</UnitType>
+		<UnitType>Nature</UnitType>
+		<UnitType>NatureClass</UnitType>
+		<Flag>ObscuresUnits</Flag>
+		<Flag>NoHPBar</Flag>
+		<Flag>NoBloodOnDeath</Flag>
+		<Flag>DoNotDieAtZeroHitpoints</Flag>
+		<Flag>NonAutoFormedUnit</Flag>
+		<Flag>DoNotCreateUnitGroupAutomatically</Flag>
+		<Flag>Immoveable</Flag>
+		<Flag>Doppled</Flag>
+		<Flag>ForceToGaia</Flag>
+		<Flag>DieAtZeroResources</Flag>
+		<Flag>StartOnNoUpdate</Flag>
+		<Flag>DoNotValidateResourceInventory</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>DoppleOnlyWhenDead</Flag>
+		<Flag>NoIdleActions</Flag>
+		<Flag>RMCanRotate</Flag>
+		<Flag>Tracked</Flag>
+	</Unit>
+	<Unit id="1688" name="UnderbrushAus">
+		<DBID>976</DBID>
+		<DisplayNameID>36870</DisplayNameID>
+		<EditorNameID>36871</EditorNameID>
+		<ObstructionRadiusX>1.0000</ObstructionRadiusX>
+		<ObstructionRadiusZ>1.0000</ObstructionRadiusZ>
+		<MaxVelocity>0.0000</MaxVelocity>
+		<MovementType>land</MovementType>
+		<AnimFile>terrain\underbrush\underbrush_aus.xml</AnimFile>
+		<UnitType>EmbellishmentClass</UnitType>
+		<Flag>NoHPBar</Flag>
+		<Flag>Immoveable</Flag>
+		<Flag>NoBloodOnDeath</Flag>
+		<Flag>NonAutoFormedUnit</Flag>
+		<Flag>VisibleUnderFog</Flag>
+		<Flag>ForceToGaia</Flag>
+		<Flag>NotSelectable</Flag>
+		<Flag>NoUnitAI</Flag>
+		<Flag>StartOnNoUpdate</Flag>
+		<Flag>DoNotShowOnMiniMap</Flag>
+		<Flag>NoIdleActions</Flag>
+		<Flag>DoNotCreateUnitGroupAutomatically</Flag>
+		<Flag>RMCanRotate</Flag>
+		<Flag>NonCollideable</Flag>
+		<Flag>DestroyUnderBuilding</Flag>
+	</Unit>
+	<Unit id="1689" name="CamelArcher">
+		<DBID>67</DBID>
+		<DisplayNameID>781331</DisplayNameID>
+		<EditorNameID>781331</EditorNameID>
+		<PopulationCount>0</PopulationCount>
+		<SubCiv>Sufi</SubCiv>
+		<ObstructionRadiusX>0.7900</ObstructionRadiusX>
+		<ObstructionRadiusZ>0.7900</ObstructionRadiusZ>
+		<FormationCategory>Mobile</FormationCategory>
+		<DeadReplacement>BloodSplat</DeadReplacement>
+		<MaxVelocity>7.0000</MaxVelocity>
+		<MaxRunVelocity>9.0000</MaxRunVelocity>
+		<MovementType>land</MovementType>
+		<TurnRate>18.0000</TurnRate>
+		<AnimFile>units\natives\saltpeter\camelarcherhorse.xml</AnimFile>
+		<ImpactType>Flesh</ImpactType>
+		<PhysicsInfo>cav</PhysicsInfo>
+		<Icon>units\natives\saltpeter\camelarcher_icon</Icon>
+		<PortraitIcon>units\natives\saltpeter\camelarcher_portrait</PortraitIcon>
+		<RolloverTextID>781338</RolloverTextID>
+		<ShortRolloverTextID>781337</ShortRolloverTextID>
+		<InitialHitpoints>200.0000</InitialHitpoints>
+		<MaxHitpoints>200.0000</MaxHitpoints>
+		<LOS>16.0000</LOS>
+		<ProjectileProtoUnit>Arrow</ProjectileProtoUnit>
+		<UnitAIType>RangedCombative</UnitAIType>
+		<TrainPoints>30.0000</TrainPoints>
+		<BuildLimit>10</BuildLimit>
+		<Bounty>15.0000</Bounty>
+		<BuildBounty>15.0000</BuildBounty>
+		<Cost resourcetype="Food">70.0000</Cost>
+		<Cost resourcetype="Wood">80.0000</Cost>
+		<AllowedAge>1</AllowedAge>
+		<Armor type="Hand" value="0.1000"/>
+		<UnitType>LogicalTypeHealed</UnitType>
+		<UnitType>LogicalTypeValidSharpshoot</UnitType>
+		<UnitType>LogicalTypeNeededForVictory</UnitType>
+		<UnitType>LogicalTypeHandUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeLandMilitary</UnitType>
+		<UnitType>LogicalTypeScout</UnitType>
+		<UnitType>LogicalTypeValidSPCUnitsDeadCondition</UnitType>
+		<UnitType>LogicalTypeGarrisonInShips</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAutoAttack</UnitType>
+		<UnitType>LogicalTypeVillagersAttack</UnitType>
+		<UnitType>LogicalTypeHandUnitsAttack</UnitType>
+		<UnitType>LogicalTypeRangedUnitsAttack</UnitType>
+		<UnitType>LogicalTypeMinimapFilterMilitary</UnitType>
+		<UnitType>AbstractArcher</UnitType>
+		<UnitType>AbstractLightCavalry</UnitType>
+		<UnitType>AbstractCavalry</UnitType>
+		<UnitType>AbstractNativeWarrior</UnitType>
+		<UnitType>UnitClass</UnitType>
+		<UnitType>Military</UnitType>
+		<UnitType>Unit</UnitType>
+		<UnitType>ConvertsHerds</UnitType>
+		<UnitType>AbstractRangedCavalry</UnitType>
+		<UnitType>CountsTowardMilitaryScore</UnitType>
+		<UnitType>AbstractCavalryInfantry</UnitType>
+		<UnitType>Ranged</UnitType>
+		<UnitType>HasBountyValue</UnitType>
+		<Flag>CollidesWithProjectiles</Flag>
+		<Flag>ApplyHandicapTraining</Flag>
+		<Flag>CorpseDecays</Flag>
+		<Flag>ShowGarrisonButton</Flag>
+		<Flag>DontRotateObstruction</Flag>
+		<Flag>ObscuredByUnits</Flag>
+		<Flag>VisibleUnderFogIfGaia</Flag>
+		<Flag>ConstrainOrientation</Flag>
+		<Flag>OrientUnitWithGround</Flag>
+		<Flag>Tracked</Flag>
+		<Command column="5" page="10">Patrol</Command>
+		<Command column="1" page="10">Stop</Command>
+		<Command column="0" page="10">Garrison</Command>
+		<Command column="2" page="10">Delete</Command>
+		<Tactics>bowCavalry.tactics</Tactics>
+		<ProtoAction>
+			<Name>BowAttack</Name>
+			<Damage>14.000000</Damage>
+			<DamageType>Ranged</DamageType>
+			<MaxRange>12.000000</MaxRange>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyCavalry">2.250000</DamageBonus>
+			<DamageBonus type="AbstractVillager">0.500000</DamageBonus>
+			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">1.750000</DamageBonus>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>BuildingAttack</Name>
+			<Damage>15.000000</Damage>
+			<DamageType>Siege</DamageType>
+			<ROF>3.000000</ROF>
+			<MaxRange>10.000000</MaxRange>
+		</ProtoAction>
+		<ProtoAction>
+			<Name>ChargeAttack</Name>
+			<Damage>7.000000</Damage>
+			<DamageType>Hand</DamageType>
+			<ROF>1.500000</ROF>
+			<DamageBonus type="AbstractHeavyCavalry">4.500000</DamageBonus>
+			<DamageBonus type="AbstractArtillery">2.000000</DamageBonus>
+			<DamageBonus type="AbstractCoyoteMan">3.500000</DamageBonus>
+		</ProtoAction>
+	</Unit>
 </Proto>
\ No newline at end of file
diff --git a/Data/randommapstringsm.xml b/Data/randommapstringsm.xml
index 2584ba5..f89a887 100644
Binary files a/Data/randommapstringsm.xml and b/Data/randommapstringsm.xml differ
diff --git a/Data/stringtablem.xml b/Data/stringtablem.xml
index 662eed8..b88485a 100644
--- a/Data/stringtablem.xml
+++ b/Data/stringtablem.xml
@@ -354,7 +354,7 @@
 		<String _locID="19141" symbol="cStringPauseRestriction">Restrict Number of Pauses</String>
 		<String _locID="19142" symbol="cStringGenericTechMessage">%s improvement complete.</String>
 		<String _locID="19144" symbol="cStringCursorUngarrisonHelp">Left-click to unload.</String>
-		<String _locID="19156">II: Colonial Age</String>
+		<String _locID="19156">II: Reformation Age</String>
 		<String _locID="19159" symbol="cStringBuilding">Building</String>
 		<String _locID="19160" symbol="cStringAbstractUnit">Unit</String>
 		<String _locID="19161">Improvement</String>
@@ -1479,7 +1479,7 @@
 		<String _locID="22826">Caravel</String>
 		<String _locID="22828">{E^Herd animal. Fattens over time. Fattens faster if tasked on a Livestock Pen, Farm, Village, or House.^}{J^Herd animal. Enhances resources generated by Shrines when tasked to them.^}{I^Herd animal. Generates experience points. Increased Experience Points generation when tasked to a Sacred Field.^}</String>
 		<String _locID="22829">Sheep</String>
-		<String _locID="22830">Caravel. Good at exploring, fishing or transport.</String>
+		<String _locID="22830">Caravel, light warship. Exploration ship that can fish. Good against heavy warships.</String>
 		<String _locID="22832">Bison</String>
 		<String _locID="22836">Build near Native settlements or Trade Routes. Provides experience points and other benefits.</String>
 		<String _locID="22837">Trading Post</String>
@@ -1520,8 +1520,8 @@
 		<String _locID="22885">Projectile</String>
 		<String _locID="22888">Cannonball</String>
 		<String _locID="22890">Projectile</String>
-		<String _locID="22896">Word of your discovery has spread. Villagers from your home city arrive to usher in the Colonial Age.</String>
-		<String _locID="22900" symbol="cStringAge1">II: Colonial Age</String>
+		<String _locID="22896">Word of your discovery has spread. Villagers from your home city arrive to usher in the Reformation Age.</String>
+		<String _locID="22900" symbol="cStringAge1">II: Reformation Age</String>
 		<String _locID="22910">Train Track</String>
 		<String _locID="22914">Dock</String>
 		<String _locID="22918">Trains and upgrades hand and ranged cavalry.</String>
@@ -1608,7 +1608,7 @@
 		<String _locID="23230">Guard War Wagons</String>
 		<String _locID="23232">Dragoon attack and hitpoints increased.</String>
 		<String _locID="23233">Guard Dragoons</String>
-		<String _locID="23238" symbol="cStringAge2Active">COLONIAL AGE! You can now train units in the New World.</String>
+		<String _locID="23238" symbol="cStringAge2Active">REFORMATION AGE! You can now train units in the New World.</String>
 		<String _locID="23240" symbol="cStringAge4Active">INDUSTRIAL AGE! Railroads and Factories can empower your economy.</String>
 		<String _locID="23244">Jimmy Villager</String>
 		<String _locID="23254">Cuirassier attack and hitpoints increased.</String>
@@ -1616,7 +1616,7 @@
 		<String _locID="23262">Crossbowman attack and hitpoints increased.</String>
 		<String _locID="23263">Veteran Crossbowmen</String>
 		<String _locID="23294">Archer and hand infantry hitpoints increased.</String>
-		<String _locID="23295">Infantry Breastplate</String>
+		<String _locID="23295">Archaic Infantry Breastplate</String>
 		<String _locID="23297">Infantry armed with firearms have their attack increased.</String>
 		<String _locID="23298">Paper Cartridge</String>
 		<String _locID="23306">Hand cavalry hitpoints increased.</String>
@@ -1758,7 +1758,7 @@
 		<String _locID="23680">Petrine Reforms</String>
 		<String _locID="23691">Iroquois short-ranged siege unit.</String>
 		<String _locID="23692">Iroquois Mantlet</String>
-		<String _locID="23693">Canoe good at exploring, fishing or transport.</String>
+		<String _locID="23693">Canoe, light warship. Exploration ship that can fish. Good against heavy warships.</String>
 		<String _locID="23694">Canoe</String>
 		<String _locID="23708">Bank</String>
 		<String _locID="23709">Building that produces Coin. Supports 10 population.</String>
@@ -1824,7 +1824,7 @@
 		<String _locID="23911">Guard Riflemen</String>
 		<String _locID="23914">Portuguese Dragoon attack and hitpoints greatly increased.</String>
 		<String _locID="23915">Jinetes</String>
-		<String _locID="23917">Ships 22 Bastieros (Crossbowmen) from your homeland. Also Improves all Crossbowmen.</String>
+		<String _locID="23917">Ships 22 Bastieros (Crossbowmen) from your homeland. Also improves all Crossbowmen.</String>
 		<String _locID="23918">Besteiros</String>
 		<String _locID="23927">Bola</String>
 		<String _locID="23928">Javelin</String>
@@ -2322,7 +2322,7 @@
 		<String _locID="25614">Skirmisher</String>
 		<String _locID="25616">Heavy artillery</String>
 		<String _locID="25617">Exploration canoe</String>
-		<String _locID="25618">Caravel. Exploration ship</String>
+		<String _locID="25618">Light warship</String>
 		<String _locID="25619">Ranged cavalry</String>
 		<String _locID="25620">Improvement building</String>
 		<String _locID="25623">French villager</String>
@@ -3284,26 +3284,26 @@
 		<String _locID="27610">The Ossuary</String>
 		<String _locID="27611">Payback</String>
 		<String _locID="27679">Czapka Uhlans</String>
-		<String _locID="27682">Frigate. Heavy warship</String>
-		<String _locID="27683">Frigate. Heavy warship.</String>
+		<String _locID="27682">Heavy warship</String>
+		<String _locID="27683">Frigate, heavy warship. Good against siege warships.</String>
 		<String _locID="27684">Frigate</String>
 		<String _locID="27685">SHP Frigate</String>
-		<String _locID="27696">Fluyt. Warship good at transport.</String>
-		<String _locID="27697">Fluyt. Slow, powerful ship resistant to building fire that can train units.</String>
+		<String _locID="27696">Heavy warship</String>
+		<String _locID="27697">Fluyt, heavy warship. Transport ship that can train units. Good against siege warships.</String>
 		<String _locID="27698">Fluyt</String>
 		<String _locID="27699">SHP Fluyt</String>
-		<String _locID="27703">Galleon. Warship good at transport.</String>
+		<String _locID="27703">Heavy warship</String>
 		<String _locID="27705">Galleon</String>
 		<String _locID="27706">SHP Galleon</String>
-		<String _locID="27710">Galley. Exploration ship</String>
-		<String _locID="27711">Galley. Good at exploring, fishing or transport.</String>
+		<String _locID="27710">Light warship</String>
+		<String _locID="27711">Galley, light warship. Exploration ship that can fish. Good against heavy warships.</String>
 		<String _locID="27712">Galley</String>
 		<String _locID="27713">SHP Galley</String>
 		<String _locID="27724">Privateer. Pirate ship</String>
-		<String _locID="27725">Privateer. Mercenary warship.</String>
+		<String _locID="27725">Privateer, light warship. Mercenary ship. Good against heavy warships.</String>
 		<String _locID="27726">Privateer</String>
 		<String _locID="27727">SHP Privateer</String>
-		<String _locID="27738">Galleon. Slow, powerful ship resistant to building fire that can train units.</String>
+		<String _locID="27738">Galleon, heavy warship. Transport ship that can train units. Good against siege warships.</String>
 		<String _locID="27739">This tech doesn't do anything yet!</String>
 		<String _locID="27740" symbol="cStringNuggetSpeedBoost">The boots of El Pollo Guapo, which increases Hero speed by %2.2f%%.</String>
 		<String _locID="27741" symbol="cStringNuggetSpeedBoostActivate">%s has recovered the boots of El Pollo Guapo, which increases Hero speed by %2.2f%%.</String>
@@ -3853,7 +3853,7 @@
 		<String _locID="29591">Hot Air Balloon</String>
 		<String _locID="29592">Recon unit</String>
 		<String _locID="29594">Mercenaries are cheaper.</String>
-		<String _locID="29620">Colonial Age</String>
+		<String _locID="29620">Reformation Age</String>
 		<String _locID="29629">Ground Decal Great Plains</String>
 		<String _locID="29630">PROP Great Plains Decal</String>
 		<String _locID="29632">Defensive building</String>
@@ -4084,7 +4084,7 @@
 		<String _locID="30457">Find Native American allies.</String>
 		<String _locID="30458">Blockade</String>
 		<String _locID="30459">Set up a blockade on enemy Home Cities, preventing them from getting any shipments!</String>
-		<String _locID="30509" symbol="cStringReachedAge2">You have reached the Colonial Age!</String>
+		<String _locID="30509" symbol="cStringReachedAge2">You have reached the Reformation Age!</String>
 		<String _locID="30510" symbol="cStringReachedAge3">You have reached the Enlightenment Age!</String>
 		<String _locID="30524">Increases the build limit on all warships such as Caravels, Frigates and Monitors.</String>
 		<String _locID="30525">Balloons can be produced from the Town Center and sent aloft to provide a huge line of sight. They cannot move once deployed and have no attack.</String>
@@ -4129,8 +4129,8 @@
 		<String _locID="30910">PROP Eagle's Nest</String>
 		<String _locID="30919">Transform your Town Wagon into a Town Center.</String>
 		<String _locID="30920">Move to an unobstructed area to transform your Town Wagon into a Town Center.</String>
-		<String _locID="30921">Monitor. Mortar ship</String>
-		<String _locID="30922">Monitor. Mortar ship good at bombarding buildings at great range.</String>
+		<String _locID="30921">Siege warship</String>
+		<String _locID="30922">Monitor, siege warship. Good at bombarding buildings at great range.</String>
 		<String _locID="30923">Monitor</String>
 		<String _locID="30924">SHP Monitor</String>
 		<String _locID="30928">Imperial upgrade for Grenadiers.</String>
@@ -4811,7 +4811,7 @@
 		<String _locID="32886" symbol="cStringCurrentXP">XP %s</String>
 		<String _locID="32887" symbol="cStringGrandConquestLabel">Grand Conquest</String>
 		<String _locID="32893">Tech Status Equals</String>
-		<String _locID="32897">%s's colony has reached the COLONIAL AGE!</String>
+		<String _locID="32897">%s's colony has reached the REFORMATION AGE!</String>
 		<String _locID="32899" gamecharacter="John" soundfilename="JOHN5036">The only way to your sister's village is through the British.</String>
 		<String _locID="32900" gamecharacter="Kanyenke" soundfilename="KANY5016">The British are attacking the village. We should attack from our side now!</String>
 		<String _locID="32901" gamecharacter="Soldier" soundfilename="GENR5131">Sir, one of our scouts has spotted a British fort.</String>
@@ -4912,9 +4912,9 @@
 		<String _locID="33011" gamecharacter="Narrator" soundfilename="TUTO1175">That sound, and the flashing Shipment icon, indicate that you may now send a Shipment from the Home City.</String>
 		<String _locID="33012" gamecharacter="Narrator" soundfilename="TUTO1180">Click on the flashing Home City button now.</String>
 		<String _locID="33013" gamecharacter="Narrator" soundfilename="TUTO1185">During a game of Age of Empires III, visit the Home City now and then to send Shipments of resources, Settlers, or soldiers.</String>
-		<String _locID="33019" gamecharacter="Narrator" soundfilename="TUTO1215">The timer above the Mini Map at the lower left of the screen shows how long it will take until you advance to the Colonial Age.</String>
-		<String _locID="33020" gamecharacter="Narrator" soundfilename="TUTO1220">While you're waiting to advance to the Colonial Age, click the flashing button to return to the New World, and continue gathering resources and exploring.</String>
-		<String _locID="33021" gamecharacter="Narrator" soundfilename="TUTO1225">You have reached the Colonial Age!</String>
+		<String _locID="33019" gamecharacter="Narrator" soundfilename="TUTO1215">The timer above the Mini Map at the lower left of the screen shows how long it will take until you advance to the Reformation Age.</String>
+		<String _locID="33020" gamecharacter="Narrator" soundfilename="TUTO1220">While you're waiting to advance to the Reformation Age, click the flashing button to return to the New World, and continue gathering resources and exploring.</String>
+		<String _locID="33021" gamecharacter="Narrator" soundfilename="TUTO1225">You have reached the Reformation Age!</String>
 		<String _locID="33022" gamecharacter="Narrator" soundfilename="TUTO1230">Build a Barracks to help defend your colony.</String>
 		<String _locID="33023" gamecharacter="Narrator" soundfilename="TUTO1235">Select a Settler.</String>
 		<String _locID="33024" gamecharacter="Narrator" soundfilename="TUTO1240">Click the flashing Barracks button.</String>
@@ -4957,27 +4957,27 @@
 		<String _locID="33076">Player Set HC Access</String>
 		<String _locID="33077">HC Access On</String>
 		<String _locID="33113" gamecharacter="Kanyenke" soundfilename="KANY0081" portraitfilename="units\spc\kanyenke\kanyenke_igc_icon">But she decides who she loves, and I will not come between you.</String>
-		<String _locID="33116">Allows you to send the Adventurer, who advances you to Colonial Age and improves your Explorer's hitpoints and the line of sight of cavalry and infantry.</String>
+		<String _locID="33116">Allows you to send the Adventurer, who advances you to Reformation Age and improves your Explorer's hitpoints and the line of sight of cavalry and infantry.</String>
 		<String _locID="33117">British</String>
 		<String _locID="33122">Allows you to send the Gentleman Pirate, who advances you to Industrial Age and increases Mercenary hitpoints.</String>
 		<String _locID="33123">British</String>
 		<String _locID="33126">Allows you to send the Exiled Prince, who advances you to Industrial Age and refunds 500 Coin.</String>
 		<String _locID="33127">French</String>
-		<String _locID="33128">Allows you to send the Master Farmer, who advances you to Colonial Age and improves your Mill gathering rate.</String>
+		<String _locID="33128">Allows you to send the Master Farmer, who advances you to Reformation Age and improves your Mill gathering rate.</String>
 		<String _locID="33129">French</String>
 		<String _locID="33130">blah</String>
-		<String _locID="33131">Allows you to send the Master Miner, who advances you to Colonial Age and improves your Mine gathering rate.</String>
+		<String _locID="33131">Allows you to send the Master Miner, who advances you to Reformation Age and improves your Mine gathering rate.</String>
 		<String _locID="33132">French</String>
 		<String _locID="33151">The Lakota Dog Soldier Society arrives at your Town Center to help fight your enemies. You get 1 Dog Soldier for every 3 minutes of game length.</String>
 		<String _locID="33152">Lakota Dog Soldiers</String>
-		<String _locID="33155">Allows you to send the Philosopher Prince, who advances you to Colonial Age and makes archaic units (longbows and pikemen) better.</String>
+		<String _locID="33155">Allows you to send the Philosopher Prince, who advances you to Reformation Age and makes archaic units (longbows and pikemen) better.</String>
 		<String _locID="33156">British</String>
 		<String _locID="33157" symbol="cStringESOLeaveGame">Leave Game</String>
 		<String _locID="33161">Stuart's Head</String>
 		<String _locID="33162">IGC Stuart's Head</String>
-		<String _locID="33163">Allows you to send the Adventurer, who advances you to Colonial Age and improves your Explorer's hitpoints and the line of sight of cavalry and infantry.</String>
+		<String _locID="33163">Allows you to send the Adventurer, who advances you to Reformation Age and improves your Explorer's hitpoints and the line of sight of cavalry and infantry.</String>
 		<String _locID="33164">Dutch</String>
-		<String _locID="33165">Allows you to send the Cavalier, who advances you to Colonial Age and increase cavalry hitpoints.</String>
+		<String _locID="33165">Allows you to send the Cavalier, who advances you to Reformation Age and increase cavalry hitpoints.</String>
 		<String _locID="33166">Dutch</String>
 		<String _locID="33167">Allows you to send the Gentleman Pirate, who advances you to Industrial Age and increases Mercenary hitpoints.</String>
 		<String _locID="33168">Dutch</String>
@@ -4993,7 +4993,7 @@
 		<String _locID="33178">Delete the selected herd.</String>
 		<String _locID="33179">Create Herd</String>
 		<String _locID="33180">Delete Herd</String>
-		<String _locID="33186">Allows you to send the Master Farmer, who advances you to Colonial Age and improves your Mill gathering rate.</String>
+		<String _locID="33186">Allows you to send the Master Farmer, who advances you to Reformation Age and improves your Mill gathering rate.</String>
 		<String _locID="33187">German</String>
 		<String _locID="33192">Allows you to send the Exiled Prince, who advances you to Industrial Age and refunds 500 Coin.</String>
 		<String _locID="33193">German</String>
@@ -5007,32 +5007,32 @@
 		<String _locID="33201">Ottoman</String>
 		<String _locID="33202">Allows you to send the Exiled Prince, who advances you to Industrial Age and refunds 500 Coin.</String>
 		<String _locID="33203">Ottoman</String>
-		<String _locID="33204">Allows you to send the Master Farmer, who advances you to Colonial Age and improves your Mill gathering rate.</String>
+		<String _locID="33204">Allows you to send the Master Farmer, who advances you to Reformation Age and improves your Mill gathering rate.</String>
 		<String _locID="33205">Ottoman</String>
-		<String _locID="33208">Allows you to send the Cavalier, who advances you to Colonial Age and increase cavalry hitpoints.</String>
+		<String _locID="33208">Allows you to send the Cavalier, who advances you to Reformation Age and increase cavalry hitpoints.</String>
 		<String _locID="33209">Ottoman</String>
 		<String _locID="33214">Lighting Set Helper</String>
 		<String _locID="33218">Allows you to send the War Minister, who advances you to Industrial Age and increases the hitpoints of unique Spanish units.</String>
 		<String _locID="33219">Spanish</String>
-		<String _locID="33220">Allows you to send the Master Miner, who advances you to Colonial Age and improves your Mine gathering rate.</String>
+		<String _locID="33220">Allows you to send the Master Miner, who advances you to Reformation Age and improves your Mine gathering rate.</String>
 		<String _locID="33221">Spanish</String>
 		<String _locID="33222">Allows you to send the Engineer, who advances you to Industrial Age and increases artillery hitpoints.</String>
 		<String _locID="33223">Spanish</String>
-		<String _locID="33224">Allows you to send the King's Musketeer, who advances you to Colonial Age and improves your infantry's hitpoints.</String>
+		<String _locID="33224">Allows you to send the King's Musketeer, who advances you to Reformation Age and improves your infantry's hitpoints.</String>
 		<String _locID="33225">Spanish</String>
-		<String _locID="33226">Allows you to send the Naturalist, who advances you to Colonial Age and improves your hunting and livestock gathering rate.</String>
+		<String _locID="33226">Allows you to send the Naturalist, who advances you to Reformation Age and improves your hunting and livestock gathering rate.</String>
 		<String _locID="33227">Spanish</String>
-		<String _locID="33232">Allows you to send the Master Miner, who advances you to Colonial Age and improves your Mine gathering rate.</String>
+		<String _locID="33232">Allows you to send the Master Miner, who advances you to Reformation Age and improves your Mine gathering rate.</String>
 		<String _locID="33233">Russian</String>
-		<String _locID="33236">Allows you to send the Cavalier, who advances you to Colonial Age and increase cavalry hitpoints.</String>
+		<String _locID="33236">Allows you to send the Cavalier, who advances you to Reformation Age and increase cavalry hitpoints.</String>
 		<String _locID="33237">Russian</String>
 		<String _locID="33240">Allows you to send the Gentleman Pirate, who advances you to Industrial Age and increases Mercenary hitpoints.</String>
 		<String _locID="33241">Russian</String>
 		<String _locID="33244">Allows you to send the Tycoon, who advances you to Industrial Age and improves your Crates and Factories.</String>
 		<String _locID="33245">Portuguese</String>
-		<String _locID="33248">Allows you to send the Bishop, who advances you to Colonial Age and makes Priests free.</String>
+		<String _locID="33248">Allows you to send the Bishop, who advances you to Reformation Age and makes Priests free.</String>
 		<String _locID="33249">Portuguese</String>
-		<String _locID="33252">Allows you to send the Master Miner, who advances you to Colonial Age and improves your Mine gathering rate.</String>
+		<String _locID="33252">Allows you to send the Master Miner, who advances you to Reformation Age and improves your Mine gathering rate.</String>
 		<String _locID="33253">Portuguese</String>
 		<String _locID="33254" symbol="cStringTradeRouteTitle">Trade Route Tool</String>
 		<String _locID="33255" symbol="cStringTradeRouteCreate">Create Trade Route</String>
@@ -5181,7 +5181,7 @@
 		<String _locID="33471" symbol="cStringRMSFastRandomDesc">Randomly selects from among all American standard maps.</String>
 		<String _locID="33472" gamecharacter="Morgan" soundfilename="MORG7021">Build a Trading Post near the natives and they will ally with us.</String>
 		<String _locID="33473" gamecharacter="Morgan" soundfilename="MORG7022">Send out a few scouts to see if there are any more natives in the area.</String>
-		<String _locID="33474">There are many Native Americans in this area. Find them and build Trading Posts near them to make an alliance. In the Colonial Age you can train their warriors to help you fight.</String>
+		<String _locID="33474">There are many Native Americans in this area. Find them and build Trading Posts near them to make an alliance. In the Reformation Age you can train their warriors to help you fight.</String>
 		<String _locID="33475">The Ottoman Fort is very strong. Getting to the Enlightenment Age and training Mortars at your Artillery Foundry will greatly help with this task.</String>
 		<String _locID="33476">Light artillery</String>
 		<String _locID="33477">Knight of Malta that throws flaming hoops.</String>
@@ -5198,7 +5198,7 @@
 		<String _locID="33501">Rescue more Aztec prisoners.</String>
 		<String _locID="33502">The rest of the prisoners may also be guarded by the Spanish but will help you if you free them.</String>
 		<String _locID="33503">Ramming, exploding ship</String>
-		<String _locID="33504">Rams anything on the water and explodes.</String>
+		<String _locID="33504">Fire Ship. Rams anything on the water and explodes.</String>
 		<String _locID="33505">Fire Ship</String>
 		<String _locID="33506">SPC Fire Ship</String>
 		<String _locID="33514">Military building</String>
@@ -5260,7 +5260,7 @@
 		<String _locID="33665" gamecharacter="Soldier" soundfilename="GENR5024">We've found a weapons cache.</String>
 		<String _locID="33666" symbol="cStringQuitESO">Do you want to quit ESO and return to the Main menu?</String>
 		<String _locID="33667" symbol="cStringPlayersColonyReachedAge3">%s's colony has reached the ENLIGHTENMENT AGE!</String>
-		<String _locID="33668" symbol="cStringPlayersColonyReachedAge2">%s's colony has reached the COLONIAL AGE!</String>
+		<String _locID="33668" symbol="cStringPlayersColonyReachedAge2">%s's colony has reached the REFORMATION AGE!</String>
 		<String _locID="33669" symbol="cStringPlayersColonyReachedAge4">%s's colony has reached the INDUSTRIAL AGE!</String>
 		<String _locID="33670">Duck Family</String>
 		<String _locID="33671">PROP Duck Family</String>
@@ -5434,10 +5434,10 @@
 		<String _locID="33900" gamecharacter="Narrator" soundfilename="TUTO5060">If you build Trading Posts at the Trading Post sites along the route, you will earn extra Experience.</String>
 		<String _locID="33901" gamecharacter="Narrator" soundfilename="TUTO5065">A Shipment is ready in the Home City!</String>
 		<String _locID="33902" gamecharacter="Narrator" soundfilename="TUTO5070">Return to the Home City and use your Shipments to send additional Settlers, soldiers, or resources.</String>
-		<String _locID="33903" gamecharacter="Narrator" soundfilename="TUTO5075">You should gather more Food so you can advance to the Colonial Age.</String>
-		<String _locID="33904" gamecharacter="Narrator" soundfilename="TUTO5080">It would be wise to advance to the Colonial Age as soon as you have enough Food.</String>
-		<String _locID="33905" gamecharacter="Narrator" soundfilename="TUTO5085">If you advance to the Colonial Age, you will be able to build additional buildings, train soldiers, and purchase new improvements.</String>
-		<String _locID="33906" gamecharacter="Narrator" soundfilename="TUTO5090">You have reached the Colonial Age! Consider building a Barracks so you can defend your colony.</String>
+		<String _locID="33903" gamecharacter="Narrator" soundfilename="TUTO5075">You should gather more Food so you can advance to the Reformation Age.</String>
+		<String _locID="33904" gamecharacter="Narrator" soundfilename="TUTO5080">It would be wise to advance to the Reformation Age as soon as you have enough Food.</String>
+		<String _locID="33905" gamecharacter="Narrator" soundfilename="TUTO5085">If you advance to the Reformation Age, you will be able to build additional buildings, train soldiers, and purchase new improvements.</String>
+		<String _locID="33906" gamecharacter="Narrator" soundfilename="TUTO5090">You have reached the Reformation Age! Consider building a Barracks so you can defend your colony.</String>
 		<String _locID="33907" gamecharacter="Narrator" soundfilename="TUTO5095">Building a Barracks will let you train Musketeers and other soldiers.</String>
 		<String _locID="33908" gamecharacter="Narrator" soundfilename="TUTO5100">Consider training Musketeers in your Barracks to defend your colony.</String>
 		<String _locID="33909" gamecharacter="Narrator" soundfilename="TUTO5105">If you build a Stable, you can train cavalry to fight alongside your other soldiers.</String>
@@ -5563,11 +5563,11 @@
 		<String _locID="34059">Request Wood deliveries at this Trading Post.</String>
 		<String _locID="34060">Request Experience generation at this Trading Post.</String>
 		<String _locID="34061">Train two additional Settlers while exploring the New World.</String>
-		<String _locID="34062">Advance to the Colonial Age</String>
+		<String _locID="34062">Advance to the Reformation Age</String>
 		<String _locID="34063">Advance to the Enlightenment Age</String>
 		<String _locID="34064">Destroy the Enemy Colony</String>
 		<String _locID="34065">You can train more Settlers at your Town Center, if you have enough Food. You will need eight Settlers to complete the objective. Hunt animals for Food, or send Food from your Home City.</String>
-		<String _locID="34066">To advance to the Colonial Age, select the Town Center, left-click the Age Advancement button, and then choose a politician. To advance, you will need 500 Food. Food may be gathered from animals or Mills.</String>
+		<String _locID="34066">To advance to the Reformation Age, select the Town Center, left-click the Age Advancement button, and then choose a politician. To advance, you will need 500 Food. Food may be gathered from animals or Mills.</String>
 		<String _locID="34067">To advance to the Enlightenment Age, you need 500 Food and 250 Coin. Keep training Settlers at your Town Center. Don't forget to build more Manors to support your population.</String>
 		<String _locID="34068">Build an Artillery Foundry to train Mortars. Mortars are good at destroying buildings but they need to be protected with other units. When you have a large army, attack!</String>
 		<String _locID="34076" symbol="cStringESOCustomGameInvite" comment="1 - inviting player, 2- game name">%1s has invited you to Custom Game: %2s. Would you like to join?</String>
@@ -5738,8 +5738,8 @@
 		<String _locID="34326" gamecharacter="Soldier" soundfilename="GENR2035">Pirate ships dead ahead captain!</String>
 		<String _locID="34331" gamecharacter="Narrator" soundfilename="TUTO1201">For your first Shipment, it's probably best to send additional Settlers to help your economy grow faster.</String>
 		<String _locID="34332" gamecharacter="Narrator" soundfilename="TUTO1202">Send a Shipment now by selecting the Settler.</String>
-		<String _locID="34333" gamecharacter="Narrator" soundfilename="TUTO1206">Advancing to the Colonial Age would allow you to construct new buildings and train soldiers.</String>
-		<String _locID="34334" gamecharacter="Narrator" soundfilename="TUTO1207">You have been given enough resources to advance to the Colonial Age. Select the Town Center.</String>
+		<String _locID="34333" gamecharacter="Narrator" soundfilename="TUTO1206">Advancing to the Reformation Age would allow you to construct new buildings and train soldiers.</String>
+		<String _locID="34334" gamecharacter="Narrator" soundfilename="TUTO1207">You have been given enough resources to advance to the Reformation Age. Select the Town Center.</String>
 		<String _locID="34336" gamecharacter="Narrator" soundfilename="TUTO1211">Left-click the flashing button to return to the New World.</String>
 		<String _locID="34337" gamecharacter="Narrator" soundfilename="TUTO5205">At the end of a game, you may also return to the Home City and spend your earned Experience to unlock new Shipment types.</String>
 		<String _locID="34338" gamecharacter="Narrator" soundfilename="TUTO5215">Every civilization in the game has a different set of Shipments it can unlock - try them all!</String>
@@ -5750,8 +5750,8 @@
 		<String _locID="34343" gamecharacter="Narrator" soundfilename="TUTO5220">Congratulations! You're now ready to play the Campaign, try a Skirmish against computer opponents, or go online and compete in multiplayer!</String>
 		<String _locID="34344" gamecharacter="Narrator" soundfilename="TUTO5190">Your Caravel can also be used to fish. With the Caravel selected, right-click on Fish to gather Food.</String>
 		<String _locID="34345" gamecharacter="Narrator" soundfilename="TUTO5180">The enemy Town Center has been destroyed!</String>
-		<String _locID="34346">Advance to the Colonial Age.</String>
-		<String _locID="34347">Select the Town Center, click the gold Advance to Colonial Age button, then choose a politician to send. It will take some time for the politician to arrive.</String>
+		<String _locID="34346">Advance to the Reformation Age.</String>
+		<String _locID="34347">Select the Town Center, click the gold Advance to Reformation Age button, then choose a politician to send. It will take some time for the politician to arrive.</String>
 		<String _locID="34349" symbol="cStringGCCmdLine2">turn.</String>
 		<String _locID="34350">St. Louis Rail Co.</String>
 		<String _locID="34351">Enlightenment Age</String>
@@ -5767,7 +5767,7 @@
 		<String _locID="34370" symbol="cStringObjectiveFormatXPValueRecurring">(%d XP each)</String>
 		<String _locID="34372">Russian</String>
 		<String _locID="34374">Russian</String>
-		<String _locID="34375">Allows you to send the King's Musketeer, who advances you to Colonial Age and improves your infantry's hitpoints.</String>
+		<String _locID="34375">Allows you to send the King's Musketeer, who advances you to Reformation Age and improves your infantry's hitpoints.</String>
 		<String _locID="34376">Russian</String>
 		<String _locID="34377">Stop Beaumont and his theft of the Spanish gold.</String>
 		<String _locID="34378">Destroy the three Outposts guarding the ruined treasure ships.</String>
@@ -5804,13 +5804,13 @@
 		<String _locID="34445" symbol="cStringESOMakeLeader">Make New Leader</String>
 		<String _locID="34446" symbol="cStringESOPromptNewLeader">There can only be one leader of a Clan. Are you sure you wish to make %s the new leader of your Clan?</String>
 		<String _locID="34447" symbol="cStringUICostLabel">Cost:</String>
-		<String _locID="34448" symbol="cStringChoosePoliticianAge2">Select a Colonial Age politician</String>
+		<String _locID="34448" symbol="cStringChoosePoliticianAge2">Select a Reformation Age politician</String>
 		<String _locID="34449" symbol="cStringChoosePoliticianAge3">Select an Enlightenment Age politician</String>
 		<String _locID="34450" symbol="cStringChoosePoliticianAge4">Select an Industrial Age politician</String>
 		<String _locID="34451" symbol="cStringChoosePoliticianAge5">Select an Imperial Age political party</String>
 		<String _locID="34452">Double-barrel Attack</String>
 		<String _locID="34453">Fire with both shotgun barrels for heavy damage to infantry, cavalry or guardians.</String>
-		<String _locID="34454" symbol="cStringAdvanceAge2">Advance to the Colonial Age</String>
+		<String _locID="34454" symbol="cStringAdvanceAge2">Advance to the Reformation Age</String>
 		<String _locID="34455" symbol="cStringAdvanceAge3">Advance to the Enlightenment Age</String>
 		<String _locID="34456" symbol="cStringAdvanceAge4">Advance to the Industrial Age</String>
 		<String _locID="34457" symbol="cStringAdvanceAge5">Advance to the Imperial Age</String>
@@ -5914,7 +5914,7 @@
 		<String _locID="34686">This building has crops around it. You need to allow more space.</String>
 		<String _locID="34687">Prop Grass Short</String>
 		<String _locID="34688">PROP Grass Short</String>
-		<String _locID="34689">Moves the Arsenal to the Colonial Age and enables more powerful Arsenal improvements.</String>
+		<String _locID="34689">Moves the Arsenal to the Reformation Age and enables more powerful Arsenal improvements.</String>
 		<String _locID="34690">Advanced Arsenal</String>
 		<String _locID="34691">Props Dead Tree</String>
 		<String _locID="34692">PROP Dead Tree</String>
@@ -6798,7 +6798,7 @@
 		<String _locID="36127">7 Players</String>
 		<String _locID="36128">8 Players</String>
 		<String _locID="36129" symbol="cStringExplorationAge">Discovery Age</String>
-		<String _locID="36130" symbol="cStringColonialAge">Colonial Age</String>
+		<String _locID="36130" symbol="cStringColonialAge">Reformation Age</String>
 		<String _locID="36131" symbol="cStringFortressAge">Enlightenment Age</String>
 		<String _locID="36132" symbol="cStringIndustrialAge">Industrial Age</String>
 		<String _locID="36133" symbol="cStringPostIndustrialAge">Post-Industrial Age</String>
@@ -6826,7 +6826,7 @@
 		<String _locID="36157">7.</String>
 		<String _locID="36158">8.</String>
 		<String _locID="36159" gamecharacter="Old Coot" soundfilename="MORG0201" portraitfilename="units\spc\old_coot\old_coot_igc_icon">Ran rails all the way from Kansas City to the West Coast.</String>
-		<String _locID="36160" gamecharacter="Narrator" soundfilename="TUTO1210">Now click on the gold button, then select a politician to advance to the Colonial Age.</String>
+		<String _locID="36160" gamecharacter="Narrator" soundfilename="TUTO1210">Now click on the gold button, then select a politician to advance to the Reformation Age.</String>
 		<String _locID="36161">Havana</String>
 		<String _locID="36169" symbol="cStringWatermark"/>
 		<String _locID="36170">3 Settlers and 4 Rodoleroes</String>
@@ -6943,9 +6943,9 @@
 		<String _locID="36331">Young Carib Native American. This boy has fighting skills against infantry.</String>
 		<String _locID="36332">Native Boy</String>
 		<String _locID="36333">SPC Native Boy</String>
-		<String _locID="36334">TEAM Dragoons can be trained in the Colonial Age. (Also works on Ruyters, Rangers, Cavalry Archers, Rifle Riders, Musket Riders, and Yabusame. For Indian and Chinese allies, it makes Zamburak and the Ming Army train slightly faster.)</String>
+		<String _locID="36334">TEAM Dragoons can be trained in the Reformation Age. (Also works on Ruyters, Rangers, Cavalry Archers, Rifle Riders, Musket Riders, and Yabusame. For Indian and Chinese allies, it makes Zamburak and the Ming Army train slightly faster.)</String>
 		<String _locID="36335">TEAM Early Dragoons</String>
-		<String _locID="36337">TEAM Allows Dragoons in Colonial Age.</String>
+		<String _locID="36337">TEAM Allows Dragoons in Reformation Age.</String>
 		<String _locID="36338">TEAM The Wood cost for Docks and Dock improvements is lower.</String>
 		<String _locID="36339">TEAM Cheap Docks</String>
 		<String _locID="36341">TEAM Docks cheaper.</String>
@@ -6958,9 +6958,9 @@
 		<String _locID="36350">TEAM Warships are cheaper.</String>
 		<String _locID="36351">TEAM Cold Water Port</String>
 		<String _locID="36353">TEAM Warships cheaper.</String>
-		<String _locID="36354">TEAM Skirmishers, Gurkhas, Riflemen, Wakina Rifles, Forest Prowlers, and the Black Flag Army can be trained in the Colonial Age. (Strelets, Longbowmen, Macehualtins, and Yumi Archers train slightly faster.)</String>
+		<String _locID="36354">TEAM Skirmishers, Gurkhas, Riflemen, Wakina Rifles, Forest Prowlers, and the Black Flag Army can be trained in the Reformation Age. (Strelets, Longbowmen, Macehualtins, and Yumi Archers train slightly faster.)</String>
 		<String _locID="36355">TEAM Early Skirmishers</String>
-		<String _locID="36357">TEAM Allows Skirmishers in Colonial Age.</String>
+		<String _locID="36357">TEAM Allows Skirmishers in Reformation Age.</String>
 		<String _locID="36358">TEAM Ranged infantry damage increased.</String>
 		<String _locID="36359">TEAM Churches, Mosques, and Field Hospitals are much cheaper and their non-advanced improvements are also cheaper. Monastaries are somewhat cheaper and Native Fire Pits become free.</String>
 		<String _locID="36360">TEAM Cheap Church</String>
@@ -7053,7 +7053,7 @@
 		<String _locID="36460">Pioneers</String>
 		<String _locID="36461">Building hitpoints increased.</String>
 		<String _locID="36462">Improved Buildings</String>
-		<String _locID="36465">Moves the Arsenal to the Colonial Age and enables more powerful Arsenal improvements, +2 Uhlans.</String>
+		<String _locID="36465">Moves the Arsenal to the Reformation Age and enables more powerful Arsenal improvements, +2 Uhlans.</String>
 		<String _locID="36466">Advanced Arsenal</String>
 		<String _locID="36467">Ships a Fort Wagon to your colony, allowing you to construct a mighty Fort, +3 Uhlans.</String>
 		<String _locID="36468">Fort</String>
@@ -7784,8 +7784,8 @@
 		<String _locID="37308">Stockyards</String>
 		<String _locID="37309">Ships 2 Fluyts and 1 Monitor.</String>
 		<String _locID="37310">Dutch Raiding Fleet</String>
-		<String _locID="37311">Ships 10 Halberdiers  and 4 Ruyters.</String>
-		<String _locID="37312">Dutch Counter Cavalry Force</String>
+		<String _locID="37311">Ships 10 Halberdiers and 4 Ruyters.</String>
+		<String _locID="37312">Dutch Regiment</String>
 		<String _locID="37313">Bank Coin production increased.</String>
 		<String _locID="37314">Tulip Speculation</String>
 		<String _locID="37319">TEAM Monitor attack and hitpoints increased.</String>
@@ -7917,7 +7917,7 @@
 		<String _locID="37450">15 Halberdiers</String>
 		<String _locID="37451" symbol="cStringMapSizeOutOfBounds">You have specified a map size that is either too small (less than 64) or too large (greater than 1024)</String>
 		<String _locID="37452">Blockhouse Engineering</String>
-		<String _locID="37453">Strelets can now build Blockhouses. Also, increases Blockhouse build limit.</String>
+		<String _locID="37453">Strelets can now build Blockhouses. Also increases Blockhouse build limit.</String>
 		<String _locID="37454">Joe fires this to be less lame.</String>
 		<String _locID="37455">Joe's Magic Tech</String>
 		<String _locID="37456">Playing a game on a higher speed increases the rates of gathering, movement, combat, training and researching improvements.</String>
@@ -7984,7 +7984,7 @@
 		<String _locID="37517">TEAM Germans send allies Town Wagons.</String>
 		<String _locID="37518">All cavalry are faster, +4 Uhlans.</String>
 		<String _locID="37519">Polish Riding School</String>
-		<String _locID="37520">Polish Winged Knights</String>
+		<String _locID="37520">Hire Polish Winged Knights</String>
 		<String _locID="37521">Ships a squadron of 5 Winged Hussar Knights and enables them at the Command Post.</String>
 		<String _locID="37522">Uhlan attack and hitpoints increased, +4 Uhlans.</String>
 		<String _locID="37523">Lipizzaner Cavalry</String>
@@ -9115,12 +9115,12 @@
 		<String _locID="38662">A paltry treasure here or there makes no difference in the long run.</String>
 		<String _locID="38663">You are so backward! What will your soldiers use to fight mine? Clubs?</String>
 		<String _locID="38664">You are so nice, to choose to fight me while you are an Age inferior. How sweet.</String>
-		<String _locID="38665">Yes, you have reached Colonial Age first. I suppose I should congratulate you.</String>
+		<String _locID="38665">Yes, you have reached Reformation Age first. I suppose I should congratulate you.</String>
 		<String _locID="38666">So soon? I must marshal my forces.</String>
-		<String _locID="38667">At last you have joined the rest of us in the Colonial Age.</String>
+		<String _locID="38667">At last you have joined the rest of us in the Reformation Age.</String>
 		<String _locID="38668">You are Colonial at last? How quaint. We are all moving on to the next Age.</String>
 		<String _locID="38669">Native warriors are brave and resourceful.</String>
-		<String _locID="38670">Are you aware that it is possible to advance to the Colonial Age?</String>
+		<String _locID="38670">Are you aware that it is possible to advance to the Reformation Age?</String>
 		<String _locID="38671">Still back in the Discovery Age?! How delightful.</String>
 		<String _locID="38672">This wealth will go straight into my war chest.</String>
 		<String _locID="38673">See how my explorer makes good use of his time? You can learn by my example.</String>
@@ -9281,11 +9281,11 @@
 		<String _locID="38828">I suggest you follow my lead and advance to the next Age as soon as possible.</String>
 		<String _locID="38829">Exploring the New World is fine, but if you do not advance to the next Age soon, you may find your explorer fighting the enemy single-handed.</String>
 		<String _locID="38830">Remarkable work. Continue to use your resources as wisely as I do, and we shall be assured victory.</String>
-		<String _locID="38831">Excellent. You have reached the Colonial Age quickly.</String>
+		<String _locID="38831">Excellent. You have reached the Reformation Age quickly.</String>
 		<String _locID="38832">Your advancement to the next Age is an inspiration to my men.</String>
 		<String _locID="38833">Although I advanced an Age before you, I expect your assistance in this war may still contribute to our eventual victory.</String>
-		<String _locID="38834">Do not be discouraged by your slow progress to the Colonial Age. Not everyone is Frederick the Great.</String>
-		<String _locID="38835">Even though you have reached the Colonial Age last, you may still fight by my side.</String>
+		<String _locID="38834">Do not be discouraged by your slow progress to the Reformation Age. Not everyone is Frederick the Great.</String>
+		<String _locID="38835">Even though you have reached the Reformation Age last, you may still fight by my side.</String>
 		<String _locID="38836">To express my gratitude for rescuing our explorer I shall have a new sapling planted in the Black Forest.</String>
 		<String _locID="38837">My troops have destroyed a trading post. We are no longer threatened by defeat in that manner.</String>
 		<String _locID="38838">The natives in this realm have been freed by my decisive action.</String>
@@ -9456,19 +9456,19 @@
 		<String _locID="39003">A kindergartener could have seen that attack coming.</String>
 		<String _locID="39004">Do you think destroying that trade site will lead to your victory? You probably also claim to see poltergeists.</String>
 		<String _locID="39005">You are like a lammergeier, a cowardly vulture attacking my trade sites when I am not prepared to defend them.</String>
-		<String _locID="39006">Are you waiting until I arrive with the army of the apocalypse before advancing to the Colonial Age?</String>
-		<String _locID="39007">Do you plan to advance to the Colonial Age after your kaffeeklatsch?</String>
-		<String _locID="39008">Apparently Oktoberfest will come and go before you reach the Colonial Age.</String>
+		<String _locID="39006">Are you waiting until I arrive with the army of the apocalypse before advancing to the Reformation Age?</String>
+		<String _locID="39007">Do you plan to advance to the Reformation Age after your kaffeeklatsch?</String>
+		<String _locID="39008">Apparently Oktoberfest will come and go before you reach the Reformation Age.</String>
 		<String _locID="39009">My schnauzer could dog paddle to the New World faster than you advance through the Ages.</String>
 		<String _locID="39010">Your empire is advancing so slowly you might have more luck if you sent settlers to the front lines with rakes.</String>
 		<String _locID="39011">You are taking so long to advance, perhaps you should just pack your whole town up in a wagon and send it back to the old world.</String>
-		<String _locID="39012">It does not take an ubermensch to take an empire to the Colonial Age!</String>
-		<String _locID="39013">Among all combatants, you have reached the Colonial Age first. Surely you do not expect that move alone to save you.</String>
-		<String _locID="39014">Your quick advancement to the Colonial Age fills me with weltschmerz.</String>
+		<String _locID="39012">It does not take an ubermensch to take an empire to the Reformation Age!</String>
+		<String _locID="39013">Among all combatants, you have reached the Reformation Age first. Surely you do not expect that move alone to save you.</String>
+		<String _locID="39014">Your quick advancement to the Reformation Age fills me with weltschmerz.</String>
 		<String _locID="39015">If your strategy is to advance your empire as slowly as possible so as to weaken us with laughter, you are succeeding.</String>
 		<String _locID="39016">Is your empire hitched to a slug?</String>
 		<String _locID="39017">Your slow rise to the second Age indicates you have little wille zur macht.</String>
-		<String _locID="39018">I see you have finally joined the rest of us in the Colonial Age.</String>
+		<String _locID="39018">I see you have finally joined the rest of us in the Reformation Age.</String>
 		<String _locID="39019">You are rather separated from your allies. Perhaps you better begin shouting for help now.</String>
 		<String _locID="39020">Do you expect the poor placement of your town center to allow you more time to practice your harpsichord?</String>
 		<String _locID="39021">It is helpful that your towns are closely packed. We will raze them all as one.</String>
@@ -9662,7 +9662,7 @@
 		<String _locID="39217">Excellent work my friend. Now we must recruit an army.</String>
 		<String _locID="39218">You're off to a great start. Keep at it.</String>
 		<String _locID="39219">Savoring the flavor of the Age would be dandy if we didn't have a war on our hands!</String>
-		<String _locID="39220">Glad to see you made it to the Colonial Age.</String>
+		<String _locID="39220">Glad to see you made it to the Reformation Age.</String>
 		<String _locID="39221">Thank you for rescuing my explorer.</String>
 		<String _locID="39222">My explorer is thankful. Let me know if I can return the favor.</String>
 		<String _locID="39223">Nice to see you've rescued my explorer. I'll put him back to exploring immediately.</String>
@@ -9842,8 +9842,8 @@
 		<String _locID="39400">Cutting off my trade routes will not save you from the wrath of my army.</String>
 		<String _locID="39401">Technological advancements are marvelous things. You should try them sometime.</String>
 		<String _locID="39402">I feel so sorry for your poor technological advancements I'm almost tempted to send you some resources. Heh, almost.</String>
-		<String _locID="39403">I will tell them to put 'First to reach Colonial Age' on your tombstone.</String>
-		<String _locID="39404">How is it the saying goes? Last to Colonial Age, first to die?</String>
+		<String _locID="39403">I will tell them to put 'First to reach Reformation Age' on your tombstone.</String>
+		<String _locID="39404">How is it the saying goes? Last to Reformation Age, first to die?</String>
 		<String _locID="39405">Your town is so far from your allies. They won't be able to hear your screams as your town is being burned to cinders.</String>
 		<String _locID="39406">Cowards of a feather flock together. I suppose that's why you and your ally built next to each other.</String>
 		<String _locID="39407">Nice try. Try again.</String>
@@ -10820,7 +10820,7 @@
 		<String _locID="40385">Do you need some kind of help? You are STILL not Colonial!</String>
 		<String _locID="40386">What is the problem? You cannot build a good army in the Discovery Age!</String>
 		<String _locID="40387">I see you're still in the previous Age from me. Have you even discovered gunpowder yet?</String>
-		<String _locID="40388">Speed in advancement to Colonial Age will not matter in the long run.</String>
+		<String _locID="40388">Speed in advancement to Reformation Age will not matter in the long run.</String>
 		<String _locID="40389">It's about time you reached Colonial. Now you can train a few troops before I devastate your countryside.</String>
 		<String _locID="40390">It is astounding that anyone could advance through the Ages so slowly!</String>
 		<String _locID="40391">Your luck will not hold. Yes, you have acquired the first treasure, but the bulk of the rest will fall to me.</String>
@@ -11443,7 +11443,7 @@
 		<String _locID="41015">When I capture this base, it will unravel the enemy's position.</String>
 		<String _locID="41016">I see you run your economy effectively. I am confident you will prove as good at warfare, no?</String>
 		<String _locID="41017">That was fast! I suspect it bodes well for the future of our alliance.</String>
-		<String _locID="41018">It's about time you managed to reach the Colonial Age with the rest of us.</String>
+		<String _locID="41018">It's about time you managed to reach the Reformation Age with the rest of us.</String>
 		<String _locID="41019">Finally! It took you long enough to get here to Colonial.</String>
 		<String _locID="41020">I see your colony is still in the early stages of construction. Will you be able to withstand more-advanced enemy armies?</String>
 		<String _locID="41021">The enemy will not wait for you to get to Colonial. They'll attack when THEY are ready, not when YOU are ready.</String>
@@ -13699,7 +13699,7 @@
 		<String _locID="43282">Daytime Lighting</String>
 		<String _locID="43283">The city with the sun shining brightly.</String>
 		<String _locID="43284">Evening Light</String>
-		<String _locID="43285">Another day ends for the Empire's capitol city.</String>
+		<String _locID="43285">Another day ends in the capitol city.</String>
 		<String _locID="43286">Daytime Lighting</String>
 		<String _locID="43287">The city with the sun shining brightly.</String>
 		<String _locID="43288">Daytime Lighting</String>
@@ -13922,7 +13922,7 @@
 		<String _locID="43505">Farm</String>
 		<String _locID="43506">Siege Workshop</String>
 		<String _locID="43507">Strong canoe built for combat.</String>
-		<String _locID="43508">Strong in naval combat when built in number, and can train units.</String>
+		<String _locID="43508">War Canoe, heavy warship. Transport ship that can train units. Good against siege warships.</String>
 		<String _locID="43509">War Canoe</String>
 		<String _locID="43510">SHP War Canoe</String>
 		<String _locID="43511">Aenna attack and hitpoints increased.</String>
@@ -14377,7 +14377,7 @@
 		<String _locID="43961">Champion Musket Rider</String>
 		<String _locID="43962">Champion Rifle Rider</String>
 		<String _locID="43963">Dance building / Healing building</String>
-		<String _locID="43964">Native healing building required to advance in Age. Task Villagers on the Fire Pit to perform powerful dances.</String>
+		<String _locID="43964">Native support building. Task Villagers on the Fire Pit to perform powerful dances.</String>
 		<String _locID="43965">Fire Pit</String>
 		<String _locID="43966">Resources.</String>
 		<String _locID="43967">Crates of 500 Food, 500 Wood, and 500 Coin</String>
@@ -14459,7 +14459,7 @@
 		<String _locID="44043">Extensive Fortifications Shipment has arrived.</String>
 		<String _locID="44044">Extensive Fortifications II Shipment has arrived.</String>
 		<String _locID="44045">Strong canoe built for combat.</String>
-		<String _locID="44046">Strong in naval combat when built in number, and can train units</String>
+		<String _locID="44046">Tlaloc Canoe, heavy warship. Transport ship that can train units. Good against siege warships.</String>
 		<String _locID="44047">Tlaloc Canoe</String>
 		<String _locID="44048">SHP Tlaloc Canoe</String>
 		<String _locID="44049">4 Canoes</String>
@@ -14552,7 +14552,7 @@
 		<String _locID="44136">Nobles' Hut</String>
 		<String _locID="44137">Nobles' Hut</String>
 		<String _locID="44138">Light infantry</String>
-		<String _locID="44139">Nobleman that flings javelins from an atlatl. Good against cavalry and Coyote Runners.</String>
+		<String _locID="44139">Nobleman that flings javelins from an atlatl. Good against heavy cavalry.</String>
 		<String _locID="44140">Eagle Runner Knight</String>
 		<String _locID="44141">INF Eagle Runner Knight</String>
 		<String _locID="44142">Hand infantry</String>
@@ -15084,7 +15084,7 @@
 		<String _locID="44668">10 Gunslinger Allies</String>
 		<String _locID="44669">Hire Hungarian Poleaxemen</String>
 		<String _locID="44670">Outlaw Band</String>
-		<String _locID="44671">A large force of outlaws joins your side, with 10 Desperados and 10 Gunslingers.</String>
+		<String _locID="44671">A large force of outlaws joins your side, with 5 Desperados and 10 Gunslingers.</String>
 		<String _locID="44672">Dakota Support</String>
 		<String _locID="44673">The Dakota Nation sends its support.</String>
 		<String _locID="44674">The Dakota Nation sends 5 Tashunke Prowlers and increases the hitpoints of all Tashunke Prowlers.</String>
@@ -16365,9 +16365,9 @@
 		<String _locID="45958">Louverture</String>
 		<String _locID="45959">Grants 4 Gatling Guns and increases their hitpoints.</String>
 		<String _locID="45960">Washington</String>
-		<String _locID="45961">Grants 20 Outlaws. Wild West is researched for free.</String>
+		<String _locID="45961">Grants 10 Outlaws. Wild West is researched for free.</String>
 		<String _locID="45962">Hidalgo</String>
-		<String _locID="45963">Grants 20 Tupi warriors. All Natives are Mythical.</String>
+		<String _locID="45963">Grants 20 Tupi warriors and increases all Native warrior limits.</String>
 		<String _locID="45964">Bonifacio</String>
 		<String _locID="45965">All units gain slightly more hitpoints.</String>
 		<String _locID="45966">Bolivar</String>
@@ -16378,7 +16378,7 @@
 		<String _locID="45971">Grants 10 Hussars and increases their hitpoints.</String>
 		<String _locID="45972">OHiggins</String>
 		<String _locID="45973" symbol="cStringRevoltButton">Revolution!</String>
-		<String _locID="45975" symbol="cStringChooseAge2">Select a Colonial Age</String>
+		<String _locID="45975" symbol="cStringChooseAge2">Select a Reformation Age</String>
 		<String _locID="45976" symbol="cStringChooseAge3">Select an Enlightenment Age</String>
 		<String _locID="45977" symbol="cStringChooseAge4">Select an Industrial Age</String>
 		<String _locID="45978" symbol="cStringChooseAge5">Select an Imperial Age</String>
@@ -16991,8 +16991,8 @@
 		<String _locID="46589">General Custer has arrived. Use your warrior army to find and kill him.</String>
 		<String _locID="46590">Custer's Army has forward bases north of the river. Crazy Horse will send warriors when each of the two forward Town Centers is destroyed.</String>
 		<String _locID="46591">Destroy the revealed buildings to reduce the number of troops that General Custer will bring across the Little Big Horn River and into the Sioux settlement. You will have to fight through enemy towns to get to most of Custer's buildings.</String>
-		<String _locID="46592">Advanced armored warship</String>
-		<String _locID="46593">Advanced armored warship.</String>
+		<String _locID="46592">Armored warship</String>
+		<String _locID="46593">Advanced armored warship with a long-ranged attack.</String>
 		<String _locID="46594">Ironclad</String>
 		<String _locID="46595">SHP Rev Ironclad</String>
 		<String _locID="46596">Imperial Man-o'-War</String>
@@ -17218,7 +17218,7 @@
 		<String _locID="46816">Ranching Shipment has arrived.</String>
 		<String _locID="46817">Great House</String>
 		<String _locID="46818">Grear House shipment has arrived.</String>
-		<String _locID="46819">Bonds between you and minor Native tribes let you train Native Villagers out of your Embassy. Also increases Embassy build limit.</String>
+		<String _locID="46819">Bonds between you and minor Native tribes increase the attack of Embassy warriors and increases Embassy build limit.</String>
 		<String _locID="46820">Kinship Ties</String>
 		<String _locID="46821">Ranching Shipment has arrived.</String>
 		<String _locID="46822">5 Spies</String>
@@ -17595,7 +17595,7 @@
 		<String _locID="47193">TEAM 3 Pet Jaguars</String>
 		<String _locID="47194">TEAM 4 Pet Bears</String>
 		<String _locID="47195">Advanced Scouts</String>
-		<String _locID="47196">Scout line of sight, attack and hitpoints increased.</String>
+		<String _locID="47196">Healers can now heal faster and Scouts line of sight, attack and hitpoints are increased.</String>
 		<String _locID="47197">Offshore Support Shipment has arrived.</String>
 		<String _locID="47198">Ruthlessness</String>
 		<String _locID="47199">War Hut units do greatly increased damage vs. settlers.</String>
@@ -18429,14 +18429,14 @@
 		<String _locID="48030">You have climbed the great tree of time, advancing well before I could.</String>
 		<String _locID="48031">Our enemy claims the rights of guest and stranger in these lands, taking a Native settlement.</String>
 		<String _locID="48032">Our enemy has gone like fog off the water, and claimed a Native ally.</String>
-		<String _locID="48033">You are late in your arrival to the Colonial Age, my ally.</String>
+		<String _locID="48033">You are late in your arrival to the Reformation Age, my ally.</String>
 		<String _locID="48034">Are you waiting for the ducks to return for the summer? Advance to Colonial soon.</String>
 		<String _locID="48035">Do not weep in the silent midnight, instead make haste and advance to the next age.</String>
 		<String _locID="48036">Stop drifting on the stream of time and advance to the next age.</String>
-		<String _locID="48037">You have pushed aside the deerskin curtain, walking into the Colonial Age before anyone else.</String>
-		<String _locID="48038">You have landed first on the shore of the Colonial Age.</String>
-		<String _locID="48039">Has perchance my ally grown old, waiting to advance to the Colonial Age?</String>
-		<String _locID="48040">It is good you have joined us in the Colonial Age, o slow one.</String>
+		<String _locID="48037">You have pushed aside the deerskin curtain, walking into the Reformation Age before anyone else.</String>
+		<String _locID="48038">You have landed first on the shore of the Reformation Age.</String>
+		<String _locID="48039">Has perchance my ally grown old, waiting to advance to the Reformation Age?</String>
+		<String _locID="48040">It is good you have joined us in the Reformation Age, o slow one.</String>
 		<String _locID="48041">Henceforward and forever, I shall speak to the winds my thanks to you.</String>
 		<String _locID="48042">I cry aloud and speak like sunlight: you have rescued my war chief.</String>
 		<String _locID="48043">I have moved heavily upon their trading post in time.</String>
@@ -18709,10 +18709,10 @@
 		<String _locID="48310">Your mischief is unwanted; my trade site has fallen by your hand.</String>
 		<String _locID="48311">With the destruction of that trade site, you have caused my anger to burn.</String>
 		<String _locID="48312">I submit that your time of wild adventure is over; will you ever advance from the Discovery Age?</String>
-		<String _locID="48313">Hurry and advance to the Colonial Age, and join the fray.</String>
+		<String _locID="48313">Hurry and advance to the Reformation Age, and join the fray.</String>
 		<String _locID="48314">Where are your tricks and gambles now? Or are you too upset to advance in age?</String>
 		<String _locID="48315">Are you so confident that you think you can defeat me from the lowly age you rest in now?</String>
-		<String _locID="48316">You are first to the Colonial Age, but the tempest of my wrath shall overtake you.</String>
+		<String _locID="48316">You are first to the Reformation Age, but the tempest of my wrath shall overtake you.</String>
 		<String _locID="48317">What good is advancing an age, when your army's bones will soon be nourishing the grass?</String>
 		<String _locID="48318">Welcome to the Industrial Age, oh chief of flying leaves and swirling dust.</String>
 		<String _locID="48319">If your plan is to watch my empire advance beyond yours, it is working.</String>
@@ -19331,7 +19331,7 @@
 		<String _locID="48932" symbol="cStringSupTrWinRatioTT">Supremacy Treaty Win Percentage: %s</String>
 		<String _locID="48933">War Huts can attack and train infantry. No cavalry, but the Noble's Hut can train special units and has a fast attack. Gets free jaguars with every Age. Builds Fire Pits to boost the economy and military. Best units: Skull Knight, Jaguar Prowl Knight.</String>
 		<String _locID="48934">War Huts can attack and train infantry. Travois constructs buildings for free and Longhouses support more population. Builds Fire Pits to boost the economy and military. Best units: Tomahawks, Light Cannon.</String>
-		<String _locID="48935">War Huts can attack and train infantry. Starts with 200 population and a free Shipment. Builds Fire Pits to boost the economy and military. Best units: Dog Soldier, Tashunke Prowler.</String>
+		<String _locID="48935">War Huts can attack and train infantry. Starts with 200 population and each Special (Big Button) upgrade sends a bison. Builds Fire Pits to boost the economy and military. Best units: Dog Soldier, Tashunke Prowler.</String>
 		<String _locID="48936">Plaza</String>
 		<String _locID="48937">Palace</String>
 		<String _locID="48938">Temple</String>
@@ -19382,7 +19382,7 @@
 		<String _locID="48984">Carib Blowgunner</String>
 		<String _locID="48985">NAT Carib Blowgunner</String>
 		<String _locID="48986">TEAM 3 Villagers shipment sent.</String>
-		<String _locID="48987">TEAM Aztec player sent everyone 3 Villagers.</String>
+		<String _locID="48987">TEAM Aztecs send everyone 3 Villagers.</String>
 		<String _locID="48988">TEAM Everyone gets Chests of 1000 Coin.</String>
 		<String _locID="48989">TEAM Everyone gets Chests of 600 Coin.</String>
 		<String _locID="48990">TEAM Aztecs send all players some adorable pet jaguars.</String>
@@ -20508,7 +20508,7 @@
 		<String _locID="61060">War Jong</String>
 		<String _locID="61061">SHP War Jong</String>
 		<String _locID="61062">Atakabune. Warship good at transport.</String>
-		<String _locID="61063">Atakabune. Slow, powerful ship resistant to building fire that can train units.</String>
+		<String _locID="61063">Atakabune, heavy warship. Transport ship that can train units. Good against siege warships.</String>
 		<String _locID="61064">Atakabune</String>
 		<String _locID="61065">SHP Atakabune</String>
 		<String _locID="61066">Galleon. Warship good at transport.</String>
@@ -20516,7 +20516,7 @@
 		<String _locID="61068">War Jong</String>
 		<String _locID="61069">SHP War Jong</String>
 		<String _locID="61070">Fune. Exploration ship</String>
-		<String _locID="61071">Fune. Good at exploring, fishing or transport.</String>
+		<String _locID="61071">Fune, light warship. Exploration ship that can fish. Good against heavy warships.</String>
 		<String _locID="61072">Fune</String>
 		<String _locID="61073">SHP Fune</String>
 		<String _locID="61074">Ramming, exploding ship</String>
@@ -21110,7 +21110,7 @@
 		<String _locID="61662">Mongolian Livestock</String>
 		<String _locID="61663">Mongolian Livestock Shipment has arrived.</String>
 		<String _locID="61664">Wokou Dhow. Mercenary warship.</String>
-		<String _locID="61665">Wokou Dhow. Mercenary warship.</String>
+		<String _locID="61665">Wokou Dhow, light warship. Mercenary ship. Good against heavy warships.</String>
 		<String _locID="61666">Wokou Dhow</String>
 		<String _locID="61667">SHP Wokou Dhow</String>
 		<String _locID="61668">Ships a Wokou Dhow containing Wokou Samurai outlaws.</String>
@@ -21237,7 +21237,7 @@
 		<String _locID="61789">Kendo Dojo</String>
 		<String _locID="61790">Howdah, Mahouts, and Siege Elephants can be trained an Age early, +1 Villager.</String>
 		<String _locID="61791">Early Elephants</String>
-		<String _locID="61792">TEAM allows Skirmishers in Colonial Age.</String>
+		<String _locID="61792">TEAM allows Skirmishers in Reformation Age.</String>
 		<String _locID="61793">Kendo Dojo</String>
 		<String _locID="61794">Early Elephants has arrived.</String>
 		<String _locID="61795">Upgrades to Hombu Dojo, increasing Dojo hitpoints and decreasing Dojo unit train time.</String>
@@ -21649,7 +21649,7 @@
 		<String _locID="62201">Delinquent Thuggee</String>
 		<String _locID="62202">GRD Delinquent Thuggee</String>
 		<String _locID="62203">War Jong. Exploration ship</String>
-		<String _locID="62204">War Jong. Good at exploring, fishing or transport.</String>
+		<String _locID="62204">War Jong, light warship. Exploration ship that can fish. Good against heavy warships.</String>
 		<String _locID="62205">War Jong</String>
 		<String _locID="62206">SHP War Jong</String>
 		<String _locID="62207">Ships 2 Naginata Riders and 1 Daimyo.</String>
@@ -22946,7 +22946,7 @@
 		<String _locID="63610">Native Building</String>
 		<String _locID="63611">NAT Shaolin Temple</String>
 		<String _locID="63612">Fuchuan. Heavy warship</String>
-		<String _locID="63613">Fuchuan. A heavy warship that can train units.</String>
+		<String _locID="63613">Fuchuan, heavy warship. Transport ship that can train units. Good against siege warships.</String>
 		<String _locID="63614">Fuchuan</String>
 		<String _locID="63615">SHP Fuchuan</String>
 		<String _locID="63616">Exalted Fuchuan</String>
@@ -23204,7 +23204,7 @@
 		<String _locID="63906">Mythical Natives</String>
 		<String _locID="63907">Build Wonders with Villagers to Advance to the next age.</String>
 		<String _locID="63908">Use your Villagers to build Wonders to advance to the next age.</String>
-		<String _locID="63909">Colonial Age</String>
+		<String _locID="63909">Reformation Age</String>
 		<String _locID="63910">Use your Villagers to build Wonders to advance to the next age.</String>
 		<String _locID="63911">Enlightenment Age</String>
 		<String _locID="63912">Use your Villagers to build Wonders to advance to the next age.</String>
@@ -23264,9 +23264,9 @@
 		<String _locID="63967">Deadfall</String>
 		<String _locID="63968">SPC YP Deadfall</String>
 		<String _locID="63969">Advance in Age with a Villager.</String>
-		<String _locID="63970">Colonial Age</String>
+		<String _locID="63970">Reformation Age</String>
 		<String _locID="63971">Use your Villagers to build a Wonder to go to the next age.</String>
-		<String _locID="63972">Colonial Age</String>
+		<String _locID="63972">Reformation Age</String>
 		<String _locID="63973" symbol="cStringTcGrantYP">The Emperor has honored you with a grant of provisions from the Imperial City.</String>
 		<String _locID="63974" symbol="cStringTcGrantXP">The Council has provided you with supplies to found a new village.</String>
 		<String _locID="63975">Villagers gather Food from hunted animals faster.</String>
@@ -23803,7 +23803,7 @@
 		<String _locID="64511">Bandit Catamaran</String>
 		<String _locID="64512">GRD Bandit Catamaran</String>
 		<String _locID="64513">Native Asian boat</String>
-		<String _locID="64514">Native boat that can attack or transport units.</String>
+		<String _locID="64514">Light warship. Mercenary transport ship. Good against heavy warships.</String>
 		<String _locID="64515">Marathan Catamaran</String>
 		<String _locID="64516">SHP Marathan Catamaran</String>
 		<String _locID="64517">Treasure guardian</String>
@@ -24883,7 +24883,7 @@
 		<String _locID="65596">Stable</String>
 		<String _locID="65597">Samurai Speed Shipment has arrived.</String>
 		<String _locID="65598">Tekkousen. Heavy warship.</String>
-		<String _locID="65599">Tekkousen. Heavy warship.</String>
+		<String _locID="65599">Tekkousen, heavy warship. Good against siege warships.</String>
 		<String _locID="65600">Tekkousen</String>
 		<String _locID="65601">SHP Tekkousen</String>
 		<String _locID="65602">Kick out your ally so that you can choose a new one.</String>
@@ -25141,7 +25141,7 @@
 		<String _locID="65854">French Expeditionary Force</String>
 		<String _locID="65855">French Expeditionary Force</String>
 		<String _locID="65856">Heavy cavalry with a splash attack, good against archers, skirmishers, and artillery / light artillery, good against infantry</String>
-		<String _locID="65857">An army of French Gendarmes (Cuirassiers) and Horse Artillery.\n5 Gendarmes: heavy cavalry with a trample attack, good against archers, skirmishers, and artillery.\n2 Horse Artillery: quick-moving artillery that is strong versus infantry.</String>
+		<String _locID="65857">An army of French Dragoons.\n10 Dragoons: ranged cavalry, good against cavalry.</String>
 		<String _locID="65858">French Expeditionary Army</String>
 		<String _locID="65859">French Expeditionary Army</String>
 		<String _locID="65860">Hand infantry, good against cavalry</String>
@@ -25803,9 +25803,9 @@
 		<String _locID="66516">Get free Gurkhas with every tech at the Consualte, +1 Villager.</String>
 		<String _locID="66517">Gurkha Aid</String>
 		<String _locID="66518">Sepoy Rebellion Shipment has arrived.</String>
-		<String _locID="66519" symbol="cStringRMSAsianRandom">Asian Maps</String>
+		<String _locID="66519" symbol="cStringRMSAsianRandom">Asian-African Maps</String>
 		<String _locID="66520"/>
-		<String _locID="66521" symbol="cStringRMSRandomAsian">Randomly selects from among all Asian standard maps.</String>
+		<String _locID="66521" symbol="cStringRMSRandomAsian">Randomly selects from among all Asian and African standard maps.</String>
 		<String _locID="66522">Gurkha Army</String>
 		<String _locID="66523">An army of 2 Gurkhas.</String>
 		<String _locID="66524">Gurkha Squad</String>
@@ -28714,7 +28714,7 @@
 		<String _locID="69433">Elephant Combat</String>
 		<String _locID="69434">Camel Combat Shipment has arrived.</String>
 		<String _locID="69435">Elephant Combat Shipment has arrived.</String>
-		<String _locID="69436" symbol="cStringAbstractNameCoyote">Coyote Runners and Disciples</String>
+		<String _locID="69436" symbol="cStringAbstractNameCoyote">Coyote Man and Disciple</String>
 		<String _locID="69437">Begin Exports</String>
 		<String _locID="69438">End Exports</String>
 		<String _locID="69439">Ships a Military Rickshaw that can turn into a Barracks or a Stable.</String>
@@ -28974,7 +28974,7 @@
 		<String _locID="69693" gamecharacter="Lieutenant Nanib" soundfilename="YNANI5034">Look at these villagers. My own people gaze on me with such distrust. I will never get used to it.</String>
 		<String _locID="69694">Food Silos Shipment has arrived.</String>
 		<String _locID="69695">Sustainable Agriculture Shipment has arrived.</String>
-		<String _locID="69696" symbol="cStringWondersColonial">Colonial Age Wonders</String>
+		<String _locID="69696" symbol="cStringWondersColonial">Reformation Age Wonders</String>
 		<String _locID="69697" symbol="cStringWondersFortress">Enlightenment Age Wonders</String>
 		<String _locID="69698" symbol="cStringWondersIndustrial">Industrial Age Wonders</String>
 		<String _locID="69699" symbol="cStringWondersImperial">Imperial Age Wonders</String>
@@ -29060,7 +29060,7 @@
 		<String _locID="69780">VIL Discovery Travois</String>
 		<String _locID="69781">Build a Trading Post here</String>
 		<String _locID="69782">"This is not our war, but if you build a Trading Post here perhaps we can work together."</String>
-		<String _locID="69783">Saltpeter Trade Site</String>
+		<String _locID="69783">Saltpeter Site</String>
 		<String _locID="69784">SPC YP Saltpeter Trade Site</String>
 		<String _locID="69785">Saltpeter Site</String>
 		<String _locID="69786">SPC YP Saltpeter Site</String>
@@ -30036,7 +30036,7 @@
 		<String _locID="78019">Imperial upgrade for Poleaxemen</String>
 		<String _locID="78020">6 Poleaxemen +2 Uhlans</String>
 		<String _locID="78021">7 Poleaxemen +4 Uhlans</String>
-		<String _locID="78022">Dhow. Good at exploring, fishing or transport.</String>
+		<String _locID="78022">Dhow, light warship. Exploration ship that can fish. Good against heavy warships.</String>
 		<String _locID="78023">Dhow. Exploration ship</String>
 		<String _locID="78024">Colonial Militia can now build defenses such as Outposts and walls.</String>
 		<String _locID="78025">Veteran Marine</String>
@@ -30081,7 +30081,7 @@
 		<String _locID="78064">Veteran Fencible</String>
 		<String _locID="78065">Veteran Fencibles</String>
 		<String _locID="78066">Composite Bows</String>
-		<String _locID="78067">Archer cavalry and infantry have their attack increased.</String>
+		<String _locID="78067">Archer (and Crossbow) cavalry and infantry have their attack increased.</String>
 		<String _locID="78068">Lumber Camp Wagon</String>
 		<String _locID="78069">Transforms into a Lumber Camp.</String>
 		<String _locID="780670">Transforms into a Lumber Camp</String>
@@ -30147,7 +30147,7 @@
 		<String _locID="780730">Colonel Custer</String>
 		<String _locID="780731">Polish royal cavalry with a trample attack.</String>
 		<String _locID="780732">Patriots</String>
-		<String _locID="780733">All your Settlers transform into Militia.</String>
+		<String _locID="780733">All your Settlers transform into Militia. Also improves all Militia.</String>
 		<String _locID="780734">Trade Guard</String>
 		<String _locID="780735">Town Centers support 10 more population and maximum population cap is increased by 30. Also increases gather rate of nearby units.</String>
 		<String _locID="780736">Trade Wagon</String>
@@ -30155,7 +30155,7 @@
 		<String _locID="780738">Fishery</String>
 		<String _locID="780739">Pirate fishery worth 300 Food.</String>
 		<String _locID="780740">Native Confederacy Support</String>
-		<String _locID="780741">Joining the Native Confederacy increases the amount of warriors you can train from minor tribes and allows military units to train in larger blocks. Also enables Black Powder Boats.</String>
+		<String _locID="780741">Joining the Native Confederacy increases the amount of native warriors you can train from minor tribes and allows military units to train in larger blocks. Also enables Black Powder Boats.</String>
 		<String _locID="780742">You have joined the Native Confederacy!</String>
 		<String _locID="780743">Patriot Militia</String>
 		<String _locID="780744">Fisheries must be built near Fish.</String>
@@ -30164,8 +30164,8 @@
 		<String _locID="780747">Town Centers cannot be built too close to any starting Town Center.</String>
 		<String _locID="780748">Repentant Miner</String>
 		<String _locID="780749">You have used Fame to get 5 Shipments from your Home City.</String>
-		<String _locID="780750">An army of French Culverins Royale.\n2 Culverins: light artillery that is good against other artillery and ships.</String>
-		<String _locID="780751">An army of French Culverins Royale and Gendarmes (Cuirassiers).\n2 Culverins: light artillery that is good against other artillery and ships.\n3 Gendarmes: heavy cavalry with a trample attack, good against archers, skirmishers, and artillery.</String>
+		<String _locID="780750">An army of French Voltigeurs (Skirmishers).\n6 Voltigeurs: riflemen armed with a long-ranged attack, but low hitpoints.</String>
+		<String _locID="780751">An army of French Hussars.\n8 Hussars: hand cavalry, good against archers, skirmishers, and artillery.</String>
 		<String _locID="780752">Imperial Gendarmes</String>
 		<String _locID="780753">Imperial Gendarme</String>
 		<String _locID="780754">Imperial Age Rush</String>
@@ -30210,7 +30210,7 @@
 		<String _locID="780793">Advance in Age to unlock new technologies and units.</String>
 		<String _locID="780794">Enables the Academy and University to generate Export over time.</String>
 		<String _locID="780795">Import</String>
-		<String _locID="780796">Trains sinister outlaws and mercenaries.</String>
+		<String _locID="780796">Trains sinister outlaws and mercenaries. Provides Explorer upgrades.</String>
 		<String _locID="780797">Control Flag</String>
 		<String _locID="780798">Capture Control Flags to gain a small experience trickle and line of sight in the area. Military units move faster around flags.</String>
 		<String _locID="780799">Strategic point</String>
@@ -30268,7 +30268,7 @@
 		<String _locID="780850">Ships an army of 10 unique native units currently available at the Embassy.</String>
 		<String _locID="780851">Market Wagon</String>
 		<String _locID="780852">Markets become cheaper and have better resource exchange rates.</String>
-		<String _locID="780853">Moves the Arsenal to the Colonial Age and enables more powerful Arsenal improvements.</String>
+		<String _locID="780853">Moves the Arsenal to the Reformation Age and enables more powerful Arsenal improvements.</String>
 		<String _locID="780854">Mill Wagon</String>
 		<String _locID="780855">Mills can now support two more gatherers and become cheaper and stronger.</String>
 		<String _locID="780856">Transforms into a Mill</String>
@@ -30329,8 +30329,8 @@
 		<String _locID="780921">Native Ties</String>
 		<String _locID="780922">Indian Allies\n</String>
 		<String _locID="780923">Trains:\nMahout\nHowdah\nFlail Elephants\nSiege Elephants\n \nShipments:\nElephants</String>
-		<String _locID="780924">Brig</String>
-		<String _locID="780925">Brig. Good at exploring, fishing or transport.</String>
+		<String _locID="780924">Explorer's Brig</String>
+		<String _locID="780925">Explorer's Brig. Good at exploring, transport and can build Docks. Cannot die.</String>
 		<String _locID="780926">Brig. Exploration ship</String>
 		<String _locID="780927">Heavy Culverins</String>
 		<String _locID="780928">Heavy Culverin</String>
@@ -30386,17 +30386,17 @@
 		<String _locID="780978">Pilgrimage</String>
 		<String _locID="780979">Ships 10 Pilgrims that work faster than normal villagers and don't take up population.</String>
 		<String _locID="780980">Swedish Allies\n+10% Building Hitpoints</String>
-		<String _locID="780981">Trains:\nSakers\nSkarpskytt\nHorse Artillery\n \nShipments:\nTown improvements</String>
+		<String _locID="780981">Trains:\nFalconets\nSkarpskytt\nHorse Artillery\n \nShipments:\nTown improvements</String>
 		<String _locID="780982">Loyalist Militia</String>
 		<String _locID="780983">Bakery Wagon</String>
 		<String _locID="780984">Transforms into a Bakery.</String>
 		<String _locID="780985">Allows Pilgrims to be trained from Churches.</String>
 		<String _locID="780986">Northern Logging</String>
 		<String _locID="780987">Villagers gather Wood faster and ships a Lumber Camp Wagon.</String>
-		<String _locID="780988">Ships a large number of Svealand Sakers (Sakers) and Horse Artillery led by a General.</String>
+		<String _locID="780988">Ships a large number of Geshwinda Falconets (Falconets) and Horse Artillery led by a General.</String>
 		<String _locID="780989">Swedish Brigade</String>
 		<String _locID="780990">Indelta Grenadier</String>
-		<String _locID="780991">Geshwinda Artillery</String>
+		<String _locID="780991">Geshwinda Falconet</String>
 		<String _locID="780992">Svealand Saker</String>
 		<String _locID="780993">George Washington is all about militia and giving power to the people. He is not very chatty and usually focuses on the task at hand. He has a strong economy and well organized units.</String>
 		<String _locID="780994">George Washington</String>
@@ -30470,11 +30470,11 @@
 		<String _locID="781062">TEAM Artillery Damage Shipment has arrived.</String>
 		<String _locID="781063">TEAM 1 Bank Wagon</String>
 		<String _locID="781064">Thatch</String>
-		<String _locID="781065">Grants a pirate fleet and increases warship limits.</String>
+		<String _locID="781065">Grants 4 pirate ships and increases warship limits.</String>
 		<String _locID="781067">Pope Pius IX</String>
 		<String _locID="781068">Celebrated as a "friend of light" and a reformer of Europe towards freedom and progress, Pope Pius IX is progressive, intellectual, decent, friendly, and open to everybody.</String>
 		<String _locID="781069">Italians</String>
-		<String _locID="781070">Home City gives support and bonuses through Decree cards. Basilica trains powerful religious units. Fame generates faster over time. Best units: Cranequinier, Basilisk Cannon.</String>
+		<String _locID="781070">Home City gives support and bonuses through Decree cards. Basilica trains powerful religious units and Capitol sends mercenary armies. Fame generates faster over time. Best units: Cranequinier, Basilisk Cannon.</String>
 		<String _locID="781071">Original version of the Italian Military Academy.</String>
 		<String _locID="781072">Gold and brown version of Italian Military Academy.</String>
 		<String _locID="781073">Peregrine Institute of Rome</String>
@@ -30569,7 +30569,7 @@
 		<String _locID="781162">10 Flatbowmen</String>
 		<String _locID="781163">24 Flatbowmen</String>
 		<String _locID="781164">Maghrabi Blade</String>
-		<String _locID="781165">Arabian unit that throws knives. Good against infantry.</String>
+		<String _locID="781165">Arabian unit that throws knives. Good against heavy cavalry.</String>
 		<String _locID="781166">Ships a number of Arabian Maghrabi mercenaries.</String>
 		<String _locID="781167">Hire Arabian Maghrabi</String>
 		<String _locID="781168">Marauder</String>
@@ -30583,19 +30583,19 @@
 		<String _locID="781176">An army of Swiss Reislaufer mercenaries.\n4 Reislaufer: elite mercenary armed with a pike, good against cavalry.</String>
 		<String _locID="781177">An army of German Landsknecht mercenaries.\n5 Landsknecht: flamboyant heavy infantry mercenary.</String>
 		<String _locID="781178">An army of German Black Riders mercenaries.\n10 Black Riders: heavily armed mercenary cavalry.</String>
-		<String _locID="781179">Provides your Church with unique Italian improvements. Also moves the Capitol to the Enlightenment Age.</String>
+		<String _locID="781179">Provides your Basilica with unique Italian improvements. Also moves the Capitol to the Enlightenment Age.</String>
 		<String _locID="781180">New World Conquest</String>
 		<String _locID="781181">Royal Decree "Sacred Congregation" Shipment has arrived.</String>
 		<String _locID="781182">Sacraments</String>
 		<String _locID="781183">Venetian Gothic</String>
-		<String _locID="781184">Architect train limit is increased and Architects can build much faster. Also, they can build Town Centers and Trading Posts extremely fast.</String>
+		<String _locID="781184">Fort and Factory build limits increased.</String>
 		<String _locID="781185">Royal Training</String>
 		<String _locID="781186">Fame armies cost less but train slower.</String>
 		<String _locID="781187">Entrepreneur</String>
 		<String _locID="781188">Improves your Italian Explorer in combat, makes him free to train (ransom) and gives him a powerful canine companion.</String>
 		<String _locID="781189">Entrepreneur Shipment has arrived.</String>
 		<String _locID="781190">Colonel Shipment has arrived.</String>
-		<String _locID="781191">An Inquisitor gathers at every Town Center and Inquisitor healing range is increased. Also, Pilgrims are faster.</String>
+		<String _locID="781191">An Inquisitor gathers at every Town Center and Inquisitor healing range is increased. Also, Pilgrims and Architects are faster.</String>
 		<String _locID="781192">Pavise Shield</String>
 		<String _locID="781193">Crossbowman and Cranequinier armor and hitpoints increased.</String>
 		<String _locID="781194">Cranequinier</String>
@@ -30607,7 +30607,7 @@
 		<String _locID="781200">Swedish Expeditionary Company</String>
 		<String _locID="781201">Swedish Expeditionary Force</String>
 		<String _locID="781202">Swedish Expeditionary Army</String>
-		<String _locID="781203">An army of Swedish Svealand Sakers (Sakers).\n3 Svealand Sakers: light artillery, good against infantry and artillery.</String>
+		<String _locID="781203">An army of Swedish Geshwinda Falconets (Falconets).\n3 Falconets: light artillery that is better against infantry than buildings.</String>
 		<String _locID="781204">Ships an additional Explorer's Dog to your colony and increases Wardog limit.</String>
 		<String _locID="781205">Hounds</String>
 		<String _locID="781206">TEAM Westward Expansion</String>
@@ -30629,12 +30629,12 @@
 		<String _locID="781222">Mercenary Force</String>
 		<String _locID="781223">Mercenary Brigade</String>
 		<String _locID="781224">Skarpskytt</String>
-		<String _locID="781225">An army of Swedish Svealand Sakers (Sakers) and Skarpskytt.\n2 Svealand Sakers: light artillery, good against infantry and artillery.\n6 Skarpskytt: long-ranged skirmisher, good against infantry.</String>
+		<String _locID="781225">An army of Swedish Geshwinda Falconets (Falconets) and Skarpskytt.\n2 Falconets: light artillery that is better against infantry than buildings.\n6 Skarpskytt: long-ranged skirmisher, good against infantry.</String>
 		<String _locID="781226">An army of Swedish Skarpskytt and Horse Artillery.\n8 Skarpskytt: long-ranged skirmisher, good against infantry.\n2 Horse Artillery: quick-moving artillery that is strong versus infantry.</String>
 		<String _locID="781227">TEAM Cheap Age Up</String>
-		<String _locID="781228">TEAM All Age Up politicians, copuncil members and wonders become cheaper.</String>
+		<String _locID="781228">TEAM All Age Up politicians, council members and wonders become cheaper.</String>
 		<String _locID="781229">TEAM Cheap Age Up Shipment has arrived.</String>
-		<String _locID="781230">TEAM 4 Pilgrims</String>
+		<String _locID="781230">TEAM 3 Pilgrims</String>
 		<String _locID="781231">Ships a number of Italian Elmeti mercenaries.</String>
 		<String _locID="781232">Hire Genoese Elmeti</String>
 		<String _locID="781233">9 Cranequinier</String>
@@ -30642,22 +30642,106 @@
 		<String _locID="781235">TEAM All artillery attack and hitpoints increased.</String>
 		<String _locID="781236">TEAM Artillery Combat Shipment has arrived.</String>
 		<String _locID="781237">Heals injured units. Boosts hitpoints of nearby units.</String>
-		<String _locID="781238">TEAM Archaic Infantry Attack</String>
-		<String _locID="781239">TEAM Archaic Infantry attack increased.</String>
-		<String _locID="781240">TEAM Archaic Infantry Attack Shipment has arrived.</String>
+		<String _locID="781238">Archaic Infantry Attack</String>
+		<String _locID="781239">Pikeman and Crossbowman attack increased.</String>
+		<String _locID="781240">Archaic Infantry Attack Shipment has arrived.</String>
 		<String _locID="781241">Ships 25 Pikemen and 1 Flag Bearer.</String>
 		<String _locID="781242">Retinues</String>
 		<String _locID="781243">Archaic Infantry Hitpoints</String>
-		<String _locID="781244">Archaic Infantry hitpoints increased.</String>
+		<String _locID="781244">Pikeman and Crossbowman hitpoints increased.</String>
 		<String _locID="781245">Archaic Infantry Hitpoints Shipment has arrived.</String>
 		<String _locID="781246">Archaic Infantry Combat</String>
-		<String _locID="781247">Archaic Infantry attack and hitpoints increased.</String>
+		<String _locID="781247">Pikeman and Crossbowman attack and hitpoints increased.</String>
 		<String _locID="781248">Archaic Infantry Combat Shipment has arrived.</String>
 		<String _locID="781249">6 Sakers</String>
 		<String _locID="781250">8 Sakers</String>
 		<String _locID="781251">Hussar and Cranequinier hitpoints increased.</String>
 		<String _locID="781252">Hussar and Cranequinier attack increased.</String>
 		<String _locID="781253">Marine range and line of sight increased.</String>
-		<String _locID="781254">Petrine Reforms Shipment has arrived.</String>
+		<String _locID="781254">Foreign Reforms Shipment has arrived.</String>
+		<String _locID="781255">Hussar and Cranequinier attack and hitpoints increased.</String>
+		<String _locID="781256">Spiritual Grace</String>
+		<String _locID="781257">Sacraments Shipment has arrived.</String>
+		<String _locID="781258">All Basilica units train faster and their cost is changed to Fame.</String>
+		<String _locID="781259">Ships a number of Swedish Fusilier mercenaries. Instead of Uhlans you get extra Fusiliers.</String>
+		<String _locID="781260">Ships a number of Italian Elmeti mercenaries. Instead of Uhlans you get extra Elmeti.</String>
+		<String _locID="781261">Ships a number of Polish Winged Knights mercenaries. Instead of Uhlans you get extra Winged Knights.</String>
+		<String _locID="781262">Zebra</String>
+		<String _locID="781263">Dromedary</String>
+		<String _locID="781264">Industrial-scale herding! You get 1 Bison for every 3 minutes of game length, up to 30 minutes.</String>
+		<String _locID="781265">Bison Herding</String>
+		<String _locID="781266">Foreign Reforms</String>
+		<String _locID="781267">Caroleans</String>
+		<String _locID="781268">Swedish</String>
+		<String _locID="781269">Home City gives support and bonuses through Decree cards. Starts with a Fishing Boat on water maps and gets a free Fishing Boat each Age. Can build Lumber Camps and Fortified Walls. Best units: Skarpskytt, Grenadier.</String>
+		<String _locID="781270">Christina Augusta</String>
+		<String _locID="781271">Christina is remembered as one of the most educated women of the 1600s. She was fond of books, manuscripts, paintings, and sculptures. She was intelligent, fickle and moody; she rejected the sexual role of a woman.</String>
+		<String _locID="781272">When this Shipment arrives, all of your current Fame is exchanged for a lesser amount of Coin.</String>
+		<String _locID="781273">King's Reward</String>
+		<String _locID="781274">King's Reward Shipment has arrived.</String>
+		<String _locID="781275">Imperial upgrade for Skarpskytts.</String>
+		<String _locID="781276">Imperial Skarpskytts</String>
+		<String _locID="781277">Imperial Skarpskytt</String>
+		<String _locID="781278">Skarpskytt attack and hitpoints increased.</String>
+		<String _locID="781279">Guard Skarpskytts</String>
+		<String _locID="781280">Guard Skarpskytt</String>
+		<String _locID="781281">Vandrare</String>
+		<String _locID="781282">Imperial upgrade for Vandrares.</String>
+		<String _locID="781283">Imperial Vandrares</String>
+		<String _locID="781284">Imperial Vandrare</String>
+		<String _locID="781285">Vandrare attack and hitpoints increased.</String>
+		<String _locID="781286">Guard Vandrares</String>
+		<String _locID="781287">Guard Vandrare</String>
+		<String _locID="781288">Ranged cavalry armed with archaic firearms. Good against cavalry and artillery.</String>
+		<String _locID="781289">Veteran Vandrares</String>
+		<String _locID="781290">Veteran Vandrare</String>
+		<String _locID="781291">Royal Decree "Kalmar Union" Shipment has arrived.</String>
+		<String _locID="781292">Kalmar Union</String>
+		<String _locID="781293">Provides your Church with unique Swedish improvements. Also moves the Capitol to the Enlightenment Age.</String>
+		<String _locID="781294">Allotment System</String>
+		<String _locID="781295">Ordinance of Alsno</String>
+		<String _locID="781296">Fekete Sereg</String>
+		<String _locID="781297">Ships 10 Fekete Sereg (Poleaxemen) soldiers from your foreign allies.</String>
+		<String _locID="781298">Veteran Skarpskytt</String>
+		<String _locID="781299">3 Inquisitors</String>
+		<String _locID="781300">7 Turkeys</String>
+		<String _locID="781301">Redoubt</String>
+		<String _locID="781302">Wall siege armor increased.</String>
+		<String _locID="781303">Fortress</String>
+		<String _locID="781304">3 Fire Ships</String>
+		<String _locID="781305">Barricades</String>
+		<String _locID="781306">Industrial-scale herding! You get 1 Deer for every 3 minutes of game length, up to 30 minutes.</String>
+		<String _locID="781307">Deer Herding</String>
+		<String _locID="781308">Industrial-scale herding! You get 1 Turkey for every 3 minutes of game length, up to 30 minutes.</String>
+		<String _locID="781309">Turkey Herding</String>
+		<String _locID="781310">Trade Act</String>
+		<String _locID="781311">For the rest of the game, small trickles of Food and Coin enrich you.</String>
+		<String _locID="781312">Trade Act shipment has arrived.</String>
+		<String _locID="781313">Basilica</String>
+		<String _locID="781314">2 Warriors will gather at each Teepee.</String>
+		<String _locID="781315">Warrior Defense</String>
+		<String _locID="781316">Black powder made with saltpeter increases gunpowder units range.</String>
+		<String _locID="781317">Fine Powder</String>
+		<String _locID="781318">Ivory hunting! You get 1 Elephant for every 3 minutes of game length, up to 30 minutes.</String>
+		<String _locID="781319">Randomly selects from among all water standard maps.</String>
+		<String _locID="781320">TEAM All players receive some playful pet bears.</String>
+		<String _locID="781321">Clan Service</String>
+		<String _locID="781322">Clan Service Shipment has arrived.</String>
+		<String _locID="781323">Wildfire</String>
+		<String _locID="781324">Firepits can be built in the Discovery Age, are stronger, faster to build and become free.</String>
+		<String _locID="781325">Wildfire Shipment has arrived.</String>
+		<String _locID="781326">Venom Extract</String>
+		<String _locID="781327">Medicine made from venom extract makes all your healers heal faster.</String>
+		<String _locID="781328">Rich Harvest</String>
+		<String _locID="781329">Ivory</String>
+		<String _locID="781330">Water Maps</String>
+		<String _locID="781331">Bishari Archer</String>
+		<String _locID="781332">Master Bishari Archer</String>
+		<String _locID="781333">Saltpeter Master Training</String>
+		<String _locID="781334">Saltpeter warrior attack and hitpoints increased.</String>
+		<String _locID="781335">Initiated Bishari Archer</String>
+		<String _locID="781336">Saltpeter Initiation Training</String>
+		<String _locID="781337">African ranged cavalry</String>
+		<String _locID="781338">Sufi ranged cavalry. Good against cavalry.</String>
 	</Language>
 </StringTable>
\ No newline at end of file
diff --git a/Data/techtreem.xml b/Data/techtreem.xml
index 5f79753..1de9193 100644
--- a/Data/techtreem.xml
+++ b/Data/techtreem.xml
@@ -27,13 +27,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -268,12 +268,6 @@
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">NativeHouseAztec</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">NatJaguarWarrior</Target>
-			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">NatEagleWarrior</Target>
-			</Effect>
 			<Effect type="TechStatus" status="obtainable">NatChinampa</Effect>
 			<Effect type="TechStatus" status="obtainable">ChampionAztecs</Effect>
 			<Effect type="TechStatus" status="obtainable">NatGarlandWars</Effect>
@@ -387,13 +381,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -687,13 +681,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -740,9 +734,6 @@
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">Envoy</Target>
 			</Effect>
-			<Effect type="Data" amount="-1.00" subtype="AllowedAge" relativity="Absolute">
-				<Target type="ProtoUnit">Barracks</Target>
-			</Effect>
 			<Effect type="TechStatus" status="obtainable">ImperialLongbowmen</Effect>
 			<Effect type="Data" amount="-1.00" subtype="AllowedAge" relativity="Absolute">
 				<Target type="ProtoUnit">ArtilleryDepot</Target>
@@ -952,13 +943,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -1215,13 +1206,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -1454,13 +1445,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -1693,13 +1684,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -1960,13 +1951,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -4824,6 +4815,7 @@
 		<Status>UNOBTAINABLE</Status>
 		<Flag>Shadow</Flag>
 		<Effects>
+			<Effect type="TechStatus" status="obtainable">BigDeer</Effect>
 			<Effect type="TechStatus" status="obtainable">BigDockCipactli</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">LivestockPen</Target>
@@ -5083,6 +5075,7 @@
 			<Effect type="TechStatus" status="active">EliteHorsemen</Effect>
 			<Effect type="TechStatus" status="active">EliteAennas</Effect>
 			<Effect type="TechStatus" status="active">FieldCannon</Effect>
+			<Effect type="TechStatus" status="active">BigDeer</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="PostImperialXPIroquois" type="Normal">
@@ -5341,16 +5334,15 @@
 		<Status>UNOBTAINABLE</Status>
 		<Flag>Shadow</Flag>
 		<Effects>
+			<Effect type="TechStatus" status="obtainable">BigWarrior</Effect>
 			<Effect type="TechStatus" status="obtainable">BigDockCipactli</Effect>
+			<Effect type="TechStatus" status="obtainable">BigBisons</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">LivestockPen</Target>
 			</Effect>
 			<Effect type="Data" amount="200.00" subtype="Cost" resource="Wood" relativity="Assign">
 				<Target type="ProtoUnit">Dock</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Resource" resource="Ships" relativity="Absolute">
-				<Target type="Player"/>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">Factory</Target>
 			</Effect>
@@ -5588,6 +5580,7 @@
 			<Effect type="TechStatus" status="active">EliteBowRider</Effect>
 			<Effect type="TechStatus" status="active">StrongWarHut</Effect>
 			<Effect type="TechStatus" status="active">MightyWarHut</Effect>
+			<Effect type="TechStatus" status="active">BigBisons</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="PostIndustrialXPAztec" type="Normal">
@@ -5620,6 +5613,7 @@
 			<Effect type="TechStatus" status="active">EliteMacehualtins</Effect>
 			<Effect type="TechStatus" status="active">ElitePumaMen</Effect>
 			<Effect type="TechStatus" status="active">EliteCoyotemen</Effect>
+			<Effect type="TechStatus" status="active">BigTurkey</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="PostImperialXPAztec" type="Normal">
@@ -6942,6 +6936,8 @@
 			<Effect type="TechStatus" status="active">ypNatHonoredJesuit</Effect>
 			<Effect type="TechStatus" status="active">ypNatDisciplinedSufi</Effect>
 			<Effect type="TechStatus" status="active">ypNatHonoredSufi</Effect>
+			<Effect type="TechStatus" status="active">ypNatDisciplinedSaltpeter</Effect>
+			<Effect type="TechStatus" status="active">ypNatHonoredSaltpeter</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="AAStandardNativeTechsPI" type="Normal">
@@ -6980,6 +6976,8 @@
 			<Effect type="TechStatus" status="active">ypNatHonoredShaolin</Effect>
 			<Effect type="TechStatus" status="active">ypNatHonoredJesuit</Effect>
 			<Effect type="TechStatus" status="active">ypNatDisciplinedJesuit</Effect>
+			<Effect type="TechStatus" status="active">ypNatDisciplinedSaltpeter</Effect>
+			<Effect type="TechStatus" status="active">ypNatHonoredSaltpeter</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="YPAge0Japanese" type="Normal">
@@ -7328,11 +7326,11 @@
 			<Effect type="TechStatus" status="obtainable">YPNatSufiSharia</Effect>
 			<Effect type="TechStatus" status="obtainable">YPNatSufiPilgramage</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">ypNatWarElephant</Target>
+				<Target type="ProtoUnit">CamelArcher</Target>
 			</Effect>
-			<Effect type="TechStatus" status="obtainable">ypNatHonoredSufi</Effect>
+			<Effect type="TechStatus" status="obtainable">ypNatHonoredSaltpeter</Effect>
+			<Effect type="TechStatus" status="obtainable">ypNatDisciplinedSaltpeter</Effect>
 			<Effect type="TechStatus" status="obtainable">YPNatSufiFasting</Effect>
-			<Effect type="TechStatus" status="obtainable">ypNatDisciplinedSufi</Effect>
 			<Effect type="TechStatus" status="obtainable">ypNativeTreatySufi</Effect>
 			<Effect type="TechStatus" status="obtainable">ypNativeTradeTreatySufi</Effect>
 			<Effect type="TechStatus" status="obtainable">YPNativeJunk</Effect>
@@ -9368,7 +9366,7 @@
 			<TechStatus status="Active">ypHCConsulateRelations</TechStatus>
 		</Prereqs>
 		<Effects>
-			<Effect type="Data" amount="10.00" subtype="FreeHomeCityUnit" unittype="USColonialMilitia2" relativity="Absolute">
+			<Effect type="Data" amount="8.00" subtype="FreeHomeCityUnit" unittype="Sharpshooter" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="TechStatus" status="unobtainable">ypHCConsulateRelations</Effect>
@@ -10151,6 +10149,8 @@
 			<Effect type="TechStatus" status="active">ChampionZapotec</Effect>
 			<Effect type="TechStatus" status="active">ypMarketWheelbarrow2</Effect>
 			<Effect type="TechStatus" status="active">ypMarketWheelbarrow</Effect>
+			<Effect type="TechStatus" status="active">ypNatDisciplinedSaltpeter</Effect>
+			<Effect type="TechStatus" status="active">ypNatHonoredSaltpeter</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="ypNativeSaltpeter" type="Normal">
@@ -10158,7 +10158,20 @@
 		<Status>UNOBTAINABLE</Status>
 		<Flag>Shadow</Flag>
 		<Effects>
+			<Effect tech="Age0French" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="CrateofWood" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">ypNatWarElephant</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">ypNatHonoredSufi</Effect>
+			<Effect type="TechStatus" status="obtainable">ypNatDisciplinedSufi</Effect>
+			<Effect type="TechStatus" status="obtainable">VenomExtract</Effect>
+			<Effect type="TechStatus" status="obtainable">NatElephants</Effect>
+			<Effect type="TechStatus" status="obtainable">NatFinePowder</Effect>
+			<Effect type="TechStatus" status="obtainable">NativeTreatySaltpeter</Effect>
 			<Effect type="TechStatus" status="obtainable">ypNativeEmbassyEnableShadow</Effect>
+			<Effect type="TechStatus" status="obtainable">ypNativeTradeTreatySaltpeter</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="ypImpLegendaryNatives" type="Normal">
@@ -10689,73 +10702,7 @@
 				<Target type="ProtoUnit">AbstractHandInfantry</Target>
 			</Effect>
 			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">Crossbowman</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatBlackwoodArcher</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatBlowgunWarrior</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatBolasWarrior</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">xpEagleKnight</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatSharktoothBowman</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">Longbowman</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">Flatbowman</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">xpWarBow</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">xpAenna</Target>
-			</Effect>
-			<Effect slot="0" type="Data" amount="1.10" subtype="HeroCost" relativity="BasePercent">
-				<Target type="ProtoUnit">xpArrowKnight</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">xpMacehualtin</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatMercBlackwoodArcher</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypConsulateShinobi</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypShinobiHorse</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypYumi</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypConsulateBestieros</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatMercBlowgunWarrior</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">NatBlowgunAmbusher</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypWokouBlindMonk</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypRepentantBlindMonk</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypMercIronTroop</Target>
-			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">ypRepentantIronTroop</Target>
+				<Target type="ProtoUnit">AbstractArcher</Target>
 			</Effect>
 		</Effects>
 	</Tech>
@@ -10893,101 +10840,18 @@
 		</Prereqs>
 		<Effects>
 			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Musketeer</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Janissary</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Grenadier</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercHighlander</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Musketeer</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Janissary</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercHighlander</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Grenadier</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Grenadier</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercHighlander</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Janissary</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Musketeer</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Musketeer</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Janissary</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercHighlander</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">Grenadier</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercFusilier</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercFusilier</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercFusilier</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">MercFusilier</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypAshigaru</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypAshigaru</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypAshigaru</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypAshigaru</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">BoneguardRifleman</Target>
+				<Target type="ProtoUnit">AbstractHeavyInfantry</Target>
 			</Effect>
 			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">BoneguardRifleman</Target>
+				<Target type="ProtoUnit">AbstractHeavyInfantry</Target>
 			</Effect>
 			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">BoneguardRifleman</Target>
-			</Effect>
-			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">BoneguardRifleman</Target>
-			</Effect>
-			<Effect type="Data" action="DefendHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypConsulateStadhouders</Target>
+				<Target type="ProtoUnit">AbstractHeavyInfantry</Target>
 			</Effect>
 			<Effect type="Data" action="MeleeHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypConsulateStadhouders</Target>
-			</Effect>
-			<Effect type="Data" action="StaggerHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypConsulateStadhouders</Target>
-			</Effect>
-			<Effect type="Data" action="VolleyHandAttack" amount="1.20" subtype="Damage" relativity="BasePercent">
-				<Target type="ProtoUnit">ypConsulateStadhouders</Target>
+				<Target type="ProtoUnit">AbstractHeavyInfantry</Target>
 			</Effect>
+			<Effect type="TechStatus" status="active">BayonetHand</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="Rifling" type="Normal">
@@ -11015,10 +10879,7 @@
 				<Target type="ProtoUnit">Cacadore</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
-				<Target type="ProtoUnit">SharpshooterS</Target>
-			</Effect>
-			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
-				<Target type="ProtoUnit">NatRifleman</Target>
+				<Target type="ProtoUnit">Sharpshooter</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
 				<Target type="ProtoUnit">MercJaeger</Target>
@@ -11026,11 +10887,14 @@
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
 				<Target type="ProtoUnit">Strelet</Target>
 			</Effect>
+			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
+				<Target type="ProtoUnit">AbusGun</Target>
+			</Effect>
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
 				<Target type="ProtoUnit">NatTracker</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
-				<Target type="ProtoUnit">AbusGun</Target>
+				<Target type="ProtoUnit">NatRifleman</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
 				<Target type="ProtoUnit">xpMusketWarrior</Target>
@@ -11056,6 +10920,15 @@
 			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
 				<Target type="ProtoUnit">ypThuggee</Target>
 			</Effect>
+			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
+				<Target type="ProtoUnit">ypConsulateRogersRanger</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
+				<Target type="ProtoUnit">ypConsulatePrussianNeedleGun</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="DamageBonus" unittype="AbstractHeavyInfantry" allactions="1" relativity="Absolute">
+				<Target type="ProtoUnit">RiflemanUSJ</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="GunnersQuadrant" type="Normal">
@@ -14682,9 +14555,6 @@
 			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
 				<Target type="ProtoUnit">YPDockAsian</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCAdmirality" type="Normal">
@@ -14762,7 +14632,7 @@
 		<RolloverTextID>780793</RolloverTextID>
 		<Flag>Shadow</Flag>
 		<Effects>
-			<Effect type="Data" amount="25.00" subtype="PopulationCapExtra" relativity="Absolute">
+			<Effect type="Data" amount="100.00" subtype="PopulationCapExtra" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="Data" amount="100.00" subtype="Resource" resource="XP" relativity="Absolute">
@@ -24360,9 +24230,15 @@
 			<Effect type="Data" amount="0.50" subtype="Cost" resource="Gold" relativity="BasePercent">
 				<Target type="ProtoUnit">Imam</Target>
 			</Effect>
-			<Effect type="Data" amount="0.50" subtype="Cost" resource="Gold" relativity="BasePercent">
+			<Effect type="Data" amount="0.50" subtype="Cost" resource="Food" relativity="BasePercent">
 				<Target type="ProtoUnit">Missionary</Target>
 			</Effect>
+			<Effect type="Data" amount="0.50" subtype="Cost" resource="Gold" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
+			<Effect type="Data" amount="0.50" subtype="Cost" resource="Fame" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
 			<Effect type="Data" amount="0.25" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Missionary</Target>
 			</Effect>
@@ -24372,8 +24248,8 @@
 			<Effect type="Data" amount="0.25" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Priest</Target>
 			</Effect>
-			<Effect type="Data" amount="0.50" subtype="Cost" resource="Wood" relativity="BasePercent">
-				<Target type="ProtoUnit">Missionary</Target>
+			<Effect type="Data" amount="0.25" subtype="TrainPoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
 			</Effect>
 			<Effect type="Data" amount="0.85" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">xpMedicineManAztec</Target>
@@ -24398,7 +24274,7 @@
 			<Effect type="Data" amount="0.80" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">AbstractInfantry</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="TrainPoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">xpSkullKnight</Target>
 			</Effect>
 			<Effect type="Data" amount="0.90" subtype="TrainPoints" relativity="BasePercent">
@@ -26878,6 +26754,21 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="Tech">YPNatBhaktiReinforcedGuantlets</Target>
 			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">VenomExtract</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">NatFinePowder</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">NatElephants</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypNatHonoredSaltpeter</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypNatDisciplinedSaltpeter</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCShipCuirassiers4" type="Normal">
@@ -29841,6 +29732,9 @@
 			<Effect type="Data" amount="2.00" subtype="DamageBonus" unittype="AbstractArtillery" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">AbstractCavalry</Target>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="BigSiegeshopSiegeDrill" type="Normal">
@@ -29930,6 +29824,9 @@
 			<Effect type="Data" amount="10.00" subtype="DamageBonus" unittype="AbstractArtillery" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">xpLakotaWarchief</Target>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="TribalIroquoisWarrior2" type="Normal">
@@ -31453,11 +31350,11 @@
 	</Tech>
 	<Tech name="HCXPExtensiveFortifications2" type="Normal">
 		<DBID>2862</DBID>
-		<DisplayNameID>44042</DisplayNameID>
+		<DisplayNameID>781305</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>ui\techs\hc_extensive_fortifications\hc_extensive_fortifications</Icon>
+		<Icon>ui\techs\native\aggressive_policy</Icon>
 		<RolloverTextID>44041</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
@@ -31468,9 +31365,12 @@
 			<Effect type="Data" amount="1.25" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">WarHut</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
+			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Absolute">
 				<Target type="ProtoUnit">Lookout</Target>
 			</Effect>
+			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">WarHut</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCXPShipCanoes1" type="Normal">
@@ -32033,7 +31933,7 @@
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>units\artillery\falconet\falconet_icon_64x64</Icon>
+		<Icon>ui\techs\native\iroquois_siege_party</Icon>
 		<RolloverTextID>44110</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
@@ -33323,7 +33223,7 @@
 	<Tech name="HCXPSpanishAllies2" type="Normal">
 		<DBID>2967</DBID>
 		<DisplayNameID>44325</DisplayNameID>
-		<Cost resourcetype="Gold">1000.0000</Cost>
+		<Cost resourcetype="Gold">1500.0000</Cost>
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>60.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
@@ -34975,7 +34875,7 @@
 		<RolloverTextID>44671</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
-			<Effect type="Data" amount="10.00" subtype="FreeHomeCityUnit" unittype="SaloonOutlawRifleman" relativity="Absolute">
+			<Effect type="Data" amount="5.00" subtype="FreeHomeCityUnit" unittype="SaloonOutlawRifleman" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="Data" amount="10.00" subtype="FreeHomeCityUnit" unittype="SaloonOutlawPistol" relativity="Absolute">
@@ -36329,12 +36229,15 @@
 		<Prereqs>
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
+		<Effects>
+			<Effect type="TextOutput">46345</Effect>
+		</Effects>
 	</Tech>
 	<Tech name="HCREVShipColonialMilitia" type="Normal">
 		<DBID>3182</DBID>
 		<DisplayNameID>45222</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
-		<ResearchPoints>40.0000</ResearchPoints>
+		<ResearchPoints>20.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\units\colonial_militia_icon_rev</Icon>
 		<Flag>HomeCity</Flag>
@@ -36342,13 +36245,16 @@
 			<Effect type="Data" amount="16.00" subtype="FreeHomeCityUnit" unittype="xpColonialMilitia" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="FlagBearer" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCREVShipGatlingGuns" type="Normal">
 		<DBID>3183</DBID>
 		<DisplayNameID>45223</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
-		<ResearchPoints>40.0000</ResearchPoints>
+		<ResearchPoints>20.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\Units\gatling_gun_icon_rev</Icon>
 		<Flag>HomeCity</Flag>
@@ -36362,7 +36268,7 @@
 		<DBID>3184</DBID>
 		<DisplayNameID>45224</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
-		<ResearchPoints>40.0000</ResearchPoints>
+		<ResearchPoints>20.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>units\trade\fort_wagon_icon_64x64_rev</Icon>
 		<Flag>HomeCity</Flag>
@@ -36379,7 +36285,7 @@
 		<DBID>3185</DBID>
 		<DisplayNameID>45225</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
-		<ResearchPoints>40.0000</ResearchPoints>
+		<ResearchPoints>20.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\units\ironclad_icon_rev</Icon>
 		<Flag>HomeCity</Flag>
@@ -37425,6 +37331,9 @@
 			<Effect type="Data" amount="2000.00" subtype="Resource" resource="XP" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="BigLonghouseWoodlandDwellers" type="Normal">
@@ -37562,6 +37471,9 @@
 			<Effect type="Data" amount="0.75" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">xpWarRifle</Target>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="BigSiouxDogSoldiers" type="Normal">
@@ -37586,6 +37498,9 @@
 			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="xpDogSoldier" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="SPCXPValleyForge" type="Normal">
@@ -37643,10 +37558,78 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
 			</Effect>
@@ -37659,21 +37642,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -37681,12 +37652,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
@@ -37695,7 +37660,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -37726,9 +37690,6 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Wood" relativity="Assign">
 				<Target type="ProtoUnit">AbstractVillager</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
-			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="XPRevolutionWashington" type="Normal">
@@ -37746,15 +37707,83 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
-			<Effect type="Data" amount="2.00" subtype="FreeHomeCityUnit" unittype="xpGatlingGun" relativity="Absolute">
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
+			<Effect type="Data" amount="4.00" subtype="FreeHomeCityUnit" unittype="xpGatlingGun" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
+			<Effect type="Data" amount="1.25" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">xpGatlingGun</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
@@ -37768,24 +37797,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -37793,9 +37807,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">xpGatlingGun</Target>
@@ -37803,11 +37814,7 @@
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">xpGatlingGun</Target>
-			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -37852,13 +37859,78 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
-			</Effect>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
 			</Effect>
@@ -37871,24 +37943,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -37896,9 +37953,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
@@ -37911,7 +37965,6 @@
 			</Effect>
 			<Effect type="TechStatus" status="active">SaloonWildWest</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -37959,12 +38012,80 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
+			<Effect type="Data" amount="1.40" subtype="BuildLimit" relativity="Percent">
+				<Target type="ProtoUnit">AbstractNativeWarrior</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
@@ -37978,24 +38099,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -38003,9 +38109,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
@@ -38014,8 +38117,6 @@
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">ImpLegendaryNatives</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -38056,19 +38157,90 @@
 		<ResearchPoints>15.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\revolution</Icon>
-		<RolloverTextID>45965</RolloverTextID>
+		<RolloverTextID>45959</RolloverTextID>
 		<Flag>CountsTowardEconomicScore</Flag>
 		<Flag>RevoltTech</Flag>
 		<Prereqs>
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
+			<Effect type="Data" amount="4.00" subtype="FreeHomeCityUnit" unittype="xpGatlingGun" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.25" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">xpGatlingGun</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
@@ -38082,24 +38254,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -38107,18 +38264,11 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.05" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">Unit</Target>
-			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -38166,16 +38316,81 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
 			<Effect type="Data" action="CannonAttack" amount="2.00" subtype="MaximumRange" relativity="Absolute">
 				<Target type="ProtoUnit">Mortar</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
 			</Effect>
@@ -38188,24 +38403,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -38213,9 +38413,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
@@ -38224,7 +38421,6 @@
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -38272,13 +38468,78 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
-			</Effect>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
 			</Effect>
@@ -38291,24 +38552,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -38316,9 +38562,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
@@ -38330,7 +38573,6 @@
 				<Target type="ProtoUnit">xpIronclad</Target>
 			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -38381,16 +38623,81 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
 			<Effect type="TechStatus" status="obtainable">HCBlockadeNative</Effect>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
 			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Hussar</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
 			</Effect>
@@ -38403,24 +38710,9 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">FlagBearer</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackPowderWagon</Target>
 			</Effect>
@@ -38428,9 +38720,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="200.00" subtype="PopulationCap" relativity="Absolute">
 				<Target type="Player"/>
@@ -38439,8 +38728,6 @@
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="SetName" proto="Hussar" culture="none" newName="30998"/>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -38843,6 +39130,9 @@
 			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">AbstractCavalry</Target>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="BigPlantationGunTrade" type="Normal">
@@ -38863,6 +39153,9 @@
 			<Effect type="Data" amount="1.25" subtype="Damage" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">xpWarRifle</Target>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="SaloonSwissPikeman" type="Normal">
@@ -39118,6 +39411,9 @@
 			<Effect type="Data" amount="2.00" subtype="FreeHomeCityUnit" unittype="Monitor" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="BigHouseCoatlicue" type="Normal">
@@ -39641,7 +39937,7 @@
 		<ResearchPoints>60.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\units\fusilier_icon</Icon>
-		<RolloverTextID>46545</RolloverTextID>
+		<RolloverTextID>781259</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
 			<Effect type="Data" amount="10.00" subtype="FreeHomeCityUnit" unittype="MercFusilier" relativity="Absolute">
@@ -39657,7 +39953,7 @@
 		<ResearchPoints>60.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\Units\elmeti_icon</Icon>
-		<RolloverTextID>46547</RolloverTextID>
+		<RolloverTextID>781260</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
 			<Effect type="Data" amount="7.00" subtype="FreeHomeCityUnit" unittype="MercElmeti" relativity="Absolute">
@@ -39940,14 +40236,23 @@
 		<RolloverTextID>46819</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
-			<Effect type="Data" amount="1.00" subtype="AddTrain" unittype="SettlerNative" relativity="Absolute">
-				<Target type="ProtoUnit">NativeEmbassy</Target>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">xpCoupRider</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="AddTrain" unittype="SettlerNative" relativity="Absolute">
-				<Target type="ProtoUnit">NativeEmbassyN</Target>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">xpCoupRider</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="AddTrain" unittype="SettlerNative" relativity="Absolute">
-				<Target type="ProtoUnit">NativeEmbassyI</Target>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">NatHuaminca</Target>
+			</Effect>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">NatHuaminca</Target>
+			</Effect>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">NatAxeRiderDogSoldier</Target>
+			</Effect>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">NatAxeRiderDogSoldier</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
 				<Target type="ProtoUnit">NativeEmbassy</Target>
@@ -40640,6 +40945,24 @@
 			<Effect type="Data" amount="250.00" subtype="Cost" resource="Food" relativity="Assign">
 				<Target type="Tech">BigIroquoisScoutingParty</Target>
 			</Effect>
+			<Effect type="Data" amount="750.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ConSupport</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateFrenchBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateSpanishBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateBritishBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1050.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="Tech">BigDockCipactli</Target>
+			</Effect>
+			<Effect type="Data" amount="300.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">BigDockCipactli</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCXPOldWaysSioux" type="Normal">
@@ -40691,6 +41014,42 @@
 			<Effect type="Data" amount="250.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="Tech">BigFarmHorsemanship</Target>
 			</Effect>
+			<Effect type="Data" amount="750.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ConSupport</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateFrenchBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateSpanishBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateBritishBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1050.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="Tech">BigDockCipactli</Target>
+			</Effect>
+			<Effect type="Data" amount="300.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">BigDockCipactli</Target>
+			</Effect>
+			<Effect type="Data" amount="225.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="Tech">BigBisons</Target>
+			</Effect>
+			<Effect type="Data" amount="225.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">BigBisons</Target>
+			</Effect>
+			<Effect type="Data" amount="225.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="Tech">BigDeer</Target>
+			</Effect>
+			<Effect type="Data" amount="225.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">BigDeer</Target>
+			</Effect>
+			<Effect type="Data" amount="225.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="Tech">BigTurkey</Target>
+			</Effect>
+			<Effect type="Data" amount="225.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">BigTurkey</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCXPOldWaysAztec" type="Normal">
@@ -40760,6 +41119,24 @@
 			<Effect type="Data" amount="300.00" subtype="Cost" resource="Food" relativity="Assign">
 				<Target type="Tech">BigFarmCinteotl</Target>
 			</Effect>
+			<Effect type="Data" amount="750.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ConSupport</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateFrenchBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateSpanishBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1500.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">ypConsulateBritishBrigadeN</Target>
+			</Effect>
+			<Effect type="Data" amount="1050.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="Tech">BigDockCipactli</Target>
+			</Effect>
+			<Effect type="Data" amount="300.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="Tech">BigDockCipactli</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCXPMedicineTeam" type="Normal">
@@ -41083,49 +41460,55 @@
 			<TechStatus status="Active">Colonialize</TechStatus>
 		</Prereqs>
 		<Effects>
-			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">Priest</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">Missionary</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">NatMedicineMan</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">xpMedicineMan</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">Imam</Target>
 			</Effect>
-			<Effect type="Data" amount="1.45" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.20" subtype="MaximumVelocity" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Imam</Target>
 			</Effect>
-			<Effect type="Data" amount="1.45" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="1.45" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Priest</Target>
 			</Effect>
-			<Effect type="Data" amount="1.45" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Missionary</Target>
 			</Effect>
-			<Effect type="Data" amount="1.45" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">xpMedicineMan</Target>
 			</Effect>
-			<Effect type="Data" amount="1.45" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">NatMedicineMan</Target>
 			</Effect>
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="ChurchStateReligion" type="Normal">
 		<DBID>3425</DBID>
 		<DisplayNameID>46982</DisplayNameID>
-		<Cost resourcetype="Food">400.0000</Cost>
-		<Cost resourcetype="Wood">400.0000</Cost>
+		<Cost resourcetype="Food">350.0000</Cost>
+		<Cost resourcetype="Wood">350.0000</Cost>
 		<ResearchPoints>15.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\native\State_Religion</Icon>
@@ -41154,6 +41537,9 @@
 			<Effect type="Data" action="Heal" amount="1.15" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
+			<Effect type="Data" action="Heal" amount="1.15" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
 			<Effect type="Data" amount="2.00" subtype="LOS" relativity="Absolute">
 				<Target type="ProtoUnit">Imam</Target>
 			</Effect>
@@ -41172,6 +41558,9 @@
 			<Effect type="Data" amount="2.00" subtype="LOS" relativity="Absolute">
 				<Target type="ProtoUnit">NatMedicineMan</Target>
 			</Effect>
+			<Effect type="Data" amount="2.00" subtype="LOS" relativity="Absolute">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="IncendiaryGrenades" type="Normal">
@@ -42366,7 +42755,7 @@
 	</Tech>
 	<Tech name="HCXPAggressivePolicy" type="Normal">
 		<DBID>3481</DBID>
-		<DisplayNameID>47189</DisplayNameID>
+		<DisplayNameID>42880</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
@@ -42458,11 +42847,12 @@
 			<Effect type="Data" amount="4.00" subtype="FreeHomeCityUnit" unittype="PetBear" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect type="TextOutput">781320</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCXPAdvancedScouts" type="Normal">
 		<DBID>3485</DBID>
-		<DisplayNameID>47195</DisplayNameID>
+		<DisplayNameID>781321</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
@@ -42479,6 +42869,25 @@
 			<Effect type="Data" amount="6.00" subtype="LOS" relativity="Absolute">
 				<Target type="ProtoUnit">NativeScout</Target>
 			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">NatMedicineMan</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">xpMedicineMan</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Priest</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Missionary</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Imam</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.15" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Surgeon</Target>
+			</Effect>
+			<Effect type="TextOutput">781322</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCXPRuthlessness" type="Normal">
@@ -45119,13 +45528,13 @@
 	</Tech>
 	<Tech name="ypNatDisciplinedSufi" type="Normal">
 		<DBID>3748</DBID>
-		<DisplayNameID>61151</DisplayNameID>
+		<DisplayNameID>781336</DisplayNameID>
 		<Cost resourcetype="Wood">200.0000</Cost>
 		<Cost resourcetype="Gold">150.0000</Cost>
 		<ResearchPoints>10.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\asians\disciplined_natives</Icon>
-		<RolloverTextID>61150</RolloverTextID>
+		<RolloverTextID>781334</RolloverTextID>
 		<Flag>YPNativeImprovement</Flag>
 		<Flag>CountsTowardMilitaryScore</Flag>
 		<Flag>UpgradeTech</Flag>
@@ -45411,13 +45820,13 @@
 	</Tech>
 	<Tech name="ypNatHonoredSufi" type="Normal">
 		<DBID>3757</DBID>
-		<DisplayNameID>61187</DisplayNameID>
+		<DisplayNameID>781333</DisplayNameID>
 		<Cost resourcetype="Wood">400.0000</Cost>
 		<Cost resourcetype="Gold">300.0000</Cost>
 		<ResearchPoints>10.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\asians\honered_natives</Icon>
-		<RolloverTextID>61186</RolloverTextID>
+		<RolloverTextID>781334</RolloverTextID>
 		<Flag>UpgradeTech</Flag>
 		<Flag>CountsTowardMilitaryScore</Flag>
 		<Flag>YPNativeImprovement</Flag>
@@ -46656,7 +47065,7 @@
 				<Target type="ProtoUnit">AbstractWall</Target>
 			</Effect>
 			<Effect type="TextOutput">61587</Effect>
-			<Effect type="Data" amount="6.00" subtype="BuildPoints" relativity="BasePercent">
+			<Effect type="Data" amount="5.00" subtype="BuildPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">AbstractWall</Target>
 			</Effect>
 		</Effects>
@@ -47729,10 +48138,10 @@
 				<Target type="ProtoUnit">ypKensei</Target>
 			</Effect>
 			<Effect type="TextOutput">70359</Effect>
-			<Effect type="Data" amount="1.10" subtype="Cost" resource="Food" relativity="BasePercent">
+			<Effect type="Data" amount="1.05" subtype="Cost" resource="Food" relativity="BasePercent">
 				<Target type="ProtoUnit">ypKensei</Target>
 			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Cost" resource="Gold" relativity="BasePercent">
+			<Effect type="Data" amount="1.05" subtype="Cost" resource="Gold" relativity="BasePercent">
 				<Target type="ProtoUnit">ypKensei</Target>
 			</Effect>
 		</Effects>
@@ -48548,7 +48957,7 @@
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>ui\techs\native\Wood_Crafting</Icon>
+		<Icon>ui\techs\native\Wood_working</Icon>
 		<RolloverTextID>62426</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
@@ -58909,6 +59318,8 @@
 			<Effect type="TechStatus" status="obtainable">ConsulateFortifiedWalls</Effect>
 			<Effect type="TechStatus" status="obtainable">ypConsulateOttomansSettlerCombat</Effect>
 			<Effect type="TechStatus" status="obtainable">ConsulateLumberWagon</Effect>
+			<Effect type="TechStatus" status="active">SwedishMinutemen</Effect>
+			<Effect type="TechStatus" status="active">SwedishBrig</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="ypBigConsulateSPCIndia2" type="Normal">
@@ -62952,6 +63363,7 @@
 			<Effect type="TechStatus" status="active">ypNatHonoredShaolin</Effect>
 			<Effect type="TechStatus" status="active">ypNatHonoredSufi</Effect>
 			<Effect type="TechStatus" status="active">ypNatHonoredUdasi</Effect>
+			<Effect type="TechStatus" status="active">ypNatHonoredSaltpeter</Effect>
 			<Effect type="TextOutput">780789</Effect>
 		</Effects>
 	</Tech>
@@ -64087,7 +64499,7 @@
 	</Tech>
 	<Tech name="ConsulateFortifiedWalls" type="Normal">
 		<DBID>733155</DBID>
-		<DisplayNameID>77793</DisplayNameID>
+		<DisplayNameID>781303</DisplayNameID>
 		<Cost resourcetype="Trade">800.0000</Cost>
 		<ResearchPoints>80.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
@@ -64427,7 +64839,7 @@
 		<Cost resourcetype="Fame">1200.0000</Cost>
 		<ResearchPoints>90.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>units\asians\consulate\french_armies\french_brigade_icon_64</Icon>
+		<Icon>ui\french_2</Icon>
 		<RolloverTextID>66606</RolloverTextID>
 		<Flag>CheckLandHCGatherPoint</Flag>
 		<Flag>CountsTowardMilitaryScore</Flag>
@@ -64596,7 +65008,7 @@
 		<DBID>733170</DBID>
 		<DisplayNameID>47078</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
-		<ResearchPoints>50.0000</ResearchPoints>
+		<ResearchPoints>20.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\infinite_privateers</Icon>
 		<Flag>HomeCity</Flag>
@@ -64696,7 +65108,7 @@
 			<Effect type="Data" amount="4.00" subtype="FreeHomeCityUnit" unittype="ypConsulateHorseArtillery" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="6.00" subtype="FreeHomeCityUnit" unittype="SakerC" relativity="Absolute">
+			<Effect type="Data" amount="6.00" subtype="FreeHomeCityUnit" unittype="ypConsulateFalconet" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="GeneralBr" relativity="Absolute">
@@ -64712,6 +65124,7 @@
 		<Status>UNOBTAINABLE</Status>
 		<Flag>Shadow</Flag>
 		<Effects>
+			<Effect type="TechStatus" status="obtainable">Redoubt</Effect>
 			<Effect type="TechStatus" status="obtainable">ypConsulateUSABrigadeFame</Effect>
 			<Effect type="TechStatus" status="obtainable">VeteranRangersShadow</Effect>
 			<Effect type="TechStatus" status="obtainable">VeteranRiflemenShadow</Effect>
@@ -64723,13 +65136,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -65096,9 +65509,8 @@
 			<Effect type="Data" action="SpawnCoveredWagon" amount="1.00" subtype="ActionAdd" unittype="CoveredWagon" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
+			<Effect type="TechStatus" status="active">HCBlockade</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockadeNative</Effect>
-			<Effect type="Blockade" delay="10.00"/>
 		</Effects>
 	</Tech>
 	<Tech name="AAStandardStartingTechsAct" type="Normal">
@@ -66773,10 +67185,10 @@
 	</Tech>
 	<Tech name="StoneFortifiedWalls" type="Normal">
 		<DBID>733225</DBID>
-		<DisplayNameID>77793</DisplayNameID>
+		<DisplayNameID>781303</DisplayNameID>
 		<Cost resourcetype="Wood">600.0000</Cost>
 		<Cost resourcetype="Gold">600.0000</Cost>
-		<ResearchPoints>80.0000</ResearchPoints>
+		<ResearchPoints>60.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\bastion\bastion</Icon>
 		<RolloverTextID>23451</RolloverTextID>
@@ -66798,10 +67210,10 @@
 	</Tech>
 	<Tech name="AsianFortifiedWalls" type="Normal">
 		<DBID>733226</DBID>
-		<DisplayNameID>77793</DisplayNameID>
+		<DisplayNameID>781303</DisplayNameID>
 		<Cost resourcetype="Wood">600.0000</Cost>
 		<Cost resourcetype="Gold">600.0000</Cost>
-		<ResearchPoints>80.0000</ResearchPoints>
+		<ResearchPoints>60.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\bastion\bastion</Icon>
 		<RolloverTextID>23451</RolloverTextID>
@@ -66826,7 +67238,7 @@
 		<DisplayNameID>77794</DisplayNameID>
 		<Cost resourcetype="Wood">400.0000</Cost>
 		<Cost resourcetype="Gold">200.0000</Cost>
-		<ResearchPoints>80.0000</ResearchPoints>
+		<ResearchPoints>60.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\stone_walls\stone_walls</Icon>
 		<RolloverTextID>23451</RolloverTextID>
@@ -67729,8 +68141,8 @@
 	<Tech name="ImperialManOWarNew" type="Normal">
 		<DBID>733264</DBID>
 		<DisplayNameID>31112</DisplayNameID>
-		<Cost resourcetype="Wood">1500.0000</Cost>
-		<Cost resourcetype="Gold">1500.0000</Cost>
+		<Cost resourcetype="Wood">1550.0000</Cost>
+		<Cost resourcetype="Gold">1550.0000</Cost>
 		<ResearchPoints>30.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\imperial_navy\imperial_navy</Icon>
@@ -67742,10 +68154,10 @@
 			<TechStatus status="Active">Imperialize</TechStatus>
 		</Prereqs>
 		<Effects>
-			<Effect type="Data" amount="1.50" subtype="Damage" allactions="1" relativity="BasePercent">
+			<Effect type="Data" amount="1.55" subtype="Damage" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">Frigate</Target>
 			</Effect>
-			<Effect type="Data" amount="1.50" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.55" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Frigate</Target>
 			</Effect>
 			<Effect type="Data" action="BroadsideAttack" amount="2.00" subtype="MaximumRange" relativity="Absolute">
@@ -67837,8 +68249,8 @@
 	<Tech name="ImperialMonitorsNew" type="Normal">
 		<DBID>733268</DBID>
 		<DisplayNameID>780938</DisplayNameID>
-		<Cost resourcetype="Wood">1500.0000</Cost>
-		<Cost resourcetype="Gold">1500.0000</Cost>
+		<Cost resourcetype="Wood">1550.0000</Cost>
+		<Cost resourcetype="Gold">1550.0000</Cost>
 		<ResearchPoints>30.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\imperial_navy\imperial_navy</Icon>
@@ -67852,10 +68264,10 @@
 		</Prereqs>
 		<Effects>
 			<Effect type="SetName" proto="Monitor" culture="none" newName="780937"/>
-			<Effect type="Data" amount="1.50" subtype="Damage" allactions="1" relativity="BasePercent">
+			<Effect type="Data" amount="1.55" subtype="Damage" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">Monitor</Target>
 			</Effect>
-			<Effect type="Data" amount="1.50" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.55" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Monitor</Target>
 			</Effect>
 			<Effect type="Data" action="LongRangeAttack" amount="2.00" subtype="MaximumRange" relativity="Absolute">
@@ -68922,7 +69334,7 @@
 			<Effect type="Data" amount="1.25" subtype="Damage" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">Mercenary</Target>
 			</Effect>
-			<Effect type="Data" amount="1.25" subtype="Cost" resource="Gold" relativity="BasePercent">
+			<Effect type="Data" amount="1.15" subtype="Cost" resource="Gold" relativity="BasePercent">
 				<Target type="ProtoUnit">Building</Target>
 			</Effect>
 			<Effect type="Data" amount="1.15" subtype="Cost" resource="Wood" relativity="BasePercent">
@@ -69116,6 +69528,9 @@
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">BlackBoat</Target>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCConquistador" type="Normal">
@@ -69286,7 +69701,7 @@
 		<DBID>733353</DBID>
 		<DisplayNameID>42330</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
-		<ResearchPoints>40.0000</ResearchPoints>
+		<ResearchPoints>20.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\inffac</Icon>
 		<Flag>HomeCity</Flag>
@@ -69531,6 +69946,73 @@
 			<TechStatus status="Active">Industrialize</TechStatus>
 		</Prereqs>
 		<Effects>
+			<Effect type="TechStatus" status="unobtainable">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHalberdiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRedcoat</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWarNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLongbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSchutzens</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSkirmishers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCarabineer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRoyalHussar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNassauers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialLancers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGendarme</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialVoltigeur</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussarsF</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialFlatbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialWarWagons</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCzapkaUhlans</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialNeedleGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDopplesoldner</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzerNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAzaps</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSpahi</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialAbusGun</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCavalryArchers</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJanissaries</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBaratcu</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialBombard</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialCacadores</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialJinetes</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGuerreiros</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialDrabants</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialRabaulds</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTartarLoyalist</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialStrelets</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialOprichniks</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGreatCannon</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHorseArtilleryNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialEspada</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialTercio</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialGarrochistas</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMonitorsNew</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialMountedCrossbowman</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSaker</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialPistolS</Effect>
 			<Effect type="TechStatus" status="unobtainable">Spies</Effect>
 			<Effect type="TechStatus" status="unobtainable">HCBlockade</Effect>
 			<Effect type="TechStatus" status="obtainable">SpiesNative</Effect>
@@ -69550,9 +70032,6 @@
 			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
 				<Target type="ProtoUnit">AbstractWarShip</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Surgeon</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">WarCamp</Target>
 			</Effect>
@@ -69565,18 +70044,6 @@
 			<Effect type="Data" amount="10.00" subtype="PlayerSpecificTrainLimitPerAction" relativity="Assign">
 				<Target type="Player"/>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Sapper</Target>
-			</Effect>
-			<Effect type="Data" amount="3.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">Factory</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Outpost</Target>
-			</Effect>
-			<Effect type="Data" amount="2.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Blockhouse</Target>
-			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">AsianFireship</Target>
 			</Effect>
@@ -69590,9 +70057,6 @@
 				<Target type="ProtoUnit">xpColonialMilitia</Target>
 			</Effect>
 			<Effect type="SetName" proto="xpColonialMilitia" culture="none" newName="34999"/>
-			<Effect type="Data" amount="5.00" subtype="BuildLimit" relativity="Assign">
-				<Target type="ProtoUnit">TownCenter</Target>
-			</Effect>
 			<Effect type="InitiateRevolution"/>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">xpGatlingGun</Target>
@@ -69601,7 +70065,6 @@
 				<Target type="Player"/>
 			</Effect>
 			<Effect type="TechStatus" status="active">XPRevolution</Effect>
-			<Effect type="TechStatus" status="active">CalltoArmsR</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
@@ -69757,6 +70220,12 @@
 		</Prereqs>
 		<Effects>
 			<Effect type="TransformUnit" toprotoid="USColonialMilitia" fromprotoid="Settler"/>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">USColonialMilitia</Target>
+			</Effect>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">USColonialMilitia</Target>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="HCGatlingGunsRepeat" type="Normal">
@@ -70487,7 +70956,7 @@
 		<Cost resourcetype="Gold">2000.0000</Cost>
 		<ResearchPoints>90.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>ui\techs\native\Dance2</Icon>
+		<Icon>ui\dance9</Icon>
 		<IconTextureCoords>.599609375 .607421875 .796875 .908203125</IconTextureCoords>
 		<RolloverTextID>780826</RolloverTextID>
 		<Flag>CheckLandHCGatherPoint</Flag>
@@ -70510,6 +70979,9 @@
 			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="FlagBearerUS" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="ypConsulateFrenchBrigadeN" type="Normal">
@@ -70518,7 +70990,7 @@
 		<Cost resourcetype="Gold">2000.0000</Cost>
 		<ResearchPoints>90.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>ui\techs\native\Dance2</Icon>
+		<Icon>ui\dance99</Icon>
 		<IconTextureCoords>.599609375 .607421875 .796875 .908203125</IconTextureCoords>
 		<RolloverTextID>780824</RolloverTextID>
 		<Flag>ypConsulateImprovementImperial</Flag>
@@ -70541,6 +71013,9 @@
 			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="FlagBearerF" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="ypConsulateSpanishBrigadeN" type="Normal">
@@ -70549,7 +71024,7 @@
 		<Cost resourcetype="Gold">2000.0000</Cost>
 		<ResearchPoints>90.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>ui\techs\native\Dance2</Icon>
+		<Icon>ui\dance999</Icon>
 		<IconTextureCoords>.599609375 .607421875 .796875 .908203125</IconTextureCoords>
 		<RolloverTextID>780825</RolloverTextID>
 		<Flag>ypConsulateImprovementImperial</Flag>
@@ -70572,6 +71047,9 @@
 			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="FlagBearerS" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
+			<Effect tech="Age0XPSioux" type="Data" amount="1.00" subtype="FreeHomeCityUnitIfTechObtainable" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="YPHCMercsArsonist1Br" type="Normal">
@@ -71046,13 +71524,13 @@
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
-			<Effect type="Data" amount="100.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">xpSpy</Target>
 			</Effect>
 			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
-			<Effect type="Data" amount="150.00" subtype="Cost" resource="Fame" relativity="Absolute">
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
 				<Target type="ProtoUnit">Surgeon</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
@@ -71151,7 +71629,7 @@
 			<Effect type="TechStatus" status="obtainable">PoliticianMusketeerSpanish</Effect>
 			<Effect type="TechStatus" status="obtainable">PoliticianGovernor</Effect>
 			<Effect type="TechStatus" status="obtainable">PoliticianBishop</Effect>
-			<Effect type="TechStatus" status="obtainable">PoliticianCavalierSpanish</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianTycoon</Effect>
 			<Effect type="TechStatus" status="obtainable">PoliticianSergeantSpanish</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">Plantation</Target>
@@ -71181,7 +71659,7 @@
 				<Target type="ProtoUnit">CWallGate</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
-				<Target type="ProtoUnit">Church</Target>
+				<Target type="ProtoUnit">BasilicaIt</Target>
 			</Effect>
 			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
 				<Target type="ProtoUnit">FishingBoat</Target>
@@ -71208,7 +71686,7 @@
 				<Target type="ProtoUnit">WallConnector</Target>
 			</Effect>
 			<Effect type="TechStatus" status="obtainable">ImperialCrossbowmenIt</Effect>
-			<Effect type="TechStatus" status="obtainable">UnlockPoliticianWarMinisterSpanish</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianViceroyPortuguese</Effect>
 			<Effect type="TechStatus" status="obtainable">UnlockPoliticianEngineerSpanish</Effect>
 			<Effect type="TechStatus" status="obtainable">UnlockPoliticianScoutSpanish</Effect>
 			<Effect type="TechStatus" status="obtainable">UnlockPoliticianAdmiralSpanish</Effect>
@@ -71339,8 +71817,8 @@
 	<Tech name="ImperialCannonIt" type="Normal">
 		<DBID>733428</DBID>
 		<DisplayNameID>781154</DisplayNameID>
-		<Cost resourcetype="Wood">1500.0000</Cost>
-		<Cost resourcetype="Gold">1500.0000</Cost>
+		<Cost resourcetype="Wood">1550.0000</Cost>
+		<Cost resourcetype="Gold">1550.0000</Cost>
 		<ResearchPoints>30.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\imperial_artillery\imperial_artillery</Icon>
@@ -71351,10 +71829,10 @@
 			<TechStatus status="Active">Imperialize</TechStatus>
 		</Prereqs>
 		<Effects>
-			<Effect type="Data" amount="1.50" subtype="Damage" allactions="1" relativity="BasePercent">
+			<Effect type="Data" amount="1.55" subtype="Damage" allactions="1" relativity="BasePercent">
 				<Target type="ProtoUnit">Cannon</Target>
 			</Effect>
-			<Effect type="Data" amount="1.50" subtype="Hitpoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.55" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">Cannon</Target>
 			</Effect>
 			<Effect type="SetName" proto="Cannon" culture="none" newName="781154"/>
@@ -71687,7 +72165,8 @@
 	<Tech name="VenetianGothic" type="Normal">
 		<DBID>733444</DBID>
 		<DisplayNameID>781183</DisplayNameID>
-		<Cost resourcetype="Gold">250.0000</Cost>
+		<Cost resourcetype="Wood">350.0000</Cost>
+		<Cost resourcetype="Gold">350.0000</Cost>
 		<ResearchPoints>15.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\architecture</Icon>
@@ -71700,16 +72179,10 @@
 		</Prereqs>
 		<Effects>
 			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
-				<Target type="ProtoUnit">Architect</Target>
-			</Effect>
-			<Effect type="Data" action="Build" amount="4.00" subtype="WorkRate" unittype="Building" relativity="BasePercent">
-				<Target type="ProtoUnit">Architect</Target>
-			</Effect>
-			<Effect type="Data" amount="1.00" subtype="AddTrain" unittype="TownCenter" relativity="Absolute">
-				<Target type="ProtoUnit">Architect</Target>
+				<Target type="ProtoUnit">FortFrontier</Target>
 			</Effect>
-			<Effect type="Data" amount="1.00" subtype="AddTrain" unittype="TradingPost" relativity="Absolute">
-				<Target type="ProtoUnit">Architect</Target>
+			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
+				<Target type="ProtoUnit">Factory</Target>
 			</Effect>
 		</Effects>
 	</Tech>
@@ -71730,14 +72203,14 @@
 			<Effect type="Data" amount="0.85" subtype="Cost" resource="Fame" relativity="BasePercent">
 				<Target type="ProtoUnit">AbstractBannerArmy</Target>
 			</Effect>
-			<Effect type="Data" amount="2.00" subtype="TrainPoints" relativity="BasePercent">
+			<Effect type="Data" amount="1.50" subtype="TrainPoints" relativity="BasePercent">
 				<Target type="ProtoUnit">AbstractBannerArmy</Target>
 			</Effect>
 		</Effects>
 	</Tech>
 	<Tech name="SacredDecree" type="Normal">
 		<DBID>733446</DBID>
-		<DisplayNameID>781182</DisplayNameID>
+		<DisplayNameID>781256</DisplayNameID>
 		<Cost resourcetype="Wood">200.0000</Cost>
 		<ResearchPoints>15.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
@@ -71756,6 +72229,9 @@
 			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
 				<Target type="ProtoUnit">Pilgrim</Target>
 			</Effect>
+			<Effect type="Data" amount="1.25" subtype="MaximumVelocity" relativity="BasePercent">
+				<Target type="ProtoUnit">Architect</Target>
+			</Effect>
 			<Effect type="Data" action="SpawnMissionary" amount="1.00" subtype="ActionAdd" unittype="TownCenter" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
@@ -71796,17 +72272,17 @@
 		<RolloverTextID>781193</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
-			<Effect type="Data" amount="1.35" subtype="Armor" relativity="BasePercent">
+			<Effect type="Data" amount="1.50" subtype="Armor" relativity="BasePercent">
 				<Target type="ProtoUnit">Crossbowman</Target>
 			</Effect>
 			<Effect type="Data" amount="1.35" subtype="Armor" relativity="BasePercent">
-				<Target type="ProtoUnit">Crossbowman</Target>
+				<Target type="ProtoUnit">MountedCrossbowman</Target>
 			</Effect>
 			<Effect type="Data" amount="1.15" subtype="Hitpoints" relativity="BasePercent">
 				<Target type="ProtoUnit">MountedCrossbowman</Target>
 			</Effect>
 			<Effect type="Data" amount="1.15" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">MountedCrossbowman</Target>
+				<Target type="ProtoUnit">Crossbowman</Target>
 			</Effect>
 			<Effect type="TextOutput">781195</Effect>
 		</Effects>
@@ -71876,16 +72352,16 @@
 		<Flag>TeamTech</Flag>
 		<Effects>
 			<Effect type="TextOutput">781229</Effect>
-			<Effect type="Data" amount="0.90" subtype="Cost" resource="Food" relativity="Percent">
+			<Effect type="Data" amount="0.85" subtype="Cost" resource="Food" relativity="Percent">
 				<Target type="techWithFlag">AgeUpgrade</Target>
 			</Effect>
-			<Effect type="Data" amount="0.90" subtype="Cost" resource="Gold" relativity="Percent">
+			<Effect type="Data" amount="0.85" subtype="Cost" resource="Gold" relativity="Percent">
 				<Target type="techWithFlag">AgeUpgrade</Target>
 			</Effect>
-			<Effect type="Data" amount="0.90" subtype="Cost" resource="Food" relativity="Percent">
+			<Effect type="Data" amount="0.85" subtype="Cost" resource="Food" relativity="Percent">
 				<Target type="ProtoUnit">AbstractWonder</Target>
 			</Effect>
-			<Effect type="Data" amount="0.90" subtype="Cost" resource="Gold" relativity="Percent">
+			<Effect type="Data" amount="0.85" subtype="Cost" resource="Gold" relativity="Percent">
 				<Target type="ProtoUnit">AbstractWonder</Target>
 			</Effect>
 		</Effects>
@@ -71900,7 +72376,7 @@
 		<Flag>HomeCity</Flag>
 		<Flag>TeamTech</Flag>
 		<Effects>
-			<Effect type="Data" amount="4.00" subtype="FreeHomeCityUnit" unittype="Pilgrim" relativity="Absolute">
+			<Effect type="Data" amount="3.00" subtype="FreeHomeCityUnit" unittype="Pilgrim" relativity="Absolute">
 				<Target type="Player"/>
 			</Effect>
 		</Effects>
@@ -71961,16 +72437,15 @@
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
-		<Icon>ui\hc_team_hand_infantry_damage</Icon>
+		<Icon>ui\hc_hand_infantry_damage</Icon>
 		<RolloverTextID>781239</RolloverTextID>
 		<Flag>HomeCity</Flag>
-		<Flag>TeamTech</Flag>
 		<Effects>
-			<Effect type="Data" amount="1.10" subtype="Damage" allactions="1" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">Pikeman</Target>
 			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Damage" allactions="1" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractArcher</Target>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">Crossbowman</Target>
 			</Effect>
 			<Effect type="TextOutput">781240</Effect>
 		</Effects>
@@ -71985,11 +72460,11 @@
 		<RolloverTextID>781244</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Pikeman</Target>
 			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractArcher</Target>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Crossbowman</Target>
 			</Effect>
 			<Effect type="TextOutput">781245</Effect>
 		</Effects>
@@ -72004,17 +72479,17 @@
 		<RolloverTextID>781247</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
-			<Effect type="Data" amount="1.10" subtype="Damage" allactions="1" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">Pikeman</Target>
 			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Damage" allactions="1" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractArcher</Target>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Pikeman</Target>
 			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">Crossbowman</Target>
 			</Effect>
-			<Effect type="Data" amount="1.10" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractArcher</Target>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Crossbowman</Target>
 			</Effect>
 			<Effect type="TextOutput">781248</Effect>
 		</Effects>
@@ -72072,14 +72547,20 @@
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\hc_cavalry_combat\hc_cavalry_combat</Icon>
-		<RolloverTextID>35224</RolloverTextID>
+		<RolloverTextID>781255</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
 			<Effect type="Data" amount="1.15" subtype="Hitpoints" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractHandCavalry</Target>
+				<Target type="ProtoUnit">Hussar</Target>
 			</Effect>
 			<Effect type="Data" amount="1.15" subtype="Damage" allactions="1" relativity="BasePercent">
-				<Target type="ProtoUnit">AbstractHandCavalry</Target>
+				<Target type="ProtoUnit">MountedCrossbowman</Target>
+			</Effect>
+			<Effect type="Data" amount="1.15" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Hussar</Target>
+			</Effect>
+			<Effect type="Data" amount="1.15" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">MountedCrossbowman</Target>
 			</Effect>
 			<Effect type="TextOutput">41805</Effect>
 		</Effects>
@@ -72091,7 +72572,7 @@
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
 		<Icon>ui\techs\hc_cavalry_hitpoints\hc_cavalry_hitpoints</Icon>
-		<RolloverTextID>35122</RolloverTextID>
+		<RolloverTextID>781251</RolloverTextID>
 		<Flag>HomeCity</Flag>
 		<Effects>
 			<Effect type="Data" amount="1.15" subtype="Hitpoints" relativity="BasePercent">
@@ -72124,7 +72605,7 @@
 	</Tech>
 	<Tech name="MarineRange" type="Normal">
 		<DBID>733463</DBID>
-		<DisplayNameID>23680</DisplayNameID>
+		<DisplayNameID>781266</DisplayNameID>
 		<Cost resourcetype="Ships">1.0000</Cost>
 		<ResearchPoints>40.0000</ResearchPoints>
 		<Status>UNOBTAINABLE</Status>
@@ -72147,4 +72628,1210 @@
 			<Effect type="TextOutput">781254</Effect>
 		</Effects>
 	</Tech>
+	<Tech name="HCSacraments" type="Normal">
+		<DBID>733464</DBID>
+		<DisplayNameID>781182</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\sacraments</Icon>
+		<RolloverTextID>781258</RolloverTextID>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="0.50" subtype="TrainPoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
+			<Effect type="Data" amount="0.50" subtype="TrainPoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Architect</Target>
+			</Effect>
+			<Effect type="Data" amount="0.50" subtype="TrainPoints" relativity="BasePercent">
+				<Target type="ProtoUnit">Pilgrim</Target>
+			</Effect>
+			<Effect type="Data" amount="55.00" subtype="Cost" resource="Fame" relativity="Assign">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
+			<Effect type="Data" amount="75.00" subtype="Cost" resource="Fame" relativity="Assign">
+				<Target type="ProtoUnit">Architect</Target>
+			</Effect>
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Assign">
+				<Target type="ProtoUnit">Pilgrim</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="ProtoUnit">Architect</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Food" relativity="Assign">
+				<Target type="ProtoUnit">Pilgrim</Target>
+			</Effect>
+			<Effect type="TextOutput">781257</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="BayonetHand" type="Normal">
+		<DBID>733465</DBID>
+		<DisplayNameID>23335</DisplayNameID>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="Data" action="MeleeHandAttack" amount="0.80" subtype="Damage" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			</Effect>
+			<Effect type="Data" action="VolleyHandAttack" amount="0.80" subtype="Damage" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			</Effect>
+			<Effect type="Data" action="DefendHandAttack" amount="0.80" subtype="Damage" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			</Effect>
+			<Effect type="Data" action="StaggerHandAttack" amount="0.80" subtype="Damage" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractHandInfantry</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="WingedKnights1" type="Normal">
+		<DBID>733466</DBID>
+		<DisplayNameID>37520</DisplayNameID>
+		<Cost resourcetype="Gold">1000.0000</Cost>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\cavalry\light_cavalry\wingedk_icon</Icon>
+		<RolloverTextID>781261</RolloverTextID>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="10.00" subtype="FreeHomeCityUnit" unittype="WingedK" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="BigBisons" type="Normal">
+		<DBID>733467</DBID>
+		<DisplayNameID>781265</DisplayNameID>
+		<Cost resourcetype="Wood">300.0000</Cost>
+		<Cost resourcetype="Gold">300.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\bigbison</Icon>
+		<IconTextureCoords>.798828125 .3046875 .99609375 .60546875</IconTextureCoords>
+		<RolloverTextID>781264</RolloverTextID>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>CheckLandHCGatherPoint</Flag>
+		<Flag>NativeDance</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="-0.67" subtype="FreeHomeCityUnit" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="Bison" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="SwedishMinutemen" type="Normal">
+		<DBID>733468</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Flag>CheckLandHCGatherPoint</Flag>
+		<Flag>YPInfiniteTech</Flag>
+		<Effects>
+			<Effect type="Data" amount="4.00" subtype="FreeHomeCityUnit" unittype="Minuteman" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="Age0Swedish" type="Normal">
+		<DBID>733469</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">LumberCamp</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">ChurchFortifiedWalls</Effect>
+			<Effect type="TechStatus" status="obtainable">ChurchLumberCamp</Effect>
+			<Effect type="TechStatus" status="obtainable">ChurchAxe</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Musketeer</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranMusketeers</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardMusketeers</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialMusketeers</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Grenadier</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardGrenadiers</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranGrenadiers</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="obtainable">IncendiaryGrenades</Effect>
+			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
+				<Target type="ProtoUnit">Church</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">GoldMiner</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="ProtoUnit">xpSpy</Target>
+			</Effect>
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
+				<Target type="ProtoUnit">xpSpy</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Gold" relativity="Assign">
+				<Target type="ProtoUnit">Surgeon</Target>
+			</Effect>
+			<Effect type="Data" amount="50.00" subtype="Cost" resource="Fame" relativity="Absolute">
+				<Target type="ProtoUnit">Surgeon</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Surgeon</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">EconomicAlliance</Effect>
+			<Effect type="TechStatus" status="obtainable">MilitaryAlliance</Effect>
+			<Effect type="TechStatus" status="obtainable">ypConsulateGermansBrigadeFame</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">CoveredWagonPlus</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Capitol</Target>
+			</Effect>
+			<Effect type="Data" amount="150.00" subtype="Resource" resource="Fame" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">SpyglassE</Effect>
+			<Effect type="TechStatus" status="obtainable">Ranching</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">MercArmyG</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">ypConsulateArmySwedish11</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">ypConsulateArmySwedish33</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">ypConsulateArmySwedish22</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Envoy</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardCrossbowmen</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardPikemen</Effect>
+			<Effect type="TechStatus" status="obtainable">Civilization</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Explorer</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">TownCenter</Target>
+			</Effect>
+			<Effect type="TechStatus" status="active">AAStandardStartingTechs</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">HouseEast</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranHussars</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardHussars</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Mill</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Settler</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardSharpshooter</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranPistols</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardPistols</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialPistols</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranCrossbowmen</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="obtainable">GuardDragoons</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialSharpshooter</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Hussar</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">CapitolD</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">ArtilleryDepot</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Stable</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Barracks</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianSergeantGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianBishopGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianPirate</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianTycoon</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianGeneral</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianPresidenteEU</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianCavalierGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">PoliticianPhilosopherPrince</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Plantation</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">TradingPost</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Mortar</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Outpost</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Dock</Target>
+			</Effect>
+			<Effect type="TechStatus" status="active">XPTrickle</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Market</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Arsenal</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranPikemen</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialCannon</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">CWallGate</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Church</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">WallStraight2</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">WallStraight5</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">WallConnector</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Crossbowman</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Pikeman</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Priest</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">FieldHospital</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">FishingBoat</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="obtainable">UnlockPoliticianViceroyGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">UnlockPoliticianEngineerGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">UnlockPoliticianMarksmanGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">UnlockPoliticianExiledPrinceGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">UnlockPoliticianQuartermasterGerman</Effect>
+			<Effect type="TechStatus" status="obtainable">UnlockPoliticianNaturalistGerman</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Dragoon</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Culverin</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Falconet</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Monitor</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Frigate</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Galleon</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">Caravel</Target>
+			</Effect>
+			<Effect type="TechStatus" status="active">Levy</Effect>
+			<Effect type="Data" action="SpawnCannon" amount="1.00" subtype="ActionEnable" relativity="Absolute">
+				<Target type="ProtoUnit">Factory</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialCannon</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="obtainable">FieldGun</Effect>
+			<Effect type="TechStatus" status="obtainable">VeteranSharpshooterShadow</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialMonitors</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">SettlerWagon</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">SPCFortCenter</Target>
+			</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="obtainable">HeavyHorseArtillery</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">xpHorseArtillery</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">xpSpy</Target>
+			</Effect>
+			<Effect type="TechStatus" status="unobtainable">Howitzer</Effect>
+			<Effect type="TechStatus" status="unobtainable">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="obtainable">HowitzerNew</Effect>
+			<Effect type="TechStatus" status="obtainable">ImperialHowitzerNew</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCFameGold" type="Normal">
+		<DBID>733470</DBID>
+		<DisplayNameID>781273</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\ransom</Icon>
+		<RolloverTextID>781272</RolloverTextID>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="TextOutput">781274</Effect>
+			<Effect type="ResourceExchange" multiplier="0.85" toresource="Gold" fromresource="Fame"/>
+		</Effects>
+	</Tech>
+	<Tech name="VeteranSharpshooterShadow" type="Normal">
+		<DBID>733471</DBID>
+		<ResearchPoints>0.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Fortressize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+			<Effect type="SetName" proto="SharpshooterS" culture="none" newName="781298"/>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ColonializeSwedish" type="Normal">
+		<DBID>733472</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\post_game\time_line_age_2</Icon>
+		<Effects>
+			<Effect type="TechStatus" status="active">Colonialize</Effect>
+			<Effect type="TextOutput">780790</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="FortressizeSwedish" type="Normal">
+		<DBID>733473</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\post_game\time_line_age_3</Icon>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="TechStatus" status="active">Fortressize</Effect>
+			<Effect type="Data" amount="1.00" subtype="BuildLimit" relativity="Absolute">
+				<Target type="ProtoUnit">TownCenter</Target>
+			</Effect>
+			<Effect type="TextOutput">780790</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="IndustrializeSwedish" type="Normal">
+		<DBID>733474</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\post_game\time_line_age_4</Icon>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="TechStatus" status="active">Industrialize</Effect>
+			<Effect type="TechStatus" status="active">Crackshot</Effect>
+			<Effect type="TextOutput">780790</Effect>
+			<Effect type="TechStatus" status="obtainable">XPRevolutionSantander</Effect>
+			<Effect type="TechStatus" status="obtainable">XPRevolutionHidalgo</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ImperializeSwedish" type="Normal">
+		<DBID>733475</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\post_game\time_line_age_5</Icon>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="TechStatus" status="active">Imperialize</Effect>
+			<Effect type="TechStatus" status="unobtainable">XPRevolutionSantander</Effect>
+			<Effect type="TechStatus" status="unobtainable">XPRevolutionHidalgo</Effect>
+			<Effect type="TextOutput">780790</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="GuardSharpshooter" type="Normal">
+		<DBID>733476</DBID>
+		<DisplayNameID>781279</DisplayNameID>
+		<Cost resourcetype="Wood">600.0000</Cost>
+		<Cost resourcetype="Gold">600.0000</Cost>
+		<ResearchPoints>30.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\guard_infantry\guard_infantry</Icon>
+		<RolloverTextID>781278</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>UpgradeTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Industrialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="1.30" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+			<Effect type="SetName" proto="SharpshooterS" culture="none" newName="781280"/>
+			<Effect type="Data" amount="1.30" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="UpdateVisual" unittype="SharpshooterS" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ImperialSharpshooter" type="Normal">
+		<DBID>733477</DBID>
+		<DisplayNameID>781276</DisplayNameID>
+		<Cost resourcetype="Wood">1500.0000</Cost>
+		<Cost resourcetype="Gold">1500.0000</Cost>
+		<ResearchPoints>30.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\imperial_infantry\imperial_infantry</Icon>
+		<RolloverTextID>781275</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>UpgradeTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">GuardSharpshooter</TechStatus>
+			<TechStatus status="Active">Imperialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="SetName" proto="SharpshooterS" culture="none" newName="781277"/>
+			<Effect type="Data" amount="1.50" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+			<Effect type="Data" amount="1.50" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">SharpshooterS</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="PostIndustrialSwedish" type="Normal">
+		<DBID>733477</DBID>
+		<DisplayNameID>36216</DisplayNameID>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\artillery\organ_gun\organ_gun_icon_64x64</Icon>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="TechStatus" status="active">Gangsaw</Effect>
+			<Effect type="TechStatus" status="active">CavalryCuirass</Effect>
+			<Effect type="TechStatus" status="active">Bayonet</Effect>
+			<Effect type="TechStatus" status="active">Rifling</Effect>
+			<Effect type="TechStatus" status="active">GunnersQuadrant</Effect>
+			<Effect type="TechStatus" status="active">HeatedShot</Effect>
+			<Effect type="TechStatus" status="active">InfantryBreastplate</Effect>
+			<Effect type="TechStatus" status="active">SeedDrill</Effect>
+			<Effect type="TechStatus" status="active">SelectiveBreeding</Effect>
+			<Effect type="TechStatus" status="active">HuntingDogs</Effect>
+			<Effect type="Data" amount="0.00" subtype="EnableTradeRouteLOS" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="TechStatus" status="active">Revetment</Effect>
+			<Effect type="TechStatus" status="active">Bastion</Effect>
+			<Effect type="TechStatus" status="active">PlacerMines</Effect>
+			<Effect type="TechStatus" status="active">Caracole</Effect>
+			<Effect type="TechStatus" status="active">OreRefining</Effect>
+			<Effect type="TechStatus" status="active">ArmorPlating</Effect>
+			<Effect type="TechStatus" status="active">Carronade</Effect>
+			<Effect type="TechStatus" status="active">PercussionLocks</Effect>
+			<Effect type="TechStatus" status="active">ChurchStandingArmy</Effect>
+			<Effect type="TechStatus" status="active">ChurchGasLighting</Effect>
+			<Effect type="TechStatus" status="active">FrontierTraining</Effect>
+			<Effect type="TechStatus" status="active">LogFlume</Effect>
+			<Effect type="TechStatus" status="active">Bookkeeping</Effect>
+			<Effect type="TechStatus" status="active">Bookkeeping</Effect>
+			<Effect type="TechStatus" status="active">ArtificialFertilizer</Effect>
+			<Effect type="TechStatus" status="active">CircularSaw</Effect>
+			<Effect type="TechStatus" status="active">Amalgamation</Effect>
+			<Effect type="TechStatus" status="active">Levy</Effect>
+			<Effect type="TechStatus" status="active">Homesteading</Effect>
+			<Effect type="TechStatus" status="active">LongLines</Effect>
+			<Effect type="TechStatus" status="active">GillNets</Effect>
+			<Effect type="TechStatus" status="active">FrontierOutpost</Effect>
+			<Effect type="TechStatus" status="active">SteelTraps</Effect>
+			<Effect type="TechStatus" status="active">FactoryWaterPower</Effect>
+			<Effect type="TechStatus" status="active">FactorySteamPower</Effect>
+			<Effect type="TechStatus" status="active">FactoryCannery</Effect>
+			<Effect type="TechStatus" status="active">StarFort</Effect>
+			<Effect type="TechStatus" status="active">FortifiedOutpost</Effect>
+			<Effect type="Data" amount="1.00" subtype="Enable" relativity="Absolute">
+				<Target type="ProtoUnit">CoveredWagon</Target>
+			</Effect>
+			<Effect type="TechStatus" status="active">ChurchMassCavalry</Effect>
+			<Effect type="TechStatus" status="active">ChurchStandingArmy</Effect>
+			<Effect type="TechStatus" status="active">VeteranPikemen</Effect>
+			<Effect type="TechStatus" status="active">VeteranMusketeers</Effect>
+			<Effect type="TechStatus" status="active">VeteranHussars</Effect>
+			<Effect type="TechStatus" status="active">VeteranGrenadiers</Effect>
+			<Effect type="TechStatus" status="active">VeteranCrossbowmen</Effect>
+			<Effect type="TechStatus" status="active">VeteranPistolS</Effect>
+			<Effect type="TechStatus" status="active">GrapeShot</Effect>
+			<Effect type="TechStatus" status="active">Howitzer</Effect>
+			<Effect type="TechStatus" status="active">FieldGun</Effect>
+			<Effect type="TechStatus" status="active">Trunion</Effect>
+			<Effect type="TechStatus" status="active">ProfessionalGunners</Effect>
+			<Effect type="TechStatus" status="active">PaperCartridge</Effect>
+			<Effect type="TechStatus" status="active">MilitaryDrummers</Effect>
+			<Effect type="TechStatus" status="active">Flintlock</Effect>
+			<Effect type="TechStatus" status="active">Pillage</Effect>
+			<Effect type="TechStatus" status="active">FactoryMassProduction</Effect>
+			<Effect type="TechStatus" status="active">GuardDragoons</Effect>
+			<Effect type="TechStatus" status="active">GuardMusketeers</Effect>
+			<Effect type="TechStatus" status="active">GuardHussars</Effect>
+			<Effect type="TechStatus" status="active">GuardGrenadiers</Effect>
+			<Effect type="TechStatus" status="active">GuardCrossbowmen</Effect>
+			<Effect type="TechStatus" status="active">GuardPistolS</Effect>
+			<Effect type="TechStatus" status="active">NativeUpgrades</Effect>
+			<Effect type="TechStatus" status="active">NativeUpgrades2</Effect>
+			<Effect type="TechStatus" status="active">AAStandardNativeTechsPI</Effect>
+			<Effect type="TechStatus" status="active">HeavyHorseArtillery</Effect>
+			<Effect type="TechStatus" status="active">GuardSharpshooter</Effect>
+			<Effect type="TechStatus" status="active">GuardPikemen</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="PostImperialSwedish" type="Normal">
+		<DBID>733478</DBID>
+		<DisplayNameID>36304</DisplayNameID>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\artillery\organ_gun\organ_gun_icon_64x64</Icon>
+		<Flag>Shadow</Flag>
+		<Effects>
+			<Effect type="TechStatus" status="active">PostIndustrialBritish</Effect>
+			<Effect type="TechStatus" status="active">ImpLargeScaleAgriculture</Effect>
+			<Effect type="TechStatus" status="active">ImpImmigrants</Effect>
+			<Effect type="TechStatus" status="active">ImpDeforestation</Effect>
+			<Effect type="TechStatus" status="active">ImpKnighthood</Effect>
+			<Effect type="TechStatus" status="active">ImpPeerage</Effect>
+			<Effect type="TechStatus" status="active">ImpExcessiveTaxation</Effect>
+			<Effect type="TechStatus" status="active">ImperialCrossbowmen</Effect>
+			<Effect type="TechStatus" status="active">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="active">ImperialMusketeers</Effect>
+			<Effect type="TechStatus" status="active">ImperialDragoons</Effect>
+			<Effect type="TechStatus" status="active">ImperialGrenadiers</Effect>
+			<Effect type="TechStatus" status="active">ImperialCulverin</Effect>
+			<Effect type="TechStatus" status="active">ImperialRocket</Effect>
+			<Effect type="TechStatus" status="active">ImperialHowitzer</Effect>
+			<Effect type="TechStatus" status="active">ImperialFieldGun</Effect>
+			<Effect type="TechStatus" status="active">ImperialManOWar</Effect>
+			<Effect type="TechStatus" status="active">ImperialHussars</Effect>
+			<Effect type="TechStatus" status="active">ImperialSharpshooter</Effect>
+			<Effect type="TechStatus" status="active">ImperialMonitors</Effect>
+			<Effect type="TechStatus" status="active">ImpLegendaryNatives</Effect>
+			<Effect type="TechStatus" status="active">ImperialHorseArtillery</Effect>
+			<Effect type="TechStatus" status="active">ImperialPikemen</Effect>
+			<Effect type="TechStatus" status="active">ImperialPistolS</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="VeteranPistolS" type="Normal">
+		<DBID>93</DBID>
+		<DisplayNameID>781289</DisplayNameID>
+		<Cost resourcetype="Wood">200.0000</Cost>
+		<Cost resourcetype="Gold">200.0000</Cost>
+		<ResearchPoints>30.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\veteran_cavalry\veteran_cavalry</Icon>
+		<RolloverTextID>781285</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>UpgradeTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Fortressize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="1.20" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+			<Effect type="Data" amount="1.20" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+			<Effect type="SetName" proto="PistolS" culture="none" newName="781290"/>
+			<Effect type="Data" amount="0.00" subtype="UpdateVisual" unittype="PistolS" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="GuardPistolS" type="Normal">
+		<DBID>733476</DBID>
+		<DisplayNameID>781286</DisplayNameID>
+		<Cost resourcetype="Wood">600.0000</Cost>
+		<Cost resourcetype="Gold">600.0000</Cost>
+		<ResearchPoints>30.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\guard_cavalry\guard_cavalry</Icon>
+		<RolloverTextID>781285</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>UpgradeTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">VeteranPistolS</TechStatus>
+			<TechStatus status="Active">Industrialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="1.30" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+			<Effect type="SetName" proto="PistolS" culture="none" newName="781287"/>
+			<Effect type="Data" amount="1.30" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="UpdateVisual" unittype="PistolS" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ImperialPistolS" type="Normal">
+		<DBID>733477</DBID>
+		<DisplayNameID>781283</DisplayNameID>
+		<Cost resourcetype="Wood">1500.0000</Cost>
+		<Cost resourcetype="Gold">1500.0000</Cost>
+		<ResearchPoints>30.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\imperial_cavalry\imperial_cavalry</Icon>
+		<RolloverTextID>781282</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>UpgradeTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">GuardPistolS</TechStatus>
+			<TechStatus status="Active">Imperialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="SetName" proto="PistolS" culture="none" newName="781284"/>
+			<Effect type="Data" amount="1.50" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+			<Effect type="Data" amount="1.50" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">PistolS</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCRoyalDecreeSwedish" type="Normal">
+		<DBID>733478</DBID>
+		<DisplayNameID>781292</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\hc_royal_decree\hc_royal_decree</Icon>
+		<RolloverTextID>781293</RolloverTextID>
+		<Flag>OrPrereqs</Flag>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="TextOutput">781291</Effect>
+			<Effect type="Data" amount="-1.00" subtype="AllowedAge" relativity="Absolute">
+				<Target type="ProtoUnit">Capitol</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ChurchFortifiedWalls" type="Normal">
+		<DBID>733479</DBID>
+		<DisplayNameID>781303</DisplayNameID>
+		<Cost resourcetype="Wood">600.0000</Cost>
+		<Cost resourcetype="Gold">600.0000</Cost>
+		<ResearchPoints>15.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\bastion\bastion</Icon>
+		<RolloverTextID>23451</RolloverTextID>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>UniqueTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">HCRoyalDecreeSwedish</TechStatus>
+			<TechStatus status="Active">Industrialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="TechStatus" status="active">Bastion</Effect>
+			<Effect type="TechStatus" status="active">StoneFortifiedWalls</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ChurchLumberCamp" type="Normal">
+		<DBID>733480</DBID>
+		<DisplayNameID>780986</DisplayNameID>
+		<Cost resourcetype="Food">300.0000</Cost>
+		<Cost resourcetype="Gold">300.0000</Cost>
+		<ResearchPoints>15.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\hc_wood_crate0\hc_wood_crate0</Icon>
+		<RolloverTextID>780987</RolloverTextID>
+		<Flag>CheckLandHCGatherPoint</Flag>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>UniqueTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">HCRoyalDecreeSwedish</TechStatus>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" action="Gather" amount="1.10" subtype="WorkRate" unittype="Tree" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.10" subtype="WorkRate" unittype="ypGroveBuilding" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="LumberWagon" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ChurchAxe" type="Normal">
+		<DBID>733481</DBID>
+		<DisplayNameID>781296</DisplayNameID>
+		<Cost resourcetype="Gold">1500.0000</Cost>
+		<ResearchPoints>15.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\infantry\poleaxeman\poleaxeman_icon</Icon>
+		<RolloverTextID>781297</RolloverTextID>
+		<Flag>UniqueTech</Flag>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>CheckLandHCGatherPoint</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Fortressize</TechStatus>
+			<TechStatus status="Active">HCRoyalDecreeSwedish</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="10.00" subtype="FreeHomeCityUnit" unittype="AxemanS" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="FlagBearer" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="SwedishBrig" type="Normal">
+		<DBID>733482</DBID>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Flag>YPNeverObtainableAfterUse</Flag>
+		<Effects>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="BrigEx" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCShipInquisitors" type="Normal">
+		<DBID>733483</DBID>
+		<DisplayNameID>781299</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\priests\priest2_icon</Icon>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="3.00" subtype="FreeHomeCityUnit" unittype="Inquisitor" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCShipTurkeys" type="Normal">
+		<DBID>733484</DBID>
+		<DisplayNameID>781300</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\animals\turkey\turkey_icon</Icon>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="7.00" subtype="FreeHomeCityUnit" unittype="Turkey" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="Redoubt" type="Normal">
+		<DBID>733485</DBID>
+		<DisplayNameID>781301</DisplayNameID>
+		<Cost resourcetype="Wood">250.0000</Cost>
+		<Cost resourcetype="Gold">250.0000</Cost>
+		<ResearchPoints>60.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\bastion\bastion</Icon>
+		<RolloverTextID>781302</RolloverTextID>
+		<Flag>UpgradeTech</Flag>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>YPNeverObtainableAfterUse</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Bastion</TechStatus>
+			<TechStatus status="Active">Industrialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="2.00" subtype="Armor" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractWall</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="UpdateVisual" unittype="AbstractWall" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="Reinforcements" type="Normal">
+		<DBID>733486</DBID>
+		<DisplayNameID>781303</DisplayNameID>
+		<Cost resourcetype="Wood">400.0000</Cost>
+		<Cost resourcetype="Gold">400.0000</Cost>
+		<ResearchPoints>60.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\bastion\bastion</Icon>
+		<RolloverTextID>23451</RolloverTextID>
+		<Flag>UpgradeTech</Flag>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>YPNeverObtainableAfterUse</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Bastion</TechStatus>
+			<TechStatus status="Active">Industrialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="2.00" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractWall</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="UpdateVisual" unittype="AbstractWall" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCREVPowder" type="Normal">
+		<DBID>733487</DBID>
+		<DisplayNameID>77826</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>20.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\trade\fort_wagon_icon_black_inf</Icon>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="3.00" subtype="FreeHomeCityUnit" unittype="BlackPowderWagon" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCREVFireShips" type="Normal">
+		<DBID>733488</DBID>
+		<DisplayNameID>781304</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>20.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\naval\fireship_inf</Icon>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="3.00" subtype="FreeHomeCityUnit" unittype="AsianFireship" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="BigDeer" type="Normal">
+		<DBID>733489</DBID>
+		<DisplayNameID>781307</DisplayNameID>
+		<Cost resourcetype="Wood">300.0000</Cost>
+		<Cost resourcetype="Gold">300.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\bigdeer</Icon>
+		<IconTextureCoords>.798828125 .3046875 .99609375 .60546875</IconTextureCoords>
+		<RolloverTextID>781306</RolloverTextID>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>CheckLandHCGatherPoint</Flag>
+		<Flag>NativeDance</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="-0.67" subtype="FreeHomeCityUnit" unittype="Deer" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="Deer" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="BigTurkey" type="Normal">
+		<DBID>733490</DBID>
+		<DisplayNameID>781309</DisplayNameID>
+		<Cost resourcetype="Wood">300.0000</Cost>
+		<Cost resourcetype="Gold">300.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\bigturkey</Icon>
+		<IconTextureCoords>.798828125 .3046875 .99609375 .60546875</IconTextureCoords>
+		<RolloverTextID>781308</RolloverTextID>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>CheckLandHCGatherPoint</Flag>
+		<Flag>NativeDance</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="-0.67" subtype="FreeHomeCityUnit" unittype="Turkey" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="Turkey" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCTradeAct" type="Normal">
+		<DBID>733491</DBID>
+		<DisplayNameID>781310</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\native\Versailles</Icon>
+		<RolloverTextID>781311</RolloverTextID>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="0.65" subtype="ResourceTrickleRate" resource="Food" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="TextOutput">781312</Effect>
+			<Effect type="Data" amount="0.65" subtype="ResourceTrickleRate" resource="Gold" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="BigWarrior" type="Normal">
+		<DBID>733492</DBID>
+		<DisplayNameID>781315</DisplayNameID>
+		<Cost resourcetype="Food">250.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\bigwarrior</Icon>
+		<IconTextureCoords>.798828125 .3046875 .99609375 .60546875</IconTextureCoords>
+		<RolloverTextID>781314</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>NativeDance</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" action="SpawnWarriors" amount="1.00" subtype="ActionAdd" unittype="Teepee" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="NatFinePowder" type="Normal">
+		<DBID>733493</DBID>
+		<DisplayNameID>781317</DisplayNameID>
+		<Cost resourcetype="Food">250.0000</Cost>
+		<Cost resourcetype="Gold">250.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\native\FinePowder</Icon>
+		<RolloverTextID>781316</RolloverTextID>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>YPNativeImprovement</Flag>
+		<Effects>
+			<Effect type="Data" action="StaggerRangedAttack" amount="2.00" subtype="MaximumRange" relativity="Absolute">
+				<Target type="ProtoUnit">AbstractGunpowderTrooper</Target>
+			</Effect>
+			<Effect type="Data" action="DefendRangedAttack" amount="2.00" subtype="MaximumRange" relativity="Absolute">
+				<Target type="ProtoUnit">AbstractGunpowderTrooper</Target>
+			</Effect>
+			<Effect type="Data" action="VolleyRangedAttack" amount="2.00" subtype="MaximumRange" relativity="Absolute">
+				<Target type="ProtoUnit">AbstractGunpowderTrooper</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="NatElephants" type="Normal">
+		<DBID>733494</DBID>
+		<DisplayNameID>781329</DisplayNameID>
+		<Cost resourcetype="Wood">300.0000</Cost>
+		<Cost resourcetype="Gold">300.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>units\animals\wild_elephant\elephant_icon_64</Icon>
+		<RolloverTextID>781318</RolloverTextID>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>YPNativeImprovement</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="-0.67" subtype="FreeHomeCityUnit" unittype="ypWildElephant" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+			<Effect type="Data" amount="1.00" subtype="FreeHomeCityUnit" unittype="ypWildElephant" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="HCCampfire" type="Normal">
+		<DBID>733495</DBID>
+		<DisplayNameID>781323</DisplayNameID>
+		<Cost resourcetype="Ships">1.0000</Cost>
+		<ResearchPoints>40.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\hc_ability_wildfire\hc_ability_wildfire</Icon>
+		<RolloverTextID>781324</RolloverTextID>
+		<Flag>HomeCity</Flag>
+		<Effects>
+			<Effect type="Data" amount="-1.00" subtype="AllowedAge" relativity="Absolute">
+				<Target type="ProtoUnit">FirePit</Target>
+			</Effect>
+			<Effect type="Data" amount="0.00" subtype="Cost" resource="Wood" relativity="Assign">
+				<Target type="ProtoUnit">FirePit</Target>
+			</Effect>
+			<Effect type="Data" amount="1.50" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">FirePit</Target>
+			</Effect>
+			<Effect type="Data" amount="0.50" subtype="TrainPoints" relativity="BasePercent">
+				<Target type="ProtoUnit">FirePit</Target>
+			</Effect>
+			<Effect type="TextOutput">781325</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="VenomExtract" type="Normal">
+		<DBID>733496</DBID>
+		<DisplayNameID>781326</DisplayNameID>
+		<Cost resourcetype="Food">200.0000</Cost>
+		<Cost resourcetype="Wood">200.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\viper</Icon>
+		<RolloverTextID>781327</RolloverTextID>
+		<Flag>YPNativeImprovement</Flag>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Colonialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Priest</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Missionary</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">NatMedicineMan</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">xpMedicineMan</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.35" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Imam</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.15" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Surgeon</Target>
+			</Effect>
+			<Effect type="Data" action="Heal" amount="1.15" subtype="WorkRate" unittype="LogicalTypeHealed" relativity="BasePercent">
+				<Target type="ProtoUnit">Inquisitor</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="BigHarvest" type="Normal">
+		<DBID>733492</DBID>
+		<DisplayNameID>781328</DisplayNameID>
+		<Cost resourcetype="Food">50.0000</Cost>
+		<Cost resourcetype="Wood">50.0000</Cost>
+		<Cost resourcetype="Gold">50.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\bigharvest</Icon>
+		<IconTextureCoords>.798828125 .3046875 .99609375 .60546875</IconTextureCoords>
+		<RolloverTextID>68617</RolloverTextID>
+		<Flag>CountsTowardEconomicScore</Flag>
+		<Flag>NativeDance</Flag>
+		<Effects>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="AbstractMine" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="Huntable" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="Tree" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="ypBerryBuilding" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="BerryBush" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="Herdable" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+			<Effect type="Data" action="Gather" amount="1.05" subtype="WorkRate" unittype="ypGroveBuilding" relativity="BasePercent">
+				<Target type="ProtoUnit">AbstractVillager</Target>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ypNativeTradeTreatySaltpeter" type="Normal">
+		<DBID>733493</DBID>
+		<ResearchPoints>0.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Prereqs>
+			<TechStatus status="Active">YPHCNativeTradeTax</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="300.00" subtype="Resource" resource="Trade" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="NativeTreatySaltpeter" type="Normal">
+		<DBID>733494</DBID>
+		<ResearchPoints>0.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Flag>Shadow</Flag>
+		<Prereqs>
+			<TechStatus status="Active">HCNativeTreaties</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="3.00" subtype="FreeHomeCityUnit" unittype="CamelArcher" relativity="Absolute">
+				<Target type="Player"/>
+			</Effect>
+		</Effects>
+	</Tech>
+	<Tech name="ypNatHonoredSaltpeter" type="Normal">
+		<DBID>733495</DBID>
+		<DisplayNameID>61187</DisplayNameID>
+		<Cost resourcetype="Wood">400.0000</Cost>
+		<Cost resourcetype="Gold">300.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\asians\honered_natives</Icon>
+		<RolloverTextID>61186</RolloverTextID>
+		<Flag>UpgradeTech</Flag>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>YPNativeImprovement</Flag>
+		<Prereqs>
+			<TechStatus status="Active">ypNatDisciplinedSaltpeter</TechStatus>
+			<TechStatus status="Active">Industrialize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="1.40" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">CamelArcher</Target>
+			</Effect>
+			<Effect type="Data" amount="1.40" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">CamelArcher</Target>
+			</Effect>
+			<Effect type="SetName" proto="CamelArcher" culture="none" newName="781332"/>
+		</Effects>
+	</Tech>
+	<Tech name="ypNatDisciplinedSaltpeter" type="Normal">
+		<DBID>733496</DBID>
+		<DisplayNameID>61151</DisplayNameID>
+		<Cost resourcetype="Wood">200.0000</Cost>
+		<Cost resourcetype="Gold">150.0000</Cost>
+		<ResearchPoints>10.0000</ResearchPoints>
+		<Status>UNOBTAINABLE</Status>
+		<Icon>ui\techs\asians\disciplined_natives</Icon>
+		<RolloverTextID>61150</RolloverTextID>
+		<Flag>YPNativeImprovement</Flag>
+		<Flag>CountsTowardMilitaryScore</Flag>
+		<Flag>UpgradeTech</Flag>
+		<Prereqs>
+			<TechStatus status="Active">Fortressize</TechStatus>
+		</Prereqs>
+		<Effects>
+			<Effect type="Data" amount="1.25" subtype="Hitpoints" relativity="BasePercent">
+				<Target type="ProtoUnit">CamelArcher</Target>
+			</Effect>
+			<Effect type="Data" amount="1.25" subtype="Damage" allactions="1" relativity="BasePercent">
+				<Target type="ProtoUnit">CamelArcher</Target>
+			</Effect>
+			<Effect type="SetName" proto="CamelArcher" culture="none" newName="781335"/>
+		</Effects>
+	</Tech>
 </TechTree>
\ No newline at end of file
diff --git a/RMM/AndesRegicide.xs b/RMM/AndesRegicide.xs
index 1b10957..697b73f 100644
--- a/RMM/AndesRegicide.xs
+++ b/RMM/AndesRegicide.xs
@@ -163,6 +163,9 @@ void main(void)
    int playerSide = rmRandInt(1,2);
 
    int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+   rmSetObjectDefMinDistance(startingUnits, 8.0);
+   rmSetObjectDefMaxDistance(startingUnits, 12.0);
+   rmAddObjectDefConstraint(startingUnits, avoidAll);
    if (cNumberTeams > 2)   // ffa
    {
 	if (cNumberNonGaiaPlayers < 4)
@@ -374,16 +377,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.45);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH())
diff --git a/RMM/Ceylon.xs b/RMM/Ceylon.xs
index 18ef1a0..757c71e 100644
--- a/RMM/Ceylon.xs
+++ b/RMM/Ceylon.xs
@@ -639,16 +639,6 @@ void main(void)
 
 	// Define and place Nuggets
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/Christmas.xml b/RMM/Christmas.xml
index 4bdc337..fcce884 100644
--- a/RMM/Christmas.xml
+++ b/RMM/Christmas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mapinfo details="130073" imagepath="ui\random_map\great_lakes" displayNameID="130072" cannotReplace=""
 		loadDetails="130074" loadBackground="ui\random_map\great_lakes\great_lakes_map">
-   <loadss>ui\random_map\great_lakes\great_lakes_ss_02</loadss>
+   <loadss>ui\random_map\africa\christmas_ss_01</loadss>
 </mapinfo>
\ No newline at end of file
diff --git a/RMM/Christmas.xs b/RMM/Christmas.xs
index eb90946..f240f9b 100644
--- a/RMM/Christmas.xs
+++ b/RMM/Christmas.xs
@@ -3,6 +3,10 @@
 // Main entry point for random map script I MADE A CHANGE
 //
 
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
 void main(void)
 {
    // Text
@@ -56,6 +60,8 @@ void main(void)
 	 
 	}
 
+	chooseMercs();
+
    // Picks the map size
    //int playerTiles=12000;	// old settings
 	int playerTiles = 20000;
@@ -415,8 +421,9 @@ if (seasonPicker < 0.5)
 	//rmPlaceObjectDefPerPlayer(startingTCID, true);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 10.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 
 	int StartAreaTreeID=rmCreateObjectDef("starting trees");
@@ -1046,6 +1053,19 @@ if (seasonPicker < 0.5)
 	rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*3);
 
 
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.8;
+    float walk = 0.03;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
 	// Text
 	rmSetStatusText("",1.0);
    
diff --git a/RMM/Congo.xml b/RMM/Congo.xml
new file mode 100644
index 0000000..90d6ee1
--- /dev/null
+++ b/RMM/Congo.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\congo" 
+displayNameID = "130081"
+details = "130082" 
+loadDetails = "130083" 
+loadBackground="ui\random_map\africa\congo\congo_map">
+   <loadss>ui\random_map\africa\congo\congo_ss_01</loadss>
+   <loadss>ui\random_map\africa\congo\congo_ss_02</loadss>
+   <loadss>ui\random_map\africa\congo\congo_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/Congo.xs b/RMM/Congo.xs
new file mode 100644
index 0000000..714b173
--- /dev/null
+++ b/RMM/Congo.xs
@@ -0,0 +1,1672 @@
+/* 
+# Mosquito Coast
+# 
+# Monteverde / Tortuguero / Cano Negro
+# 
+# The map portrays a corner of the Caribbean lowlands - a maze of rivers, canals, lagoons 
+# and tidal wetlands. Showcasing lush and dense cloud forests, home of a unique mix of 
+# animals and plants, the region gets heavy rainfall throughout the year.
+# 
+# The script may randomly load one of two variations:
+# 1. A coastal plateau with numerous deep water pockets, rock ridges and some cliffs peppering the landscape
+# 2. A strip of land with a trade route in the middle section and two smaller land areas on opposite edges of the map, separated by winding water canals
+# 
+# FFA has a separate variation with delta islands, divided by pathable waters, and two trade route areas on opposite edges of the map (their positions are random).
+# 
+# Each player side gets a native settlement (Caribs or Maya/Jesuits on TAD) in the trade route variation. More settlements can be found 
+# close to the edges of the map, in the coastal variation.
+# 
+# April-July-November
+# 
+# Mister 2014
+*/
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+bool Asian = false;
+
+bool IsYP(){
+	if (rmGetCivID("Japanese")==19)
+		Asian = true;
+	return(Asian);
+}
+
+int landnoise=0; 
+int num=0; 
+void Area(float Asize=0.0, float spotX=0.0, float spotZ=0.0, string Paint=""){
+	landnoise=rmCreateArea("Some Area"+num); 
+	rmSetAreaSize(landnoise, Asize, Asize); 
+	rmSetAreaTerrainType(landnoise, Paint); 
+	rmSetAreaCliffType(landnoise, "uger"); 
+	rmSetAreaCliffHeight(landnoise, 1.0, 0.0, 1.0); 
+	rmSetAreaCliffEdge(landnoise, 1, 1.0, 0.0, 0.0, 0); 
+	rmSetAreaCliffPainting(landnoise, true, false, false, 0, true); 
+	rmSetAreaCoherence(landnoise, 0.80); 
+	rmSetAreaSmoothDistance(landnoise, 3); 
+	rmSetAreaHeightBlend(landnoise, 4); 
+	rmSetAreaBaseHeight(landnoise, 0.0); 
+	rmSetAreaElevationNoiseBias(landnoise, 0);
+    rmSetAreaElevationEdgeFalloffDist(landnoise, 3);
+	rmSetAreaElevationVariation(landnoise, 2);
+	rmSetAreaElevationPersistence(landnoise, 0.3);
+	rmSetAreaElevationOctaves(landnoise, 4);
+	rmSetAreaElevationMinFrequency(landnoise, 0.04);
+	rmSetAreaElevationType(landnoise, cElevTurbulence);
+	rmSetAreaLocation(landnoise, spotX, spotZ); 			// DBG flag -- line 912
+	num=num+1;												
+}
+
+float PI = 3.1415926535897932384626433832795;
+float pow(float x = 0,int p = 0) { 
+	float x2 = 1;	float x4 = 1; float x8 = 1; float x16 = 1; float x32 = 1; float x64 = 1; 
+	if(p>=2) x2 = x*x; 
+	if(p>=4) x4 = x2*x2; 
+	if(p>=8) x8 = x4*x4; 
+	if(p>=16) x16 = x8*x8; 
+	if(p>=32) x32 = x16*x16; 
+	if(p>=64) x64 = x32*x32; 
+	float ret = 1;	
+	while(p>=64) {	ret = ret * x64; p = p - 64; }	
+	if(p>=32) { ret = ret * x32; p = p - 32; } 
+	if(p>=16) { ret = ret * x16; p = p - 16; } 
+	if(p>=8) { ret = ret * x8; p = p - 8; } 
+	if(p>=4) { ret = ret * x4; p = p - 4; } 
+	if(p>=2) { ret = ret * x2; p = p - 2; } 
+	if(p>=1) { ret = ret * x; p = p - 1; } 
+	return (ret); 
+}
+float atan(float n = 0) { 
+	float m = n; 
+	if(n > 1) m = 1.0 / n; 
+	if(n < -1) m = -1.0 / n; 
+	float r = m; 
+	for(i = 1; < 100) { int j = i * 2 + 1; float k = pow(m,j) / j; 
+		if(k == 0) break; 
+		if(i % 2 == 0) r = r + k; 
+		if(i % 2 == 1) r = r - k; 
+	} 
+	if(n > 1 || n < -1) r = PI / 2.0 - r; 
+	if(n < -1) r = 0.0 - r; 
+	return (r); 
+}
+float atan2(float z = 0,float x = 0) { 
+	if(x > 0) return (atan(z / x)); 
+	if(x < 0) { if(z < 0) return (atan(z / x) - PI); 
+		if(z > 0) return (atan(z / x) + PI); 	
+		return (PI); 
+	} 
+	if(z > 0) return (PI / 2.0); 
+	if(z < 0) return (0.0 - (PI / 2.0)); 
+	return (0); 
+}
+float fact(float n = 0) { 
+	float r = 1; 
+	for(i = 1; <= n) { r = r * i; } 
+	return (r); 
+}
+float cos(float n = 0) { 
+	float r = 1; 
+	for(i = 1; < 100) { 
+		int j = i * 2; float k = pow(n,j) / fact(j); 
+		if(k == 0) break; 
+		if(i % 2 == 0) r = r + k; 
+		if(i % 2 == 1) r = r - k; 
+	} 
+	return (r); 
+}
+float sin(float n = 0) { 
+	float r = n; 
+	for(i = 1; < 100) { 
+		int j = i * 2 + 1; 
+		float k = pow(n,j) / fact(j); 
+		if(k == 0) break; 
+		if(i % 2 == 0) r = r + k; 
+		if(i % 2 == 1) r = r - k; 
+	} 
+	return (r); 
+} 
+
+float LocX = 0; 
+float LocZ = 0; 
+float wAngle = 0;
+
+float getLocX(float xOrigin=0, float rad=0, float MyAngle=0) { 
+	wAngle = (2*PI*MyAngle)/360; 
+	LocX=cos(wAngle)*rad + xOrigin; 
+	return(LocX); 
+}
+	
+float getLocZ(float zOrigin=0, float rad=0, float MyAngle=0) { 
+	wAngle = (2*PI*MyAngle)/360; 
+	LocZ=sin(wAngle)*rad + zOrigin; 
+	return(LocZ); 
+}
+
+int classSmallIsland = 0;
+int islandConstraint2 = 0; 
+int avoidSmallIslands = 0;
+int islandEdgeConstraint = 0;
+
+int buildTradeArea (string TradeIslandName = "", float xLoc = 0.0, float zLoc = 0.0, float xFrac1 = 0.0, float zFrac1 = 0.0, float xFrac2 = 0.0, float zFrac2 = 0.0, string socketDef="") { 
+    int tradeIslandID=rmCreateArea(TradeIslandName); 
+    rmSetAreaSize(tradeIslandID, 0.09, 0.09);
+    rmAddAreaToClass(tradeIslandID, classSmallIsland);  
+    rmSetAreaTerrainType(tradeIslandID, "borneo\ground_grass1_borneo");
+    //rmAddAreaTerrainLayer(tradeIslandID, "amazon\river1_am", 0, 14);
+    //rmSetAreaMix(tradeIslandID, "yucatan_grass");  
+    rmSetAreaEdgeFilling(tradeIslandID, 0);
+    rmSetAreaBaseHeight(tradeIslandID, 2.0);
+    rmSetAreaSmoothDistance(tradeIslandID, 5);
+    /*rmAddAreaConstraint(tradeIslandID, avoidSmallIslands); 
+    rmAddAreaConstraint(tradeIslandID, islandConstraint2); */
+    rmSetAreaCoherence(tradeIslandID, 0.6);
+    rmSetAreaLocation(tradeIslandID, xLoc, zLoc);  
+    rmSetAreaElevationType(tradeIslandID, cElevTurbulence);
+    rmSetAreaElevationVariation(tradeIslandID, 4.0);
+    rmSetAreaElevationMinFrequency(tradeIslandID, 0.09);
+    rmSetAreaElevationOctaves(tradeIslandID, 3);
+    rmSetAreaElevationPersistence(tradeIslandID, 0.2);
+    rmSetAreaElevationNoiseBias(tradeIslandID, 1);
+    rmAddAreaInfluenceSegment(tradeIslandID, xFrac1, zFrac1, xFrac2, zFrac2);
+	rmAddAreaRemoveType(tradeIslandID, "borneo_underbrush");
+	rmAddAreaRemoveType(tradeIslandID, "PropTurtles");
+	rmAddAreaRemoveType(tradeIslandID, "PropSwan");
+	rmAddAreaRemoveType(tradeIslandID, "PropFish");
+	rmAddAreaRemoveType(tradeIslandID, "DuckFamily");
+    rmBuildArea(tradeIslandID);
+
+    int tradeRouteID = rmCreateTradeRoute();
+    int socketID=rmCreateObjectDef(socketDef);
+    rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+    rmSetObjectDefAllowOverlap(socketID, true);
+    rmSetObjectDefMinDistance(socketID, 0.0);
+    rmSetObjectDefMaxDistance(socketID, 8.0);
+    rmAddTradeRouteWaypoint(tradeRouteID, xFrac1, zFrac1);
+    rmAddRandomTradeRouteWaypoints(tradeRouteID, xFrac2, zFrac2, 6, 6);
+    //	rmAddTradeRouteWaypoint(tradeRouteID, xFrac2, zFrac2);
+    rmBuildTradeRoute(tradeRouteID, "dirt");
+    rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+    vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.5);
+    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);  
+    return(tradeIslandID);
+}
+
+void main(void){
+
+rmSetStatusText("", 0.0);
+
+	if (rmGetIsFFA()==false) {
+		float diceThrow = rmRandFloat(0,1.8);
+			// <0.9 coastal version with noisy plateau, no trade route
+			// >=0.9 central plateau with trade route
+	}
+
+	float playerTiles=14000;
+		if (cNumberNonGaiaPlayers>4)
+			playerTiles = 10800;
+		if (cNumberNonGaiaPlayers>6)
+			playerTiles = 8800;			
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+	rmSetMapSize(size, size);
+
+	rmSetSeaType("Borneo Water");
+		
+	if (rmGetIsFFA()) {	
+		rmSetSeaLevel(-2.0);
+			if (IsYP()) 
+				rmSetMapType("deccan");
+			else
+				rmSetMapType("deccan");
+	}
+	else {
+		if (IsYP()) {
+			if (diceThrow<0.0) {			// Coastal variation
+				rmSetSeaLevel(-5.0);
+				rmSetMapType("deccan");   
+			}
+			else {							// Trade route variation
+				if (rmRandFloat(0,1)>0.67) {
+					rmSetMapType("deccan");
+				}
+				else {
+					rmSetMapType("deccan");
+				}
+				rmSetSeaLevel(0.0);
+				rmSetGlobalRain(0.0);
+			}
+		}
+		else {
+			if (diceThrow<0.0) {			// Coastal variation
+				rmSetSeaLevel(-5.0);
+				rmSetMapType("deccan");  
+			}
+			else {							// Trade route variation
+				if (rmRandFloat(0,1)>0.67) {
+					rmSetMapType("deccan");
+				}
+				else {
+					rmSetMapType("deccan");
+				}
+				rmSetSeaLevel(0.0);
+				rmSetGlobalRain(0.0);
+			}
+		}
+	}
+	
+	rmSetMapType("deccan");
+	rmSetMapType("water");
+	rmSetLightingSet("301a_malta");
+	rmTerrainInitialize("water");
+
+chooseMercs();
+
+	// Make it rain
+   rmSetGlobalRain( 0.7 );
+
+rmSetWindMagnitude(2);
+//rmSetGlobalStormLength(20, 20);
+
+int classPlayer=rmDefineClass("player"); 
+int classBase=rmDefineClass("land base"); 
+rmDefineClass("startingUnit"); 
+rmDefineClass("natives"); 
+rmDefineClass("importantItem"); 
+rmDefineClass("nuggets"); 
+rmDefineClass("classCliff"); 
+rmDefineClass("classForest");
+rmDefineClass("socketClass");
+rmDefineClass("deltaIsland");
+int classIsland=rmDefineClass("island");
+int classPlateau=rmDefineClass("plateau");
+classSmallIsland=rmDefineClass("smallIsland");
+int classLake=rmDefineClass("lake");
+int classLakeIsland=rmDefineClass("lakeIsland");
+int classBay=rmDefineClass("bay");
+int classBonusIsland=rmDefineClass("bonus island");
+int classSideIsland=rmDefineClass("side island");
+
+int bonusIslandConstraint=rmCreateClassDistanceConstraint("avoid bonus island", classBonusIsland, 10.0);
+int bonusIslandConstraintMed=rmCreateClassDistanceConstraint("avoid bonus island medium", classBonusIsland, 16.0);
+int longBonusIslandConstraint=rmCreateClassDistanceConstraint("long avoid bonus island", classBonusIsland, 30.0);
+int medSideIslandConstraint=rmCreateClassDistanceConstraint("avoid side island medium", classSideIsland, 12.0);
+int longSideIslandConstraint=rmCreateClassDistanceConstraint("long avoid side island", classSideIsland, 30.0);
+int lakeConstraint=rmCreateClassDistanceConstraint("avoid bay", classLake, 15.0);
+//int bayConstraint=rmCreateClassDistanceConstraint("avoid bay", classBay, 3);
+int avoidIslet=rmCreateClassDistanceConstraint("small island avoid islands", rmClassID("deltaIsland"), 12.0);
+int islandConstraint=rmCreateClassDistanceConstraint("islands avoid each other", classIsland, 15.0);
+int islandConstraintSmall=rmCreateClassDistanceConstraint("islets avoid big Islands", classIsland, 12.0);
+int plateauConstraint=rmCreateClassDistanceConstraint("plateaus avoid each other", classPlateau, 18.0);
+islandConstraint2=rmCreateClassDistanceConstraint("stay away from main island", classIsland, 12.0);
+avoidSmallIslands = rmCreateClassDistanceConstraint("stay away from other bonus islands", classSmallIsland, 10.0);
+int avoidLakes=rmCreateClassDistanceConstraint("avoid lakes", classLake, 8.0);
+int avoidLakeIsland=rmCreateClassDistanceConstraint("avoid big lake islands", classLakeIsland, 20.0);
+int avoidLakeIslandSmall=rmCreateClassDistanceConstraint("avoid lake islands", classLakeIsland, 10.0);
+islandEdgeConstraint = rmCreatePieConstraint("Islands away from edge of map", 0.5, 0.5, 0, rmGetMapXSize()-12, 0, 0, 0);
+int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(6), rmZTilesToFraction(6), 1.0-rmXTilesToFraction(6), 1.0-rmZTilesToFraction(6), 0.01); 
+int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+int avoidEdgeMore=rmCreatePieConstraint("avoid the edge of map", 0.5, 0.5, 0, rmZFractionToMeters(0.45), rmDegreesToRadians(0), rmDegreesToRadians(360));
+int playerConstraint=rmCreateClassDistanceConstraint("player vs. player", classPlayer, 20.0); 
+int playerConstraintSmall=rmCreateClassDistanceConstraint("stuff vs. player small", classPlayer, 5.0); 
+int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+int avoidNatives=rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 0.0);
+int avoidNativesMed=rmCreateClassDistanceConstraint("stuff avoids natives medium", rmClassID("natives"), 0.0);
+int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 20.0);
+int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 10.0);
+int avoidImpassableShort=rmCreateTerrainDistanceConstraint("avoid impassable short", "Land", false, 5.0);
+int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.9);
+int cliffConstraint=rmCreateClassDistanceConstraint("cliff vs. cliff", rmClassID("classCliff"), 45.0);	
+int avoidCliff=rmCreateClassDistanceConstraint("stuff vs. cliff", rmClassID("classCliff"), 5.0);	
+int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 20.0);
+int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0); 
+int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0); 
+int avoidWater = rmCreateTerrainDistanceConstraint("avoid water", "Land", false, 8.0);
+int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+int avoidWaterPlants = rmCreateTypeDistanceConstraint("water plants avoid each other", "UnderbrushLake", 8);
+int avoidBrush=rmCreateTypeDistanceConstraint("props avoid each other", "UnderbrushJungle", 10.0);
+int avoidCoinShort=rmCreateTypeDistanceConstraint("avoid coin short", "Mine", 5.0);
+int waterConstraint = rmCreateTerrainDistanceConstraint("avoid land short", "Land", true, -1.0);	
+int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+int classPatch = rmDefineClass("patch");
+
+rmSetStatusText("", 0.1);
+
+if (rmGetIsFFA()==false) {	
+    
+  if (diceThrow>=0.0){			// Trade route variation
+    
+	int pool=rmCreateArea("the waterpool");
+	rmSetAreaSize(pool, 0.8, 0.8); 
+	rmSetAreaLocation(pool, 0.5, 0.5);
+	rmSetAreaBaseHeight(pool, -0.5);
+	rmSetAreaCoherence(pool, 1.00);
+	rmBuildArea(pool);
+    
+	int plateauCenter=rmCreateArea("center plateau");
+	rmSetAreaSize(plateauCenter, 0.17, 0.17); 
+	rmSetAreaTerrainType(plateauCenter, "borneo\ground_grass2_borneo");	
+//	rmSetAreaMix(plateauCenter, "yucatan_grass");
+	rmSetAreaLocation(plateauCenter, 0.5, 0.5);
+	rmSetAreaCoherence(plateauCenter, 0.5);
+	rmAddAreaToClass(plateauCenter, classPlateau);
+	rmSetAreaBaseHeight(plateauCenter, 1.0);
+	rmSetAreaSmoothDistance(plateauCenter, 20);
+	rmSetAreaElevationType(plateauCenter, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauCenter, 4.0);
+	rmSetAreaElevationMinFrequency(plateauCenter, 0.04);
+	rmSetAreaElevationOctaves(plateauCenter, 4);
+	rmSetAreaElevationPersistence(plateauCenter, 0.5);
+	rmSetAreaElevationNoiseBias(plateauCenter, 1);
+	rmSetAreaEdgeFilling(plateauCenter, 1);
+	rmAddAreaInfluenceSegment(plateauCenter, -0.15, 0.5, 0.5, 0.5);
+	//rmAddAreaRemoveType(plateauCenter, "UnderbrushLake");
+	rmBuildArea(plateauCenter);
+
+	int plateauCenter2=rmCreateArea("center plateau 2");
+	rmSetAreaSize(plateauCenter2, 0.17, 0.17); 
+	rmSetAreaTerrainType(plateauCenter2, "borneo\ground_grass1_borneo");	
+//	rmSetAreaMix(plateauCenter2, "yucatan_grass");
+	rmSetAreaLocation(plateauCenter2, 0.5, 0.5);
+	rmSetAreaCoherence(plateauCenter2, 0.5);
+	rmAddAreaToClass(plateauCenter2, classPlateau);
+	rmSetAreaBaseHeight(plateauCenter2, 1.0);
+	rmSetAreaSmoothDistance(plateauCenter2, 20);
+	rmSetAreaElevationType(plateauCenter2, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauCenter2, 4.0);
+	rmSetAreaElevationMinFrequency(plateauCenter2, 0.04);
+	rmSetAreaElevationOctaves(plateauCenter2, 4);
+	rmSetAreaElevationPersistence(plateauCenter2, 0.5);
+	rmSetAreaElevationNoiseBias(plateauCenter2, 1);
+	rmSetAreaEdgeFilling(plateauCenter2, 1);
+	rmAddAreaInfluenceSegment(plateauCenter2, 0.5, 0.5, 1.1, 0.5);
+	//rmAddAreaRemoveType(plateauCenter2, "UnderbrushLake");
+	rmBuildArea(plateauCenter2);
+
+	// Trade route
+
+	int tradeRouteID = rmCreateTradeRoute();
+	int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+	rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+	rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+	rmSetObjectDefAllowOverlap(socketID, true);
+	rmAddObjectDefToClass(socketID, rmClassID("socketClass"));
+	rmSetObjectDefMinDistance(socketID, 0.0);
+	rmSetObjectDefMaxDistance(socketID, 8.0);
+   
+	rmAddTradeRouteWaypoint(tradeRouteID, -0.1, .53);
+
+	if (cNumberNonGaiaPlayers==2){
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .2, .43, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .3, .50, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .5, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .7, .53, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .9, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, 1.1, .55, 5, 6);
+	}
+	else {
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .1, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .3, .55, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .5, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .7, .55, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .9, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, 1.1, .52, 5, 6);
+	}
+	rmBuildTradeRoute(tradeRouteID, "dirt");
+	  
+	vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.14);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);  
+	vector socketLoc2 = rmGetTradeRouteWayPoint(tradeRouteID, 0.37);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc2);  
+	vector socketLoc3 = rmGetTradeRouteWayPoint(tradeRouteID, 0.6);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc3);  
+	vector socketLoc4 = rmGetTradeRouteWayPoint(tradeRouteID, 0.8);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc4);  
+
+	int plateauNorthID=rmCreateArea("north platform 2");
+	if (cNumberNonGaiaPlayers==2){
+		rmSetAreaSize(plateauNorthID, 0.175, 0.175); 		// Was 0.15
+	}
+	else {
+		rmSetAreaSize(plateauNorthID, 0.2, 0.2); 
+	}
+	rmSetAreaTerrainType(plateauNorthID, "borneo\ground_grass1_borneo");
+	rmSetAreaLocation(plateauNorthID, 0.5, 0.9);
+	rmSetAreaCoherence(plateauNorthID, 0.80);
+	rmAddAreaToClass(plateauNorthID, classIsland);
+	rmAddAreaConstraint(plateauNorthID, plateauConstraint);
+	rmSetAreaBaseHeight(plateauNorthID, 1.0);
+	rmSetAreaSmoothDistance(plateauNorthID, 20);
+	rmSetAreaElevationType(plateauNorthID, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauNorthID, 4.0);
+	rmSetAreaElevationMinFrequency(plateauNorthID, 0.04);
+	rmSetAreaElevationOctaves(plateauNorthID, 4);
+	rmSetAreaElevationPersistence(plateauNorthID, 0.5);
+	rmSetAreaElevationNoiseBias(plateauNorthID, 1);
+	rmSetAreaEdgeFilling(plateauNorthID, 10);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.10, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.30, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.50, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.70, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.90, 0.89); 
+	//rmAddAreaRemoveType(plateauNorthID, "UnderbrushLake");
+	rmBuildArea(plateauNorthID);
+
+	int plateauSouthID=rmCreateArea("south platform 2");
+		if (cNumberNonGaiaPlayers==2){
+			rmSetAreaSize(plateauSouthID, 0.175, 0.175); 	// Was 0.15
+		}
+		else {
+			rmSetAreaSize(plateauSouthID, 0.2, 0.2); 
+		}
+	rmSetAreaTerrainType(plateauSouthID, "borneo\ground_grass1_borneo");
+//	rmSetAreaMix(plateauSouthID, "yucatan_grass");
+	rmSetAreaLocation(plateauSouthID, 0.5, 0.1);
+	rmSetAreaCoherence(plateauSouthID, 0.80);
+	rmAddAreaToClass(plateauSouthID, classIsland);
+	rmSetAreaBaseHeight(plateauSouthID, 1.0);
+	rmSetAreaSmoothDistance(plateauSouthID, 20);
+	rmSetAreaElevationType(plateauSouthID, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauSouthID, 4.0);
+	rmSetAreaElevationMinFrequency(plateauSouthID, 0.04);
+	rmSetAreaElevationOctaves(plateauSouthID, 4);
+	rmSetAreaElevationPersistence(plateauSouthID, 0.5);
+	rmSetAreaElevationNoiseBias(plateauSouthID, 1);
+	rmSetAreaEdgeFilling(plateauSouthID, 10);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.10, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.30, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.50, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.70, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.90, 0.11);
+	//rmAddAreaRemoveType(plateauSouthID, "UnderbrushLake");
+	rmBuildArea(plateauSouthID);
+    
+    
+    // Water weed and wild life
+
+	int avoidLand = rmCreateTerrainDistanceConstraint("avoid land", "Water", false, 5.0);
+
+    
+//	for (i=0;<(80*cNumberNonGaiaPlayers)) {	
+		int waterWeed = rmCreateObjectDef("water weed");
+		rmAddObjectDefItem(waterWeed, "UnderbrushLake", 1, 10.0);
+		rmSetObjectDefMinDistance(waterWeed, 0);
+		rmSetObjectDefMaxDistance(waterWeed, rmXFractionToMeters(0.5));
+  		rmAddObjectDefConstraint(waterWeed, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(waterWeed, avoidWaterPlants);
+  		rmAddObjectDefConstraint(waterWeed, waterConstraint);
+	  	//rmAddObjectDefConstraint(waterWeed, avoidLand);
+  		//rmAddObjectDefConstraint(waterWeed, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(waterWeed, 0, 0.5, 0.5, 50);
+//	}
+
+	int wildChance = -1;
+
+    for (i=0;<(4*cNumberNonGaiaPlayers)) {
+		int phloat = rmCreateObjectDef("phloat"+i);
+		wildChance = rmRandInt(0,3);
+		switch(wildChance) {				// Many moni, say me say many, many, many
+			case 0: rmAddObjectDefItem(phloat, "PropTurtles", 1, 0.0);
+			case 1: rmAddObjectDefItem(phloat, "PropSwan", 1, 0.0);
+			case 2: rmAddObjectDefItem(phloat, "PropFish", 1, 0.0);
+			case 3: rmAddObjectDefItem(phloat, "DuckFamily", 1, 0.0);
+		}
+		rmSetObjectDefMinDistance(phloat, 0);
+		rmSetObjectDefMaxDistance(phloat, rmXFractionToMeters(0.5));
+	  	rmAddObjectDefConstraint(phloat, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(phloat, avoidWaterPlants);
+	  	rmAddObjectDefConstraint(phloat, waterConstraint);
+	  	rmAddObjectDefConstraint(phloat, avoidLand);
+	// rmAddObjectDefConstraint(phloat, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(phloat, 0, 0.5, 0.5, 1);
+	}
+    
+}							// End of trade route variation
+
+}							// End of non-FFA area creation
+
+else {						// FFA area creation
+    
+    
+    int pool2=rmCreateArea("the waterpool 2");
+    rmSetAreaSize(pool2, 0.8, 0.8); 
+    rmSetAreaLocation(pool2, 0.5, 0.5);
+    rmSetAreaBaseHeight(pool2, -2.5);
+    rmSetAreaCoherence(pool2, 1.00);
+    rmBuildArea(pool2);
+
+ 
+}
+
+rmSetStatusText("", 0.2);
+
+// Starting positions for players placement
+
+	float pSwitch = rmRandFloat(0, 1.2);
+
+if (diceThrow<0.0){
+
+    	if (rmGetIsFFA())
+		rmPlacePlayersCircular(0.35, 0.35, 0);
+	else {
+		if (pSwitch < 0.55) {
+			rmSetPlacementSection(0.10, 0.30);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.33, 0.33, 0);
+			rmSetPlacementSection(0.60, 0.80);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.33, 0.33, 0); 
+		}
+		else {
+			rmSetPlacementSection(0.60, 0.80);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.33, 0.33, 0);
+			rmSetPlacementSection(0.10, 0.30);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.33, 0.33, 0); 
+		}
+	}
+    
+}
+else{
+    
+	if (rmGetIsFFA()) {
+		if (cNumberNonGaiaPlayers==3) {
+			rmPlacePlayer(1, 0.75, 0.7); 
+			rmPlacePlayer(2, 0.2, 0.7); 
+			rmPlacePlayer(3, 0.5, 0.1);
+		}
+		else {
+			rmPlacePlayer(1, 0.75, 0.7); 
+			rmPlacePlayer(2, 0.1, 0.4); 
+			rmPlacePlayer(3, 0.5, 0.1); 
+			rmPlacePlayer(6, 0.5, 0.5); 
+			rmPlacePlayersLine(0.3, 0.8, 0.8, 0.3, 0.0, 0.0); 
+		}
+	}
+	else if (cNumberNonGaiaPlayers==2){
+		if (pSwitch < 0.55) {
+			rmPlacePlayer(1, 0.45, 0.88);
+			rmPlacePlayer(2, 0.46, 0.12);	// correction for the weird unequal placement, given symmetrical coords		// Solved
+		}
+		else {
+			rmPlacePlayer(1, 0.46, 0.12);	// 
+			rmPlacePlayer(2, 0.45, 0.88);	 
+		}		
+	}
+	else {
+		if (pSwitch < 0.55) {
+			rmSetPlacementSection(0.9, 0.07);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.4, 0.4, 0);
+
+			rmSetPlacementSection(0.43, 0.6);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.4, 0.4, 0); 
+		}
+		else {
+			rmSetPlacementSection(0.43, 0.6);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.4, 0.4, 0);
+			rmSetPlacementSection(0.9, 0.07);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.4, 0.4, 0); 
+		}
+	}
+}
+
+// Players starting units and resources
+
+int TCvsWater = rmCreateTerrainDistanceConstraint("TC vs water", "Land", false, 15.0);
+
+	int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(playerStart, 7.0);
+	rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+
+	int startID = rmCreateObjectDef("starting object"); 
+	rmAddObjectDefItem(startID, "TownCenter", 1, 0.0); 
+	rmAddObjectDefToClass(startID, rmClassID("startingUnit")); 
+	rmSetObjectDefMinDistance(startID, 0.0); 
+	if (cNumberNonGaiaPlayers==2) {
+		rmSetObjectDefMaxDistance(startID, 1.0); 
+	}
+	else if (cNumberNonGaiaPlayers>2 && cNumberNonGaiaPlayers<7) {
+		rmSetObjectDefMaxDistance(startID, 5.0); 		
+		rmAddObjectDefConstraint(startID, avoidImpassableLand);
+	}
+    else {
+        rmSetObjectDefMaxDistance(startID, 20.0);
+    }
+	rmAddObjectDefConstraint(startID, TCvsWater);
+//	rmAddObjectDefConstraint(startID, avoidImpassableLand);
+
+	int berryID = rmCreateObjectDef("starting berries"); 
+	rmAddObjectDefItem(berryID, "BerryBush", 3, 4.0); 
+	rmSetObjectDefMinDistance(berryID, 6.0); 
+	rmSetObjectDefMaxDistance(berryID, 10.0); 
+	rmAddObjectDefConstraint(berryID, avoidCoin);
+	rmAddObjectDefConstraint(berryID, avoidWater);
+	rmAddObjectDefConstraint(berryID, avoidImpassableShort);
+
+	int treeID = rmCreateObjectDef("starting trees"); 
+	rmAddObjectDefItem(treeID, "ypTreeBorneo", rmRandInt(8,12), 10.0); 
+	rmSetObjectDefMinDistance(treeID, 12.0); 
+	rmSetObjectDefMaxDistance(treeID, 18.0);
+	rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(treeID, avoidCoin);
+//	rmAddObjectDefConstraint(treeID, avoidWater);
+
+	int foodID = rmCreateObjectDef("starting hunt"); 
+	rmAddObjectDefItem(foodID, "rhea", 6, 8.0); 
+	rmSetObjectDefMinDistance(foodID, 2.0); 
+	rmSetObjectDefMaxDistance(foodID, 7.0); 
+	rmSetObjectDefCreateHerd(foodID, true);
+
+	int startnuggetID= rmCreateObjectDef("starting nugget"); 
+	rmAddObjectDefItem(startnuggetID, "Nugget", 1, 0.0); 
+	rmSetObjectDefMinDistance(startnuggetID, 15.0); 
+	rmSetObjectDefMaxDistance(startnuggetID, 20.0);
+	rmAddObjectDefConstraint(startnuggetID, avoidWater);
+	rmAddObjectDefConstraint(startnuggetID, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(startnuggetID, avoidImpassableShort);
+	rmSetNuggetDifficulty(1, 1); 
+
+    int top2=rmCreateArea("top layer 2");
+	rmSetAreaSize(top2, 0.80, 0.80); 
+	rmSetAreaTerrainType(top2, "borneo\ground_grass1_borneo");
+	rmSetAreaElevationNoiseBias(top2, 1);
+	rmSetAreaElevationEdgeFalloffDist(top2, 3);
+	rmSetAreaElevationVariation(top2, 2);
+	rmSetAreaElevationPersistence(top2, 0.3);
+	rmSetAreaElevationOctaves(top2, 4);
+	rmSetAreaElevationMinFrequency(top2, 0.05);
+	rmSetAreaElevationType(top2, cElevTurbulence);
+	rmBuildArea(top2);
+    
+
+// Natives
+	
+if (rmGetIsFFA()==false){
+
+if (diceThrow<0.0){	
+      
+	// Natives areas
+
+	int tupiIsland=rmCreateArea("land base for tupi village");
+	rmSetAreaSize(tupiIsland, 0.017, 0.017); 
+	rmSetAreaBaseHeight(tupiIsland, 2.0);
+
+	if (cNumberNonGaiaPlayers == 2)
+		rmSetAreaLocation(tupiIsland, 0.7, 0.3);
+	else if (cNumberNonGaiaPlayers > 2 && cNumberNonGaiaPlayers < 6)
+		rmSetAreaLocation(tupiIsland, 0.6, 0.2);
+	else 
+		rmSetAreaLocation(tupiIsland, 0.6, 0.15);
+	rmSetAreaTerrainType(tupiIsland, "borneo\ground_grass2_borneo"); 
+	rmSetAreaCoherence(tupiIsland, 1.0); 
+	rmBuildArea(tupiIsland);
+
+	int seminoleIsland=rmCreateArea("land base for seminole village");
+	rmSetAreaSize(seminoleIsland, 0.017, 0.017); 
+	rmSetAreaBaseHeight(seminoleIsland, 2.0);
+
+	if (cNumberNonGaiaPlayers == 2)
+		rmSetAreaLocation(seminoleIsland, 0.3, 0.7);
+	else if (cNumberNonGaiaPlayers > 2 && cNumberNonGaiaPlayers < 6)
+		rmSetAreaLocation(seminoleIsland, 0.4, 0.8);
+	else
+		rmSetAreaLocation(seminoleIsland, 0.4, 0.85);
+
+	rmSetAreaTerrainType(seminoleIsland, "borneo\ground_grass2_borneo"); 
+	rmSetAreaCoherence(seminoleIsland, 1.0); 
+	rmBuildArea(seminoleIsland);
+            
+	int avoidTupiArea = rmCreateAreaDistanceConstraint("avoid tupi village area", tupiIsland, 5.0);
+	int avoidSeminoleArea = rmCreateAreaDistanceConstraint("avoid seminole village area", seminoleIsland, 5.0);
+                
+}
+}
+
+	string nativeType = "";
+
+	if (IsYP()) {
+		rmAllocateSubCivs(2); 
+		rmSetSubCiv(0, "Caribs");
+		rmSetSubCiv(1, "Jesuit");
+		nativeType = "uger";
+	}
+	else {  
+		rmAllocateSubCivs(2); 
+		rmSetSubCiv(0, "Caribs");
+		rmSetSubCiv(1, "Maya");
+		nativeType = "uger";
+	}
+	
+	int tupiVillageID = rmCreateGrouping("edge carib village", "uger"+rmRandInt(1,4));
+	rmSetGroupingMinDistance(tupiVillageID, 0.0);
+	rmSetGroupingMaxDistance(tupiVillageID, 10.0);
+	//rmAddGroupingToClass(tupiVillageID, rmClassID("natives"));
+	//rmAddGroupingToClass(tupiVillageID, rmClassID("importantItem"));
+	//rmAddGroupingConstraint(tupiVillageID, avoidImpassableShort);
+
+	if (rmGetIsFFA()==false){
+		if (cNumberNonGaiaPlayers==2){
+			if (diceThrow < 0.0) {
+				rmPlaceGroupingInArea(tupiVillageID, 0, tupiIsland, 1);
+				//rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.7, 0.3, 1);
+			}
+			else {
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.65, 0.9);
+				rmAddGroupingConstraint(tupiVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.5, 0.56);
+			}
+		}
+		else {
+			if (diceThrow < 0.0) {
+				rmPlaceGroupingInArea(tupiVillageID, 0, tupiIsland, 1);
+				//rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.65, 0.4);
+			}
+			else {
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.8, 0.85);
+				rmAddGroupingConstraint(tupiVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.5, 0.57);
+			}
+		}
+	}
+
+	int seminoleVillageID = rmCreateGrouping("edge native village", nativeType+rmRandInt(1,4));
+	rmSetGroupingMinDistance(seminoleVillageID, 0.0);
+	rmSetGroupingMaxDistance(seminoleVillageID, 10.0);
+	//rmAddGroupingToClass(seminoleVillageID, rmClassID("natives"));
+	//rmAddGroupingToClass(seminoleVillageID, rmClassID("importantItem"));
+	//rmAddGroupingConstraint(seminoleVillageID, avoidImpassableShort);
+
+	if (rmGetIsFFA()==false){
+		if (cNumberNonGaiaPlayers==2){
+			if (diceThrow < 0.0) {
+				//rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.14, 0.6);
+				rmPlaceGroupingInArea(seminoleVillageID, 0, seminoleIsland, 1);
+			}
+			else {
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.65, 0.1);
+				rmAddGroupingConstraint(seminoleVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.20, 0.55);
+			}
+		}
+		else {
+			if (diceThrow < 0.0) {
+				rmPlaceGroupingInArea(seminoleVillageID, 0, seminoleIsland, 1);
+				//rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.14, 0.6);
+			}
+			else {
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.75, 0.15);	// Not returning bool
+				rmAddGroupingConstraint(seminoleVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.15, 0.55);
+			}
+		}
+	}
+
+rmSetStatusText("", 0.3);
+
+	for(i=1; <cNumberPlayers) { 
+		int id=rmCreateArea("Player"+i); 
+		rmSetPlayerArea(i, id); 
+		rmSetAreaSize(id, rmAreaTilesToFraction(900), rmAreaTilesToFraction(900)); 
+        rmSetAreaTerrainType(id, "borneo\ground_grass1_borneo");
+        rmAddAreaToClass(id, classPlayer); 
+
+			if (rmGetIsFFA()==false){ 
+				rmSetAreaBaseHeight(id, 1.0);
+				rmSetAreaElevationNoiseBias(id, 0);
+				rmSetAreaElevationEdgeFalloffDist(id, 3);
+				rmSetAreaElevationVariation(id, 3);
+				rmSetAreaElevationPersistence(id, 0.3);
+				rmSetAreaElevationOctaves(id, 5);
+				rmSetAreaElevationMinFrequency(id, 0.04);
+				rmSetAreaElevationType(id, cElevTurbulence);
+				rmSetAreaCoherence(id, 0.75); 
+				rmAddAreaConstraint(id, playerConstraint); 
+				rmAddAreaConstraint(id, playerEdgeConstraint); 
+				rmSetAreaLocPlayer(id, i); 
+				if (diceThrow<0.0){ 
+					rmBuildArea(id); 
+				}
+			}
+			else {
+				rmSetAreaBaseHeight(id, 1.0);
+				rmSetAreaElevationVariation(id, 2);
+				rmSetAreaElevationNoiseBias(id, 0);
+				rmSetAreaElevationEdgeFalloffDist(id, 3);
+				rmSetAreaElevationOctaves(id, 4);
+				rmSetAreaElevationMinFrequency(id, 0.05);
+				rmAddAreaToClass(id, rmClassID("deltaIsland"));
+				rmAddAreaConstraint(id, avoidIslet);
+				rmAddAreaConstraint(id, islandConstraintSmall);
+				rmSetAreaCoherence(id, 0.5);
+				rmSetAreaLocPlayer(id, i); 
+				rmBuildArea(id); 
+			}
+
+		rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	}
+
+rmSetStatusText("", 0.4);
+
+	
+
+if (rmGetIsFFA()==false) {
+	if (diceThrow < 0.0) {
+
+    // Dem eagles, mon'
+
+	int avoidRocks = rmCreateTypeDistanceConstraint("eagles avoid eagles", "PropEaglesRocks", 50);
+//	int eagleWaterConstraint = rmCreateTerrainDistanceConstraint("avoid land short", "Land", true, -1.0);	
+
+	//for(i=0;<(20*cNumberNonGaiaPlayers)){
+		int eagleRocks = rmCreateObjectDef("eagle rocks");
+		rmAddObjectDefItem(eagleRocks, "PropEaglesRocks", 1, 0.0);
+		rmSetObjectDefMinDistance(eagleRocks, 0);
+		rmSetObjectDefMaxDistance(eagleRocks, rmXFractionToMeters(0.5));
+	//	rmAddObjectDefConstraint(eagleRocks, avoidImportantItem);
+	// 	rmAddObjectDefConstraint(eagleRocks, playerConstraint);
+		rmAddObjectDefConstraint(eagleRocks, circleConstraint);
+	// 	rmAddObjectDefConstraint(eagleRocks, eagleWaterConstraint);
+		rmAddObjectDefConstraint(eagleRocks, avoidRocks);
+	// 	rmAddObjectDefConstraint(eagleRocks, avoidCoin);
+	//	rmAddObjectDefConstraint(eagleRocks, avoidImpassableShort);
+	// 	rmAddObjectDefConstraint(eagleRocks, avoidCliff);
+		rmPlaceObjectDefAtLoc(eagleRocks, 0, 0.5, 0.5, 40*cNumberNonGaiaPlayers);
+	//	rmPlaceObjectDefInArea(eagleRocks, 0, pool, 1);
+	//}
+
+    
+    // Build the "noisy" land base
+
+	float Float1=0.00; 
+	float Float2=0.00; 
+	float Float3=0.00; 
+	float Float4=0.00; 
+	float Float5=0.00; 
+	int Int1=0; 
+	int Int2=0; 
+	int Int3=0; 
+	int Int4=0;
+
+		for(Float1=1; <=10){
+			for(Float2=1; <=10){
+				Int1=rmRandInt(1,3);
+				Int2=rmRandInt(1,2);
+				Int3=rmRandInt(1,2);
+				if(Int1==1) Float3=0.006;
+				if(Int1==2) Float3=0.011;
+				if(Int1==3) Float3=0.021;
+				if(Int2==1) Float4=0.015;
+				if(Int2==2) Float4=-0.015;
+				if(Int3==1) Float5=0.015;
+				if(Int3==2) Float5=-0.015;
+				Area(Float3, Float1/10, Float2/10, "borneo\ground_grass1_borneo");						
+				rmAddAreaToClass(landnoise, classBase);
+				rmAddAreaRemoveType(landnoise, "PropEaglesRocks");
+				rmBuildArea(landnoise);
+				Area(Float3, (Float1/10)+Float4, (Float2/10)+Float5, "borneo\ground_grass2_borneo");	// The compiler doesn't like this (float -> int index variable -> float)
+				rmAddAreaRemoveType(landnoise, "PropEaglesRocks");
+				rmBuildArea(landnoise);
+			}
+		}
+
+	// Some cliffs
+	
+	for (i=0; <26) {
+		int cliffs=rmCreateArea("cliff"+i); 
+		rmSetAreaSize(cliffs, 0.001, 0.0016); 
+		rmAddAreaToClass(cliffs, rmClassID("classCliff"));
+		rmSetAreaCliffType(cliffs, "uger"); // Cave
+		rmSetAreaCliffHeight(cliffs, 10.0, 0.0, 0.5); 
+		rmSetAreaCliffEdge(cliffs, 1, 2.0, 0.0, 0.0, 0); 
+		rmSetAreaTerrainType(cliffs, "borneo\ground_grass2_borneo"); 
+		rmSetAreaCliffPainting(cliffs, true, true, true, 0, true); 
+	//	rmAddAreaTerrainReplacement(cliffs, "cave\cave_top", "amazon\ground2_ama");
+		rmSetAreaMinBlobs(cliffs, 1); 
+		rmSetAreaMaxBlobs(cliffs, 1); 
+		rmSetAreaCoherence(cliffs, 0.5); 
+		rmAddAreaConstraint(cliffs, avoidTownCenter);
+		rmAddAreaConstraint(cliffs, avoidTupiArea);
+		rmAddAreaConstraint(cliffs, avoidSeminoleArea);
+		rmAddAreaConstraint(cliffs, cliffConstraint);
+		rmBuildArea(cliffs);
+	}
+       
+    // Layer on top of the noise land base
+
+		int top=rmCreateArea("top layer");
+		rmSetAreaSize(top, 0.80, 0.80); 
+		rmSetAreaTerrainType(top, "borneo\ground_grass1_borneo");
+		rmSetAreaElevationNoiseBias(top, 1);
+		rmSetAreaElevationEdgeFalloffDist(top, 3);
+		rmSetAreaElevationVariation(top, 2);
+		rmSetAreaElevationPersistence(top, 0.3);
+		rmSetAreaElevationOctaves(top, 4);
+		rmSetAreaElevationMinFrequency(top, 0.05);
+		rmSetAreaElevationType(top, cElevTurbulence);
+		rmBuildArea(top);		
+	}
+}
+ 
+rmSetStatusText("", 0.5);
+ 
+// Player gold
+
+	int goldID = rmCreateObjectDef("starting gold"); 
+	rmAddObjectDefItem(goldID, "mine", 1, 0.0); 
+	rmSetObjectDefMinDistance(goldID, 0.0); 
+	rmSetObjectDefMaxDistance(goldID, 8.0); 
+//	rmAddObjectDefConstraint(goldID, avoidWaterShort);
+//	rmAddObjectDefConstraint(goldID, avoidImpassableShort);
+
+		if (cNumberNonGaiaPlayers==2){
+			//rmSetIgnoreForceToGaia(true);
+			int positionSwitch = rmRandInt(1,2);
+			vector locTC1 = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startID, 1));
+   			vector locTC2 = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startID, 2));
+   		       	
+			if (positionSwitch == 1) {
+		       		rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC1)), rmZMetersToFraction((xsVectorGetZ(locTC1))-5));
+       	   	         		rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC2)), rmZMetersToFraction((xsVectorGetZ(locTC2))+5));
+       	   	         	}
+       	   	         	else {
+           	   	         		rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC1)), rmZMetersToFraction((xsVectorGetZ(locTC1))+5));
+ 			        	rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC2)), rmZMetersToFraction((xsVectorGetZ(locTC2))-5));
+       	   	           	} 
+       	   	}
+		else {
+
+			for(i=1; <cNumberPlayers) { 		
+				int placed = rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+				if (placed==0) {
+					int gold2ID = rmCreateObjectDef("starting gold 2"+i); 
+					rmAddObjectDefItem(gold2ID, "mine", 1, 0.0); 
+					rmSetObjectDefMinDistance(gold2ID, 0.0); 
+					rmSetObjectDefMaxDistance(gold2ID, 15.0); 
+					int placed2 = rmPlaceObjectDefAtLoc(gold2ID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+				}
+			
+			// 	int t = rmCreateTrigger("Obj Def Placement Check"+i);
+		    //	rmSwitchToTrigger(t);
+		    //	rmAddTriggerCondition("Always");
+		    //	rmAddTriggerEffect("Send Chat As String");
+		    //	rmSetTriggerEffectParamInt("PlayerID", 0);
+		    //	rmSetTriggerEffectParam("Message", "Player"+i+"'s starting mine="+placed); 
+			//  rmSetTriggerEffectParam("Message", "Player"+i+"'s starting mine="+placed2);
+			}
+		}
+
+	for(i=1; <cNumberPlayers) { 
+		rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+		rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+		rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+		rmPlaceObjectDefAtLoc(startnuggetID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	}
+
+
+rmSetStatusText("", 0.6);
+
+if (rmGetIsFFA()==true){
+
+	int islandCounter = 0;
+	int avoidLand2 = rmCreateTerrainDistanceConstraint("avoid land 2", "Water", false, 2.0);
+
+    
+//	for (i=0;<(80*cNumberNonGaiaPlayers)) {	
+		int waterWeed2 = rmCreateObjectDef("water weed 2");
+		rmAddObjectDefItem(waterWeed2, "UnderbrushLake", 1, 10.0);
+		rmSetObjectDefMinDistance(waterWeed2, 0);
+		rmSetObjectDefMaxDistance(waterWeed2, rmXFractionToMeters(0.5));
+  		rmAddObjectDefConstraint(waterWeed2, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(waterWeed2, avoidWaterPlants);
+  		rmAddObjectDefConstraint(waterWeed2, waterConstraint);
+	  	//rmAddObjectDefConstraint(waterWeed2, avoidLand2);
+  		//rmAddObjectDefConstraint(waterWeed2, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(waterWeed2, 0, 0.5, 0.5, 50);
+//	}
+
+	int wildChance2 = -1;
+
+    for (i=0;<(4*cNumberNonGaiaPlayers)) {
+		int phloat2 = rmCreateObjectDef("phloat 2"+i);
+		wildChance2 = rmRandInt(0,3);
+		switch(wildChance2) {				
+			case 0: rmAddObjectDefItem(phloat2, "PropTurtles", 1, 0.0);
+			case 1: rmAddObjectDefItem(phloat2, "PropSwan", 1, 0.0);
+			case 2: rmAddObjectDefItem(phloat2, "PropFish", 1, 0.0);
+			case 3: rmAddObjectDefItem(phloat2, "DuckFamily", 1, 0.0);
+		}
+		rmSetObjectDefMinDistance(phloat2, 0);
+		rmSetObjectDefMaxDistance(phloat2, rmXFractionToMeters(0.5));
+	  	rmAddObjectDefConstraint(phloat2, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(phloat2, avoidWaterPlants);
+	  	rmAddObjectDefConstraint(phloat2, waterConstraint);
+	// 	rmAddObjectDefConstraint(phloat2, avoidLand2);
+	// 	rmAddObjectDefConstraint(phloat2, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(phloat2, 0, 0.5, 0.5, 1);
+	}	
+
+	   // Two trade islands at opposite ends of map (the location is randomly chosen)
+	int bonusSwitch = rmRandInt(1,3);
+		switch(bonusSwitch) {											// area locX		// area locZ		// xFrac1			// zFrac1				// xFrac2			// zFrac2
+			case 1: { 	
+				int bonusIslandID11= buildTradeArea("bonus island 11", getLocX(0.47, 0.47, 0), getLocZ(0.47, 0.47, 0), getLocX(0.47, 0.47, 0), (getLocZ(0.47, 0.47, 0)-0.2), getLocX(0.47, 0.47, 0), (getLocZ(0.47, 0.47, 0)+0.2), "socket1"); // 0.940000,0.470000  
+				int bonusIslandID12= buildTradeArea("bonus island 12", getLocX(0.47, 0.47, 180), 	getLocZ(0.47, 0.47, 180), getLocX(0.47, 0.47, 180), (getLocZ(0.47, 0.47, 180)-0.2), getLocX(0.47, 0.47, 180), (getLocZ(0.47, 0.47, 180)+0.2),	"socket2"); // 0.004704,0.536326  
+			}	
+			case 2: {
+				int bonusIslandID21= buildTradeArea("bonus island 21", getLocX(0.47, 0.47, 300), 	getLocZ(0.47, 0.47, 300), (getLocX(0.47, 0.47, 300)-0.2), (getLocZ(0.47, 0.47, 300)), 	(getLocX(0.47, 0.47, 300)+0.2), getLocZ(0.47, 0.47, 300), "socket1"); // 0.603321,0.019305  
+				int bonusIslandID22= buildTradeArea("bonus island 22", getLocX(0.47, 0.47, 120), 	getLocZ(0.47, 0.47, 120), (getLocX(0.47, 0.47, 120)-0.2), (getLocZ(0.47, 0.47, 120)+0.05), (getLocX(0.48, 0.48, 120)+0.4), (getLocZ(0.48, 0.48, 120)+0.05), "socket2"); // 0.274411,0.897370    
+			}	
+			case 3: {
+				int bonusIslandID31= buildTradeArea("bonus island 31", getLocX(0.47, 0.47, 240), 	getLocZ(0.47, 0.47, 240), (getLocX(0.47, 0.47, 240)+0.2), (getLocZ(0.47, 0.47, 240)-0.1), (getLocX(0.47, 0.47, 240)-0.1), (getLocZ(0.47, 0.47, 240)+0.2), "socket1"); // 0.162788,0.114303   
+				int bonusIslandID32= buildTradeArea("bonus island 32", getLocX(0.47, 0.47, 60), 	getLocZ(0.47, 0.47, 60), (getLocX(0.47, 0.47, 60)+0.2), (getLocZ(0.47, 0.47, 60)-0.2), (getLocX(0.47, 0.47, 60)-0.2), (getLocZ(0.47, 0.47, 60)+0.2), "socket2"); // 0.723942,0.865491  
+			}	
+		}
+	
+	// Complete the delta with extra islands
+	for (i=0; <18) {
+		int deltaIsletID = rmCreateArea("bonus islands"+i);
+		rmAddAreaToClass(deltaIsletID, rmClassID("deltaIsland"));
+	//	rmSetAreaMix(deltaIsletID, "yucatan_grass");
+		rmSetAreaTerrainType(deltaIsletID, "borneo\ground_grass1_borneo");
+		rmSetAreaSize(deltaIsletID, 0.025, 0.035);
+		rmSetAreaCoherence(deltaIsletID, 0.75);
+		rmSetAreaBaseHeight(deltaIsletID, -1.5);
+		//rmSetAreaMinBlobs(deltaIsletID, 6);
+		//rmSetAreaMaxBlobs(deltaIsletID, 12);
+		//rmSetAreaMinBlobDistance(deltaIsletID, 8.0);
+		//rmSetAreaMaxBlobDistance(deltaIsletID, 10.0);
+		rmSetAreaSmoothDistance(deltaIsletID, 12);
+		rmSetAreaElevationType(deltaIsletID, cElevTurbulence);
+		rmSetAreaElevationVariation(deltaIsletID, 5.0);
+		rmSetAreaElevationMinFrequency(deltaIsletID, 0.04);
+		rmSetAreaElevationOctaves(deltaIsletID, 4);
+		rmSetAreaElevationPersistence(deltaIsletID, 0.5);
+		rmSetAreaElevationNoiseBias(deltaIsletID, 1);
+		rmAddAreaConstraint(deltaIsletID, avoidIslet);
+		rmAddAreaConstraint(deltaIsletID, islandConstraintSmall);
+		rmAddAreaConstraint(deltaIsletID, islandEdgeConstraint);
+		//rmSetAreaEdgeFilling(deltaIsletID, 1);
+		rmAddAreaConstraint(deltaIsletID, avoidSmallIslands);
+		rmAddAreaRemoveType(deltaIsletID, "UnderbrushLake");
+		bool ok = rmBuildArea(deltaIsletID);
+			if(ok){
+				islandCounter++;
+				if ((islandCounter%4)==0){
+					rmSetGroupingMaxDistance(tupiVillageID, 15.0);
+					rmAddGroupingConstraint(tupiVillageID, islandEdgeConstraint);
+					rmPlaceGroupingInArea(tupiVillageID, 0, deltaIsletID, 1);
+				}
+				if ((islandCounter%5)==0) {
+					rmSetGroupingMaxDistance(tupiVillageID, 15.0);
+					rmAddGroupingConstraint(seminoleVillageID, islandEdgeConstraint);
+					rmPlaceGroupingInArea(seminoleVillageID, 0, deltaIsletID, 1);		
+				}
+			}
+	}
+}
+
+
+// Resources
+
+int avoidCoinFar=0;
+	if (cNumberNonGaiaPlayers == 2) avoidCoinFar=rmCreateTypeDistanceConstraint("avoid coin far for less players", "Mine", 50.0);
+	else avoidCoinFar=rmCreateTypeDistanceConstraint("avoid coin far", "Mine", 60.0);
+int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 5.0);
+int MineVSWaterMed = rmCreateTerrainDistanceConstraint("mine avoid water medium", "Land", false, 12.0);	
+int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);
+int NorthPie=rmCreatePieConstraint("Stay North",0.5,0.5,0,rmXFractionToMeters(0.48), rmDegreesToRadians(320),rmDegreesToRadians(140)); 	
+int SouthPie=rmCreatePieConstraint("Stay South",0.5,0.5,0,rmXFractionToMeters(0.48), rmDegreesToRadians(140),rmDegreesToRadians(320));
+
+// Silver mines
+
+if (rmGetIsFFA()==false) {
+
+// Coastal variation
+	if (diceThrow<0.0){
+		int playerSilverID = rmCreateObjectDef("player silver");
+		rmAddObjectDefItem(playerSilverID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilverID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilverID, rmXFractionToMeters(0.35));
+		rmAddObjectDefConstraint(playerSilverID, avoidCoinMed);
+		//rmAddObjectDefConstraint(playerSilverID, avoidNatives);
+		rmAddObjectDefConstraint(playerSilverID, avoidTownCenterMore);
+		rmAddObjectDefConstraint(playerSilverID, NorthPie);
+		rmAddObjectDefConstraint(playerSilverID, avoidCliff);
+		//rmAddObjectDefConstraint(playerSilverID, avoidSocket);
+		//rmAddObjectDefConstraint(playerSilverID, AvoidWaterShort2);
+		//rmAddObjectDefConstraint(playerSilverID, forestConstraintShort);
+		//rmAddObjectDefConstraint(playerSilverID, circleConstraint);
+		rmPlaceObjectDefAtLoc(playerSilverID, 0, 0.75, 0.5, cNumberNonGaiaPlayers+2);
+			
+		int playerSilver2ID = rmCreateObjectDef("player silver 2");
+		rmAddObjectDefItem(playerSilver2ID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilver2ID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilver2ID, rmXFractionToMeters(0.35));
+		rmAddObjectDefConstraint(playerSilver2ID, avoidCoinMed);
+		//rmAddObjectDefConstraint(playerSilver2ID, avoidNatives);
+		rmAddObjectDefConstraint(playerSilver2ID, avoidTownCenterMore);
+		rmAddObjectDefConstraint(playerSilver2ID, SouthPie);
+		rmAddObjectDefConstraint(playerSilver2ID, avoidCliff);
+		//rmAddObjectDefConstraint(playerSilver2ID, avoidSocket);
+		rmAddObjectDefConstraint(playerSilver2ID, AvoidWaterShort2);
+		//rmAddObjectDefConstraint(playerSilver2ID, forestConstraintShort);
+		//rmAddObjectDefConstraint(playerSilver2ID, circleConstraint);
+		rmPlaceObjectDefAtLoc(playerSilver2ID, 0, 0.25, 0.5, cNumberNonGaiaPlayers+2);
+	}
+
+// Trade route variation
+	else {
+	
+		int avoidMineMed=rmCreateTypeDistanceConstraint("avoid mines medium", "Mine", 58.0);
+	
+		int playerSilverNorthID = rmCreateObjectDef("player silver north");
+		rmAddObjectDefItem(playerSilverNorthID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilverNorthID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilverNorthID, rmXFractionToMeters(0.18));
+		rmAddObjectDefConstraint(playerSilverNorthID, avoidMineMed);
+		//rmAddObjectDefConstraint(playerSilverNorthID, avoidNatives);
+		//rmAddObjectDefConstraint(playerSilverNorthID, avoidTownCenterMore);
+		rmAddObjectDefConstraint(playerSilverNorthID, MineVSWaterMed);
+		//rmAddObjectDefConstraint(playerSilverNorthID, forestConstraintShort);
+		rmAddObjectDefConstraint(playerSilverNorthID, circleConstraint);
+		if (cNumberNonGaiaPlayers==2)
+			rmPlaceObjectDefInArea(playerSilverNorthID, 0, plateauNorthID, cNumberNonGaiaPlayers);
+		else
+			rmPlaceObjectDefInArea(playerSilverNorthID, 0, plateauNorthID, cNumberNonGaiaPlayers/2);
+		
+		int playerSilverSouthID = rmCreateObjectDef("player silver south");
+		rmAddObjectDefItem(playerSilverSouthID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilverSouthID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilverSouthID, rmXFractionToMeters(0.18));
+		rmAddObjectDefConstraint(playerSilverSouthID, avoidMineMed);
+		//rmAddObjectDefConstraint(playerSilverSouthID, avoidNatives);
+		//rmAddObjectDefConstraint(playerSilverSouthID, avoidTownCenterMore);
+		//rmAddObjectDefConstraint(playerSilverSouthID, avoidSocket);
+		rmAddObjectDefConstraint(playerSilverSouthID, MineVSWaterMed);
+		//rmAddObjectDefConstraint(playerSilverSouthID, forestConstraintShort);
+		rmAddObjectDefConstraint(playerSilverSouthID, circleConstraint);
+		if (cNumberNonGaiaPlayers==2)
+			rmPlaceObjectDefInArea(playerSilverSouthID, 0, plateauSouthID, cNumberNonGaiaPlayers);
+		else
+			rmPlaceObjectDefInArea(playerSilverSouthID, 0, plateauSouthID, cNumberNonGaiaPlayers/2);
+
+		int centralBox = rmCreateBoxConstraint("keep in the central box", 0.05, 0.3, 0.95, 0.7, 0.0);
+		int avoidMineMed2=rmCreateTypeDistanceConstraint("avoid mines medium 2", "Mine", 47.0);
+				
+		int silverCentralPlateauID = rmCreateObjectDef("central plateau silver");
+		rmAddObjectDefItem(silverCentralPlateauID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(silverCentralPlateauID, 0.0);
+		rmSetObjectDefMaxDistance(silverCentralPlateauID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(silverCentralPlateauID, avoidMineMed2);
+		rmAddObjectDefConstraint(silverCentralPlateauID, avoidNatives);
+		rmAddObjectDefConstraint(silverCentralPlateauID, centralBox);
+		rmAddObjectDefConstraint(silverCentralPlateauID, MineVSWaterMed);
+		rmAddObjectDefConstraint(silverCentralPlateauID, avoidSocket);
+		rmAddObjectDefConstraint(silverCentralPlateauID, circleConstraint);
+		if (cNumberNonGaiaPlayers==2){
+			rmAddObjectDefConstraint(silverCentralPlateauID, avoidMineMed2);
+			rmPlaceObjectDefAtLoc(silverCentralPlateauID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+		}
+		else if (cNumberNonGaiaPlayers<5){
+			rmAddObjectDefConstraint(silverCentralPlateauID, avoidMineMed2);
+			rmPlaceObjectDefAtLoc(silverCentralPlateauID, 0, 0.5, 0.5, 2*cNumberNonGaiaPlayers);	
+		}
+		else{
+			rmAddObjectDefConstraint(silverCentralPlateauID, avoidCoinMed);
+			rmPlaceObjectDefAtLoc(silverCentralPlateauID, 0, 0.5, 0.5, cNumberNonGaiaPlayers+4);	
+		}
+	}	
+}
+else{
+// FFA
+		int islandminesID = rmCreateObjectDef("island silver");
+		rmAddObjectDefItem(islandminesID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(islandminesID, 0.0);
+		rmSetObjectDefMaxDistance(islandminesID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(islandminesID, avoidCoinMed);
+		rmAddObjectDefConstraint(islandminesID, avoidNatives);
+		rmAddObjectDefConstraint(islandminesID, avoidTownCenterMore);
+		//rmAddObjectDefConstraint(islandminesID, avoidSocket);
+		rmAddObjectDefConstraint(islandminesID, AvoidWaterShort2);
+		//rmAddObjectDefConstraint(islandminesID, forestConstraintShort);
+		rmAddObjectDefConstraint(islandminesID, circleConstraint);
+		rmPlaceObjectDefAtLoc(islandminesID, 0, 0.5, 0.5, (2*cNumberNonGaiaPlayers+rmRandInt(2,3)));
+}	
+
+rmSetStatusText("", 0.7);
+
+// Trees
+
+	for (j=0; < (20*cNumberNonGaiaPlayers)) {   
+		int StartAreaTree2ID=rmCreateObjectDef("starting trees dirt"+j);
+		rmAddObjectDefItem(StartAreaTree2ID, "ypTreeBorneo", rmRandInt(8,12), 16.0);
+		rmAddObjectDefItem(StartAreaTree2ID, "ypTreeBorneo", rmRandInt(3,6), 12.0);
+		rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest")); 
+		rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+		rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRoute);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocket);
+		rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenter);	
+		rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);	
+		rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 20*cNumberNonGaiaPlayers);
+	}
+
+	
+// Huntables
+
+	int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 40.0);
+	
+if (rmGetIsFFA()==false) {
+
+// Coastal variation
+	if (diceThrow<0.0){
+	int rhea1ID = rmCreateObjectDef("rhea group 1");
+	rmAddObjectDefItem(rhea1ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea1ID, true);
+	rmSetObjectDefMinDistance(rhea1ID, 0);
+	rmSetObjectDefMaxDistance(rhea1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea1ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rhea1ID, avoidHunt);
+	rmAddObjectDefConstraint(rhea1ID, avoidCliff);
+	rmAddObjectDefConstraint(rhea1ID, NorthPie);
+	
+	int antelope1ID = rmCreateObjectDef("antelope group 1");
+	rmAddObjectDefItem(antelope1ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope1ID, true);
+	rmSetObjectDefMinDistance(antelope1ID, 0);
+	rmSetObjectDefMaxDistance(antelope1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope1ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelope1ID, avoidHunt);
+	rmAddObjectDefConstraint(antelope1ID, avoidCliff);
+	rmAddObjectDefConstraint(antelope1ID, NorthPie);
+
+	int tapir1ID = rmCreateObjectDef("tapir herd 1");
+	rmAddObjectDefItem(tapir1ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir1ID, true);
+	rmSetObjectDefMinDistance(tapir1ID, 0);
+	rmSetObjectDefMaxDistance(tapir1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir1ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapir1ID, avoidHunt);
+	rmAddObjectDefConstraint(tapir1ID, avoidCliff);	
+	rmAddObjectDefConstraint(tapir1ID, NorthPie);
+
+	int moose1ID = rmCreateObjectDef("moose group 1");
+	rmAddObjectDefItem(moose1ID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose1ID, true);
+	rmSetObjectDefMinDistance(moose1ID, 0);
+	rmSetObjectDefMaxDistance(moose1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose1ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(moose1ID, avoidHunt);
+	rmAddObjectDefConstraint(moose1ID, avoidCliff);
+	rmAddObjectDefConstraint(moose1ID, NorthPie);
+	
+	int rhea2ID = rmCreateObjectDef("rhea group 2");
+	rmAddObjectDefItem(rhea2ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea2ID, true);
+	rmSetObjectDefMinDistance(rhea2ID, 0);
+	rmSetObjectDefMaxDistance(rhea2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea2ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(rhea2ID, avoidHunt);
+	rmAddObjectDefConstraint(rhea2ID, avoidCliff);
+	rmAddObjectDefConstraint(rhea2ID, SouthPie);
+
+	int antelope2ID = rmCreateObjectDef("antelope group 2");
+	rmAddObjectDefItem(antelope2ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope2ID, true);
+	rmSetObjectDefMinDistance(antelope2ID, 0);
+	rmSetObjectDefMaxDistance(antelope2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope2ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(antelope2ID, avoidHunt);
+	rmAddObjectDefConstraint(antelope2ID, avoidCliff);
+	rmAddObjectDefConstraint(antelope2ID, SouthPie);	
+
+	int tapir2ID = rmCreateObjectDef("tapir herd 2");
+	rmAddObjectDefItem(tapir2ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir2ID, true);
+	rmSetObjectDefMinDistance(tapir2ID, 0);
+	rmSetObjectDefMaxDistance(tapir2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir2ID, avoidTownCenterMedium);		
+	rmAddObjectDefConstraint(tapir2ID, avoidHunt);
+	rmAddObjectDefConstraint(tapir2ID, avoidCliff);	
+	rmAddObjectDefConstraint(tapir2ID, SouthPie);	
+
+	int moose2ID = rmCreateObjectDef("moose group 2");
+	rmAddObjectDefItem(moose2ID, "ypIbex", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose2ID, true);
+	rmSetObjectDefMinDistance(moose2ID, 0);
+	rmSetObjectDefMaxDistance(moose2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose2ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(moose2ID, avoidHunt);
+	rmAddObjectDefConstraint(moose2ID, avoidCliff);
+	rmAddObjectDefConstraint(moose2ID, SouthPie);	
+
+	int huntCount = -1;
+		if (cNumberNonGaiaPlayers==2)
+			huntCount = cNumberNonGaiaPlayers/2;
+		else if (cNumberNonGaiaPlayers<=5)
+			huntCount = cNumberNonGaiaPlayers/2;
+		else
+			huntCount = cNumberNonGaiaPlayers/2;
+	
+	rmPlaceObjectDefAtLoc(rhea1ID, 0, 0.75, 0.5, huntCount+1);
+	rmPlaceObjectDefAtLoc(antelope1ID, 0, 0.75, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(tapir1ID, 0, 0.75, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(moose1ID, 0, 0.75, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(rhea2ID, 0, 0.25, 0.5, huntCount+1);
+	rmPlaceObjectDefAtLoc(antelope2ID, 0, 0.25, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(tapir2ID, 0, 0.25, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(moose2ID, 0, 0.25, 0.5, huntCount);
+	}
+
+// Trade route variation
+	else {
+	int rhea3bID = rmCreateObjectDef("rhea group 3 player");
+	rmAddObjectDefItem(rhea3bID, "rhea", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea3bID, true);
+	rmSetObjectDefMinDistance(rhea3bID, 0);
+	rmSetObjectDefMaxDistance(rhea3bID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea3bID, circleConstraint);
+	rmAddObjectDefConstraint(rhea3bID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rhea3bID, avoidHunt);	
+
+	int tapir3bID = rmCreateObjectDef("tapir herd 3 player");
+	rmAddObjectDefItem(tapir3bID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir3bID, true);
+	rmSetObjectDefMinDistance(tapir3bID, 0);
+	rmSetObjectDefMaxDistance(tapir3bID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir3bID, circleConstraint);
+	rmAddObjectDefConstraint(tapir3bID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapir3bID, avoidHunt);
+	
+	rmPlaceObjectDefInArea(rhea3bID, 0, plateauNorthID, 1);
+	rmPlaceObjectDefInArea(rhea3bID, 0, plateauSouthID, 1);
+	rmPlaceObjectDefInArea(tapir3bID, 0, plateauNorthID, 1);
+	rmPlaceObjectDefInArea(tapir3bID, 0, plateauSouthID, 1);
+	
+	int rhea3ID = rmCreateObjectDef("rhea group 3");
+	rmAddObjectDefItem(rhea3ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea3ID, true);
+	rmSetObjectDefMinDistance(rhea3ID, 0);
+	rmSetObjectDefMaxDistance(rhea3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea3ID, circleConstraint);
+	rmAddObjectDefConstraint(rhea3ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rhea3ID, avoidHunt);
+	
+	int antelope3ID = rmCreateObjectDef("antelope group 3");
+	rmAddObjectDefItem(antelope3ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope3ID, true);
+	rmSetObjectDefMinDistance(antelope3ID, 0);
+	rmSetObjectDefMaxDistance(antelope3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope3ID, circleConstraint);
+	rmAddObjectDefConstraint(antelope3ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelope3ID, avoidHunt);
+
+	int tapir3ID = rmCreateObjectDef("tapir herd 3");
+	rmAddObjectDefItem(tapir3ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir3ID, true);
+	rmSetObjectDefMinDistance(tapir3ID, 0);
+	rmSetObjectDefMaxDistance(tapir3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir3ID, circleConstraint);
+	rmAddObjectDefConstraint(tapir3ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapir3ID, avoidHunt);
+
+	int moose3ID = rmCreateObjectDef("moose group 3");
+	rmAddObjectDefItem(moose3ID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose3ID, true);
+	rmSetObjectDefMinDistance(moose3ID, 0);
+	rmSetObjectDefMaxDistance(moose3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose3ID, circleConstraint);
+	rmAddObjectDefConstraint(moose3ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(moose3ID, avoidHunt);
+	
+	int rhea4ID = rmCreateObjectDef("rhea group 4");
+	rmAddObjectDefItem(rhea4ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea4ID, true);
+	rmSetObjectDefMinDistance(rhea4ID, 0);
+	rmSetObjectDefMaxDistance(rhea4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea4ID, circleConstraint);
+	rmAddObjectDefConstraint(rhea4ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(rhea4ID, avoidHunt);
+
+	int antelope4ID = rmCreateObjectDef("antelope group 4");
+	rmAddObjectDefItem(antelope4ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope4ID, true);
+	rmSetObjectDefMinDistance(antelope4ID, 0);
+	rmSetObjectDefMaxDistance(antelope4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope4ID, circleConstraint);
+	rmAddObjectDefConstraint(antelope4ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelope4ID, avoidHunt);
+
+	int tapir4ID = rmCreateObjectDef("tapir herd 4");
+	rmAddObjectDefItem(tapir4ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir4ID, true);
+	rmSetObjectDefMinDistance(tapir4ID, 0);
+	rmSetObjectDefMaxDistance(tapir4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir4ID, circleConstraint);
+	rmAddObjectDefConstraint(tapir4ID, avoidTownCenterMedium);		
+	rmAddObjectDefConstraint(tapir4ID, avoidHunt);
+
+	int moose4ID = rmCreateObjectDef("moose group 4");
+	rmAddObjectDefItem(moose4ID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose4ID, true);
+	rmSetObjectDefMinDistance(moose4ID, 0);
+	rmSetObjectDefMaxDistance(moose4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose4ID, circleConstraint);
+	rmAddObjectDefConstraint(moose4ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(moose4ID, avoidHunt);
+	
+	int huntsVSLandstrips = rmCreateClassDistanceConstraint("extra hunts outside of players starting areas", classIsland, 1.0);
+	
+	int herdCount = -1;
+		if (cNumberNonGaiaPlayers==2)
+			herdCount = cNumberNonGaiaPlayers/2;
+		else if (cNumberNonGaiaPlayers<=5)
+			herdCount = cNumberNonGaiaPlayers/2;
+		else
+			herdCount = cNumberNonGaiaPlayers/2;
+	
+	rmAddObjectDefConstraint(rhea3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(rhea3ID, 0, 0.5, 0.5, herdCount);
+		
+	rmAddObjectDefConstraint(antelope3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(antelope3ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(tapir3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(tapir3ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(moose3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(moose3ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(rhea4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(rhea4ID, 0, 0.5, 0.5, herdCount+1);
+	
+	rmAddObjectDefConstraint(antelope4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(antelope4ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(tapir4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(tapir4ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(moose4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(moose4ID, 0, 0.5, 0.5, herdCount);	
+	}	
+}
+else{
+// FFA
+
+	int rheaxID = rmCreateObjectDef("rhea groups");
+	rmAddObjectDefItem(rheaxID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rheaxID, true);
+	rmSetObjectDefMinDistance(rheaxID, 0);
+	rmSetObjectDefMaxDistance(rheaxID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rheaxID, circleConstraint);
+	rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rheaxID, avoidHunt);
+	
+	int antelopexID = rmCreateObjectDef("antelope groups");
+	rmAddObjectDefItem(antelopexID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelopexID, true);
+	rmSetObjectDefMinDistance(antelopexID, 0);
+	rmSetObjectDefMaxDistance(antelopexID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelopexID, circleConstraint);
+	rmAddObjectDefConstraint(antelopexID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelopexID, avoidHunt);
+
+	int tapirxID = rmCreateObjectDef("tapir herds");
+	rmAddObjectDefItem(tapirxID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapirxID, true);
+	rmSetObjectDefMinDistance(tapirxID, 0);
+	rmSetObjectDefMaxDistance(tapirxID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapirxID, circleConstraint);
+	rmAddObjectDefConstraint(tapirxID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapirxID, avoidHunt);
+
+	int moosexID = rmCreateObjectDef("moose groups");
+	rmAddObjectDefItem(moosexID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moosexID, true);
+	rmSetObjectDefMinDistance(moosexID, 0);
+	rmSetObjectDefMaxDistance(moosexID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moosexID, circleConstraint);
+	rmAddObjectDefConstraint(moosexID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(moosexID, avoidHunt);
+
+	rmPlaceObjectDefAtLoc(rheaxID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(antelopexID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(tapirxID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(moosexID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+}	
+
+rmSetStatusText("", 0.8);
+
+// Nuggets!
+
+	int avoidImpassableLandMore=rmCreateTerrainDistanceConstraint("avoid impassable land more", "Land", false, 15.0);
+
+	int nuggetID= rmCreateObjectDef("nugget"); 
+	rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0); 
+	rmSetObjectDefMinDistance(nuggetID, 0.0); 
+	rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5)); 
+	rmAddObjectDefConstraint(nuggetID, avoidNugget); 
+	rmAddObjectDefConstraint(nuggetID, avoidEdgeMore);
+	//rmAddObjectDefConstraint(nuggetID, circleConstraint);
+	rmAddObjectDefConstraint(nuggetID, avoidTownCenter);
+	rmAddObjectDefConstraint(nuggetID, avoidCoin); 
+	//rmAddObjectDefConstraint(nuggetID, avoidImpassableLandMore);
+	rmAddObjectDefConstraint(nuggetID, avoidNatives); 
+	rmAddObjectDefConstraint(nuggetID, avoidAll); 
+	rmAddObjectDefConstraint(nuggetID, avoidWaterShort); 
+	rmAddObjectDefConstraint(nuggetID, avoidTradeRouteSmall);
+	rmAddObjectDefConstraint(nuggetID, avoidSocket); 
+	rmSetNuggetDifficulty(1, 2); 
+	rmPlaceObjectDefAtLoc(nuggetID, 0, 0.5, 0.5, 5*(cNumberNonGaiaPlayers + rmRandInt(2,4))); 
+
+rmSetStatusText("", 0.9);
+
+    
+// Land underbrush stuff -- shrubs, twigs, rocks
+
+	int props = rmCreateObjectDef("ground underbrush");
+	rmAddObjectDefItem(props, "UnderbrushBorneo", 1, 0.0);
+	rmSetObjectDefMinDistance(props, 0);
+	rmSetObjectDefMaxDistance(props, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(props, avoidImportantItem);
+  	//rmAddObjectDefConstraint(props, playerConstraint);
+  	rmAddObjectDefConstraint(props, avoidEdgeMore);
+  	rmAddObjectDefConstraint(props, avoidBrush);
+	rmAddObjectDefConstraint(props, avoidNativesMed);
+  	rmAddObjectDefConstraint(props, avoidCoinShort);
+  	rmAddObjectDefConstraint(props, avoidWaterShort);
+  	rmAddObjectDefConstraint(props, avoidTownCenterSmall);
+  	rmAddObjectDefConstraint(props, avoidCliff);
+	rmPlaceObjectDefAtLoc(props, 0, 0.5, 0.5, 90*cNumberNonGaiaPlayers);
+
+ 
+	// Ruins
+
+	int ruinCount = (cNumberNonGaiaPlayers + rmRandInt(1,2));
+	rmDefineClass("classWall");
+	int wallConstraint=rmCreateClassDistanceConstraint("wall vs. wall", rmClassID("classWall"), 40.0);
+
+	for(i=0; < ruinCount) {
+		int stoneWallID = rmCreateGrouping("stone wall "+i, "uger"+rmRandInt(1,4));
+		rmAddGroupingToClass(stoneWallID, rmClassID("classWall"));
+		rmSetGroupingMinDistance(stoneWallID, 0.0);
+		rmSetGroupingMaxDistance(stoneWallID, rmXFractionToMeters(0.5));
+		rmAddGroupingConstraint(stoneWallID, avoidEdgeMore);
+		rmAddGroupingConstraint(stoneWallID, forestConstraintShort);
+		rmAddGroupingConstraint(stoneWallID, avoidTradeRoute);
+		rmAddGroupingConstraint(stoneWallID, avoidSocket);
+		rmAddGroupingConstraint(stoneWallID, wallConstraint);
+		rmAddGroupingConstraint(stoneWallID, avoidWater);
+		rmAddGroupingConstraint(stoneWallID, avoidNativesMed);
+		rmAddGroupingConstraint(stoneWallID, avoidTownCenter);
+		rmAddGroupingConstraint(stoneWallID, avoidNuggetSmall);
+		rmAddGroupingConstraint(stoneWallID, avoidAll);
+		rmPlaceGroupingAtLoc(stoneWallID, 0, 0.5, 0.5);
+	}
+
+	// KOTH game mode
+   if(rmGetIsKOTH())
+   {
+      float xLoc = 0.5;
+      float yLoc = 0.5;
+      float walk = 0.03;
+      
+      ypKingsHillPlacer(yLoc, yLoc, walk, 0);
+      rmEchoInfo("XLOC = "+yLoc);
+      rmEchoInfo("XLOC = "+yLoc);
+   }
+	
+	// Water buffalos
+
+	if (IsYP()){
+		int avoidBuffalo=rmCreateTypeDistanceConstraint("buffalo avoids buffalo", "ypWaterBuffalo", 60.0);
+
+		int randomSheep = rmCreateObjectDef("random sheep");
+		rmAddObjectDefItem(randomSheep, "ypWaterBuffalo", 1, 3.0);
+		rmSetObjectDefMinDistance(randomSheep, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randomSheep, rmXFractionToMeters(0.33));
+		//rmAddObjectDefConstraint(randomSheep, avoidAll);
+		//rmAddObjectDefConstraint(randomSheep, avoidImpassableLand);
+		rmAddObjectDefConstraint(randomSheep, avoidCliff);
+		rmAddObjectDefConstraint(randomSheep, avoidBuffalo);
+		rmPlaceObjectDefAtLoc(randomSheep, 0, 0.5, 0.5, cNumberNonGaiaPlayers*3+rmRandInt(2,3));
+	}
+
+		for (i=0; < cNumberNonGaiaPlayers*40){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "borneo\ground_grass1_borneo", "borneo\ground_forest_borneo");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+
+rmSetMapClusteringNoiseParams(0.05, 5, 0.5);  
+rmSetMapClusteringPlacementParams(0.2, 0.3, 0.4, cClusterLand);
+rmSetMapClusteringObjectParams(0, 0, 0.5);
+rmPlaceMapClusters("", "borneo_underbrush"); 
+   
+rmSetStatusText("", 1.0);
+    
+}
\ No newline at end of file
diff --git a/RMM/CongoLarge.xml b/RMM/CongoLarge.xml
new file mode 100644
index 0000000..531ffe1
--- /dev/null
+++ b/RMM/CongoLarge.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\congo" 
+displayNameID = "130102"
+details = "130103" 
+loadDetails = "130083" 
+loadBackground="ui\random_map\africa\congo\congo_map">
+   <loadss>ui\random_map\africa\congo\congo_ss_01</loadss>
+   <loadss>ui\random_map\africa\congo\congo_ss_02</loadss>
+   <loadss>ui\random_map\africa\congo\congo_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/CongoLarge.xs b/RMM/CongoLarge.xs
new file mode 100644
index 0000000..a7b3cb2
--- /dev/null
+++ b/RMM/CongoLarge.xs
@@ -0,0 +1,1672 @@
+/* 
+# Mosquito Coast
+# 
+# Monteverde / Tortuguero / Cano Negro
+# 
+# The map portrays a corner of the Caribbean lowlands - a maze of rivers, canals, lagoons 
+# and tidal wetlands. Showcasing lush and dense cloud forests, home of a unique mix of 
+# animals and plants, the region gets heavy rainfall throughout the year.
+# 
+# The script may randomly load one of two variations:
+# 1. A coastal plateau with numerous deep water pockets, rock ridges and some cliffs peppering the landscape
+# 2. A strip of land with a trade route in the middle section and two smaller land areas on opposite edges of the map, separated by winding water canals
+# 
+# FFA has a separate variation with delta islands, divided by pathable waters, and two trade route areas on opposite edges of the map (their positions are random).
+# 
+# Each player side gets a native settlement (Caribs or Maya/Jesuits on TAD) in the trade route variation. More settlements can be found 
+# close to the edges of the map, in the coastal variation.
+# 
+# April-July-November
+# 
+# Mister 2014
+*/
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+bool Asian = false;
+
+bool IsYP(){
+	if (rmGetCivID("Japanese")==19)
+		Asian = true;
+	return(Asian);
+}
+
+int landnoise=0; 
+int num=0; 
+void Area(float Asize=0.0, float spotX=0.0, float spotZ=0.0, string Paint=""){
+	landnoise=rmCreateArea("Some Area"+num); 
+	rmSetAreaSize(landnoise, Asize, Asize); 
+	rmSetAreaTerrainType(landnoise, Paint); 
+	rmSetAreaCliffType(landnoise, "uger"); 
+	rmSetAreaCliffHeight(landnoise, 1.0, 0.0, 1.0); 
+	rmSetAreaCliffEdge(landnoise, 1, 1.0, 0.0, 0.0, 0); 
+	rmSetAreaCliffPainting(landnoise, true, false, false, 0, true); 
+	rmSetAreaCoherence(landnoise, 0.80); 
+	rmSetAreaSmoothDistance(landnoise, 3); 
+	rmSetAreaHeightBlend(landnoise, 4); 
+	rmSetAreaBaseHeight(landnoise, 0.0); 
+	rmSetAreaElevationNoiseBias(landnoise, 0);
+    rmSetAreaElevationEdgeFalloffDist(landnoise, 3);
+	rmSetAreaElevationVariation(landnoise, 2);
+	rmSetAreaElevationPersistence(landnoise, 0.3);
+	rmSetAreaElevationOctaves(landnoise, 4);
+	rmSetAreaElevationMinFrequency(landnoise, 0.04);
+	rmSetAreaElevationType(landnoise, cElevTurbulence);
+	rmSetAreaLocation(landnoise, spotX, spotZ); 			// DBG flag -- line 912
+	num=num+1;												
+}
+
+float PI = 3.1415926535897932384626433832795;
+float pow(float x = 0,int p = 0) { 
+	float x2 = 1;	float x4 = 1; float x8 = 1; float x16 = 1; float x32 = 1; float x64 = 1; 
+	if(p>=2) x2 = x*x; 
+	if(p>=4) x4 = x2*x2; 
+	if(p>=8) x8 = x4*x4; 
+	if(p>=16) x16 = x8*x8; 
+	if(p>=32) x32 = x16*x16; 
+	if(p>=64) x64 = x32*x32; 
+	float ret = 1;	
+	while(p>=64) {	ret = ret * x64; p = p - 64; }	
+	if(p>=32) { ret = ret * x32; p = p - 32; } 
+	if(p>=16) { ret = ret * x16; p = p - 16; } 
+	if(p>=8) { ret = ret * x8; p = p - 8; } 
+	if(p>=4) { ret = ret * x4; p = p - 4; } 
+	if(p>=2) { ret = ret * x2; p = p - 2; } 
+	if(p>=1) { ret = ret * x; p = p - 1; } 
+	return (ret); 
+}
+float atan(float n = 0) { 
+	float m = n; 
+	if(n > 1) m = 1.0 / n; 
+	if(n < -1) m = -1.0 / n; 
+	float r = m; 
+	for(i = 1; < 100) { int j = i * 2 + 1; float k = pow(m,j) / j; 
+		if(k == 0) break; 
+		if(i % 2 == 0) r = r + k; 
+		if(i % 2 == 1) r = r - k; 
+	} 
+	if(n > 1 || n < -1) r = PI / 2.0 - r; 
+	if(n < -1) r = 0.0 - r; 
+	return (r); 
+}
+float atan2(float z = 0,float x = 0) { 
+	if(x > 0) return (atan(z / x)); 
+	if(x < 0) { if(z < 0) return (atan(z / x) - PI); 
+		if(z > 0) return (atan(z / x) + PI); 	
+		return (PI); 
+	} 
+	if(z > 0) return (PI / 2.0); 
+	if(z < 0) return (0.0 - (PI / 2.0)); 
+	return (0); 
+}
+float fact(float n = 0) { 
+	float r = 1; 
+	for(i = 1; <= n) { r = r * i; } 
+	return (r); 
+}
+float cos(float n = 0) { 
+	float r = 1; 
+	for(i = 1; < 100) { 
+		int j = i * 2; float k = pow(n,j) / fact(j); 
+		if(k == 0) break; 
+		if(i % 2 == 0) r = r + k; 
+		if(i % 2 == 1) r = r - k; 
+	} 
+	return (r); 
+}
+float sin(float n = 0) { 
+	float r = n; 
+	for(i = 1; < 100) { 
+		int j = i * 2 + 1; 
+		float k = pow(n,j) / fact(j); 
+		if(k == 0) break; 
+		if(i % 2 == 0) r = r + k; 
+		if(i % 2 == 1) r = r - k; 
+	} 
+	return (r); 
+} 
+
+float LocX = 0; 
+float LocZ = 0; 
+float wAngle = 0;
+
+float getLocX(float xOrigin=0, float rad=0, float MyAngle=0) { 
+	wAngle = (2*PI*MyAngle)/360; 
+	LocX=cos(wAngle)*rad + xOrigin; 
+	return(LocX); 
+}
+	
+float getLocZ(float zOrigin=0, float rad=0, float MyAngle=0) { 
+	wAngle = (2*PI*MyAngle)/360; 
+	LocZ=sin(wAngle)*rad + zOrigin; 
+	return(LocZ); 
+}
+
+int classSmallIsland = 0;
+int islandConstraint2 = 0; 
+int avoidSmallIslands = 0;
+int islandEdgeConstraint = 0;
+
+int buildTradeArea (string TradeIslandName = "", float xLoc = 0.0, float zLoc = 0.0, float xFrac1 = 0.0, float zFrac1 = 0.0, float xFrac2 = 0.0, float zFrac2 = 0.0, string socketDef="") { 
+    int tradeIslandID=rmCreateArea(TradeIslandName); 
+    rmSetAreaSize(tradeIslandID, 0.09, 0.09);
+    rmAddAreaToClass(tradeIslandID, classSmallIsland);  
+    rmSetAreaTerrainType(tradeIslandID, "borneo\ground_grass1_borneo");
+    //rmAddAreaTerrainLayer(tradeIslandID, "amazon\river1_am", 0, 14);
+    //rmSetAreaMix(tradeIslandID, "yucatan_grass");  
+    rmSetAreaEdgeFilling(tradeIslandID, 0);
+    rmSetAreaBaseHeight(tradeIslandID, 2.0);
+    rmSetAreaSmoothDistance(tradeIslandID, 5);
+    /*rmAddAreaConstraint(tradeIslandID, avoidSmallIslands); 
+    rmAddAreaConstraint(tradeIslandID, islandConstraint2); */
+    rmSetAreaCoherence(tradeIslandID, 0.6);
+    rmSetAreaLocation(tradeIslandID, xLoc, zLoc);  
+    rmSetAreaElevationType(tradeIslandID, cElevTurbulence);
+    rmSetAreaElevationVariation(tradeIslandID, 4.0);
+    rmSetAreaElevationMinFrequency(tradeIslandID, 0.09);
+    rmSetAreaElevationOctaves(tradeIslandID, 3);
+    rmSetAreaElevationPersistence(tradeIslandID, 0.2);
+    rmSetAreaElevationNoiseBias(tradeIslandID, 1);
+    rmAddAreaInfluenceSegment(tradeIslandID, xFrac1, zFrac1, xFrac2, zFrac2);
+	rmAddAreaRemoveType(tradeIslandID, "borneo_underbrush");
+	rmAddAreaRemoveType(tradeIslandID, "PropTurtles");
+	rmAddAreaRemoveType(tradeIslandID, "PropSwan");
+	rmAddAreaRemoveType(tradeIslandID, "PropFish");
+	rmAddAreaRemoveType(tradeIslandID, "DuckFamily");
+    rmBuildArea(tradeIslandID);
+
+    int tradeRouteID = rmCreateTradeRoute();
+    int socketID=rmCreateObjectDef(socketDef);
+    rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+    rmSetObjectDefAllowOverlap(socketID, true);
+    rmSetObjectDefMinDistance(socketID, 0.0);
+    rmSetObjectDefMaxDistance(socketID, 8.0);
+    rmAddTradeRouteWaypoint(tradeRouteID, xFrac1, zFrac1);
+    rmAddRandomTradeRouteWaypoints(tradeRouteID, xFrac2, zFrac2, 6, 6);
+    //	rmAddTradeRouteWaypoint(tradeRouteID, xFrac2, zFrac2);
+    rmBuildTradeRoute(tradeRouteID, "dirt");
+    rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+    vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.5);
+    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);  
+    return(tradeIslandID);
+}
+
+void main(void){
+
+rmSetStatusText("", 0.0);
+
+	if (rmGetIsFFA()==false) {
+		float diceThrow = rmRandFloat(0,1.8);
+			// <0.9 coastal version with noisy plateau, no trade route
+			// >=0.9 central plateau with trade route
+	}
+
+	float playerTiles=18000;
+		if (cNumberNonGaiaPlayers>4)
+			playerTiles = 16800;
+		if (cNumberNonGaiaPlayers>6)
+			playerTiles = 14000;			
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+	rmSetMapSize(size, size);
+
+	rmSetSeaType("Borneo Water");
+		
+	if (rmGetIsFFA()) {	
+		rmSetSeaLevel(-2.0);
+			if (IsYP()) 
+				rmSetMapType("deccan");
+			else
+				rmSetMapType("deccan");
+	}
+	else {
+		if (IsYP()) {
+			if (diceThrow<0.0) {			// Coastal variation
+				rmSetSeaLevel(-5.0);
+				rmSetMapType("deccan");   
+			}
+			else {							// Trade route variation
+				if (rmRandFloat(0,1)>0.67) {
+					rmSetMapType("deccan");
+				}
+				else {
+					rmSetMapType("deccan");
+				}
+				rmSetSeaLevel(0.0);
+				rmSetGlobalRain(0.0);
+			}
+		}
+		else {
+			if (diceThrow<0.0) {			// Coastal variation
+				rmSetSeaLevel(-5.0);
+				rmSetMapType("deccan");  
+			}
+			else {							// Trade route variation
+				if (rmRandFloat(0,1)>0.67) {
+					rmSetMapType("deccan");
+				}
+				else {
+					rmSetMapType("deccan");
+				}
+				rmSetSeaLevel(0.0);
+				rmSetGlobalRain(0.0);
+			}
+		}
+	}
+	
+	rmSetMapType("deccan");
+	rmSetMapType("water");
+	rmSetLightingSet("301a_malta");
+	rmTerrainInitialize("water");
+
+chooseMercs();
+
+	// Make it rain
+   rmSetGlobalRain( 0.7 );
+
+rmSetWindMagnitude(2);
+//rmSetGlobalStormLength(20, 20);
+
+int classPlayer=rmDefineClass("player"); 
+int classBase=rmDefineClass("land base"); 
+rmDefineClass("startingUnit"); 
+rmDefineClass("natives"); 
+rmDefineClass("importantItem"); 
+rmDefineClass("nuggets"); 
+rmDefineClass("classCliff"); 
+rmDefineClass("classForest");
+rmDefineClass("socketClass");
+rmDefineClass("deltaIsland");
+int classIsland=rmDefineClass("island");
+int classPlateau=rmDefineClass("plateau");
+classSmallIsland=rmDefineClass("smallIsland");
+int classLake=rmDefineClass("lake");
+int classLakeIsland=rmDefineClass("lakeIsland");
+int classBay=rmDefineClass("bay");
+int classBonusIsland=rmDefineClass("bonus island");
+int classSideIsland=rmDefineClass("side island");
+
+int bonusIslandConstraint=rmCreateClassDistanceConstraint("avoid bonus island", classBonusIsland, 10.0);
+int bonusIslandConstraintMed=rmCreateClassDistanceConstraint("avoid bonus island medium", classBonusIsland, 16.0);
+int longBonusIslandConstraint=rmCreateClassDistanceConstraint("long avoid bonus island", classBonusIsland, 30.0);
+int medSideIslandConstraint=rmCreateClassDistanceConstraint("avoid side island medium", classSideIsland, 12.0);
+int longSideIslandConstraint=rmCreateClassDistanceConstraint("long avoid side island", classSideIsland, 30.0);
+int lakeConstraint=rmCreateClassDistanceConstraint("avoid bay", classLake, 15.0);
+//int bayConstraint=rmCreateClassDistanceConstraint("avoid bay", classBay, 3);
+int avoidIslet=rmCreateClassDistanceConstraint("small island avoid islands", rmClassID("deltaIsland"), 12.0);
+int islandConstraint=rmCreateClassDistanceConstraint("islands avoid each other", classIsland, 15.0);
+int islandConstraintSmall=rmCreateClassDistanceConstraint("islets avoid big Islands", classIsland, 12.0);
+int plateauConstraint=rmCreateClassDistanceConstraint("plateaus avoid each other", classPlateau, 18.0);
+islandConstraint2=rmCreateClassDistanceConstraint("stay away from main island", classIsland, 12.0);
+avoidSmallIslands = rmCreateClassDistanceConstraint("stay away from other bonus islands", classSmallIsland, 10.0);
+int avoidLakes=rmCreateClassDistanceConstraint("avoid lakes", classLake, 8.0);
+int avoidLakeIsland=rmCreateClassDistanceConstraint("avoid big lake islands", classLakeIsland, 20.0);
+int avoidLakeIslandSmall=rmCreateClassDistanceConstraint("avoid lake islands", classLakeIsland, 10.0);
+islandEdgeConstraint = rmCreatePieConstraint("Islands away from edge of map", 0.5, 0.5, 0, rmGetMapXSize()-12, 0, 0, 0);
+int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(6), rmZTilesToFraction(6), 1.0-rmXTilesToFraction(6), 1.0-rmZTilesToFraction(6), 0.01); 
+int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+int avoidEdgeMore=rmCreatePieConstraint("avoid the edge of map", 0.5, 0.5, 0, rmZFractionToMeters(0.45), rmDegreesToRadians(0), rmDegreesToRadians(360));
+int playerConstraint=rmCreateClassDistanceConstraint("player vs. player", classPlayer, 20.0); 
+int playerConstraintSmall=rmCreateClassDistanceConstraint("stuff vs. player small", classPlayer, 5.0); 
+int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+int avoidNatives=rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 0.0);
+int avoidNativesMed=rmCreateClassDistanceConstraint("stuff avoids natives medium", rmClassID("natives"), 0.0);
+int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 10.0);
+int avoidImpassableShort=rmCreateTerrainDistanceConstraint("avoid impassable short", "Land", false, 5.0);
+int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.9);
+int cliffConstraint=rmCreateClassDistanceConstraint("cliff vs. cliff", rmClassID("classCliff"), 45.0);	
+int avoidCliff=rmCreateClassDistanceConstraint("stuff vs. cliff", rmClassID("classCliff"), 5.0);	
+int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 20.0);
+int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0); 
+int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0); 
+int avoidWater = rmCreateTerrainDistanceConstraint("avoid water", "Land", false, 8.0);
+int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+int avoidWaterPlants = rmCreateTypeDistanceConstraint("water plants avoid each other", "UnderbrushLake", 8);
+int avoidBrush=rmCreateTypeDistanceConstraint("props avoid each other", "UnderbrushJungle", 10.0);
+int avoidCoinShort=rmCreateTypeDistanceConstraint("avoid coin short", "Mine", 5.0);
+int waterConstraint = rmCreateTerrainDistanceConstraint("avoid land short", "Land", true, -1.0);	
+int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+int classPatch = rmDefineClass("patch");
+
+rmSetStatusText("", 0.1);
+
+if (rmGetIsFFA()==false) {	
+    
+  if (diceThrow>=0.0){			// Trade route variation
+    
+	int pool=rmCreateArea("the waterpool");
+	rmSetAreaSize(pool, 0.8, 0.8); 
+	rmSetAreaLocation(pool, 0.5, 0.5);
+	rmSetAreaBaseHeight(pool, -0.5);
+	rmSetAreaCoherence(pool, 1.00);
+	rmBuildArea(pool);
+    
+	int plateauCenter=rmCreateArea("center plateau");
+	rmSetAreaSize(plateauCenter, 0.17, 0.17); 
+	rmSetAreaTerrainType(plateauCenter, "borneo\ground_grass2_borneo");	
+//	rmSetAreaMix(plateauCenter, "yucatan_grass");
+	rmSetAreaLocation(plateauCenter, 0.5, 0.5);
+	rmSetAreaCoherence(plateauCenter, 0.5);
+	rmAddAreaToClass(plateauCenter, classPlateau);
+	rmSetAreaBaseHeight(plateauCenter, 1.0);
+	rmSetAreaSmoothDistance(plateauCenter, 20);
+	rmSetAreaElevationType(plateauCenter, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauCenter, 4.0);
+	rmSetAreaElevationMinFrequency(plateauCenter, 0.04);
+	rmSetAreaElevationOctaves(plateauCenter, 4);
+	rmSetAreaElevationPersistence(plateauCenter, 0.5);
+	rmSetAreaElevationNoiseBias(plateauCenter, 1);
+	rmSetAreaEdgeFilling(plateauCenter, 1);
+	rmAddAreaInfluenceSegment(plateauCenter, -0.15, 0.5, 0.5, 0.5);
+	//rmAddAreaRemoveType(plateauCenter, "UnderbrushLake");
+	rmBuildArea(plateauCenter);
+
+	int plateauCenter2=rmCreateArea("center plateau 2");
+	rmSetAreaSize(plateauCenter2, 0.17, 0.17); 
+	rmSetAreaTerrainType(plateauCenter2, "borneo\ground_grass1_borneo");	
+//	rmSetAreaMix(plateauCenter2, "yucatan_grass");
+	rmSetAreaLocation(plateauCenter2, 0.5, 0.5);
+	rmSetAreaCoherence(plateauCenter2, 0.5);
+	rmAddAreaToClass(plateauCenter2, classPlateau);
+	rmSetAreaBaseHeight(plateauCenter2, 1.0);
+	rmSetAreaSmoothDistance(plateauCenter2, 20);
+	rmSetAreaElevationType(plateauCenter2, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauCenter2, 4.0);
+	rmSetAreaElevationMinFrequency(plateauCenter2, 0.04);
+	rmSetAreaElevationOctaves(plateauCenter2, 4);
+	rmSetAreaElevationPersistence(plateauCenter2, 0.5);
+	rmSetAreaElevationNoiseBias(plateauCenter2, 1);
+	rmSetAreaEdgeFilling(plateauCenter2, 1);
+	rmAddAreaInfluenceSegment(plateauCenter2, 0.5, 0.5, 1.1, 0.5);
+	//rmAddAreaRemoveType(plateauCenter2, "UnderbrushLake");
+	rmBuildArea(plateauCenter2);
+
+	// Trade route
+
+	int tradeRouteID = rmCreateTradeRoute();
+	int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+	rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+	rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+	rmSetObjectDefAllowOverlap(socketID, true);
+	rmAddObjectDefToClass(socketID, rmClassID("socketClass"));
+	rmSetObjectDefMinDistance(socketID, 0.0);
+	rmSetObjectDefMaxDistance(socketID, 8.0);
+   
+	rmAddTradeRouteWaypoint(tradeRouteID, -0.1, .53);
+
+	if (cNumberNonGaiaPlayers==2){
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .2, .43, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .3, .50, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .5, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .7, .53, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .9, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, 1.1, .55, 5, 6);
+	}
+	else {
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .1, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .3, .55, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .5, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .7, .55, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, .9, .45, 5, 6);
+		rmAddRandomTradeRouteWaypoints(tradeRouteID, 1.1, .52, 5, 6);
+	}
+	rmBuildTradeRoute(tradeRouteID, "dirt");
+	  
+	vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.14);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);  
+	vector socketLoc2 = rmGetTradeRouteWayPoint(tradeRouteID, 0.37);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc2);  
+	vector socketLoc3 = rmGetTradeRouteWayPoint(tradeRouteID, 0.6);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc3);  
+	vector socketLoc4 = rmGetTradeRouteWayPoint(tradeRouteID, 0.8);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc4);  
+
+	int plateauNorthID=rmCreateArea("north platform 2");
+	if (cNumberNonGaiaPlayers==2){
+		rmSetAreaSize(plateauNorthID, 0.175, 0.175); 		// Was 0.15
+	}
+	else {
+		rmSetAreaSize(plateauNorthID, 0.2, 0.2); 
+	}
+	rmSetAreaTerrainType(plateauNorthID, "borneo\ground_grass1_borneo");
+	rmSetAreaLocation(plateauNorthID, 0.5, 0.9);
+	rmSetAreaCoherence(plateauNorthID, 0.80);
+	rmAddAreaToClass(plateauNorthID, classIsland);
+	rmAddAreaConstraint(plateauNorthID, plateauConstraint);
+	rmSetAreaBaseHeight(plateauNorthID, 1.0);
+	rmSetAreaSmoothDistance(plateauNorthID, 20);
+	rmSetAreaElevationType(plateauNorthID, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauNorthID, 4.0);
+	rmSetAreaElevationMinFrequency(plateauNorthID, 0.04);
+	rmSetAreaElevationOctaves(plateauNorthID, 4);
+	rmSetAreaElevationPersistence(plateauNorthID, 0.5);
+	rmSetAreaElevationNoiseBias(plateauNorthID, 1);
+	rmSetAreaEdgeFilling(plateauNorthID, 10);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.10, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.30, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.50, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.70, 0.89);
+	rmAddAreaInfluencePoint(plateauNorthID, 0.90, 0.89); 
+	//rmAddAreaRemoveType(plateauNorthID, "UnderbrushLake");
+	rmBuildArea(plateauNorthID);
+
+	int plateauSouthID=rmCreateArea("south platform 2");
+		if (cNumberNonGaiaPlayers==2){
+			rmSetAreaSize(plateauSouthID, 0.175, 0.175); 	// Was 0.15
+		}
+		else {
+			rmSetAreaSize(plateauSouthID, 0.2, 0.2); 
+		}
+	rmSetAreaTerrainType(plateauSouthID, "borneo\ground_grass1_borneo");
+//	rmSetAreaMix(plateauSouthID, "yucatan_grass");
+	rmSetAreaLocation(plateauSouthID, 0.5, 0.1);
+	rmSetAreaCoherence(plateauSouthID, 0.80);
+	rmAddAreaToClass(plateauSouthID, classIsland);
+	rmSetAreaBaseHeight(plateauSouthID, 1.0);
+	rmSetAreaSmoothDistance(plateauSouthID, 20);
+	rmSetAreaElevationType(plateauSouthID, cElevTurbulence);
+	rmSetAreaElevationVariation(plateauSouthID, 4.0);
+	rmSetAreaElevationMinFrequency(plateauSouthID, 0.04);
+	rmSetAreaElevationOctaves(plateauSouthID, 4);
+	rmSetAreaElevationPersistence(plateauSouthID, 0.5);
+	rmSetAreaElevationNoiseBias(plateauSouthID, 1);
+	rmSetAreaEdgeFilling(plateauSouthID, 10);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.10, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.30, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.50, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.70, 0.11);
+	rmAddAreaInfluencePoint(plateauSouthID, 0.90, 0.11);
+	//rmAddAreaRemoveType(plateauSouthID, "UnderbrushLake");
+	rmBuildArea(plateauSouthID);
+    
+    
+    // Water weed and wild life
+
+	int avoidLand = rmCreateTerrainDistanceConstraint("avoid land", "Water", false, 5.0);
+
+    
+//	for (i=0;<(80*cNumberNonGaiaPlayers)) {	
+		int waterWeed = rmCreateObjectDef("water weed");
+		rmAddObjectDefItem(waterWeed, "UnderbrushLake", 1, 10.0);
+		rmSetObjectDefMinDistance(waterWeed, 0);
+		rmSetObjectDefMaxDistance(waterWeed, rmXFractionToMeters(0.5));
+  		rmAddObjectDefConstraint(waterWeed, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(waterWeed, avoidWaterPlants);
+  		rmAddObjectDefConstraint(waterWeed, waterConstraint);
+	  	//rmAddObjectDefConstraint(waterWeed, avoidLand);
+  		//rmAddObjectDefConstraint(waterWeed, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(waterWeed, 0, 0.5, 0.5, 50);
+//	}
+
+	int wildChance = -1;
+
+    for (i=0;<(4*cNumberNonGaiaPlayers)) {
+		int phloat = rmCreateObjectDef("phloat"+i);
+		wildChance = rmRandInt(0,3);
+		switch(wildChance) {				// Many moni, say me say many, many, many
+			case 0: rmAddObjectDefItem(phloat, "PropTurtles", 1, 0.0);
+			case 1: rmAddObjectDefItem(phloat, "PropSwan", 1, 0.0);
+			case 2: rmAddObjectDefItem(phloat, "PropFish", 1, 0.0);
+			case 3: rmAddObjectDefItem(phloat, "DuckFamily", 1, 0.0);
+		}
+		rmSetObjectDefMinDistance(phloat, 0);
+		rmSetObjectDefMaxDistance(phloat, rmXFractionToMeters(0.5));
+	  	rmAddObjectDefConstraint(phloat, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(phloat, avoidWaterPlants);
+	  	rmAddObjectDefConstraint(phloat, waterConstraint);
+	  	rmAddObjectDefConstraint(phloat, avoidLand);
+	// rmAddObjectDefConstraint(phloat, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(phloat, 0, 0.5, 0.5, 1);
+	}
+    
+}							// End of trade route variation
+
+}							// End of non-FFA area creation
+
+else {						// FFA area creation
+    
+    
+    int pool2=rmCreateArea("the waterpool 2");
+    rmSetAreaSize(pool2, 0.8, 0.8); 
+    rmSetAreaLocation(pool2, 0.5, 0.5);
+    rmSetAreaBaseHeight(pool2, -2.5);
+    rmSetAreaCoherence(pool2, 1.00);
+    rmBuildArea(pool2);
+
+ 
+}
+
+rmSetStatusText("", 0.2);
+
+// Starting positions for players placement
+
+	float pSwitch = rmRandFloat(0, 1.2);
+
+if (diceThrow<0.0){
+
+    	if (rmGetIsFFA())
+		rmPlacePlayersCircular(0.35, 0.35, 0);
+	else {
+		if (pSwitch < 0.55) {
+			rmSetPlacementSection(0.10, 0.30);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.33, 0.33, 0);
+			rmSetPlacementSection(0.60, 0.80);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.33, 0.33, 0); 
+		}
+		else {
+			rmSetPlacementSection(0.60, 0.80);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.33, 0.33, 0);
+			rmSetPlacementSection(0.10, 0.30);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.33, 0.33, 0); 
+		}
+	}
+    
+}
+else{
+    
+	if (rmGetIsFFA()) {
+		if (cNumberNonGaiaPlayers==3) {
+			rmPlacePlayer(1, 0.75, 0.7); 
+			rmPlacePlayer(2, 0.2, 0.7); 
+			rmPlacePlayer(3, 0.5, 0.1);
+		}
+		else {
+			rmPlacePlayer(1, 0.75, 0.7); 
+			rmPlacePlayer(2, 0.1, 0.4); 
+			rmPlacePlayer(3, 0.5, 0.1); 
+			rmPlacePlayer(6, 0.5, 0.5); 
+			rmPlacePlayersLine(0.3, 0.8, 0.8, 0.3, 0.0, 0.0); 
+		}
+	}
+	else if (cNumberNonGaiaPlayers==2){
+		if (pSwitch < 0.55) {
+			rmPlacePlayer(1, 0.45, 0.88);
+			rmPlacePlayer(2, 0.46, 0.12);	// correction for the weird unequal placement, given symmetrical coords		// Solved
+		}
+		else {
+			rmPlacePlayer(1, 0.46, 0.12);	// 
+			rmPlacePlayer(2, 0.45, 0.88);	 
+		}		
+	}
+	else {
+		if (pSwitch < 0.55) {
+			rmSetPlacementSection(0.9, 0.07);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.4, 0.4, 0);
+
+			rmSetPlacementSection(0.43, 0.6);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.4, 0.4, 0); 
+		}
+		else {
+			rmSetPlacementSection(0.43, 0.6);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersCircular(0.4, 0.4, 0);
+			rmSetPlacementSection(0.9, 0.07);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersCircular(0.4, 0.4, 0); 
+		}
+	}
+}
+
+// Players starting units and resources
+
+int TCvsWater = rmCreateTerrainDistanceConstraint("TC vs water", "Land", false, 15.0);
+
+	int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(playerStart, 7.0);
+	rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+
+	int startID = rmCreateObjectDef("starting object"); 
+	rmAddObjectDefItem(startID, "TownCenter", 1, 0.0); 
+	rmAddObjectDefToClass(startID, rmClassID("startingUnit")); 
+	rmSetObjectDefMinDistance(startID, 0.0); 
+	if (cNumberNonGaiaPlayers==2) {
+		rmSetObjectDefMaxDistance(startID, 1.0); 
+	}
+	else if (cNumberNonGaiaPlayers>2 && cNumberNonGaiaPlayers<7) {
+		rmSetObjectDefMaxDistance(startID, 5.0); 		
+		rmAddObjectDefConstraint(startID, avoidImpassableLand);
+	}
+    else {
+        rmSetObjectDefMaxDistance(startID, 20.0);
+    }
+	rmAddObjectDefConstraint(startID, TCvsWater);
+//	rmAddObjectDefConstraint(startID, avoidImpassableLand);
+
+	int berryID = rmCreateObjectDef("starting berries"); 
+	rmAddObjectDefItem(berryID, "BerryBush", 3, 4.0); 
+	rmSetObjectDefMinDistance(berryID, 6.0); 
+	rmSetObjectDefMaxDistance(berryID, 10.0); 
+	rmAddObjectDefConstraint(berryID, avoidCoin);
+	rmAddObjectDefConstraint(berryID, avoidWater);
+	rmAddObjectDefConstraint(berryID, avoidImpassableShort);
+
+	int treeID = rmCreateObjectDef("starting trees"); 
+	rmAddObjectDefItem(treeID, "ypTreeBorneo", rmRandInt(8,12), 10.0); 
+	rmSetObjectDefMinDistance(treeID, 12.0); 
+	rmSetObjectDefMaxDistance(treeID, 18.0);
+	rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(treeID, avoidCoin);
+//	rmAddObjectDefConstraint(treeID, avoidWater);
+
+	int foodID = rmCreateObjectDef("starting hunt"); 
+	rmAddObjectDefItem(foodID, "rhea", 6, 8.0); 
+	rmSetObjectDefMinDistance(foodID, 2.0); 
+	rmSetObjectDefMaxDistance(foodID, 7.0); 
+	rmSetObjectDefCreateHerd(foodID, true);
+
+	int startnuggetID= rmCreateObjectDef("starting nugget"); 
+	rmAddObjectDefItem(startnuggetID, "Nugget", 1, 0.0); 
+	rmSetObjectDefMinDistance(startnuggetID, 15.0); 
+	rmSetObjectDefMaxDistance(startnuggetID, 20.0);
+	rmAddObjectDefConstraint(startnuggetID, avoidWater);
+	rmAddObjectDefConstraint(startnuggetID, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(startnuggetID, avoidImpassableShort);
+	rmSetNuggetDifficulty(1, 1); 
+
+    int top2=rmCreateArea("top layer 2");
+	rmSetAreaSize(top2, 0.80, 0.80); 
+	rmSetAreaTerrainType(top2, "borneo\ground_grass1_borneo");
+	rmSetAreaElevationNoiseBias(top2, 1);
+	rmSetAreaElevationEdgeFalloffDist(top2, 3);
+	rmSetAreaElevationVariation(top2, 2);
+	rmSetAreaElevationPersistence(top2, 0.3);
+	rmSetAreaElevationOctaves(top2, 4);
+	rmSetAreaElevationMinFrequency(top2, 0.05);
+	rmSetAreaElevationType(top2, cElevTurbulence);
+	rmBuildArea(top2);
+    
+
+// Natives
+	
+if (rmGetIsFFA()==false){
+
+if (diceThrow<0.0){	
+      
+	// Natives areas
+
+	int tupiIsland=rmCreateArea("land base for tupi village");
+	rmSetAreaSize(tupiIsland, 0.017, 0.017); 
+	rmSetAreaBaseHeight(tupiIsland, 2.0);
+
+	if (cNumberNonGaiaPlayers == 2)
+		rmSetAreaLocation(tupiIsland, 0.7, 0.3);
+	else if (cNumberNonGaiaPlayers > 2 && cNumberNonGaiaPlayers < 6)
+		rmSetAreaLocation(tupiIsland, 0.6, 0.2);
+	else 
+		rmSetAreaLocation(tupiIsland, 0.6, 0.15);
+	rmSetAreaTerrainType(tupiIsland, "borneo\ground_grass2_borneo"); 
+	rmSetAreaCoherence(tupiIsland, 1.0); 
+	rmBuildArea(tupiIsland);
+
+	int seminoleIsland=rmCreateArea("land base for seminole village");
+	rmSetAreaSize(seminoleIsland, 0.017, 0.017); 
+	rmSetAreaBaseHeight(seminoleIsland, 2.0);
+
+	if (cNumberNonGaiaPlayers == 2)
+		rmSetAreaLocation(seminoleIsland, 0.3, 0.7);
+	else if (cNumberNonGaiaPlayers > 2 && cNumberNonGaiaPlayers < 6)
+		rmSetAreaLocation(seminoleIsland, 0.4, 0.8);
+	else
+		rmSetAreaLocation(seminoleIsland, 0.4, 0.85);
+
+	rmSetAreaTerrainType(seminoleIsland, "borneo\ground_grass2_borneo"); 
+	rmSetAreaCoherence(seminoleIsland, 1.0); 
+	rmBuildArea(seminoleIsland);
+            
+	int avoidTupiArea = rmCreateAreaDistanceConstraint("avoid tupi village area", tupiIsland, 5.0);
+	int avoidSeminoleArea = rmCreateAreaDistanceConstraint("avoid seminole village area", seminoleIsland, 5.0);
+                
+}
+}
+
+	string nativeType = "";
+
+	if (IsYP()) {
+		rmAllocateSubCivs(2); 
+		rmSetSubCiv(0, "Caribs");
+		rmSetSubCiv(1, "Jesuit");
+		nativeType = "uger";
+	}
+	else {  
+		rmAllocateSubCivs(2); 
+		rmSetSubCiv(0, "Caribs");
+		rmSetSubCiv(1, "Maya");
+		nativeType = "uger";
+	}
+	
+	int tupiVillageID = rmCreateGrouping("edge carib village", "uger"+rmRandInt(1,4));
+	rmSetGroupingMinDistance(tupiVillageID, 0.0);
+	rmSetGroupingMaxDistance(tupiVillageID, 10.0);
+	//rmAddGroupingToClass(tupiVillageID, rmClassID("natives"));
+	//rmAddGroupingToClass(tupiVillageID, rmClassID("importantItem"));
+	//rmAddGroupingConstraint(tupiVillageID, avoidImpassableShort);
+
+	if (rmGetIsFFA()==false){
+		if (cNumberNonGaiaPlayers==2){
+			if (diceThrow < 0.0) {
+				rmPlaceGroupingInArea(tupiVillageID, 0, tupiIsland, 1);
+				//rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.7, 0.3, 1);
+			}
+			else {
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.65, 0.9);
+				rmAddGroupingConstraint(tupiVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.5, 0.56);
+			}
+		}
+		else {
+			if (diceThrow < 0.0) {
+				rmPlaceGroupingInArea(tupiVillageID, 0, tupiIsland, 1);
+				//rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.65, 0.4);
+			}
+			else {
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.8, 0.85);
+				rmAddGroupingConstraint(tupiVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.5, 0.57);
+			}
+		}
+	}
+
+	int seminoleVillageID = rmCreateGrouping("edge native village", nativeType+rmRandInt(1,4));
+	rmSetGroupingMinDistance(seminoleVillageID, 0.0);
+	rmSetGroupingMaxDistance(seminoleVillageID, 10.0);
+	//rmAddGroupingToClass(seminoleVillageID, rmClassID("natives"));
+	//rmAddGroupingToClass(seminoleVillageID, rmClassID("importantItem"));
+	//rmAddGroupingConstraint(seminoleVillageID, avoidImpassableShort);
+
+	if (rmGetIsFFA()==false){
+		if (cNumberNonGaiaPlayers==2){
+			if (diceThrow < 0.0) {
+				//rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.14, 0.6);
+				rmPlaceGroupingInArea(seminoleVillageID, 0, seminoleIsland, 1);
+			}
+			else {
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.65, 0.1);
+				rmAddGroupingConstraint(seminoleVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.20, 0.55);
+			}
+		}
+		else {
+			if (diceThrow < 0.0) {
+				rmPlaceGroupingInArea(seminoleVillageID, 0, seminoleIsland, 1);
+				//rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.14, 0.6);
+			}
+			else {
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.75, 0.15);	// Not returning bool
+				rmAddGroupingConstraint(seminoleVillageID, avoidTradeRouteSmall);
+				rmPlaceGroupingAtLoc(seminoleVillageID, 0, 0.15, 0.55);
+			}
+		}
+	}
+
+rmSetStatusText("", 0.3);
+
+	for(i=1; <cNumberPlayers) { 
+		int id=rmCreateArea("Player"+i); 
+		rmSetPlayerArea(i, id); 
+		rmSetAreaSize(id, rmAreaTilesToFraction(900), rmAreaTilesToFraction(900)); 
+        rmSetAreaTerrainType(id, "borneo\ground_grass1_borneo");
+        rmAddAreaToClass(id, classPlayer); 
+
+			if (rmGetIsFFA()==false){ 
+				rmSetAreaBaseHeight(id, 1.0);
+				rmSetAreaElevationNoiseBias(id, 0);
+				rmSetAreaElevationEdgeFalloffDist(id, 3);
+				rmSetAreaElevationVariation(id, 3);
+				rmSetAreaElevationPersistence(id, 0.3);
+				rmSetAreaElevationOctaves(id, 5);
+				rmSetAreaElevationMinFrequency(id, 0.04);
+				rmSetAreaElevationType(id, cElevTurbulence);
+				rmSetAreaCoherence(id, 0.75); 
+				rmAddAreaConstraint(id, playerConstraint); 
+				rmAddAreaConstraint(id, playerEdgeConstraint); 
+				rmSetAreaLocPlayer(id, i); 
+				if (diceThrow<0.0){ 
+					rmBuildArea(id); 
+				}
+			}
+			else {
+				rmSetAreaBaseHeight(id, 1.0);
+				rmSetAreaElevationVariation(id, 2);
+				rmSetAreaElevationNoiseBias(id, 0);
+				rmSetAreaElevationEdgeFalloffDist(id, 3);
+				rmSetAreaElevationOctaves(id, 4);
+				rmSetAreaElevationMinFrequency(id, 0.05);
+				rmAddAreaToClass(id, rmClassID("deltaIsland"));
+				rmAddAreaConstraint(id, avoidIslet);
+				rmAddAreaConstraint(id, islandConstraintSmall);
+				rmSetAreaCoherence(id, 0.5);
+				rmSetAreaLocPlayer(id, i); 
+				rmBuildArea(id); 
+			}
+
+		rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	}
+
+rmSetStatusText("", 0.4);
+
+	
+
+if (rmGetIsFFA()==false) {
+	if (diceThrow < 0.0) {
+
+    // Dem eagles, mon'
+
+	int avoidRocks = rmCreateTypeDistanceConstraint("eagles avoid eagles", "PropEaglesRocks", 50);
+//	int eagleWaterConstraint = rmCreateTerrainDistanceConstraint("avoid land short", "Land", true, -1.0);	
+
+	//for(i=0;<(20*cNumberNonGaiaPlayers)){
+		int eagleRocks = rmCreateObjectDef("eagle rocks");
+		rmAddObjectDefItem(eagleRocks, "PropEaglesRocks", 1, 0.0);
+		rmSetObjectDefMinDistance(eagleRocks, 0);
+		rmSetObjectDefMaxDistance(eagleRocks, rmXFractionToMeters(0.5));
+	//	rmAddObjectDefConstraint(eagleRocks, avoidImportantItem);
+	// 	rmAddObjectDefConstraint(eagleRocks, playerConstraint);
+		rmAddObjectDefConstraint(eagleRocks, circleConstraint);
+	// 	rmAddObjectDefConstraint(eagleRocks, eagleWaterConstraint);
+		rmAddObjectDefConstraint(eagleRocks, avoidRocks);
+	// 	rmAddObjectDefConstraint(eagleRocks, avoidCoin);
+	//	rmAddObjectDefConstraint(eagleRocks, avoidImpassableShort);
+	// 	rmAddObjectDefConstraint(eagleRocks, avoidCliff);
+		rmPlaceObjectDefAtLoc(eagleRocks, 0, 0.5, 0.5, 40*cNumberNonGaiaPlayers);
+	//	rmPlaceObjectDefInArea(eagleRocks, 0, pool, 1);
+	//}
+
+    
+    // Build the "noisy" land base
+
+	float Float1=0.00; 
+	float Float2=0.00; 
+	float Float3=0.00; 
+	float Float4=0.00; 
+	float Float5=0.00; 
+	int Int1=0; 
+	int Int2=0; 
+	int Int3=0; 
+	int Int4=0;
+
+		for(Float1=1; <=10){
+			for(Float2=1; <=10){
+				Int1=rmRandInt(1,3);
+				Int2=rmRandInt(1,2);
+				Int3=rmRandInt(1,2);
+				if(Int1==1) Float3=0.006;
+				if(Int1==2) Float3=0.011;
+				if(Int1==3) Float3=0.021;
+				if(Int2==1) Float4=0.015;
+				if(Int2==2) Float4=-0.015;
+				if(Int3==1) Float5=0.015;
+				if(Int3==2) Float5=-0.015;
+				Area(Float3, Float1/10, Float2/10, "borneo\ground_grass1_borneo");						
+				rmAddAreaToClass(landnoise, classBase);
+				rmAddAreaRemoveType(landnoise, "PropEaglesRocks");
+				rmBuildArea(landnoise);
+				Area(Float3, (Float1/10)+Float4, (Float2/10)+Float5, "borneo\ground_grass2_borneo");	// The compiler doesn't like this (float -> int index variable -> float)
+				rmAddAreaRemoveType(landnoise, "PropEaglesRocks");
+				rmBuildArea(landnoise);
+			}
+		}
+
+	// Some cliffs
+	
+	for (i=0; <26) {
+		int cliffs=rmCreateArea("cliff"+i); 
+		rmSetAreaSize(cliffs, 0.001, 0.0016); 
+		rmAddAreaToClass(cliffs, rmClassID("classCliff"));
+		rmSetAreaCliffType(cliffs, "uger"); // Cave
+		rmSetAreaCliffHeight(cliffs, 10.0, 0.0, 0.5); 
+		rmSetAreaCliffEdge(cliffs, 1, 2.0, 0.0, 0.0, 0); 
+		rmSetAreaTerrainType(cliffs, "borneo\ground_grass2_borneo"); 
+		rmSetAreaCliffPainting(cliffs, true, true, true, 0, true); 
+	//	rmAddAreaTerrainReplacement(cliffs, "cave\cave_top", "amazon\ground2_ama");
+		rmSetAreaMinBlobs(cliffs, 1); 
+		rmSetAreaMaxBlobs(cliffs, 1); 
+		rmSetAreaCoherence(cliffs, 0.5); 
+		rmAddAreaConstraint(cliffs, avoidTownCenter);
+		rmAddAreaConstraint(cliffs, avoidTupiArea);
+		rmAddAreaConstraint(cliffs, avoidSeminoleArea);
+		rmAddAreaConstraint(cliffs, cliffConstraint);
+		rmBuildArea(cliffs);
+	}
+       
+    // Layer on top of the noise land base
+
+		int top=rmCreateArea("top layer");
+		rmSetAreaSize(top, 0.80, 0.80); 
+		rmSetAreaTerrainType(top, "borneo\ground_grass1_borneo");
+		rmSetAreaElevationNoiseBias(top, 1);
+		rmSetAreaElevationEdgeFalloffDist(top, 3);
+		rmSetAreaElevationVariation(top, 2);
+		rmSetAreaElevationPersistence(top, 0.3);
+		rmSetAreaElevationOctaves(top, 4);
+		rmSetAreaElevationMinFrequency(top, 0.05);
+		rmSetAreaElevationType(top, cElevTurbulence);
+		rmBuildArea(top);		
+	}
+}
+ 
+rmSetStatusText("", 0.5);
+ 
+// Player gold
+
+	int goldID = rmCreateObjectDef("starting gold"); 
+	rmAddObjectDefItem(goldID, "mine", 1, 0.0); 
+	rmSetObjectDefMinDistance(goldID, 0.0); 
+	rmSetObjectDefMaxDistance(goldID, 8.0); 
+//	rmAddObjectDefConstraint(goldID, avoidWaterShort);
+//	rmAddObjectDefConstraint(goldID, avoidImpassableShort);
+
+		if (cNumberNonGaiaPlayers==2){
+			//rmSetIgnoreForceToGaia(true);
+			int positionSwitch = rmRandInt(1,2);
+			vector locTC1 = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startID, 1));
+   			vector locTC2 = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startID, 2));
+   		       	
+			if (positionSwitch == 1) {
+		       		rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC1)), rmZMetersToFraction((xsVectorGetZ(locTC1))-5));
+       	   	         		rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC2)), rmZMetersToFraction((xsVectorGetZ(locTC2))+5));
+       	   	         	}
+       	   	         	else {
+           	   	         		rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC1)), rmZMetersToFraction((xsVectorGetZ(locTC1))+5));
+ 			        	rmPlaceObjectDefAtLoc(goldID, 0, rmXMetersToFraction(xsVectorGetX(locTC2)), rmZMetersToFraction((xsVectorGetZ(locTC2))-5));
+       	   	           	} 
+       	   	}
+		else {
+
+			for(i=1; <cNumberPlayers) { 		
+				int placed = rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+				if (placed==0) {
+					int gold2ID = rmCreateObjectDef("starting gold 2"+i); 
+					rmAddObjectDefItem(gold2ID, "mine", 1, 0.0); 
+					rmSetObjectDefMinDistance(gold2ID, 0.0); 
+					rmSetObjectDefMaxDistance(gold2ID, 15.0); 
+					int placed2 = rmPlaceObjectDefAtLoc(gold2ID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+				}
+			
+			// 	int t = rmCreateTrigger("Obj Def Placement Check"+i);
+		    //	rmSwitchToTrigger(t);
+		    //	rmAddTriggerCondition("Always");
+		    //	rmAddTriggerEffect("Send Chat As String");
+		    //	rmSetTriggerEffectParamInt("PlayerID", 0);
+		    //	rmSetTriggerEffectParam("Message", "Player"+i+"'s starting mine="+placed); 
+			//  rmSetTriggerEffectParam("Message", "Player"+i+"'s starting mine="+placed2);
+			}
+		}
+
+	for(i=1; <cNumberPlayers) { 
+		rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+		rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+		rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));	
+		rmPlaceObjectDefAtLoc(startnuggetID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	}
+
+
+rmSetStatusText("", 0.6);
+
+if (rmGetIsFFA()==true){
+
+	int islandCounter = 0;
+	int avoidLand2 = rmCreateTerrainDistanceConstraint("avoid land 2", "Water", false, 2.0);
+
+    
+//	for (i=0;<(80*cNumberNonGaiaPlayers)) {	
+		int waterWeed2 = rmCreateObjectDef("water weed 2");
+		rmAddObjectDefItem(waterWeed2, "UnderbrushLake", 1, 10.0);
+		rmSetObjectDefMinDistance(waterWeed2, 0);
+		rmSetObjectDefMaxDistance(waterWeed2, rmXFractionToMeters(0.5));
+  		rmAddObjectDefConstraint(waterWeed2, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(waterWeed2, avoidWaterPlants);
+  		rmAddObjectDefConstraint(waterWeed2, waterConstraint);
+	  	//rmAddObjectDefConstraint(waterWeed2, avoidLand2);
+  		//rmAddObjectDefConstraint(waterWeed2, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(waterWeed2, 0, 0.5, 0.5, 50);
+//	}
+
+	int wildChance2 = -1;
+
+    for (i=0;<(4*cNumberNonGaiaPlayers)) {
+		int phloat2 = rmCreateObjectDef("phloat 2"+i);
+		wildChance2 = rmRandInt(0,3);
+		switch(wildChance2) {				
+			case 0: rmAddObjectDefItem(phloat2, "PropTurtles", 1, 0.0);
+			case 1: rmAddObjectDefItem(phloat2, "PropSwan", 1, 0.0);
+			case 2: rmAddObjectDefItem(phloat2, "PropFish", 1, 0.0);
+			case 3: rmAddObjectDefItem(phloat2, "DuckFamily", 1, 0.0);
+		}
+		rmSetObjectDefMinDistance(phloat2, 0);
+		rmSetObjectDefMaxDistance(phloat2, rmXFractionToMeters(0.5));
+	  	rmAddObjectDefConstraint(phloat2, avoidEdgeMore);
+	  	rmAddObjectDefConstraint(phloat2, avoidWaterPlants);
+	  	rmAddObjectDefConstraint(phloat2, waterConstraint);
+	// 	rmAddObjectDefConstraint(phloat2, avoidLand2);
+	// 	rmAddObjectDefConstraint(phloat2, avoidImpassableShort);
+		rmPlaceObjectDefAtLoc(phloat2, 0, 0.5, 0.5, 1);
+	}	
+
+	   // Two trade islands at opposite ends of map (the location is randomly chosen)
+	int bonusSwitch = rmRandInt(1,3);
+		switch(bonusSwitch) {											// area locX		// area locZ		// xFrac1			// zFrac1				// xFrac2			// zFrac2
+			case 1: { 	
+				int bonusIslandID11= buildTradeArea("bonus island 11", getLocX(0.47, 0.47, 0), getLocZ(0.47, 0.47, 0), getLocX(0.47, 0.47, 0), (getLocZ(0.47, 0.47, 0)-0.2), getLocX(0.47, 0.47, 0), (getLocZ(0.47, 0.47, 0)+0.2), "socket1"); // 0.940000,0.470000  
+				int bonusIslandID12= buildTradeArea("bonus island 12", getLocX(0.47, 0.47, 180), 	getLocZ(0.47, 0.47, 180), getLocX(0.47, 0.47, 180), (getLocZ(0.47, 0.47, 180)-0.2), getLocX(0.47, 0.47, 180), (getLocZ(0.47, 0.47, 180)+0.2),	"socket2"); // 0.004704,0.536326  
+			}	
+			case 2: {
+				int bonusIslandID21= buildTradeArea("bonus island 21", getLocX(0.47, 0.47, 300), 	getLocZ(0.47, 0.47, 300), (getLocX(0.47, 0.47, 300)-0.2), (getLocZ(0.47, 0.47, 300)), 	(getLocX(0.47, 0.47, 300)+0.2), getLocZ(0.47, 0.47, 300), "socket1"); // 0.603321,0.019305  
+				int bonusIslandID22= buildTradeArea("bonus island 22", getLocX(0.47, 0.47, 120), 	getLocZ(0.47, 0.47, 120), (getLocX(0.47, 0.47, 120)-0.2), (getLocZ(0.47, 0.47, 120)+0.05), (getLocX(0.48, 0.48, 120)+0.4), (getLocZ(0.48, 0.48, 120)+0.05), "socket2"); // 0.274411,0.897370    
+			}	
+			case 3: {
+				int bonusIslandID31= buildTradeArea("bonus island 31", getLocX(0.47, 0.47, 240), 	getLocZ(0.47, 0.47, 240), (getLocX(0.47, 0.47, 240)+0.2), (getLocZ(0.47, 0.47, 240)-0.1), (getLocX(0.47, 0.47, 240)-0.1), (getLocZ(0.47, 0.47, 240)+0.2), "socket1"); // 0.162788,0.114303   
+				int bonusIslandID32= buildTradeArea("bonus island 32", getLocX(0.47, 0.47, 60), 	getLocZ(0.47, 0.47, 60), (getLocX(0.47, 0.47, 60)+0.2), (getLocZ(0.47, 0.47, 60)-0.2), (getLocX(0.47, 0.47, 60)-0.2), (getLocZ(0.47, 0.47, 60)+0.2), "socket2"); // 0.723942,0.865491  
+			}	
+		}
+	
+	// Complete the delta with extra islands
+	for (i=0; <18) {
+		int deltaIsletID = rmCreateArea("bonus islands"+i);
+		rmAddAreaToClass(deltaIsletID, rmClassID("deltaIsland"));
+	//	rmSetAreaMix(deltaIsletID, "yucatan_grass");
+		rmSetAreaTerrainType(deltaIsletID, "borneo\ground_grass1_borneo");
+		rmSetAreaSize(deltaIsletID, 0.025, 0.035);
+		rmSetAreaCoherence(deltaIsletID, 0.75);
+		rmSetAreaBaseHeight(deltaIsletID, -1.5);
+		//rmSetAreaMinBlobs(deltaIsletID, 6);
+		//rmSetAreaMaxBlobs(deltaIsletID, 12);
+		//rmSetAreaMinBlobDistance(deltaIsletID, 8.0);
+		//rmSetAreaMaxBlobDistance(deltaIsletID, 10.0);
+		rmSetAreaSmoothDistance(deltaIsletID, 12);
+		rmSetAreaElevationType(deltaIsletID, cElevTurbulence);
+		rmSetAreaElevationVariation(deltaIsletID, 5.0);
+		rmSetAreaElevationMinFrequency(deltaIsletID, 0.04);
+		rmSetAreaElevationOctaves(deltaIsletID, 4);
+		rmSetAreaElevationPersistence(deltaIsletID, 0.5);
+		rmSetAreaElevationNoiseBias(deltaIsletID, 1);
+		rmAddAreaConstraint(deltaIsletID, avoidIslet);
+		rmAddAreaConstraint(deltaIsletID, islandConstraintSmall);
+		rmAddAreaConstraint(deltaIsletID, islandEdgeConstraint);
+		//rmSetAreaEdgeFilling(deltaIsletID, 1);
+		rmAddAreaConstraint(deltaIsletID, avoidSmallIslands);
+		rmAddAreaRemoveType(deltaIsletID, "UnderbrushLake");
+		bool ok = rmBuildArea(deltaIsletID);
+			if(ok){
+				islandCounter++;
+				if ((islandCounter%4)==0){
+					rmSetGroupingMaxDistance(tupiVillageID, 15.0);
+					rmAddGroupingConstraint(tupiVillageID, islandEdgeConstraint);
+					rmPlaceGroupingInArea(tupiVillageID, 0, deltaIsletID, 1);
+				}
+				if ((islandCounter%5)==0) {
+					rmSetGroupingMaxDistance(tupiVillageID, 15.0);
+					rmAddGroupingConstraint(seminoleVillageID, islandEdgeConstraint);
+					rmPlaceGroupingInArea(seminoleVillageID, 0, deltaIsletID, 1);		
+				}
+			}
+	}
+}
+
+
+// Resources
+
+int avoidCoinFar=0;
+	if (cNumberNonGaiaPlayers == 2) avoidCoinFar=rmCreateTypeDistanceConstraint("avoid coin far for less players", "Mine", 50.0);
+	else avoidCoinFar=rmCreateTypeDistanceConstraint("avoid coin far", "Mine", 60.0);
+int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 5.0);
+int MineVSWaterMed = rmCreateTerrainDistanceConstraint("mine avoid water medium", "Land", false, 12.0);	
+int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);
+int NorthPie=rmCreatePieConstraint("Stay North",0.5,0.5,0,rmXFractionToMeters(0.48), rmDegreesToRadians(320),rmDegreesToRadians(140)); 	
+int SouthPie=rmCreatePieConstraint("Stay South",0.5,0.5,0,rmXFractionToMeters(0.48), rmDegreesToRadians(140),rmDegreesToRadians(320));
+
+// Silver mines
+
+if (rmGetIsFFA()==false) {
+
+// Coastal variation
+	if (diceThrow<0.0){
+		int playerSilverID = rmCreateObjectDef("player silver");
+		rmAddObjectDefItem(playerSilverID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilverID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilverID, rmXFractionToMeters(0.35));
+		rmAddObjectDefConstraint(playerSilverID, avoidCoinMed);
+		//rmAddObjectDefConstraint(playerSilverID, avoidNatives);
+		rmAddObjectDefConstraint(playerSilverID, avoidTownCenterMore);
+		rmAddObjectDefConstraint(playerSilverID, NorthPie);
+		rmAddObjectDefConstraint(playerSilverID, avoidCliff);
+		//rmAddObjectDefConstraint(playerSilverID, avoidSocket);
+		//rmAddObjectDefConstraint(playerSilverID, AvoidWaterShort2);
+		//rmAddObjectDefConstraint(playerSilverID, forestConstraintShort);
+		//rmAddObjectDefConstraint(playerSilverID, circleConstraint);
+		rmPlaceObjectDefAtLoc(playerSilverID, 0, 0.75, 0.5, cNumberNonGaiaPlayers+2);
+			
+		int playerSilver2ID = rmCreateObjectDef("player silver 2");
+		rmAddObjectDefItem(playerSilver2ID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilver2ID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilver2ID, rmXFractionToMeters(0.35));
+		rmAddObjectDefConstraint(playerSilver2ID, avoidCoinMed);
+		//rmAddObjectDefConstraint(playerSilver2ID, avoidNatives);
+		rmAddObjectDefConstraint(playerSilver2ID, avoidTownCenterMore);
+		rmAddObjectDefConstraint(playerSilver2ID, SouthPie);
+		rmAddObjectDefConstraint(playerSilver2ID, avoidCliff);
+		//rmAddObjectDefConstraint(playerSilver2ID, avoidSocket);
+		rmAddObjectDefConstraint(playerSilver2ID, AvoidWaterShort2);
+		//rmAddObjectDefConstraint(playerSilver2ID, forestConstraintShort);
+		//rmAddObjectDefConstraint(playerSilver2ID, circleConstraint);
+		rmPlaceObjectDefAtLoc(playerSilver2ID, 0, 0.25, 0.5, cNumberNonGaiaPlayers+2);
+	}
+
+// Trade route variation
+	else {
+	
+		int avoidMineMed=rmCreateTypeDistanceConstraint("avoid mines medium", "Mine", 58.0);
+	
+		int playerSilverNorthID = rmCreateObjectDef("player silver north");
+		rmAddObjectDefItem(playerSilverNorthID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilverNorthID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilverNorthID, rmXFractionToMeters(0.18));
+		rmAddObjectDefConstraint(playerSilverNorthID, avoidMineMed);
+		//rmAddObjectDefConstraint(playerSilverNorthID, avoidNatives);
+		//rmAddObjectDefConstraint(playerSilverNorthID, avoidTownCenterMore);
+		rmAddObjectDefConstraint(playerSilverNorthID, MineVSWaterMed);
+		//rmAddObjectDefConstraint(playerSilverNorthID, forestConstraintShort);
+		rmAddObjectDefConstraint(playerSilverNorthID, circleConstraint);
+		if (cNumberNonGaiaPlayers==2)
+			rmPlaceObjectDefInArea(playerSilverNorthID, 0, plateauNorthID, cNumberNonGaiaPlayers);
+		else
+			rmPlaceObjectDefInArea(playerSilverNorthID, 0, plateauNorthID, cNumberNonGaiaPlayers/2);
+		
+		int playerSilverSouthID = rmCreateObjectDef("player silver south");
+		rmAddObjectDefItem(playerSilverSouthID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(playerSilverSouthID, 0.0);
+		rmSetObjectDefMaxDistance(playerSilverSouthID, rmXFractionToMeters(0.18));
+		rmAddObjectDefConstraint(playerSilverSouthID, avoidMineMed);
+		//rmAddObjectDefConstraint(playerSilverSouthID, avoidNatives);
+		//rmAddObjectDefConstraint(playerSilverSouthID, avoidTownCenterMore);
+		//rmAddObjectDefConstraint(playerSilverSouthID, avoidSocket);
+		rmAddObjectDefConstraint(playerSilverSouthID, MineVSWaterMed);
+		//rmAddObjectDefConstraint(playerSilverSouthID, forestConstraintShort);
+		rmAddObjectDefConstraint(playerSilverSouthID, circleConstraint);
+		if (cNumberNonGaiaPlayers==2)
+			rmPlaceObjectDefInArea(playerSilverSouthID, 0, plateauSouthID, cNumberNonGaiaPlayers);
+		else
+			rmPlaceObjectDefInArea(playerSilverSouthID, 0, plateauSouthID, cNumberNonGaiaPlayers/2);
+
+		int centralBox = rmCreateBoxConstraint("keep in the central box", 0.05, 0.3, 0.95, 0.7, 0.0);
+		int avoidMineMed2=rmCreateTypeDistanceConstraint("avoid mines medium 2", "Mine", 47.0);
+				
+		int silverCentralPlateauID = rmCreateObjectDef("central plateau silver");
+		rmAddObjectDefItem(silverCentralPlateauID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(silverCentralPlateauID, 0.0);
+		rmSetObjectDefMaxDistance(silverCentralPlateauID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(silverCentralPlateauID, avoidMineMed2);
+		rmAddObjectDefConstraint(silverCentralPlateauID, avoidNatives);
+		rmAddObjectDefConstraint(silverCentralPlateauID, centralBox);
+		rmAddObjectDefConstraint(silverCentralPlateauID, MineVSWaterMed);
+		rmAddObjectDefConstraint(silverCentralPlateauID, avoidSocket);
+		rmAddObjectDefConstraint(silverCentralPlateauID, circleConstraint);
+		if (cNumberNonGaiaPlayers==2){
+			rmAddObjectDefConstraint(silverCentralPlateauID, avoidMineMed2);
+			rmPlaceObjectDefAtLoc(silverCentralPlateauID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+		}
+		else if (cNumberNonGaiaPlayers<5){
+			rmAddObjectDefConstraint(silverCentralPlateauID, avoidMineMed2);
+			rmPlaceObjectDefAtLoc(silverCentralPlateauID, 0, 0.5, 0.5, 2*cNumberNonGaiaPlayers);	
+		}
+		else{
+			rmAddObjectDefConstraint(silverCentralPlateauID, avoidCoinMed);
+			rmPlaceObjectDefAtLoc(silverCentralPlateauID, 0, 0.5, 0.5, cNumberNonGaiaPlayers+4);	
+		}
+	}	
+}
+else{
+// FFA
+		int islandminesID = rmCreateObjectDef("island silver");
+		rmAddObjectDefItem(islandminesID, "mine", 1, 0.0);
+		rmSetObjectDefMinDistance(islandminesID, 0.0);
+		rmSetObjectDefMaxDistance(islandminesID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(islandminesID, avoidCoinMed);
+		rmAddObjectDefConstraint(islandminesID, avoidNatives);
+		rmAddObjectDefConstraint(islandminesID, avoidTownCenterMore);
+		//rmAddObjectDefConstraint(islandminesID, avoidSocket);
+		rmAddObjectDefConstraint(islandminesID, AvoidWaterShort2);
+		//rmAddObjectDefConstraint(islandminesID, forestConstraintShort);
+		rmAddObjectDefConstraint(islandminesID, circleConstraint);
+		rmPlaceObjectDefAtLoc(islandminesID, 0, 0.5, 0.5, (2*cNumberNonGaiaPlayers+rmRandInt(2,3)));
+}	
+
+rmSetStatusText("", 0.7);
+
+// Trees
+
+	for (j=0; < (10*cNumberNonGaiaPlayers)) {   
+		int StartAreaTree2ID=rmCreateObjectDef("starting trees dirt"+j);
+		rmAddObjectDefItem(StartAreaTree2ID, "ypTreeBorneo", rmRandInt(8,12), 16.0);
+		rmAddObjectDefItem(StartAreaTree2ID, "ypTreeBorneo", rmRandInt(3,6), 12.0);
+		rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest")); 
+		rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+		rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRoute);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocket);
+		rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenter);	
+		rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);	
+		rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 10*cNumberNonGaiaPlayers);
+	}
+
+	
+// Huntables
+
+	int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 40.0);
+	
+if (rmGetIsFFA()==false) {
+
+// Coastal variation
+	if (diceThrow<0.0){
+	int rhea1ID = rmCreateObjectDef("rhea group 1");
+	rmAddObjectDefItem(rhea1ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea1ID, true);
+	rmSetObjectDefMinDistance(rhea1ID, 0);
+	rmSetObjectDefMaxDistance(rhea1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea1ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rhea1ID, avoidHunt);
+	rmAddObjectDefConstraint(rhea1ID, avoidCliff);
+	rmAddObjectDefConstraint(rhea1ID, NorthPie);
+	
+	int antelope1ID = rmCreateObjectDef("antelope group 1");
+	rmAddObjectDefItem(antelope1ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope1ID, true);
+	rmSetObjectDefMinDistance(antelope1ID, 0);
+	rmSetObjectDefMaxDistance(antelope1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope1ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelope1ID, avoidHunt);
+	rmAddObjectDefConstraint(antelope1ID, avoidCliff);
+	rmAddObjectDefConstraint(antelope1ID, NorthPie);
+
+	int tapir1ID = rmCreateObjectDef("tapir herd 1");
+	rmAddObjectDefItem(tapir1ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir1ID, true);
+	rmSetObjectDefMinDistance(tapir1ID, 0);
+	rmSetObjectDefMaxDistance(tapir1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir1ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapir1ID, avoidHunt);
+	rmAddObjectDefConstraint(tapir1ID, avoidCliff);	
+	rmAddObjectDefConstraint(tapir1ID, NorthPie);
+
+	int moose1ID = rmCreateObjectDef("moose group 1");
+	rmAddObjectDefItem(moose1ID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose1ID, true);
+	rmSetObjectDefMinDistance(moose1ID, 0);
+	rmSetObjectDefMaxDistance(moose1ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose1ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(moose1ID, avoidHunt);
+	rmAddObjectDefConstraint(moose1ID, avoidCliff);
+	rmAddObjectDefConstraint(moose1ID, NorthPie);
+	
+	int rhea2ID = rmCreateObjectDef("rhea group 2");
+	rmAddObjectDefItem(rhea2ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea2ID, true);
+	rmSetObjectDefMinDistance(rhea2ID, 0);
+	rmSetObjectDefMaxDistance(rhea2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea2ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(rhea2ID, avoidHunt);
+	rmAddObjectDefConstraint(rhea2ID, avoidCliff);
+	rmAddObjectDefConstraint(rhea2ID, SouthPie);
+
+	int antelope2ID = rmCreateObjectDef("antelope group 2");
+	rmAddObjectDefItem(antelope2ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope2ID, true);
+	rmSetObjectDefMinDistance(antelope2ID, 0);
+	rmSetObjectDefMaxDistance(antelope2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope2ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(antelope2ID, avoidHunt);
+	rmAddObjectDefConstraint(antelope2ID, avoidCliff);
+	rmAddObjectDefConstraint(antelope2ID, SouthPie);	
+
+	int tapir2ID = rmCreateObjectDef("tapir herd 2");
+	rmAddObjectDefItem(tapir2ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir2ID, true);
+	rmSetObjectDefMinDistance(tapir2ID, 0);
+	rmSetObjectDefMaxDistance(tapir2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir2ID, avoidTownCenterMedium);		
+	rmAddObjectDefConstraint(tapir2ID, avoidHunt);
+	rmAddObjectDefConstraint(tapir2ID, avoidCliff);	
+	rmAddObjectDefConstraint(tapir2ID, SouthPie);	
+
+	int moose2ID = rmCreateObjectDef("moose group 2");
+	rmAddObjectDefItem(moose2ID, "ypIbex", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose2ID, true);
+	rmSetObjectDefMinDistance(moose2ID, 0);
+	rmSetObjectDefMaxDistance(moose2ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose2ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(moose2ID, avoidHunt);
+	rmAddObjectDefConstraint(moose2ID, avoidCliff);
+	rmAddObjectDefConstraint(moose2ID, SouthPie);	
+
+	int huntCount = -1;
+		if (cNumberNonGaiaPlayers==2)
+			huntCount = cNumberNonGaiaPlayers/2;
+		else if (cNumberNonGaiaPlayers<=5)
+			huntCount = cNumberNonGaiaPlayers/2;
+		else
+			huntCount = cNumberNonGaiaPlayers/2;
+	
+	rmPlaceObjectDefAtLoc(rhea1ID, 0, 0.75, 0.5, huntCount+1);
+	rmPlaceObjectDefAtLoc(antelope1ID, 0, 0.75, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(tapir1ID, 0, 0.75, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(moose1ID, 0, 0.75, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(rhea2ID, 0, 0.25, 0.5, huntCount+1);
+	rmPlaceObjectDefAtLoc(antelope2ID, 0, 0.25, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(tapir2ID, 0, 0.25, 0.5, huntCount);
+	rmPlaceObjectDefAtLoc(moose2ID, 0, 0.25, 0.5, huntCount);
+	}
+
+// Trade route variation
+	else {
+	int rhea3bID = rmCreateObjectDef("rhea group 3 player");
+	rmAddObjectDefItem(rhea3bID, "rhea", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea3bID, true);
+	rmSetObjectDefMinDistance(rhea3bID, 0);
+	rmSetObjectDefMaxDistance(rhea3bID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea3bID, circleConstraint);
+	rmAddObjectDefConstraint(rhea3bID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rhea3bID, avoidHunt);	
+
+	int tapir3bID = rmCreateObjectDef("tapir herd 3 player");
+	rmAddObjectDefItem(tapir3bID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir3bID, true);
+	rmSetObjectDefMinDistance(tapir3bID, 0);
+	rmSetObjectDefMaxDistance(tapir3bID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir3bID, circleConstraint);
+	rmAddObjectDefConstraint(tapir3bID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapir3bID, avoidHunt);
+	
+	rmPlaceObjectDefInArea(rhea3bID, 0, plateauNorthID, 1);
+	rmPlaceObjectDefInArea(rhea3bID, 0, plateauSouthID, 1);
+	rmPlaceObjectDefInArea(tapir3bID, 0, plateauNorthID, 1);
+	rmPlaceObjectDefInArea(tapir3bID, 0, plateauSouthID, 1);
+	
+	int rhea3ID = rmCreateObjectDef("rhea group 3");
+	rmAddObjectDefItem(rhea3ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea3ID, true);
+	rmSetObjectDefMinDistance(rhea3ID, 0);
+	rmSetObjectDefMaxDistance(rhea3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea3ID, circleConstraint);
+	rmAddObjectDefConstraint(rhea3ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rhea3ID, avoidHunt);
+	
+	int antelope3ID = rmCreateObjectDef("antelope group 3");
+	rmAddObjectDefItem(antelope3ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope3ID, true);
+	rmSetObjectDefMinDistance(antelope3ID, 0);
+	rmSetObjectDefMaxDistance(antelope3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope3ID, circleConstraint);
+	rmAddObjectDefConstraint(antelope3ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelope3ID, avoidHunt);
+
+	int tapir3ID = rmCreateObjectDef("tapir herd 3");
+	rmAddObjectDefItem(tapir3ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir3ID, true);
+	rmSetObjectDefMinDistance(tapir3ID, 0);
+	rmSetObjectDefMaxDistance(tapir3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir3ID, circleConstraint);
+	rmAddObjectDefConstraint(tapir3ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapir3ID, avoidHunt);
+
+	int moose3ID = rmCreateObjectDef("moose group 3");
+	rmAddObjectDefItem(moose3ID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose3ID, true);
+	rmSetObjectDefMinDistance(moose3ID, 0);
+	rmSetObjectDefMaxDistance(moose3ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose3ID, circleConstraint);
+	rmAddObjectDefConstraint(moose3ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(moose3ID, avoidHunt);
+	
+	int rhea4ID = rmCreateObjectDef("rhea group 4");
+	rmAddObjectDefItem(rhea4ID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rhea4ID, true);
+	rmSetObjectDefMinDistance(rhea4ID, 0);
+	rmSetObjectDefMaxDistance(rhea4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rhea4ID, circleConstraint);
+	rmAddObjectDefConstraint(rhea4ID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(rhea4ID, avoidHunt);
+
+	int antelope4ID = rmCreateObjectDef("antelope group 4");
+	rmAddObjectDefItem(antelope4ID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelope4ID, true);
+	rmSetObjectDefMinDistance(antelope4ID, 0);
+	rmSetObjectDefMaxDistance(antelope4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelope4ID, circleConstraint);
+	rmAddObjectDefConstraint(antelope4ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelope4ID, avoidHunt);
+
+	int tapir4ID = rmCreateObjectDef("tapir herd 4");
+	rmAddObjectDefItem(tapir4ID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapir4ID, true);
+	rmSetObjectDefMinDistance(tapir4ID, 0);
+	rmSetObjectDefMaxDistance(tapir4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapir4ID, circleConstraint);
+	rmAddObjectDefConstraint(tapir4ID, avoidTownCenterMedium);		
+	rmAddObjectDefConstraint(tapir4ID, avoidHunt);
+
+	int moose4ID = rmCreateObjectDef("moose group 4");
+	rmAddObjectDefItem(moose4ID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moose4ID, true);
+	rmSetObjectDefMinDistance(moose4ID, 0);
+	rmSetObjectDefMaxDistance(moose4ID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moose4ID, circleConstraint);
+	rmAddObjectDefConstraint(moose4ID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(moose4ID, avoidHunt);
+	
+	int huntsVSLandstrips = rmCreateClassDistanceConstraint("extra hunts outside of players starting areas", classIsland, 1.0);
+	
+	int herdCount = -1;
+		if (cNumberNonGaiaPlayers==2)
+			herdCount = cNumberNonGaiaPlayers/2;
+		else if (cNumberNonGaiaPlayers<=5)
+			herdCount = cNumberNonGaiaPlayers/2;
+		else
+			herdCount = cNumberNonGaiaPlayers/2;
+	
+	rmAddObjectDefConstraint(rhea3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(rhea3ID, 0, 0.5, 0.5, herdCount);
+		
+	rmAddObjectDefConstraint(antelope3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(antelope3ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(tapir3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(tapir3ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(moose3ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(moose3ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(rhea4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(rhea4ID, 0, 0.5, 0.5, herdCount+1);
+	
+	rmAddObjectDefConstraint(antelope4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(antelope4ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(tapir4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(tapir4ID, 0, 0.5, 0.5, herdCount);
+
+	rmAddObjectDefConstraint(moose4ID, huntsVSLandstrips);	
+	rmPlaceObjectDefAtLoc(moose4ID, 0, 0.5, 0.5, herdCount);	
+	}	
+}
+else{
+// FFA
+
+	int rheaxID = rmCreateObjectDef("rhea groups");
+	rmAddObjectDefItem(rheaxID, "ypIbex", rmRandInt(8,10), 10.0);
+	rmSetObjectDefCreateHerd(rheaxID, true);
+	rmSetObjectDefMinDistance(rheaxID, 0);
+	rmSetObjectDefMaxDistance(rheaxID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rheaxID, circleConstraint);
+	rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rheaxID, avoidHunt);
+	
+	int antelopexID = rmCreateObjectDef("antelope groups");
+	rmAddObjectDefItem(antelopexID, "Rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(antelopexID, true);
+	rmSetObjectDefMinDistance(antelopexID, 0);
+	rmSetObjectDefMaxDistance(antelopexID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(antelopexID, circleConstraint);
+	rmAddObjectDefConstraint(antelopexID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(antelopexID, avoidHunt);
+
+	int tapirxID = rmCreateObjectDef("tapir herds");
+	rmAddObjectDefItem(tapirxID, "ypIbex", rmRandInt(7,9), 12.0);
+	rmSetObjectDefCreateHerd(tapirxID, true);
+	rmSetObjectDefMinDistance(tapirxID, 0);
+	rmSetObjectDefMaxDistance(tapirxID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(tapirxID, circleConstraint);
+	rmAddObjectDefConstraint(tapirxID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(tapirxID, avoidHunt);
+
+	int moosexID = rmCreateObjectDef("moose groups");
+	rmAddObjectDefItem(moosexID, "rhea", rmRandInt(9,12), 8.0);
+	rmSetObjectDefCreateHerd(moosexID, true);
+	rmSetObjectDefMinDistance(moosexID, 0);
+	rmSetObjectDefMaxDistance(moosexID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(moosexID, circleConstraint);
+	rmAddObjectDefConstraint(moosexID, avoidTownCenterMedium);	
+	rmAddObjectDefConstraint(moosexID, avoidHunt);
+
+	rmPlaceObjectDefAtLoc(rheaxID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(antelopexID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(tapirxID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(moosexID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+}	
+
+rmSetStatusText("", 0.8);
+
+// Nuggets!
+
+	int avoidImpassableLandMore=rmCreateTerrainDistanceConstraint("avoid impassable land more", "Land", false, 15.0);
+
+	int nuggetID= rmCreateObjectDef("nugget"); 
+	rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0); 
+	rmSetObjectDefMinDistance(nuggetID, 0.0); 
+	rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5)); 
+	rmAddObjectDefConstraint(nuggetID, avoidNugget); 
+	rmAddObjectDefConstraint(nuggetID, avoidEdgeMore);
+	//rmAddObjectDefConstraint(nuggetID, circleConstraint);
+	rmAddObjectDefConstraint(nuggetID, avoidTownCenter);
+	rmAddObjectDefConstraint(nuggetID, avoidCoin); 
+	//rmAddObjectDefConstraint(nuggetID, avoidImpassableLandMore);
+	rmAddObjectDefConstraint(nuggetID, avoidNatives); 
+	rmAddObjectDefConstraint(nuggetID, avoidAll); 
+	rmAddObjectDefConstraint(nuggetID, avoidWaterShort); 
+	rmAddObjectDefConstraint(nuggetID, avoidTradeRouteSmall);
+	rmAddObjectDefConstraint(nuggetID, avoidSocket); 
+	rmSetNuggetDifficulty(1, 2); 
+	rmPlaceObjectDefAtLoc(nuggetID, 0, 0.5, 0.5, 5*(cNumberNonGaiaPlayers + rmRandInt(2,4))); 
+
+rmSetStatusText("", 0.9);
+
+    
+// Land underbrush stuff -- shrubs, twigs, rocks
+
+	int props = rmCreateObjectDef("ground underbrush");
+	rmAddObjectDefItem(props, "UnderbrushBorneo", 1, 0.0);
+	rmSetObjectDefMinDistance(props, 0);
+	rmSetObjectDefMaxDistance(props, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(props, avoidImportantItem);
+  	//rmAddObjectDefConstraint(props, playerConstraint);
+  	rmAddObjectDefConstraint(props, avoidEdgeMore);
+  	rmAddObjectDefConstraint(props, avoidBrush);
+	rmAddObjectDefConstraint(props, avoidNativesMed);
+  	rmAddObjectDefConstraint(props, avoidCoinShort);
+  	rmAddObjectDefConstraint(props, avoidWaterShort);
+  	rmAddObjectDefConstraint(props, avoidTownCenterSmall);
+  	rmAddObjectDefConstraint(props, avoidCliff);
+	rmPlaceObjectDefAtLoc(props, 0, 0.5, 0.5, 90*cNumberNonGaiaPlayers);
+
+ 
+	// Ruins
+
+	int ruinCount = (cNumberNonGaiaPlayers + rmRandInt(1,2));
+	rmDefineClass("classWall");
+	int wallConstraint=rmCreateClassDistanceConstraint("wall vs. wall", rmClassID("classWall"), 40.0);
+
+	for(i=0; < ruinCount) {
+		int stoneWallID = rmCreateGrouping("stone wall "+i, "uger"+rmRandInt(1,4));
+		rmAddGroupingToClass(stoneWallID, rmClassID("classWall"));
+		rmSetGroupingMinDistance(stoneWallID, 0.0);
+		rmSetGroupingMaxDistance(stoneWallID, rmXFractionToMeters(0.5));
+		rmAddGroupingConstraint(stoneWallID, avoidEdgeMore);
+		rmAddGroupingConstraint(stoneWallID, forestConstraintShort);
+		rmAddGroupingConstraint(stoneWallID, avoidTradeRoute);
+		rmAddGroupingConstraint(stoneWallID, avoidSocket);
+		rmAddGroupingConstraint(stoneWallID, wallConstraint);
+		rmAddGroupingConstraint(stoneWallID, avoidWater);
+		rmAddGroupingConstraint(stoneWallID, avoidNativesMed);
+		rmAddGroupingConstraint(stoneWallID, avoidTownCenter);
+		rmAddGroupingConstraint(stoneWallID, avoidNuggetSmall);
+		rmAddGroupingConstraint(stoneWallID, avoidAll);
+		rmPlaceGroupingAtLoc(stoneWallID, 0, 0.5, 0.5);
+	}
+
+	// KOTH game mode
+   if(rmGetIsKOTH())
+   {
+      float xLoc = 0.5;
+      float yLoc = 0.5;
+      float walk = 0.03;
+      
+      ypKingsHillPlacer(yLoc, yLoc, walk, 0);
+      rmEchoInfo("XLOC = "+yLoc);
+      rmEchoInfo("XLOC = "+yLoc);
+   }
+	
+	// Water buffalos
+
+	if (IsYP()){
+		int avoidBuffalo=rmCreateTypeDistanceConstraint("buffalo avoids buffalo", "ypWaterBuffalo", 60.0);
+
+		int randomSheep = rmCreateObjectDef("random sheep");
+		rmAddObjectDefItem(randomSheep, "ypWaterBuffalo", 1, 3.0);
+		rmSetObjectDefMinDistance(randomSheep, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randomSheep, rmXFractionToMeters(0.33));
+		//rmAddObjectDefConstraint(randomSheep, avoidAll);
+		//rmAddObjectDefConstraint(randomSheep, avoidImpassableLand);
+		rmAddObjectDefConstraint(randomSheep, avoidCliff);
+		rmAddObjectDefConstraint(randomSheep, avoidBuffalo);
+		rmPlaceObjectDefAtLoc(randomSheep, 0, 0.5, 0.5, cNumberNonGaiaPlayers*3+rmRandInt(2,3));
+	}
+
+		for (i=0; < cNumberNonGaiaPlayers*50){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "borneo\ground_grass1_borneo", "borneo\ground_forest_borneo");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+
+rmSetMapClusteringNoiseParams(0.05, 5, 0.5);  
+rmSetMapClusteringPlacementParams(0.2, 0.3, 0.4, cClusterLand);
+rmSetMapClusteringObjectParams(0, 0, 0.5);
+rmPlaceMapClusters("", "borneo_underbrush"); 
+   
+rmSetStatusText("", 1.0);
+    
+}
\ No newline at end of file
diff --git a/RMM/DeccanRegicide.xs b/RMM/DeccanRegicide.xs
index adf76e7..b9f095c 100644
--- a/RMM/DeccanRegicide.xs
+++ b/RMM/DeccanRegicide.xs
@@ -139,7 +139,7 @@ void main(void)
   int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 10.0);
 
   // general avoidance
-  int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);
+  int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 5.0);
 
   // Trade route avoidance.
   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 5.0);
@@ -503,6 +503,9 @@ void main(void)
 
 // Player placement
    int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+   rmSetObjectDefMinDistance(startingUnits, 8.0);
+   rmSetObjectDefMaxDistance(startingUnits, 12.0);
+   rmAddObjectDefConstraint(startingUnits, avoidAll);
   
    int TCID = rmCreateObjectDef("player TC");
    if (rmGetNomadStart())
@@ -893,16 +896,6 @@ void main(void)
   // Text
   rmSetStatusText("",0.90);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/Great LakesRegicide.xs b/RMM/Great LakesRegicide.xs
index 1da9710..cdece76 100644
--- a/RMM/Great LakesRegicide.xs	
+++ b/RMM/Great LakesRegicide.xs	
@@ -331,16 +331,6 @@ if (seasonPicker < 0.5)
 
    //mineType = rmRandInt(1,10);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 // check for KOTH game mode
   if(rmGetIsKOTH()) {
@@ -550,8 +540,9 @@ if (seasonPicker < 0.5)
 	rmAddObjectDefToClass(startingTCID, rmClassID("player"));
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 10.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 
 	int StartAreaTreeID=rmCreateObjectDef("starting trees");
diff --git a/RMM/Hispaniola.xs b/RMM/Hispaniola.xs
index 19d9e4d..0a83c09 100644
--- a/RMM/Hispaniola.xs
+++ b/RMM/Hispaniola.xs
@@ -391,8 +391,8 @@ void main(void)
     	
 	//Prepare to place Explorers, Explorer's dog, Explorer's Taun Taun, etc.
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 9.0);
-	rmSetObjectDefMaxDistance(startingUnits, 18.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 16.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
 
@@ -567,16 +567,6 @@ void main(void)
 
 	// Define and place Nuggets
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/Indonesia.xs b/RMM/Indonesia.xs
new file mode 100644
index 0000000..8d19785
--- /dev/null
+++ b/RMM/Indonesia.xs
@@ -0,0 +1,1629 @@
+// ESOC INDONESIA (1V1, TEAM, FFA)
+// designed by Garja
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+
+// Main entry point for random map script
+void main(void)
+{
+		
+	// Text
+	// These status text lines are used to manually animate the map generation progress bar
+	rmSetStatusText("",0.01); 
+	
+	// ************************************** GENERAL FEATURES *****************************************
+	
+	//Pick spawn variation
+	int playerplacement = -1;
+	playerplacement = rmRandInt(0,1);
+//	playerplacement = 0; // <--- TEST
+	if (cNumberNonGaiaPlayers > 2)
+		playerplacement = 1;
+	
+	// Picks the map size
+	int playerTiles=24000; //
+	if (cNumberNonGaiaPlayers >= 4)
+		playerTiles=22000; 
+	if (cNumberNonGaiaPlayers >= 6)
+		playerTiles=20000; 
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles); //2.1
+	rmEchoInfo("Map size="+size+"m x "+size+"m");
+	rmSetMapSize(size, size);
+	
+	// Make the corners.
+	rmSetWorldCircleConstraint(false);
+	
+	// Picks a default water height
+	rmSetSeaLevel(1.0);	// this is height of river surface compared to surrounding land. River depth is in the river XML.
+
+//	rmSetMapElevationParameters(cElevTurbulence, 0.05, 2, 0.5, 4.5); // type, frequency, octaves, persistence, variation 
+//	rmSetMapElevationHeightBlend(1);
+	
+	
+	// Picks default terrain and water
+	rmSetSeaType("Indonesia Coast");
+	rmSetBaseTerrainMix("coastal_japan_b"); // 
+	rmTerrainInitialize("water", 0.0); // 
+	rmSetMapType("Japan"); 
+	rmSetMapType("grass");
+	rmSetMapType("water");
+	rmSetLightingSet("borneo");
+
+	// Choose Mercs
+	chooseMercs();
+	  
+	// Text
+	rmSetStatusText("",0.10);
+	
+	// Set up Natives
+	int subCiv0 = -1;
+	int subCiv1 = -1;
+	int subCiv2 = -1;
+	subCiv0 = rmGetCivID("Jesuit");
+	subCiv1 = rmGetCivID("Zen");
+	rmSetSubCiv(0, "Jesuit");
+	rmSetSubCiv(1, "Zen");
+	
+
+	//Define some classes. These are used later for constraints.
+	int classPlayer = rmDefineClass("player");
+	int classPatch = rmDefineClass("patch");
+	int classPatch2 = rmDefineClass("patch2");
+	int classPatch3 = rmDefineClass("patch3");
+	int classPond = rmDefineClass("pond");
+	int classRocks = rmDefineClass("rocks");
+	int classGrass = rmDefineClass("grass");
+	rmDefineClass("starting settlement");
+	rmDefineClass("startingUnit");
+	int classForest = rmDefineClass("Forest");
+	int importantItem = rmDefineClass("importantItem");
+	int classNative = rmDefineClass("natives");
+	int classCliff = rmDefineClass("Cliffs");
+	int classGold = rmDefineClass("Gold");
+	int classStartingResource = rmDefineClass("startingResource");
+	int classIsland=rmDefineClass("island");
+	
+	// ******************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.20);
+	
+	// ************************************* CONTRAINTS *****************************************
+	// These are used to have objects and areas avoid each other
+   
+	// Cardinal Directions & Map placement
+	int avoidEdge = rmCreatePieConstraint("Avoid Edge",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.47), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int avoidEdgeMore = rmCreatePieConstraint("Avoid Edge More",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.38), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int avoidCenter = rmCreatePieConstraint("Avoid Center",0.5,0.5,rmXFractionToMeters(0.22), rmXFractionToMeters(0.5), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int stayCenter = rmCreatePieConstraint("Stay Center", 0.50, 0.50, rmXFractionToMeters(0.0), rmXFractionToMeters(0.16), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int stayCenterMore = rmCreatePieConstraint("Stay Center more",0.45,0.45,rmXFractionToMeters(0.0), rmXFractionToMeters(0.26), rmDegreesToRadians(0),rmDegreesToRadians(360));
+
+	int staySouthPart = rmCreatePieConstraint("Stay south part", 0.55, 0.55,rmXFractionToMeters(0.0), rmXFractionToMeters(0.60), rmDegreesToRadians(135),rmDegreesToRadians(315));
+	int stayNorthHalf = rmCreatePieConstraint("Stay north half", 0.50, 0.50,rmXFractionToMeters(0.0), rmXFractionToMeters(0.50), rmDegreesToRadians(360),rmDegreesToRadians(180));
+		
+	// Resource avoidance
+	int avoidForest = rmCreateClassDistanceConstraint("avoid forest", rmClassID("Forest"), 24.0); //15.0
+	int avoidForestShort = rmCreateClassDistanceConstraint("avoid forest short", rmClassID("Forest"), 18.0); //15.0
+	int avoidForestVeryShort = rmCreateClassDistanceConstraint("avoid forest very short", rmClassID("Forest"), 8.0); //15.0
+	int avoidForestMin = rmCreateClassDistanceConstraint("avoid forest min", rmClassID("Forest"), 4.0);
+	int avoidBerriesFar = rmCreateTypeDistanceConstraint("avoid Berries far", "berrybush", 50.0);
+	int avoidBerries = rmCreateTypeDistanceConstraint("avoid Berries", "berrybush", 40.0);
+	int avoidBerriesShort = rmCreateTypeDistanceConstraint("avoid Berries short", "berrybush", 20.0);
+	int avoidBerriesMin = rmCreateTypeDistanceConstraint("avoid Berries min", "berrybush", 4.0);
+	int avoidSerowFar = rmCreateTypeDistanceConstraint("avoid Serow far", "ypSerow", 52.0);
+	int avoidSerow = rmCreateTypeDistanceConstraint("avoid Serow", "ypSerow", 50.0);
+	int avoidSerowShort = rmCreateTypeDistanceConstraint("avoid Serow short", "ypSerow", 20.0);
+	int avoidSerowMin = rmCreateTypeDistanceConstraint("avoid Serow min", "ypSerow", 4.0);
+	int avoidEleFar = rmCreateTypeDistanceConstraint("avoid Ele far", "ypIbex", 45.0);
+	int avoidEle = rmCreateTypeDistanceConstraint("avoid Ele", "ypIbex", 40.0);
+	int avoidEleShort = rmCreateTypeDistanceConstraint("avoid  Ele short", "ypIbex", 25.0);
+	int avoidEleMin = rmCreateTypeDistanceConstraint("avoid Ele min", "ypIbex", 5.0);
+	int avoidGoldMed = rmCreateTypeDistanceConstraint("coin avoids coin", "gold", 25.0);
+	int avoidGoldTypeShort = rmCreateTypeDistanceConstraint("coin avoids coin short", "gold", 8.0);
+	int avoidGoldType = rmCreateTypeDistanceConstraint("coin avoids coin ", "gold", 45.0);
+	int avoidGoldTypeFar = rmCreateTypeDistanceConstraint("coin avoids coin far ", "gold", 52.0);
+	int avoidGoldMin=rmCreateClassDistanceConstraint("min distance vs gold", rmClassID("Gold"), 8.0);
+	int avoidGoldShort = rmCreateClassDistanceConstraint ("gold avoid gold short", rmClassID("Gold"), 15.0);
+	int avoidGold = rmCreateClassDistanceConstraint ("gold avoid gold med", rmClassID("Gold"), 58.0-1*cNumberNonGaiaPlayers);
+	int avoidGoldFar = rmCreateClassDistanceConstraint ("gold avoid gold far", rmClassID("Gold"), 68.0-1*cNumberNonGaiaPlayers);
+	int avoidGoldVeryFar = rmCreateClassDistanceConstraint ("gold avoid gold very far", rmClassID("Gold"), 66.0);
+	int avoidNuggetWater = rmCreateTypeDistanceConstraint("avoid nugget water", "AbstractNugget", 95.0);
+	int avoidNuggetWaterShort = rmCreateTypeDistanceConstraint("avoid nugget water short", "AbstractNugget", 15.0);
+	int avoidNuggetMin = rmCreateTypeDistanceConstraint("avoid nugget min", "AbstractNugget", 4.0);
+	int avoidNuggetShort = rmCreateTypeDistanceConstraint("avoid nugget short", "AbstractNugget", 40.0);
+	int avoidNugget=rmCreateTypeDistanceConstraint("avoid nugget", "AbstractNugget", 50.0);
+	int avoidNuggetFar = rmCreateTypeDistanceConstraint("avoid nugget Far", "AbstractNugget", 50.0);
+	int avoidTownCenterVeryFar = rmCreateTypeDistanceConstraint("avoid Town Center Very Far", "townCenter", 70.0-1*cNumberNonGaiaPlayers);
+	int avoidTownCenterFar = rmCreateTypeDistanceConstraint("avoid Town Center Far", "townCenter", 46.0);
+	int avoidTownCenter = rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 30.0);
+//	int avoidTownCenterMed = rmCreateTypeDistanceConstraint("avoid Town Center med", "townCenter", 40.0);
+	int avoidTownCenterShort = rmCreateTypeDistanceConstraint("avoid Town Center short", "townCenter", 26.0);
+	int avoidTownCenterMin = rmCreateTypeDistanceConstraint("avoid Town Center min", "townCenter", 18.0);
+	int avoidNativesShort = rmCreateClassDistanceConstraint("avoid natives short", rmClassID("natives"), 6.0);
+	int avoidNatives = rmCreateClassDistanceConstraint("avoid natives", rmClassID("natives"), 10.0);
+	int avoidNativesFar = rmCreateClassDistanceConstraint("avoid natives far", rmClassID("natives"), 15.0);
+	int avoidStartingResources = rmCreateClassDistanceConstraint("avoid starting resources", rmClassID("startingResource"), 8.0);
+	int avoidStartingResourcesShort = rmCreateClassDistanceConstraint("avoid starting resources short", rmClassID("startingResource"), 4.0);
+	int avoidWhale=rmCreateTypeDistanceConstraint("avoid whale", "fish", 50.0);
+	int avoidFish=rmCreateTypeDistanceConstraint("avoid fish", "fish", 30.0);
+	int avoidBuffalo=rmCreateTypeDistanceConstraint("avoid buffalo", "ypWaterBuffalo", 50.0);
+	int avoidFlag = rmCreateTypeDistanceConstraint("avoid water flag", "HomeCityWaterSpawnFlag", 20.0);
+	int avoidFlagShort = rmCreateTypeDistanceConstraint("avoid water flag short", "HomeCityWaterSpawnFlag", 10.0);
+
+	// Avoid impassable land
+	int avoidImpassableLandMin = rmCreateTerrainDistanceConstraint("avoid impassable land min", "Land", false, 0.5);
+	int avoidImpassableLandShort = rmCreateTerrainDistanceConstraint("avoid impassable land short", "Land", false, 6.0);
+	int avoidImpassableLand = rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 10.0);
+	int avoidImpassableLandMed=rmCreateTerrainDistanceConstraint("avoid impassable land medium", "Land", false, 12.0);
+	int avoidImpassableLandFar = rmCreateTerrainDistanceConstraint("avoid impassable land far", "Land", false, 20.0);
+	int stayNearLand = rmCreateTerrainMaxDistanceConstraint("stay near land ", "Land", true, 5.0);
+	int avoidLand = rmCreateTerrainDistanceConstraint("avoid land ", "Land", true, 8.0);
+	int avoidLandFar = rmCreateTerrainDistanceConstraint("avoid land far ", "Land", true, 15.0);
+	int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "water", true, 3.0);
+	int avoidWater = rmCreateTerrainDistanceConstraint("avoid water", "Land", false, 20.0);
+	int avoidWaterFar = rmCreateTerrainDistanceConstraint("avoid water far", "land", false, 30.0);
+	int stayNearWater = rmCreateTerrainMaxDistanceConstraint("stay near water ", "water", true, 20.0);
+	int stayInWater = rmCreateTerrainMaxDistanceConstraint("stay in water ", "water", true, 0.0);
+	int avoidPatch = rmCreateClassDistanceConstraint("avoid patch", rmClassID("patch"), 5.0);
+	int avoidPatch2 = rmCreateClassDistanceConstraint("avoid patch2", rmClassID("patch2"), 20.0);
+	int avoidPatch3 = rmCreateClassDistanceConstraint("avoid patch3", rmClassID("patch3"), 5.0);
+	int avoidIslandMin=rmCreateClassDistanceConstraint("avoid island min", classIsland, 8.0);
+	int avoidIslandShort=rmCreateClassDistanceConstraint("avoid island short", classIsland, 12.0);
+	int avoidIsland=rmCreateClassDistanceConstraint("avoid island", classIsland, 16.0);
+	int avoidIslandFar=rmCreateClassDistanceConstraint("avoid island far", classIsland, 32.0);
+	int avoidCliffShort = rmCreateClassDistanceConstraint("avoid cliff short", classCliff, 3.0);
+	int avoidCliff = rmCreateClassDistanceConstraint("avoid cliff", classCliff, 5.0);
+	
+	// Unit avoidance
+	int avoidStartingUnits = rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 35.0);	
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);
+	
+	// VP avoidance
+	int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 8.0);
+	int avoidTradeRouteShort = rmCreateTradeRouteDistanceConstraint("trade route short", 4.0);
+	int avoidTradeRouteSocket = rmCreateTypeDistanceConstraint("avoid trade route socket", "socketTradeRoute", 8.0);
+	int avoidTradeRouteSocketShort = rmCreateTypeDistanceConstraint("avoid trade route socket short", "socketTradeRoute", 3.0);
+	int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 10.0);
+   
+	
+	// ***********************************************************************************************
+	
+	// **************************************** PLACE PLAYERS ****************************************
+	
+	int teamZeroCount = rmGetNumberPlayersOnTeam(0);
+	int teamOneCount = rmGetNumberPlayersOnTeam(1);
+		
+	if (cNumberTeams <= 2) // 1v1 and TEAM
+	{
+		if (teamZeroCount == 1 && teamOneCount == 1) // 1v1
+		{
+			float OneVOnePlacement=rmRandFloat(0.0, 0.9);
+			
+			if (playerplacement == 1)
+			{
+				if ( OneVOnePlacement < 0.5)
+				{
+					rmPlacePlayer(1, 0.28, 0.52);
+					rmPlacePlayer(2, 0.72, 0.48);
+				}
+				else
+				{
+					rmPlacePlayer(2, 0.28, 0.52);
+					rmPlacePlayer(1, 0.72, 0.48);
+				}
+			}
+			else
+			{
+				if ( OneVOnePlacement < 0.5)
+				{
+					rmPlacePlayer(1, 0.48, 0.72);
+					rmPlacePlayer(2, 0.52, 0.28);
+				}
+				else
+				{
+					rmPlacePlayer(2, 0.48, 0.72);
+					rmPlacePlayer(1, 0.52, 0.28);
+				}
+			}
+		}
+		else if (teamZeroCount == teamOneCount) // equal N of players per TEAM
+		{
+			if (teamZeroCount == 2) // 2v2
+			{
+				rmSetPlacementTeam(0);
+				rmPlacePlayersLine(0.28, 0.64, 0.28, 0.48, 0.00, 0.25);
+
+				rmSetPlacementTeam(1);
+				rmPlacePlayersLine(0.72, 0.52, 0.72, 0.36, 0.00, 0.25);
+			}
+			else // 3v3, 4v4
+			{
+				rmSetPlacementTeam(0);
+				rmPlacePlayersLine(0.28, 0.68, 0.28, 0.44, 0.00, 0.25);
+
+				rmSetPlacementTeam(1);
+				rmPlacePlayersLine(0.72, 0.56, 0.72, 0.32, 0.00, 0.25);
+			}
+		}
+		else // unequal N of players per TEAM
+		{
+			if (teamZeroCount == 1 || teamOneCount == 1) // one team is one player
+			{
+				if (teamZeroCount < teamOneCount) // 1v2, 1v3, 1v4, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmPlacePlayersLine(0.28, 0.53, 0.28, 0.55, 0.00, 0.25);
+								
+					rmSetPlacementTeam(1);
+					if (teamOneCount == 2)
+						rmPlacePlayersLine(0.72, 0.52, 0.72, 0.36, 0.00, 0.25);
+					else
+						rmPlacePlayersLine(0.72, 0.56, 0.72, 0.32, 0.00, 0.25);
+				} 
+				else // 2v1, 3v1, 4v1, etc.
+				{
+					rmSetPlacementTeam(1);
+					rmPlacePlayersLine(0.72, 0.45, 0.72, 0.47, 0.00, 0.25);
+								
+					rmSetPlacementTeam(0);
+					if (teamZeroCount == 2)
+						rmPlacePlayersLine(0.28, 0.64, 0.28, 0.48, 0.00, 0.25);
+					else
+						rmPlacePlayersLine(0.28, 0.68, 0.28, 0.44, 0.00, 0.25);
+				} 
+			}
+			else if (teamZeroCount == 2 || teamOneCount == 2) // one team has 2 players
+			{
+				if (teamZeroCount < teamOneCount) // 2v3, 2v4, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmPlacePlayersLine(0.28, 0.64, 0.28, 0.48, 0.00, 0.25);
+
+					rmSetPlacementTeam(1);
+					rmPlacePlayersLine(0.72, 0.56, 0.72, 0.32, 0.00, 0.25);
+				} 
+				else // 3v2, 4v2, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmPlacePlayersLine(0.28, 0.68, 0.28, 0.44, 0.00, 0.25);
+
+					rmSetPlacementTeam(1);
+					rmPlacePlayersLine(0.72, 0.52, 0.72, 0.36, 0.00, 0.25);
+				} 
+			}
+			else // 3v4, 4v3, etc.
+			{
+				rmSetPlacementTeam(0);
+				rmPlacePlayersLine(0.28, 0.68, 0.28, 0.44, 0.00, 0.25);
+
+				rmSetPlacementTeam(1);
+				rmPlacePlayersLine(0.72, 0.56, 0.72, 0.32, 0.00, 0.25);
+			} 
+		}
+	}
+	else // FFA
+	{	
+		rmPlacePlayer(1, 0.28, 0.52);
+		rmPlacePlayer(2, 0.72, 0.48);
+		rmPlacePlayer(3, 0.52, 0.34);
+		rmPlacePlayer(4, 0.48, 0.66);
+		rmPlacePlayer(5, 0.70, 0.32);
+		rmPlacePlayer(6, 0.30, 0.68);
+		rmPlacePlayer(7, 0.87, 0.76);
+		rmPlacePlayer(8, 0.13, 0.24);
+	}
+	
+	// **************************************************************************************************
+   
+	// Text
+	rmSetStatusText("",0.30);
+	
+	// ******************************************** MAP LAYOUT **************************************************
+	
+	//Bays
+	int bay1ID = rmCreateArea("bay 1");
+//	rmSetAreaWaterType(bay1ID, "borneo water");
+	rmSetAreaSize(bay1ID, 0.03, 0.03);
+	if (playerplacement == 1)
+		rmSetAreaLocation(bay1ID, 0.52, 0.84);
+	else
+		rmSetAreaLocation(bay1ID, 0.84, 0.52);
+	rmSetAreaCoherence(bay1ID, 0.60);
+	rmSetAreaSmoothDistance(bay1ID, 12);
+//	rmAddAreaInfluenceSegment(bay1ID, 0.42, 0.58, 0.58, 0.42);
+//	rmAddAreaTerrainLayer(bay1ID, "borneo\ground_sand1_borneo", 0, 3);
+	rmBuildArea(bay1ID); 
+	
+	int avoidBay1 = rmCreateAreaDistanceConstraint("avoid bay1", bay1ID, 1.0);
+	
+	int bay2ID = rmCreateArea("bay 2");
+//	rmSetAreaWaterType(bay2ID, "borneo water");
+	rmSetAreaSize(bay2ID, 0.03, 0.03);
+	if (playerplacement == 1)
+		rmSetAreaLocation(bay2ID, 0.52, 0.16);
+	else
+		rmSetAreaLocation(bay2ID, 0.16, 0.52);
+	rmSetAreaCoherence(bay2ID, 0.60);
+	rmSetAreaSmoothDistance(bay2ID, 12);
+//	rmAddAreaInfluenceSegment(bay2ID, 0.42, 0.58, 0.58, 0.42);
+//	rmAddAreaTerrainLayer(bay2ID, "borneo\ground_sand1_borneo", 0, 3);
+	rmBuildArea(bay2ID); 
+	
+	int avoidBay2 = rmCreateAreaDistanceConstraint("avoid bay2", bay2ID, 1.0);
+	
+	
+	//Main island
+	int mainislandID = rmCreateArea("main island");
+	rmSetAreaSize(mainislandID, 0.25, 0.25);
+	rmSetAreaLocation(mainislandID, 0.50, 0.50);
+	rmAddAreaInfluenceSegment(mainislandID, 0.42, 0.58, 0.58, 0.42);
+	rmSetAreaMix(mainislandID, "coastal_japan_b");
+	rmSetAreaTerrainType(mainislandID, "coastal_japan\ground_forest_co_japan"); 
+	rmPaintAreaTerrain(mainislandID);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_dirt1_co_japan", 0, 2);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_dirt3_co_japan", 2, 4);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_dirt2_co_japan", 4, 6);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_grass3_co_japan", 6, 8);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_grass3_co_japan", 8, 10);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_grass2_co_japan", 10, 12);
+	rmAddAreaTerrainLayer(mainislandID, "coastal_japan\ground_grass1_co_japan", 12, 14);
+	rmSetAreaWarnFailure(mainislandID, false);
+	rmAddAreaToClass(mainislandID, classIsland);
+	rmSetAreaCoherence(mainislandID, 0.60); //.46
+	rmSetAreaSmoothDistance(mainislandID, 18);
+	rmSetAreaElevationType(mainislandID, cElevTurbulence);
+	rmSetAreaElevationVariation(mainislandID, 5.0);
+	rmSetAreaBaseHeight(mainislandID, 4.0);
+	rmSetAreaElevationMinFrequency(mainislandID, 0.04);
+	rmSetAreaElevationOctaves(mainislandID, 3);
+	rmSetAreaElevationPersistence(mainislandID, 0.4);      
+// 	rmAddConnectionArea(shallowsID, mainislandID);
+	rmSetAreaObeyWorldCircleConstraint(mainislandID, false);
+	rmAddAreaConstraint(mainislandID, avoidBay1);
+	rmAddAreaConstraint(mainislandID, avoidBay2);
+	rmBuildArea(mainislandID);
+	
+	int avoidMainIsland = rmCreateAreaDistanceConstraint("avoid main island", mainislandID, 25.0);
+	int stayInMainIsland = rmCreateAreaMaxDistanceConstraint("stay in main island", mainislandID, 0.0);
+
+	
+	//Grass patch
+	for (i=0; < 26)
+	{
+		int patchID = rmCreateArea("grass patch"+i);
+		rmSetAreaWarnFailure(patchID, false);
+//		rmSetAreaObeyWorldCircleConstraint(patchID, false);
+		rmSetAreaSize(patchID, rmAreaTilesToFraction(70), rmAreaTilesToFraction(80));
+		rmSetAreaTerrainType(patchID, "coastal_japan\ground_forest_co_japan");
+		rmAddAreaToClass(patchID, rmClassID("patch"));
+		rmSetAreaMinBlobs(patchID, 1);
+		rmSetAreaMaxBlobs(patchID, 5);
+		rmSetAreaMinBlobDistance(patchID, 13.0);
+		rmSetAreaMaxBlobDistance(patchID, 30.0);
+		rmSetAreaCoherence(patchID, 0.0);
+		rmAddAreaConstraint(patchID, avoidPatch);
+//		rmAddAreaConstraint(patchID, stayInMainIsland);
+		rmAddAreaConstraint(patchID, avoidImpassableLandMed);
+		rmBuildArea(patchID); 
+	}
+
+	// Players area
+	for (i=1; < cNumberPlayers)
+	{
+	int playerareaID = rmCreateArea("playerarea"+i);
+	rmSetPlayerArea(i, playerareaID);
+	rmSetAreaSize(playerareaID, 0.03, 0.03);
+	rmSetAreaCoherence(playerareaID, 1.0);
+	rmSetAreaWarnFailure(playerareaID, false);
+//	rmSetAreaTerrainType(playerareaID, "new_england\ground2_cliff_ne"); // for testing
+	rmSetAreaLocPlayer(playerareaID, i);
+	rmSetAreaObeyWorldCircleConstraint(playerareaID, false);
+	rmBuildArea(playerareaID);
+	rmCreateAreaDistanceConstraint("avoid player area "+i, playerareaID, 3.0);
+	rmCreateAreaMaxDistanceConstraint("stay in player area "+i, playerareaID, 0.0);
+	}
+	
+	int avoidPlayerArea1 = rmConstraintID("avoid player area 1");
+	int avoidPlayerArea2 = rmConstraintID("avoid player area 2");
+	int stayInPlayerArea1 = rmConstraintID("stay in player area 1");
+	int stayInPlayerArea2 = rmConstraintID("stay in player area 2");
+	
+	
+	
+	//Hill A
+	for (i=0; < 3)
+	{
+		int hillAID = rmCreateArea("hill A"+i);
+		if (i == 0)
+		{
+			rmSetAreaSize(hillAID, 0.017, 0.017);
+			rmSetAreaCoherence(hillAID, 0.70);
+		//	rmSetAreaCliffHeight(hillAID, 2.0, 0.0, 0.8); 
+		//	rmSetAreaCliffEdge(hillAID, 1, 0.5, 0.0, 0.0, 1); 
+		//	rmSetAreaCliffType(hillAID, "coastal japan"); 
+		//	rmSetAreaTerrainType(hillAID, "borneo\ground_grass1_borneo");
+		//	rmPaintAreaTerrain(hillAID);
+		//	rmSetAreaCliffPainting(hillAID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+		//	rmAddAreaConstraint(hillAID, avoidWater);
+			int stayInHillA1stlvl = rmCreateAreaMaxDistanceConstraint("stay in hill A first level", hillAID, 0.0);
+		}
+		else if (i==1)
+		{
+			rmSetAreaSize(hillAID, 0.011, 0.011);
+			rmSetAreaCoherence(hillAID, 0.4);
+			rmSetAreaCliffHeight(hillAID, 4.0, 0.0, 0.4); 
+			rmSetAreaCliffEdge(hillAID, 1, 0.55, 0.0, 0.0, 1); 
+			rmSetAreaCliffType(hillAID, "coastal japan"); 
+		//	rmSetAreaTerrainType(hillAID, "borneo\ground_grass1_borneo");	
+			rmSetAreaCliffPainting(hillAID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+			int stayInHillA2ndlvl = rmCreateAreaMaxDistanceConstraint("stay in hill A second level", hillAID, 0.0);
+			rmAddAreaConstraint(hillAID, avoidImpassableLandShort);
+			rmAddAreaConstraint(hillAID, stayInHillA1stlvl);
+			
+		}
+		/*
+		else
+		{
+			rmSetAreaSize(hillAID, 0.014, 0.014);
+			rmSetAreaCoherence(hillAID, 0.60);
+			rmSetAreaCliffHeight(hillAID, 2.2, 0.0, 0.3); 
+			rmSetAreaCliffEdge(hillAID, 1, 0.5, 0.0, 0.0, 1); 
+			rmSetAreaCliffType(hillAID, "coastal japan"); 
+			rmSetAreaTerrainType(hillAID, "coastal_japan\ground_forest_co_japan");	
+	//		rmSetAreaCliffPainting(hillAID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+			rmAddAreaConstraint(hillAID, avoidImpassableLandShort);
+			rmAddAreaConstraint(hillAID, stayInHillA2ndlvl);
+		
+		}
+		*/
+		rmSetAreaWarnFailure(hillAID, false);
+		rmSetAreaObeyWorldCircleConstraint(hillAID, false);	
+		rmSetAreaSmoothDistance(hillAID, 9);
+		rmAddAreaToClass(hillAID, rmClassID("Cliffs"));
+		if (playerplacement == 1)
+			rmSetAreaLocation(hillAID, 0.44, 0.62);
+		else 
+			rmSetAreaLocation(hillAID, 0.36, 0.54);
+		if (cNumberTeams <= 2)
+			rmBuildArea(hillAID);
+		/*
+		for (j=0; < 600)
+		{
+			int RiceAID = rmCreateObjectDef("riceA"+i+j);
+			rmAddObjectDefItem(RiceAID, "UnderbrushCoastalJapan", rmRandInt(1,1), 1.0); 
+			rmSetObjectDefMinDistance(RiceAID, 0);
+			rmSetObjectDefMaxDistance(RiceAID, rmXFractionToMeters(0.5));
+			rmAddObjectDefConstraint(RiceAID, avoidImpassableLandMin);
+			rmAddObjectDefConstraint(RiceAID, stayInHillA1stlvl);
+			rmPlaceObjectDefAtLoc(RiceAID, 0, 0.50, 0.50);
+		}
+		*/
+		rmCreateAreaDistanceConstraint("avoid hill A "+i, hillAID, 2.0);
+		rmCreateAreaMaxDistanceConstraint("stay in hill A "+i, hillAID, 0.0);
+		rmCreateAreaMaxDistanceConstraint("stay near hill A "+i, hillAID, 11.0);
+	}
+	
+	int avoidHillA = rmConstraintID("avoid hill A 1");
+	int stayInHillA = rmConstraintID("stay in hill A 1");
+	int stayNearHillA = rmConstraintID("stay near hill A 1");
+	
+	
+	//Hill B
+	for (i=0; < 3)
+	{
+		int hillBID = rmCreateArea("hill B"+i);
+		if (i == 0)
+		{
+			rmSetAreaSize(hillBID, 0.017, 0.017);
+			rmSetAreaCoherence(hillBID, 0.70);
+		//	rmSetAreaCliffHeight(hillBID, 2.8, 0.0, 0.8); 
+		//	rmSetAreaCliffEdge(hillBID, 1, 1.0, 0.0, 0.0, 1); 
+		//	rmSetAreaCliffType(hillBID, "coastal japan"); 
+		//	rmSetAreaTerrainType(hillBID, "borneo\ground_grass1_borneo");
+		//	rmPaintAreaTerrain(hillBID);	
+		//	rmSetAreaCliffPainting(hillBID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+		//	rmAddAreaConstraint(hillBID, avoidWater);
+			int stayInHillB1stlvl = rmCreateAreaMaxDistanceConstraint("stay in hill B first level", hillBID, 0.0);
+
+		}
+		else if(i == 1)
+		{
+			rmSetAreaSize(hillBID, 0.011, 0.011);
+			rmSetAreaCoherence(hillBID, 0.55);
+			rmSetAreaCliffHeight(hillBID, 4.0, 0.0, 0.4); 
+			rmSetAreaCliffEdge(hillBID, 1, 0.55, 0.0, 0.0, 1); 
+			rmSetAreaCliffType(hillBID, "coastal japan"); 
+		//	rmSetAreaTerrainType(hillBID, "borneo\ground_grass1_borneo");	
+			rmSetAreaCliffPainting(hillBID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+			rmAddAreaConstraint(hillBID, avoidImpassableLandShort);
+			int stayInHillB2ndlvl = rmCreateAreaMaxDistanceConstraint("stay in hill B second level", hillBID, 0.0);
+			rmAddAreaConstraint(hillBID, stayInHillB1stlvl);
+		}
+		/*
+		else
+		{
+			rmSetAreaSize(hillBID, 0.018, 0.018);
+			rmSetAreaCoherence(hillBID, 0.60);
+			rmSetAreaCliffHeight(hillBID, 2.5, 0.0, 0.8); 
+			rmSetAreaCliffEdge(hillBID, 1, 1.0, 0.0, 0.0, 1); 
+			rmSetAreaCliffType(hillBID, "coastal japan"); 
+			rmSetAreaTerrainType(hillBID, "coastal_japan\ground_forest_co_japan");	
+			rmSetAreaCliffPainting(hillBID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+			rmAddAreaConstraint(hillBID, avoidImpassableLandShort);
+			rmAddAreaConstraint(hillBID, stayInHillB2ndlvl);
+		}
+		*/
+		rmSetAreaWarnFailure(hillBID, false);
+		rmSetAreaObeyWorldCircleConstraint(hillBID, false);
+		
+		rmSetAreaSmoothDistance(hillBID, 9);
+		rmAddAreaToClass(hillBID, rmClassID("Cliffs"));
+		if (playerplacement == 1)
+			rmSetAreaLocation(hillBID, 0.56, 0.38);
+		else 
+			rmSetAreaLocation(hillBID, 0.64, 0.46);
+		if (cNumberTeams <= 2)
+			rmBuildArea(hillBID);
+		/*
+		for (j=0; < 350)
+		{
+			int RiceBID = rmCreateObjectDef("riceB"+i+j);
+			rmAddObjectDefItem(RiceBID, "UnderbrushCoastalJapan", rmRandInt(1,1), 1.0); 
+			rmSetObjectDefMinDistance(RiceBID, 0);
+			rmSetObjectDefMaxDistance(RiceBID, rmXFractionToMeters(0.5));
+			rmAddObjectDefConstraint(RiceBID, avoidImpassableLandMin);
+			rmAddObjectDefConstraint(RiceBID, stayInHillB1stlvl);
+			rmPlaceObjectDefAtLoc(RiceBID, 0, 0.50, 0.50);
+		}
+		*/
+		rmCreateAreaDistanceConstraint("avoid hill B "+i, hillBID, 1.0);
+		rmCreateAreaMaxDistanceConstraint("stay in hill B "+i, hillBID, 0.0);
+		rmCreateAreaMaxDistanceConstraint("stay near hill B "+i, hillBID, 11.0);
+	}
+	
+	int avoidHillB = rmConstraintID("avoid hill B 1");
+	int stayInHillB = rmConstraintID("stay in hill B 1");
+	int stayNearHillB = rmConstraintID("stay near hill B 1");
+
+	
+	//Big islands
+	for (i=1; <3)
+	{
+	int bigislandID = rmCreateArea("big island"+i);
+	rmSetAreaSize(bigislandID, 0.05, 0.06);
+	if (i == 1)
+	{
+		if (playerplacement == 1)
+			rmSetAreaLocation(bigislandID, rmRandFloat(0.92,0.95), rmRandFloat(0.82,0.85));
+		else
+			rmSetAreaLocation(bigislandID, rmRandFloat(0.82,0.85), rmRandFloat(0.92,0.95));
+	}
+	else
+	{
+		if (playerplacement == 1)
+			rmSetAreaLocation(bigislandID,rmRandFloat(0.05,0.08), rmRandFloat(0.15,0.18));
+		else
+			rmSetAreaLocation(bigislandID,rmRandFloat(0.15,0.18), rmRandFloat(0.05,0.08));
+	}
+	rmAddAreaInfluenceSegment(bigislandID, 0.42, 0.58, 0.58, 0.42);
+	rmSetAreaMix(bigislandID, "coastal_japan_b");
+	rmSetAreaTerrainType(bigislandID, "coastal_japan\ground_forest_co_japan"); 
+	rmPaintAreaTerrain(bigislandID);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_dirt1_co_japan", 0, 2);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_dirt3_co_japan", 2, 4);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_dirt2_co_japan", 4, 6);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_grass3_co_japan", 6, 8);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_grass3_co_japan", 8, 10);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_grass2_co_japan", 10, 12);
+	rmAddAreaTerrainLayer(bigislandID, "coastal_japan\ground_grass1_co_japan", 12, 14);
+	rmSetAreaWarnFailure(bigislandID, false);
+	rmAddAreaToClass(bigislandID, classIsland);
+	rmSetAreaMinBlobs(bigislandID, 2);
+	rmSetAreaMaxBlobs(bigislandID, 2);
+	rmSetAreaMinBlobDistance(bigislandID, 18.0);
+	rmSetAreaMaxBlobDistance(bigislandID, 23.0);
+	rmSetAreaCoherence(bigislandID, 0.55); //.46
+	rmSetAreaSmoothDistance(bigislandID, 12);
+	rmSetAreaElevationType(bigislandID, cElevTurbulence);
+	rmSetAreaElevationVariation(bigislandID, 5.0);
+	rmSetAreaBaseHeight(bigislandID, 4.0);
+	rmSetAreaElevationMinFrequency(bigislandID, 0.04);
+	rmSetAreaElevationOctaves(bigislandID, 3);
+	rmSetAreaElevationPersistence(bigislandID, 0.4); 
+	rmAddAreaConstraint(bigislandID, avoidMainIsland);
+	rmBuildArea(bigislandID);
+	rmCreateAreaDistanceConstraint("avoid big island "+i, bigislandID, 5.0);
+	rmCreateAreaMaxDistanceConstraint("stay in big island "+i, bigislandID, 0.0);
+	}
+	
+	int avoidBigIsland1 = rmConstraintID("avoid big island 1");
+	int avoidBigIsland2 = rmConstraintID("avoid big island 2");
+	int stayInBigIsland1 = rmConstraintID("stay in big island 1");
+	int stayInBigIsland2 = rmConstraintID("stay in big island 2");
+
+
+	//Small islands
+	for (i=1; <3)
+	{
+	int smallislandID = rmCreateArea("snall island"+i);
+	rmSetAreaSize(smallislandID, 0.008, 0.010);
+	if (i == 1)
+	{
+		if (playerplacement == 1)
+			rmSetAreaLocation(smallislandID, 0.52, 0.87);
+		else
+			rmSetAreaLocation(smallislandID, 0.87, 0.52);
+	}
+	else
+	{
+		if (playerplacement == 1)
+			rmSetAreaLocation(smallislandID, 0.52, 0.13);
+		else
+			rmSetAreaLocation(smallislandID, 0.13, 0.52);
+	}
+	rmAddAreaInfluenceSegment(smallislandID, 0.42, 0.58, 0.58, 0.42);
+	rmSetAreaMix(smallislandID, "coastal_japan_b");
+	rmSetAreaTerrainType(smallislandID, "borneo\ground_forest_borneo"); 
+	rmPaintAreaTerrain(smallislandID);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_dirt1_co_japan", 0, 2);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_dirt3_co_japan", 2, 4);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_dirt2_co_japan", 4, 6);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_grass3_co_japan", 6, 8);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_grass3_co_japan", 8, 10);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_grass2_co_japan", 10, 12);
+	rmAddAreaTerrainLayer(smallislandID, "coastal_japan\ground_grass1_co_japan", 12, 14);
+	rmSetAreaWarnFailure(smallislandID, false);
+	rmAddAreaToClass(smallislandID, classIsland);
+	rmSetAreaMinBlobs(smallislandID, 2);
+	rmSetAreaMaxBlobs(smallislandID, 2);
+	rmSetAreaMinBlobDistance(smallislandID, 8.0);
+	rmSetAreaMaxBlobDistance(smallislandID, 13.0);
+	rmSetAreaCoherence(smallislandID, 0.45); //.46
+	rmSetAreaSmoothDistance(smallislandID, 5);
+	rmSetAreaElevationType(smallislandID, cElevTurbulence);
+	rmSetAreaElevationVariation(smallislandID, 5.0);
+	rmSetAreaBaseHeight(smallislandID, 4.0);
+	rmSetAreaElevationMinFrequency(smallislandID, 0.04);
+	rmSetAreaElevationOctaves(smallislandID, 3);
+	rmSetAreaElevationPersistence(smallislandID, 0.4);    
+	rmAddAreaConstraint(smallislandID, avoidMainIsland);
+	rmBuildArea(smallislandID);
+	rmCreateAreaDistanceConstraint("avoid small island "+i, smallislandID, 5.0);
+	rmCreateAreaMaxDistanceConstraint("stay in small island "+i, smallislandID, 0.0);
+	}
+	
+	int avoidSmallIsland1 = rmConstraintID("avoid small island 1");
+	int avoidSmallIsland2 = rmConstraintID("avoid small island 2");
+	int stayInSmallIsland1 = rmConstraintID("stay in small island 1");
+	int stayInSmallIsland2 = rmConstraintID("stay in small island 2");
+	
+	// *********************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.40);
+	
+	// ******************************************** NATIVES *************************************************
+	
+	int natAreaA = rmCreateArea("nats area A");
+	rmSetAreaWarnFailure(natAreaA, false);
+	rmSetAreaSize(natAreaA, 0.03, 0.03);
+	rmSetAreaCoherence(natAreaA, 0.7);
+	rmSetAreaSmoothDistance(natAreaA, 4);
+//	rmSetAreaTerrainType(natAreaA, "new_england\ground2_cliff_ne");
+	
+	int natAreaB = rmCreateArea("nats area B");
+	rmSetAreaWarnFailure(natAreaB, false);
+	rmSetAreaSize(natAreaB, 0.03, 0.03);
+	rmSetAreaCoherence(natAreaB, 0.7);
+	rmSetAreaSmoothDistance(natAreaB, 4);
+//	rmSetAreaTerrainType(natAreaB, "new_england\ground2_cliff_ne");
+	
+	
+	int nativeID0 = -1;
+	int nativeID1 = -1;
+	int nativeID2 = -1;
+	int nativeID3 = -1;
+  
+	
+		nativeID0 = rmCreateGrouping("Jesuit mission A", "native jesuit mission borneo 0"+4);
+		nativeID1 = rmCreateGrouping("Jesuit mission B", "native jesuit mission borneo 0"+3);
+	
+		nativeID2 = rmCreateGrouping("Sufi mosque A", "native zen temple cj 0"+3);
+		nativeID3 = rmCreateGrouping("Sufi mosque B", "native zen temple cj 0"+3);
+	
+//	rmSetGroupingMinDistance(nativeID0, 0.00);
+//	rmSetGroupingMaxDistance(nativeID0, 0.00);
+//	rmSetGroupingMinDistance(nativeID1, 0.00);
+//	rmSetGroupingMaxDistance(nativeID1, 0.00);
+	rmAddGroupingToClass(nativeID0, rmClassID("natives"));
+	rmAddGroupingToClass(nativeID1, rmClassID("natives"));
+	rmAddGroupingToClass(nativeID2, rmClassID("natives"));
+	rmAddGroupingToClass(nativeID3, rmClassID("natives"));
+	if (playerplacement == 1)
+	{
+		if (cNumberNonGaiaPlayers < 4)
+		{
+			rmPlaceGroupingAtLoc(nativeID0, 0, 0.34, 0.70);
+			rmPlaceGroupingAtLoc(nativeID1, 0, 0.66, 0.30);
+			rmSetAreaLocation(natAreaA, 0.34, 0.70);
+			rmSetAreaLocation(natAreaB, 0.66, 0.30);
+		}
+		else
+		{
+			rmPlaceGroupingAtLoc(nativeID0, 0, 0.36, 0.72);
+			rmPlaceGroupingAtLoc(nativeID1, 0, 0.64, 0.28);
+			rmSetAreaLocation(natAreaA, 0.36, 0.72);
+			rmSetAreaLocation(natAreaB, 0.64, 0.28);
+		}
+	}
+	else
+	{
+		rmPlaceGroupingAtLoc(nativeID0, 0, 0.30, 0.66);
+		rmPlaceGroupingAtLoc(nativeID1, 0, 0.70, 0.34);
+		rmSetAreaLocation(natAreaA, 0.30, 0.66);
+		rmSetAreaLocation(natAreaB, 0.70, 0.34);
+	}
+	
+	rmPlaceGroupingAtLoc(nativeID2, 0, 0.62, 0.62);
+	rmPlaceGroupingAtLoc(nativeID3, 0, 0.40, 0.40);
+	
+	rmBuildArea(natAreaA);
+	rmBuildArea(natAreaB);
+	
+	int stayInNatAreaA = rmCreateAreaMaxDistanceConstraint("stay in nat area A", natAreaA, 0.0);
+	int stayInNatAreaB = rmCreateAreaMaxDistanceConstraint("stay in nat area B", natAreaB, 0.0);
+	int avoidNatAreaA = rmCreateAreaDistanceConstraint("avoid nat area A", natAreaA, 2.0);
+	int avoidNatAreaB = rmCreateAreaDistanceConstraint("avoid nat area B", natAreaB, 2.0);
+		
+	// ******************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.50);
+	
+	// ************************************ PLAYER STARTING RESOURCES ***************************************
+
+	// ******** Define ********
+
+	// Town center & units
+	int TCID = rmCreateObjectDef("player TC");
+	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
+	if (rmGetNomadStart())
+	{
+		rmAddObjectDefItem(TCID, "CoveredWagon", 1, 0.0);
+	}
+	else
+	{
+	rmAddObjectDefItem(TCID, "TownCenter", 1, 0.0);
+	rmAddObjectDefToClass(TCID, classStartingResource);
+	}
+	rmSetObjectDefMinDistance(TCID, 0.0);
+	rmSetObjectDefMaxDistance(TCID, 0.0);
+	
+	//Extra coin crates
+	int playerCrateID = rmCreateObjectDef("extra crates");
+	rmAddObjectDefItem(playerCrateID, "crateOfCoin", rmRandInt(1,2), 3.0);
+	rmSetObjectDefMinDistance(playerCrateID, 6);
+	rmSetObjectDefMaxDistance(playerCrateID, 10);
+	
+	// Starting mines
+	int playergoldID = rmCreateObjectDef("player mine");
+	rmAddObjectDefItem(playergoldID, "minecopper", 1, 0);
+	rmSetObjectDefMinDistance(playergoldID, 16);
+	rmSetObjectDefMaxDistance(playergoldID, 18);
+	rmAddObjectDefToClass(playergoldID, classStartingResource);
+	rmAddObjectDefToClass(playergoldID, classGold);
+	rmAddObjectDefConstraint(playergoldID, avoidTradeRouteShort);
+	rmAddObjectDefConstraint(playergoldID, avoidTradeRouteSocket);
+	rmAddObjectDefConstraint(playergoldID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playergoldID, avoidNatives);
+	rmAddObjectDefConstraint(playergoldID, avoidStartingResources);
+//	rmAddObjectDefConstraint(playergoldID, avoidEdge);
+		
+	// Starting trees
+	int playerTreeID = rmCreateObjectDef("player trees");
+	rmAddObjectDefItem(playerTreeID, "ypTreeIndo", rmRandInt(10,10), 7.0);
+    rmSetObjectDefMinDistance(playerTreeID, 12);
+    rmSetObjectDefMaxDistance(playerTreeID, 16);
+	rmAddObjectDefToClass(playerTreeID, classStartingResource);
+	rmAddObjectDefToClass(playerTreeID, classForest);
+	rmAddObjectDefConstraint(playerTreeID, avoidForestShort);
+//	rmAddObjectDefConstraint(playerTreeID, avoidTradeRoute);
+    rmAddObjectDefConstraint(playerTreeID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerTreeID, avoidStartingResources);
+	
+	// Starting berries
+	int playerberriesID = rmCreateObjectDef("player berries");
+	rmAddObjectDefItem(playerberriesID, "berrybush", 2, 3.0);
+	rmSetObjectDefMinDistance(playerberriesID, 12.0);
+	rmSetObjectDefMaxDistance(playerberriesID, 14.0);
+	rmAddObjectDefToClass(playerberriesID, classStartingResource);
+	rmAddObjectDefConstraint(playerberriesID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playerberriesID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerberriesID, avoidNatives);
+	rmAddObjectDefConstraint(playerberriesID, avoidStartingResources);
+	
+	// Starting herd
+	int playeherdID = rmCreateObjectDef("starting herd");
+	rmAddObjectDefItem(playeherdID, "ypIbex", rmRandInt(2,2), 4.0);
+	rmSetObjectDefMinDistance(playeherdID, 14.0);
+	rmSetObjectDefMaxDistance(playeherdID, 16.0);
+	rmSetObjectDefCreateHerd(playeherdID, true);
+	rmAddObjectDefToClass(playeherdID, classStartingResource);
+//	rmAddObjectDefConstraint(playeherdID, avoidTradeRoute);
+//	rmAddObjectDefConstraint(playeherdID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playeherdID, avoidNatives);
+	rmAddObjectDefConstraint(playeherdID, avoidStartingResources);
+		
+	// 2nd herd
+	int player2ndherdID = rmCreateObjectDef("player 2nd herd");
+	rmAddObjectDefItem(player2ndherdID, "ypserow", rmRandInt(8,8), 6.0);
+    rmSetObjectDefMinDistance(player2ndherdID, 34);
+    rmSetObjectDefMaxDistance(player2ndherdID, 36);
+	rmAddObjectDefToClass(player2ndherdID, classStartingResource);
+	rmSetObjectDefCreateHerd(player2ndherdID, true);
+	rmAddObjectDefConstraint(player2ndherdID, avoidStartingResources);
+	rmAddObjectDefConstraint(player2ndherdID, avoidEleShort); 
+//	rmAddObjectDefConstraint(player2ndherdID, avoidTradeRouteShort);
+//	rmAddObjectDefConstraint(player2ndherdID, avoidTradeRouteSocket);
+//	rmAddObjectDefConstraint(player2ndherdID, avoidImpassableLand);
+	rmAddObjectDefConstraint(player2ndherdID, avoidEdge);
+	rmAddObjectDefConstraint(player2ndherdID, avoidNativesShort);
+	
+	//Extra building
+	int playerSaloonID=rmCreateObjectDef("player saloon");
+	rmAddObjectDefItem(playerSaloonID, "ypTreeIndo", 1, 0.0);
+	rmSetObjectDefMinDistance(playerSaloonID, 12.0);
+	rmSetObjectDefMaxDistance(playerSaloonID, 16.0);
+	rmAddObjectDefConstraint(playerSaloonID, avoidStartingResources);
+	rmAddObjectDefConstraint(playerSaloonID, avoidImpassableLand);
+  
+	int playerFirepitID=rmCreateObjectDef("player firepit");
+	rmAddObjectDefItem(playerFirepitID, "ypTreeIndo", 1, 0.0);
+	rmSetObjectDefMinDistance(playerFirepitID, 12.0);
+	rmSetObjectDefMaxDistance(playerFirepitID, 16.0);
+	rmAddObjectDefConstraint(playerFirepitID, avoidStartingResources);
+	rmAddObjectDefConstraint(playerFirepitID, avoidImpassableLand);
+  
+	int playerMonID=rmCreateObjectDef("player monastery");
+	rmAddObjectDefItem(playerMonID, "ypTreeIndo", 1, 0.0);
+	rmSetObjectDefMinDistance(playerMonID, 12.0);
+	rmSetObjectDefMaxDistance(playerMonID, 16.0);
+	rmAddObjectDefConstraint(playerMonID, avoidStartingResources);
+	rmAddObjectDefConstraint(playerMonID, avoidImpassableLand);
+		
+
+	// Starting treasures
+	int playerNuggetID = rmCreateObjectDef("player nugget"); 
+	rmAddObjectDefItem(playerNuggetID, "Nugget", 1, 0.0);
+	rmSetNuggetDifficulty(1, 1);
+	rmSetObjectDefMinDistance(playerNuggetID, 18.0);
+	rmSetObjectDefMaxDistance(playerNuggetID, 28.0);
+	rmAddObjectDefToClass(playerNuggetID, classStartingResource);
+//	rmAddObjectDefConstraint(playerNuggetID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playerNuggetID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerNuggetID, avoidNatives);
+	rmAddObjectDefConstraint(playerNuggetID, avoidStartingResources);
+	rmAddObjectDefConstraint(playerNuggetID, avoidNugget); //Short
+	rmAddObjectDefConstraint(playerNuggetID, avoidEdge);
+	int nugget0count = rmRandInt (1,2); // 1,2
+	
+	//Colony water shipment flag
+	int shipmentflagID = rmCreateObjectDef("colony ship");
+	 rmAddObjectDefItem(shipmentflagID, "HomeCityWaterSpawnFlag", 1, 1.0);
+	rmSetObjectDefMinDistance(shipmentflagID, 0.0);
+	rmSetObjectDefMaxDistance(shipmentflagID, rmXFractionToMeters(0.12));
+	rmAddObjectDefConstraint(shipmentflagID, avoidFlag);
+	rmAddObjectDefConstraint(shipmentflagID, avoidLand);
+	rmAddObjectDefConstraint(shipmentflagID, avoidEdgeMore);
+//  rmSetHomeCityWaterSpawnPoint(i, flagLocation);
+
+	// Catamaran 
+	int catamaranID=rmCreateObjectDef("Catamaran");
+    rmAddObjectDefItem(catamaranID, "ypMarathanCatamaran", 1, 3.0);
+ 	
+		
+	// ******** Place ********
+	
+	for(i=1; <cNumberPlayers)
+	{
+		rmPlaceObjectDefAtLoc(TCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(TCID, i));
+		vector closestPoint = rmFindClosestPointVector(TCLoc, rmXFractionToMeters(1.0));
+		rmPlaceObjectDefAtLoc(shipmentflagID, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+		vector flagLocation = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(shipmentflagID, i));
+		rmPlaceObjectDefAtLoc(catamaranID, i, rmXMetersToFraction(xsVectorGetX(flagLocation)), rmZMetersToFraction(xsVectorGetZ(flagLocation)));
+
+		rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playergoldID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerCrateID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+//		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerberriesID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playeherdID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		if (rmGetNomadStart() == false) 
+		{
+			if 	(rmGetPlayerCiv(i) == rmGetCivID("Chinese") || rmGetPlayerCiv(i) == rmGetCivID("Japanese") || rmGetPlayerCiv(i) == rmGetCivID("Indians")) 
+			{
+				rmPlaceObjectDefAtLoc(playerMonID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+			}
+			else if (rmGetPlayerCiv(i) ==  rmGetCivID("XPIroquois") || rmGetPlayerCiv(i) ==  rmGetCivID("XPSioux") || rmGetPlayerCiv(i) ==  rmGetCivID("XPAztec"))
+			{
+				rmPlaceObjectDefAtLoc(playerFirepitID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+			}
+			else
+			{
+				rmPlaceObjectDefAtLoc(playerSaloonID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+			}
+		}
+		rmPlaceObjectDefAtLoc(player2ndherdID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerNuggetID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+//		if (nugget0count == 2)
+//			rmPlaceObjectDefAtLoc(playerNuggetID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));		
+		if(ypIsAsian(i) && rmGetNomadStart() == false)
+			rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+	}
+
+	// ************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.60);
+	
+	// ************************************** COMMON RESOURCES ****************************************
+  
+   
+	// ************* Mines **************
+	
+	int goldcount = 1+0.5*cNumberNonGaiaPlayers;  
+	
+	int coppercount = 2+1*cNumberNonGaiaPlayers;
+	
+	// Gold mines
+	for(i=0; < goldcount)
+	{
+		int commongoldID = rmCreateObjectDef("common gold mines"+i);
+		rmAddObjectDefItem(commongoldID, "Minegold", 1, 0.0);
+		rmSetObjectDefMinDistance(commongoldID, rmXFractionToMeters(0.04));
+		if (cNumberTeams <= 2)
+			rmSetObjectDefMaxDistance(commongoldID, rmXFractionToMeters(0.18));
+		else
+			rmSetObjectDefMaxDistance(commongoldID, rmXFractionToMeters(0.12));
+		rmAddObjectDefToClass(commongoldID, classGold);
+//		rmAddObjectDefConstraint(commongoldID, avoidTradeRoute);
+//		rmAddObjectDefConstraint(commongoldID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(commongoldID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(commongoldID, avoidNatAreaA);
+		rmAddObjectDefConstraint(commongoldID, avoidNatAreaB);
+		rmAddObjectDefConstraint(commongoldID, avoidGold);
+		rmAddObjectDefConstraint(commongoldID, avoidTownCenterVeryFar);
+		rmAddObjectDefConstraint(commongoldID, avoidEdge);
+		rmAddObjectDefConstraint(commongoldID, avoidCliff);
+		if (cNumberTeams <= 2)
+		{
+			if (i < goldcount/2)
+				rmAddObjectDefConstraint(commongoldID, stayNearHillA);
+			else
+				rmAddObjectDefConstraint(commongoldID, stayNearHillB);
+		}	
+		rmPlaceObjectDefAtLoc(commongoldID, 0, 0.50, 0.50);
+	}
+	
+	
+	// Copper mines
+	for(i=0; < coppercount)
+	{
+		int commoncopperID = rmCreateObjectDef("common copper mines"+i);
+		rmAddObjectDefItem(commoncopperID, "Minecopper", 1, 0.0);
+		rmSetObjectDefMinDistance(commoncopperID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(commoncopperID, rmXFractionToMeters(0.50));
+		rmAddObjectDefToClass(commoncopperID, classGold);
+//		rmAddObjectDefConstraint(commoncopperID, avoidTradeRoute);
+//		rmAddObjectDefConstraint(commoncopperID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(commoncopperID, avoidImpassableLand);
+		rmAddObjectDefConstraint(commoncopperID, avoidNatives);
+		rmAddObjectDefConstraint(commoncopperID, avoidGoldFar);
+		rmAddObjectDefConstraint(commoncopperID, avoidTownCenterVeryFar);
+		rmAddObjectDefConstraint(commoncopperID, avoidEdge);
+		rmAddObjectDefConstraint(commoncopperID, avoidCliff);
+		if (i < 6)
+		{
+			rmAddObjectDefConstraint(commoncopperID, avoidSmallIsland1);
+			rmAddObjectDefConstraint(commoncopperID, avoidSmallIsland2);
+		}
+		if (cNumberTeams <= 2)
+		{
+			if (i == 0)
+				rmAddObjectDefConstraint(commoncopperID, stayInBigIsland1);	
+			else if (i == 1)
+				rmAddObjectDefConstraint(commoncopperID, stayInBigIsland2);
+			else if (i == 6)
+				rmAddObjectDefConstraint(commoncopperID, stayInSmallIsland1);
+			else if (i == 7)
+				rmAddObjectDefConstraint(commoncopperID, stayInSmallIsland2);
+			else if (i%2 == 1)
+				rmAddObjectDefConstraint(commoncopperID, stayInNatAreaA);
+			else 
+				rmAddObjectDefConstraint(commoncopperID, stayInNatAreaB);
+		}	
+		else
+		{
+			if (i == 0)
+					rmAddObjectDefConstraint(commoncopperID, stayInBigIsland1);	
+			else if (i == 1)
+					rmAddObjectDefConstraint(commoncopperID, stayInBigIsland2);			
+			else if (i == 6)
+					rmAddObjectDefConstraint(commoncopperID, stayInSmallIsland1);
+			else if (i == 7)
+					rmAddObjectDefConstraint(commoncopperID, stayInSmallIsland2);		
+		}
+		rmPlaceObjectDefAtLoc(commoncopperID, 0, 0.50, 0.50);
+	}
+		
+	// *********************************
+	
+	// Text
+	rmSetStatusText("",0.70);
+	
+	// ************ Forest *************
+
+	// Inland forest
+	int forestinlandcount = 4+2*cNumberNonGaiaPlayers; //12
+	int stayInForestInlandPatch = -1;
+	
+	for (i=0; < forestinlandcount)
+	{
+		int forestinlandID = rmCreateArea("forest inland "+i);
+		rmSetAreaWarnFailure(forestinlandID, false);
+		rmSetAreaSize(forestinlandID, rmAreaTilesToFraction(200), rmAreaTilesToFraction(220)); // 130 150
+		rmSetAreaTerrainType(forestinlandID, "coastal_japan\ground_forest_co_japan"); 
+		rmSetAreaObeyWorldCircleConstraint(forestinlandID, false);
+//		rmSetAreaForestType(forestinlandID, "borneo forest");
+//		rmSetAreaForestDensity(forestinlandID, 0.8);
+//		rmSetAreaForestClumpiness(forestinlandID, 0.15);
+//		rmSetAreaForestUnderbrush(forestinlandID, 0.2);
+		rmSetAreaMinBlobs(forestinlandID, 2);
+		rmSetAreaMaxBlobs(forestinlandID, 4);
+		rmSetAreaMinBlobDistance(forestinlandID, 12.0);
+		rmSetAreaMaxBlobDistance(forestinlandID, 30.0);
+		rmSetAreaCoherence(forestinlandID, 0.55);
+		rmSetAreaSmoothDistance(forestinlandID, 6);
+		rmAddAreaToClass(forestinlandID, classForest);
+		rmAddAreaConstraint(forestinlandID, avoidForest);
+		rmAddAreaConstraint(forestinlandID, avoidGoldMin);
+		rmAddAreaConstraint(forestinlandID, avoidEleMin); 
+		rmAddAreaConstraint(forestinlandID, avoidSerowMin); 
+		rmAddAreaConstraint(forestinlandID, avoidTownCenter); 
+		rmAddAreaConstraint(forestinlandID, avoidNativesShort);
+//		rmAddAreaConstraint(forestinlandID, avoidTradeRouteShort);
+//		rmAddAreaConstraint(forestinlandID, avoidTradeRouteSocket);
+		rmAddAreaConstraint(forestinlandID, avoidImpassableLandFar);
+//		rmAddAreaConstraint(forestinlandID, avoidCliff);
+//		rmAddAreaConstraint(forestinlandID, avoidEdge);
+		rmAddAreaConstraint(forestinlandID, avoidSmallIsland1);
+		rmAddAreaConstraint(forestinlandID, avoidSmallIsland2);
+		rmBuildArea(forestinlandID);
+		
+		stayInForestInlandPatch = rmCreateAreaMaxDistanceConstraint("stay in forest inland patch"+i, forestinlandID, 0.0);
+		
+		for (j=0; < rmRandInt(18,22))
+		{
+			int forestinlandtreeID = rmCreateObjectDef("forest inland trees"+i+j);
+			rmAddObjectDefItem(forestinlandtreeID, "ypTreeIndo", rmRandInt(1,2), 3.0);
+			rmSetObjectDefMinDistance(forestinlandtreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(forestinlandtreeID,  rmXFractionToMeters(0.5));
+		//	rmAddObjectDefToClass(forestinlandtreeID, classForest);
+		//	rmAddObjectDefConstraint(forestinlandtreeID, avoidForestShort);
+//			rmAddObjectDefConstraint(forestinlandtreeID, avoidImpassableLandShort);
+			rmAddObjectDefConstraint(forestinlandtreeID, stayInForestInlandPatch);	
+			rmPlaceObjectDefAtLoc(forestinlandtreeID, 0, 0.50, 0.50);
+		}
+	}
+	
+
+	// Central forest
+	int forestcentralcount = 2+1*cNumberNonGaiaPlayers; //4
+	int stayInForestCentralPatch = -1;
+	
+	for (i=0; < forestcentralcount)
+	{
+		int forestcentralID = rmCreateArea("forest central "+i);
+		rmSetAreaWarnFailure(forestcentralID, false);
+		rmSetAreaSize(forestcentralID, rmAreaTilesToFraction(180), rmAreaTilesToFraction(200)); // 130 150
+		rmSetAreaTerrainType(forestcentralID, "coastal_japan\ground_forest_co_japan"); 
+		rmSetAreaObeyWorldCircleConstraint(forestcentralID, false);
+//		rmSetAreaForestType(forestcentralID, "borneo forest");
+//		rmSetAreaForestDensity(forestcentralID, 0.8);
+//		rmSetAreaForestClumpiness(forestcentralID, 0.15);
+//		rmSetAreaForestUnderbrush(forestcentralID, 0.2);
+		rmSetAreaMinBlobs(forestcentralID, 2);
+		rmSetAreaMaxBlobs(forestcentralID, 4);
+		rmSetAreaMinBlobDistance(forestcentralID, 12.0);
+		rmSetAreaMaxBlobDistance(forestcentralID, 30.0);
+		rmSetAreaCoherence(forestcentralID, 0.55);
+		rmSetAreaSmoothDistance(forestcentralID, 6);
+		rmAddAreaToClass(forestcentralID, classForest);
+		rmAddAreaConstraint(forestcentralID, avoidForestShort);
+		rmAddAreaConstraint(forestcentralID, avoidGoldMin);
+		rmAddAreaConstraint(forestcentralID, avoidEleMin); 
+		rmAddAreaConstraint(forestcentralID, avoidSerowMin); 
+		rmAddAreaConstraint(forestcentralID, avoidTownCenter); 
+		rmAddAreaConstraint(forestcentralID, avoidNativesShort);
+//		rmAddAreaConstraint(forestcentralID, avoidTradeRouteShort);
+//		rmAddAreaConstraint(forestcentralID, avoidTradeRouteSocket);
+		rmAddAreaConstraint(forestcentralID, avoidImpassableLandShort);
+//		rmAddAreaConstraint(forestcentralID, avoidCliff);
+		rmAddAreaConstraint(forestcentralID, stayCenter);
+		rmAddAreaConstraint(forestcentralID, avoidSmallIsland1);
+		rmAddAreaConstraint(forestcentralID, avoidSmallIsland2);
+		rmBuildArea(forestcentralID);
+		
+		stayInForestCentralPatch = rmCreateAreaMaxDistanceConstraint("stay in forest central patch"+i, forestcentralID, 0.0);
+		
+		for (j=0; < rmRandInt(16,18))
+		{
+			int forestcentraltreeID = rmCreateObjectDef("forest central trees"+i+j);
+			rmAddObjectDefItem(forestcentraltreeID, "ypTreeIndo", rmRandInt(1,2), 3.0);
+			rmSetObjectDefMinDistance(forestcentraltreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(forestcentraltreeID,  rmXFractionToMeters(0.5));
+		//	rmAddObjectDefToClass(forestcentraltreeID, classForest);
+		//	rmAddObjectDefConstraint(forestcentraltreeID, avoidForestShort);
+//			rmAddObjectDefConstraint(forestcentraltreeID, avoidImpassableLandShort);
+			rmAddObjectDefConstraint(forestcentraltreeID, stayInForestCentralPatch);	
+			rmPlaceObjectDefAtLoc(forestcentraltreeID, 0, 0.50, 0.50);
+		}
+	}
+	
+	// Coastal forest
+	int forestcoastalcount = 4+2*cNumberNonGaiaPlayers; //12
+	int stayInForestCoastalPatch = -1;
+	
+	for (i=0; < forestcoastalcount)
+	{
+		int forestcoastalID = rmCreateArea("forest coastal "+i);
+		rmSetAreaWarnFailure(forestcoastalID, false);
+		rmSetAreaSize(forestcoastalID, rmAreaTilesToFraction(180), rmAreaTilesToFraction(200)); // 130 150
+//		rmSetAreaTerrainType(forestcoastalID, "coastal_japan\ground_forest_co_japan"); 
+		rmSetAreaObeyWorldCircleConstraint(forestcoastalID, false);
+//		rmSetAreaForestType(forestcoastalID, "borneo forest");
+//		rmSetAreaForestDensity(forestcoastalID, 0.8);
+//		rmSetAreaForestClumpiness(forestcoastalID, 0.15);
+//		rmSetAreaForestUnderbrush(forestcoastalID, 0.2);
+		rmSetAreaMinBlobs(forestcoastalID, 2);
+		rmSetAreaMaxBlobs(forestcoastalID, 4);
+		rmSetAreaMinBlobDistance(forestcoastalID, 12.0);
+		rmSetAreaMaxBlobDistance(forestcoastalID, 30.0);
+		rmSetAreaCoherence(forestcoastalID, 0.55);
+		rmSetAreaSmoothDistance(forestcoastalID, 6);
+		rmAddAreaToClass(forestcoastalID, classForest);
+		rmAddAreaConstraint(forestcoastalID, avoidForestShort);
+		rmAddAreaConstraint(forestcoastalID, avoidGoldMin);
+		rmAddAreaConstraint(forestcoastalID, avoidEleMin); 
+		rmAddAreaConstraint(forestcoastalID, avoidSerowMin); 
+		rmAddAreaConstraint(forestcoastalID, avoidTownCenterShort); 
+		rmAddAreaConstraint(forestcoastalID, avoidNativesShort);
+//		rmAddAreaConstraint(forestcoastalID, avoidTradeRouteShort);
+//		rmAddAreaConstraint(forestcoastalID, avoidTradeRouteSocket);
+		rmAddAreaConstraint(forestcoastalID, avoidImpassableLandShort);
+		rmAddAreaConstraint(forestcoastalID, avoidCliff);
+//		rmAddAreaConstraint(forestcoastalID, avoidEdge);
+		rmAddAreaConstraint(forestcoastalID, avoidCenter);
+		rmAddAreaConstraint(forestcoastalID, avoidSmallIsland1);
+		rmAddAreaConstraint(forestcoastalID, avoidSmallIsland2);
+		rmBuildArea(forestcoastalID);
+		
+		stayInForestCoastalPatch = rmCreateAreaMaxDistanceConstraint("stay in forest coastal patch"+i, forestcoastalID, 0.0);
+		
+		for (j=0; < rmRandInt(14,16))
+		{
+			int forestcoastaltreeID = rmCreateObjectDef("forest coastal trees"+i+j);
+			rmAddObjectDefItem(forestcoastaltreeID, "ypTreeIndo", rmRandInt(1,2), 3.0);
+			rmSetObjectDefMinDistance(forestcoastaltreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(forestcoastaltreeID,  rmXFractionToMeters(0.5));
+		//	rmAddObjectDefToClass(forestcoastaltreeID, classForest);
+		//	rmAddObjectDefConstraint(forestcoastaltreeID, avoidForestShort);
+//			rmAddObjectDefConstraint(forestcoastaltreeID, avoidImpassableLandShort);
+			rmAddObjectDefConstraint(forestcoastaltreeID, stayInForestCoastalPatch);	
+			rmPlaceObjectDefAtLoc(forestcoastaltreeID, 0, 0.50, 0.50);
+		}
+	}
+	
+	
+	// Random  trees 
+	for (i=0; < 8+2*cNumberNonGaiaPlayers)
+	{
+		int randominlandtreeID = rmCreateObjectDef("random trees inland "+i);
+		if (i < 8)
+			rmAddObjectDefItem(randominlandtreeID, "ypTreeIndo", rmRandInt(2,3), 5.0);
+		else
+			rmAddObjectDefItem(randominlandtreeID, "ypTreeIndo", rmRandInt(2,3), 5.0);
+		rmSetObjectDefMinDistance(randominlandtreeID,  rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randominlandtreeID,  rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(randominlandtreeID, classForest);
+		if (i < 8)
+		rmAddObjectDefConstraint(randominlandtreeID, avoidForestShort);
+		rmAddObjectDefConstraint(randominlandtreeID, avoidGoldMin);
+		rmAddObjectDefConstraint(randominlandtreeID, avoidSerowMin); 
+		rmAddObjectDefConstraint(randominlandtreeID, avoidEleMin); 
+		rmAddObjectDefConstraint(randominlandtreeID, avoidTownCenterShort); 
+		rmAddObjectDefConstraint(randominlandtreeID, avoidNativesShort);
+//		rmAddObjectDefConstraint(randominlandtreeID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(randominlandtreeID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(randominlandtreeID, avoidStartingResources);
+		if (i < 8)
+			rmAddObjectDefConstraint(randominlandtreeID, avoidImpassableLandFar);
+		else
+			rmAddObjectDefConstraint(randominlandtreeID, avoidImpassableLandShort);
+		if (i < 8)
+		{
+			rmAddObjectDefConstraint(randominlandtreeID, avoidSmallIsland1);
+			rmAddObjectDefConstraint(randominlandtreeID, avoidSmallIsland2);
+			rmAddObjectDefConstraint(randominlandtreeID, avoidBigIsland1);
+			rmAddObjectDefConstraint(randominlandtreeID, avoidBigIsland2);
+		}
+		else if (i < 10)
+			rmAddObjectDefConstraint(randominlandtreeID, stayInBigIsland1);
+		else if (i < 12)
+			rmAddObjectDefConstraint(randominlandtreeID, stayInBigIsland2);
+		else if (i < 14)
+			rmAddObjectDefConstraint(randominlandtreeID, stayInSmallIsland1);
+		else
+			rmAddObjectDefConstraint(randominlandtreeID, stayInSmallIsland2);
+		rmPlaceObjectDefAtLoc(randominlandtreeID, 0, 0.50, 0.50);
+	}
+	
+	// Middle  trees 
+	for (i=0; < 2+1*cNumberNonGaiaPlayers)
+	{
+		int middletreeID = rmCreateObjectDef("middle trees "+i);
+		rmAddObjectDefItem(middletreeID, "ypTreeIndo", rmRandInt(5,8), 8.0);
+		rmSetObjectDefMinDistance(middletreeID,  rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(middletreeID,  rmXFractionToMeters(0.05));
+		rmAddObjectDefToClass(middletreeID, classForest);
+		rmAddObjectDefConstraint(middletreeID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(middletreeID, avoidForestVeryShort);
+		rmAddObjectDefConstraint(middletreeID, avoidGoldMin);
+		rmAddObjectDefConstraint(middletreeID, avoidSerowMin); 
+		rmAddObjectDefConstraint(middletreeID, avoidEleMin); 
+		rmAddObjectDefConstraint(middletreeID, avoidTownCenterShort); 
+		rmAddObjectDefConstraint(middletreeID, avoidNativesShort);
+	rmPlaceObjectDefAtLoc(middletreeID, 0, 0.50, 0.50);
+	}
+	
+		
+	
+	// ********************************
+	
+	// Text
+	rmSetStatusText("",0.80);
+	
+	// ************ Herds *************
+	
+	int serowherdcount = 5+2*cNumberNonGaiaPlayers;
+		
+	//Serow herds
+	for (i=0; < serowherdcount)
+	{
+		int serowherdID = rmCreateObjectDef("serow herd"+i);
+		rmAddObjectDefItem(serowherdID, "ypserow", rmRandInt(8,8), 6.0);
+		rmSetObjectDefMinDistance(serowherdID, 0.0);
+		rmSetObjectDefMaxDistance(serowherdID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(serowherdID, true);
+		rmAddObjectDefConstraint(serowherdID, avoidForestMin);
+		rmAddObjectDefConstraint(serowherdID, avoidGoldShort);
+		rmAddObjectDefConstraint(serowherdID, avoidSerowFar); 
+		rmAddObjectDefConstraint(serowherdID, avoidEleFar); 
+		rmAddObjectDefConstraint(serowherdID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(serowherdID, avoidNativesShort);
+//		rmAddObjectDefConstraint(serowherdID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(serowherdID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(serowherdID, avoidImpassableLandShort);
+		if (i > 1)
+		{
+		rmAddObjectDefConstraint(serowherdID, avoidBigIsland1);
+		rmAddObjectDefConstraint(serowherdID, avoidBigIsland2);
+		}
+		else if (i == 0)
+			rmAddObjectDefConstraint(serowherdID, stayInBigIsland1);
+		else
+			rmAddObjectDefConstraint(serowherdID, stayInBigIsland2);
+		rmAddObjectDefConstraint(serowherdID, avoidSmallIsland1);
+		rmAddObjectDefConstraint(serowherdID, avoidSmallIsland2);
+		rmAddObjectDefConstraint(serowherdID, avoidEdge);
+		rmPlaceObjectDefAtLoc(serowherdID, 0, 0.50, 0.50);	
+	}
+
+	// ************************************
+	
+	// ************ Berries *************
+	
+	int berriescount = 4+2*cNumberNonGaiaPlayers;
+		
+	//Berries
+	for (i=0; < berriescount)
+	{
+		int berriesID = rmCreateObjectDef("berries"+i);
+		rmAddObjectDefItem(berriesID, "berrybush", rmRandInt(3,3), 4.0);
+		rmSetObjectDefMinDistance(berriesID, 0.0);
+		rmSetObjectDefMaxDistance(berriesID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(berriesID, true);
+		rmAddObjectDefConstraint(berriesID, avoidForestMin);
+		rmAddObjectDefConstraint(berriesID, avoidGoldShort);
+		rmAddObjectDefConstraint(berriesID, avoidSerowShort); 
+		rmAddObjectDefConstraint(berriesID, avoidEleShort); 
+		rmAddObjectDefConstraint(berriesID, avoidBerriesFar); 
+		rmAddObjectDefConstraint(berriesID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(berriesID, avoidNativesShort);
+//		rmAddObjectDefConstraint(berriesID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(berriesID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(berriesID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(berriesID, avoidBigIsland1);
+		rmAddObjectDefConstraint(berriesID, avoidBigIsland2);
+		if (i > 1)
+		{
+			rmAddObjectDefConstraint(berriesID, avoidSmallIsland1);
+			rmAddObjectDefConstraint(berriesID, avoidSmallIsland2);
+		}
+		else if (i == 0)
+			rmAddObjectDefConstraint(berriesID, stayInSmallIsland1);
+		else
+			rmAddObjectDefConstraint(berriesID, stayInSmallIsland2);
+		rmAddObjectDefConstraint(berriesID, avoidEdge);
+		rmPlaceObjectDefAtLoc(berriesID, 0, 0.50, 0.50);	
+	}
+	
+	// ************************************
+	
+	// Text
+	rmSetStatusText("",0.90);
+		
+	// ************** Treasures ***************
+	
+	int treasure1count = 2+1*cNumberNonGaiaPlayers;
+	int treasure2count = 3+1*cNumberNonGaiaPlayers;
+	int treasure4count = 1+0.34*cNumberNonGaiaPlayers;
+	
+	//Treasures lvl 2
+	for (i=0; < treasure2count)
+	{
+		int Nugget2ID = rmCreateObjectDef("Nugget lvl 2 "+i);
+		rmAddObjectDefItem(Nugget2ID, "Nugget", rmRandInt(1,1), 2.0);
+		rmSetObjectDefMinDistance(Nugget2ID, 0.0);
+		rmSetObjectDefMaxDistance(Nugget2ID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(Nugget2ID, true);
+		rmAddObjectDefConstraint(Nugget2ID, avoidForestMin);
+		rmAddObjectDefConstraint(Nugget2ID, avoidGoldMin);
+		rmAddObjectDefConstraint(Nugget2ID, avoidSerowMin);
+		rmAddObjectDefConstraint(Nugget2ID, avoidBerriesMin);
+		rmAddObjectDefConstraint(Nugget2ID, avoidEleMin); 
+		rmAddObjectDefConstraint(Nugget2ID, avoidBerriesMin); 
+		rmAddObjectDefConstraint(Nugget2ID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(Nugget2ID, avoidNativesShort);
+		rmAddObjectDefConstraint(Nugget2ID, avoidNuggetFar);
+//		rmAddObjectDefConstraint(Nugget2ID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(Nugget2ID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(Nugget2ID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(Nugget2ID, avoidEdge);
+		if (i == 0)
+			rmAddObjectDefConstraint(Nugget2ID, stayInHillA);
+		else if (i == 1)
+			rmAddObjectDefConstraint(Nugget2ID, stayInHillB);
+		else if (i == 2)
+			rmAddObjectDefConstraint(Nugget2ID, stayInBigIsland1);
+		else if (i == 3)
+			rmAddObjectDefConstraint(Nugget2ID, stayInBigIsland2);
+		else
+		{
+			rmAddObjectDefConstraint(Nugget2ID, avoidBigIsland1);
+			rmAddObjectDefConstraint(Nugget2ID, avoidBigIsland2);
+			rmAddObjectDefConstraint(Nugget2ID, avoidSmallIsland1);
+			rmAddObjectDefConstraint(Nugget2ID, avoidSmallIsland2);
+		}
+		rmSetNuggetDifficulty(2,2);
+		rmPlaceObjectDefAtLoc(Nugget2ID, 0, 0.50, 0.50);	
+	}
+	
+	//Treasures lvl 4
+	for (i=0; < treasure4count)
+	{
+		int Nugget4ID = rmCreateObjectDef("Nugget lvl 4 "+i);
+		rmAddObjectDefItem(Nugget4ID, "Nugget", rmRandInt(1,1), 2.0);
+		rmSetObjectDefMinDistance(Nugget4ID, 0.0);
+		rmSetObjectDefMaxDistance(Nugget4ID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(Nugget4ID, true);
+		rmAddObjectDefConstraint(Nugget4ID, avoidForestMin);
+		rmAddObjectDefConstraint(Nugget4ID, avoidGoldMin);
+		rmAddObjectDefConstraint(Nugget4ID, avoidSerowMin);
+		rmAddObjectDefConstraint(Nugget4ID, avoidBerriesMin);
+		rmAddObjectDefConstraint(Nugget4ID, avoidEleMin); 
+		rmAddObjectDefConstraint(Nugget4ID, avoidBerriesMin); 
+		rmAddObjectDefConstraint(Nugget4ID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(Nugget4ID, avoidNativesShort);
+		rmAddObjectDefConstraint(Nugget4ID, avoidNuggetFar);
+//		rmAddObjectDefConstraint(Nugget4ID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(Nugget4ID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(Nugget4ID, avoidImpassableLandFar);
+		rmAddObjectDefConstraint(Nugget4ID, avoidEdge);
+		rmAddObjectDefConstraint(Nugget4ID, stayCenter);
+		rmAddObjectDefConstraint(Nugget4ID, avoidBigIsland1);
+		rmAddObjectDefConstraint(Nugget4ID, avoidBigIsland2);
+		rmAddObjectDefConstraint(Nugget4ID, avoidSmallIsland1);
+		rmAddObjectDefConstraint(Nugget4ID, avoidSmallIsland2);
+		rmSetNuggetDifficulty(4,4);
+		if (cNumberNonGaiaPlayers >= 3)
+			rmPlaceObjectDefAtLoc(Nugget4ID, 0, 0.50, 0.50);	
+	}
+	
+	//Treasures lvl 
+	for (i=0; < treasure1count)
+	{
+		int Nugget1ID = rmCreateObjectDef("Nugget lvl 1 "+i);
+		rmAddObjectDefItem(Nugget1ID, "Nugget", rmRandInt(1,1), 2.0);
+		rmSetObjectDefMinDistance(Nugget1ID, 0.0);
+		rmSetObjectDefMaxDistance(Nugget1ID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(Nugget1ID, true);
+		rmAddObjectDefConstraint(Nugget1ID, avoidForestMin);
+		rmAddObjectDefConstraint(Nugget1ID, avoidGoldMin);
+		rmAddObjectDefConstraint(Nugget1ID, avoidSerowMin);
+		rmAddObjectDefConstraint(Nugget1ID, avoidBerriesMin);
+		rmAddObjectDefConstraint(Nugget1ID, avoidEleMin); 
+		rmAddObjectDefConstraint(Nugget1ID, avoidBerriesMin); 
+		rmAddObjectDefConstraint(Nugget1ID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(Nugget1ID, avoidNativesShort);
+		rmAddObjectDefConstraint(Nugget1ID, avoidNuggetFar);
+//		rmAddObjectDefConstraint(Nugget1ID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(Nugget1ID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(Nugget1ID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(Nugget1ID, avoidEdge);
+		rmAddObjectDefConstraint(Nugget1ID, avoidBigIsland1);
+		rmAddObjectDefConstraint(Nugget1ID, avoidBigIsland2);
+		rmAddObjectDefConstraint(Nugget1ID, avoidSmallIsland1);
+		rmAddObjectDefConstraint(Nugget1ID, avoidSmallIsland2);
+		rmSetNuggetDifficulty(1,1);
+		rmPlaceObjectDefAtLoc(Nugget1ID, 0, 0.50, 0.50);	
+	}
+	
+	// ****************************************
+	
+	// *************** Buffalos ***************
+	
+	//Buffalos 
+	
+	int buffalocount = 10;
+	if (cNumberNonGaiaPlayers >=4)
+		buffalocount = 14;
+	if (cNumberNonGaiaPlayers >=6)
+		buffalocount = 20;
+		
+	for (i=0; < buffalocount)
+	{
+		int BuffaloID = rmCreateObjectDef("Buffalo"+i);
+		if (i < buffalocount/5)
+			rmAddObjectDefItem(BuffaloID, "ypWaterBuffalo", rmRandInt(2,2), 4.0);
+		else 
+			rmAddObjectDefItem(BuffaloID, "ypWaterBuffalo", rmRandInt(1,1), 2.0);
+		rmSetObjectDefMinDistance(BuffaloID, 0.0);
+		rmSetObjectDefMaxDistance(BuffaloID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(BuffaloID, true);
+		rmAddObjectDefConstraint(BuffaloID, avoidForestMin);
+		rmAddObjectDefConstraint(BuffaloID, avoidGoldMin);
+		rmAddObjectDefConstraint(BuffaloID, avoidSerowMin);
+		rmAddObjectDefConstraint(BuffaloID, avoidBerriesMin);
+		rmAddObjectDefConstraint(BuffaloID, avoidEleMin); 
+		rmAddObjectDefConstraint(BuffaloID, avoidBerriesMin); 
+		rmAddObjectDefConstraint(BuffaloID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(BuffaloID, avoidNativesShort);
+		rmAddObjectDefConstraint(BuffaloID, avoidNuggetMin);
+		rmAddObjectDefConstraint(BuffaloID, avoidBuffalo);
+//		rmAddObjectDefConstraint(BuffaloID, avoidTradeRouteShort);
+//		rmAddObjectDefConstraint(BuffaloID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(BuffaloID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(BuffaloID, avoidEdge);
+		if (cNumberTeams <= 2)
+		{
+			if (i < buffalocount/10)
+				rmAddObjectDefConstraint(BuffaloID, stayInBigIsland1);
+			else if (i < buffalocount/5)
+				rmAddObjectDefConstraint(BuffaloID, stayInBigIsland2);
+			else
+			{
+				rmAddObjectDefConstraint(BuffaloID, avoidBigIsland1);
+				rmAddObjectDefConstraint(BuffaloID, avoidBigIsland2);
+				rmAddObjectDefConstraint(BuffaloID, avoidSmallIsland1);
+				rmAddObjectDefConstraint(BuffaloID, avoidSmallIsland2);
+			}
+		}	
+		else
+		{
+			if (i == 0)
+				rmAddObjectDefConstraint(BuffaloID, stayInBigIsland1);
+			else if (i == 1)
+				rmAddObjectDefConstraint(BuffaloID, stayInBigIsland2);
+			else if (i < buffalocount/5)
+				rmAddObjectDefConstraint(BuffaloID, stayCenter);
+			else
+			{
+				rmAddObjectDefConstraint(BuffaloID, avoidBigIsland1);
+				rmAddObjectDefConstraint(BuffaloID, avoidBigIsland2);
+				rmAddObjectDefConstraint(BuffaloID, avoidSmallIsland1);
+				rmAddObjectDefConstraint(BuffaloID, avoidSmallIsland2);
+			}
+		}
+		rmPlaceObjectDefAtLoc(BuffaloID, 0, 0.50, 0.50);	
+	}
+
+	// ****************************************
+	
+	// ************ Sea resources *************
+	
+	 // Water nuggets
+	int nuggetwcount = 4+1*cNumberNonGaiaPlayers;
+	
+	for (i=0; < nuggetwcount)
+	{
+		int nuggetW= rmCreateObjectDef("nugget water"+i); 
+		rmAddObjectDefItem(nuggetW, "ypNuggetBoat", 1, 0.0);
+		rmSetNuggetDifficulty(5, 5);
+		rmSetObjectDefMinDistance(nuggetW, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(nuggetW, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(nuggetW, avoidLand);
+		rmAddObjectDefConstraint(nuggetW, avoidEdge);
+		rmAddObjectDefConstraint(nuggetW, avoidNuggetWater);
+		rmPlaceObjectDefAtLoc(nuggetW, 0, 0.50, 0.50);
+	}
+	
+	//Fish
+	int fishcount = 12+4*cNumberNonGaiaPlayers;
+	int whalecount = 6+2*cNumberNonGaiaPlayers;
+	
+	for (i=0; < whalecount)
+	{
+		int whaleID=rmCreateObjectDef("whale"+i);
+		rmAddObjectDefItem(whaleID, "HumpbackWhale", 1, 2.0);
+		rmSetObjectDefMinDistance(whaleID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(whaleID, avoidWhale);
+		rmAddObjectDefConstraint(whaleID, avoidLandFar);
+		rmAddObjectDefConstraint(whaleID, avoidFlag);
+		rmAddObjectDefConstraint(whaleID, avoidEdge);
+		rmAddObjectDefConstraint(whaleID, avoidNuggetWaterShort);
+		rmPlaceObjectDefAtLoc(whaleID, 0, 0.50, 0.50);
+	}
+	
+	for (i=0; < fishcount)
+	{
+		int fishID = rmCreateObjectDef("fish"+i);
+		rmAddObjectDefItem(fishID, "ypFishMolaMola", rmRandInt(2,2), 10.0);
+		rmSetObjectDefMinDistance(fishID, 0.0);
+		rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.50));
+		rmAddObjectDefConstraint(fishID, avoidFish);
+		rmAddObjectDefConstraint(fishID, avoidLand);
+		rmAddObjectDefConstraint(fishID, avoidFlagShort);
+		rmAddObjectDefConstraint(fishID, avoidEdge);
+		rmAddObjectDefConstraint(fishID, avoidNuggetWaterShort);
+		rmPlaceObjectDefAtLoc(fishID, 0, 0.50, 0.50);
+	}
+	
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.5;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+	// Text
+	rmSetStatusText("",1.00);
+	
+} //END
+	
+	
\ No newline at end of file
diff --git a/RMM/Kilimanjaro.xml b/RMM/Kilimanjaro.xml
new file mode 100644
index 0000000..d8530ab
--- /dev/null
+++ b/RMM/Kilimanjaro.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\kilimanjaro" 
+displayNameID = "130084"
+details = "130085" 
+loadDetails = "130086" 
+loadBackground="ui\random_map\africa\kilimanjaro\kilimanjaro_map">
+   <loadss>ui\random_map\africa\kilimanjaro\kilimanjaro_ss_01</loadss>
+   <loadss>ui\random_map\africa\kilimanjaro\kilimanjaro_ss_02</loadss>
+   <loadss>ui\random_map\africa\kilimanjaro\kilimanjaro_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/Kilimanjaro.xs b/RMM/Kilimanjaro.xs
new file mode 100644
index 0000000..92dc998
--- /dev/null
+++ b/RMM/Kilimanjaro.xs
@@ -0,0 +1,1048 @@
+// ESOC TIBET (1v1, TEAM, FFA)
+// designed by Garja
+
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+
+// Main entry point for random map script
+void main(void)
+{
+		
+	// Text
+	// These status text lines are used to manually animate the map generation progress bar
+	rmSetStatusText("",0.01); 
+	
+	// ************************************** GENERAL FEATURES *****************************************
+	
+	// Picks the map size
+	int playerTiles=13000; //11000
+	if (cNumberNonGaiaPlayers >= 4)
+		playerTiles = 12000;
+	if (cNumberNonGaiaPlayers >= 6)
+		playerTiles = 11000;
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles); //2.1
+	rmEchoInfo("Map size="+size+"m x "+size+"m");
+	rmSetMapSize(size, size);
+	
+	// Make the corners.
+	rmSetWorldCircleConstraint(true);
+	
+	// Picks a default water height
+	rmSetSeaLevel(-6.0);	// this is height of river surface compared to surrounding land. River depth is in the river XML.
+
+	rmSetMapElevationParameters(cElevTurbulence, 0.04, 2, 0.5, 4.5); // type, frequency, octaves, persistence, variation 
+//	rmSetMapElevationHeightBlend(1);
+	
+	
+	// Picks default terrain and water
+	rmSetBaseTerrainMix("himalayas_a"); // 
+	rmTerrainInitialize("himalayas\ground_dirt3_himal", -6.0); // 
+	rmSetMapType("himalayas"); 
+	rmSetMapType("snow");
+	rmSetMapType("land");
+	rmSetLightingSet("great lakes winter");
+
+	// Choose Mercs
+	chooseMercs();
+	
+	// Text
+	rmSetStatusText("",0.10);
+	
+	// Set up Natives
+	int subCiv0 = -1;
+	int subCiv1 = -1;
+	subCiv0 = rmGetCivID("uger");
+	subCiv1 = rmGetCivID("uger");
+	rmSetSubCiv(0, "uger");
+	rmSetSubCiv(1, "uger");
+	
+
+	//Define some classes. These are used later for constraints.
+	int classPlayer = rmDefineClass("player");
+	rmDefineClass("classHill");
+	int classPatch = rmDefineClass("patch");
+	int classPatch2 = rmDefineClass("patch2");
+	int classPatch3 = rmDefineClass("patch3");
+	int classPond = rmDefineClass("pond");
+	int classRocks = rmDefineClass("rocks");
+	int classGrass = rmDefineClass("grass");
+	rmDefineClass("starting settlement");
+	rmDefineClass("startingUnit");
+	int classForest = rmDefineClass("Forest");
+	int importantItem = rmDefineClass("importantItem");
+	int classNative = rmDefineClass("natives");
+	int classCliff = rmDefineClass("Cliffs");
+	int classUpperGold = rmDefineClass("UpperGold");
+	int classLowerGold = rmDefineClass("LowerGold");
+	int classStartingResource = rmDefineClass("startingResource");
+	
+	// ******************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.20);
+	
+	// ************************************* CONTRAINTS *****************************************
+	// These are used to have objects and areas avoid each other
+   
+	// Cardinal Directions & Map placement
+	int avoidEdge = rmCreatePieConstraint("Avoid Edge",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.47), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int avoidEdgeMore = rmCreatePieConstraint("Avoid Edge More",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.38), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int avoidCenter = rmCreatePieConstraint("Avoid Center",0.5,0.5,rmXFractionToMeters(0.28), rmXFractionToMeters(0.5), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int stayCenter = rmCreatePieConstraint("Stay Center", 0.50, 0.50, rmXFractionToMeters(0.0), rmXFractionToMeters(0.25), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int stayCenterMore = rmCreatePieConstraint("Stay Center more",0.45,0.45,rmXFractionToMeters(0.0), rmXFractionToMeters(0.26), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int staySW = rmCreatePieConstraint("Stay SW", 0.50, 0.50,rmXFractionToMeters(0.0), rmXFractionToMeters(0.50), rmDegreesToRadians(260),rmDegreesToRadians(280));
+	int stayNE = rmCreatePieConstraint("Stay NE", 0.50, 0.50,rmXFractionToMeters(0.0), rmXFractionToMeters(0.50), rmDegreesToRadians(80),rmDegreesToRadians(100));
+	int staySouthHalf = rmCreatePieConstraint("Stay south half", 0.50, 0.50,rmXFractionToMeters(0.0), rmXFractionToMeters(0.50), rmDegreesToRadians(188),rmDegreesToRadians(352));
+	int stayNorthHalf = rmCreatePieConstraint("Stay north half", 0.50, 0.50,rmXFractionToMeters(0.0), rmXFractionToMeters(0.50), rmDegreesToRadians(368),rmDegreesToRadians(172));
+	int plateauTrack = rmCreatePieConstraint("plateau limit constraint", 0.50, 0.50,rmXFractionToMeters(0.0), rmXFractionToMeters(0.36), rmDegreesToRadians(0),rmDegreesToRadians(360));
+		
+	// Resource avoidance
+	int avoidForest=rmCreateClassDistanceConstraint("avoid forest", rmClassID("Forest"), 30.0); //15.0
+	int avoidForestShort=rmCreateClassDistanceConstraint("avoid forest short", rmClassID("Forest"), 20.0); //15.0
+	int avoidForestMin=rmCreateClassDistanceConstraint("avoid forest min", rmClassID("Forest"), 4.0);
+	int avoidSerowFar = rmCreateTypeDistanceConstraint("avoid Serow far", "ypSerow", 50.0);
+	int avoidSerow = rmCreateTypeDistanceConstraint("avoid Serow", "ypSerow", 30.0);
+	int avoidSerowShort = rmCreateTypeDistanceConstraint("avoid Serow short", "ypSerow", 25.0);
+	int avoidSerowMin = rmCreateTypeDistanceConstraint("avoid Serow min", "ypSerow", 4.0);
+	int avoidIbexFar = rmCreateTypeDistanceConstraint("avoid Ibex far", "ypIbex", 58.0);
+	int avoidIbex = rmCreateTypeDistanceConstraint("avoid  Ibex", "ypIbex", 50.0);
+	int avoidIbexShort = rmCreateTypeDistanceConstraint("avoid  Ibex short", "ypIbex", 35.0);
+	int avoidIbexMin = rmCreateTypeDistanceConstraint("avoid Ibex min", "ypIbex", 4.0);
+	int avoidMuskdeerFar = rmCreateTypeDistanceConstraint("avoid muskdeer far", "ypmuskdeer", 70.0);
+	int avoidMuskdeer = rmCreateTypeDistanceConstraint("avoid muskdeer ", "ypmuskdeer", 45.0);
+	int avoidMuskdeerMin = rmCreateTypeDistanceConstraint("avoid muskdeer min ", "ypmuskdeer", 4.0);
+	int avoidGoldTypeMin = rmCreateTypeDistanceConstraint("coin avoids coin short", "gold", 8.0);
+	int avoidGoldTypeShort = rmCreateTypeDistanceConstraint("coin avoids coin short", "gold", 15.0);
+	int avoidGoldTypeMed = rmCreateTypeDistanceConstraint("coin avoids coin", "gold", 25.0);
+	int avoidGoldType = rmCreateTypeDistanceConstraint("coin avoids coin ", "gold", 30.0);
+	int avoidGoldTypeFar = rmCreateTypeDistanceConstraint("coin avoids coin far ", "gold", 50.0);
+	int avoidLowerGoldMin=rmCreateClassDistanceConstraint("avoid lower gold min ", rmClassID("LowerGold"), 8.0);
+	int avoidLowerGoldShort = rmCreateClassDistanceConstraint ("avoid lower gold short", rmClassID("LowerGold"), 15.0);
+	int avoidLowerGold = rmCreateClassDistanceConstraint ("avoid lower gold med", rmClassID("LowerGold"), 30.0);
+	int avoidLowerGoldFar = rmCreateClassDistanceConstraint ("avoid lower gold far", rmClassID("LowerGold"), 56.0);
+	int avoidLowerGoldVeryFar = rmCreateClassDistanceConstraint ("avoid lower gold very far", rmClassID("LowerGold"), 75.0);
+	int avoidUpperGoldMin=rmCreateClassDistanceConstraint("avoid upper gold min ", rmClassID("UpperGold"), 8.0);
+	int avoidUpperGoldShort = rmCreateClassDistanceConstraint ("avoid upper gold short", rmClassID("UpperGold"), 15.0);
+	int avoidUpperGold = rmCreateClassDistanceConstraint ("avoid upper gold med", rmClassID("UpperGold"), 30.0);
+	int avoidUpperGoldFar = rmCreateClassDistanceConstraint ("avoid upper gold far", rmClassID("UpperGold"), 58.0);
+	int avoidUpperGoldVeryFar = rmCreateClassDistanceConstraint ("avoid upper gold very far", rmClassID("UpperGold"), 65.0);
+	int avoidNuggetMin = rmCreateTypeDistanceConstraint("nugget avoid nugget min", "AbstractNugget", 10.0);
+	int avoidNuggetShort = rmCreateTypeDistanceConstraint("nugget avoid nugget short", "AbstractNugget", 15.0);
+	int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0);
+	int avoidNuggetFar = rmCreateTypeDistanceConstraint("nugget avoid nugget Far", "AbstractNugget", 56.0);
+	int avoidTownCenterVeryFar = rmCreateTypeDistanceConstraint("avoid Town Center Very Far", "townCenter", 85.0);
+	int avoidTownCenterFar = rmCreateTypeDistanceConstraint("avoid Town Center Far", "townCenter", 60.0);
+	int avoidTownCenter = rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 50.0);
+//	int avoidTownCenterMed = rmCreateTypeDistanceConstraint("avoid Town Center med", "townCenter", 40.0);
+	int avoidTownCenterShort = rmCreateTypeDistanceConstraint("avoid Town Center short", "townCenter", 25.0);
+	int avoidTownCenterMin = rmCreateTypeDistanceConstraint("avoid Town Center min", "townCenter", 18.0);
+	int avoidNativesShort = rmCreateClassDistanceConstraint("avoid natives short", rmClassID("natives"), 0.0);
+	int avoidNatives = rmCreateClassDistanceConstraint("avoid natives", rmClassID("natives"), 0.0);
+	int avoidNativesFar = rmCreateClassDistanceConstraint("avoid natives far", rmClassID("natives"), 0.0);
+	int avoidStartingResources = rmCreateClassDistanceConstraint("avoid starting resources", rmClassID("startingResource"), 6.0);
+	int avoidStartingResourcesShort = rmCreateClassDistanceConstraint("avoid starting resources short", rmClassID("startingResource"), 4.0);
+	int avoidWhale=rmCreateTypeDistanceConstraint("avoid whale", "fish", 52.0);
+	int avoidFish=rmCreateTypeDistanceConstraint("avoid fish", "fish", 24.0);
+	int avoidYak=rmCreateTypeDistanceConstraint("avoid yak", "ypyak", 62.0);
+	int avoidColonyShip = rmCreateTypeDistanceConstraint("avoid colony ship", "HomeCityWaterSpawnFlag", 30.0);
+	int avoidColonyShipShort = rmCreateTypeDistanceConstraint("avoid colony ship short", "HomeCityWaterSpawnFlag", 15.0);
+
+	// Avoid impassable land
+	int avoidImpassableLandMin = rmCreateTerrainDistanceConstraint("avoid impassable land min", "Land", false, 2.0);
+	int avoidImpassableLandShort = rmCreateTerrainDistanceConstraint("avoid impassable land short", "Land", false, 5.0);
+	int avoidImpassableLand = rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 8.0);
+	int avoidImpassableLandMed=rmCreateTerrainDistanceConstraint("avoid impassable land medium", "Land", false, 12.0);
+	int avoidImpassableLandFar = rmCreateTerrainDistanceConstraint("avoid impassable land far", "Land", false, 20.0);
+	int stayNearLand = rmCreateTerrainMaxDistanceConstraint("stay near land ", "Land", true, 5.0);
+	int avoidLand = rmCreateTerrainDistanceConstraint("avoid land ", "Land", true, 8.0);
+	int avoidLandFar = rmCreateTerrainDistanceConstraint("avoid land far ", "Land", true, 15.0);
+	int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "water", true, 3.0);
+	int avoidWater = rmCreateTerrainDistanceConstraint("avoid water ", "water", true, 10);
+	int avoidWaterFar = rmCreateTerrainDistanceConstraint("avoid water far", "water", true, 30.0);
+	int stayNearWater = rmCreateTerrainMaxDistanceConstraint("stay near water ", "water", true, 20.0);
+	int stayInWater = rmCreateTerrainMaxDistanceConstraint("stay in water ", "water", true, 0.0);
+	int avoidPatch = rmCreateClassDistanceConstraint("avoid patch", rmClassID("patch"), 5.0);
+	int avoidPatch2 = rmCreateClassDistanceConstraint("avoid patch2", rmClassID("patch2"), 20.0);
+	int avoidPatch3 = rmCreateClassDistanceConstraint("avoid patch3", rmClassID("patch3"), 5.0);
+	
+	// Unit avoidance
+	int avoidStartingUnits = rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 35.0);
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);	
+	
+	// VP avoidance
+	int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 6.0);
+	int avoidTradeRouteShort = rmCreateTradeRouteDistanceConstraint("trade route short", 4.0);
+	int avoidTradeRouteSocket = rmCreateTypeDistanceConstraint("avoid trade route socket", "socketTradeRoute", 8.0);
+	int avoidTradeRouteSocketShort = rmCreateTypeDistanceConstraint("avoid trade route socket short", "socketTradeRoute", 7.0);
+	int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 10.0);
+   
+	
+	// ***********************************************************************************************
+	
+	// **************************************** PLACE PLAYERS ****************************************
+
+	int teamZeroCount = rmGetNumberPlayersOnTeam(0);
+	int teamOneCount = rmGetNumberPlayersOnTeam(1);
+	
+	if (cNumberTeams <= 2) // 1v1 and TEAM
+	{
+		if (teamZeroCount == 1 && teamOneCount == 1) // 1v1
+		{
+			float OneVOnePlacement=rmRandFloat(0.0, 0.9);
+			if ( OneVOnePlacement < 0.5)
+			{
+				rmPlacePlayer(1, 0.25, 0.50);
+				rmPlacePlayer(2, 0.75, 0.50);
+			}
+			else
+			{
+				rmPlacePlayer(2, 0.25, 0.50);
+				rmPlacePlayer(1, 0.75, 0.50);
+			}
+			
+		}
+		else if (teamZeroCount == teamOneCount) // equal N of players per TEAM
+		{
+			if (teamZeroCount == 2) // 2v2
+			{
+				rmSetPlacementTeam(0);
+				rmSetPlacementSection(0.650, 0.850); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.26, 0.26, 0);
+
+				rmSetPlacementTeam(1);
+				rmSetPlacementSection(0.150, 0.350); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.26, 0.26, 0);
+			}
+			else // 3v3, 4v4 
+			{
+				rmSetPlacementTeam(0);
+				rmSetPlacementSection(0.625, 0.875); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.26, 0.26, 0);
+
+				rmSetPlacementTeam(1);
+				rmSetPlacementSection(0.125, 0.375); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.26, 0.26, 0);
+			}
+		}
+		else // unequal N of players per TEAM
+		{
+			if (teamZeroCount == 1 || teamOneCount == 1) // one team is one player
+			{
+				if (teamZeroCount < teamOneCount) // 1v2, 1v3, 1v4, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmSetPlacementSection(0.249, 0.251); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+
+					rmSetPlacementTeam(1);
+					if (teamOneCount == 2)
+						rmSetPlacementSection(0.650, 0.850); // 
+					else
+						rmSetPlacementSection(0.625, 0.875); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+				} 
+				else // 2v1, 3v1, 4v1, etc.
+				{
+					rmSetPlacementTeam(0);
+					if (teamZeroCount == 2)
+						rmSetPlacementSection(0.150, 0.350); // 
+					else
+						rmSetPlacementSection(0.125, 0.375); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+
+					rmSetPlacementTeam(1);
+					rmSetPlacementSection(0.749, 0.751); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+				} 
+			}
+			else if (teamZeroCount == 2 || teamOneCount == 2) // one team has 2 players
+			{
+				if (teamZeroCount < teamOneCount) // 2v3, 2v4, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmSetPlacementSection(0.650, 0.850); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+
+					rmSetPlacementTeam(1);
+					rmSetPlacementSection(0.125, 0.375); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+				} 
+				else // 3v2, 4v2, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmSetPlacementSection(0.625, 0.875); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+
+					rmSetPlacementTeam(1);
+					rmSetPlacementSection(0.150, 0.350); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.26, 0.26, 0);
+				} 
+			}
+			else // 3v4, 4v3, etc.
+			{
+				rmSetPlacementTeam(0);
+				rmSetPlacementSection(0.625, 0.875); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.26, 0.26, 0);
+
+				rmSetPlacementTeam(1);
+				rmSetPlacementSection(0.125, 0.375); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.26, 0.26, 0);
+			} 
+		}
+	}
+	else // FFA
+	{	
+		rmSetTeamSpacingModifier(0.25);
+		rmPlacePlayersCircular(0.26, 0.26, 0.0);
+	}
+	
+	// **************************************************************************************************
+   
+	// Text
+	rmSetStatusText("",0.30);
+	
+		// ****************************************** TRADE ROUTE **********************************************
+		
+	float TPvariation = -1;
+	TPvariation = rmRandFloat(0.1,1.0);
+//	TPvariation = 0.3; // <--- TEST
+		
+	int tradeRouteID = rmCreateTradeRoute();
+	int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+	rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+	rmSetObjectDefAllowOverlap(socketID, true);
+	rmSetObjectDefMinDistance(socketID, 0.0);
+	rmSetObjectDefMaxDistance(socketID, 8.0);
+	rmAddObjectDefConstraint(socketID, avoidImpassableLandShort);
+
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.05, 0.60); 
+		rmAddTradeRouteWaypoint(tradeRouteID, 0.20, 0.85); 
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.50, 0.95);
+		rmAddTradeRouteWaypoint(tradeRouteID, 0.80, 0.82); 
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.95, 0.60);
+
+	bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID, "water");
+	if(placedTradeRoute == false)
+	rmEchoError("Failed to place trade route");
+	rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+	vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.15);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.50);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.85);
+	rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);	
+	
+	
+	int tradeRoute2ID = rmCreateTradeRoute();
+	int socket2ID=rmCreateObjectDef("sockets to dock Trade Posts 2");
+	rmAddObjectDefItem(socket2ID, "SocketTradeRoute", 1, 0.0);
+	rmSetObjectDefAllowOverlap(socket2ID, true);
+	rmSetObjectDefMinDistance(socket2ID, 0.0);
+	rmSetObjectDefMaxDistance(socket2ID, 8.0);
+	rmAddObjectDefConstraint(socket2ID, avoidImpassableLandShort);
+
+	rmAddTradeRouteWaypoint(tradeRoute2ID, 0.95, 0.40); 
+		rmAddTradeRouteWaypoint(tradeRoute2ID, 0.80, 0.16); 
+	rmAddTradeRouteWaypoint(tradeRoute2ID, 0.50, 0.05);
+		rmAddTradeRouteWaypoint(tradeRoute2ID, 0.20, 0.16); 
+	rmAddTradeRouteWaypoint(tradeRoute2ID, 0.05, 0.40);
+		
+	bool placedTradeRoute2 = rmBuildTradeRoute(tradeRoute2ID, "water");
+	if(placedTradeRoute2 == false)
+	rmEchoError("Failed to place trade route 2");
+	rmSetObjectDefTradeRouteID(socket2ID, tradeRoute2ID);
+	vector socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.15);
+	rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+	socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.50);
+	rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+	socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.85);
+	rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);	
+
+	
+	// *************************************************************************************************************
+	
+	// ******************************************** MAP LAYOUT **************************************************
+	
+	
+	//Plateau 1st level
+	int plateauID = rmCreateArea("first level plateau");
+    rmSetAreaWarnFailure(plateauID, false);
+	rmSetAreaLocation(plateauID, 0.50, 0.50);
+	rmSetAreaSize(plateauID, 0.36, 0.36);
+//	rmAddAreaInfluenceSegment(plateauID, 0.40, 0.50, 0.60, 0.50);
+	rmSetAreaCliffHeight(plateauID, 6, 0.0, 0.6); 
+	rmSetAreaCliffEdge(plateauID, 8, 0.10, 0, 1.0, 0); 
+	rmSetAreaMix(plateauID, "himalayas_b");	
+	rmSetAreaTerrainType(plateauID, "himalayas\ground_dirt2_himal");
+	rmSetAreaCliffType(plateauID, "himalayas"); 
+//	rmSetAreaCliffPainting(plateauID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+	rmSetAreaCoherence(plateauID, 0.70);
+	rmSetAreaSmoothDistance(plateauID, 14);
+//	rmAddAreaConstraint(plateauID, plateauTrack);
+	rmAddAreaConstraint(plateauID, avoidTradeRouteShort);
+	rmAddAreaConstraint(plateauID, avoidTradeRouteSocketShort);
+	rmBuildArea(plateauID); 
+	
+	int avoidPlateau = rmCreateAreaDistanceConstraint("avoid first level plateau ", plateauID, 2);
+	int stayInPlateau = rmCreateAreaMaxDistanceConstraint("stay in first level plateau ", plateauID, 0);
+	int avoidRamp = rmCreateCliffRampDistanceConstraint("avoid ramp", plateauID, 15.0);
+	int avoidRampShort = rmCreateCliffRampDistanceConstraint("avoid ramp short", plateauID, 8.0);
+	
+	//Hill 2nd level
+	int hillID = rmCreateArea("second level hill");
+    rmSetAreaWarnFailure(hillID, false);
+	rmSetAreaLocation(hillID, 0.5, 0.5);
+	rmSetAreaSize(hillID, 0.05, 0.05);
+	rmSetAreaCliffHeight(hillID, 4, 0.0, 0.8); 
+	rmSetAreaCliffEdge(hillID, 4, 0.20, 0, 1.0, 0); 
+//	rmSetAreaMix(hillID, "himalayas_b");
+	rmSetAreaTerrainType(hillID, "himalayas\ground_dirt2_himal");
+	rmSetAreaCliffType(hillID, "himalayas"); 
+//	rmSetAreaCliffPainting(hillID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge	
+	rmSetAreaCoherence(hillID, 0.65);
+	rmSetAreaSmoothDistance(hillID, 8);
+	rmBuildArea(hillID); 
+	
+	int avoidHill = rmCreateAreaDistanceConstraint("avoid second level plateau ", hillID, 2);
+	int stayInHill = rmCreateAreaMaxDistanceConstraint("stay in second level plateau ", hillID, 0);
+	
+	
+		
+	// Patches
+	for (i=0; < 6+1*cNumberNonGaiaPlayers)
+	{
+		int patchID = rmCreateArea("patch"+i);
+		rmSetAreaWarnFailure(patchID, false);
+		rmSetAreaObeyWorldCircleConstraint(patchID, false);
+		rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(60));
+		rmSetAreaTerrainType(patchID, "himalayas\ground_dirt3_himal");
+		rmAddAreaToClass(patchID, rmClassID("patch"));
+		rmSetAreaMinBlobs(patchID, 1);
+		rmSetAreaMaxBlobs(patchID, 5);
+		rmSetAreaMinBlobDistance(patchID, 12.0);
+		rmSetAreaMaxBlobDistance(patchID, 30.0);
+		rmSetAreaCoherence(patchID, 0.0);
+		rmAddAreaConstraint(patchID, avoidPatch);
+		rmAddAreaConstraint(patchID, avoidImpassableLandMin);
+		rmAddAreaConstraint(patchID, stayInHill);
+		rmBuildArea(patchID); 
+	}
+	
+
+	
+	// Players area
+	for (i=1; < cNumberPlayers)
+	{
+	int playerareaID = rmCreateArea("playerarea"+i);
+	rmSetPlayerArea(i, playerareaID);
+	rmSetAreaSize(playerareaID, 0.05, 0.05);
+	rmSetAreaCoherence(playerareaID, 1.0);
+	rmSetAreaWarnFailure(playerareaID, false);
+//	rmSetAreaTerrainType(playerareaID, "new_england\ground2_cliff_ne"); // for testing
+	rmSetAreaLocPlayer(playerareaID, i);
+	rmSetAreaObeyWorldCircleConstraint(playerareaID, false);
+	rmBuildArea(playerareaID);
+	rmCreateAreaDistanceConstraint("avoid player area "+i, playerareaID, 3.0);
+	rmCreateAreaMaxDistanceConstraint("stay in player area "+i, playerareaID, 0.0);
+	}
+	
+	int avoidPlayerArea1 = rmConstraintID("avoid player area 1");
+	int avoidPlayerArea2 = rmConstraintID("avoid player area 2");
+	int stayInPlayerArea1 = rmConstraintID("stay in player area 1");
+	int stayInPlayerArea2 = rmConstraintID("stay in player area 2");
+
+	// *********************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.40);
+	
+	
+		
+	// Text
+	rmSetStatusText("",0.45);
+	
+	// ******************************************** NATIVES *************************************************
+	
+	
+	float Natsvariation = -1;
+//	Natsvariation = rmRandFloat(0.0,1.0); // > 0.66 x2 udasi, > 0.33 x2 bhakti, else 1 udasi and 1 bhakti
+	Natsvariation = 0.2; // <--- TEST
+	
+	int nativeID0 = -1;
+    int nativeID1 = -1;
+	
+		if (Natsvariation > 0.66)
+	{
+		nativeID0 = rmCreateGrouping("Udasi village A", "uger"+1);
+		nativeID1 = rmCreateGrouping("Udasi village B", "uger"+1);
+	}
+	else if (Natsvariation > 0.33)
+	{
+		nativeID0 = rmCreateGrouping("Shaolin temple A", "uger"+1);
+		nativeID1 = rmCreateGrouping("Shaolin temple A", "uger"+1);
+	}	
+	else
+	{
+		nativeID0 = rmCreateGrouping("Udasi village A", "uger"+1);
+		nativeID1 = rmCreateGrouping("Shaolin temple A", "uger"+1);
+	}
+//	rmSetGroupingMinDistance(nativeID0, 0.00);
+//	rmSetGroupingMaxDistance(nativeID0, 0.00);
+//	rmSetGroupingMinDistance(nativeID1, 0.00);
+//	rmSetGroupingMaxDistance(nativeID1, 0.00);
+	rmAddGroupingToClass(nativeID0, rmClassID("natives"));
+	rmAddGroupingToClass(nativeID1, rmClassID("natives"));
+	if (cNumberTeams <= 2)
+	{
+		rmPlaceGroupingAtLoc(nativeID0, 0, 0.50, 0.73);
+		rmPlaceGroupingAtLoc(nativeID1, 0, 0.50, 0.27);
+	}
+	else
+	{
+		rmPlaceGroupingAtLoc(nativeID0, 0, 0.50, 0.70);
+		rmPlaceGroupingAtLoc(nativeID1, 0, 0.50, 0.30);
+	}
+	
+	// ******************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.50);
+	
+	// ************************************ PLAYER STARTING RESOURCES ***************************************
+
+	// ******** Define ********
+
+	// Town center & units
+	int TCID = rmCreateObjectDef("player TC");
+	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
+	if (rmGetNomadStart())
+	{
+		rmAddObjectDefItem(TCID, "CoveredWagon", 1, 0.0);
+	}
+	else
+	{
+	rmAddObjectDefItem(TCID, "TownCenter", 1, 0.0);
+	rmAddObjectDefToClass(TCID, classStartingResource);
+	}
+	rmSetObjectDefMinDistance(TCID, 0.0);
+	rmSetObjectDefMaxDistance(TCID, 0.0);
+	
+	// Starting mine
+	int playergoldID = rmCreateObjectDef("player mine");
+	rmAddObjectDefItem(playergoldID, "mine", 1, 0);
+	rmSetObjectDefMinDistance(playergoldID, 12.0);
+	rmSetObjectDefMaxDistance(playergoldID, 14.0);
+	rmAddObjectDefToClass(playergoldID, classStartingResource);
+	rmAddObjectDefToClass(playergoldID, classUpperGold);
+	rmAddObjectDefConstraint(playergoldID, avoidTradeRouteShort);
+	rmAddObjectDefConstraint(playergoldID, avoidTradeRouteSocket);
+	rmAddObjectDefConstraint(playergoldID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playergoldID, avoidNatives);
+	rmAddObjectDefConstraint(playergoldID, avoidStartingResources);
+	rmAddObjectDefConstraint(playergoldID, stayCenter);
+//	rmAddObjectDefConstraint(playergoldID, avoidEdge);
+	
+	// 2nd mine
+	int playergold2ID = rmCreateObjectDef("player second mine");
+	rmAddObjectDefItem(playergold2ID, "mine", 1, 0);
+	rmSetObjectDefMinDistance(playergold2ID, 52.0); //58
+	rmSetObjectDefMaxDistance(playergold2ID, 54.0); //62
+	rmAddObjectDefToClass(playergold2ID, classStartingResource);
+	rmAddObjectDefToClass(playergold2ID, classUpperGold);
+	rmAddObjectDefConstraint(playergold2ID, avoidTradeRouteShort);
+	rmAddObjectDefConstraint(playergold2ID, avoidTradeRouteSocket);
+	rmAddObjectDefConstraint(playergold2ID, avoidImpassableLandMed);
+	rmAddObjectDefConstraint(playergold2ID, avoidNatives);
+	rmAddObjectDefConstraint(playergold2ID, avoidGoldTypeFar);
+	rmAddObjectDefConstraint(playergold2ID, avoidStartingResources);
+	rmAddObjectDefConstraint(playergold2ID, stayInPlateau);
+	rmAddObjectDefConstraint(playergold2ID, avoidHill);
+	rmAddObjectDefConstraint(playergold2ID, avoidEdge);
+		
+	// Starting trees
+	int playerTreeID = rmCreateObjectDef("player trees");
+	rmAddObjectDefItem(playerTreeID, "ypTreeHimalayas", rmRandInt(2,2), 3.0);
+    rmSetObjectDefMinDistance(playerTreeID, 12);
+    rmSetObjectDefMaxDistance(playerTreeID, 18);
+	rmAddObjectDefToClass(playerTreeID, classStartingResource);
+	rmAddObjectDefToClass(playerTreeID, classForest);
+//	rmAddObjectDefConstraint(playerTreeID, avoidForestShort);
+	rmAddObjectDefConstraint(playerTreeID, avoidTradeRoute);
+    rmAddObjectDefConstraint(playerTreeID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerTreeID, avoidStartingResources);
+	
+	// Starting herd
+	int playeherdID = rmCreateObjectDef("starting herd");
+	rmAddObjectDefItem(playeherdID, "ypIbex", rmRandInt(10,10), 7.0);
+	rmSetObjectDefMinDistance(playeherdID, 12.0);
+	rmSetObjectDefMaxDistance(playeherdID, 16.0);
+	rmSetObjectDefCreateHerd(playeherdID, true);
+	rmAddObjectDefToClass(playeherdID, classStartingResource);
+	rmAddObjectDefConstraint(playeherdID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playeherdID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playeherdID, avoidNatives);
+	rmAddObjectDefConstraint(playeherdID, avoidStartingResources);
+		
+	// 2nd herd
+	int player2ndherdID = rmCreateObjectDef("player 2nd herd");
+	rmAddObjectDefItem(player2ndherdID, "ypIbex", rmRandInt(10,10), 7.0);
+    rmSetObjectDefMinDistance(player2ndherdID, 28);
+    rmSetObjectDefMaxDistance(player2ndherdID, 30);
+	rmAddObjectDefToClass(player2ndherdID, classStartingResource);
+	rmSetObjectDefCreateHerd(player2ndherdID, true);
+	rmAddObjectDefConstraint(player2ndherdID, avoidStartingResources);
+	rmAddObjectDefConstraint(player2ndherdID, avoidSerow); 
+//	rmAddObjectDefConstraint(player2ndherdID, avoidTradeRouteShort);
+	rmAddObjectDefConstraint(player2ndherdID, avoidTradeRouteSocket);
+	rmAddObjectDefConstraint(player2ndherdID, avoidImpassableLand);
+	rmAddObjectDefConstraint(player2ndherdID, avoidEdge);
+	rmAddObjectDefConstraint(player2ndherdID, avoidNatives);
+		
+	// Starting berries
+	int playerberriesID = rmCreateObjectDef("player berries");
+	rmAddObjectDefItem(playerberriesID, "berrybush", 2, 3.0);
+	rmSetObjectDefMinDistance(playerberriesID, 12.0);
+	rmSetObjectDefMaxDistance(playerberriesID, 14.0);
+	rmAddObjectDefToClass(playerberriesID, classStartingResource);
+	rmAddObjectDefConstraint(playerberriesID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playerberriesID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerberriesID, avoidNatives);
+	rmAddObjectDefConstraint(playerberriesID, avoidStartingResources);	
+		
+	// Starting yaks
+	int playerYakID = rmCreateObjectDef("starting yaks");
+	rmAddObjectDefItem(playerYakID, "ypyak", rmRandInt(1,3), 3.0);
+	rmSetObjectDefMinDistance(playerYakID, 12.0);
+	rmSetObjectDefMaxDistance(playerYakID, 16.0);
+	rmAddObjectDefToClass(playerYakID, classStartingResource);
+	rmAddObjectDefConstraint(playerYakID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playerYakID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerYakID, avoidNatives);
+	rmAddObjectDefConstraint(playerYakID, avoidStartingResources);
+
+	// Starting treasures
+	int playerNuggetID = rmCreateObjectDef("player nugget"); 
+	rmAddObjectDefItem(playerNuggetID, "Nugget", 1, 0.0);
+	rmSetNuggetDifficulty(1, 1);
+	rmSetObjectDefMinDistance(playerNuggetID, 20.0);
+	rmSetObjectDefMaxDistance(playerNuggetID, 30.0);
+	rmAddObjectDefToClass(playerNuggetID, classStartingResource);
+	rmAddObjectDefConstraint(playerNuggetID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playerNuggetID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerNuggetID, avoidNatives);
+	rmAddObjectDefConstraint(playerNuggetID, avoidStartingResources);
+	rmAddObjectDefConstraint(playerNuggetID, avoidNugget); //Short
+	rmAddObjectDefConstraint(playerNuggetID, avoidEdge);
+	int nugget0count = rmRandInt (1,2); // 1,2
+
+	
+	
+	// ******** Place ********
+	
+	for(i=1; <cNumberPlayers)
+	{
+		rmPlaceObjectDefAtLoc(TCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(TCID, i));
+
+		rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playergoldID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+//		rmPlaceObjectDefAtLoc(playergold2ID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerberriesID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playeherdID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerYakID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+//		rmPlaceObjectDefAtLoc(player2ndherdID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+//		rmPlaceObjectDefAtLoc(player3rdherdID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerNuggetID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+//		if (nugget0count == 2)
+//			rmPlaceObjectDefAtLoc(playerNuggetID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+				
+		if(ypIsAsian(i) && rmGetNomadStart() == false)
+			rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		vector closestPoint = rmFindClosestPointVector(TCLoc, rmXFractionToMeters(1.0));
+	}
+
+	// ************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.60);
+	
+	// ************************************** COMMON RESOURCES ****************************************
+  
+   
+	// ************* Mines **************
+	
+	int sidegoldcount = 4+1*cNumberNonGaiaPlayers;  
+	int plateaugoldcount = 2+1*cNumberNonGaiaPlayers;   
+	
+	// Plateau mines
+	for(i=0; < plateaugoldcount)
+	{
+		int plateaugoldID = rmCreateObjectDef("plateau mines"+i);
+		rmAddObjectDefItem(plateaugoldID, "Mine", 1, 0.0);
+		rmSetObjectDefMinDistance(plateaugoldID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(plateaugoldID, rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(plateaugoldID, classUpperGold);
+		rmAddObjectDefConstraint(plateaugoldID, avoidTradeRoute);
+		rmAddObjectDefConstraint(plateaugoldID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(plateaugoldID, avoidNatives);
+		rmAddObjectDefConstraint(plateaugoldID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(plateaugoldID, avoidGoldTypeFar);
+		rmAddObjectDefConstraint(plateaugoldID, avoidUpperGoldVeryFar);
+		rmAddObjectDefConstraint(plateaugoldID, avoidTownCenter);
+		rmAddObjectDefConstraint(plateaugoldID, avoidEdge);
+		rmAddObjectDefConstraint(plateaugoldID, stayInPlateau);
+		rmAddObjectDefConstraint(plateaugoldID, avoidHill);
+		rmAddObjectDefConstraint(plateaugoldID, avoidRamp);
+		rmPlaceObjectDefAtLoc(plateaugoldID, 0, 0.50, 0.50);
+	}
+	
+	
+	// ground floor mines
+	for(i=0; < sidegoldcount)
+	{
+		int groundgoldID = rmCreateObjectDef("ground floor mines"+i);
+		rmAddObjectDefItem(groundgoldID, "Mine", 1, 0.0);
+		rmSetObjectDefMinDistance(groundgoldID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(groundgoldID, rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(groundgoldID, classLowerGold);
+		rmAddObjectDefConstraint(groundgoldID, avoidTradeRoute);
+		rmAddObjectDefConstraint(groundgoldID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(groundgoldID, avoidNatives);
+		rmAddObjectDefConstraint(groundgoldID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(groundgoldID, avoidLowerGoldVeryFar);
+		rmAddObjectDefConstraint(groundgoldID, avoidGoldTypeFar);
+		rmAddObjectDefConstraint(groundgoldID, avoidTownCenterFar);
+		rmAddObjectDefConstraint(groundgoldID, avoidEdge);
+		rmAddObjectDefConstraint(groundgoldID, avoidPlateau);
+		rmAddObjectDefConstraint(groundgoldID, avoidRamp);
+		if (i == 0)
+			rmAddObjectDefConstraint(groundgoldID, stayNE);
+		else if (i == 1)
+			rmAddObjectDefConstraint(groundgoldID, staySW);
+		else if (i < 4)
+			rmAddObjectDefConstraint(groundgoldID, staySouthHalf);
+		else 
+			rmAddObjectDefConstraint(groundgoldID, stayNorthHalf);
+		rmPlaceObjectDefAtLoc(groundgoldID, 0, 0.50, 0.50);
+	}
+	
+		
+	// *********************************
+	
+	// Text
+	rmSetStatusText("",0.70);
+	
+	// ************ Forest *************
+	
+	
+	// Lowground forest
+	int forestlowcount = 14+3*cNumberNonGaiaPlayers;
+	int stayInForestLowPatch = -1;
+	
+	for (i=0; < forestlowcount)
+	{
+		int forestlowID = rmCreateArea("forest lowground "+i);
+		rmSetAreaWarnFailure(forestlowID, false);
+		rmSetAreaSize(forestlowID, rmAreaTilesToFraction(130), rmAreaTilesToFraction(150));
+//		rmSetAreaTerrainType(forestlowID, "mongolia\ground_grass6_mongol");
+		rmSetAreaObeyWorldCircleConstraint(forestlowID, false);
+//		rmSetAreaForestDensity(forestlowID, 0.8);
+//		rmSetAreaForestClumpiness(forestlowID, 0.15);
+//		rmSetAreaForestUnderbrush(forestlowID, 0.2);
+		rmSetAreaMinBlobs(forestlowID, 2);
+		rmSetAreaMaxBlobs(forestlowID, 4);
+		rmSetAreaMinBlobDistance(forestlowID, 14.0);
+		rmSetAreaMaxBlobDistance(forestlowID, 30.0);
+		rmSetAreaCoherence(forestlowID, 0.65);
+		rmSetAreaSmoothDistance(forestlowID, 6);
+		rmAddAreaToClass(forestlowID, classForest);
+		rmAddAreaConstraint(forestlowID, avoidForest);
+		rmAddAreaConstraint(forestlowID, avoidGoldTypeMin);
+		rmAddAreaConstraint(forestlowID, avoidIbexMin); 
+		rmAddAreaConstraint(forestlowID, avoidTownCenterShort); 
+		rmAddAreaConstraint(forestlowID, avoidNativesShort);
+		rmAddAreaConstraint(forestlowID, avoidTradeRouteShort);
+		rmAddAreaConstraint(forestlowID, avoidTradeRouteSocket);
+		rmAddAreaConstraint(forestlowID, avoidImpassableLandShort);
+		rmAddAreaConstraint(forestlowID, avoidHill);
+		rmAddAreaConstraint(forestlowID, avoidRamp);
+//		rmAddAreaConstraint(forestlowID, avoidEdge);
+		rmBuildArea(forestlowID);
+		
+		stayInForestLowPatch = rmCreateAreaMaxDistanceConstraint("stay in forest low patch"+i, forestlowID, 0.0);
+		
+		for (j=0; < rmRandInt(15,16))
+		{
+			int forestlowtreeID = rmCreateObjectDef("forest lowground trees"+i+j);
+			rmAddObjectDefItem(forestlowtreeID, "ypTreeHimalayas", rmRandInt(1,2), 2.0);
+			rmSetObjectDefMinDistance(forestlowtreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(forestlowtreeID,  rmXFractionToMeters(0.5));
+		//	rmAddObjectDefToClass(forestlowtreeID, classForest);
+		//	rmAddObjectDefConstraint(forestlowtreeID, avoidForestShort);
+			rmAddObjectDefConstraint(forestlowtreeID, avoidImpassableLandShort);
+			rmAddObjectDefConstraint(forestlowtreeID, stayInForestLowPatch);	
+			rmPlaceObjectDefAtLoc(forestlowtreeID, 0, 0.50, 0.50);
+		}
+	}
+	
+	// Random trees 
+	for (i=0; < 18+3*cNumberNonGaiaPlayers)
+	{
+		int randomtreeID = rmCreateObjectDef("random trees "+i);
+		rmAddObjectDefItem(randomtreeID, "ypTreeHimalayas", rmRandInt(2,4), 5.0);
+		rmSetObjectDefMinDistance(randomtreeID,  rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randomtreeID,  rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(randomtreeID, classForest);
+		rmAddObjectDefConstraint(randomtreeID, avoidForestShort);
+		rmAddObjectDefConstraint(randomtreeID, avoidGoldTypeMin);
+		rmAddObjectDefConstraint(randomtreeID, avoidIbexMin); 
+		rmAddObjectDefConstraint(randomtreeID, avoidTownCenterShort); 
+		rmAddObjectDefConstraint(randomtreeID, avoidNativesShort);
+		rmAddObjectDefConstraint(randomtreeID, avoidTradeRouteShort);
+		rmAddObjectDefConstraint(randomtreeID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(randomtreeID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(randomtreeID, avoidStartingResources);
+		rmPlaceObjectDefAtLoc(randomtreeID, 0, 0.50, 0.50);
+	}
+	
+	// ********************************
+	
+	// Text
+	rmSetStatusText("",0.80);
+	
+	// ************ Herds *************
+	
+	int highgroundherdcount = 1+2*cNumberNonGaiaPlayers;
+	int lowgroundherdcount = 3+2*cNumberNonGaiaPlayers;
+		
+	//Highground herds
+	for (i=0; < highgroundherdcount)
+	{
+		int highgroundherdID = rmCreateObjectDef("highground herd"+i);
+		rmAddObjectDefItem(highgroundherdID, "ypIbex", rmRandInt(10,10), 7.0);
+		rmSetObjectDefMinDistance(highgroundherdID, 0.0);
+		rmSetObjectDefMaxDistance(highgroundherdID, rmXFractionToMeters(0.6));
+		rmSetObjectDefCreateHerd(highgroundherdID, true);
+		rmAddObjectDefConstraint(highgroundherdID, avoidForestMin);
+		rmAddObjectDefConstraint(highgroundherdID, avoidGoldTypeShort);
+		rmAddObjectDefConstraint(highgroundherdID, avoidIbexFar);  
+		rmAddObjectDefConstraint(highgroundherdID, avoidTownCenterFar); 
+		rmAddObjectDefConstraint(highgroundherdID, avoidNatives);
+//		rmAddObjectDefConstraint(highgroundherdID, avoidTradeRouteShort);
+		rmAddObjectDefConstraint(highgroundherdID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(highgroundherdID, avoidImpassableLand);
+		rmAddObjectDefConstraint(highgroundherdID, stayInPlateau);
+		rmAddObjectDefConstraint(highgroundherdID, avoidRamp);
+		rmAddObjectDefConstraint(highgroundherdID, avoidEdge);
+//		if (i < 1)
+//			rmAddObjectDefConstraint(highgroundherdID, staySW);
+//		else if (i < 2)
+//			rmAddObjectDefConstraint(highgroundherdID, stayNE);
+		rmPlaceObjectDefAtLoc(highgroundherdID, 0, 0.50, 0.50);	
+	}
+	
+	//Lowground herds
+	for (i=0; < lowgroundherdcount)
+	{
+		int lowgroundherdID = rmCreateObjectDef("lowground herd"+i);
+		rmAddObjectDefItem(lowgroundherdID, "ypMuskdeer", rmRandInt(7,7), 7.0);
+		rmSetObjectDefMinDistance(lowgroundherdID, 0.0);
+		rmSetObjectDefMaxDistance(lowgroundherdID, rmXFractionToMeters(0.6));
+		rmSetObjectDefCreateHerd(lowgroundherdID, true);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidForestMin);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidGoldTypeShort);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidMuskdeerFar); 
+		rmAddObjectDefConstraint(lowgroundherdID, avoidIbex);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidTownCenter); 
+		rmAddObjectDefConstraint(lowgroundherdID, avoidNatives);
+//		rmAddObjectDefConstraint(lowgroundherdID, avoidTradeRouteShort);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidPlateau);
+		rmAddObjectDefConstraint(lowgroundherdID, avoidEdge);
+//		if (i < 2)
+//			rmAddObjectDefConstraint(lowgroundherdID, staySW);
+//		else if (i < 4)
+//			rmAddObjectDefConstraint(lowgroundherdID, stayNE);
+		rmPlaceObjectDefAtLoc(lowgroundherdID, 0, 0.50, 0.50);	
+	}
+	
+	
+	// ************************************
+	
+	// Text
+	rmSetStatusText("",0.90);
+		
+	// ************** Treasures ***************
+	
+	int treasure4count = 0.5*cNumberNonGaiaPlayers;
+	int treasure2count = 3+0.5*cNumberNonGaiaPlayers;
+	int treasure1count = 4+1*cNumberNonGaiaPlayers;
+		
+		
+	// Treasures lvl4
+	for (i=0; < treasure4count)
+	{
+		int Nugget4ID = rmCreateObjectDef("nugget lvl4 "+i); 
+		rmAddObjectDefItem(Nugget4ID, "Nugget", 1, 0.0);
+		rmSetObjectDefMinDistance(Nugget4ID, 0);
+		rmSetObjectDefMaxDistance(Nugget4ID, rmXFractionToMeters(0.5));
+		rmSetNuggetDifficulty(4,4);
+		rmAddObjectDefConstraint(Nugget4ID, avoidNugget);
+		rmAddObjectDefConstraint(Nugget4ID, avoidNatives);
+		rmAddObjectDefConstraint(Nugget4ID, avoidTradeRouteShort);
+		rmAddObjectDefConstraint(Nugget4ID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(Nugget4ID, avoidImpassableLand);
+		rmAddObjectDefConstraint(Nugget4ID, avoidGoldTypeMin);
+		rmAddObjectDefConstraint(Nugget4ID, avoidTownCenter);
+		rmAddObjectDefConstraint(Nugget4ID, avoidIbexMin);
+		rmAddObjectDefConstraint(Nugget4ID, avoidForestMin);	
+		rmAddObjectDefConstraint(Nugget4ID, avoidEdge); 
+		rmAddObjectDefConstraint(Nugget4ID, stayInPlateau);
+		rmAddObjectDefConstraint(Nugget4ID, avoidHill);
+		rmAddObjectDefConstraint(Nugget4ID, avoidRamp);
+		if (cNumberNonGaiaPlayers >= 4)
+			rmPlaceObjectDefAtLoc(Nugget4ID, 0, 0.50, 0.50);
+	}		
+		
+		
+	// Treasures lvl2
+	for (i=0; < treasure2count)
+	{
+		int Nugget2ID = rmCreateObjectDef("nugget lvl2 "+i); 
+		rmAddObjectDefItem(Nugget2ID, "Nugget", 1, 0.0);
+		rmSetObjectDefMinDistance(Nugget2ID, 0);
+		rmSetObjectDefMaxDistance(Nugget2ID, rmXFractionToMeters(0.5));
+		rmSetNuggetDifficulty(2,2);
+		rmAddObjectDefConstraint(Nugget2ID, avoidNugget);
+		rmAddObjectDefConstraint(Nugget2ID, avoidNatives);
+		rmAddObjectDefConstraint(Nugget2ID, avoidTradeRouteShort);
+		rmAddObjectDefConstraint(Nugget2ID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(Nugget2ID, avoidImpassableLand);
+		rmAddObjectDefConstraint(Nugget2ID, avoidGoldTypeMin);
+		rmAddObjectDefConstraint(Nugget2ID, avoidTownCenter);
+		rmAddObjectDefConstraint(Nugget2ID, avoidIbexMin);
+		rmAddObjectDefConstraint(Nugget2ID, avoidForestMin);	
+		rmAddObjectDefConstraint(Nugget2ID, avoidEdge); 
+		rmAddObjectDefConstraint(Nugget2ID, stayInPlateau);
+		rmAddObjectDefConstraint(Nugget2ID, avoidHill);
+		rmAddObjectDefConstraint(Nugget2ID, avoidRamp);
+		rmPlaceObjectDefAtLoc(Nugget2ID, 0, 0.50, 0.50);
+	}	
+		
+		
+	// Treasures lvl1	
+	for (i=0; < treasure1count)
+	{
+		int Nugget1ID = rmCreateObjectDef("nugget lvl1 "+i); 
+		rmAddObjectDefItem(Nugget1ID, "Nugget", 1, 0.0);
+		rmSetObjectDefMinDistance(Nugget1ID, 0);
+		rmSetObjectDefMaxDistance(Nugget1ID, rmXFractionToMeters(0.5));
+		rmSetNuggetDifficulty(1,1);
+		rmAddObjectDefConstraint(Nugget1ID, avoidNuggetFar);
+		rmAddObjectDefConstraint(Nugget1ID, avoidNatives);
+		rmAddObjectDefConstraint(Nugget1ID, avoidTradeRouteShort);
+		rmAddObjectDefConstraint(Nugget1ID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(Nugget1ID, avoidImpassableLandMed);
+		rmAddObjectDefConstraint(Nugget1ID, avoidGoldTypeMin);
+		rmAddObjectDefConstraint(Nugget1ID, avoidTownCenter); 
+		rmAddObjectDefConstraint(Nugget1ID, avoidMuskdeerMin);
+		rmAddObjectDefConstraint(Nugget1ID, avoidForestMin);	
+		rmAddObjectDefConstraint(Nugget1ID, avoidEdge); 
+		rmAddObjectDefConstraint(Nugget1ID, avoidPlateau);
+//		if (i < 2)
+//			rmAddObjectDefConstraint(Nugget2ID, staySouthHalf); 
+//		else if (i < 4)
+//			rmAddObjectDefConstraint(Nugget2ID, stayNorthHalf); 
+		rmPlaceObjectDefAtLoc(Nugget1ID, 0, 0.50, 0.50);
+	}
+	
+	
+	// ****************************************
+	
+	// Text
+	rmSetStatusText("",0.95);
+	
+	// **************** Yaks *****************
+	
+	int yakcount = 2+3*cNumberNonGaiaPlayers;
+	
+	for (i=0; < yakcount)
+	{
+		int yakID=rmCreateObjectDef("yak"+i);
+		if (i < yakcount/4)
+			rmAddObjectDefItem(yakID, "ypyak", 2, 4.0);
+		else
+			rmAddObjectDefItem(yakID, "ypyak", 1, 1.0);
+		rmSetObjectDefMinDistance(yakID, 0.0);
+		rmSetObjectDefMaxDistance(yakID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(yakID, avoidYak);
+		rmAddObjectDefConstraint(yakID, avoidNatives);
+		rmAddObjectDefConstraint(yakID, avoidTradeRouteSocket);
+		rmAddObjectDefConstraint(yakID, avoidImpassableLand);
+		rmAddObjectDefConstraint(yakID, avoidGoldTypeMin);
+		rmAddObjectDefConstraint(yakID, avoidTownCenterFar);
+		rmAddObjectDefConstraint(yakID, avoidIbexMin); 
+		rmAddObjectDefConstraint(yakID, avoidMuskdeerMin);
+		rmAddObjectDefConstraint(yakID, avoidForestMin);
+		rmAddObjectDefConstraint(yakID, avoidNuggetShort);
+		rmAddObjectDefConstraint(yakID, avoidEdge); 
+		rmAddObjectDefConstraint(yakID, avoidRampShort); 
+		rmAddObjectDefConstraint(yakID, avoidHill);
+		if (i < yakcount/4)
+		{
+			rmAddObjectDefConstraint(yakID, stayInPlateau);
+			if (i%2 == 0)
+				rmAddObjectDefConstraint(yakID, stayNorthHalf);
+			else
+				rmAddObjectDefConstraint(yakID, staySouthHalf);
+		}
+		else
+			rmAddObjectDefConstraint(yakID, avoidPlateau);
+		rmPlaceObjectDefAtLoc(yakID, 0, 0.50, 0.50);
+	}
+	// ****************************************
+	
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.5;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+	// Text
+	rmSetStatusText("",1.00);
+		
+} //END
+	
+	
\ No newline at end of file
diff --git a/RMM/Largerandommaps.set b/RMM/Largerandommaps.set
index 18519be..5392923 100644
--- a/RMM/Largerandommaps.set
+++ b/RMM/Largerandommaps.set
@@ -12,4 +12,7 @@
   <map>new englandLarge</map>
   <map>californialarge</map>
   <map>mongolialarge</map>
+  <map>CongoLarge</map>
+  <map>SaharaLarge</map>
+  <map>australialarge</map>
 </randomMaps>
diff --git a/RMM/Madagascar.xml b/RMM/Madagascar.xml
new file mode 100644
index 0000000..b159035
--- /dev/null
+++ b/RMM/Madagascar.xml
@@ -0,0 +1,13 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\madagascar" 
+displayNameID = "130093" 
+details = "130094" 
+loadDetails = "130095" 
+loadBackground="ui\random_map\africa\madagascar\madagascar_map">
+  <loadss>ui\random_map\africa\madagascar\madagascar_ss_01</loadss>
+  <loadss>ui\random_map\africa\madagascar\madagascar_ss_02</loadss>
+  <loadss>ui\random_map\africa\madagascar\madagascar_ss_03</loadss>
+</mapinfo>
+
+ 
\ No newline at end of file
diff --git a/RMM/Madagascar.xs b/RMM/Madagascar.xs
new file mode 100644
index 0000000..03370bd
--- /dev/null
+++ b/RMM/Madagascar.xs
@@ -0,0 +1,1142 @@
+// Korea
+// RF_Gandalf
+// Main entry point for random map script    
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+// initialize map type variables
+  string nativeCiv1 = "";
+  string nativeCiv2 = "";
+ 
+  string baseMix = "california_grass";
+  string baseTerrain = "water";
+  string seaType = "california coast";
+  string cliffType = "california";
+
+  string forestType = "Madagascar Forest";
+  string startTreeType = "TreeAraucania";
+  
+  string mapType1 = "ceylon";
+  string mapType2 = "water";
+
+  string huntable1 = "ypMuskDeer";  
+  string huntable2 = "ypIbex";
+  string fish1 = "ypFishTuna";
+  string fish2 = "ypSquid";
+  string whale1 = "HumpbackWhale";
+  string sheepType = "ypWaterBuffalo";
+  
+  string patchTerrain = "california\groundforest_cal";
+  string patchType1 = "california\groundforest_cal";
+  string patchType2 = "california\groundforest_cal";
+  
+  string lightingType = "yucatan";
+  
+// Initialize terms
+  int classSmallIsland = 0;
+  int avoidAll = 0;
+  int avoidAllForests = 0;
+  int avoidWater4 = 0;
+  int avoidRandomBerries = 0;
+  int avoidNugget = 0;
+  int nuggetVsCoin = 0;
+  int islandConstraint = 0; 
+  int avoidSmallIslands = 0;
+  int nuggetAvoidsBerries = 0;
+  int forestVsNugget = 0;
+  int forestVsCoin = 0;
+  int islandEdgeConstraint = 0;
+  int forestConstraintShort = 0;
+  int avoidImpassableLand = 0;
+  int avoidImpassableLandLong = 0;
+  int shortAvoidTradeRoute = 0;
+  int avoidTradeRouteSocketsShort = 0;
+  int avoidTradeRouteSocketsNear = 0;
+  int avoidNuggetShort = 0;
+  int avoidCoinShort = 0;
+  int numTries = 0;
+  int goldCounter = 0;
+  int berryCounter = 0;
+  int nuggetCounter = 0;
+  int forestCounter = 0;
+  int huntCounter = 0;
+  float randomIslandStuff = 0.0;
+
+   int classHuntable=0;
+   int huntableConstraint=0;
+   int classImportantItem=0;
+
+   float xLoc = 0.0;
+   float yLoc = 0.0;
+
+//places mines in the north
+void sfIslandGold (int islandID = 0, string mineType = "mine", int mineCount = 1)
+{
+  int islandGoldID = rmCreateObjectDef("random gold"+goldCounter);
+  rmAddObjectDefItem(islandGoldID, mineType, 1, 0);
+  rmSetObjectDefMinDistance(islandGoldID, 0.0);
+  rmSetObjectDefMaxDistance(islandGoldID, 6.0);    
+  rmAddObjectDefConstraint(islandGoldID, avoidImpassableLandLong);    
+  rmAddObjectDefConstraint(islandGoldID, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(islandGoldID, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(islandGoldID, avoidAll);    
+  rmAddObjectDefConstraint(islandGoldID, avoidCoinShort);    
+  rmAddObjectDefConstraint(islandGoldID, avoidNuggetShort);    
+  rmPlaceObjectDefInArea(islandGoldID, 0, islandID, mineCount);
+  goldCounter = goldCounter + 1;
+}
+
+//places berries in the north
+void sfIslandBerries (int islandID = 0, int berryLow = 0, int berryHigh = 0)
+{
+  int islandBerriesID=rmCreateObjectDef("random berries"+berryCounter);
+  rmAddObjectDefItem(islandBerriesID, "berrybush", rmRandInt(berryLow,berryHigh), 6.0); 
+  rmSetObjectDefMinDistance(islandBerriesID, 0.0);
+  rmSetObjectDefMaxDistance(islandBerriesID, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(islandBerriesID, avoidRandomBerries);
+  rmAddObjectDefConstraint(islandBerriesID, avoidImpassableLand);  
+  rmAddObjectDefConstraint(islandBerriesID, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(islandBerriesID, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(islandBerriesID, avoidAll);    
+  rmPlaceObjectDefInArea(islandBerriesID, 0, islandID, 1); 
+  berryCounter = berryCounter + 1;
+}
+
+//places treasures in the north
+void sfIslandNuggets (int islandID = 0, int nuggetLow = 0, int nuggetHigh = 0)
+{
+  int nuggetID= rmCreateObjectDef("nugget"+nuggetCounter); 
+  rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0);
+  rmSetObjectDefMinDistance(nuggetID, 0.0);
+  rmSetNuggetDifficulty(nuggetLow, nuggetHigh);
+  rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(nuggetID, nuggetAvoidsBerries);
+  rmAddObjectDefConstraint(nuggetID, avoidAll);
+  rmAddObjectDefConstraint(nuggetID, avoidImpassableLandLong);
+  rmAddObjectDefConstraint(nuggetID, forestVsNugget);
+  rmAddObjectDefConstraint(nuggetID, forestConstraintShort);
+  rmAddObjectDefConstraint(nuggetID, avoidWater4);
+  rmAddObjectDefConstraint(nuggetID, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(nuggetID, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(nuggetID, islandEdgeConstraint);
+  rmPlaceObjectDefInArea(nuggetID, 0, islandID, 1);
+  nuggetCounter = nuggetCounter + 1;
+}
+
+//builds the north area
+int sfBuildBigIsland (string bigIslandName = "topID", float x_loc = 0.5, float y_loc = 0.85, float mainlandType = 0.0)
+{
+  int bigIslandID=rmCreateArea(bigIslandName);
+  rmSetAreaSize(bigIslandID, 0.14, 0.14);
+  rmAddAreaToClass(bigIslandID, classSmallIsland);  
+  rmSetAreaMix(bigIslandID, baseMix);
+  rmSetAreaEdgeFilling(bigIslandID, 5);
+  rmSetAreaBaseHeight(bigIslandID, 1.0);
+  rmSetAreaSmoothDistance(bigIslandID, 10);
+  rmSetAreaWarnFailure(bigIslandID, false);
+  rmSetAreaCoherence(bigIslandID, 0.55);
+  rmSetAreaLocation(bigIslandID, x_loc, y_loc);  
+  rmSetAreaObeyWorldCircleConstraint(bigIslandID, false);
+  rmSetAreaElevationType(bigIslandID, cElevTurbulence);
+  rmSetAreaElevationVariation(bigIslandID, 3.0);
+  rmSetAreaElevationMinFrequency(bigIslandID, 0.09);
+  rmSetAreaElevationOctaves(bigIslandID, 3);
+  rmSetAreaElevationPersistence(bigIslandID, 0.2);
+  rmSetAreaElevationNoiseBias(bigIslandID, 1); 
+  rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.9, 1.0, 0.9);
+  rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.9, 0.0, 0.9);  
+  rmBuildArea(bigIslandID);
+  
+    int tradeRouteID = rmCreateTradeRoute();
+    int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+    rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+    rmAddObjectDefToClass(socketID, classImportantItem); 
+    rmSetObjectDefAllowOverlap(socketID, true);
+    rmSetObjectDefMinDistance(socketID, 0.0);
+    rmSetObjectDefMaxDistance(socketID, 8.0);
+
+    rmAddTradeRouteWaypoint(tradeRouteID, .925, .935);
+    rmAddTradeRouteWaypoint(tradeRouteID, .9, .89);
+    rmAddTradeRouteWaypoint(tradeRouteID, .61, .8);
+    rmAddTradeRouteWaypoint(tradeRouteID, .55, .77);
+    rmAddTradeRouteWaypoint(tradeRouteID, .5, .77);
+    rmAddTradeRouteWaypoint(tradeRouteID, .45, .77);
+    rmAddTradeRouteWaypoint(tradeRouteID, .39, .8);
+    rmAddTradeRouteWaypoint(tradeRouteID, .1, .89);
+    rmAddTradeRouteWaypoint(tradeRouteID, .075, .935);
+    rmEchoInfo("Up top");
+   
+    bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID, "water");
+    if(placedTradeRoute == false)
+      rmEchoError("Failed to place trade route"); 
+    
+    // add the sockets along the trade route.
+    rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+    
+    vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.3);
+    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc); 
+
+    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.7);
+    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);   
+    
+    // check for KOTH game mode
+    if(rmGetIsKOTH())
+    {
+      int randLoc = rmRandInt(1,2);
+      float walk = 0.1;
+
+      xLoc = 0.5;
+      
+      ypKingsHillPlacer(xLoc, yLoc, walk, avoidTradeRouteSocketsNear);
+      rmEchoInfo("XLOC = "+xLoc);
+      rmEchoInfo("XLOC = "+yLoc);
+    }
+  
+  sfIslandBerries(bigIslandID, 7, 9);  
+  sfIslandNuggets(bigIslandID, 4, 4);
+  sfIslandNuggets(bigIslandID, 3, 3);
+  sfIslandNuggets(bigIslandID, 4, 4);
+  sfIslandNuggets(bigIslandID, 3, 3);
+  
+  if(cNumberNonGaiaPlayers < 4) 
+    sfIslandGold(bigIslandID, "minegold", 2);
+  else if(cNumberNonGaiaPlayers < 6) 
+    sfIslandGold(bigIslandID, "minegold", 3);
+  else if (mainlandType == 1.0)
+    sfIslandGold(bigIslandID, "minegold", 4);
+    
+  return(bigIslandID);
+}
+
+//main function
+void main(void)
+{
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.01);
+
+// Define Natives
+   int subCiv0=-1;
+   int subCiv1=-1;
+   int subCiv2=-1;
+
+   if (rmAllocateSubCivs(3) == true)
+   {
+	subCiv0=rmGetCivID("bhakti");
+	rmEchoInfo("subCiv0 is bhakti "+subCiv0);
+	if (subCiv0 >= 0)
+	rmSetSubCiv(0, "bhakti");
+
+	subCiv1=rmGetCivID("jesuit");
+	rmEchoInfo("subCiv1 is jesuit "+subCiv1);
+	if (subCiv1 >= 0)
+	rmSetSubCiv(1, "jesuit");
+
+	subCiv2=rmGetCivID("aztecs");
+	rmEchoInfo("subCiv2 is aztecs "+subCiv2);
+	if (subCiv2 >= 0)
+	rmSetSubCiv(2, "aztecs");
+   }
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.10);
+		
+// Set size of map
+	int playerTiles=27000;
+	if (cNumberNonGaiaPlayers == 3)   // If 3 players...
+		playerTiles = 25000;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers == 4)   // If 4 players...
+		playerTiles = 22000;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers >4)   // If 5 or 6 players...
+		playerTiles = 19000;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers == 6)	// If more than 6 players...
+		playerTiles = 16500;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers >6)	// If more than 6 players...
+		playerTiles = 15000;		// ...give this many tiles per player.	
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+	int longSide=1.1*size;							// was 1.35
+
+// === new sizes ======================================================================================================
+	int scalingNumber = 2;
+	if (cNumberNonGaiaPlayers == 2)  
+	{
+	   size = 465;
+	   longSide = 515;
+	}
+	else if (cNumberNonGaiaPlayers < 5) // 3 or 4 
+	{
+	   size = 475;
+	   longSide = 550;
+	   scalingNumber = 3;
+	}				
+	else if (cNumberNonGaiaPlayers < 7)   
+	{
+	   size = 485;
+	   longSide = 585;
+	   scalingNumber = 4;
+	   if (cNumberTeams > 2)	
+	   {
+	      size = 495;
+	      longSide = 625;
+	   }
+	}		
+	else if (cNumberNonGaiaPlayers > 6)	
+	{
+	   size = 495;
+	   longSide = 625;
+	   scalingNumber = 5;
+	   if (cNumberTeams > 2)	
+	   {
+	      size = 515;
+	      longSide = 650;
+	   }
+	}		
+
+	rmEchoInfo("Map size="+size+"m x "+size+"m");
+	rmSetMapSize(size, longSide);
+
+// Set up map types
+      int mapTypePicker = rmRandInt(1,2);
+	rmSetSeaLevel(1.0);          
+	rmSetSeaType(seaType);
+      rmEnableLocalWater(false);
+	rmSetBaseTerrainMix(baseMix);
+      if (mapTypePicker == 1)
+	   rmSetMapType(mapType1);
+      else
+	   rmSetMapType(mapType2);
+	rmSetMapType("grass");
+	rmSetMapType("water");
+	rmSetLightingSet(lightingType);
+
+// Initialize map.
+	rmTerrainInitialize(baseTerrain);
+	chooseMercs();
+
+// Define some classes.
+	int classPlayer=rmDefineClass("player");
+	int classIsland=rmDefineClass("island");
+      classSmallIsland=rmDefineClass("smallIsland");
+	rmDefineClass("classForest");
+	
+	rmDefineClass("natives");
+	rmDefineClass("classSocket");
+      rmDefineClass("classPatch");
+
+      classHuntable=rmDefineClass("huntableFood");   
+      int classHerdable=rmDefineClass("herdableFood"); 
+      classImportantItem=rmDefineClass("importantItem");
+      rmDefineClass("classCliff");
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.20);
+
+// -------------Define constraints----------------------------------------
+   avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);    
+   avoidAllForests=rmCreateTypeDistanceConstraint("avoid all forests", "all", 6.0);    
+   avoidRandomBerries=rmCreateTypeDistanceConstraint("avoid random berries", "berrybush", 55.0);
+   nuggetAvoidsBerries=rmCreateTypeDistanceConstraint("nuggets avoid berries", "berrybush", 5.0);
+   int avoidBerries = rmCreateTypeDistanceConstraint("avoid berries", "berrybush", 8.0);
+
+   int avoidSheep=rmCreateClassDistanceConstraint("sheep avoids sheep etc", rmClassID("herdableFood"), 45.0);
+   huntableConstraint=rmCreateClassDistanceConstraint("huntable constraint", rmClassID("huntableFood"), 45.0);
+   int nuggetPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 60.0);
+  
+   // Create an edge of map constraint.
+   int playerEdgeConstraint=rmCreatePieConstraint("player edge of map", 0.5, 0.5, rmXFractionToMeters(0.0), rmXFractionToMeters(0.46), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+   // Player area constraint.
+   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 25.0);
+   int playerConstraintMed=rmCreateClassDistanceConstraint("stay away from players med", classPlayer, 50.0);
+   int playerConstraintFar=rmCreateClassDistanceConstraint("stay away from player Far", classPlayer, 75.0);
+   int playerConstraintNative=rmCreateClassDistanceConstraint("natives stay away from player Far", classPlayer, 65.0);
+  
+   // Island Halves
+   int avoidSouth = rmCreateBoxConstraint("avoid the south", 0.0, 0.05, 1.0, 1.0);
+
+   // Bonus area constraint.  
+   islandConstraint=rmCreateClassDistanceConstraint("stay away from main island", classIsland, 12.0);
+   avoidSmallIslands = rmCreateClassDistanceConstraint("stay away from other bonus islands", classSmallIsland, 10.0);
+   islandEdgeConstraint = rmCreatePieConstraint("Islands away from edge of map", 0.5, 0.5, 0, rmGetMapXSize()-12, 0, 0, 0);
+
+   // Fish Constraints
+   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", fish1, 25.0);		
+   int fishVsFishTarponID=rmCreateTypeDistanceConstraint("fish v fish2", fish2, 20.0);
+   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 8.0);			
+   int whaleVsWhaleID=rmCreateTypeDistanceConstraint("whale v whale", whale1, 35.0);	
+   int fishVsWhaleID=rmCreateTypeDistanceConstraint("fish v whale", whale1, 20.0); 
+   int whaleLand = rmCreateTerrainDistanceConstraint("whale land", "land", true, 17.0);
+   int whaleEdgeConstraint = rmCreateBoxConstraint("whales avoid edge", rmXTilesToFraction(17), rmZTilesToFraction(17), 1.0-rmXTilesToFraction(17), 1.0-rmZTilesToFraction(17), 0.01);
+   int avoidLand = rmCreateTerrainDistanceConstraint("ship avoid land", "land", true, 15.0);
+
+   // resource constraints
+   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 24.0);
+   forestConstraintShort=rmCreateClassDistanceConstraint("vs. forest short", rmClassID("classForest"), 5.0);
+   int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "mine", 50.0);	
+   avoidCoinShort=rmCreateTypeDistanceConstraint("avoid coin short", "minegold", 30.0);	
+   int avoidGold=rmCreateTypeDistanceConstraint("avoid gold", "minegold", 55.0);	
+   forestVsCoin=rmCreateTypeDistanceConstraint("forest vs. coin", "mine", 7.0);
+   nuggetVsCoin=rmCreateTypeDistanceConstraint("nugget vs. coin", "mine", 8.0);
+   int avoidRandomTurkeys=rmCreateTypeDistanceConstraint("avoid random turkeys", huntable1, 35.0);	
+   avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "abstractNugget", 35.0); 
+   int avoidNuggetFar=rmCreateTypeDistanceConstraint("nugget avoid nugget far", "abstractNugget", 70.0); 
+   forestVsNugget=rmCreateTypeDistanceConstraint("forest vs. nugget", "abstractNugget", 10.0);
+   avoidNuggetShort=rmCreateTypeDistanceConstraint("vs. nugget short", "abstractNugget", 8.0);
+   int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
+
+   // Avoid impassable land
+   avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 6.0);
+   avoidImpassableLandLong=rmCreateTerrainDistanceConstraint("avoid impassable land long", "Land", false, 15.0);
+   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 2.0);
+
+   int cliffsAvoidCliffs=rmCreateClassDistanceConstraint("cliffs vs. cliffs", rmClassID("classCliff"), 30.0);
+
+   // Constraint to avoid water.
+   avoidWater4 = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 7.0);
+   int avoidWater20 = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 20.0);
+   int avoidWater8 = rmCreateTerrainDistanceConstraint("avoid water 8", "Land", false, 13.0);
+
+   int avoidImportantItem = rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 10.0);
+   int avoidImportantItemCliff = rmCreateClassDistanceConstraint("cliffs etc avoid importants", rmClassID("importantItem"), 40.0);
+   int avoidImportantItemFar = rmCreateClassDistanceConstraint("secrets etc avoid each other Far", rmClassID("importantItem"), 50.0);
+  
+   shortAvoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route short", 5.0);
+   int medAvoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route med", 10.0);
+   avoidTradeRouteSocketsShort=rmCreateTypeDistanceConstraint("avoid trade route sockets short", "sockettraderoute", 10.0);
+   avoidTradeRouteSocketsNear=rmCreateTypeDistanceConstraint("avoid trade route sockets near", "sockettraderoute", 6.0);
+
+   // Flag constraints for HC spawn point
+   int flagEdgeConstraint = rmCreateBoxConstraint("flags avoid edge", rmXTilesToFraction(15), rmZTilesToFraction(15), 1.0-rmXTilesToFraction(15), 1.0-rmZTilesToFraction(15), 0.01);
+   int flagLand = rmCreateTerrainDistanceConstraint("flag vs land", "land", true, 18.0);
+   int flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same", "HomeCityWaterSpawnFlag", 22); 
+   if (cNumberTeams > 2)
+	flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same far", "HomeCityWaterSpawnFlag", 50); 
+	
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.30);
+
+// Make one big island.  
+   int bigIslandID=rmCreateArea("big peninsula");
+   if (cNumberNonGaiaPlayers > 6)
+      rmSetAreaSize(bigIslandID, 0.46, 0.46);
+   else if (cNumberNonGaiaPlayers > 4)
+      rmSetAreaSize(bigIslandID, 0.45, 0.45);
+   else
+      rmSetAreaSize(bigIslandID, 0.43, 0.43);
+   rmSetAreaCoherence(bigIslandID, 0.66);
+   rmSetAreaBaseHeight(bigIslandID, 1.5);
+   rmSetAreaSmoothDistance(bigIslandID, 12);
+   rmSetAreaMix(bigIslandID, baseMix);
+   rmAddAreaToClass(bigIslandID, classIsland);
+   rmSetAreaObeyWorldCircleConstraint(bigIslandID, false);
+   rmSetAreaElevationType(bigIslandID, cElevTurbulence);
+   rmSetAreaElevationVariation(bigIslandID, 3.0);
+   rmSetAreaElevationMinFrequency(bigIslandID, 0.12);
+   rmSetAreaElevationOctaves(bigIslandID, 3);
+   rmSetAreaElevationPersistence(bigIslandID, 0.15);
+   rmSetAreaElevationNoiseBias(bigIslandID, 1);
+   rmSetAreaEdgeFilling(bigIslandID, 5);
+
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.2, 0.5, 1.0); 
+   rmAddAreaInfluenceSegment(bigIslandID, 0.0, 0.94, 1.0, 0.94);
+   if (cNumberNonGaiaPlayers < 7)
+   {
+      rmAddAreaInfluenceSegment(bigIslandID, 0.5, 1.0, 0.5, 0.21);
+      rmAddAreaInfluenceSegment(bigIslandID, 0.32, 1.0, 0.34, 0.225); 
+      rmAddAreaInfluenceSegment(bigIslandID, 0.68, 1.0, 0.66, 0.225); 
+   }
+   else
+   {
+      rmAddAreaInfluenceSegment(bigIslandID, 0.5, 1.0, 0.5, 0.195);
+      rmAddAreaInfluenceSegment(bigIslandID, 0.32, 1.0, 0.34, 0.215); 
+      rmAddAreaInfluenceSegment(bigIslandID, 0.68, 1.0, 0.66, 0.215); 
+   }
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.75, 0.0, 0.9);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.75, 1.0, 0.9); 
+
+   rmSetAreaLocation(bigIslandID, 0.5, 0.6);
+   rmSetAreaWarnFailure(bigIslandID, false);
+   rmBuildArea(bigIslandID);
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.40);
+	
+// Set up player areas and starting locs	
+  float teamStartLoc = rmRandFloat(0.0, 1.0);  
+
+  if (cNumberTeams == 2)
+  {
+    if (cNumberNonGaiaPlayers == 2)
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.67, 0.5, 0.67, 0.51, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.33, 0.5, 0.33, 0.51, 0.1, 0); 
+    }
+    else if (cNumberNonGaiaPlayers < 5)
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.69, 0.4, 0.69, 0.62, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.31, 0.62, 0.31, 0.4, 0.1, 0); 
+    }  
+    else if (cNumberNonGaiaPlayers < 7)
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.69, 0.35, 0.69, 0.67, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.31, 0.67, 0.31, 0.35, 0.1, 0); 
+    }
+    else
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.69, 0.32, 0.69, 0.69, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.31, 0.69, 0.31, 0.32, 0.1, 0); 
+    } 
+  }
+  else  // otherwise FFA
+  {
+	if (cNumberNonGaiaPlayers < 5)
+ 	   rmSetPlayerPlacementArea(0.31, 0.35, 0.69, 0.65);
+	else if (cNumberNonGaiaPlayers < 7)
+ 	   rmSetPlayerPlacementArea(0.31, 0.33, 0.69, 0.67);
+	else
+ 	   rmSetPlayerPlacementArea(0.31, 0.33, 0.69, 0.69);
+	rmPlacePlayersSquare(0.5, 0.0, 0.0);
+  }
+
+ // Create the Player's area.
+   float playerFraction=rmAreaTilesToFraction(100);
+   for(i=1; <cNumberPlayers)
+   {
+    int id=rmCreateArea("Player"+i, bigIslandID);
+    rmSetPlayerArea(i, id);
+    rmSetAreaSize(id, playerFraction, playerFraction);
+    rmAddAreaConstraint(id, avoidWater8);
+    rmAddAreaToClass(id, classPlayer);
+    rmSetAreaLocPlayer(id, i);
+    rmSetAreaWarnFailure(id, true);
+   }
+
+   // Build the areas. 
+   rmBuildAllAreas();
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.50);
+
+   int castleSetup = rmRandInt(1,2);
+   if (cNumberTeams > 2)
+	castleSetup = 3;
+
+   if (castleSetup == 1)
+      yLoc = 0.92;
+   else if (castleSetup == 2)
+      yLoc = 0.72;
+   else
+	yLoc = 0.5;
+
+   int bonusIslandID6 = sfBuildBigIsland("bonus island 6", 0.5, 0.92, 1.0);
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.60);
+ 
+// Natives  
+   int nativeType = rmRandInt(1,2);
+   int villageType = rmRandInt(1,5);
+   int nativeSetup = rmRandInt(1,2);
+   int zenVillage = 0;
+
+    int villageAID = -1;  // SOUTHERN VILLAGE
+    if (nativeType == 1)
+    {
+       villageAID = rmCreateGrouping("village A", "native bhakti village "+villageType);
+	 zenVillage = 1;
+    }
+    else 
+       villageAID = rmCreateGrouping("village A", "native jesuit mission cj 0"+villageType);
+    rmAddGroupingToClass(villageAID, rmClassID("importantItem"));
+    rmSetGroupingMinDistance(villageAID, 0.0);
+    rmSetGroupingMaxDistance(villageAID, 15.0);
+    rmAddGroupingConstraint(villageAID, avoidImpassableLand);
+    rmAddGroupingConstraint(villageAID, avoidWater8);
+    rmAddGroupingConstraint(villageAID, avoidImportantItemFar);
+    if (cNumberTeams > 2 && cNumberNonGaiaPlayers > 4)
+       rmAddGroupingConstraint(villageAID, playerConstraintMed);
+    else
+       rmAddGroupingConstraint(villageAID, playerConstraintNative);
+    rmAddGroupingConstraint(villageAID, avoidAll);
+    rmAddGroupingConstraint(villageAID, medAvoidTradeRoute);
+    rmAddGroupingConstraint(villageAID, avoidTradeRouteSocketsShort);
+
+    int villageBID = -1;   // NORTHERN VILLAGE
+    if (zenVillage == 1)
+	 nativeType = 2;
+    else
+       nativeType = rmRandInt(1,2);
+    villageType = rmRandInt(1,5);
+    if (nativeType == 1)
+       villageBID = rmCreateGrouping("village B", "native Aztec village "+villageType);
+    else 
+       villageBID = rmCreateGrouping("village B", "native bhakti village "+villageType);
+    rmAddGroupingToClass(villageBID, rmClassID("importantItem"));
+    rmSetGroupingMinDistance(villageBID, 0.0);
+    rmSetGroupingMaxDistance(villageBID, 22.0);
+    rmAddGroupingConstraint(villageBID, avoidImpassableLand);
+    rmAddGroupingConstraint(villageBID, avoidWater8);
+    rmAddGroupingConstraint(villageBID, avoidImportantItemFar);
+    rmAddGroupingConstraint(villageBID, playerConstraintNative);
+    rmAddGroupingConstraint(villageBID, avoidAll);
+    rmAddGroupingConstraint(villageBID, medAvoidTradeRoute);
+    rmAddGroupingConstraint(villageBID, avoidTradeRouteSocketsShort);
+    
+   if (nativeSetup == 1) 
+   {
+      if (cNumberNonGaiaPlayers == 2)
+      {
+         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.235);
+   	   if (castleSetup == 1)
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.7); 
+   	   else
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.92); 
+      }
+	else
+      {
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.31, 0.91); 
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.69, 0.91);
+	   if (cNumberNonGaiaPlayers > 5)
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.225);
+	   else 
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.235);
+      }
+   }
+   else if (nativeSetup == 2) 
+   {
+	if (cNumberNonGaiaPlayers > 5)
+         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.228);
+	else 
+         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.238);
+      if(rmGetIsKOTH())
+      {
+	}
+	else
+	{
+	  if (cNumberTeams == 2 && cNumberNonGaiaPlayers > 3)
+	  {
+           if (rmRandInt(1,2) == 1)
+	         rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.49);
+	     else
+ 	         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.49);
+	  }
+	}
+      if (castleSetup == 1)
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.7); 
+   	else
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.91); 
+   }
+  
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.70);
+
+// Player stuff 
+//Prepare to place TCs
+	int TCID = rmCreateObjectDef("player TC");
+	if ( rmGetNomadStart())
+		rmAddObjectDefItem(TCID, "coveredWagon", 1, 0);
+	else
+		rmAddObjectDefItem(TCID, "townCenter", 1, 0);
+	rmSetObjectDefMinDistance(TCID, 0.0);
+	rmSetObjectDefMaxDistance(TCID, 10.0); 
+	rmAddObjectDefConstraint(TCID, avoidImpassableLand);
+	rmAddObjectDefConstraint(TCID, avoidWater8);
+    	
+//Prepare to place Explorers, Explorer's dog, Explorer's Taun Taun, etc.
+	int startingUnits = rmCreateStartingUnitsObjectDef(4.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
+	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
+
+//Prepare to place player starting Mines
+	int playerGoldID = rmCreateObjectDef("player silver");
+	rmAddObjectDefItem(playerGoldID, "mine", 1, 0);
+	rmSetObjectDefMinDistance(playerGoldID, 14.0);
+	rmSetObjectDefMaxDistance(playerGoldID, 20.0);
+      rmAddObjectDefConstraint(playerGoldID, avoidWater8);
+	rmAddObjectDefConstraint(playerGoldID, avoidAll);
+      rmAddObjectDefConstraint(playerGoldID, avoidImpassableLand);
+      rmAddObjectDefConstraint(playerGoldID, avoidBerries);
+
+      int startSilver2ID = rmCreateObjectDef("player second silver");
+      rmAddObjectDefItem(startSilver2ID, "mine", 1, 0);
+      rmSetObjectDefMinDistance(startSilver2ID, 42.0);
+      rmSetObjectDefMaxDistance(startSilver2ID, 48.0);
+      rmAddObjectDefConstraint(startSilver2ID, avoidWater8);
+      rmAddObjectDefConstraint(startSilver2ID, avoidAll);
+      rmAddObjectDefConstraint(startSilver2ID, avoidImpassableLand);
+
+//Dock Wagon
+	int playerCrateID=rmCreateObjectDef("starting wagon");
+	rmAddObjectDefItem(playerCrateID, "ypDockWagon", 1, 0.0);
+	rmSetObjectDefMinDistance(playerCrateID, 9.0);
+	rmSetObjectDefMaxDistance(playerCrateID, 12.0);
+	rmAddObjectDefConstraint(playerCrateID, avoidAll);
+	rmAddObjectDefConstraint(playerCrateID, shortAvoidImpassableLand);
+
+//Prepare to place player starting Berries
+	int playerBerriesID=rmCreateObjectDef("player berries");
+	rmAddObjectDefItem(playerBerriesID, "berrybush", 5, 3.0);	
+      rmSetObjectDefMinDistance(playerBerriesID, 13);
+      rmSetObjectDefMaxDistance(playerBerriesID, 16);	
+	rmAddObjectDefConstraint(playerBerriesID, avoidAll);
+	rmAddObjectDefConstraint(playerBerriesID, avoidWater8);
+      rmAddObjectDefConstraint(playerBerriesID, shortAvoidImpassableLand);
+  
+//Prepare to place player starting pop block
+	int playerPopBlock=rmCreateObjectDef("player pop block");
+	rmAddObjectDefItem(playerPopBlock, "ypPopBlock", 1, 0.0);	
+      rmSetObjectDefMinDistance(playerPopBlock, 7);
+      rmSetObjectDefMaxDistance(playerPopBlock, 10);
+	rmAddObjectDefConstraint(playerPopBlock, avoidAll);
+      rmAddObjectDefConstraint(playerPopBlock, avoidImpassableLand);
+
+//Prepare to place player starting huntables
+	int playerTurkeyID=rmCreateObjectDef("player deer");
+      rmAddObjectDefItem(playerTurkeyID, huntable1, 7, 6.0);	
+      rmSetObjectDefMinDistance(playerTurkeyID, 15);
+	rmSetObjectDefMaxDistance(playerTurkeyID, 20);	
+	rmAddObjectDefConstraint(playerTurkeyID, avoidAll);
+	rmAddObjectDefConstraint(playerTurkeyID, avoidWater8);
+      rmAddObjectDefConstraint(playerTurkeyID, avoidImpassableLand);
+      rmSetObjectDefCreateHerd(playerTurkeyID, false);
+
+//Prepare to place player starting trees
+	int StartAreaTreeID=rmCreateObjectDef("starting trees");
+	rmAddObjectDefItem(StartAreaTreeID, startTreeType, 7, 5.0);
+	rmAddObjectDefConstraint(StartAreaTreeID, avoidAll);
+      rmAddObjectDefConstraint(StartAreaTreeID, avoidImpassableLand);
+      rmAddObjectDefConstraint(StartAreaTreeID, avoidBerries);
+	rmAddObjectDefConstraint(StartAreaTreeID, avoidWater4);
+	rmSetObjectDefMinDistance(StartAreaTreeID, 22.0);	
+	rmSetObjectDefMaxDistance(StartAreaTreeID, 25.0);	
+
+	int waterSpawnPointID = 0;
+   
+// Clear out constraints for good measure.
+   rmClearClosestPointConstraints(); 
+   
+   for(i=1; <cNumberPlayers)
+   {
+      // Place TC and starting units
+	rmPlaceObjectDefAtLoc(TCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(TCID, i));				
+	rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+	rmPlaceObjectDefAtLoc(playerBerriesID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));  
+      rmPlaceObjectDefAtLoc(playerGoldID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));   
+	rmPlaceObjectDefAtLoc(playerTurkeyID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));  										
+      rmPlaceObjectDefAtLoc(playerCrateID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      rmPlaceObjectDefAtLoc(playerPopBlock, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      rmPlaceObjectDefAtLoc(startSilver2ID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));  
+        
+      // Place player starting trees
+	rmPlaceObjectDefAtLoc(StartAreaTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+         
+      if(ypIsAsian(i) && rmGetNomadStart() == false)
+         rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+     
+      // Place water spawn points for the players
+	waterSpawnPointID=rmCreateObjectDef("colony ship "+i);
+	rmAddObjectDefItem(waterSpawnPointID, "HomeCityWaterSpawnFlag", 1, 10.0);
+	rmAddClosestPointConstraint(flagVsFlag);
+	rmAddClosestPointConstraint(flagLand); 
+      rmAddClosestPointConstraint(flagEdgeConstraint); 
+	vector closestPoint = rmFindClosestPointVector(TCLoc, rmXFractionToMeters(1.0));
+	rmPlaceObjectDefAtLoc(waterSpawnPointID, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+    
+    // place some starter fishing boats at the spawn flag. We're that nice.
+    int fishingBoatID1=rmCreateObjectDef("FishingBoat1"+i);
+    int fishingBoatID2=rmCreateObjectDef("FishingBoat2"+i);
+    
+    if (rmGetPlayerCiv(i) ==  rmGetCivID("Japanese") || rmGetPlayerCiv(i) ==  rmGetCivID("Indians") || rmGetPlayerCiv(i) ==  rmGetCivID("Chinese")) 
+    {
+      rmAddObjectDefItem(fishingBoatID1, "ypFishingBoatAsian", 1, 10.0);
+      rmAddObjectDefItem(fishingBoatID2, "ypFishingBoatAsian", 1, 10.0);
+    }    
+    else
+    {
+      rmAddObjectDefItem(fishingBoatID1, "FishingBoat", 1, 10.0);
+      rmAddObjectDefItem(fishingBoatID2, "FishingBoat", 1, 10.0);
+    }
+    
+    rmPlaceObjectDefAtLoc(fishingBoatID1, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+    rmPlaceObjectDefAtLoc(fishingBoatID2, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));        
+		
+    // clear closest point for next iteration
+    rmClearClosestPointConstraints();
+
+   }
+	
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.80); 
+
+// Cliffs
+   int cliffHt = -1;
+   int numCliffs=(cNumberNonGaiaPlayers + 4);
+
+   for (i=0; <numCliffs)
+   {
+	cliffHt = rmRandInt(5,7);    
+	int bigCliffID=rmCreateArea("big cliff" +i);
+	rmSetAreaWarnFailure(bigCliffID, false);
+	rmSetAreaCliffType(bigCliffID, cliffType);
+	rmAddAreaToClass(bigCliffID, rmClassID("classCliff"));
+      rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(350), rmAreaTilesToFraction(500));
+	rmSetAreaCliffEdge(bigCliffID, 1, 0.65, 0.1, 1.0, 0);
+	rmSetAreaCliffPainting(bigCliffID, false, true, true, 1.5, true);
+	rmSetAreaCliffHeight(bigCliffID, cliffHt, 2.0, 1.0);
+	rmSetAreaCoherence(bigCliffID, rmRandFloat(0.4, 0.9));
+	rmSetAreaSmoothDistance(bigCliffID, 15);
+	rmSetAreaHeightBlend(bigCliffID, 1.0);
+	rmSetAreaMinBlobs(bigCliffID, 3);
+	rmSetAreaMaxBlobs(bigCliffID, 7);
+	rmSetAreaMinBlobDistance(bigCliffID, 5.0);
+	rmSetAreaMaxBlobDistance(bigCliffID, 20.0);
+	rmAddAreaConstraint(bigCliffID, avoidImportantItemFar);
+      rmAddAreaConstraint(bigCliffID, playerConstraintFar);
+      rmAddAreaConstraint(bigCliffID, avoidWater20);
+      rmAddAreaConstraint(bigCliffID, avoidAll);
+	rmAddAreaConstraint(bigCliffID, medAvoidTradeRoute);
+      rmAddAreaConstraint(bigCliffID, cliffsAvoidCliffs);
+      rmAddAreaConstraint(bigCliffID, avoidTradeRouteSocketsShort);
+	rmBuildArea(bigCliffID);
+   } 
+
+// Gold
+   int goldID = rmCreateObjectDef("random silver");
+   rmAddObjectDefItem(goldID, "mine", 1, 0);
+   rmSetObjectDefMinDistance(goldID, 0.0);
+   rmSetObjectDefMaxDistance(goldID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(goldID, playerConstraintFar);
+   rmAddObjectDefConstraint(goldID, avoidAll);
+   rmAddObjectDefConstraint(goldID, avoidCoin);
+   rmAddObjectDefConstraint(goldID, avoidGold);
+   rmAddObjectDefConstraint(goldID, avoidImpassableLand);
+   rmAddObjectDefConstraint(goldID, avoidImportantItem);    
+   rmPlaceObjectDefInArea(goldID, 0, bigIslandID, cNumberNonGaiaPlayers*2.5);
+
+// Berries
+   int berriesID=rmCreateObjectDef("random berries");
+   rmAddObjectDefItem(berriesID, "berrybush", rmRandInt(4,6), 6.0);  
+   rmSetObjectDefMinDistance(berriesID, 0.0);
+   rmSetObjectDefMaxDistance(berriesID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(berriesID, playerConstraintMed);
+   rmAddObjectDefConstraint(berriesID, avoidAll);
+   rmAddObjectDefConstraint(berriesID, avoidRandomBerries);
+   rmAddObjectDefConstraint(berriesID, avoidImpassableLand);
+   rmAddObjectDefConstraint(berriesID, avoidImportantItem);    
+   rmPlaceObjectDefInArea(berriesID, 0, bigIslandID, cNumberNonGaiaPlayers*2); 
+
+ // --------------- Make load bar move. ----------------------------------------------------------------------------
+	rmSetStatusText("",0.85);
+  
+// Forests
+   numTries=14*cNumberNonGaiaPlayers;
+   if (cNumberNonGaiaPlayers > 4)
+      numTries=12*cNumberNonGaiaPlayers;
+   if (cNumberNonGaiaPlayers > 6)
+      numTries=10*cNumberNonGaiaPlayers;
+   int failCount=0;   
+   int failCount2=0;
+   int forestSize = rmRandInt(160,300);
+   int patchSize = 0;
+   int coverForestPatchID = 0;
+   int forest = 0;
+   for (i=0; <numTries)
+   {   
+    forest=rmCreateArea("forest "+i);
+    rmSetAreaWarnFailure(forest, false);
+    rmSetAreaSize(forest, rmAreaTilesToFraction(forestSize), rmAreaTilesToFraction(forestSize));
+    rmSetAreaForestType(forest, forestType);
+    rmSetAreaForestDensity(forest, 0.6);
+    rmSetAreaForestClumpiness(forest, 0.2);
+    rmSetAreaForestUnderbrush(forest, 0.1);
+    rmSetAreaCoherence(forest, 0.4);
+    rmAddAreaToClass(forest, rmClassID("classForest")); 
+    rmAddAreaConstraint(forest, forestConstraint);
+    rmAddAreaConstraint(forest, avoidImportantItem); 
+    rmAddAreaConstraint(forest, avoidWater4);
+    rmAddAreaConstraint(forest, playerConstraint);
+    rmAddAreaConstraint(forest, forestVsCoin);
+    rmAddAreaConstraint(forest, avoidAll);
+    
+    if(rmBuildArea(forest)==false)
+     {
+        // Stop trying once we fail 5 times in a row.
+        failCount++;
+        if(failCount==5)
+           break;
+     }
+     else
+        failCount=0; 
+
+   	   failCount2=0; 
+	   patchSize = forestSize+50;
+         coverForestPatchID = rmCreateArea("cover forest patch"+i, rmAreaID("forest "+i));   
+         rmSetAreaWarnFailure(coverForestPatchID, false);
+         rmSetAreaSize(coverForestPatchID, rmAreaTilesToFraction(patchSize), rmAreaTilesToFraction(patchSize));
+         rmSetAreaCoherence(coverForestPatchID, 0.99);
+         rmSetAreaMix(coverForestPatchID, baseMix);
+         if(rmBuildArea(coverForestPatchID)==false)
+         {
+            // Stop trying once we fail 3 times in a row.
+            failCount2++;
+            if(failCount2==3)
+               break;
+         }
+         else
+            failCount2=0; 
+
+	forestSize = rmRandInt(160,300);
+   } 
+
+// Huntables - near and far
+   int farPronghornID=rmCreateObjectDef("far pronghorn");
+   rmAddObjectDefItem(farPronghornID, huntable2, rmRandInt(5,6), 4.0);
+   rmAddObjectDefToClass(farPronghornID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(farPronghornID, 53.0);
+   rmSetObjectDefMaxDistance(farPronghornID, 65.0);
+   rmAddObjectDefConstraint(farPronghornID, playerConstraintMed);
+   rmAddObjectDefConstraint(farPronghornID, avoidImpassableLand);
+   rmAddObjectDefConstraint(farPronghornID, avoidImportantItem);
+   rmAddObjectDefConstraint(farPronghornID, huntableConstraint);
+   rmAddObjectDefConstraint(farPronghornID, avoidAll);
+   rmSetObjectDefCreateHerd(farPronghornID, true);
+   rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+
+   int turkeyID=rmCreateObjectDef("random deer");
+   rmAddObjectDefItem(turkeyID, huntable1, rmRandInt(5,6), 5.0);
+   rmAddObjectDefToClass(turkeyID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(turkeyID, 65.0);
+   rmSetObjectDefMaxDistance(turkeyID, 75.0);
+   rmAddObjectDefConstraint(turkeyID, playerConstraintNative);
+   rmAddObjectDefConstraint(turkeyID, avoidRandomTurkeys);
+   rmAddObjectDefConstraint(turkeyID, avoidImpassableLand);
+   rmAddObjectDefConstraint(turkeyID, avoidImportantItem); 
+   rmSetObjectDefCreateHerd(turkeyID, true);
+   rmPlaceObjectDefPerPlayer(turkeyID, false, 1);
+
+   rmSetObjectDefMinDistance(turkeyID, 0.0);
+   rmSetObjectDefMaxDistance(turkeyID, rmXFractionToMeters(0.25));
+   rmPlaceObjectDefAtLoc(turkeyID, 0, 0.5, 0.95, 2); 
+
+   rmSetObjectDefMinDistance(farPronghornID, 80.0);
+   rmSetObjectDefMaxDistance(farPronghornID, 87.0);
+   rmAddObjectDefConstraint(farPronghornID, playerConstraintFar);
+   rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+
+ // --------------- Make load bar move. ----------------------------------------------------------------------------
+	rmSetStatusText("",0.90);
+  
+// Nuggets
+   if (mapTypePicker == 2)
+	rmSetMapType(mapType1);
+   else
+	rmSetMapType(mapType2);
+   int nugget1= rmCreateObjectDef("nugget easy"); 
+   rmAddObjectDefItem(nugget1, "Nugget", 1, 0.0);
+   rmSetObjectDefMinDistance(nugget1, 35.0);
+   rmSetObjectDefMaxDistance(nugget1, 45.0);
+   rmAddObjectDefConstraint(nugget1, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(nugget1, avoidNugget);
+   rmAddObjectDefConstraint(nugget1, playerConstraint);
+   rmAddObjectDefConstraint(nugget1, avoidAll);
+   rmAddObjectDefConstraint(nugget1, avoidImportantItem); 
+   rmAddObjectDefConstraint(nugget1, avoidWater4);
+   rmSetNuggetDifficulty(1, 1);
+   rmPlaceObjectDefPerPlayer(nugget1, false, 2);
+
+   rmSetNuggetDifficulty(2, 2);
+   rmAddObjectDefConstraint(nugget1, playerConstraintNative);
+   rmSetObjectDefMinDistance(nugget1, 65.0);
+   rmSetObjectDefMaxDistance(nugget1, rmXFractionToMeters(0.25));
+   rmPlaceObjectDefPerPlayer(nugget1, false, 2);
+
+   rmSetNuggetDifficulty(3, 3);
+   rmSetObjectDefMinDistance(nugget1, 60.0);
+   rmSetObjectDefMaxDistance(nugget1, rmXFractionToMeters(0.45));
+   rmPlaceObjectDefInArea(nugget1, 0, bigIslandID, cNumberNonGaiaPlayers);
+
+   rmSetNuggetDifficulty(4, 4);
+   rmPlaceObjectDefInArea(nugget1, 0, bigIslandID, 2);
+    
+// sheep etc
+      int sheepID=rmCreateObjectDef("herdable animal");
+      rmAddObjectDefItem(sheepID, sheepType, 2, 4.0);
+      rmSetObjectDefMinDistance(sheepID, 35.0);
+      rmAddObjectDefToClass(sheepID, rmClassID("herdableFood"));
+      rmSetObjectDefMaxDistance(sheepID, rmXFractionToMeters(0.5));
+      rmAddObjectDefConstraint(sheepID, avoidSheep);
+      rmAddObjectDefConstraint(sheepID, avoidAll);
+      rmAddObjectDefConstraint(sheepID, playerConstraint);
+      rmAddObjectDefConstraint(sheepID, avoidImpassableLand);
+      if (rmRandInt(1,2) == 1)
+         rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*3);
+      else 
+         rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*4); 
+
+// Water nuggets
+  rmSetMapType(mapType1);
+  int nugget2= rmCreateObjectDef("nugget water"); 
+  rmAddObjectDefItem(nugget2, "ypNuggetBoat", 1, 0.0);
+  rmSetNuggetDifficulty(5, 5);
+  rmSetObjectDefMinDistance(nugget2, rmXFractionToMeters(0.0));
+  rmSetObjectDefMaxDistance(nugget2, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(nugget2, avoidLand);
+  rmAddObjectDefConstraint(nugget2, avoidNuggetFar);
+  if (cNumberNonGaiaPlayers <4)
+     rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.35, cNumberNonGaiaPlayers*4);
+  else if (cNumberNonGaiaPlayers <7)
+     rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.35, cNumberNonGaiaPlayers*3);
+  else
+     rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.35, cNumberNonGaiaPlayers*2);
+
+// Random whales
+	int whaleID=rmCreateObjectDef("whale");
+	rmAddObjectDefItem(whaleID, whale1, 1, 0.0);
+	rmAddObjectDefConstraint(whaleID, whaleVsWhaleID);
+	rmAddObjectDefConstraint(whaleID, whaleLand);
+      rmAddObjectDefConstraint(whaleID, whaleEdgeConstraint);
+	rmSetObjectDefMinDistance(whaleID, 0.0);
+	rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.3)); 
+	rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.1, cNumberNonGaiaPlayers);
+
+	rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.35)); 
+	rmPlaceObjectDefAtLoc(whaleID, 0, 0.1, 0.47, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(whaleID, 0, 0.9, 0.47, cNumberNonGaiaPlayers);
+
+// Place Random Fish everywhere, but restrained to avoid whales
+	int fishID=rmCreateObjectDef("fish 1");
+	rmAddObjectDefItem(fishID, fish1, 1, 0.0);
+	rmSetObjectDefMinDistance(fishID, 0.0);
+	rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.35));
+	rmAddObjectDefConstraint(fishID, fishVsFishID);
+	rmAddObjectDefConstraint(fishID, fishVsWhaleID);
+	rmAddObjectDefConstraint(fishID, fishLand);
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.1, 0.5, 4*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.9, 0.5, 4*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.05, 4*cNumberNonGaiaPlayers);
+
+	int fish2ID=rmCreateObjectDef("fish 2");
+	rmAddObjectDefItem(fish2ID, fish2, 1, 0.0);
+	rmSetObjectDefMinDistance(fish2ID, 0.0);
+	rmSetObjectDefMaxDistance(fish2ID, rmXFractionToMeters(0.45));
+	rmAddObjectDefConstraint(fish2ID, fishVsFishTarponID);
+	rmAddObjectDefConstraint(fish2ID, fishVsWhaleID);
+	rmAddObjectDefConstraint(fish2ID, fishLand);
+	rmPlaceObjectDefAtLoc(fish2ID, 0, 0.1, 0.5, 3*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fish2ID, 0, 0.9, 0.5, 3*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.1, 3*cNumberNonGaiaPlayers);
+
+	if (cNumberNonGaiaPlayers <5)		// If less than 5 players, place extra fish.
+	{
+	      rmSetObjectDefMaxDistance(fish2ID, rmXFractionToMeters(0.65));
+		rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.4, 3*cNumberNonGaiaPlayers);	
+	}
+
+// Cover the forest base
+      int desertID = rmCreateArea("desert", rmAreaID("big peninsula"));
+      rmSetAreaLocation(desertID, 0.5, 0.5); 
+      rmSetAreaWarnFailure(desertID, false);
+      rmSetAreaSize(desertID, 0.43, 0.43);
+      rmSetAreaCoherence(desertID, 0.99);
+      rmSetAreaMix(desertID, baseMix);
+      rmBuildArea(desertID);
+
+      int desert2ID = rmCreateArea("desert 2", rmAreaID("topID"));
+      rmSetAreaLocation(desert2ID, 0.5, 0.85); 
+      rmSetAreaWarnFailure(desert2ID, false);
+      rmSetAreaSize(desert2ID, 0.14, 0.14);
+      rmSetAreaCoherence(desert2ID, 0.99);
+      rmSetAreaMix(desert2ID, baseMix);
+      rmBuildArea(desert2ID);
+
+// Vary some terrain
+  for (i=0; < 20) {
+    int patch=rmCreateArea("first patch "+i);
+    rmSetAreaWarnFailure(patch, false);
+    rmSetAreaSize(patch, rmAreaTilesToFraction(80), rmAreaTilesToFraction(150));
+    rmSetAreaMix(patch, baseMix);
+    rmSetAreaTerrainType(patch, patchTerrain);
+    rmAddAreaTerrainLayer(patch, patchType1, 0, 1);
+    rmAddAreaToClass(patch, rmClassID("classPatch"));
+    rmSetAreaCoherence(patch, 0.4);
+    rmAddAreaConstraint(patch, shortAvoidImpassableLand);
+    rmBuildArea(patch); 
+  }
+      
+  for (i=0; <10) {
+    int dirtPatch=rmCreateArea("paint patch "+i);
+    rmSetAreaWarnFailure(dirtPatch, false);
+    rmSetAreaSize(dirtPatch, rmAreaTilesToFraction(100), rmAreaTilesToFraction(300));
+    rmSetAreaMix(dirtPatch, baseMix);
+    rmSetAreaTerrainType(dirtPatch, patchTerrain);
+    rmAddAreaTerrainLayer(dirtPatch, patchType2, 0, 1);
+    rmAddAreaToClass(dirtPatch, rmClassID("classPatch"));
+    rmSetAreaCoherence(dirtPatch, 0.4);
+    rmAddAreaConstraint(dirtPatch, shortAvoidImpassableLand);
+    rmAddAreaConstraint(dirtPatch, patchConstraint);
+    rmBuildArea(dirtPatch); 
+  }
+  
+  int ambiental = rmCreateObjectDef("ambiental");
+  rmAddObjectDefItem(ambiental, "UnderbrushCarolinasForest", 1, 10.0);
+  rmSetObjectDefMinDistance(ambiental, 0);
+  rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(ambiental, avoidImpassableLand);    
+  rmAddObjectDefConstraint(ambiental, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(ambiental, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(ambiental, avoidAll);    
+  rmAddObjectDefConstraint(ambiental, avoidCoinShort);    
+  rmAddObjectDefConstraint(ambiental, avoidNuggetShort);   
+  rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 80*cNumberNonGaiaPlayers);
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.99);  
+}
\ No newline at end of file
diff --git a/RMM/MadagascarRegicide.xml b/RMM/MadagascarRegicide.xml
new file mode 100644
index 0000000..782a8f8
--- /dev/null
+++ b/RMM/MadagascarRegicide.xml
@@ -0,0 +1,12 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\madagascar" 
+displayNameID = "130099"
+details = "130100" 
+loadDetails = "130101" 
+loadBackground="ui\random_map\africa\madagascar\madagascar_map">
+   <loadss>ui\random_map\africa\madagascar\madagascar_ss_01</loadss>
+   <loadss>ui\random_map\africa\madagascar\madagascar_ss_02</loadss>
+   <loadss>ui\random_map\africa\madagascar\madagascar_ss_03</loadss>
+</mapinfo>
+ 
\ No newline at end of file
diff --git a/RMM/MadagascarRegicide.xs b/RMM/MadagascarRegicide.xs
new file mode 100644
index 0000000..d5d57b7
--- /dev/null
+++ b/RMM/MadagascarRegicide.xs
@@ -0,0 +1,1064 @@
+// Korea-Regicide
+// RF_Gandalf
+// Main entry point for random map script    
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+// initialize map type variables
+  string nativeCiv1 = "";
+  string nativeCiv2 = "";
+ 
+  string baseMix = "california_grass";
+  string baseTerrain = "water";
+  string seaType = "california coast";
+  string cliffType = "california";
+
+  string forestType = "Madagascar Forest";
+  string startTreeType = "TreeAraucania";
+  
+  string mapType1 = "ceylon";
+  string mapType2 = "water";
+
+  string huntable1 = "ypMuskDeer";  
+  string huntable2 = "ypIbex";
+  string fish1 = "ypFishTuna";
+  string fish2 = "ypSquid";
+  string whale1 = "HumpbackWhale";
+  string sheepType = "ypWaterBuffalo";
+  
+  string patchTerrain = "california\groundforest_cal";
+  string patchType1 = "california\groundforest_cal";
+  string patchType2 = "california\groundforest_cal";
+  
+  string lightingType = "yucatan";
+  
+// Initialize terms
+  int classSmallIsland = 0;
+  int avoidAll = 0;
+  int avoidAllForests = 0;
+  int avoidWater4 = 0;
+  int avoidRandomBerries = 0;
+  int avoidNugget = 0;
+  int nuggetVsCoin = 0;
+  int islandConstraint = 0; 
+  int avoidSmallIslands = 0;
+  int nuggetAvoidsBerries = 0;
+  int forestVsNugget = 0;
+  int forestVsCoin = 0;
+  int islandEdgeConstraint = 0;
+  int forestConstraintShort = 0;
+  int avoidImpassableLand = 0;
+  int avoidImpassableLandLong = 0;
+  int shortAvoidTradeRoute = 0;
+  int avoidTradeRouteSocketsShort = 0;
+  int avoidTradeRouteSocketsNear = 0;
+  int avoidNuggetShort = 0;
+  int avoidCoinShort = 0;
+  int playerConstraintMed = 0;
+  int numTries = 0;
+  int goldCounter = 0;
+  int berryCounter = 0;
+  int nuggetCounter = 0;
+  int forestCounter = 0;
+  int huntCounter = 0;
+  float randomIslandStuff = 0.0;
+
+   int classHuntable=0;
+   int huntableConstraint=0;
+   int classImportantItem=0;
+
+   float xLoc = 0.0;
+   float yLoc = 0.0;
+
+//places mines in the north
+void sfIslandGold (int islandID = 0, string mineType = "mine", int mineCount = 1)
+{
+  int islandGoldID = rmCreateObjectDef("random gold"+goldCounter);
+  rmAddObjectDefItem(islandGoldID, mineType, 1, 0);
+  rmSetObjectDefMinDistance(islandGoldID, 0.0);
+  rmSetObjectDefMaxDistance(islandGoldID, 6.0);    
+  rmAddObjectDefConstraint(islandGoldID, avoidImpassableLandLong);    
+  rmAddObjectDefConstraint(islandGoldID, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(islandGoldID, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(islandGoldID, avoidAll);    
+  rmAddObjectDefConstraint(islandGoldID, avoidCoinShort);    
+  rmAddObjectDefConstraint(islandGoldID, avoidNuggetShort);    
+  rmPlaceObjectDefInArea(islandGoldID, 0, islandID, mineCount);
+  goldCounter = goldCounter + 1;
+}
+
+//places berries in the north
+void sfIslandBerries (int islandID = 0, int berryLow = 0, int berryHigh = 0)
+{
+  int islandBerriesID=rmCreateObjectDef("random berries"+berryCounter);
+  rmAddObjectDefItem(islandBerriesID, "berrybush", rmRandInt(berryLow,berryHigh), 6.0); 
+  rmSetObjectDefMinDistance(islandBerriesID, 0.0);
+  rmSetObjectDefMaxDistance(islandBerriesID, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(islandBerriesID, avoidRandomBerries);
+  rmAddObjectDefConstraint(islandBerriesID, avoidImpassableLand);  
+  rmAddObjectDefConstraint(islandBerriesID, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(islandBerriesID, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(islandBerriesID, avoidAll);    
+  rmPlaceObjectDefInArea(islandBerriesID, 0, islandID, 1); 
+  berryCounter = berryCounter + 1;
+}
+
+//places treasures in the north
+void sfIslandNuggets (int islandID = 0, int nuggetLow = 0, int nuggetHigh = 0)
+{
+  int nuggetID= rmCreateObjectDef("nugget"+nuggetCounter); 
+  rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0);
+  rmSetObjectDefMinDistance(nuggetID, 0.0);
+  rmSetNuggetDifficulty(nuggetLow, nuggetHigh);
+  rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(nuggetID, nuggetAvoidsBerries);
+  rmAddObjectDefConstraint(nuggetID, avoidAll);
+  rmAddObjectDefConstraint(nuggetID, avoidImpassableLandLong);
+  rmAddObjectDefConstraint(nuggetID, forestVsNugget);
+  rmAddObjectDefConstraint(nuggetID, forestConstraintShort);
+  rmAddObjectDefConstraint(nuggetID, avoidWater4);
+  rmAddObjectDefConstraint(nuggetID, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(nuggetID, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(nuggetID, islandEdgeConstraint);
+  rmPlaceObjectDefInArea(nuggetID, 0, islandID, 1);
+  nuggetCounter = nuggetCounter + 1;
+}
+
+//builds the north area
+int sfBuildBigIsland (string bigIslandName = "", float x_loc = 0.0, float y_loc = 0.0, float mainlandType = 0.0)
+{
+  int bigIslandID=rmCreateArea(bigIslandName);
+  rmSetAreaSize(bigIslandID, 0.14, 0.14);
+  rmAddAreaToClass(bigIslandID, classSmallIsland);  
+  rmSetAreaMix(bigIslandID, baseMix);
+  rmSetAreaEdgeFilling(bigIslandID, 5);
+  rmSetAreaBaseHeight(bigIslandID, 1.0);
+  rmSetAreaSmoothDistance(bigIslandID, 10);
+  rmSetAreaWarnFailure(bigIslandID, false);
+  rmSetAreaCoherence(bigIslandID, 0.55);
+  rmSetAreaLocation(bigIslandID, x_loc, y_loc);  
+  rmSetAreaObeyWorldCircleConstraint(bigIslandID, false);
+  rmSetAreaElevationType(bigIslandID, cElevTurbulence);
+  rmSetAreaElevationVariation(bigIslandID, 3.0);
+  rmSetAreaElevationMinFrequency(bigIslandID, 0.09);
+  rmSetAreaElevationOctaves(bigIslandID, 3);
+  rmSetAreaElevationPersistence(bigIslandID, 0.2);
+  rmSetAreaElevationNoiseBias(bigIslandID, 1); 
+  rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.9, 1.0, 0.9);
+  rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.9, 0.0, 0.9);  
+  rmBuildArea(bigIslandID);
+  
+    int tradeRouteID = rmCreateTradeRoute();
+    int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+    rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+    rmAddObjectDefToClass(socketID, classImportantItem); 
+    rmSetObjectDefAllowOverlap(socketID, true);
+    rmSetObjectDefMinDistance(socketID, 0.0);
+    rmSetObjectDefMaxDistance(socketID, 8.0);
+
+    rmAddTradeRouteWaypoint(tradeRouteID, .915, .95);
+    rmAddTradeRouteWaypoint(tradeRouteID, .9, .9);
+    rmAddTradeRouteWaypoint(tradeRouteID, .6, .81);
+    rmAddTradeRouteWaypoint(tradeRouteID, .55, .77);
+    rmAddTradeRouteWaypoint(tradeRouteID, .5, .77);
+    rmAddTradeRouteWaypoint(tradeRouteID, .45, .77);
+    rmAddTradeRouteWaypoint(tradeRouteID, .4, .81);
+    rmAddTradeRouteWaypoint(tradeRouteID, .1, .9);
+    rmAddTradeRouteWaypoint(tradeRouteID, .085, .95);
+    rmEchoInfo("Up top");
+   
+    bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID, "water");
+    if(placedTradeRoute == false)
+      rmEchoError("Failed to place trade route"); 
+    
+    // add the sockets along the trade route.
+    rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+    
+    vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.3);
+    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc); 
+
+    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.7);
+    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);   
+    
+    // check for KOTH game mode
+    if(rmGetIsKOTH())
+    {
+      int randLoc = rmRandInt(1,2);
+      float walk = 0.05;
+
+      xLoc = 0.5;
+      
+      ypKingsHillPlacer(xLoc, yLoc, walk, avoidTradeRouteSocketsNear);
+      rmEchoInfo("XLOC = "+xLoc);
+      rmEchoInfo("XLOC = "+yLoc);
+    }
+  
+  sfIslandBerries(bigIslandID, 7, 9);  
+  sfIslandNuggets(bigIslandID, 4, 4);
+  sfIslandNuggets(bigIslandID, 3, 3);
+  
+  if(cNumberNonGaiaPlayers < 4) 
+    sfIslandGold(bigIslandID, "minegold", 2);
+  else if(cNumberNonGaiaPlayers < 6) 
+    sfIslandGold(bigIslandID, "minegold", 3);
+  else if (mainlandType == 1.0)
+    sfIslandGold(bigIslandID, "minegold", 4);
+    
+  return(bigIslandID);
+}
+
+//main function
+void main(void)
+{
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.01);
+
+// Define Natives
+   int subCiv0=-1;
+   int subCiv1=-1;
+   int subCiv2=-1;
+
+   if (rmAllocateSubCivs(3) == true)
+   {
+	subCiv0=rmGetCivID("bhakti");
+	rmEchoInfo("subCiv0 is bhakti "+subCiv0);
+	if (subCiv0 >= 0)
+	rmSetSubCiv(0, "bhakti");
+
+	subCiv1=rmGetCivID("jesuit");
+	rmEchoInfo("subCiv1 is jesuit "+subCiv1);
+	if (subCiv1 >= 0)
+	rmSetSubCiv(1, "jesuit");
+
+	subCiv2=rmGetCivID("aztecs");
+	rmEchoInfo("subCiv2 is aztecs "+subCiv2);
+	if (subCiv2 >= 0)
+	rmSetSubCiv(2, "aztecs");
+   }
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.10);
+		
+// Set size of map
+	int playerTiles=27000;
+	if (cNumberNonGaiaPlayers == 3)   // If 3 players...
+		playerTiles = 25000;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers == 4)   // If 4 players...
+		playerTiles = 22000;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers >4)   // If 5 or 6 players...
+		playerTiles = 19000;		// ...give this many tiles per player.
+	if (cNumberNonGaiaPlayers >6)	// If more than 6 players...
+		playerTiles = 15000;		// ...give this many tiles per player.	
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+	int longSide=1.35*size;
+	rmEchoInfo("Map size="+size+"m x "+size+"m");
+	rmSetMapSize(size, longSide);
+
+// Set up map types
+      int mapTypePicker = rmRandInt(1,2);
+	rmSetSeaLevel(1.0);          
+	rmSetSeaType(seaType);
+      rmEnableLocalWater(false);
+	rmSetBaseTerrainMix(baseMix);
+      if (mapTypePicker == 1)
+	   rmSetMapType(mapType1);
+      else
+	   rmSetMapType(mapType2);
+	rmSetMapType("grass");
+	rmSetMapType("water");
+	rmSetLightingSet(lightingType);
+
+// Initialize map.
+	rmTerrainInitialize(baseTerrain);
+	chooseMercs();
+
+// Define some classes.
+	int classPlayer=rmDefineClass("player");
+	int classIsland=rmDefineClass("island");
+      classSmallIsland=rmDefineClass("smallIsland");
+	rmDefineClass("classForest");
+	
+	rmDefineClass("natives");
+	rmDefineClass("classSocket");
+      rmDefineClass("classPatch");
+
+      classHuntable=rmDefineClass("huntableFood");   
+      int classHerdable=rmDefineClass("herdableFood"); 
+      classImportantItem=rmDefineClass("importantItem");
+      rmDefineClass("classCliff");
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.20);
+
+// -------------Define constraints----------------------------------------
+   avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);    
+   avoidAllForests=rmCreateTypeDistanceConstraint("avoid all forests", "all", 6.0);    
+   avoidRandomBerries=rmCreateTypeDistanceConstraint("avoid random berries", "berrybush", 55.0);
+   nuggetAvoidsBerries=rmCreateTypeDistanceConstraint("nuggets avoid berries", "berrybush", 5.0);
+   int avoidBerries = rmCreateTypeDistanceConstraint("avoid berries", "berrybush", 8.0);
+
+   int avoidSheep=rmCreateClassDistanceConstraint("sheep avoids sheep etc", rmClassID("herdableFood"), 45.0);
+   huntableConstraint=rmCreateClassDistanceConstraint("huntable constraint", rmClassID("huntableFood"), 45.0);
+   int nuggetPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 60.0);
+  
+   // Create an edge of map constraint.
+   int playerEdgeConstraint=rmCreatePieConstraint("player edge of map", 0.5, 0.5, rmXFractionToMeters(0.0), rmXFractionToMeters(0.46), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+   // Player area constraint.
+   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 25.0);
+   playerConstraintMed=rmCreateClassDistanceConstraint("stay away from players med", classPlayer, 40.0);
+   int playerConstraintFar=rmCreateClassDistanceConstraint("stay away from player Far", classPlayer, 75.0);
+   int playerConstraintNative=rmCreateClassDistanceConstraint("natives stay away from player Far", classPlayer, 65.0);
+  
+   // Island Halves
+   int westHalf = rmCreateBoxConstraint("stay in west half", .35, .6, .65, .7);
+   int eastHalf = rmCreateBoxConstraint("stay in east half", .35, .3, .65, .4);
+   int middle = rmCreateBoxConstraint("stay in middle", .285, .715, .715, .285);
+   int avoidSouth = rmCreateBoxConstraint("avoid the south", 0.0, 0.05, 1.0, 1.0);
+
+   // Bonus area constraint.  
+   islandConstraint=rmCreateClassDistanceConstraint("stay away from main island", classIsland, 12.0);
+   avoidSmallIslands = rmCreateClassDistanceConstraint("stay away from other bonus islands", classSmallIsland, 10.0);
+   islandEdgeConstraint = rmCreatePieConstraint("Islands away from edge of map", 0.5, 0.5, 0, rmGetMapXSize()-12, 0, 0, 0);
+
+   // Fish Constraints
+   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", fish1, 25.0);		
+   int fishVsFishTarponID=rmCreateTypeDistanceConstraint("fish v fish2", fish2, 20.0);
+   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 8.0);			
+   int whaleVsWhaleID=rmCreateTypeDistanceConstraint("whale v whale", whale1, 35.0);	
+   int fishVsWhaleID=rmCreateTypeDistanceConstraint("fish v whale", whale1, 20.0); 
+   int whaleLand = rmCreateTerrainDistanceConstraint("whale land", "land", true, 20.0);
+   int whaleEdgeConstraint = rmCreatePieConstraint("whale away from edge of map", 0.5, 0.5, 0, rmGetMapXSize()-18, 0, 0, 0);
+   int avoidLand = rmCreateTerrainDistanceConstraint("ship avoid land", "land", true, 15.0);
+
+   // resource constraints
+   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 35.0);
+   forestConstraintShort=rmCreateClassDistanceConstraint("vs. forest short", rmClassID("classForest"), 5.0);
+   int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "mine", 50.0);	
+   avoidCoinShort=rmCreateTypeDistanceConstraint("avoid coin short", "minegold", 30.0);	
+   int avoidGold=rmCreateTypeDistanceConstraint("avoid gold", "minegold", 55.0);	
+   forestVsCoin=rmCreateTypeDistanceConstraint("forest vs. coin", "mine", 10.0);
+   nuggetVsCoin=rmCreateTypeDistanceConstraint("nugget vs. coin", "mine", 8.0);
+   int avoidRandomTurkeys=rmCreateTypeDistanceConstraint("avoid random turkeys", huntable1, 35.0);	
+   avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "abstractNugget", 35.0); 
+   int avoidNuggetFar=rmCreateTypeDistanceConstraint("nugget avoid nugget far", "abstractNugget", 70.0); 
+   forestVsNugget=rmCreateTypeDistanceConstraint("forest vs. nugget", "abstractNugget", 10.0);
+   avoidNuggetShort=rmCreateTypeDistanceConstraint("vs. nugget short", "abstractNugget", 8.0);
+   int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
+
+   // Avoid impassable land
+   avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 6.0);
+   avoidImpassableLandLong=rmCreateTerrainDistanceConstraint("avoid impassable land long", "Land", false, 15.0);
+   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 2.0);
+
+   int cliffsAvoidCliffs=rmCreateClassDistanceConstraint("cliffs vs. cliffs", rmClassID("classCliff"), 30.0);
+
+   // Constraint to avoid water.
+   avoidWater4 = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 5.0);
+   int avoidWater20 = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 20.0);
+   int avoidWater8 = rmCreateTerrainDistanceConstraint("avoid water 8", "Land", false, 10.0);
+
+   int avoidImportantItem = rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 10.0);
+   int avoidImportantItemFar = rmCreateClassDistanceConstraint("secrets etc avoid each other Far", rmClassID("importantItem"), 50.0);
+  
+   shortAvoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route short", 5.0);
+   int medAvoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route med", 12.0);
+   avoidTradeRouteSocketsShort=rmCreateTypeDistanceConstraint("avoid trade route sockets short", "sockettraderoute", 10.0);
+   avoidTradeRouteSocketsNear=rmCreateTypeDistanceConstraint("avoid trade route sockets near", "sockettraderoute", 6.0);
+
+   // Flag constraints for HC spawn point
+   int flagEdgeConstraint = rmCreatePieConstraint("flags away from edge of map", 0.5, 0.5, 0, rmGetMapXSize()-15, 0, 0, 0);
+   int flagLand = rmCreateTerrainDistanceConstraint("flag vs land", "land", true, 18.0);
+   int flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same", "HomeCityWaterSpawnFlag", 22); 
+	
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.30);
+
+// Make one big island.  
+   int bigIslandID=rmCreateArea("big peninsula");
+   rmSetAreaSize(bigIslandID, 0.46, 0.46);
+   rmSetAreaCoherence(bigIslandID, 0.76);
+   rmSetAreaBaseHeight(bigIslandID, 1.5);
+   rmSetAreaSmoothDistance(bigIslandID, 18);
+   rmSetAreaMix(bigIslandID, baseMix);
+   rmAddAreaToClass(bigIslandID, classIsland);
+   rmSetAreaObeyWorldCircleConstraint(bigIslandID, false);
+   rmSetAreaElevationType(bigIslandID, cElevTurbulence);
+   rmSetAreaElevationVariation(bigIslandID, 3.0);
+   rmSetAreaElevationMinFrequency(bigIslandID, 0.12);
+   rmSetAreaElevationOctaves(bigIslandID, 3);
+   rmSetAreaElevationPersistence(bigIslandID, 0.15);
+   rmSetAreaElevationNoiseBias(bigIslandID, 1);
+   rmSetAreaEdgeFilling(bigIslandID, 5);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.18, 0.5, 1.0); 
+   rmAddAreaInfluenceSegment(bigIslandID, 0.0, 0.94, 1.0, 0.94);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 1.0, 0.5, 0.19); 
+
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.75, 0.0, 0.9);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.75, 1.0, 0.9);
+
+   rmAddAreaInfluenceSegment(bigIslandID, 0.305, 1.0, 0.305, 0.19); 
+   rmAddAreaInfluenceSegment(bigIslandID, 0.695, 1.0, 0.695, 0.19); 
+
+   rmSetAreaLocation(bigIslandID, 0.5, 0.6);
+   rmSetAreaWarnFailure(bigIslandID, false);
+   rmBuildArea(bigIslandID);
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.40);
+	
+// Set up player areas and starting locs
+	
+  float teamStartLoc = rmRandFloat(0.0, 1.0);  
+
+  if (cNumberTeams == 2)
+  {
+    if (cNumberNonGaiaPlayers == 2)
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.67, 0.5, 0.67, 0.51, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.33, 0.5, 0.33, 0.51, 0.1, 0); 
+    }
+    else if (cNumberNonGaiaPlayers < 5)
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.67, 0.4, 0.67, 0.6, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.33, 0.6, 0.33, 0.4, 0.1, 0); 
+    }  
+    else
+    {
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(0);
+      else    
+        rmSetPlacementTeam(1);
+
+      rmPlacePlayersLine(0.67, 0.35, 0.67, 0.65, 0.1, 0);                
+
+      if (teamStartLoc > 0.5)
+        rmSetPlacementTeam(1);
+      else    
+        rmSetPlacementTeam(0);
+
+      rmPlacePlayersLine(0.33, 0.65, 0.33, 0.35, 0.1, 0); 
+    } 
+  }
+  else  // otherwise FFA
+  {
+	if (cNumberNonGaiaPlayers < 5)
+ 	   rmSetPlayerPlacementArea(0.32, 0.33, 0.68, 0.67);
+	else if (cNumberNonGaiaPlayers < 7)
+ 	   rmSetPlayerPlacementArea(0.31, 0.31, 0.69, 0.69);
+	else
+ 	   rmSetPlayerPlacementArea(0.3, 0.29, 0.7, 0.71);
+	rmPlacePlayersSquare(0.49, 0.0, 0.0);
+  }
+
+ // Create the Player's area.
+   float playerFraction=rmAreaTilesToFraction(100);
+   for(i=1; <cNumberPlayers)
+   {
+    int id=rmCreateArea("Player"+i, bigIslandID);
+    rmSetPlayerArea(i, id);
+    rmSetAreaSize(id, playerFraction, playerFraction);
+    rmAddAreaConstraint(id, avoidWater8);
+    rmAddAreaToClass(id, classPlayer);
+    rmSetAreaLocPlayer(id, i);
+    rmSetAreaWarnFailure(id, true);
+   }
+
+   // Build the areas. 
+   rmBuildAllAreas();
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.50);
+
+   int castleSetup = rmRandInt(1,2);
+   if (cNumberTeams > 2)
+	castleSetup = 3;
+
+   if (castleSetup == 1)
+      yLoc = 0.93;
+   else if (castleSetup == 2)
+      yLoc = 0.72;
+   else
+	yLoc = 0.5;
+
+   int bonusIslandID6 = sfBuildBigIsland("bonus island 6", 0.5, 0.92, 1.0);
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.60);
+ 
+// Natives  
+   int nativeType = rmRandInt(1,3);
+   int villageType = rmRandInt(1,5);
+   int nativeSetup = rmRandInt(1,2);
+
+    int villageAID = -1;  // SOUTHERN VILLAGE
+    if (nativeType == 1)
+       villageAID = rmCreateGrouping("village A", "native bhakti village "+villageType);
+    else 
+       villageAID = rmCreateGrouping("village A", "native jesuit mission cj 0"+villageType);
+    rmAddGroupingToClass(villageAID, rmClassID("importantItem"));
+    rmSetGroupingMinDistance(villageAID, 0.0);
+    rmSetGroupingMaxDistance(villageAID, 15.0);
+    rmAddGroupingConstraint(villageAID, avoidImpassableLand);
+    rmAddGroupingConstraint(villageAID, avoidWater8);
+    rmAddGroupingConstraint(villageAID, avoidImportantItemFar);
+    rmAddGroupingConstraint(villageAID, playerConstraintNative);
+    rmAddGroupingConstraint(villageAID, avoidAll);
+    rmAddGroupingConstraint(villageAID, medAvoidTradeRoute);
+    rmAddGroupingConstraint(villageAID, avoidTradeRouteSocketsShort);
+
+    int villageBID = -1;   // NORTHERN VILLAGE
+    nativeType = rmRandInt(1,3);
+    villageType = rmRandInt(1,5);
+    if (nativeType == 1)
+       villageBID = rmCreateGrouping("village B", "native Aztec village "+villageType);
+    else 
+       villageBID = rmCreateGrouping("village B", "native bhakti village "+villageType);
+    rmAddGroupingToClass(villageBID, rmClassID("importantItem"));
+    rmSetGroupingMinDistance(villageBID, 0.0);
+    rmSetGroupingMaxDistance(villageBID, 20.0);
+    rmAddGroupingConstraint(villageBID, avoidImpassableLand);
+    rmAddGroupingConstraint(villageBID, avoidWater8);
+    rmAddGroupingConstraint(villageBID, avoidImportantItemFar);
+    rmAddGroupingConstraint(villageBID, playerConstraintNative);
+    rmAddGroupingConstraint(villageBID, avoidAll);
+    rmAddGroupingConstraint(villageBID, medAvoidTradeRoute);
+    rmAddGroupingConstraint(villageBID, avoidTradeRouteSocketsShort);
+    
+   if (nativeSetup == 1) 
+   {
+      if (cNumberNonGaiaPlayers == 2)
+      {
+         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.23);
+   	   if (castleSetup == 1)
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.72); 
+   	   else
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.93); 
+      }
+	else
+      {
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.22, 0.9); 
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.78, 0.9);
+	   if (cNumberNonGaiaPlayers > 5)
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.215);
+	   else 
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.23);
+      }
+   }
+   else if (nativeSetup == 2) 
+   {
+	if (cNumberNonGaiaPlayers > 5)
+         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.215);
+	else 
+         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.23);
+      if(rmGetIsKOTH())
+      {
+	}
+	else
+	{
+	  if (cNumberTeams == 2)
+	  {
+           if (rmRandInt(1,2) == 1)
+	         rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.49);
+	     else
+ 	         rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.49);
+	  }
+	}
+      if (castleSetup == 1)
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.72); 
+   	else
+         rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.93); 
+   }
+  
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.70);
+
+// Player stuff 
+//Prepare to place TCs
+	int TCID = rmCreateObjectDef("player TC");
+	if ( rmGetNomadStart())
+		rmAddObjectDefItem(TCID, "coveredWagon", 1, 0);
+	else
+		rmAddObjectDefItem(TCID, "townCenter", 1, 0);
+	rmSetObjectDefMinDistance(TCID, 0.0);
+	rmSetObjectDefMaxDistance(TCID, 10.0); 
+	rmAddObjectDefConstraint(TCID, avoidImpassableLand);
+	rmAddObjectDefConstraint(TCID, avoidWater8);
+    	
+//Prepare to place Explorers, Explorer's dog, Explorer's Taun Taun, etc.
+	int startingUnits = rmCreateStartingUnitsObjectDef(4.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
+	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
+
+//Prepare to place player starting Mines
+	int playerGoldID = rmCreateObjectDef("player silver");
+	rmAddObjectDefItem(playerGoldID, "mine", 1, 0);
+	rmSetObjectDefMinDistance(playerGoldID, 14.0);
+	rmSetObjectDefMaxDistance(playerGoldID, 20.0);
+	rmAddObjectDefConstraint(playerGoldID, avoidAll);
+      rmAddObjectDefConstraint(playerGoldID, avoidImpassableLand);
+      rmAddObjectDefConstraint(playerGoldID, avoidBerries);
+
+      int startSilver2ID = rmCreateObjectDef("player second silver");
+      rmAddObjectDefItem(startSilver2ID, "mine", 1, 0);
+      rmSetObjectDefMinDistance(startSilver2ID, 42.0);
+      rmSetObjectDefMaxDistance(startSilver2ID, 48.0);
+      rmAddObjectDefConstraint(startSilver2ID, avoidAll);
+      rmAddObjectDefConstraint(startSilver2ID, avoidImpassableLand);
+
+//Dock Wagon
+	int playerCrateID=rmCreateObjectDef("starting wagon");
+	rmAddObjectDefItem(playerCrateID, "ypDockWagon", 1, 0.0);
+	rmSetObjectDefMinDistance(playerCrateID, 9.0);
+	rmSetObjectDefMaxDistance(playerCrateID, 12.0);
+	rmAddObjectDefConstraint(playerCrateID, avoidAll);
+	rmAddObjectDefConstraint(playerCrateID, shortAvoidImpassableLand);
+
+//Prepare to place player starting Berries
+	int playerBerriesID=rmCreateObjectDef("player berries");
+	rmAddObjectDefItem(playerBerriesID, "berrybush", 5, 3.0);	
+      rmSetObjectDefMinDistance(playerBerriesID, 13);
+      rmSetObjectDefMaxDistance(playerBerriesID, 16);	
+	rmAddObjectDefConstraint(playerBerriesID, avoidAll);
+      rmAddObjectDefConstraint(playerBerriesID, shortAvoidImpassableLand);
+  
+//Prepare to place player starting pop block
+	int playerPopBlock=rmCreateObjectDef("player pop block");
+	rmAddObjectDefItem(playerPopBlock, "ypPopBlock", 1, 0.0);	
+      rmSetObjectDefMinDistance(playerPopBlock, 7);
+      rmSetObjectDefMaxDistance(playerPopBlock, 10);
+	rmAddObjectDefConstraint(playerPopBlock, avoidAll);
+      rmAddObjectDefConstraint(playerPopBlock, avoidImpassableLand);
+
+//Prepare to place player starting huntables
+	int playerTurkeyID=rmCreateObjectDef("player deer");
+      rmAddObjectDefItem(playerTurkeyID, huntable1, 7, 6.0);	
+      rmSetObjectDefMinDistance(playerTurkeyID, 15);
+	rmSetObjectDefMaxDistance(playerTurkeyID, 20);	
+	rmAddObjectDefConstraint(playerTurkeyID, avoidAll);
+      rmAddObjectDefConstraint(playerTurkeyID, avoidImpassableLand);
+      rmSetObjectDefCreateHerd(playerTurkeyID, false);
+
+//Prepare to place player starting trees
+	int StartAreaTreeID=rmCreateObjectDef("starting trees");
+	rmAddObjectDefItem(StartAreaTreeID, startTreeType, 7, 5.0);
+	rmAddObjectDefConstraint(StartAreaTreeID, avoidAll);
+      rmAddObjectDefConstraint(StartAreaTreeID, avoidImpassableLand);
+      rmAddObjectDefConstraint(StartAreaTreeID, avoidBerries);
+	rmSetObjectDefMinDistance(StartAreaTreeID, 22.0);	
+	rmSetObjectDefMaxDistance(StartAreaTreeID, 25.0);
+
+// Regicide objects
+  int playerCastle=rmCreateObjectDef("Castle");
+  rmAddObjectDefItem(playerCastle, "ypCastleRegicide", 1, 0.0);
+  rmAddObjectDefConstraint(playerCastle, avoidAll);
+  rmAddObjectDefConstraint(playerCastle, avoidImpassableLand);
+  rmSetObjectDefMinDistance(playerCastle, 17.0);	
+  rmSetObjectDefMaxDistance(playerCastle, 21.0);
+  
+  int playerWalls = rmCreateGrouping("regicide walls", "regicide_walls");
+  rmAddGroupingToClass(playerWalls, rmClassID("importantItem"));
+  rmSetGroupingMinDistance(playerWalls, 0.0);
+  rmSetGroupingMaxDistance(playerWalls, 4.0);
+  rmAddGroupingConstraint(playerWalls, avoidWater8);
+  
+  int playerDaimyo=rmCreateObjectDef("Daimyo"+i);
+  rmAddObjectDefItem(playerDaimyo, "ypDaimyoRegicide", 1, 0.0);
+  rmAddObjectDefConstraint(playerDaimyo, avoidAll);
+  rmSetObjectDefMinDistance(playerDaimyo, 7.0);	
+  rmSetObjectDefMaxDistance(playerDaimyo, 10.0);	
+
+	int waterSpawnPointID = 0;
+   
+// Clear out constraints for good measure.
+   rmClearClosestPointConstraints(); 
+   
+   for(i=1; <cNumberPlayers)
+   {
+      // Place TC and starting units
+	rmPlaceObjectDefAtLoc(TCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(TCID, i));				
+	rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+
+    rmPlaceObjectDefAtLoc(playerDaimyo, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+    rmPlaceGroupingAtLoc(playerWalls, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+    rmPlaceObjectDefAtLoc(playerCastle, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc))); 
+
+	rmPlaceObjectDefAtLoc(playerBerriesID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));  
+      rmPlaceObjectDefAtLoc(playerGoldID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));   
+	rmPlaceObjectDefAtLoc(playerTurkeyID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));  										
+  //  rmPlaceObjectDefAtLoc(playerCrateID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      rmPlaceObjectDefAtLoc(playerPopBlock, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      rmPlaceObjectDefAtLoc(startSilver2ID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));  
+      // Place player starting trees
+	rmPlaceObjectDefAtLoc(StartAreaTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+         
+      if(ypIsAsian(i) && rmGetNomadStart() == false)
+         rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+     
+      // Place water spawn points for the players
+	waterSpawnPointID=rmCreateObjectDef("colony ship "+i);
+	rmAddObjectDefItem(waterSpawnPointID, "HomeCityWaterSpawnFlag", 1, 10.0);
+	rmAddClosestPointConstraint(flagVsFlag);
+	rmAddClosestPointConstraint(flagLand); 
+      rmAddClosestPointConstraint(flagEdgeConstraint); 
+	vector closestPoint = rmFindClosestPointVector(TCLoc, rmXFractionToMeters(1.0));
+	rmPlaceObjectDefAtLoc(waterSpawnPointID, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+    
+    // place some starter fishing boats at the spawn flag. We're that nice.
+    int fishingBoatID1=rmCreateObjectDef("FishingBoat1"+i);
+    int fishingBoatID2=rmCreateObjectDef("FishingBoat2"+i);
+    
+    if (rmGetPlayerCiv(i) ==  rmGetCivID("Japanese") || rmGetPlayerCiv(i) ==  rmGetCivID("Indians") || rmGetPlayerCiv(i) ==  rmGetCivID("Chinese")) 
+    {
+      rmAddObjectDefItem(fishingBoatID1, "ypFishingBoatAsian", 1, 10.0);
+      rmAddObjectDefItem(fishingBoatID2, "ypFishingBoatAsian", 1, 10.0);
+    }    
+    else
+    {
+      rmAddObjectDefItem(fishingBoatID1, "FishingBoat", 1, 10.0);
+      rmAddObjectDefItem(fishingBoatID2, "FishingBoat", 1, 10.0);
+    }
+    
+    rmPlaceObjectDefAtLoc(fishingBoatID1, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+    rmPlaceObjectDefAtLoc(fishingBoatID2, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));        
+		
+    // clear closest point for next iteration
+    rmClearClosestPointConstraints();
+
+   }
+	
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.80); 
+
+// Cliffs
+   int cliffHt = -1;
+   int numCliffs=(cNumberNonGaiaPlayers + 4);
+   int cliffVariety = rmRandInt(1,3);
+
+   for (i=0; <numCliffs)
+   {
+      cliffVariety = rmRandInt(1,3);
+	cliffHt = rmRandInt(5,7);    
+	int bigCliffID=rmCreateArea("big cliff" +i);
+	rmSetAreaWarnFailure(bigCliffID, false);
+	rmSetAreaCliffType(bigCliffID, cliffType);
+	rmAddAreaToClass(bigCliffID, rmClassID("classCliff"));
+      rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(400), rmAreaTilesToFraction(800));
+	rmSetAreaCliffEdge(bigCliffID, 1, 0.65, 0.1, 1.0, 0);
+	rmSetAreaCliffPainting(bigCliffID, false, true, true, 1.5, true);
+	rmSetAreaCliffHeight(bigCliffID, cliffHt, 2.0, 1.0);
+	rmSetAreaCoherence(bigCliffID, rmRandFloat(0.4, 0.9));
+	rmSetAreaSmoothDistance(bigCliffID, 15);
+	rmSetAreaHeightBlend(bigCliffID, 1.0);
+	rmSetAreaMinBlobs(bigCliffID, 3);
+	rmSetAreaMaxBlobs(bigCliffID, 7);
+	rmSetAreaMinBlobDistance(bigCliffID, 5.0);
+	rmSetAreaMaxBlobDistance(bigCliffID, 20.0);
+	rmAddAreaConstraint(bigCliffID, avoidImportantItem);
+      rmAddAreaConstraint(bigCliffID, playerConstraintFar);
+      rmAddAreaConstraint(bigCliffID, avoidWater20);
+	rmAddAreaConstraint(bigCliffID, medAvoidTradeRoute);
+      rmAddAreaConstraint(bigCliffID, cliffsAvoidCliffs);
+      rmAddAreaConstraint(bigCliffID, avoidTradeRouteSocketsShort);
+	rmBuildArea(bigCliffID);
+   } 
+
+// Gold
+   int goldID = rmCreateObjectDef("random silver");
+   rmAddObjectDefItem(goldID, "mine", 1, 0);
+   rmSetObjectDefMinDistance(goldID, 0.0);
+   rmSetObjectDefMaxDistance(goldID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(goldID, playerConstraintFar);
+   rmAddObjectDefConstraint(goldID, avoidAll);
+   rmAddObjectDefConstraint(goldID, avoidCoin);
+   rmAddObjectDefConstraint(goldID, avoidGold);
+   rmAddObjectDefConstraint(goldID, avoidImpassableLand);
+   rmAddObjectDefConstraint(goldID, avoidImportantItem);    
+   rmPlaceObjectDefInArea(goldID, 0, bigIslandID, cNumberNonGaiaPlayers*2.5);
+
+// Berries
+   int berriesID=rmCreateObjectDef("random berries");
+   rmAddObjectDefItem(berriesID, "berrybush", rmRandInt(4,6), 6.0);  
+   rmSetObjectDefMinDistance(berriesID, 0.0);
+   rmSetObjectDefMaxDistance(berriesID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(berriesID, playerConstraint);
+   rmAddObjectDefConstraint(berriesID, avoidAll);
+   rmAddObjectDefConstraint(berriesID, avoidRandomBerries);
+   rmAddObjectDefConstraint(berriesID, avoidImpassableLand);
+   rmAddObjectDefConstraint(berriesID, avoidImportantItem);    
+   rmPlaceObjectDefInArea(berriesID, 0, bigIslandID, cNumberNonGaiaPlayers*2); 
+  
+// Forests
+   numTries=12*cNumberNonGaiaPlayers;
+   int failCount=0;
+   int forestSize = rmRandInt(200,320);
+   int patchSize = 0;
+
+   for (i=0; <numTries)
+   {   
+    int forest=rmCreateArea("forest "+i);
+    rmSetAreaWarnFailure(forest, false);
+    rmSetAreaSize(forest, rmAreaTilesToFraction(forestSize), rmAreaTilesToFraction(forestSize));
+    rmSetAreaForestType(forest, forestType);
+    rmSetAreaForestDensity(forest, 0.6);
+    rmSetAreaForestClumpiness(forest, 0.2);
+    rmSetAreaForestUnderbrush(forest, 0.1);
+    rmSetAreaCoherence(forest, 0.4);
+    rmAddAreaToClass(forest, rmClassID("classForest")); 
+    rmAddAreaConstraint(forest, forestConstraint);
+    rmAddAreaConstraint(forest, avoidImportantItem); 
+    rmAddAreaConstraint(forest, avoidWater4);
+    rmAddAreaConstraint(forest, playerConstraint);
+    rmAddAreaConstraint(forest, forestVsCoin);
+    rmAddAreaConstraint(forest, avoidAll);
+    
+    if(rmBuildArea(forest)==false)
+     {
+        // Stop trying once we fail 5 times in a row.
+        failCount++;
+        if(failCount==5)
+           break;
+     }
+     else
+        failCount=0; 
+
+	patchSize = forestSize+70;
+      int coverForestPatchID = rmCreateArea(("forest cover"+i), rmAreaID("forest "+i));   
+      rmSetAreaWarnFailure(coverForestPatchID, false);
+      rmSetAreaSize(coverForestPatchID, rmAreaTilesToFraction(patchSize), rmAreaTilesToFraction(patchSize));
+      rmSetAreaCoherence(coverForestPatchID, 0.99);
+      rmSetAreaMix(coverForestPatchID, baseMix);
+      rmBuildArea(coverForestPatchID);
+
+	forestSize = rmRandInt(200,350);
+   } 
+
+// Huntables - near and far
+   int farPronghornID=rmCreateObjectDef("far pronghorn");
+   rmAddObjectDefItem(farPronghornID, huntable2, rmRandInt(4,6), 4.0);
+   rmAddObjectDefToClass(farPronghornID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(farPronghornID, 45.0);
+   rmSetObjectDefMaxDistance(farPronghornID, 60.0);
+   rmAddObjectDefConstraint(farPronghornID, nuggetPlayerConstraint);
+   rmAddObjectDefConstraint(farPronghornID, avoidImpassableLand);
+   rmAddObjectDefConstraint(farPronghornID, avoidImportantItem);
+   rmAddObjectDefConstraint(farPronghornID, huntableConstraint);
+   rmAddObjectDefConstraint(farPronghornID, avoidAll);
+   rmSetObjectDefCreateHerd(farPronghornID, true);
+   rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+
+   int turkeyID=rmCreateObjectDef("random deer");
+   rmAddObjectDefItem(turkeyID, huntable1, rmRandInt(3,5), 5.0);
+   rmAddObjectDefToClass(turkeyID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(turkeyID, 65.0);
+   rmSetObjectDefMaxDistance(turkeyID, rmXFractionToMeters(0.3));
+   rmAddObjectDefConstraint(turkeyID, playerConstraintNative);
+   rmAddObjectDefConstraint(turkeyID, avoidRandomTurkeys);
+   rmAddObjectDefConstraint(turkeyID, avoidImpassableLand);
+   rmAddObjectDefConstraint(turkeyID, avoidImportantItem); 
+   rmSetObjectDefCreateHerd(turkeyID, true);
+   rmPlaceObjectDefAtLoc(turkeyID, 0, 0.5, 0.95, 2); 
+   rmPlaceObjectDefPerPlayer(turkeyID, false, 1);
+
+   rmSetObjectDefMinDistance(farPronghornID, 75.0);
+   rmSetObjectDefMaxDistance(farPronghornID, 105.0);
+   rmAddObjectDefConstraint(farPronghornID, playerConstraintFar);
+   rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+
+ // --------------- Make load bar move. ----------------------------------------------------------------------------
+	rmSetStatusText("",0.90);
+  
+// Nuggets
+   if (mapTypePicker == 2)
+	rmSetMapType(mapType1);
+   else
+	rmSetMapType(mapType2);
+   int nugget1= rmCreateObjectDef("nugget easy"); 
+   rmAddObjectDefItem(nugget1, "Nugget", 1, 0.0);
+   rmSetObjectDefMinDistance(nugget1, 35.0);
+   rmSetObjectDefMaxDistance(nugget1, 45.0);
+   rmAddObjectDefConstraint(nugget1, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(nugget1, avoidNugget);
+   rmAddObjectDefConstraint(nugget1, playerConstraint);
+   rmAddObjectDefConstraint(nugget1, avoidAll);
+   rmAddObjectDefConstraint(nugget1, avoidImportantItem); 
+   rmAddObjectDefConstraint(nugget1, avoidWater4);
+   rmSetNuggetDifficulty(1, 1);
+   rmPlaceObjectDefPerPlayer(nugget1, false, 2);
+
+   rmSetNuggetDifficulty(2, 2);
+   rmAddObjectDefConstraint(nugget1, playerConstraintNative);
+   rmSetObjectDefMinDistance(nugget1, 65.0);
+   rmSetObjectDefMaxDistance(nugget1, rmXFractionToMeters(0.25));
+   rmPlaceObjectDefPerPlayer(nugget1, false, 2);
+
+   rmSetNuggetDifficulty(3, 3);
+   rmSetObjectDefMinDistance(nugget1, 60.0);
+   rmSetObjectDefMaxDistance(nugget1, rmXFractionToMeters(0.45));
+   rmPlaceObjectDefInArea(nugget1, 0, bigIslandID, cNumberNonGaiaPlayers);
+
+   rmSetNuggetDifficulty(4, 4);
+   rmPlaceObjectDefInArea(nugget1, 0, bigIslandID, 2);
+    
+// sheep etc
+      int sheepID=rmCreateObjectDef("herdable animal");
+      rmAddObjectDefItem(sheepID, sheepType, 2, 4.0);
+      rmSetObjectDefMinDistance(sheepID, 35.0);
+      rmAddObjectDefToClass(sheepID, rmClassID("herdableFood"));
+      rmSetObjectDefMaxDistance(sheepID, rmXFractionToMeters(0.5));
+      rmAddObjectDefConstraint(sheepID, avoidSheep);
+      rmAddObjectDefConstraint(sheepID, avoidAll);
+      rmAddObjectDefConstraint(sheepID, playerConstraint);
+      rmAddObjectDefConstraint(sheepID, avoidImpassableLand);
+      if (rmRandInt(1,2) == 1)
+         rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*3);
+      else 
+         rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*4); 
+
+// Water nuggets
+  rmSetMapType("Japan");
+  int nugget2= rmCreateObjectDef("nugget water"); 
+  rmAddObjectDefItem(nugget2, "ypNuggetBoat", 1, 0.0);
+  rmSetNuggetDifficulty(5, 5);
+  rmSetObjectDefMinDistance(nugget2, rmXFractionToMeters(0.0));
+  rmSetObjectDefMaxDistance(nugget2, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(nugget2, avoidLand);
+  rmAddObjectDefConstraint(nugget2, avoidNuggetFar);
+  if (cNumberNonGaiaPlayers <4)
+     rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.35, cNumberNonGaiaPlayers*4);
+  else if (cNumberNonGaiaPlayers <7)
+     rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.35, cNumberNonGaiaPlayers*3);
+  else
+     rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.35, cNumberNonGaiaPlayers*2);
+
+// Random whales
+	int whaleID=rmCreateObjectDef("whale");
+	rmAddObjectDefItem(whaleID, whale1, 1, 0.0);
+	rmAddObjectDefConstraint(whaleID, whaleVsWhaleID);
+	rmAddObjectDefConstraint(whaleID, whaleLand);
+      rmAddObjectDefConstraint(whaleID, whaleEdgeConstraint);
+	rmSetObjectDefMinDistance(whaleID, 0.0);
+	rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.35)); 
+	rmPlaceObjectDefAtLoc(whaleID, 0, 0.1, 0.47, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(whaleID, 0, 0.9, 0.47, cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.05, cNumberNonGaiaPlayers*3);
+
+// Place Random Fish everywhere, but restrained to avoid whales 
+
+	int fishID=rmCreateObjectDef("fish 1");
+	rmAddObjectDefItem(fishID, fish1, 1, 0.0);
+	rmSetObjectDefMinDistance(fishID, 0.0);
+	rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.35));
+	rmAddObjectDefConstraint(fishID, fishVsFishID);
+	rmAddObjectDefConstraint(fishID, fishVsWhaleID);
+	rmAddObjectDefConstraint(fishID, fishLand);
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.1, 0.5, 4*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.9, 0.5, 4*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.05, 4*cNumberNonGaiaPlayers);
+
+	int fish2ID=rmCreateObjectDef("fish 2");
+	rmAddObjectDefItem(fish2ID, fish2, 1, 0.0);
+	rmSetObjectDefMinDistance(fish2ID, 0.0);
+	rmSetObjectDefMaxDistance(fish2ID, rmXFractionToMeters(0.45));
+	rmAddObjectDefConstraint(fish2ID, fishVsFishTarponID);
+	rmAddObjectDefConstraint(fish2ID, fishVsWhaleID);
+	rmAddObjectDefConstraint(fish2ID, fishLand);
+	rmPlaceObjectDefAtLoc(fish2ID, 0, 0.1, 0.5, 3*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fish2ID, 0, 0.9, 0.5, 3*cNumberNonGaiaPlayers);
+	rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.1, 3*cNumberNonGaiaPlayers);
+
+	if (cNumberNonGaiaPlayers <5)		// If less than 5 players, place extra fish.
+	{
+	      rmSetObjectDefMaxDistance(fish2ID, rmXFractionToMeters(0.65));
+		rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.4, 3*cNumberNonGaiaPlayers);	
+	}
+
+  // Vary some terrain
+  for (i=0; < 20) {
+    int patch=rmCreateArea("first patch "+i);
+    rmSetAreaWarnFailure(patch, false);
+    rmSetAreaSize(patch, rmAreaTilesToFraction(100), rmAreaTilesToFraction(200));
+    rmSetAreaMix(patch, baseMix);
+    rmSetAreaTerrainType(patch, patchTerrain);
+    rmAddAreaTerrainLayer(patch, patchType1, 0, 1);
+    rmAddAreaToClass(patch, rmClassID("classPatch"));
+    rmSetAreaCoherence(patch, 0.4);
+    rmAddAreaConstraint(patch, shortAvoidImpassableLand);
+    rmBuildArea(patch); 
+  }
+      
+  for (i=0; <10) {
+    int dirtPatch=rmCreateArea("paint patch "+i);
+    rmSetAreaWarnFailure(dirtPatch, false);
+    rmSetAreaSize(dirtPatch, rmAreaTilesToFraction(200), rmAreaTilesToFraction(300));
+    rmSetAreaMix(dirtPatch, baseMix);
+    rmSetAreaTerrainType(dirtPatch, patchTerrain);
+    rmAddAreaTerrainLayer(dirtPatch, patchType2, 0, 1);
+    rmAddAreaToClass(dirtPatch, rmClassID("classPatch"));
+    rmSetAreaCoherence(dirtPatch, 0.4);
+    rmAddAreaConstraint(dirtPatch, shortAvoidImpassableLand);
+    rmAddAreaConstraint(dirtPatch, patchConstraint);
+    rmBuildArea(dirtPatch); 
+  }
+
+  // Regicide Trigger
+	for(i=1; <= cNumberNonGaiaPlayers) {
+    
+    // Lose on Daimyo's death
+    rmCreateTrigger("DaimyoDeath"+i);
+    rmSwitchToTrigger(rmTriggerID("DaimyoDeath"+i));
+    rmSetTriggerPriority(4); 
+    rmSetTriggerActive(true);
+    rmSetTriggerRunImmediately(true);
+    rmSetTriggerLoop(false);
+    
+    rmAddTriggerCondition("Is Dead");
+    rmSetTriggerConditionParamInt("SrcObject", rmGetUnitPlacedOfPlayer(playerDaimyo, i), false);
+    
+    rmAddTriggerEffect("Set Player Defeated");
+    rmSetTriggerEffectParamInt("Player", i, false);
+    
+  }
+  
+  int ambiental = rmCreateObjectDef("ambiental");
+  rmAddObjectDefItem(ambiental, "UnderbrushCarolinasForest", 1, 10.0);
+  rmSetObjectDefMinDistance(ambiental, 0);
+  rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+  rmAddObjectDefConstraint(ambiental, avoidImpassableLand);    
+  rmAddObjectDefConstraint(ambiental, avoidTradeRouteSocketsShort);   
+  rmAddObjectDefConstraint(ambiental, shortAvoidTradeRoute);   
+  rmAddObjectDefConstraint(ambiental, avoidAll);    
+  rmAddObjectDefConstraint(ambiental, avoidCoinShort);    
+  rmAddObjectDefConstraint(ambiental, avoidNuggetShort);   
+  rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 80*cNumberNonGaiaPlayers);
+
+// --------------- Make load bar move. ----------------------------------------------------------------------------
+   rmSetStatusText("",0.99);  
+}
\ No newline at end of file
diff --git a/RMM/Nile River.xml b/RMM/Nile River.xml
new file mode 100644
index 0000000..7ad0721
--- /dev/null
+++ b/RMM/Nile River.xml	
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\nile" 
+displayNameID = "130096" 
+details = "130097" 
+loadDetails = "130098" 
+loadBackground="ui\random_map\africa\nile\nile_map">
+   <loadss>ui\random_map\africa\nile\nile_ss_01</loadss>
+   <loadss>ui\random_map\africa\nile\nile_ss_02</loadss>
+   <loadss>ui\random_map\africa\nile\nile_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/Nile River.xs b/RMM/Nile River.xs
new file mode 100644
index 0000000..5612ac4
--- /dev/null
+++ b/RMM/Nile River.xs	
@@ -0,0 +1,389 @@
+	/* Durokan's fertilebelt - Feb 21 2016 1.0 -- -- */
+	include "mercenaries.xs";
+	include "ypAsianInclude.xs";
+	include "ypKOTHInclude.xs";
+ 
+	void main(void) {
+	
+   // These status text lines are used to manually animate the map generation progress bar
+   rmSetStatusText("",0.01);
+
+	int playerTiles = 18000;
+	if (cNumberNonGaiaPlayers >4)
+		playerTiles = 16000;
+	if (cNumberNonGaiaPlayers >6)
+		playerTiles = 14000;			
+
+  int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+  rmEchoInfo("Map size="+size+"m x "+size+"m");
+  rmSetMapSize(size, size);
+  
+        rmSetMapType("land");
+        rmSetMapType("grass");
+        rmSetMapType("deccan");
+        rmTerrainInitialize("deccan\ground_grass3_deccan");
+	rmSetMapElevationParameters(cElevTurbulence, 0.06, 1, 0.4, 3.0);
+	rmSetMapElevationHeightBlend(0.6);
+	rmSetLightingSet("texas");
+		
+
+	// Init map.
+	rmTerrainInitialize("deccan\ground_grass3_deccan", -2);
+
+	//amazon\river1_am amazon\river3_am
+    rmDefineClass("classForest");
+
+        int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+        int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+	int forestConstraintHunt=rmCreateClassDistanceConstraint("river hunts vs. forest", rmClassID("classForest"), 15.0);
+        int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 50.0);
+	int avoidHuntShort=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 25.0);
+	int avoidHuntSparse=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 55.0);
+        int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+        int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+        int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 9.0);
+        int avoidWaterReallyShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 1.0);
+        int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 15.0);
+        int AvoidWaterLong = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 22.0);
+        int dryAF = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 100.0);
+        int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+        int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+        int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+        int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+        int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+        int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+        int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+        int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);  
+        int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 68.0);
+        int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0);
+	int AvoidHerdables = rmCreateTerrainDistanceConstraint("avoid herds by something", "herdables", false, 45.0);
+	int avoidRush=rmCreateTypeDistanceConstraint("avoid rush by a lot", "AbstractRush", 75.0);
+        int riverGrass = rmCreateTerrainMaxDistanceConstraint("riverGrass stays near the water", "land", false, 24.0);
+        int riverHunt = rmCreateTerrainMaxDistanceConstraint("hunts stay near the water", "land", false, 12.0);
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);
+        int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int classPatch = rmDefineClass("patch");
+
+   rmSetStatusText("",0.10);
+	
+        chooseMercs();
+		
+		  // Player placing  
+  
+  int teamZeroCount = rmGetNumberPlayersOnTeam(0);
+	int teamOneCount = rmGetNumberPlayersOnTeam(1);
+  
+  
+	if (cNumberTeams == 2)	{
+		
+		rmSetPlacementTeam(0);
+		rmSetPlacementSection(0.73, 0.83);
+		rmPlacePlayersCircular(0.39, 0.39, .02);
+            
+
+		rmSetPlacementTeam(1);
+        rmSetPlacementSection(.43, .53);     
+		rmPlacePlayersCircular(0.39, 0.39, .02);
+    
+	}
+
+	// FFA
+	else {
+	rmSetPlacementSection(0.35, 0.9);
+    rmPlacePlayersCircular(0.4, 0.4, 0.02);
+	}
+
+   // Text
+   rmSetStatusText("",0.20);
+
+        int rivershallowsize = 12;
+	if (cNumberNonGaiaPlayers > 2){
+		rivershallowsize = 16;
+	}
+	if (cNumberNonGaiaPlayers > 4){
+		rivershallowsize = 20;
+	}
+	if (cNumberNonGaiaPlayers > 6){
+		rivershallowsize = 24;
+	}
+	
+	int halfShallowSize = rivershallowsize/2;
+	int originalShallowSize = rivershallowsize;
+	
+	int ambiental = rmCreateObjectDef("ambiental");
+	rmAddObjectDefItem(ambiental, "UnderbrushDeccan", 1, 5.0);
+	rmSetObjectDefMinDistance(ambiental, 0);
+	rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(ambiental, avoidTownCenterSmall);
+	rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 100*cNumberNonGaiaPlayers);
+	
+	int middleRiver = rmRiverCreate(-1, "Deccan Plateau River", 5, 15, 6, 9);
+	rmRiverAddWaypoint(middleRiver, 0.0, 0.0);
+	rmRiverAddWaypoint(middleRiver, .6, .6);
+	rmRiverSetShallowRadius(middleRiver, 32);
+	rmRiverAddShallow(middleRiver, rmRandFloat(0.16, 0.16));
+	rmRiverAddShallow(middleRiver, rmRandFloat(0.3, 0.3));
+	rmRiverSetBankNoiseParams(middleRiver, 0.07, 2, 1.5, 10.0, 0.667, 2.0);
+	rmRiverBuild(middleRiver);
+
+	int topRiver = rmRiverCreate(-1, "Deccan Plateau River", 5, 15, 6, 9);
+	rmRiverAddWaypoint(topRiver, 1.0, 0.75);
+	rmRiverAddWaypoint(topRiver, .6, .6);
+	rmRiverAddWaypoint(topRiver, .75, 1.0);
+	rmRiverSetShallowRadius(topRiver, halfShallowSize);
+    rmRiverAddShallow(topRiver, rmRandFloat(0.0, 0.1));
+    rmRiverAddShallow(topRiver, rmRandFloat(0.15, 0.25));
+	rmRiverAddShallow(topRiver, rmRandFloat(0.3, 0.45));
+	rmRiverAddShallow(topRiver, rmRandFloat(0.5, 0.5));
+	rmRiverAddShallow(topRiver, rmRandFloat(0.75, 0.85));
+	rmRiverAddShallow(topRiver, rmRandFloat(0.9, 1.00));
+	rmRiverSetShallowRadius(topRiver, rivershallowsize);
+    rmRiverAddShallow(topRiver, rmRandFloat(0.55, 0.7));
+	rmRiverSetShallowRadius(topRiver, halfShallowSize);
+	rmRiverSetBankNoiseParams(topRiver, 0.07, 2, 1.5, 10.0, 0.667, 2.0);
+	rmRiverBuild(topRiver);
+
+	int botRiver = rmRiverCreate(-1, "Deccan Plateau River", 5, 15, 6, 9);
+	rmRiverAddWaypoint(botRiver, 1.0, 0.55);
+	rmRiverAddWaypoint(botRiver, .4, .4);
+	rmRiverAddWaypoint(botRiver, .55, 1.0);
+	rmRiverSetShallowRadius(botRiver, rivershallowsize);
+    rmRiverAddShallow(botRiver, rmRandFloat(0.0, 0.1));
+    rmRiverAddShallow(botRiver, rmRandFloat(0.15, 0.25));
+	rmRiverAddShallow(botRiver, rmRandFloat(0.3, 0.45));
+	rmRiverAddShallow(botRiver, rmRandFloat(0.5, 0.5));
+	rmRiverAddShallow(botRiver, rmRandFloat(0.75, 0.85));
+	rmRiverAddShallow(botRiver, rmRandFloat(0.9, 1.00));
+	rmRiverSetShallowRadius(botRiver, halfShallowSize);
+    rmRiverAddShallow(botRiver, rmRandFloat(0.55, 0.7));
+	rmRiverSetShallowRadius(botRiver, rivershallowsize);
+	rmRiverSetBankNoiseParams(botRiver, 0.07, 2, 1.5, 10.0, 0.667, 2.0);
+	rmRiverBuild(botRiver);
+
+   // Text
+   rmSetStatusText("",0.40);
+
+		for (i=0; < cNumberNonGaiaPlayers*60){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "deccan\ground_grass3_deccan", "deccan\ground_dirt3_deccan");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+
+
+    // Paint some grass near the river
+  int grassRiver=rmCreateArea("river grass");
+  rmSetAreaSize(grassRiver, 1.0, 1.0);
+  rmSetAreaLocation(grassRiver, .5, .5);
+  rmSetAreaWarnFailure(grassRiver, false);
+  rmSetAreaSmoothDistance(grassRiver, 10);
+  rmSetAreaCoherence(grassRiver, 1.0);
+	rmSetAreaTerrainType(grassRiver, "deccan\ground_grass2_deccan");
+  rmAddAreaConstraint(grassRiver, riverGrass);
+  rmBuildArea(grassRiver);
+  
+  /*
+      // Paint some grass near the river
+  int grassPatchBot=rmCreateArea("bot river grass");
+  rmSetAreaSize(grassPatchBot, .5, .5);
+  rmSetAreaLocation(grassPatchBot, .3, .5);
+  rmSetAreaWarnFailure(grassPatchBot, false);
+  rmSetAreaSmoothDistance(grassPatchBot, 10);
+  rmSetAreaCoherence(grassPatchBot, 1.0);
+  rmSetAreaMix(grassPatchBot, "deccan_grass_b");
+  rmAddAreaConstraint(grassPatchBot, riverGrass);
+  rmBuildArea(grassPatchBot);*/
+
+        int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+        rmSetObjectDefMinDistance(playerStart, 7.0);
+        rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+       
+        int goldID = rmCreateObjectDef("starting gold");
+        rmAddObjectDefItem(goldID, "minegold", 1, 8.0);
+        rmSetObjectDefMinDistance(goldID, 15.0);
+        rmSetObjectDefMaxDistance(goldID, 15.0);
+        
+        int berryID = rmCreateObjectDef("starting berries");
+        rmAddObjectDefItem(berryID, "BerryBush", 4, 6.0);
+        rmSetObjectDefMinDistance(berryID, 8.0);
+        rmSetObjectDefMaxDistance(berryID, 12.0);
+        rmAddObjectDefConstraint(berryID, avoidCoin);
+ 
+   rmSetStatusText("",0.50);
+
+        int treeID = rmCreateObjectDef("starting trees");
+        rmAddObjectDefItem(treeID, "ypTreeSaxaul", rmRandInt(6,9), 10.0);
+        rmAddObjectDefItem(treeID, "UnderbrushForest", rmRandInt(8,10), 12.0);
+        rmSetObjectDefMinDistance(treeID, 12.0);
+        rmSetObjectDefMaxDistance(treeID, 18.0);
+        rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+        rmAddObjectDefConstraint(treeID, avoidCoin);
+ 
+        int foodID = rmCreateObjectDef("starting hunt");
+        rmAddObjectDefItem(foodID, "zebra", 3, 8.0);
+        rmSetObjectDefMinDistance(foodID, 10.0);
+        rmSetObjectDefMaxDistance(foodID, 10.0);
+        rmSetObjectDefCreateHerd(foodID, true);
+ 
+        int foodID2 = rmCreateObjectDef("starting hunt 2");
+        rmAddObjectDefItem(foodID2, "zebra", 3, 8.0);
+        rmSetObjectDefMinDistance(foodID2, 40.0);
+        rmSetObjectDefMaxDistance(foodID2, 40.0);
+        rmSetObjectDefCreateHerd(foodID2, true);
+
+        for(i=1; < cNumberNonGaiaPlayers + 1) {
+    int id=rmCreateArea("Player"+i);
+    rmSetPlayerArea(i, id);
+    int startID = rmCreateObjectDef("object"+i);
+    rmAddObjectDefItem(startID, "TownCenter", 1, 5.0);
+    rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID2, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+  }
+  
+   // Text
+   rmSetStatusText("",0.60);
+
+		int wetHunts = rmCreateObjectDef("wetHunts");
+        rmAddObjectDefItem(wetHunts, "ypWildElephant", rmRandInt(2,2), 10.0);
+        rmSetObjectDefCreateHerd(wetHunts, true);
+        rmSetObjectDefMinDistance(wetHunts, 0);
+        rmSetObjectDefMaxDistance(wetHunts, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(wetHunts, avoidHuntShort);
+		rmAddObjectDefConstraint(wetHunts, riverHunt);
+        rmPlaceObjectDefAtLoc(wetHunts, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
+
+        int wetberries = rmCreateObjectDef("wetberries");
+        rmAddObjectDefItem(wetberries, "BerryBush", rmRandInt(2,2), 10.0);
+        rmSetObjectDefCreateHerd(wetberries, true);
+        rmSetObjectDefMinDistance(wetberries, 0);
+        rmSetObjectDefMaxDistance(wetberries, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(wetberries, avoidHuntShort);
+        rmAddObjectDefConstraint(wetberries, riverHunt);
+        rmPlaceObjectDefAtLoc(wetberries, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
+
+		int rightmines = rmCreateObjectDef("right gold mines");
+        rmAddObjectDefItem(rightmines, "mine", 1, 1.0);
+        rmSetObjectDefMinDistance(rightmines, 0.0);
+        rmSetObjectDefMaxDistance(rightmines, rmXFractionToMeters(0.3));
+        rmAddObjectDefConstraint(rightmines, avoidCoinMed);
+        rmAddObjectDefConstraint(rightmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(rightmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(rightmines, forestConstraintShort);
+        rmAddObjectDefConstraint(rightmines, circleConstraint);
+		rmAddObjectDefConstraint(rightmines, dryAF);
+        rmPlaceObjectDefAtLoc(rightmines, 0, 0.5, .0, 1*cNumberNonGaiaPlayers + 1);
+
+		int leftmines = rmCreateObjectDef("left gold mines");
+        rmAddObjectDefItem(leftmines, "mine", 1, 1.0);
+        rmSetObjectDefMinDistance(leftmines, 0.0);
+        rmSetObjectDefMaxDistance(leftmines, rmXFractionToMeters(0.3));
+        rmAddObjectDefConstraint(leftmines, avoidCoinMed);
+        rmAddObjectDefConstraint(leftmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(leftmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(leftmines, forestConstraintShort);
+        rmAddObjectDefConstraint(leftmines, circleConstraint);
+		rmAddObjectDefConstraint(leftmines, dryAF);
+        rmPlaceObjectDefAtLoc(leftmines, 0, 0.0, 0.5, 1*cNumberNonGaiaPlayers + 1);
+
+		int nuggetID= rmCreateObjectDef("nugget"); 
+		rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0); 
+		rmSetObjectDefMinDistance(nuggetID, 0.0); 
+		rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.35)); 
+		rmAddObjectDefConstraint(nuggetID, avoidNugget); 
+		rmSetNuggetDifficulty(2, 3); 
+		rmAddObjectDefConstraint(nuggetID, riverHunt);
+		rmPlaceObjectDefAtLoc(nuggetID, 0, 0.7, 0.7, 2*(cNumberNonGaiaPlayers + 3));   
+	
+		int treasureID= rmCreateObjectDef("treasure"); 
+		rmAddObjectDefItem(treasureID, "Nugget", 1, 0.0); 
+		rmSetObjectDefMinDistance(treasureID, 0.0); 
+		rmSetObjectDefMaxDistance(treasureID, rmXFractionToMeters(0.35)); 
+		rmAddObjectDefConstraint(treasureID, avoidNugget); 
+		rmAddObjectDefConstraint(treasureID, AvoidWaterShort2);
+		rmSetNuggetDifficulty(1, 2); 
+		rmPlaceObjectDefAtLoc(treasureID, 0, 0.7, 0.7, 2*(cNumberNonGaiaPlayers + 3));   
+
+     for (j=0; < (12)) {  
+                int wetForest=rmCreateObjectDef("wet trees"+j);
+                rmAddObjectDefItem(wetForest, "TreeAmazon", rmRandInt(2,3), rmRandFloat(8.0,16.0));
+                rmAddObjectDefToClass(wetForest, rmClassID("classForest"));
+                rmSetObjectDefMinDistance(wetForest, 0);
+                rmSetObjectDefMaxDistance(wetForest, rmXFractionToMeters(0.5));
+                rmAddObjectDefConstraint(wetForest, forestConstraintShort);
+                rmAddObjectDefConstraint(wetForest, riverHunt);       
+				rmAddObjectDefConstraint(wetForest, avoidWaterShort);
+
+                rmPlaceObjectDefAtLoc(wetForest, 0, .5, 0.5, 7*cNumberNonGaiaPlayers);
+				}
+			
+   rmSetStatusText("",0.70);	
+	
+		
+        for (j=0; < (12)) {  
+			int dryForest=rmCreateObjectDef("dry Forest"+j);
+			rmAddObjectDefItem(dryForest, "ypTreeSaxaul", rmRandInt(5,9), rmRandFloat(8.0,16.0));
+			rmAddObjectDefToClass(dryForest, rmClassID("classForest"));
+			rmSetObjectDefMinDistance(dryForest, 0);
+			rmSetObjectDefMaxDistance(dryForest, rmXFractionToMeters(0.45));
+			rmAddObjectDefConstraint(dryForest, avoidTradeRoute);
+			rmAddObjectDefConstraint(dryForest, avoidSocket);
+			rmAddObjectDefConstraint(dryForest, circleConstraint);
+			rmAddObjectDefConstraint(dryForest, forestConstraint);
+			rmAddObjectDefConstraint(dryForest, avoidTownCenter);  
+			rmAddObjectDefConstraint(dryForest, AvoidWaterShort2);  
+			rmAddObjectDefConstraint(dryForest, dryAF);
+			rmPlaceObjectDefAtLoc(dryForest, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+        }
+		
+   // Text
+   rmSetStatusText("",0.80);
+
+		/*
+ 		int dryHuntsL = rmCreateObjectDef("dryHuntsL");
+        rmAddObjectDefItem(dryHuntsL, "ypWildElephant", rmRandInt(1,1), 10.0);
+        rmSetObjectDefCreateHerd(dryHuntsL, true);
+        rmSetObjectDefMinDistance(dryHuntsL, 0);
+        rmSetObjectDefMaxDistance(dryHuntsL, rmXFractionToMeters(0.4));
+        rmAddObjectDefConstraint(dryHuntsL, avoidHuntSparse);
+		rmAddObjectDefConstraint(dryHuntsL, dryAF);
+        rmPlaceObjectDefAtLoc(dryHuntsL, 0, 0.0, 0.5, 2*cNumberNonGaiaPlayers);
+
+ 		int dryHuntsR = rmCreateObjectDef("dryHuntsR");
+        rmAddObjectDefItem(dryHuntsR, "ypWildElephant", rmRandInt(1,1), 10.0);
+        rmSetObjectDefCreateHerd(dryHuntsR, true);
+        rmSetObjectDefMinDistance(dryHuntsR, 0);
+        rmSetObjectDefMaxDistance(dryHuntsR, rmXFractionToMeters(0.4));
+        rmAddObjectDefConstraint(dryHuntsR, avoidHuntSparse);
+		rmAddObjectDefConstraint(dryHuntsR, dryAF);
+        rmPlaceObjectDefAtLoc(dryHuntsR, 0, 0.0, 0.5, 2*cNumberNonGaiaPlayers);
+		*/
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.7;
+    float yLoc = 0.7;
+    float walk = 0.3;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+	// Text
+	rmSetStatusText("",1.0);
+}
+ 
diff --git a/RMM/Orinoco.xs b/RMM/Orinoco.xs
index ba2d6fe..b554546 100644
--- a/RMM/Orinoco.xs
+++ b/RMM/Orinoco.xs
@@ -269,11 +269,17 @@ void main(void)
 	float topOrBottom = rmRandFloat(0.0, 1.0);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	if(cNumberTeams > 2) //ffa
 	{
 		rmSetPlacementSection(0.10, 0.90);
 		rmSetTeamSpacingModifier(0.75);
 		rmPlacePlayersCircular(0.4, 0.4, 0);
+		rmAddObjectDefConstraint(startingUnits, avoidAll);
+		rmSetObjectDefMinDistance(startingUnits, 8.0);
+		rmSetObjectDefMaxDistance(startingUnits, 12.0);
 	}
 	else
 	{
@@ -284,6 +290,9 @@ void main(void)
 			rmSetPlacementSection(0.95, 0.25);
 			rmSetTeamSpacingModifier(.40);
 			rmPlacePlayersCircular(0.4, 0.4, rmDegreesToRadians(5.0));
+			rmAddObjectDefConstraint(startingUnits, avoidAll);
+			rmSetObjectDefMinDistance(startingUnits, 8.0);
+			rmSetObjectDefMaxDistance(startingUnits, 12.0);
 		}
 		else
 		{
@@ -291,6 +300,9 @@ void main(void)
 			rmSetPlacementSection(0.5, 0.75);
 			rmSetTeamSpacingModifier(0.40);
 			rmPlacePlayersCircular(0.4, 0.4, rmDegreesToRadians(5.0));
+			rmAddObjectDefConstraint(startingUnits, avoidAll);
+			rmSetObjectDefMinDistance(startingUnits, 8.0);
+			rmSetObjectDefMaxDistance(startingUnits, 12.0);
 
 		}
 	}
@@ -776,9 +788,9 @@ void main(void)
 	// Forest areas
 
 	if (cNumberNonGaiaPlayers > 4)
-		numTries=2*cNumberNonGaiaPlayers;
-	else
 		numTries=3*cNumberNonGaiaPlayers;
+	else
+		numTries=4*cNumberNonGaiaPlayers;
 	failCount=0;
 	for (i=0; <numTries)
 		{   
@@ -814,9 +826,9 @@ void main(void)
 		}
 
 	if (cNumberNonGaiaPlayers > 4)
-		numTries=2*cNumberNonGaiaPlayers;
+		numTries=3*cNumberNonGaiaPlayers;
 	else
-		numTries=3*cNumberNonGaiaPlayers; 
+		numTries=4*cNumberNonGaiaPlayers; 
 	failCount=0;
 	for (i=0; <numTries)
 		{   
@@ -851,7 +863,7 @@ void main(void)
 				failCount=0; 
 		}
 
-	numTries=4*cNumberNonGaiaPlayers;  
+	numTries=5*cNumberNonGaiaPlayers;  
 	failCount=0;
 	for (i=0; <numTries)
 		{   
@@ -869,7 +881,7 @@ void main(void)
 			rmSetAreaCoherence(forestRandomID, 0.4);
 			rmSetAreaSmoothDistance(forestRandomID, 10);
 			rmAddAreaToClass(forestRandomID, rmClassID("classForest"));
-			rmAddAreaConstraint(forestRandomID, avoidForestFar); 
+			rmAddAreaConstraint(forestRandomID, avoidForest); 
 			rmAddAreaConstraint(forestRandomID, shortAvoidImportantItem);
 			rmAddAreaConstraint(forestRandomID, playerConstraint);
 			rmAddAreaConstraint(forestRandomID, avoidRiver);
@@ -890,16 +902,6 @@ void main(void)
 	
 	// Resources that can be placed after forests
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/PampasRegicide.xs b/RMM/PampasRegicide.xs
index b73185a..208c075 100644
--- a/RMM/PampasRegicide.xs
+++ b/RMM/PampasRegicide.xs
@@ -15,11 +15,11 @@ void main(void)
 
 // ********************** MAP PARAMETERS *********************
    // Map size
-   int playerTiles = 10000;
+   int playerTiles = 12000;
    if (cNumberNonGaiaPlayers >4)
-	playerTiles = 8000;
+	playerTiles = 10000;
    if (cNumberNonGaiaPlayers >6)
-	playerTiles = 6000;
+	playerTiles = 8000;
 // size reset for Regicide		
    int size=2.1*sqrt(cNumberNonGaiaPlayers*playerTiles);
    int longSide=1.4*size;      // 'Longside' is used to make the map rectangular
@@ -531,7 +531,7 @@ void main(void)
       rmAddObjectDefConstraint(startSilver2ID, centerConstraint);
    
    int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-   rmSetObjectDefMinDistance(startingUnits, 5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
    rmSetObjectDefMaxDistance(startingUnits, 10.0);
    rmAddObjectDefConstraint(startingUnits, avoidAll);
    //rmAddObjectDefConstraint(startingUnits, avoidResource);
@@ -749,16 +749,6 @@ void main(void)
 // Text
 	rmSetStatusText("",0.35);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 // ********** KOTH game mode **********
    if(rmGetIsKOTH())
@@ -902,7 +892,7 @@ void main(void)
 	rmSetStatusText("",0.60);
 
 // Forests
-   int numTries=10*cNumberNonGaiaPlayers;  
+   int numTries=11*cNumberNonGaiaPlayers;  
    int failCount=0;
    for (i=0; <numTries)
    {   
diff --git a/RMM/RockiesLower.xml b/RMM/RockiesLower.xml
new file mode 100644
index 0000000..6b89f5f
--- /dev/null
+++ b/RMM/RockiesLower.xml
@@ -0,0 +1,13 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\rockies" 
+displayNameID = "130078" 
+details = "130079" 
+loadDetails = "130080" 
+loadBackground="ui\random_map\rockies\rockies_map">
+   <loadss>ui\random_map\africa\rockies\rockies_ss_01</loadss>
+   <loadss>ui\random_map\africa\rockies\rockies_ss_03</loadss>
+   <loadss>ui\random_map\africa\rockies\rockies_ss_03</loadss>
+</mapinfo>
+
+ 
\ No newline at end of file
diff --git a/RMM/RockiesLower.xs b/RMM/RockiesLower.xs
new file mode 100644
index 0000000..5800dd6
--- /dev/null
+++ b/RMM/RockiesLower.xs
@@ -0,0 +1,1290 @@
+// ESOC CASCADE RANGE (1v1, TEAM, FFA)
+// designed by Garja
+
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+// Main entry point for random map script
+void main(void)
+{
+		
+	// Text
+	// These status text lines are used to manually animate the map generation progress bar
+	rmSetStatusText("",0.01); 
+	
+	// ************************************** GENERAL FEATURES *****************************************
+	
+	// Picks the map size
+	int playerTiles=11500; //12000
+	if (cNumberNonGaiaPlayers >= 4)
+		playerTiles = 10500;
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles); //2.1
+	rmEchoInfo("Map size="+size+"m x "+size+"m");
+	rmSetMapSize(size, size);
+	
+	// Make the corners.
+	rmSetWorldCircleConstraint(true);
+		
+	// Picks a default water height
+	rmSetSeaLevel(3.5);	// this is height of river surface compared to surrounding land. River depth is in the river XML.
+
+	rmSetMapElevationParameters(cElevTurbulence, 0.05, 3, 0.4, 4.0); // type, frequency, octaves, persistence, variation 
+//	rmSetMapElevationHeightBlend(1);
+	
+	// Picks default terrain and water
+	rmSetSeaType("great lakes");
+	rmSetBaseTerrainMix("great plains grass"); // nwt_grass1
+	rmTerrainInitialize("great_plains\ground4_gp", 4.0); // NWterritory\ground_grass2_nwt  NWterritory\ground_grass2_nwt
+	rmSetMapType("rockies"); 
+	rmSetMapType("snow");
+	rmSetMapType("land");
+	rmSetLightingSet("rockies"); //
+	
+
+	// Choose Mercs
+	chooseMercs();
+	
+	// Text
+	rmSetStatusText("",0.10);
+	
+	// Set up Natives
+	int subCiv0 = -1;
+	int subCiv1 = -1;
+	subCiv0 = rmGetCivID("Cheyenne");
+	subCiv1 = rmGetCivID("Comanche");
+	rmSetSubCiv(0, "Cheyenne");
+	rmSetSubCiv(1, "Comanche");
+
+	
+
+	//Define some classes. These are used later for constraints.
+	int classPlayer = rmDefineClass("Players");
+	int classHill = rmDefineClass("Hills");
+	int classPatch = rmDefineClass("patch");
+	int classPatch2 = rmDefineClass("patch2");
+	int classPatch3 = rmDefineClass("patch3");
+	int classPatch4 = rmDefineClass("patch4");
+	int classGrass = rmDefineClass("grass");
+	rmDefineClass("starting settlement");
+	rmDefineClass("startingUnit");
+	int classForest = rmDefineClass("Forest");
+	int importantItem = rmDefineClass("importantItem");
+	int classNative = rmDefineClass("natives");
+	int classCliff = rmDefineClass("Cliffs");
+	int classGold = rmDefineClass("Gold");
+	int classStartingResource = rmDefineClass("startingResource");
+	
+	// ******************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.20);
+	
+	// ************************************* CONTRAINTS *****************************************
+	// These are used to have objects and areas avoid each other
+   
+   
+	// Cardinal Directions & Map placement
+	int avoidEdge = rmCreatePieConstraint("Avoid Edge",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.47), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int avoidEdgeMore = rmCreatePieConstraint("Avoid Edge More",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.45), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int stayEdge = rmCreatePieConstraint("Stay Edge",0.5,0.5,rmXFractionToMeters(0.42), rmXFractionToMeters(0.5), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int avoidCenter = rmCreatePieConstraint("Avoid Center",0.5,0.5,rmXFractionToMeters(0.28), rmXFractionToMeters(0.5), rmDegreesToRadians(0),rmDegreesToRadians(360));
+	int stayCenter = rmCreatePieConstraint("Stay Center",0.5,0.5,rmXFractionToMeters(0.0), rmXFractionToMeters(0.25), rmDegreesToRadians(0),rmDegreesToRadians(360));
+
+	
+	// Resource avoidance
+	int avoidForestFar=rmCreateClassDistanceConstraint("avoid forest far", rmClassID("Forest"), 40.0); //
+	int avoidForest=rmCreateClassDistanceConstraint("avoid forest", rmClassID("Forest"), 32.0); //29.0 
+	int avoidForestShort=rmCreateClassDistanceConstraint("avoid forest short", rmClassID("Forest"), 24.0); //
+	int avoidForestMin=rmCreateClassDistanceConstraint("avoid forest min", rmClassID("Forest"), 4.0);
+	int avoidElkFar = rmCreateTypeDistanceConstraint("avoid elk far", "elk", 60.0);
+	int avoidElk = rmCreateTypeDistanceConstraint("avoid elk", "elk", 45.0);
+	int avoidElkShort = rmCreateTypeDistanceConstraint("avoid elk short", "elk", 30.0);
+	int avoidElkMin = rmCreateTypeDistanceConstraint("avoid elk min", "elk", 5.0);
+	int avoidBerriesFar = rmCreateTypeDistanceConstraint("avoid berries far", "berrybush", 56.0);
+	int avoidBerries = rmCreateTypeDistanceConstraint("avoid  berries", "berrybush", 40.0);
+	int avoidBerriesShort = rmCreateTypeDistanceConstraint("avoid  berries short", "berrybush", 30.0);
+	int avoidBerriesMin = rmCreateTypeDistanceConstraint("avoid berries min", "berrybush", 10.0);
+	int avoidGoldTypeMin = rmCreateTypeDistanceConstraint("coin avoids coin min ", "gold", 10.0);
+	int avoidGoldTypeShort = rmCreateTypeDistanceConstraint("coin avoids coin short", "gold", 18.0);
+	int avoidGoldType = rmCreateTypeDistanceConstraint("coin avoids coin ", "gold", 26.0);
+	int avoidGoldTypeFar = rmCreateTypeDistanceConstraint("coin avoids coin far ", "gold", 50.0);
+	int avoidGoldMin=rmCreateClassDistanceConstraint("min distance vs gold", rmClassID("Gold"), 10.0);
+	int avoidGold = rmCreateClassDistanceConstraint ("gold avoid gold med", rmClassID("Gold"), 30.0);
+	int avoidGoldFar = rmCreateClassDistanceConstraint ("gold avoid gold far", rmClassID("Gold"), 60.0);
+	int avoidGoldVeryFar = rmCreateClassDistanceConstraint ("gold avoid gold very far", rmClassID("Gold"), 72.0);
+	int avoidNuggetShort = rmCreateTypeDistanceConstraint("nugget avoid nugget short", "AbstractNugget", 40.0);
+	int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 38.0);
+	int avoidFish=rmCreateTypeDistanceConstraint("avoid fish", "fish", 10.0);
+	
+	int avoidTownCenterVeryFar=rmCreateTypeDistanceConstraint("avoid Town Center Very Far", "townCenter", 82.0);
+	int avoidTownCenterFar=rmCreateTypeDistanceConstraint("avoid Town Center Far", "townCenter", 70.0);
+	int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 26.0);
+	int avoidTownCenterMed=rmCreateTypeDistanceConstraint(" avoid Town Center med", "townCenter", 24.0);
+	int avoidTownCenterShort=rmCreateTypeDistanceConstraint(" avoid Town Center short", "townCenter", 20.0);
+	int avoidTownCenterResources=rmCreateTypeDistanceConstraint(" avoid Town Center", "townCenter", 40.0);
+	int avoidNatives = rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 8.0);
+	int avoidNativesFar = rmCreateClassDistanceConstraint("stuff avoids natives far", rmClassID("natives"), 14.0);
+	int avoidStartingResources  = rmCreateClassDistanceConstraint("avoid starting resource", rmClassID("startingResource"), 8.0);
+	int avoidStartingResourcesShort  = rmCreateClassDistanceConstraint("avoid starting resource short", rmClassID("startingResource"), 4.0);
+	
+	
+
+	// Land and terrain constraints
+	int avoidImpassableLand = rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 6.0);
+	int avoidImpassableLandFar=rmCreateTerrainDistanceConstraint("far avoid impassable land", "Land", false, 10.0);
+	int avoidImpassableLandShort = rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 3.0);
+	int avoidImpassableLandMin = rmCreateTerrainDistanceConstraint("min avoid impassable land", "Land", false, 1.0);
+	int avoidImpassableLandZero=rmCreateTerrainDistanceConstraint("medium avoid impassable land", "Land", false, 0.2);
+	int avoidWater = rmCreateTerrainDistanceConstraint("avoid water ", "water", true, 20);
+	int stayNearWater = rmCreateTerrainMaxDistanceConstraint("stay near water ", "land", false, 12.0);
+	int stayInWater = rmCreateTerrainMaxDistanceConstraint("stay in water ", "water", true, 0.0);
+	int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "water", true, 3.0);
+	int avoidPatch = rmCreateClassDistanceConstraint("patch avoid patch", rmClassID("patch"), 12.0);
+	int avoidPatch2 = rmCreateClassDistanceConstraint("patch avoid patch 2", rmClassID("patch2"), 12.0);
+	int avoidPatch3 = rmCreateClassDistanceConstraint("patch avoid patch 3", rmClassID("patch3"), 15.0);
+	int avoidPatch4 = rmCreateClassDistanceConstraint("patch avoid patch 4", rmClassID("patch4"), 24.0);
+	int avoidStone = rmCreateClassDistanceConstraint("stone avoid stone", rmClassID("stonewater"), 5.0);
+	int avoidGrass = rmCreateClassDistanceConstraint("grass avoid grass", rmClassID("grass"), 10.0);
+	int avoidCliffMin = rmCreateClassDistanceConstraint("avoid cliff min", rmClassID("Cliffs"), 1.0);
+	int avoidCliff = rmCreateClassDistanceConstraint("avoid cliff", rmClassID("Cliffs"), 4.0);
+	int avoidCliffMed = rmCreateClassDistanceConstraint("avoid cliff medium", rmClassID("Cliffs"), 8.0);
+	int avoidCliffFar = rmCreateClassDistanceConstraint("avoid cliff far", rmClassID("Cliffs"), 16.0);
+	int avoidLand = rmCreateTerrainDistanceConstraint("avoid land ", "Land", true, 10.0);
+
+	// Unit avoidance
+	int avoidStartingUnits = rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 35.0);
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);
+		
+	
+	// VP avoidance
+	int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 10.0);
+	int avoidTradeRouteShort = rmCreateTradeRouteDistanceConstraint("trade route short", 5.0);
+	int avoidTradeRouteSocket = rmCreateTypeDistanceConstraint("avoid trade route socket", "socketTradeRoute", 8.0);
+	int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 10.0);
+   
+	
+	
+	
+	// ***********************************************************************************************
+	
+	// **************************************** PLACE PLAYERS ****************************************
+
+	int teamZeroCount = rmGetNumberPlayersOnTeam(0);
+	int teamOneCount = rmGetNumberPlayersOnTeam(1);
+
+	if (cNumberTeams <= 2) // 1v1 and TEAM
+	{
+		if (teamZeroCount == 1 && teamOneCount == 1) // 1v1
+		{
+			float OneVOnePlacement=rmRandFloat(0.0, 0.9);
+			if ( OneVOnePlacement < 0.5)
+			{
+				rmPlacePlayer(1, 0.50, 0.20);
+				rmPlacePlayer(2, 0.50, 0.80);
+			}
+			else
+			{
+				rmPlacePlayer(2, 0.50, 0.20);
+				rmPlacePlayer(1, 0.50, 0.80);
+			}
+			
+		}
+		else if (teamZeroCount == teamOneCount) // equal N of players per TEAM
+		{
+			if (teamZeroCount == 2) // 2v2
+			{
+				rmSetPlacementTeam(0);
+				rmSetPlacementSection(0.960, 0.080); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.34, 0.34, 0);
+
+				rmSetPlacementTeam(1);
+				rmSetPlacementSection(0.460, 0.580); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.34, 0.34, 0);
+			}
+			else // 3v3, 4v4 
+			{
+				rmSetPlacementTeam(0);
+				rmSetPlacementSection(0.930, 0.125); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.34, 0.34, 0);
+
+				rmSetPlacementTeam(1);
+				rmSetPlacementSection(0.430, 0.625); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.34, 0.34, 0);
+			}
+		}
+		else // unequal N of players per TEAM
+		{
+			if (teamZeroCount == 1 || teamOneCount == 1) // one team is one player
+			{
+				if (teamZeroCount < teamOneCount) // 1v2, 1v3, 1v4, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmPlacePlayersLine(0.50, 0.82, 0.51, 0.80, 0.00, 0.00);
+
+					rmSetPlacementTeam(1);
+					if (teamOneCount == 2)
+						rmSetPlacementSection(0.460, 0.580); // 
+					else
+						rmSetPlacementSection(0.430, 0.625); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.34, 0.34, 0);
+				} 
+				else // 2v1, 3v1, 4v1, etc.
+				{
+					rmSetPlacementTeam(0);
+					if (teamZeroCount == 2)
+						rmSetPlacementSection(0.960, 0.080); // 
+					else
+						rmSetPlacementSection(0.930, 0.125); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.34, 0.34, 0);
+
+					rmSetPlacementTeam(1);
+					rmPlacePlayersLine(0.50, 0.18, 0.51, 0.20, 0.00, 0.00);
+				} 
+			}
+			else if (teamZeroCount == 2 || teamOneCount == 2) // one team has 2 players
+			{
+				if (teamZeroCount < teamOneCount) // 2v3, 2v4, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmSetPlacementSection(0.960, 0.080); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.34, 0.34, 0);
+
+					rmSetPlacementTeam(1);
+					rmSetPlacementSection(0.430, 0.625); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.34, 0.34, 0);
+				} 
+				else // 3v2, 4v2, etc.
+				{
+					rmSetPlacementTeam(0);
+					rmSetPlacementSection(0.930, 0.125); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.34, 0.34, 0);
+
+					rmSetPlacementTeam(1);
+					rmSetPlacementSection(0.460, 0.580); // 
+					rmSetTeamSpacingModifier(0.25);
+					rmPlacePlayersCircular(0.34, 0.34, 0);
+				} 
+			}
+			else // 3v4, 4v3, etc.
+			{
+				rmSetPlacementTeam(0);
+				rmSetPlacementSection(0.930, 0.125); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.34, 0.34, 0);
+
+				rmSetPlacementTeam(1);
+				rmSetPlacementSection(0.430, 0.625); // 
+				rmSetTeamSpacingModifier(0.25);
+				rmPlacePlayersCircular(0.34, 0.34, 0);
+			} 
+		}
+	}
+	else // FFA
+	{	
+		rmSetPlacementSection(0.380, 0.120);
+	//	rmSetTeamSpacingModifier(0.25);
+		rmPlacePlayersCircular(0.33, 0.33, 0.0);
+	}
+		
+	// **************************************************************************************************
+   
+	// Text
+	rmSetStatusText("",0.30);
+	
+	// ******************************************** MAP LAYOUT AND LANDSCAPE DESIGN **************************************************
+	
+	int groundID = rmCreateArea("ground");
+    rmSetAreaWarnFailure(groundID, false);
+	rmSetAreaObeyWorldCircleConstraint(groundID, false);
+    rmSetAreaSize(groundID, 1.0, 1.0);
+	rmSetAreaTerrainType(groundID, "great_lakes\ground_shoreline3_gl");
+//	rmPaintAreaTerrain(groundID);
+    rmSetAreaCoherence(groundID, 0.0);
+//	rmAddAreaConstraint(groundID, avoidImpassableLandZero);	
+//	rmAddAreaConstraint(groundID, avoidPlateau1);
+//	rmAddAreaConstraint(groundID, avoidPlateau2);
+//	rmAddAreaConstraint(groundID, avoidCliff);
+    rmBuildArea(groundID); 
+	
+	
+	//Lake1
+	int Lake1ID = rmCreateArea("Lake1");
+	rmSetAreaSize(Lake1ID, 0.05, 0.055);
+	rmSetAreaLocation(Lake1ID, 1.0, 0.7);
+	rmAddAreaInfluenceSegment(Lake1ID, 1.0, 0.6, 0.88, 0.55); // 0.62, 0.62
+	rmSetAreaWaterType(Lake1ID, "great lakes"); //yukon river
+//	rmSetAreaMinBlobs(Lake1ID, 8);
+//	rmSetAreaMaxBlobs(Lake1ID, 10);
+//	rmSetAreaMinBlobDistance(Lake1ID, 10);
+//	rmSetAreaMaxBlobDistance(Lake1ID, 20);
+	rmSetAreaSmoothDistance(Lake1ID, 12);
+	rmSetAreaCoherence(Lake1ID, 0.6);
+	rmSetAreaObeyWorldCircleConstraint(Lake1ID, false);
+	if (cNumberTeams <= 2)
+		rmBuildArea(Lake1ID);
+	
+	int stayNearLake1 = rmCreateAreaMaxDistanceConstraint("stay near lake 1", Lake1ID, 14.0);
+	
+	//Lake2
+	int Lake2ID = rmCreateArea("Lake2");
+	rmSetAreaSize(Lake2ID, 0.05, 0.055);
+	rmSetAreaLocation(Lake2ID, 0.0, 0.3);
+	rmAddAreaInfluenceSegment(Lake2ID, 0.0, 0.4, 0.12, 0.45); // 0.62, 0.62
+	rmSetAreaWaterType(Lake2ID, "great lakes"); //yukon river
+//	rmSetAreaMinBlobs(Lake2ID, 8);
+//	rmSetAreaMaxBlobs(Lake2ID, 10);
+//	rmSetAreaMinBlobDistance(Lake2ID, 10);
+//	rmSetAreaMaxBlobDistance(Lake2ID, 20);
+	rmSetAreaSmoothDistance(Lake2ID, 12);
+	rmSetAreaCoherence(Lake2ID, 0.6);
+	rmSetAreaObeyWorldCircleConstraint(Lake2ID, false);
+	if (cNumberTeams <= 2)
+		rmBuildArea(Lake2ID);
+	
+	int stayNearLake2 = rmCreateAreaMaxDistanceConstraint("stay near lake 2", Lake2ID, 14.0);
+
+	//Lake3
+	int Lake3ID = rmCreateArea("Lake3");
+	rmSetAreaSize(Lake3ID, 0.05, 0.0565);
+	rmSetAreaLocation(Lake3ID, 1.0, 0.5);
+	rmAddAreaInfluenceSegment(Lake3ID, 1.0, 0.5, 0.80, 0.5); // 0.62, 0.62
+	rmSetAreaWaterType(Lake3ID, "great lakes"); //yukon river
+//	rmSetAreaMinBlobs(Lake3ID, 8);
+//	rmSetAreaMaxBlobs(Lake3ID, 10);
+//	rmSetAreaMinBlobDistance(Lake3ID, 10);
+//	rmSetAreaMaxBlobDistance(Lake3ID, 20);
+	rmSetAreaSmoothDistance(Lake3ID, 12);
+	rmSetAreaCoherence(Lake3ID, 0.6);
+	rmSetAreaObeyWorldCircleConstraint(Lake3ID, false);
+	if (cNumberTeams >= 3)
+		rmBuildArea(Lake3ID);
+	
+	int stayNearLake3 = rmCreateAreaMaxDistanceConstraint("stay near lake 3", Lake3ID, 15.0);
+	
+	// Plateau template
+	int TemplateID = rmCreateArea("plateau template");
+	rmSetAreaSize(TemplateID, 0.34, 0.34);
+	rmSetAreaWarnFailure(TemplateID, false);
+//	rmSetAreaMix(TemplateID, "rockies_snow");
+	rmSetAreaCoherence(TemplateID, 0.65);
+	rmSetAreaSmoothDistance(TemplateID, 10);
+	rmSetAreaLocation(TemplateID, 0.5, 0.5);
+	rmBuildArea(TemplateID);
+	
+	int avoidTemplate = rmCreateAreaDistanceConstraint("avoid template", TemplateID, 3.0);
+	
+	
+	// Snow rim template
+	int Template2ID = rmCreateArea("snow rim template");
+	rmSetAreaSize(Template2ID, 0.50, 0.50);
+	rmSetAreaWarnFailure(Template2ID, false);
+//	rmSetAreaMix(Template2ID, "rockies_snow");
+	rmSetAreaCoherence(Template2ID, 0.8);
+	rmSetAreaSmoothDistance(Template2ID, 6);
+	rmSetAreaLocation(Template2ID, 0.5, 0.5);
+	rmBuildArea(Template2ID);
+
+	int avoidTemplate2 = rmCreateAreaDistanceConstraint("avoid template2", Template2ID, 1.5);
+	
+
+	// Border1 template
+	int Template3ID = rmCreateArea("border1 template");
+	rmSetAreaSize(Template3ID, 0.63, 0.63);
+	rmSetAreaWarnFailure(Template3ID, false);
+//	rmSetAreaMix(Template3ID, "rockies_snow");
+	rmSetAreaCoherence(Template3ID, 0.8);
+	rmSetAreaSmoothDistance(Template3ID, 10);
+	rmSetAreaLocation(Template3ID, 0.5, 0.5);
+	rmBuildArea(Template3ID);
+
+	int avoidTemplate3 = rmCreateAreaDistanceConstraint("avoid template3", Template3ID, 1.5);
+	
+	// Border2 template
+	int Template4ID = rmCreateArea("border2 template");
+	rmSetAreaSize(Template4ID, 0.67, 0.67);
+	rmSetAreaWarnFailure(Template4ID, false);
+//	rmSetAreaMix(Template4ID, "rockies_snow");
+	rmSetAreaCoherence(Template4ID, 0.9);
+	rmSetAreaSmoothDistance(Template4ID, 12);
+	rmSetAreaLocation(Template4ID, 0.5, 0.5);
+	rmBuildArea(Template4ID);
+
+	int avoidTemplate4 = rmCreateAreaDistanceConstraint("avoid template4", Template4ID, 1.5);
+	
+	
+	// Plateau
+	for(i=1; < 3)
+	{
+		int plateauID = rmCreateArea("plateau"+i);
+		rmSetAreaSize(plateauID, 0.30, 0.30); //0.23, 0.23
+		rmSetAreaWarnFailure(plateauID, false);
+		rmSetAreaObeyWorldCircleConstraint(plateauID, false);
+	//	rmSetAreaCliffType(plateauID, "araucania north coast"); // araucania north coast
+	//	rmSetAreaCliffPainting(plateauID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+		rmSetAreaTerrainType(plateauID, "great_lakes\ground_grass2_gl");
+		rmSetAreaBaseHeight(plateauID, 7.0);
+		rmSetAreaHeightBlend(plateauID, 2.0);
+		rmSetAreaElevationType(plateauID, cElevTurbulence);
+		rmSetAreaElevationVariation(plateauID, 7.0);
+		rmSetAreaElevationMinFrequency(plateauID, 0.05);
+		rmSetAreaElevationOctaves(plateauID, 3);
+		rmSetAreaElevationPersistence(plateauID, 0.5);
+	//	rmSetAreaBaseHeight(plateauID, 5, 0.0, 0.8); 
+	//	rmSetAreaCliffEdge(plateauID, 5, 0.083, 0.0, 0.30, 1); 
+		rmSetAreaCoherence(plateauID, 0.8);
+		rmSetAreaSmoothDistance(plateauID, 6);
+	//	rmAddAreaToClass(plateauID, rmClassID("Cliffs"));
+		rmAddAreaConstraint(plateauID, avoidTemplate);	
+		rmAddAreaConstraint (plateauID, avoidImpassableLandMin);
+		if (i < 2)
+			rmSetAreaLocation(plateauID, 0.0, 1.0);
+		else	
+			rmSetAreaLocation(plateauID, 1.0, 0.0);
+		if (cNumberTeams <= 2)
+			rmBuildArea(plateauID);
+		rmCreateAreaDistanceConstraint("avoid plateau "+i, plateauID, 0.2);
+		rmCreateAreaMaxDistanceConstraint("stay in plateau "+i, plateauID, 0.0);
+	}
+	
+	int avoidPlateau1 = rmConstraintID("avoid plateau 1");
+	int avoidPlateau2 = rmConstraintID("avoid plateau 2");
+	int stayInPlateau1 = rmConstraintID("stay in plateau 1");
+	int stayInPlateau2 = rmConstraintID("stay in plateau 2");
+		
+	
+	// Plateau FFA
+	int plateau3ID = rmCreateArea("plateau FFA");
+	rmSetAreaSize(plateau3ID, 0.60, 0.60); //0.23, 0.23
+	rmSetAreaWarnFailure(plateau3ID, false);
+	rmSetAreaObeyWorldCircleConstraint(plateau3ID, false);
+//	rmSetAreaCliffType(plateau3ID, "araucania north coast"); // araucania north coast
+//	rmSetAreaCliffPainting(plateau3ID, false, true, true, 0.5 , true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+	rmSetAreaTerrainType(plateau3ID, "great_lakes\ground_grass2_gl");
+	rmSetAreaBaseHeight(plateau3ID, 7.0);
+	rmSetAreaHeightBlend(plateau3ID, 2.0);
+	rmSetAreaElevationType(plateau3ID, cElevTurbulence);
+	rmSetAreaElevationVariation(plateau3ID, 7.0);
+	rmSetAreaElevationMinFrequency(plateau3ID, 0.05);
+	rmSetAreaElevationOctaves(plateau3ID, 3);
+	rmSetAreaElevationPersistence(plateau3ID, 0.5);
+//	rmSetAreaBaseHeight(plateau3ID, 5, 0.0, 0.8); 
+//	rmSetAreaCliffEdge(plateau3ID, 5, 0.083, 0.0, 0.30, 1); 
+	rmSetAreaCoherence(plateau3ID, 0.8);
+	rmSetAreaSmoothDistance(plateau3ID, 6);
+//	rmAddAreaToClass(plateau3ID, rmClassID("Cliffs"));
+	rmAddAreaConstraint(plateau3ID, avoidTemplate);	
+	rmAddAreaConstraint (plateau3ID, avoidImpassableLandMin);
+	rmSetAreaLocation(plateau3ID, 0.0, 0.5);
+	if (cNumberTeams >= 3)
+		rmBuildArea(plateau3ID);
+	
+	int avoidPlateau3 = rmCreateAreaDistanceConstraint("avoid plateau 3", plateau3ID, 3.0);
+	int stayInPlateau3 = rmCreateAreaMaxDistanceConstraint("stay in plateau 3", plateau3ID, 0.0);
+
+	
+	// Snow rim
+	for(i=1; < 3)
+	{
+		int snowrimID = rmCreateArea("snow rim"+i);
+		rmSetAreaSize(snowrimID, 0.17, 0.17); //0.08, 0.08
+		rmSetAreaWarnFailure(snowrimID, false);
+		rmSetAreaObeyWorldCircleConstraint(snowrimID, false);
+//		rmSetAreaTerrainType(snowrimID, "araucania\ground_snow3_ara");
+		rmSetAreaTerrainType(snowrimID, "great_lakes\ground_snow3_gl");
+		rmAddAreaTerrainLayer(snowrimID, "great_lakes\ground_grass3_gl", 0, 2);
+		rmSetAreaCoherence(snowrimID, 1.0);
+		rmAddAreaConstraint(snowrimID, avoidTemplate);		
+		if (i < 2)
+			rmSetAreaLocation(snowrimID, 0.0, 1.0);
+		else	
+			rmSetAreaLocation(snowrimID, 1.0, 0.0);
+		rmAddAreaConstraint(snowrimID, avoidTemplate2);
+		rmAddAreaConstraint (snowrimID, avoidImpassableLand);
+		if (cNumberTeams <= 2)
+			rmBuildArea(snowrimID);
+		rmCreateAreaDistanceConstraint("avoid snow rim "+i, snowrimID, 3.0);
+		rmCreateAreaDistanceConstraint("avoid snow rim far "+i, snowrimID, 15.0);
+		rmCreateAreaMaxDistanceConstraint("stay in snow rim "+i, snowrimID, 0.0);
+	}
+	
+	int avoidSnowRim1 = rmConstraintID("avoid snow rim 1");
+	int avoidSnowRim2 = rmConstraintID("avoid snow rim 2");
+	int avoidSnowRim1Far = rmConstraintID("avoid snow rim far 1");
+	int avoidSnowRim2Far = rmConstraintID("avoid snow rim far 2");
+	int stayInSnowRim1 = rmConstraintID("stay in snow rim 1");
+	int stayInSnowRim2 = rmConstraintID("stay in snow rim 2");
+	
+	
+	// Snow rim FFA
+	int snowrim3ID = rmCreateArea("snow rim FFA");
+	rmSetAreaSize(snowrim3ID, 0.38, 0.38); //0.08, 0.08
+	rmSetAreaWarnFailure(snowrim3ID, false);
+	rmSetAreaObeyWorldCircleConstraint(snowrim3ID, false);
+//	rmSetAreaTerrainType(snowrim3ID, "araucania\ground_snow3_ara");
+	rmSetAreaTerrainType(snowrim3ID, "great_lakes\ground_snow3_gl");
+	rmAddAreaTerrainLayer(snowrim3ID, "great_lakes\ground_grass3_gl", 0, 2);
+	rmSetAreaCoherence(snowrim3ID, 1.0);
+	rmAddAreaConstraint(snowrim3ID, avoidTemplate);		
+	rmSetAreaLocation(snowrim3ID, 0.0, 0.5);
+	rmAddAreaConstraint(snowrim3ID, avoidTemplate2);
+	rmAddAreaConstraint (snowrim3ID, avoidImpassableLand);
+	if (cNumberTeams >= 3)
+		rmBuildArea(snowrim3ID);
+			
+	int avoidSnowRim3 = rmCreateAreaDistanceConstraint("avoid snow rim 3 ", snowrim3ID, 3.0);
+	int avoidSnowRim3Far = rmCreateAreaDistanceConstraint("avoid snow rim far 3 ", snowrim3ID, 15.0);
+	int stayInSnowRim3 = rmCreateAreaMaxDistanceConstraint("stay in snow rim 3", snowrim3ID, 0.0);
+
+	
+	// Rocky border
+	for(i=1; < 3)
+	{
+		int borderID = rmCreateArea("border"+i);
+		rmSetAreaSize(borderID, 0.10, 0.10); //0.08, 0.08
+		rmSetAreaWarnFailure(borderID, false);
+		rmSetAreaObeyWorldCircleConstraint(borderID, false);
+		rmSetAreaCliffType(borderID, "araucania south"); //new england snow, rocky mountain edge
+	//	rmSetAreaCliffPainting(borderID, false, true, true, true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+		rmSetAreaTerrainType(borderID, "rockies\groundsnow5_roc");
+		rmSetAreaCliffHeight(borderID, 7, 0.0, 0.2); 
+		rmSetAreaCliffEdge(borderID, 1, 1.0, 0.0, 0.0, 1); 
+		rmSetAreaCoherence(borderID, 0.5);
+		rmSetAreaSmoothDistance(borderID, 4);
+		rmAddAreaToClass(borderID, rmClassID("Cliffs"));
+		if (i <2)
+			rmSetAreaLocation(borderID, 0.0, 0.7);
+		else
+			rmSetAreaLocation(borderID, 1.0, 0.3);
+		rmAddAreaConstraint(borderID, avoidTemplate3);
+		rmAddAreaConstraint (borderID, avoidImpassableLandMin);
+		if (cNumberTeams <= 2)
+			rmBuildArea(borderID);
+	}
+	
+	int avoidBorder = rmCreateAreaDistanceConstraint("avoid border", borderID, 8.0);
+
+	
+	// Rocky border FFA
+	int border3ID = rmCreateArea("border FFA");
+	rmSetAreaSize(border3ID, 0.23, 0.23); //0.08, 0.08
+	rmSetAreaWarnFailure(border3ID, false);
+	rmSetAreaObeyWorldCircleConstraint(border3ID, false);
+	rmSetAreaCliffType(border3ID, "araucania south"); //new england snow, rocky mountain edge
+//	rmSetAreaCliffPainting(border3ID, false, true, true, true); //  paintGround,  paintOutsideEdge,  paintSide,  minSideHeight,  paintInsideEdge
+	rmSetAreaTerrainType(border3ID, "rockies\groundsnow5_roc");
+	rmSetAreaCliffHeight(border3ID, 7, 0.0, 0.2); 
+	rmSetAreaCliffEdge(border3ID, 1, 1.0, 0.0, 0.0, 1); 
+	rmSetAreaCoherence(border3ID, 0.5);
+	rmSetAreaSmoothDistance(border3ID, 4);
+	rmAddAreaToClass(border3ID, rmClassID("Cliffs"));
+	rmSetAreaLocation(border3ID, 0.0, 0.5);
+	rmAddAreaConstraint(border3ID, avoidTemplate3);
+	rmAddAreaConstraint (border3ID, avoidImpassableLandMin);
+	if (cNumberTeams >= 3)
+		rmBuildArea(border3ID);
+		
+	int avoidBorder3 = rmCreateAreaDistanceConstraint("avoid border 3", border3ID, 8.0);
+	
+	
+	
+	// Patches yellow flowers
+	for (i=0; < 12*cNumberNonGaiaPlayers)
+    {
+        int patch1ID = rmCreateArea("plateau yellow patch"+i);
+        rmSetAreaWarnFailure(patch1ID, false);
+		rmSetAreaObeyWorldCircleConstraint(patch1ID, false);
+        rmSetAreaSize(patch1ID, rmAreaTilesToFraction(80), rmAreaTilesToFraction(120));
+		rmSetAreaTerrainType(patch1ID, "great_lakes\ground_grass4_gl");
+		rmPaintAreaTerrain(patch1ID);
+        rmAddAreaToClass(patch1ID, rmClassID("patch"));
+        rmSetAreaMinBlobs(patch1ID, 1);
+        rmSetAreaMaxBlobs(patch1ID, 5);
+        rmSetAreaMinBlobDistance(patch1ID, 16.0);
+        rmSetAreaMaxBlobDistance(patch1ID, 40.0);
+        rmSetAreaCoherence(patch1ID, 0.0);
+		rmAddAreaConstraint(patch1ID, avoidImpassableLandMin);
+		rmAddAreaConstraint(patch1ID, avoidPatch);
+		if (cNumberTeams <= 2)
+		{
+			rmAddAreaConstraint(patch1ID, avoidSnowRim1Far);
+			rmAddAreaConstraint(patch1ID, avoidSnowRim2Far);
+		}
+		else
+			rmAddAreaConstraint(patch1ID, avoidSnowRim3Far);
+//		rmAddAreaConstraint(patch1ID, avoidBorder);
+		rmAddAreaConstraint(patch1ID, avoidCliff);
+        rmBuildArea(patch1ID); 
+    }
+	
+	// Patches white flowers
+	for (i=0; < 12*cNumberNonGaiaPlayers)
+    {
+        int patch2ID = rmCreateArea("plateau white patch"+i);
+        rmSetAreaWarnFailure(patch2ID, false);
+		rmSetAreaObeyWorldCircleConstraint(patch2ID, false);
+        rmSetAreaSize(patch2ID, rmAreaTilesToFraction(80), rmAreaTilesToFraction(120));
+		rmSetAreaTerrainType(patch2ID, "great_lakes\ground_grass5_gl");
+		rmPaintAreaTerrain(patch2ID);
+        rmAddAreaToClass(patch2ID, rmClassID("patch2"));
+        rmSetAreaMinBlobs(patch2ID, 1);
+        rmSetAreaMaxBlobs(patch2ID, 5);
+        rmSetAreaMinBlobDistance(patch2ID, 16.0);
+        rmSetAreaMaxBlobDistance(patch2ID, 40.0);
+        rmSetAreaCoherence(patch2ID, 0.0);
+		rmAddAreaConstraint(patch2ID, avoidImpassableLandMin);
+		rmAddAreaConstraint(patch2ID, avoidPatch2);
+		if (cNumberTeams <= 2)
+		{
+			rmAddAreaConstraint(patch2ID, avoidSnowRim1Far);
+			rmAddAreaConstraint(patch2ID, avoidSnowRim2Far);
+		}
+		else
+			rmAddAreaConstraint(patch2ID, avoidSnowRim3Far);
+//		rmAddAreaConstraint(patch2ID, avoidBorder);
+		rmAddAreaConstraint(patch2ID, avoidCliff);
+        rmBuildArea(patch2ID); 
+    }
+/*	
+	// Patches snow
+	for (i=0; < 30)
+    {
+        int patch3ID = rmCreateArea("snow patch"+i);
+        rmSetAreaWarnFailure(patch3ID, false);
+		rmSetAreaObeyWorldCircleConstraint(patch3ID, false);
+        rmSetAreaSize(patch3ID, rmAreaTilesToFraction(10), rmAreaTilesToFraction(15));
+		rmSetAreaTerrainType(patch3ID, "rockies\groundsnow1_roc");
+		rmPaintAreaTerrain(patch3ID);
+        rmAddAreaToClass(patch3ID, rmClassID("patch2"));
+        rmSetAreaMinBlobs(patch3ID, 3);
+        rmSetAreaMaxBlobs(patch3ID, 5);
+        rmSetAreaMinBlobDistance(patch3ID, 30.0);
+        rmSetAreaMaxBlobDistance(patch3ID, 40.0);
+        rmSetAreaCoherence(patch3ID, 0.0);
+		rmAddAreaConstraint(patch3ID, avoidImpassableLandMin);
+		rmAddAreaConstraint(patch3ID, avoidPatch3);
+		if (i<15)
+			rmAddAreaConstraint(patch3ID, stayInSnowRim1);
+		else
+			rmAddAreaConstraint(patch3ID, stayInSnowRim2);
+//		rmAddAreaConstraint(patch3ID, avoidBorder);
+		rmAddAreaConstraint(patch3ID, avoidCliff);
+        rmBuildArea(patch3ID); 
+    }
+*/	
+	
+	// Players area
+	for (i=1; < cNumberPlayers)
+	{
+	int playerareaID = rmCreateArea("playerarea"+i);
+	rmSetPlayerArea(i, playerareaID);
+	rmSetAreaSize(playerareaID, 0.06, 0.06);
+	rmSetAreaCoherence(playerareaID, 1.0);
+	rmSetAreaWarnFailure(playerareaID, false);
+//	rmSetAreaMix(playerareaID, "rockies_snow");
+	rmSetAreaLocPlayer(playerareaID, i);
+	rmBuildArea(playerareaID);
+	int avoidPlayerArea = rmCreateAreaDistanceConstraint("avoid player area "+i, playerareaID, 2.0);
+	int stayInPlayerArea = rmCreateAreaMaxDistanceConstraint("stay in player area "+i, playerareaID, 0.0);
+	}
+
+	// ******************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.40);
+	
+	// ******************************************** NATIVES *************************************************
+
+	int nativeID0 = -1;
+    int nativeID1 = -1;
+	int nativeID2 = -1;
+    int nativeID3 = -1;
+		
+	nativeID0 = rmCreateGrouping("Nootka village 1", "native cheyenne village "+2); //+5
+    rmSetGroupingMinDistance(nativeID0, 0.00);
+    rmSetGroupingMaxDistance(nativeID0, 0.00);
+//	rmAddGroupingConstraint(nativeID0, avoidImpassableLand);
+	rmAddGroupingToClass(nativeID0, rmClassID("natives"));
+//  rmAddGroupingToClass(nativeID0, rmClassID("importantItem"));
+//	rmAddGroupingConstraint(nativeID0, avoidNatives);
+	if (cNumberTeams <= 2)
+		rmPlaceGroupingAtLoc(nativeID0, 0, 0.72, 0.30);
+	else
+		rmPlaceGroupingAtLoc(nativeID0, 0, 0.55, 0.38);
+	
+	nativeID2 = rmCreateGrouping("Klamath village 1", "native comanche village "+1); //+1
+    rmSetGroupingMinDistance(nativeID2, 0.00);
+    rmSetGroupingMaxDistance(nativeID2, 0.00);
+//	rmAddGroupingConstraint(nativeID2, avoidImpassableLand);
+	rmAddGroupingToClass(nativeID2, rmClassID("natives"));
+//  rmAddGroupingToClass(nativeID2, rmClassID("importantItem"));
+//	rmAddGroupingConstraint(nativeID2, avoidNatives);
+	if (cNumberTeams <= 2)
+		rmPlaceGroupingAtLoc(nativeID2, 0, 0.60, 0.50);
+	else
+		rmPlaceGroupingAtLoc(nativeID2, 0, 0.40, 0.38);
+	
+	nativeID1 = rmCreateGrouping("Nootka village 2", "native cheyenne village "+1);
+    rmSetGroupingMinDistance(nativeID1, 0.00);
+    rmSetGroupingMaxDistance(nativeID1, 0.00);
+//  rmAddGroupingConstraint(nativeID1, avoidImpassableLand);
+	rmAddGroupingToClass(nativeID1, rmClassID("natives"));
+//  rmAddGroupingToClass(nativeID1, rmClassID("importantItem"));
+//	rmAddGroupingConstraint(nativeID1, avoidNatives);
+	if (cNumberTeams <= 2)
+		rmPlaceGroupingAtLoc(nativeID1, 0, 0.30, 0.70); // 
+	else
+		rmPlaceGroupingAtLoc(nativeID1, 0, 0.55, 0.62); // 
+	
+	nativeID3 = rmCreateGrouping("Klamath village 2", "native comanche village "+2);
+    rmSetGroupingMinDistance(nativeID3, 0.00);
+    rmSetGroupingMaxDistance(nativeID3, 0.00);
+//  rmAddGroupingConstraint(nativeID3, avoidImpassableLand);
+	rmAddGroupingToClass(nativeID3, rmClassID("natives"));
+//  rmAddGroupingToClass(nativeID3, rmClassID("importantItem"));
+//	rmAddGroupingConstraint(nativeID3, avoidNatives);
+	if (cNumberTeams <= 2)
+		rmPlaceGroupingAtLoc(nativeID3, 0, 0.40, 0.50); // 
+	else
+		rmPlaceGroupingAtLoc(nativeID3, 0, 0.40, 0.62); //
+	
+	// ******************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.50);
+	
+	// ************************************ PLAYER STARTING RESOURCES ***************************************
+
+	// ******** Define ********
+
+	// Town center & units
+	int TCID = rmCreateObjectDef("player TC");
+	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
+	if (rmGetNomadStart())
+	{
+		rmAddObjectDefItem(TCID, "CoveredWagon", 1, 0.0);
+	}
+	else
+	{
+	rmAddObjectDefItem(TCID, "TownCenter", 1, 0.0);
+	rmAddObjectDefToClass(TCID, classStartingResource);
+	}
+	rmSetObjectDefMinDistance(TCID, 0.0);
+	rmSetObjectDefMaxDistance(TCID, 0.0);
+	
+	// Starting mines
+	int playergoldID = rmCreateObjectDef("player mine");
+	rmAddObjectDefItem(playergoldID, "minetin", 1, 0);
+	rmSetObjectDefMinDistance(playergoldID, 12.0);
+	rmSetObjectDefMaxDistance(playergoldID, 14.0);
+	rmAddObjectDefToClass(playergoldID, classStartingResource);
+	rmAddObjectDefToClass(playergoldID, classGold);
+	rmAddObjectDefConstraint(playergoldID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playergoldID, avoidNatives);
+	rmAddObjectDefConstraint(playergoldID, avoidStartingResources);
+	
+	// 2nd mine
+	int playergold2ID = rmCreateObjectDef("player second mine");
+	rmAddObjectDefItem(playergold2ID, "minetin", 1, 0);
+	rmSetObjectDefMinDistance(playergold2ID, 40.0); //58
+	rmSetObjectDefMaxDistance(playergold2ID, 42.0); //62
+	rmAddObjectDefToClass(playergold2ID, classStartingResource);
+	rmAddObjectDefToClass(playergold2ID, classGold);
+	rmAddObjectDefConstraint(playergold2ID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playergold2ID, avoidCliffMed);
+	rmAddObjectDefConstraint(playergold2ID, avoidNatives);
+	rmAddObjectDefConstraint(playergold2ID, avoidGoldTypeFar);
+	rmAddObjectDefConstraint(playergold2ID, avoidStartingResources);
+	rmAddObjectDefConstraint(playergold2ID, avoidCenter);
+	
+	// Starting berries
+	int playerberriesID = rmCreateObjectDef("player berries");
+	rmAddObjectDefItem(playerberriesID, "berrybush", 4, 4.0);
+	rmSetObjectDefMinDistance(playerberriesID, 12.0);
+	rmSetObjectDefMaxDistance(playerberriesID, 14.0);
+	rmAddObjectDefToClass(playerberriesID, classStartingResource);
+	rmAddObjectDefConstraint(playerberriesID, avoidTradeRoute);
+	rmAddObjectDefConstraint(playerberriesID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerberriesID, avoidNatives);
+	rmAddObjectDefConstraint(playerberriesID, avoidStartingResources);
+	
+	// Starting trees
+	int playerTreeID = rmCreateObjectDef("player trees");
+	rmAddObjectDefItem(playerTreeID, "TreeRockies", rmRandInt(5,5), 5.0);
+    rmSetObjectDefMinDistance(playerTreeID, 12);
+    rmSetObjectDefMaxDistance(playerTreeID, 16);
+	rmAddObjectDefToClass(playerTreeID, classStartingResource);
+	rmAddObjectDefToClass(playerTreeID, classForest);
+	rmAddObjectDefConstraint(playerTreeID, avoidForestShort);
+    rmAddObjectDefConstraint(playerTreeID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerTreeID, avoidStartingResourcesShort);
+	rmAddObjectDefConstraint(playerTreeID, avoidPlateau1);
+	rmAddObjectDefConstraint(playerTreeID, avoidPlateau2);
+			
+	// Starting herd
+	int playerherdID = rmCreateObjectDef("starting herd");
+	rmAddObjectDefItem(playerherdID, "bighornsheep", rmRandInt(10,10), 7.0);
+	rmSetObjectDefMinDistance(playerherdID, 19.0);
+	rmSetObjectDefMaxDistance(playerherdID, 20.0);
+	rmSetObjectDefCreateHerd(playerherdID, true);
+	rmAddObjectDefToClass(playerherdID, classStartingResource);
+	rmAddObjectDefConstraint(playerherdID, avoidImpassableLand);
+	rmAddObjectDefConstraint(playerherdID, avoidNatives);
+	rmAddObjectDefConstraint(playerherdID, avoidStartingResourcesShort);
+		
+	// 2nd herd
+	int playerherd2ID = rmCreateObjectDef("2nd herd");
+    rmAddObjectDefItem(playerherd2ID, "bighornsheep", rmRandInt(6,6), 5.0);
+    rmSetObjectDefMinDistance(playerherd2ID, 45);
+    rmSetObjectDefMaxDistance(playerherd2ID, 46);
+	rmAddObjectDefToClass(playerherd2ID, classStartingResource);
+	rmSetObjectDefCreateHerd(playerherd2ID, true);
+	rmAddObjectDefConstraint(playerherd2ID, avoidElk); //Short
+	rmAddObjectDefConstraint(playerherd2ID, avoidImpassableLandShort);
+	rmAddObjectDefConstraint(playerherd2ID, avoidNatives);
+	rmAddObjectDefConstraint(playerherd2ID, avoidStartingResources);
+	rmAddObjectDefConstraint(playerherd2ID, avoidCliffMed);
+	
+/*	// 3nd herd
+	int playerherd3ID = rmCreateObjectDef("3nd herd");
+    rmAddObjectDefItem(playerherd3ID, "pronghorn", rmRandInt(7,7), 5.0);
+    rmSetObjectDefMinDistance(playerherd3ID, 45);
+    rmSetObjectDefMaxDistance(playerherd3ID, 48);
+	rmAddObjectDefToClass(playerherd3ID, classStartingResource);
+	rmSetObjectDefCreateHerd(playerherd3ID, true);
+	rmAddObjectDefConstraint(playerherd3ID, avoidRhea); //Short
+	rmAddObjectDefConstraint(playerherd3ID, avoidElk);
+	rmAddObjectDefConstraint(playerherd3ID, avoidImpassableLandShort);
+	rmAddObjectDefConstraint(playerherd3ID, avoidNatives);
+	rmAddObjectDefConstraint(playerherd3ID, avoidStartingResources);
+*/
+	
+	// Starting treasures
+	int playerNuggetID = rmCreateObjectDef("player nugget"); 
+	rmAddObjectDefItem(playerNuggetID, "Nugget", 1, 0.0);
+	rmSetNuggetDifficulty(1, 1);
+	rmSetObjectDefMinDistance(playerNuggetID, 24.0);
+	rmSetObjectDefMaxDistance(playerNuggetID, 26.0);
+	rmAddObjectDefToClass(playerNuggetID, classStartingResource);
+	rmAddAreaConstraint(playerNuggetID, avoidGoldTypeMin);
+	rmAddObjectDefConstraint(playerNuggetID, avoidImpassableLandShort);
+	rmAddObjectDefConstraint(playerNuggetID, avoidNatives);
+	rmAddObjectDefConstraint(playerNuggetID, avoidStartingResources);
+//	rmAddObjectDefConstraint(playerNuggetID, avoidNuggetShort);
+	rmAddObjectDefConstraint(playerNuggetID, avoidCliffMed);
+		
+	// ******** Place ********
+	
+	for(i=1; <cNumberPlayers)
+	{
+		rmPlaceObjectDefAtLoc(TCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(TCID, i));
+
+		rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playergoldID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playergold2ID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerberriesID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerTreeID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerherdID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerherd2ID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		rmPlaceObjectDefAtLoc(playerNuggetID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+				
+		if(ypIsAsian(i) && rmGetNomadStart() == false)
+		rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+		vector closestPoint = rmFindClosestPointVector(TCLoc, rmXFractionToMeters(1.0));
+	}
+
+	// ************************************************************************************************
+	
+	// Text
+	rmSetStatusText("",0.60);
+	
+	// ************************************** COMMON RESOURCES ****************************************
+  
+   
+	// ********** Mines ***********
+	
+		int goldcount = 3*cNumberNonGaiaPlayers;  //
+
+	//Mines
+	for(i=0; < goldcount)
+	{
+		int goldID = rmCreateObjectDef("gold"+i);
+		rmAddObjectDefItem(goldID, "Minetin", 1, 0.0);
+		rmSetObjectDefMinDistance(goldID, rmXFractionToMeters(0.10));
+		rmSetObjectDefMaxDistance(goldID, rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(goldID, classGold);
+		rmAddObjectDefConstraint(goldID, avoidImpassableLandFar);
+		rmAddObjectDefConstraint(goldID, avoidNatives);
+		rmAddObjectDefConstraint(goldID, avoidGoldFar);
+		rmAddObjectDefConstraint(goldID, avoidTownCenterFar);
+		rmAddObjectDefConstraint(goldID, avoidCliffFar);
+		rmAddObjectDefConstraint(goldID, avoidEdge);
+		rmPlaceObjectDefAtLoc(goldID, 0, 0.50, 0.50);
+	}
+		
+	// ****************************
+	
+	// Text
+	rmSetStatusText("",0.70);
+	
+	// ********** Forest **********
+	
+	// Lake forest
+	int lakeforestcount = 4;
+	int stayInLakeForest = -1;
+	
+	for (i=0; < lakeforestcount)
+	{
+		int lakeforestID = rmCreateArea("lake forest"+i);
+		rmSetAreaWarnFailure(lakeforestID, false);
+		rmSetAreaSize(lakeforestID, rmAreaTilesToFraction(110), rmAreaTilesToFraction(120));
+//		rmSetAreaTerrainType(lakeforestID, "pampas\groundforest_pam");
+		if (i < 2)
+			rmSetAreaTerrainType(lakeforestID, "great_lakes\ground_grass2_gl");
+		rmSetAreaObeyWorldCircleConstraint(lakeforestID, false);
+		rmSetAreaMinBlobs(lakeforestID, 1);
+		rmSetAreaMaxBlobs(lakeforestID, 5);
+		rmSetAreaMinBlobDistance(lakeforestID, 16.0);
+		rmSetAreaMaxBlobDistance(lakeforestID, 40.0);
+		rmSetAreaCoherence(lakeforestID, 0.0);
+		rmSetAreaSmoothDistance(lakeforestID, 5);
+		rmAddAreaToClass(lakeforestID, classForest);
+		rmAddAreaConstraint(lakeforestID, avoidForestShort);
+		rmAddAreaConstraint(lakeforestID, avoidGoldTypeMin);
+		rmAddAreaConstraint(lakeforestID, avoidNatives);
+		rmAddAreaConstraint(lakeforestID, avoidImpassableLandMin);
+		rmAddAreaConstraint(lakeforestID, avoidCliffMin);
+		if (cNumberTeams <= 2)
+		{
+			if (i==0 || i==2)
+				rmAddAreaConstraint(lakeforestID, stayNearLake1);
+			else
+				rmAddAreaConstraint(lakeforestID, stayNearLake2);
+			if (i == 0)	
+				rmAddAreaConstraint(lakeforestID, stayInPlateau1);
+			else if (i == 1)
+				rmAddAreaConstraint(lakeforestID, stayInPlateau2);
+			if ( i >= 2)
+			{
+				rmAddAreaConstraint(lakeforestID, avoidPlateau1);
+				rmAddAreaConstraint(lakeforestID, avoidPlateau2);
+			}
+		}
+		else
+		{
+			rmAddAreaConstraint(lakeforestID, stayNearLake3);
+			if (i <= 2)	
+					rmAddAreaConstraint(lakeforestID, stayInPlateau3);
+			else 	
+				rmAddAreaConstraint(lakeforestID, avoidPlateau3);
+		}
+	
+			
+		rmBuildArea(lakeforestID);
+		
+		stayInLakeForest = rmCreateAreaMaxDistanceConstraint("stay in lake forest"+i, lakeforestID, 0);
+		
+		for (j=0; < rmRandInt(10,12)) // 20,22
+		{
+			int lakeforesttreeID = rmCreateObjectDef("lake forest trees"+i+j);
+			if (i < 2)
+				rmAddObjectDefItem(lakeforesttreeID, "TreeRockiesSnow", rmRandInt(2,3), 3.0);
+			else
+				rmAddObjectDefItem(lakeforesttreeID, "TreeRockies", rmRandInt(2,3), 3.0);
+			rmSetObjectDefMinDistance(lakeforesttreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(lakeforesttreeID,  rmXFractionToMeters(0.5));
+			rmAddObjectDefToClass(lakeforesttreeID, classForest);
+		//	rmAddObjectDefConstraint(lakeforesttreeID, avoidForestShort);
+			rmAddObjectDefConstraint(lakeforesttreeID, avoidImpassableLandMin);
+			rmAddObjectDefConstraint(lakeforesttreeID, stayInLakeForest);	
+			rmPlaceObjectDefAtLoc(lakeforesttreeID, 0, 0.50, 0.50);
+		}
+		
+	}
+	
+	
+	// Plateau forest
+	int plateauforestcount = 4*cNumberNonGaiaPlayers;
+	int stayInPlateauForest = -1;
+	
+	for (i=0; < plateauforestcount)
+	{
+		int plateauforestID = rmCreateArea("plateau forest"+i);
+		rmSetAreaWarnFailure(plateauforestID, false);
+		rmSetAreaSize(plateauforestID, rmAreaTilesToFraction(110), rmAreaTilesToFraction(120));
+//		rmSetAreaTerrainType(plateauforestID, "pampas\groundforest_pam");
+		rmSetAreaTerrainType(plateauforestID, "great_lakes\ground_grass2_gl");
+		rmSetAreaObeyWorldCircleConstraint(plateauforestID, false);
+		rmSetAreaMinBlobs(plateauforestID, 1);
+		rmSetAreaMaxBlobs(plateauforestID, 5);
+		rmSetAreaMinBlobDistance(plateauforestID, 16.0);
+		rmSetAreaMaxBlobDistance(plateauforestID, 40.0);
+		rmSetAreaCoherence(plateauforestID, 0.0);
+		rmSetAreaSmoothDistance(plateauforestID, 5);
+		rmAddAreaToClass(plateauforestID, classForest);
+		rmAddAreaConstraint(plateauforestID, avoidForest);
+		rmAddAreaConstraint(plateauforestID, avoidGoldTypeMin);
+		rmAddAreaConstraint(plateauforestID, avoidStartingResources);
+		rmAddAreaConstraint(plateauforestID, avoidNatives);
+		rmAddAreaConstraint(plateauforestID, avoidImpassableLandMin);
+		rmAddAreaConstraint(plateauforestID, avoidCliffMin);
+		rmAddAreaConstraint(plateauforestID, avoidTownCenter);
+		if (cNumberTeams <= 2)
+		{
+			if (i < plateauforestcount/2)	
+				rmAddAreaConstraint(plateauforestID, stayInPlateau1);
+			else 
+				rmAddAreaConstraint(plateauforestID, stayInPlateau2);
+		}
+		else
+			rmAddAreaConstraint(plateauforestID, stayInPlateau3);
+			
+		rmBuildArea(plateauforestID);
+		
+		stayInPlateauForest = rmCreateAreaMaxDistanceConstraint("stay in plateau forest"+i, plateauforestID, 0);
+		
+		for (j=0; < rmRandInt(9,10)) // 20,22
+		{
+			int plateauforesttreeID = rmCreateObjectDef("plateau forest trees"+i+j);
+			rmAddObjectDefItem(plateauforesttreeID, "TreeRockiesSnow", rmRandInt(2,3), 3.0);
+			rmSetObjectDefMinDistance(plateauforesttreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(plateauforesttreeID,  rmXFractionToMeters(0.5));
+			rmAddObjectDefToClass(plateauforesttreeID, classForest);
+		//	rmAddObjectDefConstraint(plateauforesttreeID, avoidForestShort);
+			rmAddObjectDefConstraint(plateauforesttreeID, avoidImpassableLandMin);
+			rmAddObjectDefConstraint(plateauforesttreeID, stayInPlateauForest);	
+			rmPlaceObjectDefAtLoc(plateauforesttreeID, 0, 0.50, 0.50);
+		}
+		
+	}
+	
+	// Valley forest
+	int valleyforestcount = 3*cNumberNonGaiaPlayers;
+	int stayInValleyForest = -1;
+	
+	for (i=0; < valleyforestcount)
+	{
+		int valleyforestID = rmCreateArea("valley forest"+i);
+		rmSetAreaWarnFailure(valleyforestID, false);
+		rmSetAreaSize(valleyforestID, rmAreaTilesToFraction(110), rmAreaTilesToFraction(120));
+//		rmSetAreaTerrainType(valleyforestID, "pampas\groundforest_pam");
+		rmSetAreaObeyWorldCircleConstraint(valleyforestID, false);
+		rmSetAreaMinBlobs(valleyforestID, 1);
+		rmSetAreaMaxBlobs(valleyforestID, 5);
+		rmSetAreaMinBlobDistance(valleyforestID, 16.0);
+		rmSetAreaMaxBlobDistance(valleyforestID, 35.0);
+		rmSetAreaCoherence(valleyforestID, 0.0);
+		rmSetAreaSmoothDistance(valleyforestID, 5);
+		rmAddAreaToClass(valleyforestID, classForest);
+		rmAddAreaConstraint(valleyforestID, avoidForest);
+		rmAddAreaConstraint(valleyforestID, avoidGoldTypeMin);
+		rmAddAreaConstraint(valleyforestID, avoidStartingResourcesShort);
+		rmAddAreaConstraint(valleyforestID, avoidNativesFar);
+		rmAddAreaConstraint(valleyforestID, avoidImpassableLandMin);
+		rmAddAreaConstraint(valleyforestID, avoidCliffMin);
+		rmAddAreaConstraint(valleyforestID, avoidTownCenter);
+		if (cNumberTeams <= 2)
+		{
+			rmAddAreaConstraint(valleyforestID, avoidPlateau1);
+			rmAddAreaConstraint(valleyforestID, avoidPlateau2);
+		}
+		else
+			rmAddAreaConstraint(valleyforestID, avoidPlateau3);
+			
+		rmBuildArea(valleyforestID);
+		
+		stayInValleyForest = rmCreateAreaMaxDistanceConstraint("stay in valley forest"+i, valleyforestID, 0);
+		
+		for (j=0; < rmRandInt(9,10)) // 20,22
+		{
+			int valleyforesttreeID = rmCreateObjectDef("valley forest trees"+i+j);
+			rmAddObjectDefItem(valleyforesttreeID, "TreeRockies", rmRandInt(2,3), 3.0);
+			rmSetObjectDefMinDistance(valleyforesttreeID,  rmXFractionToMeters(0.0));
+			rmSetObjectDefMaxDistance(valleyforesttreeID,  rmXFractionToMeters(0.5));
+			rmAddObjectDefToClass(valleyforesttreeID, classForest);
+		//	rmAddObjectDefConstraint(valleyforesttreeID, avoidForestShort);
+			rmAddObjectDefConstraint(valleyforesttreeID, avoidImpassableLandMin);
+			rmAddObjectDefConstraint(valleyforesttreeID, stayInValleyForest);	
+			rmPlaceObjectDefAtLoc(valleyforesttreeID, 0, 0.50, 0.50);
+		}
+		
+	}
+		
+	// ********************************
+	
+	// Text
+	rmSetStatusText("",0.80);
+	
+	// ************ Herds *************
+
+	//Elk herds
+	int herdcount = 3*cNumberNonGaiaPlayers;
+	
+	for(i=0; < herdcount)
+	{
+		int elkherdID = rmCreateObjectDef("elk herd"+i);
+		rmAddObjectDefItem(elkherdID, "pronghorn", rmRandInt(6,6), 5.0);
+		rmSetObjectDefMinDistance(elkherdID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(elkherdID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(elkherdID, true);
+		rmAddObjectDefConstraint(elkherdID, avoidImpassableLand);
+		rmAddObjectDefConstraint(elkherdID, avoidNatives);
+		rmAddObjectDefConstraint(elkherdID, avoidGoldTypeShort);
+		rmAddObjectDefConstraint(elkherdID, avoidForestMin);
+		rmAddObjectDefConstraint(elkherdID, avoidCliffFar);
+		rmAddObjectDefConstraint(elkherdID, avoidTownCenterFar);
+		rmAddObjectDefConstraint(elkherdID, avoidElkFar);
+		rmAddObjectDefConstraint(elkherdID, avoidEdge);
+		rmPlaceObjectDefAtLoc(elkherdID, 0, 0.50, 0.50);
+	}
+
+	// ********************************
+	
+	// ************ Berries *************
+	
+	//Berries
+	int berriescount = 3*cNumberNonGaiaPlayers;
+	
+	for(i=0; < berriescount)
+	{
+		int berriesID = rmCreateObjectDef("berries"+i);
+		rmAddObjectDefItem(berriesID, "berrybush", rmRandInt(4,4), 5.0);
+		rmSetObjectDefMinDistance(berriesID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(berriesID, rmXFractionToMeters(0.5));
+		rmSetObjectDefCreateHerd(berriesID, true);
+		rmAddObjectDefConstraint(berriesID, avoidImpassableLand);
+		rmAddObjectDefConstraint(berriesID, avoidNatives);
+		rmAddObjectDefConstraint(berriesID, avoidGoldTypeShort);
+		rmAddObjectDefConstraint(berriesID, avoidForestMin);
+		rmAddObjectDefConstraint(berriesID, avoidCliffFar);
+		rmAddObjectDefConstraint(berriesID, avoidTownCenterFar);
+		rmAddObjectDefConstraint(berriesID, avoidElkShort);
+		rmAddObjectDefConstraint(berriesID, avoidBerriesFar);
+		rmAddObjectDefConstraint(berriesID, avoidEdge);
+		rmPlaceObjectDefAtLoc(berriesID, 0, 0.50, 0.50);
+	}
+
+	// ********************************
+	
+	
+	// Random tree clumps
+	for (i=0; < 4+cNumberNonGaiaPlayers)
+	{
+		int randomtreeID = rmCreateObjectDef("random tree"+i);
+		rmAddObjectDefItem(randomtreeID, "TreeRockies", rmRandInt(3,5), 4.0);
+		rmSetObjectDefMinDistance(randomtreeID,  rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randomtreeID,  rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(randomtreeID, classForest);
+		rmAddObjectDefConstraint(randomtreeID, avoidForestShort);
+		rmAddObjectDefConstraint(randomtreeID, avoidNatives);
+		rmAddObjectDefConstraint(randomtreeID, avoidGoldTypeMin);
+		rmAddObjectDefConstraint(randomtreeID, avoidElkMin);
+		rmAddObjectDefConstraint(randomtreeID, avoidBerriesMin);
+		rmAddObjectDefConstraint(randomtreeID, avoidImpassableLandShort);
+		rmAddObjectDefConstraint(randomtreeID, avoidStartingResourcesShort);
+		if (cNumberTeams <= 2)
+		{
+			rmAddObjectDefConstraint(randomtreeID, avoidPlateau1);	
+			rmAddObjectDefConstraint(randomtreeID, avoidPlateau2);	
+		}
+		else
+			rmAddObjectDefConstraint(randomtreeID, avoidPlateau3);	
+		rmAddObjectDefConstraint(randomtreeID, avoidTownCenter);
+		rmPlaceObjectDefAtLoc(randomtreeID, 0, 0.50, 0.50);
+	}
+	
+	// ********************************
+	
+	// Text
+	rmSetStatusText("",0.90);
+
+	// ********** Treasures ***********
+	
+	// Treasures 	
+	int NuggetID = rmCreateObjectDef("Nugget"); 
+	rmAddObjectDefItem(NuggetID, "Nugget", 1, 0.0);
+	rmSetObjectDefMinDistance(NuggetID, 0);
+    rmSetObjectDefMaxDistance(NuggetID, rmXFractionToMeters(0.5));
+	rmSetNuggetDifficulty(1,3);
+	rmAddObjectDefConstraint(NuggetID, avoidNugget);
+	rmAddObjectDefConstraint(NuggetID, avoidNatives);
+	rmAddObjectDefConstraint(NuggetID, avoidCliffFar);
+	rmAddObjectDefConstraint(NuggetID, avoidImpassableLand);
+	rmAddObjectDefConstraint(NuggetID, avoidGoldTypeMin);
+	rmAddObjectDefConstraint(NuggetID, avoidElkMin);
+	rmAddObjectDefConstraint(NuggetID, avoidBerriesMin);	
+	rmAddObjectDefConstraint(NuggetID, avoidForestMin);	
+	rmAddObjectDefConstraint(NuggetID, avoidTownCenterFar);
+	rmAddObjectDefConstraint(NuggetID, avoidNatives); 
+	rmAddObjectDefConstraint(NuggetID, avoidEdge);
+	
+	int nuggetcount = 6*cNumberNonGaiaPlayers;
+	
+	for (i=0; < nuggetcount)
+	{
+		rmPlaceObjectDefAtLoc(NuggetID, 0, 0.50, 0.50);
+	}
+		
+	// ********************************
+	
+	//Fish
+	int fishID = rmCreateObjectDef("fish");
+	rmAddObjectDefItem(fishID, "Fishsalmon", rmRandInt(2,2), 8.0);
+	rmSetObjectDefMinDistance(fishID, 0.0);
+	rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(fishID, avoidFish);
+	rmAddObjectDefConstraint(fishID, avoidLand);
+	rmAddObjectDefConstraint(fishID, avoidEdge);
+
+	
+	for (i=0; < 2+cNumberNonGaiaPlayers/2)
+	{
+		if (cNumberTeams <= 2)
+		{
+			rmPlaceObjectDefAtLoc(fishID, 0, 1.00, 0.70);
+			rmPlaceObjectDefAtLoc(fishID, 0, 0.00, 0.30);
+		}
+		else
+		{
+			rmPlaceObjectDefAtLoc(fishID, 0, 1.00, 0.50);
+			rmPlaceObjectDefAtLoc(fishID, 0, 1.00, 0.50);
+		}
+	}
+	
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.5;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+	// Text
+	rmSetStatusText("",1.00);
+	
+
+
+	
+} //END
+	
+	
\ No newline at end of file
diff --git a/RMM/Sahara.xml b/RMM/Sahara.xml
new file mode 100644
index 0000000..d4e24a7
--- /dev/null
+++ b/RMM/Sahara.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo
+imagepath = "ui\random_map\africa\sahara"
+displayNameID = "130087"
+details = "130088"
+loadDetails = "130089"
+loadBackground="ui\random_map\africa\sahara\sahara_map">
+   <loadss>ui\random_map\africa\sahara\sahara_ss_01</loadss>
+   <loadss>ui\random_map\africa\sahara\sahara_ss_02</loadss>
+   <loadss>ui\random_map\africa\sahara\sahara_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/Sahara.xs b/RMM/Sahara.xs
new file mode 100644
index 0000000..7cdd298
--- /dev/null
+++ b/RMM/Sahara.xs
@@ -0,0 +1,614 @@
+// RM script of Sahara
+// For K&B mod
+// By AOE_Fan
+// TAD-compatible version!
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+void main(void)
+{
+   // Text
+   // Make the loading bar move
+   rmSetStatusText("",0.01);
+
+
+   // Chooses the 3 natives - Sudanese or Berbers randomly
+
+   int nativeInt1 = rmRandInt(1,2);
+   int nativeInt2 = rmRandInt(1,2);
+   int nativeInt3 = rmRandInt(1,2);
+
+   // Native 1
+   if (nativeInt1 == 1)
+      rmSetSubCiv(0, "Aztecs");
+   else
+      rmSetSubCiv(0, "Aztecs");
+
+   // Native 2
+   if (nativeInt2 == 1) 
+      rmSetSubCiv(1, "Sufi");
+   else
+      rmSetSubCiv(1, "Sufi");
+
+   // Native 3
+   if (nativeInt3 == 1) 
+      rmSetSubCiv(2, "Aztecs");
+   else
+      rmSetSubCiv(2, "Aztecs");
+
+
+   // Picks the map size
+   int playerTiles = 12000;
+   if (cNumberNonGaiaPlayers > 4)
+      playerTiles = 11000;
+   if (cNumberNonGaiaPlayers > 6)
+      playerTiles = 9000;
+
+
+   int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+   rmEchoInfo("Map size="+size+"m x "+size+"m");
+   rmSetMapSize(size, size);
+
+
+   // Chooses if 3rd native starts from north or south
+   int native3Place = rmRandInt(1,2);
+
+
+   // Set map the map smoothness
+   rmSetMapElevationHeightBlend(1);
+
+
+   // Chooses the side where teams start in team games
+   int teamSide = rmRandInt(1,4);
+
+
+   // Picks a default water height
+   rmSetSeaLevel(0.0);
+
+
+   // Pick lighting
+   rmSetLightingSet("3x01a_newengland");
+
+
+   // Picks default terrain and map type
+   rmSetMapElevationParameters(cElevTurbulence, 0.08, 4, 0.5, 12.0);
+   rmTerrainInitialize("borneo\shoreline1_borneo", 1.0);
+   rmSetMapType("mongolia");
+   rmSetMapType("grass");
+   rmSetMapType("land");
+
+
+   chooseMercs();
+
+
+   // Corner constraint
+   rmSetWorldCircleConstraint(true);
+
+   // Define classes, these are used for constraints
+   int classPlayer=rmDefineClass("player");
+   int classAnimals=rmDefineClass("animals");
+   int classMines=rmDefineClass("mines");
+   int classRocks=rmDefineClass("rocks");
+   int classForest=rmDefineClass("forest");
+   rmDefineClass("startingUnit");
+   rmDefineClass("nuggets");
+   rmDefineClass("natives");
+   rmDefineClass("classPatch");
+
+
+   // Define constraints - used for things to avoid certain things
+   
+   // Map edge and centre constraints
+   int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+   // 1/4 slice of map constraints
+   int Northward=rmCreatePieConstraint("northMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(20), rmDegreesToRadians(40));
+   int Eastward=rmCreatePieConstraint("eastMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(80), rmDegreesToRadians(150));
+   int Southward=rmCreatePieConstraint("southMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(200), rmDegreesToRadians(220));
+   int Westward=rmCreatePieConstraint("westMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(260), rmDegreesToRadians(330));
+
+   // All player things avoidance
+   int veryLongPlayerConstraint=rmCreateClassDistanceConstraint("nuggets stay away from players very long", classPlayer, 70.0);
+   int longPlayerConstraint=rmCreateClassDistanceConstraint("nuggets stay away from players long", classPlayer, 55.0);
+   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 35.0);
+   int mediumPlayerConstraint=rmCreateClassDistanceConstraint("nuggets stay away from players medium", classPlayer, 40.0);
+   int shortPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players short", classPlayer, 20.0);
+   int shortestPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players shortest", classPlayer, 18.0);
+   int shortAvoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units short", rmClassID("startingUnit"), 12.0);
+   int shortyPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players shortest", classPlayer, 16.0);
+
+   // Resource avoidance
+   int avoidMines=rmCreateClassDistanceConstraint("avoid mines", classMines, 65.0);
+   int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 10.0);
+   int animalConstraint=rmCreateClassDistanceConstraint("avoid all animals", classAnimals, 40.0);
+   int shortAnimalConstraint=rmCreateClassDistanceConstraint("short avoid all animals", classAnimals, 5.0);
+   int avoidRocks=rmCreateClassDistanceConstraint("rocks avoid rocks", classRocks, 100.0);
+   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
+   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 18.0);
+
+   // Avoid impassable land
+   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 6.0);
+
+   // Nugget avoidance
+   int avoidNuggets=rmCreateClassDistanceConstraint("stuff avoids nuggets", rmClassID("nuggets"), 60.0);
+
+   // Native avoidance
+   int avoidNatives=rmCreateClassDistanceConstraint("things avoids natives", rmClassID("natives"), 10.0);
+   int nativesAvoidNatives=rmCreateClassDistanceConstraint("natives avoids natives", rmClassID("natives"), 100.0);
+
+   // Decoration avoidance
+   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
+   int avoidPatch=rmCreateClassDistanceConstraint("patches avoid patches", rmClassID("classPatch"), 2.0);
+
+
+   // Text
+   rmSetStatusText("",0.10);
+
+
+   // Place players - in team and FFA games
+
+   // Player placement if FFA (Free For All) - place players in circle
+   if(cNumberTeams > 2)
+   {
+      rmSetTeamSpacingModifier(0.7);
+      rmPlacePlayersCircular(0.36, 0.36, 0.0);
+   }
+
+   // Player placement if teams - place teams in circle to apart from each other
+   if(cNumberTeams == 2)
+   {
+      rmSetPlacementTeam(0);
+      if (teamSide == 1)
+            rmSetPlacementSection(0.00, 0.25);
+      else if (teamSide == 2)
+            rmSetPlacementSection(0.25, 0.50);
+      else if (teamSide == 3)
+            rmSetPlacementSection(0.50, 0.75);
+      else if (teamSide == 4)
+            rmSetPlacementSection(0.75, 1.00);
+      rmSetTeamSpacingModifier(0.25);
+      rmPlacePlayersCircular(0.36, 0.36, 0.0);
+
+      rmSetPlacementTeam(1);
+      if (teamSide == 1)
+            rmSetPlacementSection(0.50, 0.75);
+      else if (teamSide == 2)
+            rmSetPlacementSection(0.75, 1.00);
+      else if (teamSide == 3)
+            rmSetPlacementSection(0.00, 0.25);
+      else if (teamSide == 4)
+            rmSetPlacementSection(0.25, 0.50);
+      rmSetTeamSpacingModifier(0.25);
+      rmPlacePlayersCircular(0.36, 0.36, 0.0);
+   }
+
+
+   // Text
+   rmSetStatusText("",0.20);
+
+
+   // Define and place players' area, green terrain
+
+   float playerFraction=rmAreaTilesToFraction(1100);
+   for(i=1; <cNumberPlayers)
+   {
+      int id=rmCreateArea("Player"+i);
+      rmSetPlayerArea(i, id);
+      rmSetAreaSize(id, playerFraction, playerFraction);
+      rmAddAreaToClass(id, classPlayer);
+      rmSetAreaTerrainType(id, "borneo\ground_grass5_borneo");
+      rmAddAreaTerrainLayer(id, "borneo\ground_sand3_borneo", 8, 12);
+      rmAddAreaTerrainLayer(id, "borneo\ground_sand2_borneo", 6, 8);
+      rmAddAreaTerrainLayer(id, "borneo\ground_sand1_borneo", 0, 6);
+      rmSetAreaMinBlobs(id, 1);
+      rmSetAreaMaxBlobs(id, 1);
+      rmSetAreaBaseHeight(id, 1);
+      rmSetAreaCoherence(id, 1.0);
+      rmAddAreaConstraint(id, playerConstraint); 
+      rmSetAreaLocPlayer(id, i);
+      rmSetAreaWarnFailure(id, false);
+   }
+
+
+   // Build the areas.
+   rmBuildAllAreas();
+
+
+   // Text
+   rmSetStatusText("",0.30);
+
+
+   // Define and place players' oasis
+
+   for(i=1; <cNumberPlayers) 
+   {
+      int oasisPlayerID=rmCreateArea("Player"+i+"oasis player", rmAreaID("Player"+i));
+      rmSetAreaSize(oasisPlayerID, rmAreaTilesToFraction(100), rmAreaTilesToFraction(150));
+      rmSetAreaWaterType(oasisPlayerID, "texas pond");
+      rmSetAreaBaseHeight(oasisPlayerID, 1);
+      rmSetAreaHeightBlend(oasisPlayerID, 3.0);
+      rmSetAreaMinBlobs(oasisPlayerID, 1);
+      rmSetAreaMaxBlobs(oasisPlayerID, 2);
+      rmSetAreaMinBlobDistance(oasisPlayerID, 10);
+      rmSetAreaMaxBlobDistance(oasisPlayerID, 14);
+      rmAddAreaConstraint(oasisPlayerID, avoidAll);
+      rmSetAreaCoherence(oasisPlayerID, 0.8);
+      rmBuildArea(oasisPlayerID);
+   }
+
+
+   // Define and place "things" to players' oasis
+
+   for(i=1; <cNumberPlayers) 
+   {
+      // Define and place trees to players' oasis
+      int oasisTreesPlayerID=rmCreateObjectDef("oasis trees player"+i);
+      rmAddObjectDefItem(oasisTreesPlayerID, "TreeCaribbean", 4, 6.0);
+      rmSetObjectDefMinDistance(oasisTreesPlayerID, 0);
+      rmSetObjectDefMaxDistance(oasisTreesPlayerID, 6);
+      rmAddObjectDefConstraint(oasisTreesPlayerID, avoidAll);
+      int numTries=30*cNumberNonGaiaPlayers;
+      for (j=0; <numTries) 
+            rmPlaceObjectDefInArea(oasisTreesPlayerID, 0, rmAreaID("Player"+i+"oasis player"));
+
+      // Define and place addax to players' oasis
+      int addaxHerdPlayerID=rmCreateObjectDef("addax herd player"+i);
+      rmAddObjectDefItem(addaxHerdPlayerID, "rhea", 1, 5.0);
+      rmSetObjectDefMinDistance(addaxHerdPlayerID, 2);
+      rmSetObjectDefMaxDistance(addaxHerdPlayerID, 6);
+      rmAddObjectDefToClass(addaxHerdPlayerID, classAnimals);
+      rmAddObjectDefConstraint(addaxHerdPlayerID, shortAnimalConstraint);
+      numTries=6;
+      for (j=0; <numTries)
+            rmPlaceObjectDefInArea(addaxHerdPlayerID, 0, rmAreaID("Player"+i+"oasis player"));
+   }
+
+
+   // Text
+   rmSetStatusText("",0.40);
+
+
+   // Define starting objects and resources
+
+   int startingTCID=rmCreateObjectDef("startingTC");
+   if (rmGetNomadStart())
+      rmAddObjectDefItem(startingTCID, "CoveredWagon", 1, 5.0);
+   else
+      rmAddObjectDefItem(startingTCID, "townCenter", 1, 5.0);
+   rmSetObjectDefMinDistance(startingTCID, 1.0);
+   rmSetObjectDefMaxDistance(startingTCID, 14.0);
+   rmAddObjectDefConstraint(startingTCID, avoidImpassableLand);
+   rmAddObjectDefConstraint(startingTCID, avoidAll);
+   rmAddObjectDefToClass(startingTCID, classPlayer);
+
+   int startingUnits=rmCreateStartingUnitsObjectDef(5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
+   rmSetObjectDefMaxDistance(startingUnits, 16.0);
+   rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
+   rmAddObjectDefConstraint(startingUnits, avoidAll);
+
+   int startBerryID=rmCreateObjectDef("starting berries");
+   rmAddObjectDefItem(startBerryID, "Berrybush", 3, 5.0);
+   rmSetObjectDefMinDistance(startBerryID, 13);
+   rmSetObjectDefMaxDistance(startBerryID, 16);
+   rmAddObjectDefConstraint(startBerryID, avoidStartResource);
+   rmAddObjectDefConstraint(startBerryID, avoidImpassableLand);
+   rmAddObjectDefConstraint(startBerryID, shortAvoidStartingUnits);
+   rmAddObjectDefConstraint(startBerryID, avoidAll);
+
+   int startCopperID=rmCreateObjectDef("player copper");
+   rmAddObjectDefItem(startCopperID, "MineCopper", 1, 5.0);
+   rmSetObjectDefMinDistance(startCopperID, 14);
+   rmSetObjectDefMaxDistance(startCopperID, 30);
+   rmAddObjectDefConstraint(startCopperID, avoidStartResource);
+   rmAddObjectDefConstraint(startCopperID, avoidImpassableLand);
+   rmAddObjectDefConstraint(startCopperID, shortAvoidStartingUnits);
+   rmAddObjectDefConstraint(startCopperID, avoidAll);
+
+   // Place starting objects
+
+   for(i=1; <cNumberPlayers)
+   {					
+      // Place starting objects and resources
+      rmPlaceObjectDefAtLoc(startingTCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	  if(ypIsAsian(i) && rmGetNomadStart() == false)
+         rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i, 1), i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+   }
+
+
+   // Text
+   rmSetStatusText("",0.50);
+
+
+   // Place starting resources, so they avoid oasis
+
+   for(i=1; <cNumberPlayers)
+   {					
+      rmPlaceObjectDefAtLoc(startCopperID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startBerryID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+   }
+
+
+   // Text
+   rmSetStatusText("",0.60);
+
+   
+   // Define and place larger oasis and its "things" to middle
+
+   // Define and place green terrain
+   int oasisTerrainMiddleID=rmCreateArea("oasis terrain middle");
+   rmSetAreaSize(oasisTerrainMiddleID, 0.11, 0.11);
+   rmSetAreaBaseHeight(oasisTerrainMiddleID, 1.0);
+   rmSetAreaLocation(oasisTerrainMiddleID, 0.5, 0.5);
+   rmSetAreaHeightBlend(oasisTerrainMiddleID, 3.0);
+   rmSetAreaTerrainType(oasisTerrainMiddleID, "borneo\ground_grass5_borneo");
+   rmAddAreaTerrainLayer(oasisTerrainMiddleID, "borneo\ground_sand3_borneo", 4, 6);
+   rmAddAreaTerrainLayer(oasisTerrainMiddleID, "borneo\ground_sand2_borneo", 2, 4);
+   rmAddAreaTerrainLayer(oasisTerrainMiddleID, "borneo\ground_sand1_borneo", 0, 2);
+   rmSetAreaCoherence(oasisTerrainMiddleID, 0.9);
+   rmBuildArea(oasisTerrainMiddleID);
+
+   // Define and place the middle oasis itself
+   int oasisMiddleID=rmCreateArea("oasis middle");
+   rmSetAreaSize(oasisMiddleID, 0.05, 0.05);
+   rmSetAreaWaterType(oasisMiddleID, "texas pond");
+   rmSetAreaBaseHeight(oasisMiddleID, 1.0);
+   rmSetAreaLocation(oasisMiddleID, 0.5, 0.5);
+   rmSetAreaHeightBlend(oasisMiddleID, 3.0);
+   rmSetAreaCoherence(oasisMiddleID, 0.8);
+   rmAddAreaConstraint(oasisMiddleID, avoidAll);
+   rmBuildArea(oasisMiddleID);
+
+   // Define and place trees to middle oasis 
+   int oasisTreesMiddleID=rmCreateObjectDef("oasis trees middle");
+   rmAddObjectDefItem(oasisTreesMiddleID, "TreeCaribbean", 4, 8.0);
+   rmSetObjectDefMinDistance(oasisTreesMiddleID, 1);
+   rmSetObjectDefMaxDistance(oasisTreesMiddleID, 10);
+   rmAddObjectDefConstraint(oasisTreesMiddleID, avoidAll);
+   numTries=200;
+   for (i=0; <numTries)
+      rmPlaceObjectDefInArea(oasisTreesMiddleID, 0, rmAreaID("oasis middle"));
+
+   // Define and place ostrich to middle oasis
+   int ostrichHerdID=rmCreateObjectDef("ostrich herd");
+   if (i < 8)
+      rmAddObjectDefItem(ostrichHerdID, "ypWildElephant", rmRandInt(4,5), 5.0);
+   else
+      rmAddObjectDefItem(ostrichHerdID, "Zebra", rmRandInt(4,5), 5.0);
+   rmSetObjectDefCreateHerd(ostrichHerdID, true);
+   rmSetObjectDefMinDistance(ostrichHerdID, rmXFractionToMeters(0.04));
+   rmSetObjectDefMaxDistance(ostrichHerdID, rmXFractionToMeters(0.17));
+   rmAddObjectDefToClass(ostrichHerdID, classAnimals);
+   rmAddObjectDefConstraint(ostrichHerdID, avoidAll);
+   rmAddObjectDefConstraint(ostrichHerdID, animalConstraint);
+   numTries=2*cNumberNonGaiaPlayers;
+   for (i=0; <numTries)
+      rmPlaceObjectDefAtLoc(ostrichHerdID, 0, 0.5, 0.5);
+
+	int fishID=rmCreateObjectDef("fish");
+	rmAddObjectDefItem(fishID, "FishSalmon", 1, 1);
+	rmSetObjectDefMinDistance(fishID, 0.0);
+	rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(fishID, fishVsFishID);
+	rmAddObjectDefConstraint(fishID, fishLand);
+   	numTries=20;
+   	for (i=0; <numTries)
+      	rmPlaceObjectDefInArea(fishID, 0, rmAreaID("oasis middle"));
+
+   // Text
+   rmSetStatusText("",0.70);
+
+
+   for (i=0; < 100)   
+   {
+      int grassPatch=rmCreateArea("grass patch "+i);
+      rmSetAreaSize(grassPatch, rmAreaTilesToFraction(20), rmAreaTilesToFraction(40));
+      rmSetAreaTerrainType(grassPatch, "borneo\ground_sand1_borneo");
+      rmAddAreaToClass(grassPatch, rmClassID("classPatch"));
+      rmSetAreaMinBlobs(grassPatch, 1);
+      rmSetAreaMaxBlobs(grassPatch, 5);
+      rmSetAreaMinBlobDistance(grassPatch, 10.0);
+      rmSetAreaMaxBlobDistance(grassPatch, 40.0);
+      rmSetAreaCoherence(grassPatch, 0.0);
+      rmSetAreaSmoothDistance(grassPatch, 10);
+      rmAddAreaConstraint(grassPatch, avoidImpassableLand);
+      rmAddAreaConstraint(grassPatch, avoidPatch);
+      rmAddAreaConstraint(grassPatch, shortestPlayerConstraint);
+      rmBuildArea(grassPatch); 
+   }
+
+
+   // Place the 3 natives, Sudanese or Berbers
+
+   // Native 1
+   int nativeVillageID = -1;
+   int nativeVillageType = rmRandInt(1,5);
+   if (nativeInt1 == 1)
+      nativeVillageID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillageType);
+   else
+      nativeVillageID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillageType);
+   rmSetGroupingMinDistance(nativeVillageID, rmXFractionToMeters(0.15));
+   rmSetGroupingMaxDistance(nativeVillageID, rmXFractionToMeters(0.22));
+   rmAddGroupingConstraint(nativeVillageID, playerConstraint);
+   if(cNumberTeams > 2)
+      rmAddGroupingConstraint(nativeVillageID, nativesAvoidNatives);
+   if(cNumberTeams == 2)
+      rmAddGroupingConstraint(nativeVillageID, Eastward);
+   rmAddGroupingToClass(nativeVillageID, rmClassID("natives"));
+   rmPlaceGroupingAtLoc(nativeVillageID, 0, 0.5, 0.5);
+
+   // Native 2
+   int nativeVillage2ID = -1;
+   int nativeVillage2Type = rmRandInt(1,5);
+   if (nativeInt2 == 1)
+      nativeVillage2ID = rmCreateGrouping("Sufi A", "native sufi mosque mongol "+nativeVillage2Type);
+   else
+      nativeVillage2ID = rmCreateGrouping("Sufi A", "native sufi mosque mongol "+nativeVillage2Type);
+   rmSetGroupingMinDistance(nativeVillage2ID, rmXFractionToMeters(0.15));
+   rmSetGroupingMaxDistance(nativeVillage2ID, rmXFractionToMeters(0.22));
+   rmAddGroupingConstraint(nativeVillage2ID, playerConstraint);
+   if(cNumberTeams > 2)
+      rmAddGroupingConstraint(nativeVillage2ID, nativesAvoidNatives);
+   if(cNumberTeams == 2)
+      rmAddGroupingConstraint(nativeVillage2ID, Westward);
+   rmAddGroupingToClass(nativeVillage2ID, rmClassID("natives"));
+   rmPlaceGroupingAtLoc(nativeVillage2ID, 0, 0.5, 0.5);
+
+   // Native 3
+   int nativeVillage3ID = -1;
+   int nativeVillage3Type = rmRandInt(1,5);
+   if (nativeInt3 == 1)
+      nativeVillage3ID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillage3Type);
+   else
+      nativeVillage3ID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillage3Type);
+   rmSetGroupingMinDistance(nativeVillage3ID, rmXFractionToMeters(0.15));
+   rmSetGroupingMaxDistance(nativeVillage3ID, rmXFractionToMeters(0.22));
+   rmAddGroupingConstraint(nativeVillage3ID, playerConstraint);
+   if(cNumberTeams > 2)
+      rmAddGroupingConstraint(nativeVillage3ID, nativesAvoidNatives);
+   if(cNumberTeams == 2 && native3Place == 1)
+      rmAddGroupingConstraint(nativeVillage3ID, Northward);
+   else if(cNumberTeams == 2 && native3Place == 2)
+      rmAddGroupingConstraint(nativeVillage3ID, Southward);
+   rmAddGroupingToClass(nativeVillage3ID, rmClassID("natives"));
+   rmPlaceGroupingAtLoc(nativeVillage3ID, 0, 0.5, 0.5);
+
+
+   // Text
+   rmSetStatusText("",0.80);
+
+
+   // Define and place mines - gold and copper
+
+   // Gold mines
+
+   int goldCount = 3*cNumberNonGaiaPlayers;
+
+   for(i=0; < goldCount)
+   {
+      int goldID=rmCreateObjectDef("gold mine"+i);
+      rmAddObjectDefItem(goldID, "minegold", 1, 0.0);
+      rmSetObjectDefMinDistance(goldID, rmXFractionToMeters(0.10));
+      rmSetObjectDefMaxDistance(goldID, rmXFractionToMeters(0.47));
+      rmAddObjectDefToClass(goldID, classMines);
+      rmAddObjectDefConstraint(goldID, playerConstraint);
+      rmAddObjectDefConstraint(goldID, avoidMines);
+      rmAddObjectDefConstraint(goldID, avoidNatives);
+      rmPlaceObjectDefAtLoc(goldID, 0, 0.5, 0.5);
+   }
+
+   // Copper mines
+
+   int copperCount = 1*cNumberNonGaiaPlayers;
+
+   for(i=0; < copperCount)
+   {
+      int copperID=rmCreateObjectDef("copper mine"+i);
+      rmAddObjectDefItem(copperID, "MineCopper", 1, 0.0);
+      rmSetObjectDefMinDistance(copperID, rmXFractionToMeters(0.10));
+      rmSetObjectDefMaxDistance(copperID, rmXFractionToMeters(0.47));
+      rmAddObjectDefToClass(copperID, classMines);
+      rmAddObjectDefConstraint(copperID, playerConstraint);
+      rmAddObjectDefConstraint(copperID, avoidMines);
+      rmAddObjectDefConstraint(copperID, avoidNatives);
+      rmPlaceObjectDefAtLoc(copperID, 0, 0.5, 0.5);
+   }
+
+
+   // Text
+   rmSetStatusText("",0.90);
+
+
+   // Define and place treasures
+
+   // Easy treasures
+   int nugget1=rmCreateObjectDef("nugget easy"); 
+   rmAddObjectDefItem(nugget1, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(1, 1);
+   rmAddObjectDefToClass(nugget1, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget1, 20.0);
+   rmSetObjectDefMaxDistance(nugget1, 30.0);
+   rmAddObjectDefConstraint(nugget1, shortPlayerConstraint);
+   rmAddObjectDefConstraint(nugget1, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget1, avoidNuggets);
+   rmAddObjectDefConstraint(nugget1, avoidNatives);
+   rmPlaceObjectDefPerPlayer(nugget1, false, 1);
+
+   // Medium treasures
+   int nugget2=rmCreateObjectDef("nugget medium"); 
+   rmAddObjectDefItem(nugget2, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(2, 2);
+   rmAddObjectDefToClass(nugget2, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget2, 0.0);
+   rmSetObjectDefMaxDistance(nugget2, rmXFractionToMeters(0.47));
+   rmAddObjectDefConstraint(nugget2, mediumPlayerConstraint);
+   rmAddObjectDefConstraint(nugget2, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget2, avoidNuggets);
+   rmAddObjectDefConstraint(nugget2, avoidNatives);
+   rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.5, 2*cNumberNonGaiaPlayers);
+
+   // Hard treasures
+   int nugget3=rmCreateObjectDef("nugget hard"); 
+   rmAddObjectDefItem(nugget3, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(3, 3);
+   rmAddObjectDefToClass(nugget3, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget3, 0.0);
+   rmSetObjectDefMaxDistance(nugget3, rmXFractionToMeters(0.47));
+   rmAddObjectDefConstraint(nugget3, longPlayerConstraint);
+   rmAddObjectDefConstraint(nugget3, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget3, avoidNuggets);
+   rmAddObjectDefConstraint(nugget3, avoidNatives);
+   rmPlaceObjectDefAtLoc(nugget3, 0, 0.5, 0.5, 2*cNumberNonGaiaPlayers);
+
+   // Very hard treasures
+   int nugget4=rmCreateObjectDef("nugget nuts"); 
+   rmAddObjectDefItem(nugget4, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(4, 4);
+   rmAddObjectDefToClass(nugget4, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget4, 0.0);
+   rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.47));
+   rmAddObjectDefConstraint(nugget4, veryLongPlayerConstraint);
+   rmAddObjectDefConstraint(nugget4, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget4, avoidNuggets);
+   rmAddObjectDefConstraint(nugget4, avoidNatives);
+   if (cNumberNonGaiaPlayers <= 4)
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 2);
+   else if (cNumberNonGaiaPlayers >= 5)
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 3);
+   else if (cNumberNonGaiaPlayers >= 7)
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 4);
+
+	// Random trees 
+	for (i=0; < 20*cNumberNonGaiaPlayers)
+	{
+		int randomtreeID = rmCreateObjectDef("random trees "+i);
+		rmAddObjectDefItem(randomtreeID, "TreeSonora", 1, 1);
+		rmSetObjectDefMinDistance(randomtreeID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randomtreeID, rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(randomtreeID, classForest);
+		rmAddObjectDefConstraint(randomtreeID, avoidAll);
+		rmAddObjectDefConstraint(randomtreeID, avoidImpassableLand);
+		rmAddObjectDefConstraint(randomtreeID, shortAvoidStartingUnits);
+		rmAddObjectDefConstraint(randomtreeID, avoidNatives);
+		rmPlaceObjectDefAtLoc(randomtreeID, 0, 0.5, 0.5);
+	}
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.4;
+    float yLoc = 0.4;
+    float walk = 0.03;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+   // Text
+   rmSetStatusText("",1.0);
+}  
diff --git a/RMM/SaharaLarge.xml b/RMM/SaharaLarge.xml
new file mode 100644
index 0000000..2550e1a
--- /dev/null
+++ b/RMM/SaharaLarge.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo
+imagepath = "ui\random_map\africa\sahara"
+displayNameID = "130104"
+details = "130105"
+loadDetails = "130089"
+loadBackground="ui\random_map\africa\sahara\sahara_map">
+   <loadss>ui\random_map\africa\sahara\sahara_ss_01</loadss>
+   <loadss>ui\random_map\africa\sahara\sahara_ss_02</loadss>
+   <loadss>ui\random_map\africa\sahara\sahara_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/SaharaLarge.xs b/RMM/SaharaLarge.xs
new file mode 100644
index 0000000..4e5c3e9
--- /dev/null
+++ b/RMM/SaharaLarge.xs
@@ -0,0 +1,614 @@
+// RM script of Sahara
+// For K&B mod
+// By AOE_Fan
+// TAD-compatible version!
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+void main(void)
+{
+   // Text
+   // Make the loading bar move
+   rmSetStatusText("",0.01);
+
+
+   // Chooses the 3 natives - Sudanese or Berbers randomly
+
+   int nativeInt1 = rmRandInt(1,2);
+   int nativeInt2 = rmRandInt(1,2);
+   int nativeInt3 = rmRandInt(1,2);
+
+   // Native 1
+   if (nativeInt1 == 1)
+      rmSetSubCiv(0, "Aztecs");
+   else
+      rmSetSubCiv(0, "Aztecs");
+
+   // Native 2
+   if (nativeInt2 == 1) 
+      rmSetSubCiv(1, "Sufi");
+   else
+      rmSetSubCiv(1, "Sufi");
+
+   // Native 3
+   if (nativeInt3 == 1) 
+      rmSetSubCiv(2, "Aztecs");
+   else
+      rmSetSubCiv(2, "Aztecs");
+
+
+   // Picks the map size
+   int playerTiles = 20000;
+   if (cNumberNonGaiaPlayers > 4)
+      playerTiles = 18000;
+   if (cNumberNonGaiaPlayers > 6)
+      playerTiles = 16000;
+
+
+   int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+   rmEchoInfo("Map size="+size+"m x "+size+"m");
+   rmSetMapSize(size, size);
+
+
+   // Chooses if 3rd native starts from north or south
+   int native3Place = rmRandInt(1,2);
+
+
+   // Set map the map smoothness
+   rmSetMapElevationHeightBlend(1);
+
+
+   // Chooses the side where teams start in team games
+   int teamSide = rmRandInt(1,4);
+
+
+   // Picks a default water height
+   rmSetSeaLevel(0.0);
+
+
+   // Pick lighting
+   rmSetLightingSet("3x01a_newengland");
+
+
+   // Picks default terrain and map type
+   rmSetMapElevationParameters(cElevTurbulence, 0.08, 4, 0.5, 12.0);
+   rmTerrainInitialize("borneo\shoreline1_borneo", 1.0);
+   rmSetMapType("mongolia");
+   rmSetMapType("grass");
+   rmSetMapType("land");
+
+
+   chooseMercs();
+
+
+   // Corner constraint
+   rmSetWorldCircleConstraint(true);
+
+   // Define classes, these are used for constraints
+   int classPlayer=rmDefineClass("player");
+   int classAnimals=rmDefineClass("animals");
+   int classMines=rmDefineClass("mines");
+   int classRocks=rmDefineClass("rocks");
+   int classForest=rmDefineClass("forest");
+   rmDefineClass("startingUnit");
+   rmDefineClass("nuggets");
+   rmDefineClass("natives");
+   rmDefineClass("classPatch");
+
+
+   // Define constraints - used for things to avoid certain things
+   
+   // Map edge and centre constraints
+   int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+   // 1/4 slice of map constraints
+   int Northward=rmCreatePieConstraint("northMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(20), rmDegreesToRadians(40));
+   int Eastward=rmCreatePieConstraint("eastMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(80), rmDegreesToRadians(150));
+   int Southward=rmCreatePieConstraint("southMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(200), rmDegreesToRadians(220));
+   int Westward=rmCreatePieConstraint("westMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(260), rmDegreesToRadians(330));
+
+   // All player things avoidance
+   int veryLongPlayerConstraint=rmCreateClassDistanceConstraint("nuggets stay away from players very long", classPlayer, 70.0);
+   int longPlayerConstraint=rmCreateClassDistanceConstraint("nuggets stay away from players long", classPlayer, 55.0);
+   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 35.0);
+   int mediumPlayerConstraint=rmCreateClassDistanceConstraint("nuggets stay away from players medium", classPlayer, 40.0);
+   int shortPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players short", classPlayer, 20.0);
+   int shortestPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players shortest", classPlayer, 18.0);
+   int shortAvoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units short", rmClassID("startingUnit"), 12.0);
+   int shortyPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players shortest", classPlayer, 16.0);
+
+   // Resource avoidance
+   int avoidMines=rmCreateClassDistanceConstraint("avoid mines", classMines, 65.0);
+   int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 10.0);
+   int animalConstraint=rmCreateClassDistanceConstraint("avoid all animals", classAnimals, 40.0);
+   int shortAnimalConstraint=rmCreateClassDistanceConstraint("short avoid all animals", classAnimals, 5.0);
+   int avoidRocks=rmCreateClassDistanceConstraint("rocks avoid rocks", classRocks, 100.0);
+   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
+   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 18.0);
+
+   // Avoid impassable land
+   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 6.0);
+
+   // Nugget avoidance
+   int avoidNuggets=rmCreateClassDistanceConstraint("stuff avoids nuggets", rmClassID("nuggets"), 60.0);
+
+   // Native avoidance
+   int avoidNatives=rmCreateClassDistanceConstraint("things avoids natives", rmClassID("natives"), 10.0);
+   int nativesAvoidNatives=rmCreateClassDistanceConstraint("natives avoids natives", rmClassID("natives"), 100.0);
+
+   // Decoration avoidance
+   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
+   int avoidPatch=rmCreateClassDistanceConstraint("patches avoid patches", rmClassID("classPatch"), 2.0);
+
+
+   // Text
+   rmSetStatusText("",0.10);
+
+
+   // Place players - in team and FFA games
+
+   // Player placement if FFA (Free For All) - place players in circle
+   if(cNumberTeams > 2)
+   {
+      rmSetTeamSpacingModifier(0.7);
+      rmPlacePlayersCircular(0.36, 0.36, 0.0);
+   }
+
+   // Player placement if teams - place teams in circle to apart from each other
+   if(cNumberTeams == 2)
+   {
+      rmSetPlacementTeam(0);
+      if (teamSide == 1)
+            rmSetPlacementSection(0.00, 0.25);
+      else if (teamSide == 2)
+            rmSetPlacementSection(0.25, 0.50);
+      else if (teamSide == 3)
+            rmSetPlacementSection(0.50, 0.75);
+      else if (teamSide == 4)
+            rmSetPlacementSection(0.75, 1.00);
+      rmSetTeamSpacingModifier(0.25);
+      rmPlacePlayersCircular(0.36, 0.36, 0.0);
+
+      rmSetPlacementTeam(1);
+      if (teamSide == 1)
+            rmSetPlacementSection(0.50, 0.75);
+      else if (teamSide == 2)
+            rmSetPlacementSection(0.75, 1.00);
+      else if (teamSide == 3)
+            rmSetPlacementSection(0.00, 0.25);
+      else if (teamSide == 4)
+            rmSetPlacementSection(0.25, 0.50);
+      rmSetTeamSpacingModifier(0.25);
+      rmPlacePlayersCircular(0.36, 0.36, 0.0);
+   }
+
+
+   // Text
+   rmSetStatusText("",0.20);
+
+
+   // Define and place players' area, green terrain
+
+   float playerFraction=rmAreaTilesToFraction(1100);
+   for(i=1; <cNumberPlayers)
+   {
+      int id=rmCreateArea("Player"+i);
+      rmSetPlayerArea(i, id);
+      rmSetAreaSize(id, playerFraction, playerFraction);
+      rmAddAreaToClass(id, classPlayer);
+      rmSetAreaTerrainType(id, "borneo\ground_grass5_borneo");
+      rmAddAreaTerrainLayer(id, "borneo\ground_sand3_borneo", 8, 12);
+      rmAddAreaTerrainLayer(id, "borneo\ground_sand2_borneo", 6, 8);
+      rmAddAreaTerrainLayer(id, "borneo\ground_sand1_borneo", 0, 6);
+      rmSetAreaMinBlobs(id, 1);
+      rmSetAreaMaxBlobs(id, 1);
+      rmSetAreaBaseHeight(id, 1);
+      rmSetAreaCoherence(id, 1.0);
+      rmAddAreaConstraint(id, playerConstraint); 
+      rmSetAreaLocPlayer(id, i);
+      rmSetAreaWarnFailure(id, false);
+   }
+
+
+   // Build the areas.
+   rmBuildAllAreas();
+
+
+   // Text
+   rmSetStatusText("",0.30);
+
+
+   // Define and place players' oasis
+
+   for(i=1; <cNumberPlayers) 
+   {
+      int oasisPlayerID=rmCreateArea("Player"+i+"oasis player", rmAreaID("Player"+i));
+      rmSetAreaSize(oasisPlayerID, rmAreaTilesToFraction(100), rmAreaTilesToFraction(150));
+      rmSetAreaWaterType(oasisPlayerID, "texas pond");
+      rmSetAreaBaseHeight(oasisPlayerID, 1);
+      rmSetAreaHeightBlend(oasisPlayerID, 3.0);
+      rmSetAreaMinBlobs(oasisPlayerID, 1);
+      rmSetAreaMaxBlobs(oasisPlayerID, 2);
+      rmSetAreaMinBlobDistance(oasisPlayerID, 10);
+      rmSetAreaMaxBlobDistance(oasisPlayerID, 14);
+      rmAddAreaConstraint(oasisPlayerID, avoidAll);
+      rmSetAreaCoherence(oasisPlayerID, 0.8);
+      rmBuildArea(oasisPlayerID);
+   }
+
+
+   // Define and place "things" to players' oasis
+
+   for(i=1; <cNumberPlayers) 
+   {
+      // Define and place trees to players' oasis
+      int oasisTreesPlayerID=rmCreateObjectDef("oasis trees player"+i);
+      rmAddObjectDefItem(oasisTreesPlayerID, "TreeCaribbean", 4, 6.0);
+      rmSetObjectDefMinDistance(oasisTreesPlayerID, 0);
+      rmSetObjectDefMaxDistance(oasisTreesPlayerID, 6);
+      rmAddObjectDefConstraint(oasisTreesPlayerID, avoidAll);
+      int numTries=30*cNumberNonGaiaPlayers;
+      for (j=0; <numTries) 
+            rmPlaceObjectDefInArea(oasisTreesPlayerID, 0, rmAreaID("Player"+i+"oasis player"));
+
+      // Define and place addax to players' oasis
+      int addaxHerdPlayerID=rmCreateObjectDef("addax herd player"+i);
+      rmAddObjectDefItem(addaxHerdPlayerID, "rhea", 1, 5.0);
+      rmSetObjectDefMinDistance(addaxHerdPlayerID, 2);
+      rmSetObjectDefMaxDistance(addaxHerdPlayerID, 6);
+      rmAddObjectDefToClass(addaxHerdPlayerID, classAnimals);
+      rmAddObjectDefConstraint(addaxHerdPlayerID, shortAnimalConstraint);
+      numTries=6;
+      for (j=0; <numTries)
+            rmPlaceObjectDefInArea(addaxHerdPlayerID, 0, rmAreaID("Player"+i+"oasis player"));
+   }
+
+
+   // Text
+   rmSetStatusText("",0.40);
+
+
+   // Define starting objects and resources
+
+   int startingTCID=rmCreateObjectDef("startingTC");
+   if (rmGetNomadStart())
+      rmAddObjectDefItem(startingTCID, "CoveredWagon", 1, 5.0);
+   else
+      rmAddObjectDefItem(startingTCID, "townCenter", 1, 5.0);
+   rmSetObjectDefMinDistance(startingTCID, 1.0);
+   rmSetObjectDefMaxDistance(startingTCID, 14.0);
+   rmAddObjectDefConstraint(startingTCID, avoidImpassableLand);
+   rmAddObjectDefConstraint(startingTCID, avoidAll);
+   rmAddObjectDefToClass(startingTCID, classPlayer);
+
+   int startingUnits=rmCreateStartingUnitsObjectDef(5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
+   rmSetObjectDefMaxDistance(startingUnits, 16.0);
+   rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
+   rmAddObjectDefConstraint(startingUnits, avoidAll);
+
+   int startBerryID=rmCreateObjectDef("starting berries");
+   rmAddObjectDefItem(startBerryID, "Berrybush", 3, 5.0);
+   rmSetObjectDefMinDistance(startBerryID, 13);
+   rmSetObjectDefMaxDistance(startBerryID, 16);
+   rmAddObjectDefConstraint(startBerryID, avoidStartResource);
+   rmAddObjectDefConstraint(startBerryID, avoidImpassableLand);
+   rmAddObjectDefConstraint(startBerryID, shortAvoidStartingUnits);
+   rmAddObjectDefConstraint(startBerryID, avoidAll);
+
+   int startCopperID=rmCreateObjectDef("player copper");
+   rmAddObjectDefItem(startCopperID, "MineCopper", 1, 5.0);
+   rmSetObjectDefMinDistance(startCopperID, 14);
+   rmSetObjectDefMaxDistance(startCopperID, 30);
+   rmAddObjectDefConstraint(startCopperID, avoidStartResource);
+   rmAddObjectDefConstraint(startCopperID, avoidImpassableLand);
+   rmAddObjectDefConstraint(startCopperID, shortAvoidStartingUnits);
+   rmAddObjectDefConstraint(startCopperID, avoidAll);
+
+   // Place starting objects
+
+   for(i=1; <cNumberPlayers)
+   {					
+      // Place starting objects and resources
+      rmPlaceObjectDefAtLoc(startingTCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	  if(ypIsAsian(i) && rmGetNomadStart() == false)
+         rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i, 1), i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+   }
+
+
+   // Text
+   rmSetStatusText("",0.50);
+
+
+   // Place starting resources, so they avoid oasis
+
+   for(i=1; <cNumberPlayers)
+   {					
+      rmPlaceObjectDefAtLoc(startCopperID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startBerryID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+   }
+
+
+   // Text
+   rmSetStatusText("",0.60);
+
+   
+   // Define and place larger oasis and its "things" to middle
+
+   // Define and place green terrain
+   int oasisTerrainMiddleID=rmCreateArea("oasis terrain middle");
+   rmSetAreaSize(oasisTerrainMiddleID, 0.11, 0.11);
+   rmSetAreaBaseHeight(oasisTerrainMiddleID, 1.0);
+   rmSetAreaLocation(oasisTerrainMiddleID, 0.5, 0.5);
+   rmSetAreaHeightBlend(oasisTerrainMiddleID, 3.0);
+   rmSetAreaTerrainType(oasisTerrainMiddleID, "borneo\ground_grass5_borneo");
+   rmAddAreaTerrainLayer(oasisTerrainMiddleID, "borneo\ground_sand3_borneo", 4, 6);
+   rmAddAreaTerrainLayer(oasisTerrainMiddleID, "borneo\ground_sand2_borneo", 2, 4);
+   rmAddAreaTerrainLayer(oasisTerrainMiddleID, "borneo\ground_sand1_borneo", 0, 2);
+   rmSetAreaCoherence(oasisTerrainMiddleID, 0.9);
+   rmBuildArea(oasisTerrainMiddleID);
+
+   // Define and place the middle oasis itself
+   int oasisMiddleID=rmCreateArea("oasis middle");
+   rmSetAreaSize(oasisMiddleID, 0.05, 0.05);
+   rmSetAreaWaterType(oasisMiddleID, "texas pond");
+   rmSetAreaBaseHeight(oasisMiddleID, 1.0);
+   rmSetAreaLocation(oasisMiddleID, 0.5, 0.5);
+   rmSetAreaHeightBlend(oasisMiddleID, 3.0);
+   rmSetAreaCoherence(oasisMiddleID, 0.8);
+   rmAddAreaConstraint(oasisMiddleID, avoidAll);
+   rmBuildArea(oasisMiddleID);
+
+   // Define and place trees to middle oasis 
+   int oasisTreesMiddleID=rmCreateObjectDef("oasis trees middle");
+   rmAddObjectDefItem(oasisTreesMiddleID, "TreeCaribbean", 4, 8.0);
+   rmSetObjectDefMinDistance(oasisTreesMiddleID, 1);
+   rmSetObjectDefMaxDistance(oasisTreesMiddleID, 10);
+   rmAddObjectDefConstraint(oasisTreesMiddleID, avoidAll);
+   numTries=200;
+   for (i=0; <numTries)
+      rmPlaceObjectDefInArea(oasisTreesMiddleID, 0, rmAreaID("oasis middle"));
+
+   // Define and place ostrich to middle oasis
+   int ostrichHerdID=rmCreateObjectDef("ostrich herd");
+   if (i < 8)
+      rmAddObjectDefItem(ostrichHerdID, "ypWildElephant", rmRandInt(4,5), 5.0);
+   else
+      rmAddObjectDefItem(ostrichHerdID, "Zebra", rmRandInt(4,5), 5.0);
+   rmSetObjectDefCreateHerd(ostrichHerdID, true);
+   rmSetObjectDefMinDistance(ostrichHerdID, rmXFractionToMeters(0.04));
+   rmSetObjectDefMaxDistance(ostrichHerdID, rmXFractionToMeters(0.17));
+   rmAddObjectDefToClass(ostrichHerdID, classAnimals);
+   rmAddObjectDefConstraint(ostrichHerdID, avoidAll);
+   rmAddObjectDefConstraint(ostrichHerdID, animalConstraint);
+   numTries=2*cNumberNonGaiaPlayers;
+   for (i=0; <numTries)
+      rmPlaceObjectDefAtLoc(ostrichHerdID, 0, 0.5, 0.5);
+
+	int fishID=rmCreateObjectDef("fish");
+	rmAddObjectDefItem(fishID, "FishSalmon", 1, 1);
+	rmSetObjectDefMinDistance(fishID, 0.0);
+	rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(fishID, fishVsFishID);
+	rmAddObjectDefConstraint(fishID, fishLand);
+   	numTries=20;
+   	for (i=0; <numTries)
+      	rmPlaceObjectDefInArea(fishID, 0, rmAreaID("oasis middle"));
+
+   // Text
+   rmSetStatusText("",0.70);
+
+
+   for (i=0; < 100)   
+   {
+      int grassPatch=rmCreateArea("grass patch "+i);
+      rmSetAreaSize(grassPatch, rmAreaTilesToFraction(20), rmAreaTilesToFraction(40));
+      rmSetAreaTerrainType(grassPatch, "borneo\ground_sand1_borneo");
+      rmAddAreaToClass(grassPatch, rmClassID("classPatch"));
+      rmSetAreaMinBlobs(grassPatch, 1);
+      rmSetAreaMaxBlobs(grassPatch, 5);
+      rmSetAreaMinBlobDistance(grassPatch, 10.0);
+      rmSetAreaMaxBlobDistance(grassPatch, 40.0);
+      rmSetAreaCoherence(grassPatch, 0.0);
+      rmSetAreaSmoothDistance(grassPatch, 10);
+      rmAddAreaConstraint(grassPatch, avoidImpassableLand);
+      rmAddAreaConstraint(grassPatch, avoidPatch);
+      rmAddAreaConstraint(grassPatch, shortestPlayerConstraint);
+      rmBuildArea(grassPatch); 
+   }
+
+
+   // Place the 3 natives, Sudanese or Berbers
+
+   // Native 1
+   int nativeVillageID = -1;
+   int nativeVillageType = rmRandInt(1,5);
+   if (nativeInt1 == 1)
+      nativeVillageID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillageType);
+   else
+      nativeVillageID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillageType);
+   rmSetGroupingMinDistance(nativeVillageID, rmXFractionToMeters(0.15));
+   rmSetGroupingMaxDistance(nativeVillageID, rmXFractionToMeters(0.22));
+   rmAddGroupingConstraint(nativeVillageID, playerConstraint);
+   if(cNumberTeams > 2)
+      rmAddGroupingConstraint(nativeVillageID, nativesAvoidNatives);
+   if(cNumberTeams == 2)
+      rmAddGroupingConstraint(nativeVillageID, Eastward);
+   rmAddGroupingToClass(nativeVillageID, rmClassID("natives"));
+   rmPlaceGroupingAtLoc(nativeVillageID, 0, 0.5, 0.5);
+
+   // Native 2
+   int nativeVillage2ID = -1;
+   int nativeVillage2Type = rmRandInt(1,5);
+   if (nativeInt2 == 1)
+      nativeVillage2ID = rmCreateGrouping("Sufi A", "native sufi mosque mongol "+nativeVillage2Type);
+   else
+      nativeVillage2ID = rmCreateGrouping("Sufi A", "native sufi mosque mongol "+nativeVillage2Type);
+   rmSetGroupingMinDistance(nativeVillage2ID, rmXFractionToMeters(0.15));
+   rmSetGroupingMaxDistance(nativeVillage2ID, rmXFractionToMeters(0.22));
+   rmAddGroupingConstraint(nativeVillage2ID, playerConstraint);
+   if(cNumberTeams > 2)
+      rmAddGroupingConstraint(nativeVillage2ID, nativesAvoidNatives);
+   if(cNumberTeams == 2)
+      rmAddGroupingConstraint(nativeVillage2ID, Westward);
+   rmAddGroupingToClass(nativeVillage2ID, rmClassID("natives"));
+   rmPlaceGroupingAtLoc(nativeVillage2ID, 0, 0.5, 0.5);
+
+   // Native 3
+   int nativeVillage3ID = -1;
+   int nativeVillage3Type = rmRandInt(1,5);
+   if (nativeInt3 == 1)
+      nativeVillage3ID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillage3Type);
+   else
+      nativeVillage3ID = rmCreateGrouping("Aztec village"+i, "native Aztec village "+nativeVillage3Type);
+   rmSetGroupingMinDistance(nativeVillage3ID, rmXFractionToMeters(0.15));
+   rmSetGroupingMaxDistance(nativeVillage3ID, rmXFractionToMeters(0.22));
+   rmAddGroupingConstraint(nativeVillage3ID, playerConstraint);
+   if(cNumberTeams > 2)
+      rmAddGroupingConstraint(nativeVillage3ID, nativesAvoidNatives);
+   if(cNumberTeams == 2 && native3Place == 1)
+      rmAddGroupingConstraint(nativeVillage3ID, Northward);
+   else if(cNumberTeams == 2 && native3Place == 2)
+      rmAddGroupingConstraint(nativeVillage3ID, Southward);
+   rmAddGroupingToClass(nativeVillage3ID, rmClassID("natives"));
+   rmPlaceGroupingAtLoc(nativeVillage3ID, 0, 0.5, 0.5);
+
+
+   // Text
+   rmSetStatusText("",0.80);
+
+
+   // Define and place mines - gold and copper
+
+   // Gold mines
+
+   int goldCount = 3*cNumberNonGaiaPlayers;
+
+   for(i=0; < goldCount)
+   {
+      int goldID=rmCreateObjectDef("gold mine"+i);
+      rmAddObjectDefItem(goldID, "minegold", 1, 0.0);
+      rmSetObjectDefMinDistance(goldID, rmXFractionToMeters(0.10));
+      rmSetObjectDefMaxDistance(goldID, rmXFractionToMeters(0.47));
+      rmAddObjectDefToClass(goldID, classMines);
+      rmAddObjectDefConstraint(goldID, playerConstraint);
+      rmAddObjectDefConstraint(goldID, avoidMines);
+      rmAddObjectDefConstraint(goldID, avoidNatives);
+      rmPlaceObjectDefAtLoc(goldID, 0, 0.5, 0.5);
+   }
+
+   // Copper mines
+
+   int copperCount = 1*cNumberNonGaiaPlayers;
+
+   for(i=0; < copperCount)
+   {
+      int copperID=rmCreateObjectDef("copper mine"+i);
+      rmAddObjectDefItem(copperID, "MineCopper", 1, 0.0);
+      rmSetObjectDefMinDistance(copperID, rmXFractionToMeters(0.10));
+      rmSetObjectDefMaxDistance(copperID, rmXFractionToMeters(0.47));
+      rmAddObjectDefToClass(copperID, classMines);
+      rmAddObjectDefConstraint(copperID, playerConstraint);
+      rmAddObjectDefConstraint(copperID, avoidMines);
+      rmAddObjectDefConstraint(copperID, avoidNatives);
+      rmPlaceObjectDefAtLoc(copperID, 0, 0.5, 0.5);
+   }
+
+
+   // Text
+   rmSetStatusText("",0.90);
+
+
+   // Define and place treasures
+
+   // Easy treasures
+   int nugget1=rmCreateObjectDef("nugget easy"); 
+   rmAddObjectDefItem(nugget1, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(1, 1);
+   rmAddObjectDefToClass(nugget1, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget1, 20.0);
+   rmSetObjectDefMaxDistance(nugget1, 30.0);
+   rmAddObjectDefConstraint(nugget1, shortPlayerConstraint);
+   rmAddObjectDefConstraint(nugget1, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget1, avoidNuggets);
+   rmAddObjectDefConstraint(nugget1, avoidNatives);
+   rmPlaceObjectDefPerPlayer(nugget1, false, 1);
+
+   // Medium treasures
+   int nugget2=rmCreateObjectDef("nugget medium"); 
+   rmAddObjectDefItem(nugget2, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(2, 2);
+   rmAddObjectDefToClass(nugget2, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget2, 0.0);
+   rmSetObjectDefMaxDistance(nugget2, rmXFractionToMeters(0.47));
+   rmAddObjectDefConstraint(nugget2, mediumPlayerConstraint);
+   rmAddObjectDefConstraint(nugget2, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget2, avoidNuggets);
+   rmAddObjectDefConstraint(nugget2, avoidNatives);
+   rmPlaceObjectDefAtLoc(nugget2, 0, 0.5, 0.5, 2*cNumberNonGaiaPlayers);
+
+   // Hard treasures
+   int nugget3=rmCreateObjectDef("nugget hard"); 
+   rmAddObjectDefItem(nugget3, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(3, 3);
+   rmAddObjectDefToClass(nugget3, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget3, 0.0);
+   rmSetObjectDefMaxDistance(nugget3, rmXFractionToMeters(0.47));
+   rmAddObjectDefConstraint(nugget3, longPlayerConstraint);
+   rmAddObjectDefConstraint(nugget3, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget3, avoidNuggets);
+   rmAddObjectDefConstraint(nugget3, avoidNatives);
+   rmPlaceObjectDefAtLoc(nugget3, 0, 0.5, 0.5, 2*cNumberNonGaiaPlayers);
+
+   // Very hard treasures
+   int nugget4=rmCreateObjectDef("nugget nuts"); 
+   rmAddObjectDefItem(nugget4, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(4, 4);
+   rmAddObjectDefToClass(nugget4, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(nugget4, 0.0);
+   rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.47));
+   rmAddObjectDefConstraint(nugget4, veryLongPlayerConstraint);
+   rmAddObjectDefConstraint(nugget4, avoidImpassableLand);
+   rmAddObjectDefConstraint(nugget4, avoidNuggets);
+   rmAddObjectDefConstraint(nugget4, avoidNatives);
+   if (cNumberNonGaiaPlayers <= 4)
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 2);
+   else if (cNumberNonGaiaPlayers >= 5)
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 3);
+   else if (cNumberNonGaiaPlayers >= 7)
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 4);
+
+	// Random trees 
+	for (i=0; < 25*cNumberNonGaiaPlayers)
+	{
+		int randomtreeID = rmCreateObjectDef("random trees "+i);
+		rmAddObjectDefItem(randomtreeID, "TreeSonora", 1, 1);
+		rmSetObjectDefMinDistance(randomtreeID, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(randomtreeID, rmXFractionToMeters(0.5));
+		rmAddObjectDefToClass(randomtreeID, classForest);
+		rmAddObjectDefConstraint(randomtreeID, avoidAll);
+		rmAddObjectDefConstraint(randomtreeID, avoidImpassableLand);
+		rmAddObjectDefConstraint(randomtreeID, shortAvoidStartingUnits);
+		rmAddObjectDefConstraint(randomtreeID, avoidNatives);
+		rmPlaceObjectDefAtLoc(randomtreeID, 0, 0.5, 0.5);
+	}
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.4;
+    float yLoc = 0.4;
+    float walk = 0.03;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+   // Text
+   rmSetStatusText("",1.0);
+}  
diff --git a/RMM/Savanna Grass.xml b/RMM/Savanna Grass.xml
new file mode 100644
index 0000000..37789e4
--- /dev/null
+++ b/RMM/Savanna Grass.xml	
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo
+imagepath = "ui\random_map\africa\savannah"
+displayNameID = "130090"
+details = "130091"
+loadDetails = "130092"
+loadBackground="ui\random_map\africa\savannah\savannah_map">
+   <loadss>ui\random_map\africa\savannah\savannah_ss_01</loadss>
+   <loadss>ui\random_map\africa\savannah\savannah_ss_02</loadss>
+   <loadss>ui\random_map\africa\savannah\savannah_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/Savanna Grass.xs b/RMM/Savanna Grass.xs
new file mode 100644
index 0000000..426eb55
--- /dev/null
+++ b/RMM/Savanna Grass.xs	
@@ -0,0 +1,395 @@
+/* Durokan's Savanna G- April 17 2016 Version 1.1 */
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+ 
+void main(void) {
+ 
+   // Text
+   // Make the loading bar move
+   rmSetStatusText("",0.01);
+
+   // Picks the map size
+	int playerTiles=11000;
+	if (cNumberNonGaiaPlayers >4)
+		playerTiles = 10000;
+	if (cNumberNonGaiaPlayers >6)
+		playerTiles = 8500;
+
+	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+	rmSetMapSize(size, size);
+
+	rmSetMapType("land");
+        rmSetMapType("grass");
+        rmSetMapType("mongolia");
+        rmTerrainInitialize("texas\ground3_tex");
+        rmSetLightingSet("great plains");
+       
+        rmDefineClass("classForest");
+         rmDefineClass("classCliffy");
+
+        int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+        int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+        int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 50.0);
+        int avoidHerd=rmCreateTypeDistanceConstraint("herds avoid herds", "herdable", 50.0);
+        int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+        int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+        int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+        int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 5.0);
+        int AvoidWaterFar = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 35.0);
+        int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+        int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+        int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 7.0);
+        int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+        int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+        int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+        int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+        int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);  
+        int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0);
+        int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0);
+        int avoidNatives=rmCreateClassDistanceConstraint("things avoids natives", rmClassID("natives"), 5.0);
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);
+       
+		int waterHunt = rmCreateTerrainMaxDistanceConstraint("hunts stay near the water", "land", false, 10.0);
+
+		int avoidCliffy=rmCreateClassDistanceConstraint("objects vs. cliffies", rmClassID("classCliffy"), 10.0);
+
+		  // Player placing  
+  
+ 
+  	int spawnSwitch = rmRandFloat(0,1.2);
+
+		rmPlacePlayersCircular(0.4, 0.4, 0.02);
+		
+        chooseMercs();
+
+   // Text
+   rmSetStatusText("",0.20);
+         
+        int continent2 = rmCreateArea("continent");
+        rmSetAreaSize(continent2, 1.0, 1.0);
+        rmSetAreaLocation(continent2, 0.5, 0.0);
+        rmSetAreaTerrainType(continent2, "texas\ground3_tex");
+        rmSetAreaBaseHeight(continent2, 0.0);
+        rmSetAreaCoherence(continent2, 1.0);
+        rmSetAreaSmoothDistance(continent2, 10);
+        rmSetAreaHeightBlend(continent2, 1);
+        //rmSetAreaEdgeFilling(continent2, 5);
+        rmSetAreaElevationNoiseBias(continent2, 0);
+        rmSetAreaElevationEdgeFalloffDist(continent2, 10);
+        rmSetAreaElevationVariation(continent2, 5);
+        rmSetAreaElevationPersistence(continent2, .2);
+        rmSetAreaElevationOctaves(continent2, 5);
+        rmSetAreaElevationMinFrequency(continent2, 0.04);
+        rmSetAreaElevationType(continent2, cElevTurbulence);  
+        rmBuildArea(continent2);    
+       
+	   
+	    int lakeID9=rmCreateArea("round lake small");
+        rmSetAreaLocation(lakeID9, 0.5, 0.5);
+        rmSetAreaSize(lakeID9, .05, .05);
+        rmSetAreaWaterType(lakeID9, "texas pond");
+        rmSetAreaBaseHeight(lakeID9, 0.0);
+        rmSetAreaCoherence(lakeID9, .86);
+        rmBuildArea(lakeID9);
+       
+        int island = rmCreateArea("island");
+        rmSetAreaSize(island, 0.003, 0.003);
+        rmSetAreaLocation(island, 0.44, 0.56);
+        rmSetAreaTerrainType(island, "texas\ground3_tex");
+        rmSetAreaBaseHeight(island, -.5);
+        rmSetAreaCoherence(island, 0.85);
+        rmBuildArea(island);
+
+        int island2 = rmCreateArea("island2");
+        rmSetAreaSize(island2, 0.003, 0.003);
+        rmSetAreaLocation(island2, 0.56, 0.44);
+        rmSetAreaTerrainType(island2, "texas\ground3_tex");
+        rmSetAreaBaseHeight(island2, -.5);
+        rmSetAreaCoherence(island2, 0.85);
+        rmBuildArea(island2);
+
+        int island3 = rmCreateArea("island3");
+        rmSetAreaSize(island3, 0.01, 0.01);
+        rmSetAreaLocation(island3, 0.5, 0.5);
+        rmSetAreaTerrainType(island3, "texas\ground3_tex");
+        rmSetAreaBaseHeight(island3, 0.0);
+        rmSetAreaCoherence(island3, 0.85);
+        rmBuildArea(island3);
+		
+		for (j=0; < 4) {   
+		int cliffies = rmCreateArea("le balanced cliffies"+j);
+		rmAddAreaToClass(cliffies, rmClassID("classCliffy")); 
+		rmSetAreaSize(cliffies, 0.004, 0.004); 
+		rmSetAreaCliffType(cliffies, "texas");
+		rmSetAreaCliffEdge(cliffies, 1, 1, 0.0, 0.0, 1); 
+		rmSetAreaCliffPainting(cliffies, true, true, true, 1.5, true);
+		rmSetAreaCliffHeight(cliffies, 3, 0.1, 0.5);
+		rmSetAreaCoherence(cliffies, .88);
+		if(j==0){
+		rmSetAreaLocation(cliffies, .3, .3);
+		}else if(j==1){
+		rmSetAreaLocation(cliffies, .7, .7);
+		}else if(j==2){
+		rmSetAreaLocation(cliffies, .7, .3);
+		}else{
+		rmSetAreaLocation(cliffies, .3, .7);
+		}
+  		rmBuildArea(cliffies);	
+		}
+
+		for (j=0; < 4) {   
+		int satelliteLakes=rmCreateArea("satellite lakes"+j);
+        rmSetAreaSize(satelliteLakes, .005, .005);
+        rmSetAreaWaterType(satelliteLakes, "texas pond");
+        rmSetAreaBaseHeight(satelliteLakes, 0.0);
+        rmSetAreaCoherence(satelliteLakes, .86);
+		if(j==0){
+		rmSetAreaLocation(satelliteLakes, 0.5, 0.25);
+		}else if(j==1){
+		rmSetAreaLocation(satelliteLakes, 0.5, 0.75);
+		}else if(j==2){
+		rmSetAreaLocation(satelliteLakes, 0.75, 0.5);
+		}else{
+		rmSetAreaLocation(satelliteLakes, 0.25, 0.5);
+		}
+		rmBuildArea(satelliteLakes);
+		}
+		
+				// Build grassy areas everywhere.  Whee!
+	int numTries=2*cNumberNonGaiaPlayers;
+	for (i=0; <numTries){   
+		int grassyArea=rmCreateArea("grassyArea"+i);
+		rmSetAreaSize(grassyArea, .2, .2);
+		rmSetAreaForestType(grassyArea, "Great Plains grass");
+		rmSetAreaForestDensity(grassyArea, .5);
+		rmSetAreaForestClumpiness(grassyArea, 0.01);
+		rmAddAreaConstraint(grassyArea, avoidNatives);
+		rmBuildArea(grassyArea);
+	}
+		
+		int meows = rmCreateObjectDef("meows");
+        rmAddObjectDefItem(meows, "UnderbrushTexas", 1, 5.0);
+        rmSetObjectDefMinDistance(meows, 0);
+        rmSetObjectDefMaxDistance(meows, 0);
+		rmAddObjectDefConstraint(meows, avoidCliffy);
+		rmSetObjectDefMaxDistance(meows, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(meows, circleConstraint);
+		rmAddObjectDefConstraint(meows, avoidTownCenterMedium);
+		rmAddObjectDefConstraint(meows, avoidHerd);
+		rmPlaceObjectDefAtLoc(meows, 0, 0.5, 0.5, cNumberNonGaiaPlayers*8);
+
+
+   // Text
+   rmSetStatusText("",0.50);
+
+  	//Natives
+		
+	int subCiv0 = -1;
+	subCiv0 = rmGetCivID("Aztecs");
+	rmSetSubCiv(0, "Aztecs");
+	
+	int nativeID0 = -1;
+		
+	nativeID0 = rmCreateGrouping("Jesuit village", "native Aztec village "+4);
+    rmSetGroupingMinDistance(nativeID0, 0.00);
+    rmSetGroupingMaxDistance(nativeID0, 0.00);
+	rmAddGroupingToClass(nativeID0, rmClassID("natives"));
+	rmPlaceGroupingAtLoc(nativeID0, 0, 0.5, 0.5);
+
+
+        int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+        rmSetObjectDefMinDistance(playerStart, 7.0);
+        rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+       
+        int goldID = rmCreateObjectDef("starting gold");
+        rmAddObjectDefItem(goldID, "minegold", 1, 8.0);
+        rmSetObjectDefMinDistance(goldID, 15.0);
+        rmSetObjectDefMaxDistance(goldID, 15.0);
+       
+        int gold2ID = rmCreateObjectDef("starting gold 2");
+        rmAddObjectDefItem(gold2ID, "mine", 1, 16.0);
+        rmSetObjectDefMinDistance(gold2ID, 15.0);
+        rmSetObjectDefMaxDistance(gold2ID, 15.0);
+        rmAddObjectDefConstraint(gold2ID, avoidCoin);
+ 
+        int berryID = rmCreateObjectDef("starting berries");
+        rmAddObjectDefItem(berryID, "BerryBush", 2, 6.0);
+        rmSetObjectDefMinDistance(berryID, 8.0);
+        rmSetObjectDefMaxDistance(berryID, 12.0);
+        rmAddObjectDefConstraint(berryID, avoidCoin);
+ 
+        int treeID = rmCreateObjectDef("starting trees");
+        rmAddObjectDefItem(treeID, "TreeTexasDirt", rmRandInt(6,9), 10.0);
+        rmAddObjectDefItem(treeID, "UnderbrushForest", rmRandInt(8,10), 12.0);
+        rmSetObjectDefMinDistance(treeID, 12.0);
+        rmSetObjectDefMaxDistance(treeID, 18.0);
+        rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+        rmAddObjectDefConstraint(treeID, avoidCoin);
+ 
+        int foodID = rmCreateObjectDef("starting hunt");
+        rmAddObjectDefItem(foodID, "zebra", 8, 8.0);
+        rmSetObjectDefMinDistance(foodID, 10.0);
+        rmSetObjectDefMaxDistance(foodID, 10.0);
+        rmSetObjectDefCreateHerd(foodID, true);
+ 
+        int foodID2 = rmCreateObjectDef("starting hunt 2");
+        rmAddObjectDefItem(foodID2, "zebra", 8, 8.0);
+        rmSetObjectDefMinDistance(foodID2, 40.0);
+        rmSetObjectDefMaxDistance(foodID2, 40.0);
+        rmSetObjectDefCreateHerd(foodID2, true);
+               
+
+        for(i=1; < cNumberNonGaiaPlayers + 1) {
+    int id=rmCreateArea("Player"+i);
+    rmSetPlayerArea(i, id);
+    int startID = rmCreateObjectDef("object"+i);
+    rmAddObjectDefItem(startID, "TownCenter", 1, 5.0);
+    rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(gold2ID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		
+		int playerMissions = rmCreateObjectDef("missionaries"+i);
+        rmAddObjectDefItem(playerMissions, "UnderbrushTexas", 1, 10.0);
+        rmSetObjectDefMinDistance(playerMissions, 0);
+        rmSetObjectDefMaxDistance(playerMissions, 0);
+        rmPlaceObjectDefAtLoc(playerMissions, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i), 1);
+
+		
+		int teamNumber = rmGetPlayerTeam(i);
+
+  }
+  
+  	  
+   // Text
+   rmSetStatusText("",0.70);
+
+	for (j=0; < (6*cNumberNonGaiaPlayers)) {   
+		int StartAreaTree2ID=rmCreateObjectDef("starting trees dirt"+j);
+		rmAddObjectDefItem(StartAreaTree2ID, "TreeTexasDirt", rmRandInt(8,10), rmRandFloat(8.0,16.0));
+		rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest")); 
+		rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+		rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRoute);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocket);
+		//rmAddObjectDefConstraint(StartAreaTree2ID, avoidNatives);
+	  	rmAddObjectDefConstraint(StartAreaTree2ID, circleConstraint);
+		rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+		//rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenter);	
+		rmAddObjectDefConstraint(StartAreaTree2ID, avoidCliffy);	
+		rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);	
+		rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+	}
+  
+  	int islandminesID = rmCreateObjectDef("island silver");
+	rmAddObjectDefItem(islandminesID, "mine", 1, 1.0);
+	rmSetObjectDefMinDistance(islandminesID, 0.0);
+	rmSetObjectDefMaxDistance(islandminesID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(islandminesID, avoidCoinMed);
+	//rmAddObjectDefConstraint(islandminesID, avoidNatives);
+	rmAddObjectDefConstraint(islandminesID, avoidTownCenterMore);
+	rmAddObjectDefConstraint(islandminesID, avoidSocket);
+	rmAddObjectDefConstraint(islandminesID, AvoidWaterShort2);
+	rmAddObjectDefConstraint(islandminesID, forestConstraintShort);
+	rmAddObjectDefConstraint(islandminesID, avoidCliffy);
+	rmAddObjectDefConstraint(islandminesID, circleConstraint);
+	rmPlaceObjectDefAtLoc(islandminesID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+	int elephantswitch = rmRandInt(0,1);
+	
+		int elephantHunts = rmCreateObjectDef("elephants");
+		rmAddObjectDefItem(elephantHunts, "ypWildElephant", 5, 10.0);
+		rmSetObjectDefCreateHerd(elephantHunts, true);
+		rmSetObjectDefMinDistance(elephantHunts, 0);
+		rmSetObjectDefMaxDistance(elephantHunts, rmXFractionToMeters(0.15));
+		rmAddObjectDefConstraint(elephantHunts, circleConstraint);	
+		rmAddObjectDefConstraint(elephantHunts, avoidHunt);
+		rmAddObjectDefConstraint(elephantHunts, waterHunt);
+		rmAddObjectDefConstraint(elephantHunts, avoidCliffy);
+		if(elephantswitch == 1){
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.6, 0.6, 1);   
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.4, 0.6, 1);   
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.6, 0.4, 1);
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.4, 0.4, 1);
+		}else{
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.5, 0.7, 1);   
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.5, 0.3, 1);   
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.6, 0.5, 1);
+		rmPlaceObjectDefAtLoc(elephantHunts, 0, 0.4, 0.5, 1);
+		}
+
+  	int pronghornHunts = rmCreateObjectDef("pronghornHunts");
+	rmAddObjectDefItem(pronghornHunts, "zebra", rmRandInt(7,8), 6.0);
+	rmSetObjectDefCreateHerd(pronghornHunts, true);
+	rmSetObjectDefMinDistance(pronghornHunts, 0);
+	rmSetObjectDefMaxDistance(pronghornHunts, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(pronghornHunts, circleConstraint);
+	rmAddObjectDefConstraint(pronghornHunts, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(pronghornHunts, avoidHunt);
+	rmAddObjectDefConstraint(pronghornHunts, AvoidWaterFar);
+	rmAddObjectDefConstraint(pronghornHunts, avoidCliffy);
+	rmPlaceObjectDefAtLoc(pronghornHunts, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+
+  	int rheaHunts = rmCreateObjectDef("rheas");
+	rmAddObjectDefItem(rheaHunts, "rhea", rmRandInt(7,8), 6.0);
+	rmSetObjectDefCreateHerd(rheaHunts, true);
+	rmSetObjectDefMinDistance(rheaHunts, 0);
+	rmSetObjectDefMaxDistance(rheaHunts, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(rheaHunts, circleConstraint);
+	rmAddObjectDefConstraint(rheaHunts, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(rheaHunts, avoidHunt);
+	rmAddObjectDefConstraint(rheaHunts, avoidCliffy);
+	rmAddObjectDefConstraint(rheaHunts, AvoidWaterFar);
+	rmPlaceObjectDefAtLoc(rheaHunts, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+	
+	int herdableID=rmCreateObjectDef("beefaloes");
+	rmAddObjectDefItem(herdableID, "ypWaterBuffalo", 1, 4.0);
+	rmSetObjectDefMinDistance(herdableID, 0.0);
+	rmAddObjectDefConstraint(herdableID, avoidCliffy);
+	rmSetObjectDefMaxDistance(herdableID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(herdableID, circleConstraint);
+	rmAddObjectDefConstraint(herdableID, avoidTownCenterMedium);
+	rmAddObjectDefConstraint(herdableID, avoidHerd);
+	rmPlaceObjectDefAtLoc(herdableID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*4);
+  
+	int nuggetID= rmCreateObjectDef("nugget"); 
+	rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0); 
+	rmSetObjectDefMinDistance(nuggetID, 0.0); 
+	rmAddObjectDefConstraint(nuggetID, avoidCliffy);
+	rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5)); 
+	rmAddObjectDefConstraint(nuggetID, avoidNugget); 
+	rmAddObjectDefConstraint(nuggetID, circleConstraint);
+	rmAddObjectDefConstraint(nuggetID, avoidTownCenter);
+	rmAddObjectDefConstraint(nuggetID, avoidCoin); 
+	rmAddObjectDefConstraint(nuggetID, forestConstraintShort);
+	//rmAddObjectDefConstraint(nuggetID, avoidNatives); 
+	rmAddObjectDefConstraint(nuggetID, avoidWaterShort); 
+	rmAddObjectDefConstraint(nuggetID, avoidTradeRouteSmall);
+	rmAddObjectDefConstraint(nuggetID, avoidSocket); 
+	rmSetNuggetDifficulty(1, 2); 
+	rmPlaceObjectDefAtLoc(nuggetID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);   
+  
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.6;
+    float yLoc = 0.4;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+  
+   // Text
+   rmSetStatusText("",1.0); 
+}
+ 
diff --git a/RMM/TexasRegicide.xs b/RMM/TexasRegicide.xs
index 30202b8..7c6e49a 100644
--- a/RMM/TexasRegicide.xs
+++ b/RMM/TexasRegicide.xs
@@ -441,7 +441,7 @@ void main(void)
 
 // Starting units	
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-   rmSetObjectDefMinDistance(startingUnits, 5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
    rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
@@ -857,7 +857,7 @@ void main(void)
 		rmAddAreaToClass(cliffEastID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(cliffEastID, 2, 0.4, 0.1, 1.0, 0);
 		rmSetAreaCliffPainting(cliffEastID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffEastID, 7, 1.0, 1.0);
+		rmSetAreaCliffHeight(cliffEastID, 5, 1.0, 1.0);
 		rmSetAreaHeightBlend(cliffEastID, 1);
 		rmAddAreaTerrainLayer(cliffEastID, "texas\ground2_tex", 0, 2);
 		rmSetAreaObeyWorldCircleConstraint(cliffEastID, false);
@@ -898,7 +898,7 @@ void main(void)
 		rmAddAreaToClass(cliffWestID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(cliffWestID, 2, 0.4, 0.1, 1.0, 0);
 		rmSetAreaCliffPainting(cliffWestID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffWestID, 7, 1.0, 1.0);
+		rmSetAreaCliffHeight(cliffWestID, 5, 1.0, 1.0);
 		rmSetAreaHeightBlend(cliffWestID, 1);
 		rmAddAreaTerrainLayer(cliffWestID, "texas\ground2_tex", 0, 2);
 		rmSetAreaObeyWorldCircleConstraint(cliffWestID, false);
@@ -1080,17 +1080,6 @@ void main(void)
    }
 
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
-
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
     
@@ -1166,6 +1155,18 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.90);
 
+   // wood resources
+   int randomTreeID=rmCreateObjectDef("random tree");
+   rmAddObjectDefItem(randomTreeID, "TreeTexasDirt", 2, 4.0);
+   rmSetObjectDefMinDistance(randomTreeID, 0.0);
+   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(randomTreeID, avoidAll);
+   rmAddObjectDefConstraint(randomTreeID, avoidResource);
+   rmAddObjectDefConstraint(randomTreeID, avoidImpassableLand);
+   rmAddObjectDefConstraint(randomTreeID, avoidCliffs);
+   rmAddObjectDefConstraint(randomTreeID, avoidTradeRoute);
+   rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
+
    // livestock
    int cowID=rmCreateObjectDef("cow");
    rmAddObjectDefItem(cowID, "cow", 2, 4.0);
diff --git a/RMM/unknown.xml b/RMM/UnknownLand.xml
similarity index 50%
rename from RMM/unknown.xml
rename to RMM/UnknownLand.xml
index 2e134b2..8d42a74 100644
--- a/RMM/unknown.xml
+++ b/RMM/UnknownLand.xml
@@ -1,7 +1,13 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<mapinfo details = "45467" imagepath = "ui\random_map\unknown" displayNameID = "45466" cannotReplace = ""
-		loadDetails="45468" loadBackground="ui\random_map\unknown\unknown_map">
+<mapinfo 
+imagepath = "ui\random_map\africa\unknown" 
+displayNameID = "130075" 
+details = "130076" 
+loadDetails = "130077" 
+loadBackground="ui\random_map\africa\unknown\unknown_map">
    <loadss>ui\random_map\unknown\unknown_ss_01</loadss>
    <loadss>ui\random_map\unknown\unknown_ss_02</loadss>
    <loadss>ui\random_map\unknown\unknown_ss_03</loadss>
-</mapinfo>
\ No newline at end of file
+</mapinfo>
+
+ 
\ No newline at end of file
diff --git a/RMM/UnknownLand.xs b/RMM/UnknownLand.xs
new file mode 100644
index 0000000..775932e
--- /dev/null
+++ b/RMM/UnknownLand.xs
@@ -0,0 +1,8224 @@
+// Gandalf's Random Land Map - TAD 
+// a random map for AOE3: TAD
+// by RF_Gandalf
+
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+include "mercenaries.xs";
+
+void main(void)
+{  
+   // Text
+   rmSetStatusText("",0.01);
+
+// Set up for variables
+   string baseType = "";
+   string pondType = "";
+   string cliffType = "";
+   string forestType = "";
+   string forest2Type = "";
+   string riverType = "";
+   string treeType = "";
+   string deerType = "";
+   string deer2Type = "";
+   string sheepType = "";
+   string centerHerdType = "";
+   string fishType = "";
+   string native1Name = "";
+   string native2Name = "";
+   string patchMixType = "";
+   string mineType = "";
+   string tradeRouteType1 = "";
+   string tradeRouteType2 = "";
+ 
+// Pick pattern for trees, terrain, features, etc.
+   int patternChance = rmRandInt(29,37); 
+   int variantChance = rmRandInt(1,2);
+   int lightingChance = rmRandInt(1,2);
+   int axisChance = rmRandInt(1,2);
+   int playerSide = rmRandInt(1,2);   
+   int positionChance = rmRandInt(1,2);   
+   int distChance = rmRandInt(1,4);
+   int sectionChance = rmRandInt(1,3);
+   int ffaChance = rmRandInt(1,4);
+   int trPattern = rmRandInt(0,11);
+   int socketPattern = rmRandInt(1,2);   
+   int nativeSetup = rmRandInt(0,22);
+   if (cNumberNonGaiaPlayers > 5)
+   {
+	if ((nativeSetup == 10) || (nativeSetup == 11))   
+	{
+	   if (rmRandInt(1,2) == 2)
+		nativeSetup = rmRandInt(12,22);
+	   else
+            nativeSetup = rmRandInt(0,9);
+	}
+	if ((trPattern == 2) || (trPattern == 3))   
+	{
+	   if (rmRandInt(1,17) < 8)
+		nativeSetup = rmRandInt(16,22);
+	   else
+            nativeSetup = rmRandInt(0,9);
+	}	   
+   }
+   else
+   {
+	if ((trPattern == 2) || (trPattern == 3))   
+	{
+	   if (rmRandInt(1,17) < 8)
+		nativeSetup = rmRandInt(16,22);
+	   else
+            nativeSetup = rmRandInt(0,9);
+	}
+	if ((trPattern == 8) || (trPattern == 9))   
+	{
+         nativeSetup = rmRandInt(0,20);
+	}
+   }
+   int nativePattern = -1;
+   int nativeChoice = rmRandInt(1,2);
+   int nativeNumber = rmRandInt(2,6);
+   int endPosition = rmRandInt(1,3);
+   int sidePosition = rmRandInt(1,3);
+   int sheepChance = rmRandInt(1,2);
+   int featureChance = rmRandInt(1,10);
+   int cliffChance = rmRandInt(1,10);
+   int makeCliffs = -1; 
+   int cliffVariety = rmRandInt(0,5);
+   int bareCliffs = -1;
+   int makeLake = -1;
+   int makePonds = -1;
+   int makeIce = -1;
+   int makeRiver = -1;
+   int centerMt = -1;
+   int forestMt = -1;
+   int makeCentralHighlands = -1;
+   int makeCentralCanyon = -1;
+   int vultures = -1;
+   int eagles = -1;
+   int plainsMap = -1;
+   int tropicalMap = -1;
+   int hillTrees = -1;
+   int placeBerries = 1;
+   int berryNum = rmRandInt(2,3);
+   if (cNumberNonGaiaPlayers > 5)
+	berryNum = rmRandInt(4,6);
+   else if (cNumberNonGaiaPlayers > 3)
+	berryNum = rmRandInt(3,4);
+   int reducedForest = -1;
+   int mtPattern = rmRandInt(1,4);
+   int extendCenter = rmRandInt(0,2);
+   int lakePos = rmRandInt(0,3);
+   int clearCenter = -1;
+   int clearCenterChance = -1;
+   int makeCentralForestPatch = -1;
+   int forestDist = rmRandInt(12,18);
+   if (cNumberNonGaiaPlayers < 5)
+	forestDist = rmRandInt(11,16);
+   int forSize = rmRandInt(1,3);
+   int twoChoice = rmRandInt(1,2);
+   int threeChoice = rmRandInt(1,3);
+   int fourChoice = rmRandInt(1,4);
+   int fiveChoice = rmRandInt(1,5);
+   int sixChoice = rmRandInt(1,6);
+   int placeGold = rmRandInt(1,5);
+   int coverUp = 0;
+   int forestCoverUp = 0; 
+   int specialPatch = 0;
+   int noCliffForest = 0;
+   int extraBerries = 0;
+   int mineChance = rmRandInt(1,5);
+   int mineNumber = rmRandInt(0,8);
+   int startingOutpost = rmRandInt(1,8);
+   int dualForest = 0;
+   int denseForest = 0;
+   int forestSize = 0;
+   int patchSize = 0;
+   int bonusCrates = rmRandInt(1,5);
+
+// Picks the map size
+   int playerTiles=14800;  
+   if (cNumberNonGaiaPlayers > 7)
+	playerTiles = 11500;  
+   else if (cNumberNonGaiaPlayers > 5)
+	playerTiles = 12500;  
+   else if (cNumberNonGaiaPlayers > 3)
+	playerTiles = 13000; 
+   else if (cNumberNonGaiaPlayers == 3)
+	playerTiles = 13500;
+   int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+   rmEchoInfo("Map size="+size+"m x "+size+"m");
+   rmSetMapSize(size, size);
+
+// Elevation
+   int elevationChance = rmRandInt(1,4);
+  // rmSetMapElevationParameters(long type, float minFrequency, long numberOctaves, float persistence, float heightVariation)
+
+   if (elevationChance == 1)
+   {
+	rmSetMapElevationParameters(cElevTurbulence, 0.4, 6, 0.7, 5.0);
+	rmSetMapElevationHeightBlend(1.0);
+   }
+   else if (elevationChance == 2)
+   {
+	rmSetMapElevationParameters(cElevTurbulence, 0.04, 3, 0.5, 6.0);
+	rmSetMapElevationHeightBlend(1.0);
+   }  
+   else if (elevationChance == 3)
+   {
+	rmSetMapElevationParameters(cElevTurbulence, 0.1, 5, 0.2, 5.0);
+	rmSetMapElevationHeightBlend(0.9);
+   }
+   else if (elevationChance == 4)
+   {
+	rmSetMapElevationParameters(cElevTurbulence, 0.2, 4, 0.2, 3.0);
+	rmSetMapElevationHeightBlend(0.8);
+   }
+
+// Pick terrain patterns and features
+//   patternChance = 33; // ========================================================================================= 
+//   featureChance = 6;
+//   trPattern = 1;
+//   extendCenter = 0;
+//   fourChoice = 1;
+//   threeChoice = 2;
+//   sixChoice = 1;
+//   nativeSetup = 22;
+//   lightingChance = 1;
+//   extendCenter = 2;
+//   variantChance = 1;
+//   mineNumber = 0;
+
+   if (patternChance == 1) // NE
+   {   
+      rmSetSeaType("new england coast");
+      rmSetMapType("newEngland");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Great Lakes");
+	else
+	   rmSetLightingSet("new england");
+      baseType = "newengland_grass";
+	forestType = "new england forest";
+	riverType = "new england lake";
+      cliffType = "New England Inland Grass";
+	pondType = "new england lake";
+	treeType = "TreeNewEngland";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "moose";         
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "turkey";        
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishSalmon";
+	mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+	if (cliffChance > 2)
+         makeCliffs = 1;
+      if (featureChance == 1)
+	   makeLake = 1;
+	else if (featureChance == 2)
+	   makePonds = 1;	   	
+	else if (featureChance < 6)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   makePonds = 0;
+	}
+      else if (featureChance < 8)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   makeCliffs = 2;
+	   makePonds = 0;
+	}
+      nativePattern = 40;
+   }
+   else if (patternChance == 2) // carolina
+   {
+      rmSetSeaType("atlantic coast");
+      rmSetMapType("carolina");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("312b_washington");
+	else
+	   rmSetLightingSet("carolina");
+      baseType = "carolina_grass";
+	forestType = "carolina pine forest";
+	riverType = "Amazon River";
+      cliffType = "Carolina Inland";
+	treeType = "TreeCarolinaGrass";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "turkey";        
+	}   
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishBass";
+	mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+	extraBerries = 2;
+	if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 6)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 2;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+	if (nativeChoice == 1)
+	   nativePattern = 3;
+	else
+	   nativePattern = 40;
+   }
+   else if (patternChance == 3) // bayou
+   {
+      rmSetSeaType("yucatan Coast");
+      rmSetMapType("bayou");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("berlin dusk");
+	else
+         rmSetLightingSet("bayou");
+      baseType = "bayou_grass";
+	forestType = "bayou swamp forest";
+      pondType = "bayou";
+	treeType = "TreeBayou";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "turkey";        
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishBass";
+	mineType = "mine";
+	eagles = 1;
+      makeCliffs = 0;
+	if (rmRandInt(1,5) > 1)
+         makeLake = 1;
+	extraBerries = 2;
+	if (threeChoice == 1)
+	   nativePattern = 3;
+	else if (threeChoice == 2)
+	   nativePattern = 21;
+	else
+	   nativePattern = 42;
+   }
+   else if (patternChance == 4) // great lakes green
+   {
+      if (variantChance == 1)
+         rmSetSeaType("hudson bay");
+      else
+	   rmSetSeaType("new england coast");
+      rmSetMapType("greatlakes");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("constantinople");
+	else
+         rmSetLightingSet("Great Lakes");
+      baseType = "greatlakes_grass";
+	forestType = "great lakes forest";
+      cliffType = "New England";
+      pondType = "great lakes";
+	treeType = "TreeGreatLakes";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "bison";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "moose";        
+	}   
+      sheepType = "sheep";
+      fishType = "FishBass";
+	mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+      extraBerries = 2;
+      if (featureChance == 1)
+	   makePonds = 1;	
+      else if (featureChance < 4)
+	   makeLake = 1;
+	else if (featureChance < 6)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+      }
+	else if (featureChance < 7)
+	{
+	   makeCentralCanyon = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 9)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+	if (cliffChance >6)
+         makeCliffs = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 4;
+	else if (fiveChoice == 2)
+	   nativePattern = 5;
+	else if (fiveChoice == 3)
+	   nativePattern = 40;
+	else if (fiveChoice == 4)
+	   nativePattern = 22;
+	else
+	   nativePattern = 40;
+   }
+   else if (patternChance == 5) // great lakes winter
+   {
+      rmSetSeaType("great lakes ice");
+      rmSetMapType("greatlakes");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+	   rmSetLightingSet("308b_caribbeanlight");
+	else
+         rmSetLightingSet("Great Lakes Winter");
+      baseType = "greatlakes_snow";
+	forestType = "great lakes forest snow";
+	riverType = "Yukon River";
+      pondType = "great lakes ice";
+	treeType = "TreeGreatLakesSnow";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "elk";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "bison";
+         centerHerdType = "moose";       
+	}      
+      sheepType = "sheep";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	else
+	   mineType = "MineCopper";
+      placeBerries = 0;
+      hillTrees = rmRandInt(0,1);
+      if (featureChance < 4)
+	   makeLake = 1;
+	else if (featureChance < 7)
+	   makeIce = 1;
+	else if (featureChance < 9)
+	   forestMt = 1;
+      else if (featureChance == 9)
+	   makeRiver = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 4;
+	else if (fiveChoice == 2)
+	   nativePattern = 5;
+	else if (fiveChoice == 3)
+	   nativePattern = 40;
+	else if (fiveChoice == 4)
+	   nativePattern = 22;
+	else
+	   nativePattern = 40;
+   }
+   else if (patternChance == 6) // saguenay
+   {
+      rmSetSeaType("hudson bay");
+      rmSetMapType("saguenay");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("lisbon");
+	else
+         rmSetLightingSet("saguenay");
+      baseType = "saguenay grass";
+	forestType = "saguenay forest";
+	riverType = "saguenay lake";
+      pondType = "saguenay lake";
+	treeType = "TreeSaguenay";
+      if (variantChance == 1)
+	{
+         deerType = "caribou";
+         deer2Type = "moose";
+         centerHerdType = "caribou";
+	}
+      else 
+	{     
+         deerType = "caribou";
+         deer2Type = "caribou";
+         centerHerdType = "moose";       
+	}
+      sheepType = "sheep";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	else
+	   mineType = "MineCopper";
+	extraBerries = 1;
+	makePonds = rmRandInt(1,3);
+      if (featureChance < 5)
+	   makeLake = 1;
+	else if (featureChance <7)
+	   makePonds = 1;
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   makePonds = 0;
+	}	
+
+	if (threeChoice == 1)
+	   nativePattern = 5;
+	else if (threeChoice == 2)
+	   nativePattern = 6;
+	else if (threeChoice == 3)
+	   nativePattern = 16;
+   }
+   else if (patternChance == 7) // yukon
+   {
+      rmSetSeaType("great lakes ice");
+      rmSetMapType("yukon");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+	   rmSetLightingSet("305b");
+	else
+         rmSetLightingSet("yukon");
+      baseType = "yukon snow";
+	forestType = "yukon snow forest";
+	riverType = "Yukon River";
+      cliffType = "rocky mountain2";
+	treeType = "TreeYukonSnow";
+      if (variantChance == 1)
+	{
+         deerType = "caribou";
+         deer2Type = "muskOx";
+         centerHerdType = "bighornsheep";
+	}
+      else 
+	{     
+         deerType = "muskOx";
+         deer2Type = "caribou";
+         centerHerdType = "caribou";       
+	}
+      sheepChance = 0;
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "minegold";
+	else
+	   mineType = "MineCopper";
+      placeBerries = 0;
+      hillTrees = rmRandInt(0,1);
+	clearCenterChance = 3;
+      if (featureChance < 4)
+	{
+	   centerMt = 1;
+	   cliffVariety = rmRandInt(1,5);
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 2;
+	}
+	else if (featureChance < 9)
+	{
+	   makeIce = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 9)
+	{
+	   makeRiver = 1;
+	   clearCenterChance = 0;
+	}
+	if (cliffChance > 2)
+         makeCliffs = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 5;
+	else if (fiveChoice == 2)
+	   nativePattern = 6;
+	else if (fiveChoice == 3)
+	   nativePattern = 8;
+	else if (fiveChoice == 4)
+	   nativePattern = 27;
+	else
+	   nativePattern = 28;
+   }
+   else if (patternChance == 8) // rockies
+   {
+      rmSetSeaType("great lakes");
+      rmSetMapType("rockies");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+	   rmSetLightingSet("305b");
+	else
+         rmSetLightingSet("rockies");
+      baseType = "rockies_grass";
+	forestType = "rockies forest";
+      cliffType = "rocky mountain2";
+	treeType = "TreeRockies";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "elk";
+         centerHerdType = "bighornsheep";
+	}
+      else 
+	{     
+         deerType = "elk";
+         deer2Type = "elk";
+         centerHerdType = "bighornsheep";
+	}   
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "minegold";
+	else
+	   mineType = "mine";
+	eagles = 1;
+      hillTrees = 1;
+      reducedForest = 1;
+      if (featureChance < 6)
+	   centerMt = 1;
+	else 
+	   makeCentralHighlands = 1;
+	nativeChoice = rmRandInt(1,5);
+	if (nativeChoice == 1)
+	   nativePattern = 23;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 19;
+	else if (nativeChoice == 4)
+	   nativePattern = 8;
+	else if (nativeChoice == 5)
+	   nativePattern = 28;
+   }
+   else if (patternChance == 9) // great plains 1
+   {
+      rmSetSeaType("Yucatan coast");
+      rmSetMapType("greatPlains");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("ottoman morning");
+	else
+         rmSetLightingSet("great plains");       
+      baseType = "great plains grass"; 
+	forestType = "great plains forest";
+	riverType = "Amazon River";
+      cliffType = "Great Plains";
+      pondType = "great plains pond";
+	treeType = "TreeGreatPlains";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "pronghorn";
+         centerHerdType = "bison";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "elk";
+	} 
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishBass";
+	mineType = "mine";
+      vultures = 1;
+      plainsMap = 1;
+	extraBerries = 2;
+	clearCenterChance = 2;
+      if (featureChance == 1)
+	   makePonds = 1;
+      else if (featureChance < 4)
+	   makeLake = 1;
+	else if (featureChance < 5)
+	{
+	   makeCentralCanyon = 1;
+	   cliffChance = 0;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+	   clearCenterChance = 0;
+	}
+	if (cliffChance > 7)  
+         makeCliffs = 1;
+	if (rmRandInt(1,2) == 1) 
+	   bareCliffs = 1;
+	cliffVariety = rmRandInt(2,7);
+	if (cliffVariety == 4)
+	   cliffVariety = 6;
+	if (cliffVariety == 5)
+	   cliffVariety = 7;
+	nativeChoice = rmRandInt(1,5);
+	if (nativeChoice == 1)
+	   nativePattern = 23;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 19;
+	else if (nativeChoice == 4)
+	   nativePattern = 8;
+	else if (nativeChoice == 5)
+	   nativePattern = 28;
+   }
+   else if (patternChance == 10) // great plains 2
+   {
+      rmSetSeaType("new england coast");
+      rmSetMapType("greatPlains");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("spc14abuffalo");
+	else
+         rmSetLightingSet("great plains");
+      baseType = "great plains drygrass";
+	forestType = "great plains forest";
+	riverType = "great plains pond";
+      cliffType = "Great Plains";
+      pondType = "great plains pond";
+	treeType = "TreeGreatPlains";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "pronghorn";
+         centerHerdType = "bison";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bison";
+	}
+      sheepType = "cow";
+      fishType = "FishBass";
+	mineType = "mine";
+      vultures = 1;
+      plainsMap = 1;
+	extraBerries = 2;
+	forestCoverUp = 1; 
+	clearCenterChance = 1;
+      if (featureChance == 1)
+	   makePonds = 1;
+      else if (featureChance == 2)
+	   makeLake = 1;
+	else if (featureChance < 5)
+	{
+	   makeCentralCanyon = 1;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+	   clearCenterChance = 0;
+	}
+	if (cliffChance > 7)  
+         makeCliffs = 1;
+	if (rmRandInt(0,1) == 1)  
+	   bareCliffs = 1;
+	cliffVariety = rmRandInt(2,7);
+	if (cliffVariety == 4)
+	   cliffVariety = 6;
+	if (cliffVariety == 5)
+	   cliffVariety = 7;
+	nativeChoice = rmRandInt(1,5);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 8;
+	else if (nativeChoice == 5)
+	   nativePattern = 28;
+   }
+   else if (patternChance == 11) // texas grass
+   {   
+      rmSetSeaType("new england coast");
+      rmSetMapType("texas");
+	rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("pampas");
+	else
+         rmSetLightingSet("texas");
+      baseType = "texas_grass";
+	forestType = "texas forest";
+	riverType = "Amazon River";
+      cliffType = "Texas Grass";
+	pondType = "texas pond";
+	treeType = "TreeTexas";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "deer";
+         centerHerdType = "bison";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bison";
+	}
+      sheepType = "cow";
+      fishType = "FishBass";
+	mineType = "mine";
+      vultures = 1;
+	extraBerries = 2;
+
+	if (cliffChance > 3)
+         makeCliffs = 1;
+	clearCenterChance = 2;
+      if (featureChance == 1)
+	   makePonds = 1;
+      else if (featureChance < 4)
+	   makeLake = 1;
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance == 7)
+	{
+	   makeRiver = 1;
+	   makeCliffs = 2;
+	   clearCenterChance = 0;
+	}
+
+	nativeChoice = rmRandInt(1,6);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 19;
+	else if (nativeChoice == 5)
+	   nativePattern = 20;
+	else
+	   nativePattern = 9;
+   }
+   else if (patternChance == 12) // texas desert
+   {   
+      rmSetSeaType("new england coast");
+      rmSetMapType("texas");
+	rmSetMapType("grass");
+	if (featureChance == 7)
+	   rmSetLightingSet("seville");
+	else
+	{
+	   if (lightingChance == 1)
+	      rmSetLightingSet("seville");
+	   else
+            rmSetLightingSet("texas");
+	}
+	if (lightingChance == 1)
+	   baseType = "texas_dirt";
+	else
+         baseType = "texas_grass";
+	forestType = "texas forest dirt";
+	riverType = "Pampas River";
+      cliffType = "Texas";
+	pondType = "texas pond";
+	treeType = "TreeTexasDirt";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "pronghorn";
+         centerHerdType = "pronghorn";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bison";
+	}
+      sheepType = "cow";
+      fishType = "FishBass";
+	mineType = "mine";
+      vultures = 1;
+      clearCenterChance = 1;
+      makeCliffs = 1;
+      if (featureChance < 4)
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   makeCliffs = 2;
+	   clearCenterChance = 0;
+	}
+
+	nativeChoice = rmRandInt(1,6);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 31;
+	else if (nativeChoice == 5)
+	   nativePattern = 38;
+	else
+	   nativePattern = 39;
+   }
+   else if (patternChance == 13) // sonora
+   {   
+      rmSetSeaType("Atlantic Coast");
+      rmSetMapType("sonora");
+	rmSetMapType("grass");
+	if (featureChance == 10)
+	   rmSetLightingSet("pampas");
+	else
+	{
+   	   if (lightingChance == 1)
+            rmSetLightingSet("sonora");
+	   else
+            rmSetLightingSet("pampas");
+	}
+      baseType = "sonora_dirt";
+	forestType = "sonora forest";
+	riverType = "Pampas River";
+      cliffType = "Sonora";
+      cliffVariety = 8;
+	treeType = "TreeSonora";
+      if (variantChance == 1)
+	{
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bighornsheep";         
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bighornsheep";
+         centerHerdType = "bison";         
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishBass";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      vultures = 1;
+      reducedForest = 1;
+      if (featureChance < 4)
+	{
+	   makeCentralCanyon = 1;
+	}
+	else if (featureChance < 6)
+	{
+	   makeCentralHighlands = 1;
+	}
+	else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	}
+      makeCliffs = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 10;
+	else if (fiveChoice == 2)
+	   nativePattern = 31;
+	else if (fiveChoice == 3)
+	   nativePattern = 32;
+	else if (fiveChoice == 4)
+	   nativePattern = 33;
+	else
+	   nativePattern = 37;
+   }
+   else if (patternChance == 14) // yucatan
+   {
+      rmSetSeaType("yucatan Coast");
+      rmSetMapType("yucatan");
+      rmSetMapType("tropical");
+	if (lightingChance == 1)
+	   rmSetLightingSet("311b");
+	else
+         rmSetLightingSet("yucatan");     
+      baseType = "yucatan_grass";
+	forestType = "yucatan forest";
+	riverType = "Amazon River";
+      cliffType = "Amazon";
+      pondType = "Amazon River Basin";
+	treeType = "TreeYucatan";
+      if (variantChance == 1)
+      {
+         deerType = "tapir";
+         deer2Type = "capybara";
+         centerHerdType = "turkey";
+      }
+      else
+	{
+         deerType = "capybara";
+         deer2Type = "turkey";
+         centerHerdType = "tapir";
+	}
+      sheepChance = 0;
+      fishType = "FishTarpon";
+      mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+	extraBerries = 1;
+      tropicalMap = 1;
+      if (featureChance == 1)
+	   makePonds = 1;
+      else if (featureChance == 2)
+	   makeLake = 1;
+	else if (featureChance < 5)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 7)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 7)
+	{
+	   makeRiver = 1;
+	   cliffChance = 2;
+	   makePonds = 0;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 11;
+	else if (fiveChoice == 2)
+	   nativePattern = 12;
+	else if (fiveChoice == 3)
+	   nativePattern = 34;
+	else if (fiveChoice == 4)
+	   nativePattern = 35;
+	else
+	   nativePattern = 36;
+   }
+   else if (patternChance == 15) // caribbean
+   {
+      rmSetSeaType("caribbean coast");
+      rmSetMapType("caribbean");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("301a_malta");
+	else
+         rmSetLightingSet("caribbean");     
+      baseType = "caribbean grass";
+	forestType = "caribbean palm forest";
+      pondType = "Amazon River Basin";
+	treeType = "TreeCaribbean";
+      cliffType = "Caribbean";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "tapir";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "tapir";
+         centerHerdType = "deer";
+	}
+      sheepChance = 0;
+      fishType = "FishTarpon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "minegold";
+	else
+	   mineType = "mine";
+	extraBerries = 2;
+      tropicalMap = 1;
+      if (featureChance < 4)
+	   makeLake = 1;
+	else if (featureChance < 6)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 12;
+	else if (fiveChoice == 2)
+	   nativePattern = 13;
+	else if (fiveChoice == 3)
+	   nativePattern = 18;
+	else if (fiveChoice == 4)
+	   nativePattern = 36;
+	else
+	   nativePattern = 42;
+   }
+   else if (patternChance == 16) // amazon
+   {
+      rmSetSeaType("yucatan coast");
+      rmSetMapType("amazonia");
+      rmSetMapType("tropical");
+	if (lightingChance == 1)
+	   rmSetLightingSet("323b_inca");
+	else
+         rmSetLightingSet("amazon");     
+      baseType = "amazon grass";
+	forestType = "amazon rain forest";
+	riverType = "Amazon River";
+      cliffType = "Amazon";
+      pondType = "Amazon River Basin";
+	treeType = "TreeAmazon";
+      if (variantChance == 1)
+      {
+         deerType = "tapir";
+         deer2Type = "tapir";
+         centerHerdType = "capybara";
+      }
+      else
+	{
+         deerType = "capybara";
+         deer2Type = "tapir";
+         centerHerdType = "capybara";
+	}
+      sheepChance = 0;
+      fishType = "FishTarpon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "minegold";
+	else
+	   mineType = "mine";
+	extraBerries = 1;
+      tropicalMap = 1;
+      if (featureChance == 1)
+	   makeLake = 1;
+	else if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 6)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+
+	if (fiveChoice == 1)
+	   nativePattern = 13;
+	else if (fiveChoice == 2)
+	   nativePattern = 14;
+	else if (fiveChoice == 3)
+	   nativePattern = 15;
+	else if (fiveChoice == 4)
+	   nativePattern = 18;
+	else
+	   nativePattern = 26;
+   }
+   else if (patternChance == 17) // pampas
+   {
+      rmSetSeaType("Pampas River");
+      rmSetMapType("pampas");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("texas");
+	else
+         rmSetLightingSet("pampas");
+	if (cliffVariety < 3)  // not used for cliffs!
+	   baseType = "pampas_grass";
+	else
+         baseType = "pampas_dirt";
+	forestType = "pampas forest";
+	treeType = "TreePampas";
+	riverType = "Pampas River";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "rhea";
+         centerHerdType = "rhea";
+	}
+      else 
+	{     
+         deerType = "rhea";
+         deer2Type = "deer";
+         centerHerdType = "rhea";
+	}
+      sheepType = "llama";
+      fishType = "FishBass";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+	clearCenterChance = 2;
+      if (featureChance < 6)
+	{
+	   makeRiver = 1;
+	   clearCenterChance = 0;
+	}
+      vultures = 1;
+      eagles = 1;
+
+	if (threeChoice == 1)
+	   nativePattern = 14;
+	else if (threeChoice == 2)
+	   nativePattern = 25;
+	else
+	   nativePattern = 26;
+   }
+   else if (patternChance == 18) // patagonia
+   {
+      rmSetSeaType("hudson bay");
+      rmSetMapType("patagonia");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("paris day");
+	else
+         rmSetLightingSet("patagonia");
+	if (twoChoice == 1)
+	{
+	   baseType = "patagonia_grass";
+	   patchMixType = "patagonia_dirt";
+	}
+	else
+	{
+         baseType = "patagonia_dirt";
+	   patchMixType = "patagonia_grass";
+	}
+	forestType = "patagonia forest";
+      cliffType = "Patagonia";
+      pondType = "hudson bay";
+	treeType = "TreePatagoniaDirt";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "rhea";
+         centerHerdType = "rhea";
+	}
+      else 
+	{     
+         deerType = "rhea";
+         deer2Type = "deer";
+         centerHerdType = "rhea";
+	}
+      sheepType = "llama";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      hillTrees = rmRandInt(0,1);
+	extraBerries = 2;
+	makeCliffs = 2;
+	specialPatch = 1;
+      if (featureChance < 3)
+	{
+ 	   makeLake = 1;
+	}
+	else if (featureChance < 6)
+	{
+	   makeCentralHighlands = 1;
+   	   clearCenterChance = 2;
+	}
+	else if (featureChance < 8)
+	{
+	   makeCentralCanyon = 1;
+	}
+
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 15;
+	else if (fiveChoice == 3)
+	   nativePattern = 24;
+	else if (fiveChoice == 4)
+	   nativePattern = 25;
+	else
+	   nativePattern = 26;
+   }
+   else if (patternChance == 19) // palm desert
+   {   
+      rmSetMapType("sonora");
+	rmSetMapType("grass");
+      if (lightingChance == 1)
+         rmSetLightingSet("seville");
+      else
+         rmSetLightingSet("pampas");
+	if (twoChoice == 1)
+	{
+         baseType = "texas_dirt";
+         cliffType = "Texas";
+	}
+	else
+	{
+         baseType = "sonora_dirt";
+         cliffType = "Sonora";
+	}
+	forestType = "caribbean palm forest";
+	riverType = "Pampas River";
+	treeType = "TreeCaribbean";
+	pondType = "texas pond";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "turkey";
+	}
+      fishType = "FishBass";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      sheepType = "cow";
+      vultures = 1;
+	coverUp = 1;
+	makePonds = 0;
+      clearCenterChance = 1;
+      makeCliffs = 2;
+	noCliffForest = 1;
+      if (featureChance < 4)
+	{
+	   makeCentralCanyon = 1;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	}
+	else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   clearCenterChance = 0;
+	}
+
+	if (fourChoice == 1)
+	   nativePattern = 36;
+	else if (fourChoice == 2)
+	   nativePattern = 34;
+	else if (fourChoice == 3)
+	   nativePattern = 35;
+	else 
+	   nativePattern = 33;
+   }
+   else if (patternChance == 20) // yukon tundra
+   {
+      rmSetSeaType("hudson bay");
+      rmSetMapType("yukon");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+         rmSetLightingSet("seville morning");
+	else
+         rmSetLightingSet("yukon");
+      baseType = "yukon grass";
+	forestType = "yukon forest";
+	riverType = "Yukon River";
+      cliffType = "rocky mountain2";
+	if (rmRandInt(1,2) == 1)
+         pondType = "hudson bay";
+	else  
+         pondType = "great lakes ice";
+	treeType = "TreeYukon";
+      if (variantChance == 1)
+	{
+	   if (featureChance > 8)
+	   {
+		makeRiver = 1; 
+            deerType = "muskOx";
+            deer2Type = "caribou";
+            centerHerdType = "caribou";
+	   }
+	   else
+	   {
+	      centerMt = 1;
+	      clearCenterChance = 3;
+            deerType = "muskOx";
+            deer2Type = "caribou";
+            centerHerdType = "bighornsheep";
+	   }
+	}
+      else 
+	{  
+         deerType = "caribou"; 
+         deer2Type = "muskOx";
+         centerHerdType = "caribou";  
+	   clearCenterChance = 3;
+         if (featureChance < 4)
+		makeIce = 1;
+	   else if (featureChance < 8)	
+	      makeLake = 1;     
+	}
+      sheepChance = 0;
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      placeBerries = 0;
+      hillTrees = 0;  
+
+	if (threeChoice == 1)
+	   nativePattern = 5;
+	else if (threeChoice == 2)
+	   nativePattern = 6;
+	else if (threeChoice == 3)
+	   nativePattern = 16;
+   }
+   else if (patternChance == 21) // andes
+   {
+      rmSetSeaType("hudson bay");   
+      rmSetMapType("andes");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+         rmSetLightingSet("greatplainstest");
+	else
+	   rmSetLightingSet("andes");
+	if (twoChoice == 1)
+	{
+         baseType = "andes_grass_a";
+	   patchMixType = "andes_grass_b";
+	}
+	else
+	{
+         baseType = "andes_grass_b";
+	   patchMixType = "andes_grass_a";
+	}
+	forestType = "andes forest";
+	riverType = "Andes River";
+      cliffType = "andes";
+	treeType = "TreeAndes";
+      pondType = "hudson bay";      
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "rhea";
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	}
+      sheepType = "llama";
+      fishType = "FishMoonBass";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      hillTrees = rmRandInt(0,1);
+      makeCliffs = 2;
+      eagles = 1;
+	extraBerries = 2;
+      tropicalMap = 1;
+	specialPatch = 1;
+	if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   hillTrees = 0;
+	   clearCenterChance = 1;
+	}
+	else if (featureChance < 5)	
+	{
+	   makeCentralCanyon = 1;
+	   hillTrees = 0;
+	}
+	else if (featureChance < 7)
+	{
+	   centerMt = 1;
+   	   clearCenterChance = 1;
+	}
+	else if (featureChance == 10)	
+	{
+	   makeRiver = 1;
+	}
+
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 24;
+	else if (fiveChoice == 3)
+	   nativePattern = 25;
+	else if (fiveChoice == 4)
+	   nativePattern = 26;
+	else
+	   nativePattern = 18;
+   }
+   else if (patternChance == 22) // araucania green or central
+   {
+      rmSetSeaType("Araucania Central Coast");   
+      rmSetMapType("araucania");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Araucania Central");
+	else
+         rmSetLightingSet("Texas");  
+	if (fourChoice == 1)
+	{
+         baseType = "araucania_grass_a";
+	   patchMixType = "araucania_grass_b";
+	   makePonds = rmRandInt(1,5);
+	}
+	else if (fourChoice == 2)
+	{
+         baseType = "araucania_grass_b";
+	   patchMixType = "araucania_grass_a";
+	   makePonds = rmRandInt(1,5);
+	}
+	else if (fourChoice == 3)
+	{
+         baseType = "araucania_grass_c";
+	   patchMixType = "araucania_grass_b";
+	   makePonds = rmRandInt(1,5);
+	}
+	else
+	{
+         baseType = "araucania_grass_d";
+	   patchMixType = "araucania_grass_c";
+	}
+	forestType = "Araucania Forest";
+	riverType = "Andes River";
+	cliffType = "Araucania Central";      
+	treeType = "TreeAraucania";
+      pondType = "great plains pond";
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	} 
+      sheepType = "llama";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      makeCliffs = 2;
+	coverUp = 1;   
+	specialPatch = 1;
+	extraBerries = 1;
+	clearCenterChance = 0;
+      if (featureChance == 1)
+	{
+	   if (fourChoice < 4)
+	      makeLake = 1;
+	}
+	else if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	   clearCenterChance = 2;
+	}
+	else if (featureChance < 5)	
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 7)
+	{
+	   centerMt = 1;
+	   makeCliffs = 1;
+	}
+	else if (featureChance == 10)	
+	{
+	   makeRiver = 1;
+	   makePonds = 0;
+	}
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 25;
+	else if (fiveChoice == 3)
+	   nativePattern = 11;
+	else if (fiveChoice == 4)
+	   nativePattern = 26;
+	else
+	   nativePattern = 34;
+   }
+   else if (patternChance == 23) // araucania north  
+   {
+      rmSetSeaType("Araucania North Coast");
+      rmSetMapType("araucania");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("NthAraucaniaLight");
+	else
+         rmSetLightingSet("constantinople");  
+	if (cliffChance > 3)
+         makeCliffs = 1;
+	if (sixChoice == 1)
+	{
+	   baseType = "araucania_north_dirt_a"; 
+         patchMixType = "araucania_north_grass_a";
+	   makeCliffs = 0;
+	}
+	else if (sixChoice == 2)
+	{
+	   baseType = "araucania_north_grass_a";
+         patchMixType = "araucania_north_dirt_a"; 
+	   makeCliffs = 0;
+	}
+	else if (sixChoice == 3)
+	{
+	   baseType = "araucania_north_grass_a";
+	   patchMixType = "araucania_north_grass_b"; 
+	   makeCliffs = 0;
+	}
+	else if (sixChoice == 4)
+	{
+	   baseType = "araucania_north_grass_b";
+	   patchMixType = "araucania_north_grass_a"; 
+	}
+	else if (sixChoice == 5)
+	{
+	   baseType = "araucania_north_grass_b";
+	   patchMixType = "araucania_north_grass_c"; 
+	}
+	else if (sixChoice == 6)
+	{
+	   baseType = "araucania_north_grass_c";
+	   patchMixType = "araucania_north_grass_a"; 
+	}
+	forestType =  "North Araucania Forest";
+	riverType = "Pampas River";
+	cliffType = "Araucania North";
+	treeType = "TreeAraucania";
+      pondType = "texas pond";   
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	} 
+      sheepType = "llama";
+      fishType = "FishSalmon";
+      mineType = "MineCopper";
+	coverUp = 1;
+	specialPatch = 1;
+	extraBerries = 2;
+	clearCenterChance = 2;
+	hillTrees = 0;
+	if (featureChance < 3)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 5)	
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	}
+
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 24;
+	else if (fiveChoice == 3)
+	   nativePattern = 25;
+	else if (fiveChoice == 4)
+	   nativePattern = 26;
+	else
+	   nativePattern = 18;
+   }
+   else if (patternChance == 24) // araucania south 
+   {
+      rmSetSeaType("Araucania Southern Coast");  
+      rmSetMapType("araucania");
+      rmSetMapType("snow");
+	if (lightingChance == 2)
+	   rmSetLightingSet("SthAraucaniaLight");
+	else
+	   rmSetLightingSet("303a_boston");  
+	if (fourChoice == 1)
+	{
+   	   baseType = "araucania_snow_a";
+         patchMixType = "araucania_snow_b";
+	}
+	else if (fourChoice == 2)
+	{
+   	   baseType = "araucania_snow_a";
+         patchMixType = "araucania_snow_c";
+	}
+	else if (fourChoice == 3)
+	{
+   	   baseType = "araucania_snow_c";
+         patchMixType = "araucania_snow_a";
+	}
+	else if (fourChoice == 4)
+	{
+   	   baseType = "araucania_snow_b";
+         patchMixType = "araucania_snow_a";
+	}
+	forestType = "Patagonia Snow Forest";
+	riverType = "Yukon River";  
+      cliffType = "Araucania South";
+	treeType = "TreePatagoniaSnow";
+	if (twoChoice == 1)
+	   pondType = "great lakes ice";  
+	else
+	   pondType = "Araucania Southern Coast"; 
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	} 
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "llama";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      placeBerries = 0;
+      hillTrees = rmRandInt(0,1);
+      makeCliffs = 2;
+	noCliffForest = 1;
+	if (featureChance < 3)
+	   makeLake = 1;
+	else if (featureChance == 3)
+	{
+	   makeCentralHighlands = 1;
+	   hillTrees = 0;
+	   clearCenterChance = 2;
+	}
+	else if (featureChance == 4)	
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   hillTrees = 0;
+	}
+	else if (featureChance == 5)
+	{
+	   centerMt = 1;
+	   hillTrees = 0;
+	}
+	else if (featureChance == 6)
+	{
+	   makeIce = 1;
+	   hillTrees = 0;
+	   cliffChance = 0;
+	}
+	else if (featureChance == 7)
+	{
+	   forestMt = 1;
+	   hillTrees = 0;
+	}
+	else if (featureChance == 10)	
+	{
+	   makeRiver = 1;
+	}
+	if (fourChoice == 1)
+	   nativePattern = 14;
+	else if (fourChoice == 2)
+	   nativePattern = 25;
+	else if (fourChoice == 3)
+	   nativePattern = 26;
+	else
+	   nativePattern = 11;
+   }
+   else if (patternChance == 25) // california green
+   {
+      rmSetSeaType("california coast");   
+      rmSetMapType("california");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("california");
+	else
+         rmSetLightingSet("new england");      
+	if (threeChoice == 1)
+	{
+         baseType = "california_grass";
+	   if (twoChoice == 1)
+	      patchMixType = "california_grassrocks"; 
+	   else
+	      patchMixType = "california_snowground5";  
+	}
+	else if (threeChoice == 2)
+	{
+         baseType = "california_grassrocks"; 
+	   if (twoChoice == 1)
+	      patchMixType = "california_grass"; 
+	   else
+	      patchMixType = "california_snowground5";  
+	}
+	else if (threeChoice == 3)
+	{
+         baseType = "california_snowground5";  
+	   if (twoChoice == 1)
+	      patchMixType = "california_grass"; 
+	   else
+	      patchMixType = "california_grassrocks"; 
+	}
+	if (fiveChoice < 3)
+	{ 
+	   forestType = "california redwood forest";
+	   treeType = "TreeRedwood";
+	}
+	else if (fiveChoice < 5)
+	{ 
+	   forestType = "California pine forest";
+	   treeType = "TreePonderosaPine";
+	}
+	else
+	{
+	   forestType = "california madrone forest";
+	   treeType = "TreeMadrone";
+	}
+	riverType = "Andes River";
+      cliffType = "California";
+      if (variantChance == 1)
+	{
+         deerType = "elk";
+         deer2Type = "deer";
+         centerHerdType = "elk";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "elk";
+	} 
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "minegold";
+	specialPatch = 1;
+	if (rmRandInt(1,2) == 1)
+	   forestCoverUp = 1; 
+      hillTrees = rmRandInt(0,1);
+      eagles = 1;
+	extraBerries = 2;
+	if (featureChance == 1)
+	{
+	   makeLake = 1;
+	   pondType = "california coast";
+	}
+	else if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 6)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 9)
+	{
+	   makePonds = 1;
+         pondType = "great plains pond";
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 2;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+	if (fourChoice < 3)
+	   nativePattern = 27;
+	else
+	   nativePattern = 28;
+   }
+   else if (patternChance == 26) // california desert 
+   {
+      rmSetSeaType("Araucania North Coast");   
+      rmSetMapType("california");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("texas");
+	else
+         rmSetLightingSet("307a_beach");      
+      if (variantChance == 1)
+	{
+         deerType = "pronghorn";
+         deer2Type = "pronghorn";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "pronghorn";
+	}
+	forestType = "California Desert Forest";
+	treeType = "TreeSonora";
+	if (cliffChance > 5)  
+         makeCliffs = 1;
+	if (threeChoice == 1)
+	{ 
+	   baseType = "california_desert0";
+	   patchMixType = "california_desert";
+	}
+	else if (threeChoice == 2)
+	{ 
+	   baseType = "california_desert";
+	   patchMixType = "california_desert0";
+	}
+	else
+	{
+	   baseType = "california_desert2";
+	   patchMixType = "california_desert";
+	   forestType = "california madrone forest";
+	   treeType = "TreeMadrone";
+	   makeCliffs = 0;
+         centerHerdType = "elk";
+	}
+	riverType = "Andes River";
+	cliffType = "Sonora";
+       if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishBass";
+      mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+      vultures = 1;
+	coverUp = 1;
+	clearCenterChance = 2;
+	if (featureChance < 3)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance < 5)
+	{
+	   makeCentralCanyon = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 5)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+	if (fourChoice < 3)
+	   nativePattern = 27;
+	else
+	   nativePattern = 43;
+   }
+   else if (patternChance == 27) // nwt    
+   {
+      rmSetSeaType("Northwest Territory Water");   
+      rmSetMapType("northwestTerritory");
+      rmSetMapType("grass");
+	if (lightingChance == 2)
+	   rmSetLightingSet("nwterritory");
+	else
+         rmSetLightingSet("saguenay");
+      baseType = "nwt_grass1";
+	if (twoChoice == 1)
+	{
+	   forestType = "NW Territory Birch Forest";
+   	   treeType = "TreeGreatLakes";
+	}
+	else
+	{ 
+	   forestType = "NW Territory Forest";
+	   treeType = "TreeGreatPlains";   
+	}
+	riverType = "Northwest Territory Water";
+	cliffType = "Araucania Central";    
+	pondType = "Northwest Territory Water";
+      if (variantChance == 1)
+	{
+         deerType = "elk";
+         deer2Type = "deer";
+         centerHerdType = "moose"; 
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "elk";
+	} 
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      makeCliffs = 2;  
+      eagles = 1;
+	extraBerries = 2;
+      fishType = "FishSalmon";
+      mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+	coverUp = 1;
+      if (featureChance < 3)
+	   makeLake = 1;
+	else if (featureChance < 5)
+	   makeCentralHighlands = 1;
+      else if (featureChance < 7)
+	   forestMt = 1;
+      else if (featureChance == 9)
+         makePonds = 1;
+	else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   makePonds = 0;
+	}
+	if (fourChoice == 1)
+	   nativePattern = 27;
+	else if (fourChoice == 2)
+	   nativePattern = 28;
+	else if (fourChoice == 3)
+	   nativePattern = 7;
+	else
+	   nativePattern = 6;
+   }
+   else if (patternChance == 28) // painted desert     
+   {   
+      rmSetSeaType("hudson bay");
+      rmSetMapType("sonora");
+	rmSetMapType("desert");
+      if (lightingChance == 1)
+         rmSetLightingSet("sonora");
+      else
+         rmSetLightingSet("pampas");
+	if (twoChoice == 1)
+         baseType = "painteddesert_groundmix_1";
+	else
+         baseType = "painteddesert_groundmix_2";
+	forestType = "painteddesert forest";
+	riverType = "Pampas River";
+      cliffType = "Painteddesert";
+      cliffVariety = 8;
+	treeType = "TreePaintedDesert";
+	pondType = "texas pond";
+      if (variantChance == 1)
+	{
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bighornsheep";         
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bighornsheep";
+         centerHerdType = "bison";         
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishBass";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "MineCopper";
+      vultures = 1;
+      reducedForest = 1;
+      if (featureChance < 4)
+	{
+	   makeCentralCanyon = 1;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	}
+      makeCliffs = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 30;
+	else if (fiveChoice == 2)
+	   nativePattern = 31;
+	else if (fiveChoice == 3)
+	   nativePattern = 32;
+	else if (fiveChoice == 4)
+	   nativePattern = 33;
+	else
+	   nativePattern = 37;
+   }
+   else if (patternChance == 29) // HONSHU  
+   {   
+      rmSetSeaType("Coastal Japan");
+      rmSetMapType("ceylon");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Honshu");
+	else
+	   rmSetLightingSet("new england");
+      baseType = "coastal_japan_a";
+      patchMixType = "coastal_japan_c";
+	forestType = "Coastal Japan Forest";
+	riverType = "Coastal Japan";
+      cliffType = "Coastal Japan";
+	pondType = "Coastal Japan";
+	treeType = "ypTreeJapaneseMaple";
+      if (variantChance == 1)
+	{
+         deerType = "ypNilgai";
+         deer2Type = "ypGiantSalamander";
+         centerHerdType = "ypNilgai";         
+	}
+      else 
+	{     
+         deerType = "ypNilgai";
+         deer2Type = "ypNilgai";
+         centerHerdType = "ypGiantSalamander";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishCatfish";
+	mineType = "mine";
+	specialPatch = 1;
+	if (featureChance == 1)
+	{
+	   makeLake = 1;
+	}
+	else if (featureChance < 4)	
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+      else if (featureChance < 6)
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   hillTrees = 0;
+	}
+      else if (featureChance == 6)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      nativePattern = 44;
+   }
+   else if (patternChance == 30) // DECCAN
+   {   
+      rmSetSeaType("Coastal Japan");
+      rmSetMapType("deccan");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("deccan");
+	else
+	   rmSetLightingSet("texas");
+	if (twoChoice == 1)
+	{
+         baseType = "deccan_grassy_Dirt_a";
+	   patchMixType = "deccan_grass_a";
+         cliffType = "Deccan Plateau";
+	}
+	else
+	{
+         baseType = "deccan_grass_a";
+	   patchMixType = "deccan_grassy_Dirt_a";
+         cliffType = "Deccan Plateau River";
+	} 
+	if (threeChoice == 1)
+	{
+ 	   forestType = "Ashoka Forest";
+	   forest2Type = "Deccan Forest";
+   	   treeType = "ypTreeAshoka";
+	   if (rmRandInt(1,2) == 1)
+	      dualForest = 1;
+	}
+	else if (threeChoice == 2)
+	{
+ 	   forestType = "Eucalyptus Forest";
+	   forest2Type = "Deccan Forest";
+   	   treeType = "ypTreeEucalyptus";
+	   if (rmRandInt(1,2) == 1)
+	      dualForest = 1;
+	}
+	else
+	{
+	   forestType = "Deccan Forest";
+   	   treeType = "ypTreeDeccan";
+	}
+	riverType = "Deccan Plateau River";
+      if (variantChance == 1)
+	{
+         deerType = "Zebra";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "Zebra";         
+	}
+      else 
+	{     
+         deerType = "Zebra";
+         deer2Type = "Zebra";
+         centerHerdType = "ypWildElephant";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishCatfish";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineCopper";
+	else
+	   mineType = "mine";
+	specialPatch = 1;
+	if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 5)	
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   hillTrees = 0;
+	}
+      else if (featureChance == 5)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+	}
+	else
+	{
+	   if (twoChoice == 2)
+	      clearCenter = 1;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+
+	if (threeChoice == 1)
+         nativePattern = 45;
+	else if (threeChoice == 2)
+         nativePattern = 46;
+	else if (threeChoice == 3)
+         nativePattern = 47;
+   }
+   else if (patternChance == 31) // HIMALAYAS
+   {   
+      rmSetSeaType("Hudson Bay");
+      rmSetMapType("himalayas");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Himalayas");
+	else
+	   rmSetLightingSet("Yukon");
+      baseType = "himalayas_a";
+      patchMixType = "himalayas_b";
+	forestType = "Himalayas Forest";
+	riverType = "Yukon River";
+      cliffType = "himalayas";
+	treeType = "ypTreeHimalayas";
+      if (variantChance == 1)
+	{
+         deerType = "ypIbex";
+         deer2Type = "ypNilgai";
+         centerHerdType = "ypIbex";         
+	}
+      else 
+	{     
+         deerType = "ypNilgai";
+         deer2Type = "ypIbex";
+         centerHerdType = "ypNilgai";        
+	}
+      sheepType = "ypYak";
+      fishType = "ypFishCatfish";
+	mineType = "mine";
+	if (rmRandInt(1,2) == 1)
+         placeBerries = 0;
+	specialPatch = 1;
+      clearCenterChance = 1;
+	if (featureChance < 3)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 2;
+         clearCenterChance = 1;
+	}
+	else if (featureChance < 5)	
+	{
+	   makeCentralCanyon = 1;
+	   cliffChance = 0;
+	   hillTrees = 0;
+         clearCenterChance = 0;
+	}
+      else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+         clearCenterChance = 0;
+	}
+	if (cliffChance > 0)
+         makeCliffs = 1;
+	cliffVariety = 10;
+      nativePattern = 49;
+   }
+   else if (patternChance == 32) // INDOCHINA-BORNEO
+   {   
+      rmSetSeaType("borneo coast");
+      rmSetMapType("borneo");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("borneo");
+	else
+	   rmSetLightingSet("bayou");
+      baseType = "borneo_grass_a";
+      patchMixType = "borneo_sand_a";
+	if (fourChoice == 1)
+	{
+	   forestType = "Borneo Palm Forest";
+	   forest2Type = "Borneo Canopy Forest";
+	   dualForest = 1;
+	}
+	else if (fourChoice == 2)
+	{
+	   forestType = "Borneo Palm Forest";
+	}
+	else if (fourChoice == 3)
+	{
+	   forestType = "Borneo Canopy Forest";
+	}
+	else
+	   forestType = "Borneo Forest";
+	riverType = "Borneo Water";
+	pondType = "Borneo Water";
+	treeType = "ypTreeBorneo";
+      if (variantChance == 1)
+	{
+         deerType = "ypNilgai";
+         deer2Type = "ypNilgai";
+         centerHerdType = "ypWildElephant";         
+	}
+      else 
+	{     
+         deerType = "ypNilgai";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "ypNilgai";        
+	}
+      sheepType = "ypWaterBuffalo";
+      fishType = "ypFishCatfish";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineGold";
+	else
+	   mineType = "mine";
+	extraBerries = 1;
+	if (rmRandInt(1,2) == 1)
+	   specialPatch = 1;
+	makePonds = rmRandInt(1,8);
+	if (featureChance == 1)
+	{
+	   makeLake = 1;
+	   makePonds = 0;
+	}
+      else if (featureChance < 4)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance > 8)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+	   makePonds = 0;
+	}
+      makeCliffs = 0;
+
+      nativePattern = 48;
+   }
+   else if (patternChance == 33) // MONGOLIA
+   {   
+      rmSetSeaType("Hudson Bay");
+      rmSetMapType("mongolia");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Mongolia");
+	else
+	   rmSetLightingSet("Pampas");
+	if (twoChoice == 1)
+	{
+         baseType = "mongolia_grass_b";
+         patchMixType = "mongolia_grass_a";
+	   forestType = "Mongolian Forest";
+	   treeType = "ypTreeMongolianFir";
+	}
+	else
+	{
+         baseType = "mongolia_desert";
+         patchMixType = "mongolia_grass_b";
+	   forestType = "Saxaul Forest";
+         treeType = "ypTreeSaxaul";
+	}
+      if (variantChance == 1)
+	{
+         deerType = "ypSaiga";
+         deer2Type = "Zebra";
+         centerHerdType = "ypSaiga";         
+	}
+      else 
+	{     
+         deerType = "Zebra";
+         deer2Type = "ypSaiga";
+         centerHerdType = "Zebra";        
+	}
+      sheepType = "ypYak";
+      fishType = "ypFishCatfish";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineCopper";
+	else
+	   mineType = "mine";
+	specialPatch = 1;
+	extraBerries = 2;
+      if (twoChoice == 1)
+	{
+	   if (featureChance > 5)
+            clearCenter = 1;
+	}
+	else
+         clearCenterChance = 2;
+
+      makeCliffs = 0;
+
+      nativePattern = 50;
+   }
+   else if (patternChance == 34) // CEYLON  
+   {   
+      rmSetSeaType("ceylon coast");
+      rmSetMapType("ceylon");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("ceylon");
+	else
+	   rmSetLightingSet("Great Lakes");
+      baseType = "ceylon_grass_a";
+      patchMixType = "ceylon_sand_a";
+	forestType = "Ceylon Forest";
+      cliffType = "ceylon";
+	treeType = "ypTreeCeylon";
+      if (variantChance == 1)
+	{
+         deerType = "ypNilgai";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "ypNilgai";         
+	}
+      else 
+	{     
+         deerType = "ypNilgai";
+         deer2Type = "ypNilgai";
+         centerHerdType = "ypWildElephant";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishCarp";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "minegold";
+	else
+	   mineType = "mine";
+	extraBerries = 1;
+	specialPatch = 1;
+	if (featureChance < 3)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 5)	
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   hillTrees = 0;
+	}
+      else if (featureChance == 5)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      nativePattern = 51;
+   }
+   else if (patternChance == 35) // YELLOW RIVER 
+   {   
+      rmSetSeaType("ceylon coast");
+      rmSetMapType("yellowRiver");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("carolina");
+	else
+	   rmSetLightingSet("Great Lakes");
+      baseType = "yellow_river_a";
+      patchMixType = "yellow_river_b";
+	dualForest = 1;
+	if (twoChoice == 1)
+	{
+ 	  forestType = "Yellow River Forest";
+	  forest2Type = "Bamboo Forest";
+   	  treeType = "ypTreeBamboo";
+	}
+	else
+	{
+ 	  forestType = "Yellow River Forest";
+	  forest2Type = "Ginkgo Forest";
+   	  treeType = "ypTreeGinkgo";
+	}
+      riverType = "Yellow River";
+	pondType = "Yellow River Flooded";
+      cliffType = "Yellow River";
+      if (variantChance == 1)
+	{
+         deerType = "ypMuskDeer";
+         deer2Type = "ypNilgai";
+         centerHerdType = "ypMuskDeer";         
+	}
+      else 
+	{     
+         deerType = "ypMuskDeer";
+         deer2Type = "ypMuskDeer";
+         centerHerdType = "ypNilgai";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishCarp";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineCopper";
+	else
+	   mineType = "mine";
+	specialPatch = 1;
+	makePonds = rmRandInt(1,8);
+	if (featureChance == 1)
+	{
+	   makeLake = 1;
+	   makePonds = 0;
+	}
+	if (featureChance < 4)
+	{
+	   makeCentralHighlands = 1;
+	   cliffChance = 0;
+	}
+	else if (featureChance == 4)	
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   hillTrees = 0;
+	   makePonds = 0;
+	}
+      else if (featureChance == 5)
+	{
+	   forestMt = 1;
+	   cliffChance = 0;
+	}
+      else if (featureChance > 8)
+	{
+	   makeRiver = 1;
+	   cliffChance = 0;
+	   makePonds = 0;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+
+	if (cliffChance > 5)
+         makeCliffs = 1;
+
+      nativePattern = 52;
+   }
+   else if (patternChance == 36) // SIBERIA  
+   {   
+      rmSetSeaType("new england coast");
+      rmSetMapType("deccan");
+	rmSetMapType("grass");
+	if (featureChance == 7)
+	   rmSetLightingSet("great plains");
+	else
+	{
+	   if (lightingChance == 1)
+	      rmSetLightingSet("great plains");
+	   else
+            rmSetLightingSet("texas");
+	}
+	if (lightingChance == 1)
+	   baseType = "texas_grass";
+	else
+         baseType = "texas_grass";
+	forestType = "texas forest";
+	riverType = "Pampas River";
+      cliffType = "Texas Grass";
+	pondType = "texas pond";
+	treeType = "TreeTexasDirt";
+      if (variantChance == 1)
+	{
+         deerType = "Zebra";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "ypWildElephant";
+	}
+      else 
+	{     
+         deerType = "ypWildElephant";
+         deer2Type = "Zebra";
+         centerHerdType = "Zebra";
+	}
+      sheepType = "ypWaterBuffalo";
+      fishType = "FishBass";
+	mineType = "mine";
+      vultures = 1;
+      clearCenterChance = 1;
+      makeCliffs = 1;
+      if (featureChance < 4)
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance < 7)
+	{
+	   makeCentralHighlands = 1;
+	   makeCliffs = 2;
+	}
+	else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   makeCliffs = 2;
+	   clearCenterChance = 0;
+	}
+
+	nativeChoice = rmRandInt(1,6);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 31;
+	else if (nativeChoice == 5)
+	   nativePattern = 38;
+	else
+	   nativePattern = 39;
+   }
+   else if (patternChance == 37) // GREEN SIBERIA  
+   {
+      rmSetSeaType("Northwest Territory Water");   
+      rmSetMapType("mongolia");
+      rmSetMapType("grass");
+	if (lightingChance == 2)
+	   rmSetLightingSet("nwterritory");
+	else
+         rmSetLightingSet("saguenay");
+      baseType = "nwt_grass1";
+      forestType = "NW Territory Forest";
+      treeType = "TreeGreatPlains";   
+	riverType = "Northwest Territory Water";
+	cliffType = "Araucania Central";    
+	pondType = "Northwest Territory Water";
+      if (variantChance == 1)
+	{
+         deerType = "ypMuskDeer";
+         deer2Type = "ypSaiga";
+         centerHerdType = "ypSaiga";         
+	}
+      else 
+	{     
+         deerType = "ypSaiga";
+         deer2Type = "ypMuskDeer";
+         centerHerdType = "ypSaiga";        
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "ypGoat"; 
+      eagles = 1;
+      fishType = "FishSalmon";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	else
+	   mineType = "mine";
+      hillTrees = rmRandInt(0,1);
+	coverUp = 1;
+	makePonds = rmRandInt(1,4);
+      if (featureChance < 3)
+	   makeLake = 1;
+	else if (featureChance < 5)
+	   makeCentralHighlands = 1;
+      else if (featureChance < 7)
+	{
+	   makeCentralCanyon = 1;
+	   makeCliffs = 2;
+	   hillTrees = 0;
+	}
+	else if (featureChance == 10)
+	{
+	   makeRiver = 1;
+	   makePonds = 0;
+	   cliffChance = 0;
+	}
+	if (cliffChance > 7)
+         makeCliffs = 1;
+	if (twoChoice == 1)
+         nativePattern = 52;
+	else 
+         nativePattern = 54;
+   }
+
+   tradeRouteType1 = "dirt";
+   tradeRouteType2 = "dirt";
+   if (patternChance > 28)
+   {
+      tradeRouteType1 = "water";
+      tradeRouteType2 = "water";
+   }
+
+   if (clearCenterChance == 1)
+      clearCenter = rmRandInt(1,2);
+   if (clearCenterChance == 2)
+      clearCenter = rmRandInt(1,4);
+   if (clearCenterChance == 3)
+      clearCenter = rmRandInt(1,6);
+   if (clearCenter > 1)
+	clearCenter = 0;
+
+   rmSetBaseTerrainMix(baseType);
+   rmTerrainInitialize("yukon\ground1_yuk", 1);
+   rmEnableLocalWater(false);
+   rmSetMapType("land");
+   rmSetWorldCircleConstraint(true);
+   rmSetWindMagnitude(2.0);
+
+// Native patterns
+  if (nativePattern == 1)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Iroquois");
+      native2Name = "native iroquois village ";
+  }
+  else if (nativePattern == 2)
+  {
+      rmSetSubCiv(0, "Comanche");
+      native1Name = "native comanche village ";
+      rmSetSubCiv(1, "Lakota");
+      native2Name = "native lakota village ";
+  }
+  else if (nativePattern == 3)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Seminoles");
+      native2Name = "native seminole village ";
+  }
+  else if (nativePattern == 4)
+  {
+      rmSetSubCiv(0, "Cheyenne");
+      native1Name = "native cheyenne village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 5)
+  {
+      rmSetSubCiv(0, "Huron");
+      native1Name = "native huron village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 6)
+  {
+      rmSetSubCiv(0, "Nootka");
+      native1Name = "native nootka village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 7)
+  {
+      rmSetSubCiv(0, "Nootka");
+      native1Name = "native nootka village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 8)
+  {
+      rmSetSubCiv(0, "Cree");
+      native1Name = "native cree village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 9)
+  {
+      rmSetSubCiv(0, "Seminoles");
+      native1Name = "native seminole village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 10)
+  {
+      rmSetSubCiv(0, "Zapotec");
+      native1Name = "native zapotec village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 11)
+  {
+      rmSetSubCiv(0, "Mapuche");
+      native1Name = "native mapuche village ";
+      rmSetSubCiv(1, "Maya");
+      native2Name = "native maya village ";
+  }
+  else if (nativePattern == 12)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Maya");
+      native2Name = "native maya village ";
+  }
+  else if (nativePattern == 13)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Tupi");
+      native2Name = "native tupi village ";
+  }
+  else if (nativePattern == 14)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Tupi");
+      native2Name = "native tupi village ";
+  }
+  else if (nativePattern == 15)
+  {
+      rmSetSubCiv(0, "Maya");
+      native1Name = "native maya village ";
+      rmSetSubCiv(1, "Tupi");
+      native2Name = "native tupi village ";
+  }
+  else if (nativePattern == 16)
+  {
+      rmSetSubCiv(0, "Nootka");
+      native1Name = "native nootka village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 17)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Aztecs");
+      native2Name = "native aztec village ";
+  }
+  else if (nativePattern == 18)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Caribs");
+      native2Name = "native carib village ";
+  }
+  else if (nativePattern == 19)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 20)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 21)
+  {
+      rmSetSubCiv(0, "Seminoles");
+      native1Name = "native seminole village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 22)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 23)
+  {
+      rmSetSubCiv(0, "Comanche");
+      native1Name = "native comanche village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 24)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Maya");
+      native2Name = "native maya village ";
+  }
+  else if (nativePattern == 25)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Mapuche");
+      native2Name = "native mapuche village ";
+  }
+  else if (nativePattern == 26)
+  {
+      rmSetSubCiv(0, "Tupi");
+      native1Name = "native tupi village ";
+      rmSetSubCiv(1, "Mapuche");
+      native2Name = "native mapuche village ";
+  }
+  else if (nativePattern == 27)
+  {
+      rmSetSubCiv(0, "Klamath");
+      native1Name = "native klamath village ";
+      rmSetSubCiv(1, "Nootka");
+      native2Name = "native nootka village ";
+  }
+  else if (nativePattern == 28)
+  {
+      rmSetSubCiv(0, "Klamath");
+      native1Name = "native klamath village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 29)
+  {
+      rmSetSubCiv(0, "Comanche");
+      native1Name = "native comanche village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 30)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 31)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Navajo");
+      native2Name = "native navajo village ";
+  }
+  else if (nativePattern == 32)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 33)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 34)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 35)
+  {
+      rmSetSubCiv(0, "Maya");
+      native1Name = "native maya village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 36)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 37)
+  {
+      rmSetSubCiv(0, "Navajo");
+      native1Name = "native navajo village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 38)
+  {
+      rmSetSubCiv(0, "Navajo");
+      native1Name = "native navajo village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 39)
+  {
+      rmSetSubCiv(0, "Navajo");
+      native1Name = "native navajo village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 40)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 41)
+  {
+      rmSetSubCiv(0, "Lakota");
+      native1Name = "native lakota village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 42)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Seminoles");
+      native2Name = "native seminole village ";
+  }
+  else if (nativePattern == 43)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Klamath");
+      native2Name = "native klamath village ";
+  }
+  else if (nativePattern == 44)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "udasi");
+      native2Name = "native udasi village ";
+  }
+  else if (nativePattern == 45)
+  {
+      rmSetSubCiv(0, "udasi");
+      native1Name = "native udasi village ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ";
+  }
+  else if (nativePattern == 46)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque deccan ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ";
+  }
+  else if (nativePattern == 47)
+  {
+      rmSetSubCiv(0, "udasi");
+      native1Name = "native udasi village ";
+      rmSetSubCiv(1, "sufi");
+      native2Name = "native sufi mosque deccan ";
+  }
+  else if (nativePattern == 48)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque borneo ";
+      rmSetSubCiv(1, "jesuit");
+      native2Name = "native jesuit mission borneo 0";
+  }
+  else if (nativePattern == 49)
+  {
+      rmSetSubCiv(0, "udasi");
+      native1Name = "native udasi village himal ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village himal ";
+  }
+  else if (nativePattern == 50)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque mongol ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ceylon ";
+  }
+  else if (nativePattern == 51)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ceylon ";
+  }
+  else if (nativePattern == 52)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque mongol ";
+      rmSetSubCiv(1, "aztecs");
+      native2Name = "native Aztec village ";
+  }
+  else if (nativePattern == 53)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "aztecs");
+      native2Name = "native shaolin temple mongol 0";
+  }
+  else if (nativePattern == 54)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "jesuit");
+      native2Name = "native jesuit mission borneo 0";
+  }
+
+// Precipitation
+   if ((patternChance == 14) || (patternChance == 16)) // yucatan, amazon    
+      if (lightingChance == 2)
+         rmSetGlobalRain( 0.5 );
+   if (patternChance == 7) // yukon
+      rmSetGlobalSnow( 1.0 );
+   if ((patternChance == 5) || (patternChance == 20) || (patternChance == 24)) // gl winter, yukon tundra, s araucania 
+      if (lightingChance == 2)    
+         rmSetGlobalSnow( 0.7 );
+   if (patternChance == 8) // rockies
+      if (lightingChance == 2)
+         rmSetGlobalSnow( 0.5 );
+   if ((patternChance == 32) || (patternChance == 29)) // himalayas, siberia
+      if (rmRandInt(1,2) == 2)
+         rmSetGlobalRain( 0.3 );
+   if (patternChance == 30) // deccan
+      if (twoChoice == 2)
+         rmSetGlobalRain( 0.3 ); 
+
+   if (patternChance == 27) // nwt
+   {
+	// Make it rain
+	rmSetGlobalRain( 1.0 );
+	rmSetGlobalStormLength(1.0, 0.0);
+
+	// Sets up the rain triggers 
+	rmCreateTrigger("ChangeRain1");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain1"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 20);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 0.3);
+
+	rmCreateTrigger("ChangeRain2");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain2"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 40);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 1.0);
+
+	rmCreateTrigger("ChangeRain3");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain3"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 60);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 0.3);
+
+	rmCreateTrigger("ChangeRain4");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain4"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 75);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 0.0);
+   }
+   
+   chooseMercs();
+
+// Define some classes.
+   int classPlayer=rmDefineClass("player");
+   int lakeClass=rmDefineClass("lake");
+   rmDefineClass("classHill");
+   rmDefineClass("classPatch");
+   rmDefineClass("starting settlement");
+   rmDefineClass("startingUnit");
+   rmDefineClass("classForest");
+   rmDefineClass("importantItem");
+   rmDefineClass("natives");
+   rmDefineClass("classCliff");
+   rmDefineClass("center");
+   rmDefineClass("classNugget");
+   rmDefineClass("socketClass");
+   rmDefineClass("classIce");
+   rmDefineClass("classClearing"); 
+   int classHuntable=rmDefineClass("huntableFood");   
+   int classHerdable=rmDefineClass("herdableFood"); 
+   int canyon=rmDefineClass("canyon");
+
+   // Text
+   rmSetStatusText("",0.10);
+
+// -------------Define constraints
+   // Map edge constraints
+   int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(10), rmZTilesToFraction(10), 1.0-rmXTilesToFraction(10), 1.0-rmZTilesToFraction(10), 0.01);
+   int secondEdgeConstraint=rmCreateBoxConstraint("bison edge of map", rmXTilesToFraction(20), rmZTilesToFraction(20), 1.0-rmXTilesToFraction(20), 1.0-rmZTilesToFraction(20), 0.01);
+   int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int circleConstraintMt=rmCreatePieConstraint("circle Constraint for mts", 0.5, 0.5, 0, rmZFractionToMeters(0.2), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+   // Center constraints
+   int centerConstraint=rmCreateClassDistanceConstraint("stay away from center", rmClassID("center"), 30.0);
+   int centerConstraintShort=rmCreateClassDistanceConstraint("stay away from center short", rmClassID("center"), 12.0);
+   int centerConstraintFar=rmCreateClassDistanceConstraint("stay away from center far", rmClassID("center"), 70.0);
+   int centerConstraintForest=rmCreateClassDistanceConstraint("stay away from center forest", rmClassID("center"), rmZFractionToMeters(0.24));
+   int centerConstraintForest2=rmCreateClassDistanceConstraint("stay away from center forest 2", rmClassID("center"), rmZFractionToMeters(0.22));
+   int centerConstraintForest3=rmCreateClassDistanceConstraint("stay away from center forest 3", rmClassID("center"), rmZFractionToMeters(0.21));
+   int centerConstraintForest4=rmCreateClassDistanceConstraint("stay away from center forest 4", rmClassID("center"), rmZFractionToMeters(0.20));
+
+   // Player constraints
+   int playerConstraintForest=rmCreateClassDistanceConstraint("forests kinda stay away from players", classPlayer, 15.0);
+   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 40.0);
+   int mediumPlayerConstraint=rmCreateClassDistanceConstraint("medium stay away from players", classPlayer, 25.0);
+   int nuggetPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 60.0);
+   int farPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players more", classPlayer, 85.0);
+   int fartherPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players the most", classPlayer, 105.0);
+   int enormousPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players for asymmetric starts", classPlayer, 130.0);
+   int longPlayerConstraint=rmCreateClassDistanceConstraint("land stays away from players", classPlayer, 70.0); 
+
+   // Nature avoidance
+   int forestObjConstraint=rmCreateTypeDistanceConstraint("forest obj", "all", 6.0);
+   int shortForestConstraint=rmCreateClassDistanceConstraint("patch vs. forest", rmClassID("classForest"), 15.0);
+   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), forestDist);
+   int longForestConstraint=rmCreateClassDistanceConstraint("long forest vs. forest", rmClassID("classForest"), 26.0);
+   int avoidResource=rmCreateTypeDistanceConstraint("resource avoid resource", "resource", 20.0);
+   int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "gold", 10.0);
+   int shortAvoidSilver=rmCreateTypeDistanceConstraint("short gold avoid gold", "Mine", 20.0);
+   int coinAvoidCoin=rmCreateTypeDistanceConstraint("coin avoids coin", "gold", 35.0);
+   int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 1.0);
+   int avoidSheep=rmCreateClassDistanceConstraint("sheep avoids sheep etc", rmClassID("herdableFood"), 45.0);
+   int huntableConstraint=rmCreateClassDistanceConstraint("huntable constraint", rmClassID("huntableFood"), 35.0);
+   int longHuntableConstraint=rmCreateClassDistanceConstraint("long huntable constraint", rmClassID("huntableFood"), 55.0);
+   int forestsAvoidBison=rmCreateClassDistanceConstraint("forest avoids bison", rmClassID("huntableFood"), 15.0);
+   int avoidDucks=rmCreateTypeDistanceConstraint("avoids ducks", "DuckFamily", 50.0);
+
+   // Avoid impassable land, certain features
+   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 4.0);
+   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 2.0);
+   int longAvoidImpassableLand=rmCreateTerrainDistanceConstraint("long avoid impassable land", "Land", false, 18.0);
+   int hillConstraint=rmCreateClassDistanceConstraint("hill vs. hill", rmClassID("classHill"), 15.0);
+   int shortHillConstraint=rmCreateClassDistanceConstraint("patches vs. hill", rmClassID("classHill"), 5.0);
+   int longHillConstraint=rmCreateClassDistanceConstraint("far from hill", rmClassID("classHill"), 35.0);
+   int medHillConstraint=rmCreateClassDistanceConstraint("medium from hill", rmClassID("classHill"), 25.0);
+   int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 8.0);
+   int avoidCliffs=rmCreateClassDistanceConstraint("stuff vs. cliff", rmClassID("classCliff"), 12.0);
+   int avoidCliffsShort=rmCreateClassDistanceConstraint("stuff vs. cliff short", rmClassID("classCliff"), 7.0);
+   int cliffsAvoidCliffs=rmCreateClassDistanceConstraint("cliffs vs. cliffs", rmClassID("classCliff"), 30.0);
+   int avoidWater10 = rmCreateTerrainDistanceConstraint("avoid water mid-long", "Land", false, 10.0);
+   int avoidWater15 = rmCreateTerrainDistanceConstraint("avoid water mid-longer", "Land", false, 15.0);
+   int avoidWater20 = rmCreateTerrainDistanceConstraint("avoid water a little more", "Land", false, 20.0);
+   int avoidWater30 = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 30.0);
+   int avoidCanyons=rmCreateClassDistanceConstraint("avoid canyons", rmClassID("canyon"), 35.0);
+   int shortAvoidCanyons=rmCreateClassDistanceConstraint("short avoid canyons", rmClassID("canyon"), 15.0);
+   int nearShore=rmCreateTerrainMaxDistanceConstraint("tree v. water", "land", true, 14.0);
+   int rockVsLand = rmCreateTerrainDistanceConstraint("rock v. land", "land", true, 2.0);
+   int avoidLakes=rmCreateClassDistanceConstraint("stuff vs.lakes", rmClassID("lake"), 12.0);
+   int avoidLakesFar=rmCreateClassDistanceConstraint("stuff vs.lakes far", rmClassID("lake"), 55.0);
+   int avoidIce=rmCreateClassDistanceConstraint("stuff vs.ice", rmClassID("classIce"), 12.0);
+   int avoidClearing=rmCreateClassDistanceConstraint("avoid clearings", rmClassID("classClearing"), 11.0);  
+  
+   // Unit avoidance
+   int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 30.0);
+   int avoidStartingUnitsSmall=rmCreateClassDistanceConstraint("objects avoid starting units small", rmClassID("startingUnit"), 10.0);
+   int avoidStartingUnitsLarge=rmCreateClassDistanceConstraint("objects avoid starting units large", rmClassID("startingUnit"), 50.0);
+   int avoidImportantItem=rmCreateClassDistanceConstraint("things avoid each other", rmClassID("importantItem"), 10.0);
+   int avoidImportantItemSmall=rmCreateClassDistanceConstraint("important item small avoidance", rmClassID("importantItem"), 7.0);
+   int avoidNatives=rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 55.0);
+   int avoidNativesMed=rmCreateClassDistanceConstraint("stuff avoids natives medium", rmClassID("natives"), 35.0);
+   int avoidNativesShort=rmCreateClassDistanceConstraint("stuff avoids natives shorter", rmClassID("natives"), 15.0);
+   int avoidNugget=rmCreateClassDistanceConstraint("nugget vs. nugget", rmClassID("classNugget"), 42.0);
+   int avoidNuggetMed=rmCreateClassDistanceConstraint("nugget vs. nugget med", rmClassID("classNugget"), 50.0);
+   int avoidNuggetLong=rmCreateClassDistanceConstraint("nugget vs. nugget long", rmClassID("classNugget"), 65.0);
+   int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0);
+   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
+
+   // Trade route avoidance.
+   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 8.0);
+   int avoidSocket=rmCreateClassDistanceConstraint("avoid sockets", rmClassID("socketClass"), 13.0);
+
+// End of constraints -----------------------------------
+
+// Set up of trade routes for special situations
+   if (makeRiver == 1)
+   {
+	if (trPattern == 0)
+	   trPattern = 1;
+	if (trPattern == 3)
+	   trPattern = 2;
+	if (trPattern == 6)
+	   trPattern = 4;
+	if (trPattern == 7)
+	   trPattern = 5;
+	if (trPattern == 8)
+	   trPattern = 9;
+	if (trPattern == 10)
+	   trPattern = 11;
+   }
+
+   if ((makeLake == 1) || (makeIce == 1) || (makeCentralCanyon == 1) || (makeCentralHighlands == 1))      
+   {
+	if ((trPattern == 6) || (trPattern == 10))   
+	{
+	   if (rmRandInt(1,10) == 10)
+		trPattern = 11;
+	   else
+	   {
+	   if (rmRandInt(1,3) == 1)
+	      trPattern = rmRandInt(7,9);
+	   else
+	      trPattern = rmRandInt(0,5);
+	   }
+	}
+   }
+
+   if ((forestMt == 1) || (centerMt == 1))      
+   {
+      if (mtPattern == 1)
+	{
+	   if (rmRandInt(1,10) == 10)
+		trPattern = 11;
+	   else
+	   {
+	   if (rmRandInt(1,3) == 1)
+	      trPattern = rmRandInt(7,9);
+	   else
+	      trPattern = rmRandInt(0,5);
+	   }
+	}
+   }
+
+// Set up for native positions based on trade route
+   if (trPattern > 7)
+	endPosition = rmRandInt(1,2);
+   if (trPattern == 2)
+	endPosition = rmRandInt(2,3);
+   if (trPattern == 3)
+	endPosition = rmRandInt(2,3);
+   if (trPattern == 0)
+   {
+	if (rmRandInt(1,2) == 1)
+	   endPosition = 3;
+	else
+	   endPosition = 1;
+   }
+   if (trPattern == 1)
+   {
+	if (rmRandInt(1,2) == 1)
+	   endPosition = 3;
+	else
+	   endPosition = 1;
+   }
+
+// Set up for player start area distance from center
+   if (trPattern < 2)
+   {
+	if (rmRandInt(1,4) == 1)
+         distChance = 4;
+	else
+         distChance = rmRandInt(1,2);
+   }
+   if ((trPattern == 8) || (trPattern == 9)) 
+	distChance = rmRandInt(2,4);
+   if (trPattern == 11)
+	distChance = rmRandInt(1,2);
+
+// Set up player starting locations
+if (cNumberNonGaiaPlayers == 2)
+{
+   sectionChance = rmRandInt(1,13);
+   if (trPattern == 4)
+      sectionChance = rmRandInt(1,9);
+   if (trPattern == 5) 
+      sectionChance = rmRandInt(1,9);
+   if (axisChance == 1)
+   {
+      if (playerSide == 1)
+      {
+	     rmSetPlacementTeam(0);
+      }
+      else if (playerSide == 2)
+      {
+		rmSetPlacementTeam(1);
+      }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.24, 0.26);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.29, 0.31);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.19, 0.21);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.14, 0.16);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.34, 0.36);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.34, 0.36);
+	    else if (sectionChance == 7)
+             rmSetPlacementSection(0.14, 0.16);
+	    else if (sectionChance == 8)
+             rmSetPlacementSection(0.29, 0.31);
+	    else if (sectionChance == 9)
+             rmSetPlacementSection(0.19, 0.21);
+	    else if (sectionChance == 10)
+             rmSetPlacementSection(0.09, 0.11);
+	    else if (sectionChance == 11)
+             rmSetPlacementSection(0.89, 0.91);
+	    else if (sectionChance == 12)
+             rmSetPlacementSection(0.09, 0.11);
+	    else if (sectionChance == 13)
+             rmSetPlacementSection(0.39, 0.41);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.38, 0.40, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.74, 0.76);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.79, 0.81);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.69, 0.71);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.64, 0.66);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.84, 0.86);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.64, 0.66);
+	    else if (sectionChance == 7)
+             rmSetPlacementSection(0.84, 0.86);
+	    else if (sectionChance == 8)
+             rmSetPlacementSection(0.69, 0.71);
+	    else if (sectionChance == 9)
+             rmSetPlacementSection(0.79, 0.81);
+	    else if (sectionChance == 10)
+             rmSetPlacementSection(0.39, 0.41);
+	    else if (sectionChance == 11)
+             rmSetPlacementSection(0.59, 0.61);
+	    else if (sectionChance == 12)
+             rmSetPlacementSection(0.59, 0.61);
+	    else if (sectionChance == 13)
+             rmSetPlacementSection(0.89, 0.91);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.38, 0.40, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+   }
+   else if (axisChance == 2)
+   {
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.49, 0.51);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.44, 0.46);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.54, 0.56);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.39, 0.41);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.59, 0.61);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.89, 0.91);
+	    else if (sectionChance == 7)
+             rmSetPlacementSection(0.09, 0.11);
+	    else if (sectionChance == 8)
+             rmSetPlacementSection(0.54, 0.56);
+	    else if (sectionChance == 9)
+             rmSetPlacementSection(0.44, 0.46);
+	    else if (sectionChance == 10)
+             rmSetPlacementSection(0.14, 0.16);
+	    else if (sectionChance == 11)
+             rmSetPlacementSection(0.34, 0.36);
+	    else if (sectionChance == 12)
+             rmSetPlacementSection(0.34, 0.36);
+	    else if (sectionChance == 13)
+             rmSetPlacementSection(0.64, 0.66);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.38, 0.40, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.99, 0.01);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.94, 0.96);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.04, 0.06);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.89, 0.91);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.09, 0.11);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.59, 0.61);
+	    else if (sectionChance == 7)
+             rmSetPlacementSection(0.39, 0.41);
+	    else if (sectionChance == 8)
+             rmSetPlacementSection(0.94, 0.96);
+	    else if (sectionChance == 9)
+             rmSetPlacementSection(0.04, 0.06);
+	    else if (sectionChance == 10)
+             rmSetPlacementSection(0.84, 0.86);
+	    else if (sectionChance == 11)
+             rmSetPlacementSection(0.64, 0.66);
+	    else if (sectionChance == 12)
+             rmSetPlacementSection(0.84, 0.86);
+	    else if (sectionChance == 13)
+             rmSetPlacementSection(0.14, 0.16);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.38, 0.40, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+   }
+}   
+else 
+{ 
+   if (cNumberTeams == 2)
+   {
+      if (cNumberNonGaiaPlayers == 4) // 2 teams, 4 players 
+      {
+	  sectionChance = rmRandInt(1,6);
+        if (axisChance == 1)
+        {
+          if (playerSide == 1)
+          {
+	  	rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.21, 0.29);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.19, 0.31);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.18, 0.32);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.17, 0.33);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.16, 0.26);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.24, 0.34);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.71, 0.79);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.69, 0.81);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.68, 0.82);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.67, 0.83);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.66, 0.76);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.74, 0.84);          
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+        }
+        else if (axisChance == 2)
+        {
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.46, 0.54);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.44, 0.56);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.43, 0.57);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.42, 0.58);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.41, 0.51);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.49, 0.59);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.96, 0.04);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.94, 0.06);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.93, 0.07);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.92, 0.08);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.91, 0.01);
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.99, 0.09);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+        } 
+      }
+      else if (cNumberNonGaiaPlayers <7) // for 2 teams, for 3 or 5-6 players
+      {
+        if (axisChance == 1)
+        {
+          if (playerSide == 1)
+          {
+	  	rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.17, 0.33);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.15, 0.35);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.13, 0.37);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.67, 0.83);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.65, 0.85);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.63, 0.87);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+        }
+        else if (axisChance == 2)
+        {
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.42, 0.58);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.40, 0.60);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.38, 0.62);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.92, 0.08);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.90, 0.10);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.88, 0.12);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+        }
+      }
+      else  // for 2 teams, for over 6 players
+      {
+        if (axisChance == 1)
+        {
+          if (playerSide == 1)
+          {
+	  	rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.15, 0.35);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.13, 0.37);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.11, 0.39);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.43, 0.45, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.65, 0.85);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.63, 0.87);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.61, 0.89);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.43, 0.45, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+        }
+        else if (axisChance == 2)
+        {
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(0);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(1);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.40, 0.60);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.38, 0.62);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.36, 0.64);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.43, 0.45, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+
+	    if (playerSide == 1)
+          {
+		rmSetPlacementTeam(1);
+	    }
+          else if (playerSide == 2)
+	    {
+		rmSetPlacementTeam(0);
+	    }
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.90, 0.10);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.88, 0.12);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.86, 0.14);
+
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.43, 0.45, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+        }
+      }
+   }
+   else  // for FFA or over 2 teams
+   {
+      if (cNumberNonGaiaPlayers == 3) 
+      {
+		if (ffaChance == 1)
+		{
+   		   rmPlacePlayer(1, 0.31, 0.71);
+		   rmPlacePlayer(2, 0.69, 0.71);
+		   rmPlacePlayer(3, 0.69, 0.29);
+		}
+		else if (ffaChance == 2)
+		{
+   		   rmPlacePlayer(2, 0.31, 0.71);
+		   rmPlacePlayer(3, 0.69, 0.71);
+		   rmPlacePlayer(1, 0.69, 0.29);
+		}		
+		else if (ffaChance == 3)
+		{
+   		   rmPlacePlayer(3, 0.31, 0.71);
+		   rmPlacePlayer(1, 0.69, 0.71);
+		   rmPlacePlayer(2, 0.69, 0.29);
+		}
+		else
+            { 
+	      if (distChance == 1)
+	         rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	      else if (distChance == 2)
+	         rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	      else if (distChance == 3)
+	         rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	      else if (distChance == 4)
+	         rmPlacePlayersCircular(0.30, 0.32, 0.0);
+            }
+      }
+      else if (cNumberNonGaiaPlayers == 4) 
+      {
+		if (ffaChance == 1)
+		{
+   		   rmPlacePlayer(1, 0.31, 0.71);
+		   rmPlacePlayer(2, 0.69, 0.71);
+		   rmPlacePlayer(3, 0.69, 0.29);
+		   rmPlacePlayer(4, 0.31, 0.29);
+		}
+		else if (ffaChance == 2)
+		{
+   		   rmPlacePlayer(2, 0.31, 0.71);
+		   rmPlacePlayer(3, 0.69, 0.71);
+		   rmPlacePlayer(4, 0.69, 0.29);
+		   rmPlacePlayer(1, 0.31, 0.29);
+		}		
+		else if (ffaChance == 3) 
+		{
+   		   rmPlacePlayer(3, 0.31, 0.71);
+		   rmPlacePlayer(4, 0.69, 0.71);
+		   rmPlacePlayer(1, 0.69, 0.29);
+		   rmPlacePlayer(2, 0.31, 0.29);
+		}
+		else
+            { 
+	      if (distChance == 1)
+	         rmPlacePlayersCircular(0.41, 0.43, 0.0);
+	      else if (distChance == 2)
+	         rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	      else if (distChance == 3)
+	         rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	      else if (distChance == 4)
+	         rmPlacePlayersCircular(0.30, 0.32, 0.0);
+            }
+	}
+      else  // over 4 FFA 
+      { 
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.42, 0.44, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.39, 0.41, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.35, 0.37, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.30, 0.32, 0.0);
+      }
+   }
+}
+
+   // Text
+   rmSetStatusText("",0.20);
+	
+// Set up player areas.
+   float playerFraction=rmAreaTilesToFraction(120);
+   for(i=1; <cNumberPlayers)
+   {
+      int id=rmCreateArea("Player"+i);
+      rmSetPlayerArea(i, id);
+      rmSetAreaSize(id, playerFraction, playerFraction);
+      rmAddAreaToClass(id, classPlayer);
+      rmSetAreaMinBlobs(id, 1);
+      rmSetAreaMaxBlobs(id, 1);
+      rmAddAreaConstraint(id, longAvoidImpassableLand);
+      rmAddAreaConstraint(id, playerEdgeConstraint); 
+      rmSetAreaLocPlayer(id, i);
+      rmSetAreaMix(id, baseType);
+      rmSetAreaWarnFailure(id, false);
+   }
+   rmBuildAllAreas();
+
+   // Text
+   rmSetStatusText("",0.30);
+
+// Rivers
+   if (makeRiver == 1)  
+   {
+      int riverWidthChance = rmRandInt(1,3);
+      int rivermin = -1;
+      int rivermax = -1;
+      int riverVar = rmRandInt(12,18);
+      int shallowPattern = rmRandInt(1,5);
+      if ((trPattern == 2) || (trPattern == 4) || (trPattern == 5)|| (trPattern == 11))  // for less variability in river
+      {
+         riverWidthChance = rmRandInt(1,2);
+	   riverVar = rmRandInt(10,14);
+      }
+      if (riverWidthChance == 1)
+      {
+	   rivermin = 7;
+	   rivermax = 9;
+      }
+      else if (riverWidthChance == 2)
+      {
+         rivermin = 9;
+	   rivermax = 11;
+      }
+      else
+      {
+         rivermin = 10;
+	   rivermax = 12;
+      }
+	int singleRiver = rmRiverCreate(-1, riverType, 30, riverVar, rivermin, rivermax); 
+	if (axisChance == 1)
+	   rmRiverSetConnections(singleRiver, 0.5, 0.0, 0.5, 1.0);
+	else
+	   rmRiverSetConnections(singleRiver, 0.0, 0.5, 1.0, 0.5);
+	if (shallowPattern < 3)
+	{	
+	   rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	   rmRiverAddShallow(singleRiver, rmRandFloat(0.34, 0.42)); 
+
+	   rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	   rmRiverAddShallow(singleRiver, rmRandFloat(0.58, 0.66));
+	}
+	if (shallowPattern < 4)
+	{
+	   if (shallowPattern >1)
+	   {	
+	      rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	      rmRiverAddShallow(singleRiver, rmRandFloat(0.05, 0.2)); 
+
+	      rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	      rmRiverAddShallow(singleRiver, rmRandFloat(0.8, 0.95));
+	   }
+	}
+	if (shallowPattern > 3)
+	{	
+	   rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	   rmRiverAddShallow(singleRiver, rmRandFloat(0.05, 0.2)); 
+
+	   rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	   rmRiverAddShallow(singleRiver, rmRandFloat(0.8, 0.95));
+	}
+	if (shallowPattern > 2)
+	{
+	   if (shallowPattern < 5)
+	   {	
+	      rmRiverSetShallowRadius(singleRiver, rmRandInt(9, 12));
+	      rmRiverAddShallow(singleRiver, 0.5);
+	   }
+	}
+	rmRiverSetBankNoiseParams(singleRiver, 0.07, 2, 1.5, 10.0, 0.667, 3.0);
+	rmRiverBuild(singleRiver);
+   }
+
+// Trade Routes
+if (trPattern == 2) // 2 opposite inner semicircular routes
+{
+   // first route
+   int tradeRouteID = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.59, 0.82);
+	else	
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.54, 0.81);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.65, 0.70);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.66, 0.56);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.68, 0.54);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.68, 0.46);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.66, 0.44);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.65, 0.30);
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.59, 0.18);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.54, 0.19);
+   }
+   else 
+   {
+	if (makeRiver == 1)	
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.18, 0.59);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.19, 0.54);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.28, 0.65);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.40, 0.66);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.46, 0.68);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.54, 0.68);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.62, 0.66);
+	rmAddTradeRouteWaypoint(tradeRouteID, 0.60, 0.65);
+	if (makeRiver == 1)	
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.82, 0.59);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.81, 0.54);
+   }
+   rmBuildTradeRoute(tradeRouteID, tradeRouteType1);
+
+   // second route
+   int tradeRouteID2 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	if (makeRiver == 1)	
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.41, 0.18);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.46, 0.19);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.35, 0.30);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.34, 0.44);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.32, 0.46);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.32, 0.54);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.34, 0.56);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.35, 0.70);
+	if (makeRiver == 1)	
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.41, 0.82);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.46, 0.81);
+   }
+   else
+   {
+	if (makeRiver == 1)	
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.18, 0.41);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.19, 0.46);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.28, 0.35);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.40, 0.33);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.47, 0.32);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.53, 0.32);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.60, 0.33);
+	rmAddTradeRouteWaypoint(tradeRouteID2, 0.72, 0.35);
+	if (makeRiver == 1)	
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.82, 0.41);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID2, 0.81, 0.46);
+   }
+   rmBuildTradeRoute(tradeRouteID2, tradeRouteType2);	
+}
+else if (trPattern == 3)  // one 'circular' inner route
+{
+   int tradeRouteID3 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {	
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.51, 0.8);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.66, 0.55);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.68, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.66, 0.45);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.5, 0.2);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.34, 0.45);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.32, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.34, 0.55);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.495, 0.8);
+   }
+   else 
+   {	
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.2, 0.51);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.40, 0.66);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.5, 0.68);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.60, 0.66);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.8, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.60, 0.34);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.5, 0.32);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.40, 0.34);
+	rmAddTradeRouteWaypoint(tradeRouteID3, 0.2, 0.49);
+   }
+   rmBuildTradeRoute(tradeRouteID3, tradeRouteType1);
+}
+else if (trPattern == 4)  // two 'diagonal'
+{
+   int tradeRouteID4 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.67, 1.0);
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.6, 0.62);
+	if(variantChance == 1)
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.67, 0.55);
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.67, 0.45);
+	}
+	else
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.62, 0.55);
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.62, 0.45);
+	}
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.6, 0.38);
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.67, 0.0);
+   }
+   else if (axisChance == 2) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID4, 1.0, 0.67);
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.62, 0.6);
+	if(variantChance == 1)
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.55, 0.67);
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.45, 0.67);
+	}
+	else
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.55, 0.62);
+	   rmAddTradeRouteWaypoint(tradeRouteID4, 0.45, 0.62);
+	}
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.38, 0.6);
+	rmAddTradeRouteWaypoint(tradeRouteID4, 0.0, 0.67);
+   }
+   rmBuildTradeRoute(tradeRouteID4, tradeRouteType2);
+
+   int tradeRouteID4A = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+     rmAddTradeRouteWaypoint(tradeRouteID4A, 0.33, 1.0);
+	rmAddTradeRouteWaypoint(tradeRouteID4A, 0.4, 0.62);
+	if(variantChance == 1)
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.33, 0.55);
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.33, 0.45);
+	}
+	else
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.38, 0.55);
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.38, 0.45);
+	}
+	rmAddTradeRouteWaypoint(tradeRouteID4A, 0.4, 0.38);
+      rmAddTradeRouteWaypoint(tradeRouteID4A, 0.33, 0.0);
+   }
+   else if (axisChance == 2) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID4A, 1.0, 0.33);
+	rmAddTradeRouteWaypoint(tradeRouteID4A, 0.62, 0.4);
+	if(variantChance == 1)
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.55, 0.33);
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.45, 0.33);
+	}
+	else
+	{
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.55, 0.38);
+	   rmAddTradeRouteWaypoint(tradeRouteID4A, 0.45, 0.38);
+	}
+	rmAddTradeRouteWaypoint(tradeRouteID4A, 0.38, 0.4);
+	rmAddTradeRouteWaypoint(tradeRouteID4A, 0.0, 0.33);
+   }
+   rmBuildTradeRoute(tradeRouteID4A, tradeRouteType1);
+}
+else if (trPattern == 5)  // two 'parabolas'
+{
+   int tradeRouteID5 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.68, 0.85);
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.6, 0.62);
+      if ((makeCentralCanyon == 1) || (makeCentralHighlands == 1) || (makeRiver == 1)) 
+    	   rmAddTradeRouteWaypoint(tradeRouteID5, 0.585, 0.5);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID5, 0.54, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.6, 0.38);
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.68, 0.15);
+   }
+   else if (axisChance == 2) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.85, 0.68);
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.62, 0.6);
+      if ((makeCentralCanyon == 1) || (makeCentralHighlands == 1) || (makeRiver == 1)) 
+	   rmAddTradeRouteWaypoint(tradeRouteID5, 0.5, 0.585);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID5, 0.5, 0.54);
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.38, 0.6);
+	rmAddTradeRouteWaypoint(tradeRouteID5, 0.15, 0.68);
+   }
+   rmBuildTradeRoute(tradeRouteID5, tradeRouteType1);
+
+   int tradeRouteID5A = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+      rmAddTradeRouteWaypoint(tradeRouteID5A, 0.32, 0.85);
+	rmAddTradeRouteWaypoint(tradeRouteID5A, 0.4, 0.62);
+      if ((makeCentralCanyon == 1) || (makeCentralHighlands == 1) || (makeRiver == 1))  
+         rmAddTradeRouteWaypoint(tradeRouteID5A, 0.415, 0.5);
+	else
+         rmAddTradeRouteWaypoint(tradeRouteID5A, 0.46, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID5A, 0.4, 0.38);
+      rmAddTradeRouteWaypoint(tradeRouteID5A, 0.32, 0.15);
+   }
+   else if (axisChance == 2) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID5A, 0.85, 0.32);
+	rmAddTradeRouteWaypoint(tradeRouteID5A, 0.62, 0.4);
+      if ((makeCentralCanyon == 1) || (makeCentralHighlands == 1) || (makeRiver == 1))  
+	   rmAddTradeRouteWaypoint(tradeRouteID5A, 0.5, 0.415);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID5A, 0.5, 0.46);
+	rmAddTradeRouteWaypoint(tradeRouteID5A, 0.38, 0.4);
+	rmAddTradeRouteWaypoint(tradeRouteID5A, 0.15, 0.32);
+   }
+   rmBuildTradeRoute(tradeRouteID5A, tradeRouteType2);
+}
+else if (trPattern == 6)  // one diagonal
+{
+   int tradeRouteID6 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.5, 0.0);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.48, 0.2);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.52, 0.35);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.5, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.48, 0.55);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.52, 0.8);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.5, 1.0);
+   }
+   else
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.0, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.2, 0.48);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.35, 0.52);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.5, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.65, 0.48);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 0.8, 0.52);
+	rmAddTradeRouteWaypoint(tradeRouteID6, 1.0, 0.5);
+   }
+   rmBuildTradeRoute(tradeRouteID6, tradeRouteType1);	
+}
+else if (trPattern == 7) // 2 intersecting 'parabolas'
+{
+   // first route
+   int tradeRouteID7 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.4, 1.0);	
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.58, 0.82);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.66, 0.55);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.68, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.66, 0.45);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.58, 0.18);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.4, 0.0);
+   }
+   else 
+   {	
+	rmAddTradeRouteWaypoint(tradeRouteID7, 1.0, 0.4);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.82, 0.58);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.60, 0.66);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.5, 0.68);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.40, 0.66);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.18, 0.58);
+	rmAddTradeRouteWaypoint(tradeRouteID7, 0.0, 0.4);
+   }
+   rmBuildTradeRoute(tradeRouteID7, tradeRouteType1);
+
+   // second route
+   int tradeRouteID7A = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.6, 0.0);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.42, 0.18);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.34, 0.45);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.32, 0.5);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.34, 0.55);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.42, 0.82);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.6, 1.0);
+   }
+   else
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.0, 0.6);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.18, 0.42);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.40, 0.34);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.5, 0.32);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.60, 0.34);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 0.82, 0.42);
+	rmAddTradeRouteWaypoint(tradeRouteID7A, 1.0, 0.6);
+   }
+   rmBuildTradeRoute(tradeRouteID7A, tradeRouteType2);	
+}
+else if (trPattern == 8)  // one 'circular' outside route
+{
+   int tradeRouteID8 = rmCreateTradeRoute();
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.0, 0.51); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.071, 0.6); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.105, 0.68); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.19, 0.81);  
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.325, 0.90);
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.5, 0.95); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.675, 0.90);
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.81, 0.81);  
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.895, 0.7);
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.937, 0.5); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.895, 0.3);
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.81, 0.19);   
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.675, 0.10);
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.5, 0.05);  
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.325, 0.10);
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.19, 0.19);  
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.105, 0.32); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.07, 0.4); 
+   rmAddTradeRouteWaypoint(tradeRouteID8, 0.0, 0.49); 
+   rmBuildTradeRoute(tradeRouteID8, tradeRouteType1);
+}
+else if (trPattern == 9)  // 2 'semi-circular' outside routes
+{
+   int tradeRouteID9 = rmCreateTradeRoute();
+   if (axisChance == 2)
+   { 
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.02, 0.575); 
+	else 
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.0, 0.525); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.07, 0.58); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.105, 0.68); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.19, 0.81);  
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.325, 0.90);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.5, 0.93); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.675, 0.90);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.81, 0.81); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.895, 0.7);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.93, 0.58);
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.98, 0.575); 
+	else 
+         rmAddTradeRouteWaypoint(tradeRouteID9, 1.0, 0.525);
+   }
+   else
+   {
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.575, 0.98); 
+	else   
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.525, 1.0); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.58, 0.93); 
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.68, 0.88);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.81, 0.81);  
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.89, 0.695);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.93, 0.5);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.89, 0.305);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.81, 0.19);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.68, 0.12);
+      rmAddTradeRouteWaypoint(tradeRouteID9, 0.58, 0.07);
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.575, 0.02); 
+	else  
+         rmAddTradeRouteWaypoint(tradeRouteID9, 0.525, 0.0); 
+   }
+   rmBuildTradeRoute(tradeRouteID9, tradeRouteType1);
+
+   // second route
+   int tradeRouteID9A = rmCreateTradeRoute();
+   if (axisChance == 2)
+   { 
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.98, 0.425); 
+	else 
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 1.0, 0.475);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.935, 0.42);  
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.89, 0.31);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.81, 0.19);   
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.675, 0.10);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.5, 0.07);  
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.325, 0.10);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.2, 0.2);  
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.11, 0.31); 
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.065, 0.42);
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.02, 0.425); 
+	else   
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.0, 0.475); 
+   }
+   else
+   {
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.425, 0.02); 
+	else 
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.475, 0.0);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.42, 0.065);   
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.31, 0.11);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.2, 0.2);  
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.10, 0.325);  
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.07, 0.5); 
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.10, 0.675); 
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.19, 0.81);  
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.31, 0.89);
+      rmAddTradeRouteWaypoint(tradeRouteID9A, 0.42, 0.935);
+	if(makeRiver == 1)
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.425, 0.98); 
+	else  
+         rmAddTradeRouteWaypoint(tradeRouteID9A, 0.475, 1.0);  
+   }
+   rmBuildTradeRoute(tradeRouteID9A, tradeRouteType2);
+}
+else if (trPattern == 0)  // one 'circular' middle route
+{
+   int tradeRouteID0 = rmCreateTradeRoute();
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.16, 0.508);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.24, 0.75);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.5, 0.84);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.76, 0.76);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.84, 0.5);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.76, 0.26);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.5, 0.16);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.24, 0.24);
+   rmAddTradeRouteWaypoint(tradeRouteID0, 0.16, 0.492);
+   rmBuildTradeRoute(tradeRouteID0, tradeRouteType1);
+}
+else if (trPattern == 1)  // 2 'semicircular' middle routes
+{
+   int tradeRouteID1 = rmCreateTradeRoute();
+   int tradeRouteID1A = rmCreateTradeRoute();
+   if (axisChance == 2)
+   {
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.165, 0.59);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.165, 0.56);
+      rmAddTradeRouteWaypoint(tradeRouteID1, 0.25, 0.74);
+      rmAddTradeRouteWaypoint(tradeRouteID1, 0.5, 0.835);
+      rmAddTradeRouteWaypoint(tradeRouteID1, 0.75, 0.74);
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.835, 0.59);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.835, 0.56);
+      rmBuildTradeRoute(tradeRouteID1, tradeRouteType1);	
+
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.835, 0.41);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.835, 0.44);
+      rmAddTradeRouteWaypoint(tradeRouteID1A, 0.75, 0.26);
+      rmAddTradeRouteWaypoint(tradeRouteID1A, 0.5, 0.165);
+      rmAddTradeRouteWaypoint(tradeRouteID1A, 0.25, 0.26);
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.165, 0.41);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.165, 0.44);
+      rmBuildTradeRoute(tradeRouteID1A, tradeRouteType2);
+   }
+   else if (axisChance == 1)
+   {
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.59, 0.835);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.55, 0.835);
+      rmAddTradeRouteWaypoint(tradeRouteID1, 0.74, 0.75);
+      rmAddTradeRouteWaypoint(tradeRouteID1, 0.835, 0.5);
+      rmAddTradeRouteWaypoint(tradeRouteID1, 0.74, 0.25);
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.59, 0.165);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1, 0.55, 0.165);
+      rmBuildTradeRoute(tradeRouteID1, tradeRouteType1);	
+
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.41, 0.165);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.45, 0.165);
+      rmAddTradeRouteWaypoint(tradeRouteID1A, 0.26, 0.25);
+      rmAddTradeRouteWaypoint(tradeRouteID1A, 0.165, 0.5);
+      rmAddTradeRouteWaypoint(tradeRouteID1A, 0.26, 0.75);
+	if (makeRiver == 1)
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.41, 0.835);
+	else
+	   rmAddTradeRouteWaypoint(tradeRouteID1A, 0.45, 0.835);
+      rmBuildTradeRoute(tradeRouteID1A, tradeRouteType2);
+   }
+}
+else if (trPattern == 10)  // new single with random waypoints
+{
+   int tradeRouteID10 = rmCreateTradeRoute();
+   vector tradeRoutePoint = cOriginVector;
+   if (axisChance == 1) 
+   {
+	tradeRoutePoint = rmFindClosestPoint(0.5, 0.0, 20.0);
+	rmAddTradeRouteWaypoint(tradeRouteID10, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)));
+	rmAddRandomTradeRouteWaypoints(tradeRouteID10, 0.55, 0.4, 4, 6);
+	rmAddRandomTradeRouteWaypoints(tradeRouteID10, 0.45, 0.6, 2, 3);
+	tradeRoutePoint = rmFindClosestPoint(0.5, 1.0, 20.0);
+	rmAddRandomTradeRouteWaypoints(tradeRouteID10, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
+   }
+   else // axisChance == 2
+   {
+	tradeRoutePoint = rmFindClosestPoint(0.0, 0.5, 20.0);
+	rmAddTradeRouteWaypoint(tradeRouteID10, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)));
+	rmAddRandomTradeRouteWaypoints(tradeRouteID10, 0.4, 0.45, 4, 6);
+	rmAddRandomTradeRouteWaypoints(tradeRouteID10, 0.6, 0.55, 2, 3);
+	tradeRoutePoint = rmFindClosestPoint(1.0, 0.5, 20.0);
+	rmAddRandomTradeRouteWaypoints(tradeRouteID10, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
+   } 
+   bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID10, tradeRouteType1);
+   if(placedTradeRoute == false)
+      rmEchoError("Failed to place trade route");  
+}
+else if (trPattern == 11)  // two wider spaced 'diagonals'
+{
+   int tradeRouteID11 = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.7, 1.0);
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.67, 0.62);
+      rmAddTradeRouteWaypoint(tradeRouteID11, 0.7, 0.55);
+      rmAddTradeRouteWaypoint(tradeRouteID11, 0.7, 0.45);
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.67, 0.38);
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.7, 0.0);
+   }
+   else if (axisChance == 2) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID11, 1.0, 0.7);
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.62, 0.67);
+      rmAddTradeRouteWaypoint(tradeRouteID11, 0.55, 0.7);
+      rmAddTradeRouteWaypoint(tradeRouteID11, 0.45, 0.7);
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.38, 0.67);
+	rmAddTradeRouteWaypoint(tradeRouteID11, 0.0, 0.7);
+   }
+   rmBuildTradeRoute(tradeRouteID11, tradeRouteType1);
+
+   int tradeRouteID11A = rmCreateTradeRoute();
+   if (axisChance == 1) 
+   {
+      rmAddTradeRouteWaypoint(tradeRouteID11A, 0.3, 1.0);
+	rmAddTradeRouteWaypoint(tradeRouteID11A, 0.33, 0.62);
+      rmAddTradeRouteWaypoint(tradeRouteID11A, 0.3, 0.55);
+      rmAddTradeRouteWaypoint(tradeRouteID11A, 0.3, 0.45);
+	rmAddTradeRouteWaypoint(tradeRouteID11A, 0.33, 0.38);
+      rmAddTradeRouteWaypoint(tradeRouteID11A, 0.3, 0.0);
+   }
+   else if (axisChance == 2) 
+   {
+	rmAddTradeRouteWaypoint(tradeRouteID11A, 1.0, 0.3);
+	rmAddTradeRouteWaypoint(tradeRouteID11A, 0.62, 0.33);
+      rmAddTradeRouteWaypoint(tradeRouteID11A, 0.55, 0.3);
+      rmAddTradeRouteWaypoint(tradeRouteID11A, 0.45, 0.3);
+	rmAddTradeRouteWaypoint(tradeRouteID11A, 0.38, 0.33);
+	rmAddTradeRouteWaypoint(tradeRouteID11A, 0.0, 0.3);
+   }
+   rmBuildTradeRoute(tradeRouteID11A, tradeRouteType1);
+}
+
+// Trade sockets
+   int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+   rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+   rmSetObjectDefAllowOverlap(socketID, true);
+   rmAddObjectDefToClass(socketID, rmClassID("importantItem"));
+   rmSetObjectDefMinDistance(socketID, 0.0);
+   rmSetObjectDefMaxDistance(socketID, 7.0);
+
+if (trPattern == 2) // 2 opposite inner semicircular routes
+{
+   // add the meeting poles along the trade route.
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+   vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.17);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.83);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+   // change the trade route for the new sockets
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID2);
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID2, 0.83);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID2, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID2, 0.17);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+}
+else if (trPattern == 3) // inner circle
+{
+   if (socketPattern == 1)
+   {
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID3);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.09);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.25);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.41);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.59);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.75);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.91);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   else if (socketPattern == 2)
+   {
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID3);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.15);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.35);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.65);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID3, 0.85);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+}
+else if (trPattern == 4) //  2 diagonal
+{
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID4);
+
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4, 0.88);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   else
+   {
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4, 0.17);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4, 0.83);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+
+   // change the trade route for the new sockets
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID4A);
+   if (socketPattern == 1)
+   {
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4A, 0.88);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4A, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+  
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4A, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   else
+   {
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4A, 0.83);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID4A, 0.17);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+}
+else if (trPattern == 5) //  2 parabolas
+{
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID5);
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID5, 0.17);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID5, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID5, 0.83);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+   // change the trade route for the new sockets
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID5A);
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID5A, 0.83);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID5A, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID5A, 0.17);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+}
+else if (trPattern == 6)   // one diagonal
+{
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID6);
+   if (socketPattern == 1)
+   {
+	if (twoChoice == 1) // 6 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.09);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.25);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.41);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.59);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.75);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.91);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+	else  // 4 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.36);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.64);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.88);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+   }
+   else if (socketPattern == 2)
+   {
+	if (twoChoice == 1) // 5 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.31);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.69);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.88);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+	else // 3 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.2);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID6, 0.8);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+   }
+}
+else if (trPattern == 7) // 2 intersecting parabolas
+{
+   // add the meeting poles along the trade route.
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID7);
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID7, 0.21);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID7, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID7, 0.79);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+   // change the trade route for the new sockets
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID7A);
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID7A, 0.79);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if (socketPattern == 1)
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID7A, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID7A, 0.21);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+}
+else if (trPattern == 8) // outer ring
+{ 
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID8);
+   if (socketPattern == 1) // 6 or 10 sockets
+   {
+      if (cNumberNonGaiaPlayers < 6)  // 6 sockets    
+      {
+ 	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.05);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.172);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.338);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.51);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.672);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.838);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+      }
+      else // over 5 players, 10 sockets 
+      {
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.05);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.15);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.25);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.35);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.45);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.55);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.65);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.75);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.85);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.95);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+      }	
+   }
+   else if (socketPattern == 2) // 8 sockets or 12 sockets    
+   {
+      if (cNumberNonGaiaPlayers < 6)  // 8 sockets 
+      { 
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.063);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.188);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.313);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.438);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.563);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.688);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.813);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.938);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+	else // over 5 players, 12 sockets
+	{
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.025);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.11);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.191);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.272);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.353);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.434);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.525);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.606);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.687);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.768);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.849);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+	    socketLoc = rmGetTradeRouteWayPoint(tradeRouteID8, 0.930);
+	    rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+      }
+   }
+}
+else if (trPattern == 9) //  2 outer semicircles
+{
+   if (socketPattern == 1) // 6 sockets
+   { 
+      if (variantChance == 1)
+	{
+          rmSetObjectDefTradeRouteID(socketID, tradeRouteID9);
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.1);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.43);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.76);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          // change the trade route for the new sockets
+          rmSetObjectDefTradeRouteID(socketID, tradeRouteID9A);
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.1);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.43);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.76);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	 }
+	 else
+	 {
+          rmSetObjectDefTradeRouteID(socketID, tradeRouteID9);
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.23);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.5);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.77);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          // change the trade route for the new sockets
+          rmSetObjectDefTradeRouteID(socketID, tradeRouteID9A);
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.23);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.5);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+          socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.77);
+          rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	 }
+   }
+   else if (socketPattern == 2) // 8 sockets
+   { 
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID9);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.37);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.62);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9, 0.87);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      // change the trade route for the new sockets
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID9A);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.37);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.62);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID9A, 0.87);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+}
+else if(trPattern == 0) // middle ring
+{
+   if (socketPattern == 1) // 6 sockets
+   {
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID0);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.01);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.172);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+  
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.338);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.51);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.672);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.835);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   else if (socketPattern == 2) // 8 sockets
+   {
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID0);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.063);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.188);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.313);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.438);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.563);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.688);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.813);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID0, 0.938);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+}
+else if (trPattern == 1) //  2 middle semicircles
+{
+   if (socketPattern == 1) // 3 each
+   { 
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID1);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.1);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.43);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.77);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      // change the trade route for the new sockets
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID1A);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.1);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.43);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.77);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   if (socketPattern == 2) // 4 each
+   { 
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID1);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.07);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.32);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.57);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1, 0.82);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      // change the trade route for the new sockets
+      rmSetObjectDefTradeRouteID(socketID, tradeRouteID1A);
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.07);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.32);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.57);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID1A, 0.82);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+}
+else if (trPattern == 10)    // one diagonal
+{
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID10);
+   if (socketPattern == 1)
+   {
+	if (twoChoice == 1) // 6 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.09);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.25);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.41);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.59);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.75);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.91);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+	else  // 4 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.36);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.64);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.88);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+   }
+   else if (socketPattern == 2)
+   {
+	if (twoChoice == 1) // 5 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.12);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.31);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.69);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.88);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+	else // 3 TPs
+	{
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.16);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID10, 0.84);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+	}
+   }
+}
+else if (trPattern == 11) // 2 new random diagonals
+{
+   // add the meeting poles along the trade route.
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID11);
+   if (socketPattern == 1)
+   {
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.21);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.79);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   else
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.15);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.35);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.65);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11, 0.85);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+
+   // change the trade route for the new sockets
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID11A);
+   if (socketPattern == 1)
+   {
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.21);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+ 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.79);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   else
+   { 
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.15);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.35);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.65);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID11A, 0.85);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+}
+
+   //Text
+   rmSetStatusText("",0.35);
+
+// Starting TCs and units 		
+   int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
+   rmSetObjectDefMaxDistance(startingUnits, 10.0);
+   rmAddObjectDefConstraint(startingUnits, avoidAll);
+
+   int startingTCID= rmCreateObjectDef("startingTC");
+   if ( rmGetNomadStart())
+   {
+	rmAddObjectDefItem(startingTCID, "CoveredWagon", 1, 0.0);
+   }
+   else
+   {
+      rmAddObjectDefItem(startingTCID, "TownCenter", 1, 0.0);
+   }
+   rmSetObjectDefMaxDistance(startingTCID, 18.0);
+   rmAddObjectDefConstraint(startingTCID, avoidAll);
+   rmAddObjectDefConstraint(startingTCID, avoidTradeRoute);
+   rmAddObjectDefConstraint(startingTCID, longAvoidImpassableLand );
+
+   int playerCrateFID=rmCreateObjectDef("bonus starting food crates");
+   rmAddObjectDefItem(playerCrateFID, "crateOfFood", rmRandInt(1,3), 6.0);
+   rmSetObjectDefMinDistance(playerCrateFID, 10);
+   rmSetObjectDefMaxDistance(playerCrateFID, 12);
+   rmAddObjectDefConstraint(playerCrateFID, avoidAll);
+   rmAddObjectDefConstraint(playerCrateFID, avoidImpassableLand);
+
+   int playerCrateWID=rmCreateObjectDef("bonus starting wood crates");
+   rmAddObjectDefItem(playerCrateWID, "crateOfWood", rmRandInt(1,3), 6.0);
+   rmSetObjectDefMinDistance(playerCrateWID, 10);
+   rmSetObjectDefMaxDistance(playerCrateWID, 12);
+   rmAddObjectDefConstraint(playerCrateWID, avoidAll);
+   rmAddObjectDefConstraint(playerCrateWID, avoidImpassableLand);
+
+   int playerCrateCID=rmCreateObjectDef("bonus starting coin crates");
+   rmAddObjectDefItem(playerCrateCID, "crateOfCoin", rmRandInt(1,3), 6.0);
+   rmSetObjectDefMinDistance(playerCrateCID, 10);
+   rmSetObjectDefMaxDistance(playerCrateCID, 12);
+   rmAddObjectDefConstraint(playerCrateCID, avoidAll);
+   rmAddObjectDefConstraint(playerCrateCID, avoidImpassableLand);
+
+   int silverType = -1;
+   silverType = rmRandInt(1,10);
+   int playerGoldID=rmCreateObjectDef("player silver closer");
+   rmAddObjectDefItem(playerGoldID, mineType, 1, 0.0);
+   if (startingOutpost == 1) 
+      rmAddObjectDefItem(playerGoldID, "ypOutpostAsian", 1, 6.0);
+   rmAddObjectDefConstraint(playerGoldID, avoidTradeRoute);
+   rmAddObjectDefConstraint(playerGoldID, avoidSocket);
+   rmAddObjectDefConstraint(playerGoldID, coinAvoidCoin);
+   rmAddObjectDefConstraint(playerGoldID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(playerGoldID, circleConstraint);
+   rmAddObjectDefConstraint(playerGoldID, avoidAll);
+   rmAddObjectDefConstraint(playerGoldID, avoidWater20);
+   rmSetObjectDefMinDistance(playerGoldID, 18.0);
+   rmSetObjectDefMaxDistance(playerGoldID, 23.0);
+            
+   for(i=1; <cNumberPlayers)
+   {	
+      rmPlaceObjectDefAtLoc(startingTCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startingTCID, i));
+      if(ypIsAsian(i) && rmGetNomadStart() == false)
+        rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+	if (bonusCrates == 1)
+      {
+	   if (rmRandInt(1,3) > 1)
+            rmPlaceObjectDefAtLoc(playerCrateFID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+	   if (rmRandInt(1,3) > 1)
+            rmPlaceObjectDefAtLoc(playerCrateWID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+	   if (rmRandInt(1,3) > 1)
+            rmPlaceObjectDefAtLoc(playerCrateCID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+	}
+      rmPlaceObjectDefAtLoc(playerGoldID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      if (startingOutpost > 1) 
+      {
+         if (mineNumber == 0)
+            rmPlaceObjectDefAtLoc(playerGoldID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      }
+   }
+
+// Central features & patches, per map or variant
+   // Center area
+   int centerArea=rmCreateArea("TheCenter");
+   rmSetAreaSize(centerArea, 0.1, 0.2);
+   rmSetAreaLocation(centerArea, 0.5, 0.5);
+   rmAddAreaToClass(centerArea, rmClassID("center")); 
+
+   // Texas desert
+   if (patternChance == 12)
+   {
+      if (lightingChance == 2)
+ 	{
+         int desertID = rmCreateArea("desert");
+         rmSetAreaLocation(desertID, 0.5, 0.5); 
+         rmSetAreaWarnFailure(desertID, false);
+         rmSetAreaSize(desertID, 0.7, 0.95);
+         rmSetAreaCoherence(desertID, rmRandFloat(0.2, 0.5));
+         rmSetAreaTerrainType(desertID, "texas\ground4_tex");
+         rmAddAreaTerrainLayer(desertID, "texas\ground1_tex", 0, 4);
+         rmAddAreaTerrainLayer(desertID, "texas\ground2_tex", 4, 8);
+         rmAddAreaTerrainLayer(desertID, "texas\ground3_tex", 8, 12);
+         rmSetAreaMix(desertID, "texas_dirt");
+         rmBuildArea(desertID);
+	}
+   }
+
+   // Center Highland or Canyon
+   int makeCentralCliffArea = -1;
+   if (makeCentralHighlands == 1)
+	makeCentralCliffArea = 1;
+   if (makeCentralCanyon == 1)
+ 	makeCentralCliffArea = 1;
+   if ((patternChance == 8) || (patternChance == 24 && makeCentralHighlands == 1)) 
+	extendCenter = 0;
+   if (makeCentralCliffArea == 1)
+   {
+      int edgeChance = rmRandInt(1,4);
+	if (extendCenter > 0)
+	   edgeChance = rmRandInt(2,4);
+      reducedForest = 1;
+      int centerHighlandsID=rmCreateArea("center highlands");
+      rmSetAreaLocation(centerHighlandsID, 0.5, 0.5);
+	if ((trPattern == 2) || (trPattern == 3))
+	{
+	   if (cNumberNonGaiaPlayers > 3)   
+            rmSetAreaSize(centerHighlandsID, 0.028, 0.035);
+	   else
+            rmSetAreaSize(centerHighlandsID, 0.04, 0.048);
+	}
+	else
+	{
+	   if (extendCenter == 0)
+	   {
+	      if (cNumberNonGaiaPlayers > 3)   
+               rmSetAreaSize(centerHighlandsID, 0.035, 0.045);
+	      else
+               rmSetAreaSize(centerHighlandsID, 0.045, 0.05);
+	   }
+         else if (extendCenter == 1)
+	   {
+            rmSetAreaSize(centerHighlandsID, 0.055, 0.075);
+	      if (axisChance == 1)
+		   rmAddAreaInfluenceSegment(centerHighlandsID, 0.5, 0.27, 0.5, 0.73); 
+	      else if (axisChance == 2)
+		   rmAddAreaInfluenceSegment(centerHighlandsID, 0.27, 0.5, 0.73, 0.5); 
+		endPosition = rmRandInt(2,3);
+	   }
+	   else if (extendCenter == 2)
+	   {
+            rmSetAreaSize(centerHighlandsID, 0.065, 0.08);
+	      if (axisChance == 1)
+		   rmAddAreaInfluenceSegment(centerHighlandsID, 0.5, 0.2, 0.5, 0.8); 
+	      else if (axisChance == 2)
+		   rmAddAreaInfluenceSegment(centerHighlandsID, 0.2, 0.5, 0.8, 0.5); 
+	   }
+	}
+	if (clearCenter == 1)
+	{
+	   if (rmRandInt(0,1) == 1)
+            rmAddAreaToClass(centerHighlandsID, rmClassID("center"));
+	}	
+      rmAddAreaToClass(centerHighlandsID, rmClassID("classCliff"));
+      if (patternChance == 12)
+         rmSetAreaMix(centerHighlandsID, "texas_dirt");
+      else if (patternChance == 8)
+	   rmSetAreaTerrainType(centerHighlandsID, "rockies\groundsnow1_roc");
+	else if (patternChance == 24 && makeCentralHighlands == 1)
+	   rmSetAreaTerrainType(centerHighlandsID, "rockies\groundsnow1_roc");
+	else 
+         rmSetAreaMix(centerHighlandsID, baseType);
+      rmSetAreaCliffType(centerHighlandsID, cliffType);
+      rmSetAreaCliffPainting(centerHighlandsID, false, true, true, 1.5, true);
+	if (edgeChance == 1)
+         rmSetAreaCliffEdge(centerHighlandsID, 2, 0.45, 0.1, 0.5, 0);
+	else if (edgeChance == 2)
+         rmSetAreaCliffEdge(centerHighlandsID, 3, 0.29, 0.1, 0.5, 0);
+	else if (edgeChance == 3)
+         rmSetAreaCliffEdge(centerHighlandsID, 4, 0.21, 0.1, 0.5, 0);
+	else if (edgeChance == 4)
+         rmSetAreaCliffEdge(centerHighlandsID, 5, 0.15, 0.08, 0.5, 0);
+	if (makeCentralHighlands == 1)
+	   rmSetAreaCliffHeight(centerHighlandsID, rmRandInt(6,8), 1.0, 0.5);
+	else if (makeCentralCanyon == 1)
+	   rmSetAreaCliffHeight(centerHighlandsID, -8, 1.0, 0.5);
+      rmSetAreaSmoothDistance(centerHighlandsID, rmRandInt(10,20));
+      rmSetAreaCoherence(centerHighlandsID, rmRandFloat(0.4,0.8));
+	rmSetAreaHeightBlend(centerHighlandsID, 1.0);
+      rmAddAreaConstraint(centerHighlandsID, avoidTradeRoute);
+      rmAddAreaConstraint(centerHighlandsID, avoidSocket);
+      rmAddAreaConstraint(centerHighlandsID, playerConstraint);
+      rmBuildArea(centerHighlandsID);
+      makeLake = 0;
+   }
+
+   // Center mountains
+   int numMt = -1;
+   if (mtPattern == 1)
+ 	numMt = 1;
+   else if (mtPattern == 2)
+ 	numMt = 2;	   
+   else
+ 	numMt = rmRandInt(3,6);
+   if (centerMt == 1)
+   {
+      reducedForest = 1;
+	for (i=0; <numMt)   
+      { 
+         int mtPatchID = rmCreateArea("mt patch"+i); 
+         rmAddAreaToClass(mtPatchID, rmClassID("classHill"));
+         rmAddAreaToClass(mtPatchID, rmClassID("classPatch"));
+	   if (clearCenter == 1)
+	   {
+	      if (rmRandInt(0,1) == 1)
+	         rmAddAreaToClass(mtPatchID, rmClassID("center"));
+	   }
+ 	   if (patternChance == 8) // Rockies
+	   {
+            rmSetAreaTerrainType(mtPatchID, "rockies\groundsnow1_roc");
+            rmAddAreaTerrainLayer(mtPatchID, "rockies\groundsnow8_roc", 0, 3);
+            rmAddAreaTerrainLayer(mtPatchID, "rockies\groundsnow7_roc", 3, 5);
+            rmAddAreaTerrainLayer(mtPatchID, "rockies\groundsnow6_roc", 5, 7);
+	   }
+	   if (patternChance == 20)  // Yukon Tundra
+	   {
+            rmSetAreaTerrainType(mtPatchID, "yukon\ground1_yuk");
+            rmAddAreaTerrainLayer(mtPatchID, "yukon\ground5_yuk", 0, 2);
+            rmAddAreaTerrainLayer(mtPatchID, "yukon\ground4_yuk", 2, 4);
+            rmAddAreaTerrainLayer(mtPatchID, "yukon\ground8_yuk", 4, 6);
+	   }
+	   if ((patternChance == 18) || (patternChance == 24))   // Patagonia or Araucania South   
+	   {
+            rmSetAreaTerrainType(mtPatchID, "rockies\groundsnow1_roc");
+            if (fourChoice == 3)
+		   rmAddAreaTerrainLayer(mtPatchID, "patagonia\ground_snow2_pat", 0, 3);
+	   }
+ 	   if (patternChance == 7) // Yukon
+	   {
+            rmSetAreaTerrainType(mtPatchID, "rockies\groundsnow1_roc");
+	   }
+         rmSetAreaWarnFailure(mtPatchID, false);
+ 	   if (mtPattern == 1)
+	   {
+            rmSetAreaSize(mtPatchID, 0.035, 0.045);
+            rmSetAreaLocation(mtPatchID, 0.5, 0.5);
+		if (variantChance == 1)
+		{
+               rmSetAreaMinBlobs(mtPatchID, 6);
+               rmSetAreaMaxBlobs(mtPatchID, 14);
+               rmSetAreaMinBlobDistance(mtPatchID, 30.0);
+               rmSetAreaMaxBlobDistance(mtPatchID, 45.0);
+		}
+	   }
+ 	   else if (mtPattern == 2)
+	   {
+            rmSetAreaSize(mtPatchID, 0.018, 0.023);
+		if (variantChance == 1)
+		{
+               rmSetAreaMinBlobs(mtPatchID, 6);
+               rmSetAreaMaxBlobs(mtPatchID, 12);
+               rmSetAreaMinBlobDistance(mtPatchID, 26.0);
+               rmSetAreaMaxBlobDistance(mtPatchID, 40.0);
+		}
+	   }
+	   else if (mtPattern == 3)
+	   {
+            rmSetAreaMinBlobs(mtPatchID, 4);
+            rmSetAreaMaxBlobs(mtPatchID, 6);
+            rmSetAreaMinBlobDistance(mtPatchID, 15.0);
+            rmSetAreaMaxBlobDistance(mtPatchID, 20.0);
+            rmSetAreaSize(mtPatchID, rmAreaTilesToFraction(500), rmAreaTilesToFraction(1050));
+	   }
+	   else if (mtPattern == 4)
+	   {
+            rmSetAreaMinBlobs(mtPatchID, 1);
+            rmSetAreaMaxBlobs(mtPatchID, 3);
+            rmSetAreaMinBlobDistance(mtPatchID, 30.0);
+            rmSetAreaMaxBlobDistance(mtPatchID, 40.0);
+            rmSetAreaSize(mtPatchID, rmAreaTilesToFraction(600), rmAreaTilesToFraction(1100));
+	   }
+         rmSetAreaElevationType(mtPatchID, cElevTurbulence);
+	   rmSetAreaElevationVariation(mtPatchID, rmRandInt(2, 3));
+	   rmSetAreaCoherence(mtPatchID, rmRandFloat(0.4, 0.8));
+	   rmSetAreaBaseHeight(mtPatchID, rmRandInt(8, 10));
+	   rmSetAreaElevationPersistence(mtPatchID, rmRandFloat(0.5, 0.8));
+	   if (rmRandInt(1,3) == 3)
+            rmSetAreaSmoothDistance(mtPatchID, rmRandInt(8, 20));
+         rmAddAreaConstraint(mtPatchID, avoidTradeRoute);
+         rmAddAreaConstraint(mtPatchID, avoidSocket);
+         rmAddAreaConstraint(mtPatchID, longHillConstraint);
+         rmAddAreaConstraint(mtPatchID, circleConstraintMt);
+         rmAddAreaConstraint(mtPatchID, farPlayerConstraint);
+         rmBuildArea(mtPatchID);
+      }
+   }
+  
+   if (forestMt == 1) // green hill forest
+   {
+      int htBlend = rmRandFloat(1.8,3.0);
+      reducedForest = 1;
+	for (i=0; <numMt)   
+      { 	
+         int hillPatchID = rmCreateArea("green hill"+i); 
+         rmAddAreaToClass(hillPatchID, rmClassID("classHill"));
+         rmAddAreaToClass(hillPatchID, rmClassID("classPatch"));
+         rmSetAreaWarnFailure(hillPatchID, false);
+         rmSetAreaForestType(hillPatchID, forestType);
+         rmSetAreaForestDensity(hillPatchID, rmRandFloat(0.3, 0.5));
+         rmSetAreaForestClumpiness(hillPatchID, rmRandFloat(0.5, 0.8));
+         rmSetAreaForestUnderbrush(hillPatchID, rmRandFloat(0.0, 0.3));
+ 	   if (mtPattern == 1)
+	   {
+            rmSetAreaSize(hillPatchID, 0.035, 0.045);
+            rmSetAreaLocation(hillPatchID, 0.5, 0.5);
+		if (variantChance == 1)
+		{
+               rmSetAreaMinBlobs(hillPatchID, 6);
+               rmSetAreaMaxBlobs(hillPatchID, 12);
+               rmSetAreaMinBlobDistance(hillPatchID, 32.0);
+               rmSetAreaMaxBlobDistance(hillPatchID, 45.0);
+		}
+	   }
+ 	   else if (mtPattern == 2)
+	   {
+            rmSetAreaSize(hillPatchID, 0.018, 0.023);
+		if (variantChance == 1)
+		{
+               rmSetAreaMinBlobs(hillPatchID, 6);
+               rmSetAreaMaxBlobs(hillPatchID, 14);
+               rmSetAreaMinBlobDistance(hillPatchID, 26.0);
+               rmSetAreaMaxBlobDistance(hillPatchID, 40.0);
+		}
+	   }
+	   else if (mtPattern == 3)
+	   {
+            rmSetAreaMinBlobs(hillPatchID, 4);
+            rmSetAreaMaxBlobs(hillPatchID, 6);
+            rmSetAreaMinBlobDistance(hillPatchID, 15.0);
+            rmSetAreaMaxBlobDistance(hillPatchID, 20.0);
+            rmSetAreaSize(hillPatchID, rmAreaTilesToFraction(400), rmAreaTilesToFraction(950));
+	   }
+	   else if (mtPattern == 4)
+	   {
+            rmSetAreaMinBlobs(hillPatchID, 1);
+            rmSetAreaMaxBlobs(hillPatchID, 3);
+            rmSetAreaMinBlobDistance(hillPatchID, 30.0);
+            rmSetAreaMaxBlobDistance(hillPatchID, 40.0);
+            rmSetAreaSize(hillPatchID, rmAreaTilesToFraction(400), rmAreaTilesToFraction(950));
+	   }
+         rmSetAreaElevationType(hillPatchID, cElevTurbulence);
+         rmSetAreaElevationVariation(hillPatchID, rmRandInt(2, 3));
+	   rmSetAreaElevationPersistence(hillPatchID, rmRandFloat(0.5, 0.8));
+         rmSetAreaCoherence(hillPatchID, rmRandFloat(0.4, 0.8));
+         rmSetAreaBaseHeight(hillPatchID, rmRandInt(7, 9));
+         rmSetAreaHeightBlend(hillPatchID, htBlend);
+	   if (rmRandInt(1,3) == 3)
+            rmSetAreaSmoothDistance(hillPatchID, rmRandInt(10, 20));
+         rmAddAreaConstraint(hillPatchID, avoidTradeRoute);
+         rmAddAreaConstraint(hillPatchID, avoidSocket);
+         rmAddAreaConstraint(hillPatchID, longHillConstraint);
+         rmAddAreaConstraint(hillPatchID, circleConstraintMt);
+         rmAddAreaConstraint(hillPatchID, farPlayerConstraint);
+         rmBuildArea(hillPatchID);
+	}  
+   }
+
+   // Snow patch for Rockies, central highlands
+   if (patternChance == 8)  // Rockies
+   {
+	if (makeCentralCliffArea == 1)
+	{
+         int snowPatch2ID = rmCreateArea("snow patch 2"); 
+         rmAddAreaToClass(snowPatch2ID, rmClassID("classHill"));
+         rmAddAreaToClass(snowPatch2ID, rmClassID("classPatch"));
+         rmSetAreaLocation(snowPatch2ID, 0.5, 0.5); 
+         rmSetAreaWarnFailure(snowPatch2ID, false);
+         rmSetAreaSize(snowPatch2ID, 0.048, 0.049);
+         rmSetAreaElevationType(snowPatch2ID, cElevTurbulence);
+	   rmSetAreaElevationVariation(snowPatch2ID, rmRandInt(2, 3));
+	   rmSetAreaCoherence(snowPatch2ID, rmRandFloat(0.4, 0.8));
+	   if (rmRandInt(1,3) == 3)
+            rmSetAreaSmoothDistance(snowPatch2ID, rmRandInt(8, 20));
+         rmSetAreaTerrainType(snowPatch2ID, "rockies\groundsnow1_roc");
+         rmAddAreaTerrainLayer(snowPatch2ID, "rockies\groundsnow8_roc", 0, 5);
+         rmAddAreaTerrainLayer(snowPatch2ID, "rockies\groundsnow7_roc", 5, 9);
+         rmAddAreaTerrainLayer(snowPatch2ID, "rockies\groundsnow6_roc", 9, 13);
+         rmAddAreaConstraint(snowPatch2ID, avoidTradeRoute);
+         rmAddAreaConstraint(snowPatch2ID, avoidSocket);
+         rmBuildArea(snowPatch2ID); 
+	}
+   }
+
+   // Ice - Great Lakes Winter, Yukon, Yukon Tundra or Araucania South
+   if (makeIce == 1)
+   {
+      nativeNumber = 2;
+      int icePatchID = rmCreateArea("ice patch"); 
+      rmAddAreaToClass(icePatchID, rmClassID("classIce"));
+      rmAddAreaToClass(icePatchID, rmClassID("center"));
+	if (variantChance == 2)
+	   rmAddAreaToClass(icePatchID, rmClassID("classHill"));
+      rmSetAreaLocation(icePatchID, 0.5, 0.5); 
+      rmSetAreaWarnFailure(icePatchID, false);
+      rmSetAreaSize(icePatchID, 0.035, 0.05);
+      rmSetAreaCoherence(icePatchID, rmRandFloat(0.6,0.9));
+      rmSetAreaMix(icePatchID, "great_lakes_ice");
+      rmSetAreaBaseHeight(icePatchID, 1.0);
+      rmSetAreaElevationVariation(icePatchID, 0.0);
+      rmAddAreaConstraint(icePatchID, avoidTradeRoute);
+      rmAddAreaConstraint(icePatchID, avoidSocket);
+      rmAddAreaConstraint(icePatchID, playerConstraint);
+      rmBuildArea(icePatchID); 
+	int iceHole = rmRandInt(1,2); 
+	if (iceHole == 1)
+	{
+         int waterPatchID = rmCreateArea("water patch", rmAreaID("ice patch")); 
+         rmAddAreaToClass(waterPatchID, rmClassID("classPatch"));
+         rmSetAreaWarnFailure(waterPatchID, false);
+         rmSetAreaSize(waterPatchID, 0.01, 0.025);
+         rmSetAreaCoherence(waterPatchID, rmRandFloat(0.2,0.8));
+         rmSetAreaWaterType(waterPatchID, "great lakes ice");
+         rmSetAreaBaseHeight(waterPatchID, 1.0);
+         rmBuildArea(waterPatchID); 
+	}
+   }
+
+// KOTH game mode - no lake - to avoid need for water warfare ==========================================================
+   if(rmGetIsKOTH())
+   {
+	makeLake = 0;
+      int randLoc = rmRandInt(1,2);
+      float xLoc = 0.5;
+      float yLoc = 0.5;
+      float walk = 0.05;
+    
+      ypKingsHillLandfill(xLoc, yLoc, .0075, 2.0, baseType, 0);
+      ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+   }
+
+   // Center lake      
+   if (makeLake == 1)
+   {
+	int lakePattern = rmRandInt(1,3);
+	if (cNumberNonGaiaPlayers == 2)
+	{ 
+	   if ((sectionChance == 4) || (sectionChance == 5) || (sectionChance == 11) || (sectionChance == 12) || (sectionChance == 13))	
+	      lakePos = 0; 
+	}
+      nativeNumber = 2;
+	int smalllakeID=rmCreateArea("small lake");
+      rmSetAreaWaterType(smalllakeID, pondType);
+      rmAddAreaToClass(smalllakeID, lakeClass);
+      rmSetAreaLocation(smalllakeID, 0.5, 0.5);
+      rmSetAreaBaseHeight(smalllakeID, 0);
+	if ((trPattern == 2) || (trPattern == 3)) 
+	{
+	   if (cNumberNonGaiaPlayers > 3)   
+            rmSetAreaSize(smalllakeID, 0.028, 0.038);
+	   else
+            rmSetAreaSize(smalllakeID, 0.04, 0.048);
+	}
+	else
+	{
+	   if (extendCenter == 0)
+	   {
+	      if (cNumberNonGaiaPlayers > 3)   
+               rmSetAreaSize(smalllakeID, 0.035, 0.045);
+	      else
+               rmSetAreaSize(smalllakeID, 0.045, 0.05);
+	   }
+	   else if (extendCenter == 1)
+	   {
+	      if (axisChance == 1)
+		{
+		   if (lakePos < 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.065);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.5, 0.27, 0.5, 0.73);
+		   }
+		   else if (lakePos == 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.03, 0.06);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.5, 0.42, 0.5, 0.73); 
+		   }
+		   else if (lakePos == 3)
+		   {
+			rmSetAreaSize(smalllakeID, 0.03, 0.06);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.5, 0.27, 0.5, 0.58);
+		   }
+		} 
+	      else if (axisChance == 2)
+		{
+		   if (lakePos < 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.065);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.27, 0.5, 0.73, 0.5);
+		   }
+		   else if (lakePos == 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.03, 0.06);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.42, 0.5, 0.73, 0.5);
+		   }
+		   else if (lakePos == 3)
+		   {
+			rmSetAreaSize(smalllakeID, 0.03, 0.06);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.27, 0.5, 0.58, 0.5);
+		   }
+		}     
+		endPosition = 3;
+	   }
+	   else if (extendCenter == 2)
+	   {
+	      if (axisChance == 1)
+		{
+		   if (lakePos < 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.07);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.5, 0.2, 0.5, 0.8); 
+		   }
+		   else if (lakePos == 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.065);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.5, 0.42, 0.5, 0.8);  
+		   }
+		   else if (lakePos == 3)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.065);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.5, 0.2, 0.5, 0.58); 
+		   }
+		} 
+	      else if (axisChance == 2)
+		{
+		   if (lakePos < 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.07);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.2, 0.5, 0.8, 0.5);
+		   }
+		   else if (lakePos == 2)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.065);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.2, 0.5, 0.58, 0.5);
+		   }
+		   else if (lakePos == 3)
+		   {
+			rmSetAreaSize(smalllakeID, 0.035, 0.065);
+		      rmAddAreaInfluenceSegment(smalllakeID, 0.42, 0.5, 0.8, 0.5);
+		   }
+		}     
+		endPosition = 3;
+	   }
+	}
+	if (lakePattern == 1)
+	{
+         rmSetAreaMinBlobs(smalllakeID, 1);
+         rmSetAreaMaxBlobs(smalllakeID, 3);
+         rmSetAreaMinBlobDistance(smalllakeID, 12.0);
+         rmSetAreaMaxBlobDistance(smalllakeID, 18.0);
+         rmSetAreaCoherence(smalllakeID, rmRandFloat(0.4,0.8));
+	}
+	else if (lakePattern == 2)
+	{
+         rmSetAreaMinBlobs(smalllakeID, 3);
+         rmSetAreaMaxBlobs(smalllakeID, 8);
+         rmSetAreaMinBlobDistance(smalllakeID, 25.0);
+         rmSetAreaMaxBlobDistance(smalllakeID, 40.0);
+         rmSetAreaCoherence(smalllakeID, rmRandFloat(0.2,0.5));
+	}
+	else if (lakePattern == 3)
+	{
+         rmSetAreaMinBlobs(smalllakeID, 6);
+         rmSetAreaMaxBlobs(smalllakeID, 12);
+         rmSetAreaMinBlobDistance(smalllakeID, 32.0);
+         rmSetAreaMaxBlobDistance(smalllakeID, 50.0);
+         rmSetAreaCoherence(smalllakeID, rmRandFloat(0.2,0.3));
+	}
+      rmSetAreaSmoothDistance(smalllakeID, rmRandInt(10,20));
+      rmAddAreaConstraint(smalllakeID, farPlayerConstraint);
+      rmAddAreaConstraint(smalllakeID, avoidTradeRoute);
+      rmAddAreaConstraint(smalllakeID, avoidSocket);
+      rmSetAreaWarnFailure(smalllakeID, false);
+      rmBuildArea(smalllakeID);
+   }
+ 
+   // Text
+   rmSetStatusText("",0.40);
+
+// NATIVES
+   // Village A 
+   int villageAID = -1;
+   int whichNative = rmRandInt(1,2);
+   int villageType = rmRandInt(1,5);
+   if (whichNative == 1)
+	   villageAID = rmCreateGrouping("village A", native1Name+villageType);
+   else if (whichNative == 2)
+	   villageAID = rmCreateGrouping("village A", native2Name+villageType);
+   rmAddGroupingToClass(villageAID, rmClassID("natives"));
+   rmAddGroupingToClass(villageAID, rmClassID("importantItem"));
+   rmSetGroupingMinDistance(villageAID, 0.0);
+   rmSetGroupingMaxDistance(villageAID, rmXFractionToMeters(0.12));
+   rmAddGroupingConstraint(villageAID, avoidImpassableLand);
+   rmAddGroupingConstraint(villageAID, avoidTradeRoute);
+   rmAddGroupingConstraint(villageAID, avoidWater15);
+   rmAddGroupingConstraint(villageAID, avoidNativesMed);
+   rmAddGroupingConstraint(villageAID, playerConstraint);
+   rmAddGroupingConstraint(villageAID, avoidIce);
+
+   // Village D - opposite type from A 
+   int villageDID = -1;
+   villageType = rmRandInt(1,5);
+   if (whichNative == 2)
+	   villageDID = rmCreateGrouping("village D", native1Name+villageType);
+   else if (whichNative == 1)
+	   villageDID = rmCreateGrouping("village D", native2Name+villageType);
+   rmAddGroupingToClass(villageDID, rmClassID("natives"));
+   rmAddGroupingToClass(villageDID, rmClassID("importantItem"));
+   rmSetGroupingMinDistance(villageDID, 0.0);
+   rmSetGroupingMaxDistance(villageDID, rmXFractionToMeters(0.12));
+   rmAddGroupingConstraint(villageDID, avoidImpassableLand);
+   rmAddGroupingConstraint(villageDID, avoidTradeRoute);
+   rmAddGroupingConstraint(villageDID, avoidWater15);
+   rmAddGroupingConstraint(villageDID, avoidNativesMed);
+   rmAddGroupingConstraint(villageDID, playerConstraint);
+   rmAddGroupingConstraint(villageDID, avoidIce);
+   if (mtPattern > 2)
+      rmAddGroupingConstraint(villageDID, shortHillConstraint);
+
+   // Village B - randomly same or opposite village A
+   int villageBID = -1;	
+   villageType = rmRandInt(1,5);
+   whichNative = rmRandInt(1,2);
+   if (whichNative == 1)
+	   villageBID = rmCreateGrouping("village B", native1Name+villageType);
+   else if (whichNative == 2)
+	   villageBID = rmCreateGrouping("village B", native2Name+villageType);
+   rmAddGroupingToClass(villageBID, rmClassID("importantItem"));
+   rmAddGroupingToClass(villageBID, rmClassID("natives"));
+   rmSetGroupingMinDistance(villageBID, 0.0);
+   rmSetGroupingMaxDistance(villageBID, rmXFractionToMeters(0.12));
+   rmAddGroupingConstraint(villageBID, avoidImpassableLand);
+   rmAddGroupingConstraint(villageBID, avoidTradeRoute);
+   rmAddGroupingConstraint(villageBID, avoidWater15);
+   rmAddGroupingConstraint(villageBID, avoidNatives);
+   rmAddGroupingConstraint(villageBID, playerConstraint);
+
+   // Village C // appears in center, variable, randomly same or opposite A and B
+   int villageCID = -1;	
+   villageType = rmRandInt(1,5);
+   whichNative = rmRandInt(1,2);
+   if (whichNative == 1)
+	   villageCID = rmCreateGrouping("village C", native1Name+villageType);
+   else if (whichNative == 2)
+	   villageCID = rmCreateGrouping("village C", native2Name+villageType);
+   rmAddGroupingToClass(villageCID, rmClassID("importantItem"));
+   rmAddGroupingToClass(villageCID, rmClassID("natives"));
+   rmSetGroupingMinDistance(villageCID, 0.0);
+   rmSetGroupingMaxDistance(villageCID, rmXFractionToMeters(0.09));
+   rmAddGroupingConstraint(villageCID, avoidImpassableLand);
+   rmAddGroupingConstraint(villageCID, avoidWater15);
+   rmAddGroupingConstraint(villageCID, avoidTradeRoute);
+   rmAddGroupingConstraint(villageCID, avoidNatives);
+   rmAddGroupingConstraint(villageCID, playerConstraint);
+   if (mtPattern > 2)
+      rmAddGroupingConstraint(villageCID, shortHillConstraint);
+
+   // Placement of Native Americans
+   if(makeRiver == 1)
+   {
+	if (cNumberNonGaiaPlayers > 3)
+	{
+	   if(rmRandInt(1,4) == 1)
+		nativeSetup = 6;
+	   else
+		nativeSetup = 16;
+	   if ((trPattern == 11) || (trPattern == 4) || (trPattern == 5) || (trPattern == 2))   
+		nativeSetup = 6;
+	}	   
+	else
+	{
+	   if(rmRandInt(1,3) > 1)
+		nativeSetup = 16;
+	   else
+	   {
+		if (threeChoice == 1)
+		   nativeSetup = 6;
+		else if (threeChoice == 2)
+		   nativeSetup = 10;
+		else
+		   nativeSetup = 11;
+	   }
+	   if ((trPattern == 11) || (trPattern == 4) || (trPattern == 5) || (trPattern == 2))   
+	   {
+		if (threeChoice == 1)
+		   nativeSetup = 6;
+		else if (threeChoice == 2)
+		   nativeSetup = 10;
+		else
+		   nativeSetup = 11;
+	   }
+	}   
+   }
+
+   if (makeLake == 1)
+   {
+	if (extendCenter > 0)
+	   nativeSetup = rmRandInt(6,22);
+   }
+
+   if ((nativeSetup == 16) || (nativeSetup == 17) || (nativeSetup == 18))        
+   {
+      if (axisChance == 2)
+	{
+  	      if (variantChance == 1)
+	      {  
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.79, 0.36);
+               rmPlaceGroupingAtLoc(villageBID, 0, 0.21, 0.36);
+               rmPlaceGroupingAtLoc(villageBID, 0, 0.79, 0.64);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.21, 0.64);
+		   if (nativeSetup == 17)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.4);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.6);
+		   }
+		   if (nativeSetup == 18)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.43, 0.4);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.57, 0.4);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.43, 0.6);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.57, 0.6);
+		   }
+  	      }
+	      else
+	      {
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.68, 0.4);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.32, 0.4);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.68, 0.6);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.32, 0.6);
+		   if (nativeSetup == 17)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.34);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.66);
+		   }
+		   if (nativeSetup == 18)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.43, 0.38);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.57, 0.38);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.43, 0.62);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.57, 0.62);
+		   }
+	      }
+      }
+	else if (axisChance == 1)
+	{
+	      if (variantChance == 1)
+	      {  
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.41, 0.79);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.41, 0.21);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.59, 0.79);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.59, 0.21);
+		   if (nativeSetup == 17)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.31, 0.5);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.69, 0.5);
+		   }
+		   if (nativeSetup == 18)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.38, 0.43);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.38, 0.57);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.62, 0.43);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.62, 0.43);
+		   }
+	      }
+	      else
+	      {
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.4, 0.7);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.4, 0.3);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.6, 0.7);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.6, 0.3);
+		   if (nativeSetup == 17)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.4, 0.5);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.6, 0.5);
+		   }
+		   if (nativeSetup == 18)
+		   {	
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.38, 0.43);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.38, 0.57);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.62, 0.43);
+			rmPlaceGroupingAtLoc(villageDID, 0, 0.62, 0.43);
+		   }
+	      }	   
+	}
+   }
+   else if (nativeSetup == 19)    
+   {
+      if (axisChance == 2)
+	{
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.74, 0.28);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.26, 0.28);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.74, 0.72);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.26, 0.72);
+		   rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.4);
+		   rmPlaceGroupingAtLoc(villageBID, 0, 0.5, 0.6);
+      }
+	else if (axisChance == 1)
+	{
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.28, 0.74);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.28, 0.26);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.72, 0.74);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.72, 0.26);
+		   rmPlaceGroupingAtLoc(villageBID, 0, 0.4, 0.5);
+		   rmPlaceGroupingAtLoc(villageBID, 0, 0.6, 0.5);
+	}
+   } 
+   else if (nativeSetup == 20)
+   {
+      if (axisChance == 2)
+	{
+  	      if (variantChance == 1)
+	      {  
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.79, 0.38);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.21, 0.38);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.79, 0.62);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.21, 0.62);
+	      }
+	      else
+	      {
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.67, 0.4);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.33, 0.4);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.67, 0.6);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.33, 0.6);
+	      }
+      }
+	else if (axisChance == 1)
+	{
+	      if (variantChance == 1)
+	      {  
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.4, 0.79);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.4, 0.21);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.6, 0.79);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.6, 0.21);
+	      }
+	      else
+	      {
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.4, 0.7);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.4, 0.3);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.6, 0.7);
+		   rmPlaceGroupingAtLoc(villageDID, 0, 0.6, 0.3);
+	      }
+	}
+   } 
+   else if (nativeSetup > 20) // 21 AND 22
+   {
+	if (nativeSetup == 22)
+	{
+	   if (nativeNumber > 2)
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.515, 0.515);
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.485, 0.485);
+	   }
+	   else
+	   {
+	      if (axisChance == 1)
+	      {
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.4, 0.51);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.6, 0.49);
+            }
+   	      else
+	      {
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.51, 0.6);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.49, 0.4);
+	      }
+	   }
+	}
+      if (axisChance == 2)
+	{
+  	      if (variantChance == 1)
+	      {  
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.85, 0.135);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.15, 0.135);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.15, 0.865);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.85, 0.865);
+	      }
+	      else
+	      {
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.85, 0.135);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.15, 0.135);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.15, 0.865);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.85, 0.865);
+	      }
+      }
+	else if (axisChance == 1)
+	{
+	      if (variantChance == 1)
+	      {  
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.135, 0.85);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.135, 0.15);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.865, 0.15);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.865, 0.85);
+	      }
+	      else
+	      {
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.135, 0.85);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.135, 0.15);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.865, 0.15);
+		   rmPlaceGroupingAtLoc(villageAID, 0, 0.865, 0.85);
+	      }
+	}
+   }
+   else if (nativeSetup < 4) 
+   {
+      if (axisChance == 1)
+	{
+	   if (endPosition == 1)
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.505, 0.73);
+	   else if (endPosition == 2)
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.495, 0.82);
+	   else
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.505, 0.91);
+	}	 
+      else
+	{
+	   if (endPosition == 1)
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.73, 0.505);
+	   else if (endPosition == 2)
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.82, 0.495);
+	   else
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.91, 0.505);
+	}  
+      if (axisChance == 1)
+	{
+	   if (endPosition == 1)
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.495, 0.27);
+	   else if (endPosition == 2)
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.505, 0.18);
+	   else
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.495, 0.09);
+	}
+      else
+	{
+	   if (endPosition == 1)
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.27, 0.495);
+	   else if (endPosition == 2)
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.18, 0.505);
+	   else
+            rmPlaceGroupingAtLoc(villageBID, 0, 0.09, 0.495);
+	}         
+	if (nativeSetup < 2)
+	{
+         if (nativeNumber > 2)
+            rmPlaceGroupingAtLoc(villageCID, 0, 0.5, 0.5);
+	}
+	else 
+	{
+	   rmSetGroupingMaxDistance(villageCID, rmXFractionToMeters(0.085));
+         if (nativeNumber > 2)
+	   {
+		if (axisChance == 1)
+		{
+               rmPlaceGroupingAtLoc(villageCID, 0, 0.485, 0.51);
+               rmPlaceGroupingAtLoc(villageCID, 0, 0.515, 0.49);
+	      }
+		else
+		{
+               rmPlaceGroupingAtLoc(villageCID, 0, 0.51, 0.515);
+               rmPlaceGroupingAtLoc(villageCID, 0, 0.49, 0.485);
+	      }
+	   }
+	}
+   }
+   else if (nativeSetup > 5)
+   {
+	if (nativeSetup == 7)
+	{
+         if (axisChance == 1)
+	   {
+	      if (endPosition == 1)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.495, 0.75); 
+	      else if (endPosition == 2)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.505, 0.84); 
+	      else
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.495, 0.93); 
+	   }
+         else
+	   {
+	      if (endPosition == 1)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.745, 0.495);
+	      else if (endPosition == 2)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.84, 0.505);
+	      else
+              rmPlaceGroupingAtLoc(villageDID, 0, 0.93, 0.495);
+	   }
+         if (axisChance == 1)
+	   {
+	      if (endPosition == 1)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.505, 0.25);
+	      else if (endPosition == 2)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.495, 0.16);
+	      else
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.505, 0.07);
+	   }            
+         else
+	   {
+	      if (endPosition == 1)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.25, 0.505);
+	      else if (endPosition == 2)
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.16, 0.495);
+	      else
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.07, 0.505);
+	   }            
+	}
+	if (nativeSetup == 8)
+	{
+	   rmSetGroupingMaxDistance(villageDID, rmXFractionToMeters(0.065));
+         if (nativeNumber > 2)
+	   {
+		if (axisChance == 1)
+		{
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.485, 0.49);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.515, 0.51);
+	      }
+		else
+		{
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.49, 0.515);
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.51, 0.485);
+	      }
+	   }
+	}
+	if (nativeSetup == 9)
+	{
+	   rmSetGroupingMaxDistance(villageDID, rmXFractionToMeters(0.07));
+         if (nativeNumber > 2)
+	   {
+               rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.5);
+	   }
+	}
+	if (nativeSetup < 12)
+	{
+         rmSetGroupingMinDistance(villageAID, 65.0);
+         rmSetGroupingMaxDistance(villageAID, 85.0);  
+	   rmAddGroupingConstraint(villageAID, nuggetPlayerConstraint); 
+         rmSetGroupingMinDistance(villageDID, 65.0);
+         rmSetGroupingMaxDistance(villageDID, 85.0);
+	   rmAddGroupingConstraint(villageDID, nuggetPlayerConstraint); 
+         for(i=1; <cNumberPlayers) 
+         {       
+   	      rmPlaceGroupingAtLoc(villageAID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	      if (nativeSetup == 10)
+ 	      {     
+		   rmPlaceGroupingAtLoc(villageDID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	      }
+	      if (nativeSetup == 11)
+		   rmPlaceGroupingAtLoc(villageAID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	   }
+	}
+      if (nativeSetup > 11) // setup 12 to 15
+      {
+         rmSetGroupingMaxDistance(villageAID, rmXFractionToMeters(0.07));
+         rmAddGroupingConstraint(villageAID, nuggetPlayerConstraint);
+         if (axisChance == 1)
+	   {
+		if (distChance < 6)
+		{
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.33, 0.4);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.33, 0.6);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.67, 0.4);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.67, 0.6);
+		}
+		else
+		{
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.13, 0.31);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.13, 0.69);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.87, 0.31);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.87, 0.69);
+		}
+	   }
+	   else
+	   {
+		if (distChance < 6)
+		{
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.4, 0.33);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.6, 0.33);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.4, 0.67);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.6, 0.67);
+		}
+		else
+		{
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.31, 0.13);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.69, 0.13);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.31, 0.87);
+               rmPlaceGroupingAtLoc(villageAID, 0, 0.69, 0.87);
+		}
+	   }
+	   if (nativeSetup == 13) 
+	   {
+	      rmSetGroupingMaxDistance(villageDID, rmXFractionToMeters(0.07));
+            if (nativeNumber > 2)
+	      {
+		   if (rmRandInt(1,2) == 1)
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.5);
+		   else
+		   {
+		      if (axisChance == 1)
+		      {
+               	   rmPlaceGroupingAtLoc(villageDID, 0, 0.485, 0.49);
+               	   rmPlaceGroupingAtLoc(villageDID, 0, 0.515, 0.51);
+	      	}
+			else
+			{
+           		   rmPlaceGroupingAtLoc(villageDID, 0, 0.49, 0.515);
+           	         rmPlaceGroupingAtLoc(villageDID, 0, 0.51, 0.485);
+	      	}
+	         }
+		}
+	   }
+	   if (nativeSetup == 14) 
+	   {
+            if (axisChance == 1)
+	      {
+	         if (endPosition == 1)
+		   {
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.495, 0.75);
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.505, 0.25);
+		   } 
+   	         else if (endPosition == 2)
+		   {
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.505, 0.84);
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.495, 0.16);
+		   } 
+	         else
+		   {
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.505, 0.07);
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.495, 0.93);
+		   } 
+	      }
+            else
+	      {
+	         if (endPosition == 1)
+		   {
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.745, 0.495);
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.25, 0.505);
+		   }
+	         else if (endPosition == 2)
+		   {
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.84, 0.505);
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.16, 0.495);
+		   }
+	         else
+		   {
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.93, 0.495);
+                  rmPlaceGroupingAtLoc(villageDID, 0, 0.07, 0.505);
+		   }
+	      }                
+	   }
+      }
+   }
+   else if (nativeSetup > 3) // setup 4 and 5
+   {
+      if (axisChance == 1)
+	{
+	   if (endPosition == 1)
+	   {
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.75);
+		rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.25);
+	   }
+	   else if (endPosition == 2)
+	   {
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.84);
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.16);
+	   }
+	   else
+	   {
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.93);
+		rmPlaceGroupingAtLoc(villageAID, 0, 0.5, 0.08);
+	   }
+	}          
+      else
+	{
+	   if (endPosition == 1)
+	   {
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.745, 0.5);
+	      rmPlaceGroupingAtLoc(villageAID, 0, 0.25, 0.5);
+	   }
+	   else if (endPosition == 2)
+	   {
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.84, 0.5);
+		rmPlaceGroupingAtLoc(villageAID, 0, 0.16, 0.5);
+	   }
+	   else
+	   {
+            rmPlaceGroupingAtLoc(villageAID, 0, 0.93, 0.5);
+		rmPlaceGroupingAtLoc(villageAID, 0, 0.07, 0.5);
+	   }
+	}       
+	if (nativeSetup == 4)
+	{
+	   if (axisChance == 1)
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.485, 0.51);
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.515, 0.49);
+         }
+   	   else
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.51, 0.515);
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.49, 0.485);
+	   }
+	}
+   	rmSetGroupingMaxDistance(villageDID, rmXFractionToMeters(0.085));
+      if (axisChance == 1)
+	{
+         if (sidePosition == 1)
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.74, 0.5);
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.24, 0.5);
+	   }
+	   else if (sidePosition == 2)
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.84, 0.5);
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.16, 0.5);
+	   }
+	   else
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.93, 0.5);
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.08, 0.5);
+	   }
+      }
+	else
+	{
+         if (sidePosition == 1)
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.75);
+		rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.25);
+	   }	   
+	   else if (sidePosition == 2)
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.84);
+		rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.16);
+	   }
+	   else
+	   {
+            rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.93);
+		rmPlaceGroupingAtLoc(villageDID, 0, 0.5, 0.08); 
+         }
+	}  
+   }
+
+   // Text
+   rmSetStatusText("",0.50);
+
+// Player Nuggets
+   int playerNuggetID=rmCreateObjectDef("player nugget");
+   rmAddObjectDefItem(playerNuggetID, "nugget", 1, 0.0);
+   rmAddObjectDefToClass(playerNuggetID, rmClassID("classNugget"));
+   rmSetObjectDefMinDistance(playerNuggetID, 34.0);
+   rmSetObjectDefMaxDistance(playerNuggetID, 47.0);
+   rmAddObjectDefConstraint(playerNuggetID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(playerNuggetID, avoidTradeRoute);
+   rmAddObjectDefConstraint(playerNuggetID, avoidSocket);
+   rmAddObjectDefConstraint(playerNuggetID, avoidNugget);
+   rmAddObjectDefConstraint(playerNuggetID, avoidWater10);
+   for(i=1; <cNumberPlayers)
+   {
+ 	rmSetNuggetDifficulty(1, 1);
+	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+   }
+
+// Small Ponds for Bayou      
+   if (patternChance == 3)
+   {
+	for (i=0; <cNumberNonGaiaPlayers*3)   
+      {
+	   int smallPond2ID=rmCreateArea("bigger small pond"+i);
+	   rmSetAreaSize(smallPond2ID, rmAreaTilesToFraction(340), rmAreaTilesToFraction(460));
+         rmSetAreaWaterType(smallPond2ID, pondType);
+         rmSetAreaBaseHeight(smallPond2ID, 0);
+         rmSetAreaMinBlobs(smallPond2ID, 5);
+         rmSetAreaMaxBlobs(smallPond2ID, 7);
+         rmSetAreaMinBlobDistance(smallPond2ID, 24.0);
+         rmSetAreaMaxBlobDistance(smallPond2ID, 36.0);
+         rmAddAreaToClass(smallPond2ID, lakeClass);
+         rmAddAreaConstraint(smallPond2ID, avoidLakes);
+         rmAddAreaConstraint(smallPond2ID, playerConstraint);
+         rmAddAreaConstraint(smallPond2ID, avoidTradeRoute);
+         rmAddAreaConstraint(smallPond2ID, avoidSocket);
+         rmAddAreaConstraint(smallPond2ID, avoidAll);
+         rmAddAreaConstraint(smallPond2ID, avoidNativesShort);
+         rmAddAreaConstraint(smallPond2ID, centerConstraintFar);
+         rmSetAreaCoherence(smallPond2ID, 0.1);
+         rmSetAreaWarnFailure(smallPond2ID, false);
+         rmBuildArea(smallPond2ID);
+      }
+	for (i=0; <cNumberNonGaiaPlayers*6)   
+      {
+	   int smallPondID=rmCreateArea("small pond"+i);
+	   rmSetAreaSize(smallPondID, rmAreaTilesToFraction(180), rmAreaTilesToFraction(240));
+         rmSetAreaWaterType(smallPondID, pondType);
+         rmSetAreaBaseHeight(smallPondID, 0);
+         rmSetAreaMinBlobs(smallPondID, 2);
+         rmSetAreaMaxBlobs(smallPondID, 4);
+         rmSetAreaMinBlobDistance(smallPondID, 6.0);
+         rmSetAreaMaxBlobDistance(smallPondID, 12.0);
+         rmAddAreaToClass(smallPondID, lakeClass);
+         rmAddAreaConstraint(smallPondID, avoidLakes);
+         rmAddAreaConstraint(smallPondID, playerConstraint);
+         rmAddAreaConstraint(smallPondID, avoidTradeRoute);
+         rmAddAreaConstraint(smallPondID, avoidSocket);
+         rmAddAreaConstraint(smallPondID, avoidAll);
+         rmAddAreaConstraint(smallPondID, avoidNativesShort);
+         rmAddAreaConstraint(smallPondID, centerConstraintFar);
+         rmSetAreaCoherence(smallPondID, rmRandFloat(0.2,0.8));
+         rmSetAreaWarnFailure(smallPondID, false);
+         rmBuildArea(smallPondID);
+      }
+   }
+
+// Cliffs
+   int cliffHt = -1;
+   int failCount=0;
+   int numTries=cNumberNonGaiaPlayers*14;
+   int anotherChance = -1;
+   anotherChance = rmRandInt(0,1);
+   if (makeCliffs == 2)
+   {
+     if (anotherChance == 1)
+        makeCliffs = 1;
+     else
+        makeCliffs = 0;
+   } 
+   if (makeCentralCliffArea == 1)
+   {
+	numTries=cNumberNonGaiaPlayers*7;
+	if ((patternChance == 9) || (patternChance == 10))
+  	   cliffVariety = rmRandInt(3,7);
+	else
+  	   cliffVariety = rmRandInt(1,3);
+   }
+   if (makeCliffs == 1)
+   { 
+	if ((patternChance == 13) || (patternChance == 28))    // for Sonora or Painted Desert only      
+	{
+	   // bigger mesas
+	   for(i=0; <numTries)
+	   {
+		int cliffHeight=rmRandInt(0,10);
+		int mesaID=rmCreateArea("mesa"+i);
+		rmSetAreaSize(mesaID, rmAreaTilesToFraction(25), rmAreaTilesToFraction(160)); 
+		rmSetAreaWarnFailure(mesaID, false);
+		rmSetAreaCliffType(mesaID, cliffType);
+		rmAddAreaToClass(mesaID, rmClassID("canyon"));
+		rmAddAreaToClass(mesaID, rmClassID("classCliff"));	
+		rmSetAreaCliffEdge(mesaID, 1, 1.0, 0.1, 1.0, 0);
+		if (cliffHeight <= 7)
+		  rmSetAreaCliffHeight(mesaID, rmRandInt(5,9), 1.0, 1.0);
+		else
+		  rmSetAreaCliffHeight(mesaID, -10, 1.0, 1.0);
+		rmAddAreaConstraint(mesaID, avoidCanyons);
+		rmSetAreaMinBlobs(mesaID, 3);
+		rmSetAreaMaxBlobs(mesaID, 5);
+		rmSetAreaMinBlobDistance(mesaID, 3.0);
+		rmSetAreaMaxBlobDistance(mesaID, 5.0);
+		rmSetAreaCoherence(mesaID, 0.5);
+		rmAddAreaConstraint(mesaID, playerConstraint); 
+		rmAddAreaConstraint(mesaID, avoidSocket);
+		rmAddAreaConstraint(mesaID, avoidNativesShort);
+		rmAddAreaConstraint(mesaID, avoidWater20);
+		rmAddAreaConstraint(mesaID, avoidTradeRoute);
+		rmAddAreaConstraint(mesaID, shortAvoidSilver);
+		if(rmBuildArea(mesaID)==false)
+		{
+			// Stop trying once we fail 3 times in a row.
+			failCount++;
+			if(failCount==2)
+				break;
+		}
+		else
+			failCount=0;
+	   }
+	// smaller mesas
+      if (makeCentralCliffArea == 1)
+	   numTries=cNumberNonGaiaPlayers*10;
+      else
+	   numTries=cNumberNonGaiaPlayers*14;
+	   for(i=0; <numTries)
+	   {
+		int smallCliffHeight=rmRandInt(0,10);
+		int smallMesaID=rmCreateArea("small mesa"+i);
+		rmSetAreaSize(smallMesaID, rmAreaTilesToFraction(4), rmAreaTilesToFraction(8));  
+		rmSetAreaWarnFailure(smallMesaID, false);
+		rmSetAreaCliffType(smallMesaID, cliffType);
+		rmAddAreaToClass(smallMesaID, rmClassID("canyon"));
+		rmAddAreaToClass(smallMesaID, rmClassID("classCliff"));	
+		rmSetAreaCliffEdge(smallMesaID, 1, 1.0, 0.1, 1.0, 0);
+		rmSetAreaCliffHeight(smallMesaID, rmRandInt(5,8), 1.0, 1.0);
+		rmAddAreaConstraint(smallMesaID, shortAvoidCanyons);
+		rmSetAreaMinBlobs(smallMesaID, 3);
+		rmSetAreaMaxBlobs(smallMesaID, 5);
+		rmSetAreaMinBlobDistance(smallMesaID, 3.0);
+		rmSetAreaMaxBlobDistance(smallMesaID, 5.0);
+		rmSetAreaCoherence(smallMesaID, 0.3);
+		rmAddAreaConstraint(smallMesaID, mediumPlayerConstraint); 
+		rmAddAreaConstraint(smallMesaID, avoidNativesShort); 
+		rmAddAreaConstraint(smallMesaID, avoidSocket);
+		rmAddAreaConstraint(smallMesaID, avoidWater10);
+		rmAddAreaConstraint(smallMesaID, avoidTradeRoute);
+		rmAddAreaConstraint(smallMesaID, shortAvoidSilver);
+		if(rmBuildArea(smallMesaID)==false)
+		{
+			// Stop trying once we fail 3 times in a row.
+			failCount++;
+			if(failCount==20)
+				break;
+		}
+		else
+			failCount=0;
+	   }
+	}
+	else if (cliffVariety == 0) // larger gorges a little like AOM Anatolia
+	{
+	   int gorgeHt=rmRandInt(-7,-4);
+	   numTries = 2;
+	   if (cNumberNonGaiaPlayers > 4)
+	      numTries = 3;
+	   for(i=0; <numTries)
+	   {
+	   int gorgeID=rmCreateArea("gorge"+i);
+         rmSetAreaWarnFailure(gorgeID, false); 
+	   rmSetAreaSize(gorgeID, rmAreaTilesToFraction(1500), rmAreaTilesToFraction(1800));
+	   rmSetAreaCliffType(gorgeID, cliffType);
+	   rmAddAreaToClass(gorgeID, rmClassID("classCliff"));
+	   rmSetAreaMinBlobs(gorgeID, 4);
+	   rmSetAreaMaxBlobs(gorgeID, 6);
+	   if (rmRandInt(1,3) == 1)
+	      rmSetAreaCliffEdge(gorgeID, 6, 0.10, 0.2, 1.0, 0);
+	   else
+	   {
+		if (rmRandInt(1,2) == 1) 
+	         rmSetAreaCliffEdge(gorgeID, 5, 0.15, 0.15, 1.0, 0);
+		else
+	         rmSetAreaCliffEdge(gorgeID, 4, 0.17, 0.15, 1.0, 0);
+	   }		
+	   rmSetAreaCliffPainting(gorgeID, false, true, true, 1.5);
+	   rmSetAreaMinBlobDistance(gorgeID, 20.0);
+	   rmSetAreaMaxBlobDistance(gorgeID, 20.0);
+	   rmSetAreaCoherence(gorgeID, rmRandFloat(0.0,0.2));
+	   rmSetAreaSmoothDistance(gorgeID, rmRandInt(10,20));
+	   rmSetAreaCliffHeight(gorgeID, gorgeHt, 1.0, 1.0);
+	   rmSetAreaHeightBlend(gorgeID, 2);
+	   rmAddAreaConstraint(gorgeID, cliffsAvoidCliffs);
+         rmAddAreaConstraint(gorgeID, avoidImportantItem);
+	   rmAddAreaConstraint(gorgeID, avoidTradeRoute);
+         rmAddAreaConstraint(gorgeID, avoidNatives);
+	   rmAddAreaConstraint(gorgeID, avoidWater20);
+	   rmAddAreaConstraint(gorgeID, avoidSocket);
+	   rmAddAreaConstraint(gorgeID, avoidStartingUnits);
+	   rmAddAreaConstraint(gorgeID, fartherPlayerConstraint);
+	   rmAddAreaConstraint(gorgeID, secondEdgeConstraint);
+	   rmAddAreaConstraint(gorgeID, longHillConstraint);
+ 	   rmBuildArea(gorgeID);
+	   }
+      }
+      else // all other maps with cliffs
+      {
+         int numCliffs = rmRandInt(4,5);
+	   if (cliffVariety == 2)
+		if (makeCentralCliffArea == 1)
+		   numCliffs = rmRandInt(3,4);
+		else
+		   numCliffs = rmRandInt(5,7);
+	   else
+ 		if (makeCentralCliffArea == 1)
+		   numCliffs = rmRandInt(3,4);
+         for (i=0; <numCliffs)
+         {
+		cliffHt = rmRandInt(5,7);    
+		int bigCliffID=rmCreateArea("big cliff" +i);
+		rmSetAreaWarnFailure(bigCliffID, false);
+		rmSetAreaCliffType(bigCliffID, cliffType);
+		rmAddAreaToClass(bigCliffID, rmClassID("classCliff"));
+		rmSetAreaMinBlobs(bigCliffID, 3);
+		rmSetAreaMaxBlobs(bigCliffID, 5);
+		rmSetAreaMinBlobDistance(bigCliffID, 5.0);
+		rmSetAreaMaxBlobDistance(bigCliffID, 20.0);
+		if (cliffVariety == 1) // like Patagonia
+		{
+   	         rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(550), rmAreaTilesToFraction(750));
+      	   rmSetAreaCliffEdge(bigCliffID, 2, 0.35, 0.1, 1.0, 0);
+		   if (bareCliffs == 1)
+			rmSetAreaCliffPainting(bigCliffID, true, true, true, 1.5, true);
+		   else
+      	      rmSetAreaCliffPainting(bigCliffID, false, true, true, 1.5, true);
+		   rmSetAreaCliffHeight(bigCliffID, 7, 2.0, 0.5);
+		   rmSetAreaCoherence(bigCliffID, 0.5);
+		   rmSetAreaSmoothDistance(bigCliffID, 5);
+		   rmSetAreaHeightBlend(bigCliffID, 1.0);
+		}
+		else if (cliffVariety == 2) // smaller, kinda like in Sudden Death from AOM
+		{
+   	         rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(280), rmAreaTilesToFraction(400));
+		   rmSetAreaCliffEdge(bigCliffID, 1, 0.6, 0.1, 1.0, 0);
+		   if (bareCliffs == 1)
+			rmSetAreaCliffPainting(bigCliffID, true, true, true, 1.5, true);
+		   else
+      	      rmSetAreaCliffPainting(bigCliffID, false, true, true, 1.5, true);
+		   rmSetAreaCliffHeight(bigCliffID, cliffHt, 1.0, 1.0);
+		   rmSetAreaCoherence(bigCliffID, rmRandFloat(0.4, 0.9));
+		   rmSetAreaSmoothDistance(bigCliffID, 10);
+		   rmSetAreaHeightBlend(bigCliffID, 2.0);
+		}
+		else if (cliffVariety == 6)  // odd long ridges
+		{
+   	         rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(300), rmAreaTilesToFraction(400));
+		   if (rmRandInt(1,2) == 1)
+ 	            rmSetAreaCliffEdge(bigCliffID, 2, 0.36, 0.1, 1.0, 0);
+		   else
+ 	            rmSetAreaCliffEdge(bigCliffID, 3, 0.26, 0.08, 1.0, 0);
+		   rmSetAreaCliffPainting(bigCliffID, true, true, true, 1.5, true);
+		   rmSetAreaCliffHeight(bigCliffID, cliffHt, 2.0, 1.0);
+		   rmSetAreaCoherence(bigCliffID, rmRandFloat(0.3, 0.5));
+		   rmSetAreaSmoothDistance(bigCliffID, 5);
+		   rmSetAreaHeightBlend(bigCliffID, 1.0);
+	  	   rmSetAreaMinBlobs(bigCliffID, 2);
+		   rmSetAreaMaxBlobs(bigCliffID, 2);
+		   rmSetAreaMinBlobDistance(bigCliffID, 90.0);
+		   rmSetAreaMaxBlobDistance(bigCliffID, 110.0);
+	         bareCliffs = 1;
+		}
+		else if (cliffVariety == 7)  // smooth rock domes
+		{
+   	         rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(200), rmAreaTilesToFraction(400));
+		   rmSetAreaCliffEdge(bigCliffID, 1, 0.005, 0.01, 1.0, 0);
+		   rmSetAreaCliffPainting(bigCliffID, true, true, true, 1.5, true);
+		   rmSetAreaCliffHeight(bigCliffID, rmRandInt(7,8), 2.0, 1.0);
+		   rmSetAreaCoherence(bigCliffID, rmRandFloat(0.3, 0.5));
+		   rmSetAreaSmoothDistance(bigCliffID, 20);
+		   rmSetAreaHeightBlend(bigCliffID, 1.0);
+	         bareCliffs = 1;
+		}
+		else  // kinda random, kinda like Texas or NE
+		{
+   	         rmSetAreaSize(bigCliffID, rmAreaTilesToFraction(400), rmAreaTilesToFraction(700));
+		   rmSetAreaCliffEdge(bigCliffID, 1, 0.6, 0.1, 1.0, 0);
+		   if (bareCliffs == 1)
+			rmSetAreaCliffPainting(bigCliffID, true, true, true, 1.5, true);
+		   else
+      	      rmSetAreaCliffPainting(bigCliffID, false, true, true, 1.5, true);
+		   rmSetAreaCliffHeight(bigCliffID, cliffHt, 2.0, 1.0);
+		   rmSetAreaCoherence(bigCliffID, rmRandFloat(0.4, 0.9));
+		   rmSetAreaSmoothDistance(bigCliffID, rmRandInt(12,16));
+		   rmSetAreaHeightBlend(bigCliffID, 1.0);
+		}
+		rmAddAreaConstraint(bigCliffID, avoidImportantItem);
+		rmAddAreaConstraint(bigCliffID, avoidTradeRoute);
+            rmAddAreaConstraint(bigCliffID, avoidNatives);
+	      rmAddAreaConstraint(bigCliffID, avoidWater20);
+	      rmAddAreaConstraint(bigCliffID, cliffsAvoidCliffs);
+	      rmAddAreaConstraint(bigCliffID, avoidSocket);
+	      rmAddAreaConstraint(bigCliffID, avoidStartingUnits);
+	      rmAddAreaConstraint(bigCliffID, longPlayerConstraint);
+	      rmAddAreaConstraint(bigCliffID, longHillConstraint);
+		rmBuildArea(bigCliffID);
+         }
+      }
+   }
+
+// Random ponds
+   if (makePonds == 1)
+   {
+	for (i=0; <cNumberNonGaiaPlayers*2)   
+      {
+	   int pondID=rmCreateArea("random pond"+i);
+	   rmSetAreaSize(pondID, rmAreaTilesToFraction(300), rmAreaTilesToFraction(600));
+         rmSetAreaWaterType(pondID, pondType);
+         rmSetAreaBaseHeight(pondID, 0);
+         rmSetAreaMinBlobs(pondID, 1);
+         rmSetAreaMaxBlobs(pondID, 6);
+         rmSetAreaMinBlobDistance(pondID, 12.0);
+         rmSetAreaMaxBlobDistance(pondID, 35.0);
+         rmAddAreaToClass(pondID, lakeClass);
+         rmAddAreaConstraint(pondID, avoidLakesFar);
+         rmAddAreaConstraint(pondID, longPlayerConstraint);
+         rmAddAreaConstraint(pondID, circleConstraint);
+         rmAddAreaConstraint(pondID, avoidTradeRoute);
+         rmAddAreaConstraint(pondID, avoidSocket);
+         rmAddAreaConstraint(pondID, avoidCliffs);
+         rmAddAreaConstraint(pondID, avoidAll);
+         rmAddAreaConstraint(pondID, avoidNativesShort);
+         rmAddAreaConstraint(pondID, medHillConstraint);
+         rmSetAreaCoherence(pondID, rmRandFloat(0.1,0.7));
+         rmSetAreaWarnFailure(pondID, false);
+         rmBuildArea(pondID);
+      }
+   }
+
+   // Text
+   rmSetStatusText("",0.60);
+
+// Random Nuggets
+   int nugget2= rmCreateObjectDef("nugget medium"); 
+   rmAddObjectDefItem(nugget2, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(2, 2);
+   rmAddObjectDefToClass(nugget2, rmClassID("classNugget"));
+   rmSetObjectDefMinDistance(nugget2, 60.0);
+   rmSetObjectDefMaxDistance(nugget2, 100.0);
+   rmAddObjectDefConstraint(nugget2, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(nugget2, circleConstraint);
+   rmAddObjectDefConstraint(nugget2, avoidSocket);
+   rmAddObjectDefConstraint(nugget2, avoidTradeRoute);
+   rmAddObjectDefConstraint(nugget2, nuggetPlayerConstraint);
+   rmAddObjectDefConstraint(nugget2, avoidNuggetMed);
+   rmAddObjectDefConstraint(nugget2, avoidWater10);
+   rmAddObjectDefConstraint(nugget2, avoidAll);
+   rmAddObjectDefConstraint(nugget2, avoidIce);
+   rmPlaceObjectDefPerPlayer(nugget2, false, 1);
+
+   int nugget3= rmCreateObjectDef("nugget hard"); 
+   rmAddObjectDefItem(nugget3, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(3, 3);
+   rmAddObjectDefToClass(nugget3, rmClassID("classNugget"));
+   rmSetObjectDefMinDistance(nugget3, 80.0);
+   rmSetObjectDefMaxDistance(nugget3, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(nugget3, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(nugget3, circleConstraint);
+   rmAddObjectDefConstraint(nugget3, avoidSocket);
+   rmAddObjectDefConstraint(nugget3, avoidTradeRoute);
+   rmAddObjectDefConstraint(nugget3, longPlayerConstraint);
+   rmAddObjectDefConstraint(nugget3, avoidNuggetMed);
+   rmAddObjectDefConstraint(nugget3, avoidWater10);
+   rmAddObjectDefConstraint(nugget3, avoidAll);
+   rmAddObjectDefConstraint(nugget3, avoidIce);
+   rmPlaceObjectDefPerPlayer(nugget3, false, 1);
+
+   int nugget4= rmCreateObjectDef("nugget nuts"); 
+   rmAddObjectDefItem(nugget4, "Nugget", 1, 0.0);
+   rmSetNuggetDifficulty(4, 4);
+   rmAddObjectDefToClass(nugget4, rmClassID("classNugget"));
+   rmAddObjectDefConstraint(nugget4, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(nugget4, circleConstraint);
+   rmAddObjectDefConstraint(nugget4, avoidSocket);
+   rmAddObjectDefConstraint(nugget4, avoidTradeRoute);
+   rmAddObjectDefConstraint(nugget4, longPlayerConstraint);
+   rmAddObjectDefConstraint(nugget4, avoidWater10);
+   rmAddObjectDefConstraint(nugget4, avoidAll);
+   rmAddObjectDefConstraint(nugget4, avoidIce);
+
+   // Team nuggets - only works on certain Asian map types - and/or more level 4 nuggets    
+   if (cNumberTeams == 2 && cNumberNonGaiaPlayers > 3 && rmRandInt(1,3) > 1 && ((patternChance == 29) || (patternChance == 30) || (patternChance == 33) || (patternChance == 35)))  
+   {
+      rmAddObjectDefConstraint(nugget4, avoidNuggetMed);
+      rmSetObjectDefMinDistance(nugget4, 70.0);
+      rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.3));
+      rmSetNuggetDifficulty(12, 12);
+      rmPlaceObjectDefPerPlayer(nugget4, false, 1);
+
+      rmSetNuggetDifficulty(4, 4);
+      rmSetObjectDefMinDistance(nugget4, 0.0);
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 1);
+      if (cNumberNonGaiaPlayers > 4)
+         rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(1,2));
+   }
+   else  // only regular level 4 nuggets
+   {
+      rmSetObjectDefMinDistance(nugget4, 85.0);
+      rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.4));
+      rmAddObjectDefConstraint(nugget4, avoidNuggetLong);
+      rmSetNuggetDifficulty(4, 4);
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+   }
+   // more level 4 nuggets
+   rmAddObjectDefConstraint(nugget4, avoidNuggetLong);
+   if (rmRandInt(1,4) > 1)
+   {
+      rmSetObjectDefMinDistance(nugget4, 15.0);
+      rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.15));
+      rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 1);
+	if (cNumberNonGaiaPlayers > 3 && rmRandInt(1,2) == 1)
+         rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, 1);
+   }
+
+   // more level 3 nuggets
+   rmAddObjectDefConstraint(nugget3, fartherPlayerConstraint);
+   rmSetNuggetDifficulty(2, 3);
+   rmPlaceObjectDefPerPlayer(nugget3, false, 1);
+   if (rmRandInt(1,5) == 1)
+      rmPlaceObjectDefPerPlayer(nugget3, false, 1);
+
+   // Text
+   rmSetStatusText("",0.65);
+
+// more resources
+   // start area trees 
+   int StartAreaTreeID=rmCreateObjectDef("starting trees");
+   rmAddObjectDefItem(StartAreaTreeID, treeType, 1, 0.0);
+   rmSetObjectDefMinDistance(StartAreaTreeID, 8);
+   rmSetObjectDefMaxDistance(StartAreaTreeID, 12);
+   rmAddObjectDefConstraint(StartAreaTreeID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(StartAreaTreeID, avoidTradeRoute);
+   rmAddObjectDefConstraint(StartAreaTreeID, avoidAll);
+   rmPlaceObjectDefPerPlayer(StartAreaTreeID, false, 3);
+
+   // berry bushes
+   int StartBerryBushID=rmCreateObjectDef("starting berry bush");
+   rmAddObjectDefItem(StartBerryBushID, "BerryBush", rmRandInt(3,5), 4.0);
+   rmSetObjectDefMinDistance(StartBerryBushID, 10.0);
+   rmSetObjectDefMaxDistance(StartBerryBushID, 16.0);
+   rmAddObjectDefConstraint(StartBerryBushID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(StartBerryBushID, avoidAll);
+   if (placeBerries == 1)
+      rmPlaceObjectDefPerPlayer(StartBerryBushID, false, 1);
+   if (tropicalMap == 1)
+      rmPlaceObjectDefPerPlayer(StartBerryBushID, false, 1);
+
+   rmSetObjectDefMinDistance(StartBerryBushID, 0.0);
+   rmSetObjectDefMaxDistance(StartBerryBushID, 75.0);
+   rmAddObjectDefConstraint(StartBerryBushID, nuggetPlayerConstraint);
+   if (extraBerries == 1)
+      rmPlaceObjectDefInArea(StartBerryBushID, 0, rmAreaID("TheCenter"), berryNum);
+   if (extraBerries == 2)
+   {
+	if (rmRandInt(1,2) == 1)
+         rmPlaceObjectDefInArea(StartBerryBushID, 0, rmAreaID("TheCenter"), 2);
+   } 
+
+   // start area huntable
+   int deerNum = rmRandInt(5,8);
+   int startPronghornID=rmCreateObjectDef("starting pronghorn");
+   rmAddObjectDefItem(startPronghornID, deerType, deerNum, 5.0);
+   rmAddObjectDefToClass(startPronghornID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(startPronghornID, 16);
+   rmSetObjectDefMaxDistance(startPronghornID, 22);
+   rmAddObjectDefConstraint(startPronghornID, avoidStartResource);
+   rmAddObjectDefConstraint(startPronghornID, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(startPronghornID, avoidAll);
+   rmSetObjectDefCreateHerd(startPronghornID, true);
+   rmPlaceObjectDefPerPlayer(startPronghornID, false, 1);
+
+   // second huntable
+   int deer2Num = rmRandInt(4, 8);
+   int farPronghornID=rmCreateObjectDef("far pronghorn");
+   rmAddObjectDefItem(farPronghornID, deer2Type, deer2Num, 5.0);
+   rmAddObjectDefToClass(farPronghornID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(farPronghornID, 42.0);
+   rmSetObjectDefMaxDistance(farPronghornID, 60.0);
+   rmAddObjectDefConstraint(farPronghornID, avoidStartResource);
+   rmAddObjectDefConstraint(farPronghornID, mediumPlayerConstraint);
+   rmAddObjectDefConstraint(farPronghornID, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(farPronghornID, avoidNativesShort);
+   rmAddObjectDefConstraint(farPronghornID, huntableConstraint);
+   rmAddObjectDefConstraint(farPronghornID, avoidAll);
+   rmAddObjectDefConstraint(farPronghornID, avoidIce);
+   rmSetObjectDefCreateHerd(farPronghornID, true);
+   if (sheepChance == 0)
+      rmPlaceObjectDefPerPlayer(farPronghornID, false, 2);
+   else
+      rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+
+   // possible additional second huntable for low player numbers
+   if (rmRandInt(1,3) < 3)
+   { 
+      if (cNumberNonGaiaPlayers < 4)
+      {
+         rmAddObjectDefConstraint(farPronghornID, fartherPlayerConstraint);
+         rmSetObjectDefMinDistance(farPronghornID, rmXFractionToMeters(0.25));
+         rmSetObjectDefMaxDistance(farPronghornID, rmXFractionToMeters(0.35));
+         rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+      }
+   }
+
+// Mines - other
+   silverType = rmRandInt(1,10);
+   int GoldMediumID=rmCreateObjectDef("player silver med");
+   rmAddObjectDefItem(GoldMediumID, mineType, 1, 0.0);
+   rmAddObjectDefConstraint(GoldMediumID, avoidTradeRoute);
+   rmAddObjectDefConstraint(GoldMediumID, avoidSocket);
+   rmAddObjectDefConstraint(GoldMediumID, coinAvoidCoin);
+   rmAddObjectDefConstraint(GoldMediumID, shortAvoidCanyons);
+   rmAddObjectDefConstraint(GoldMediumID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(GoldMediumID, playerConstraint);
+   rmAddObjectDefConstraint(GoldMediumID, circleConstraint);
+   rmAddObjectDefConstraint(GoldMediumID, avoidAll);
+   rmAddObjectDefConstraint(GoldMediumID, avoidIce);
+   rmAddObjectDefConstraint(GoldMediumID, avoidWater10);
+   rmSetObjectDefMinDistance(GoldMediumID, 40.0);
+   rmSetObjectDefMaxDistance(GoldMediumID, 55.0);
+   rmPlaceObjectDefPerPlayer(GoldMediumID, false, 1);
+
+// Extra mines - distant, in the middle and near ends of axis.
+   silverType = rmRandInt(1,10);
+   int extraGoldID = rmCreateObjectDef("extra silver "+i);
+   if (mineChance == 1)
+      rmAddObjectDefItem(extraGoldID, "minegold", 1, 0);
+   else
+      rmAddObjectDefItem(extraGoldID, mineType, 1, 0);
+   rmAddObjectDefToClass(extraGoldID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(extraGoldID, avoidTradeRoute);
+   rmAddObjectDefConstraint(extraGoldID, avoidSocket);
+   rmAddObjectDefConstraint(extraGoldID, coinAvoidCoin);
+   rmAddObjectDefConstraint(extraGoldID, shortAvoidCanyons);
+   rmAddObjectDefConstraint(extraGoldID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(extraGoldID, avoidWater10);
+   rmAddObjectDefConstraint(extraGoldID, avoidAll);
+   rmAddObjectDefConstraint(extraGoldID, avoidIce);
+   rmSetObjectDefMinDistance(extraGoldID, 0.0);
+   if (makeIce == 1)
+   {
+      rmSetObjectDefMaxDistance(extraGoldID, 100.0);
+      rmAddObjectDefConstraint(extraGoldID, centerConstraintFar);
+   }
+   else if (makeLake == 1)
+   {
+      rmSetObjectDefMaxDistance(extraGoldID, 100.0);
+	rmAddObjectDefConstraint(extraGoldID, centerConstraintFar);
+   }
+   else
+      rmSetObjectDefMaxDistance(extraGoldID, 70.0);
+   if (mineNumber == 4)
+      rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.5, 0.5, 1);
+   else   
+      rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.5, 0.5, rmRandInt(2,3));
+
+   if ((mineNumber < 4) || (mineNumber > 4))
+   { 
+      if (cNumberNonGaiaPlayers > 4)
+         rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.5, 0.5, 1);
+      if (cNumberNonGaiaPlayers > 6)
+         rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.5, 0.5, 1);
+   }
+   if ((mineNumber < 5) || (mineNumber > 5))
+   { 
+      if (axisChance == 1)
+      {
+         rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.49, 0.78, 1);
+         rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.51, 0.22, 1);
+      }
+      else
+      {
+         rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.78, 0.51, 1);
+         rmPlaceObjectDefAtLoc(extraGoldID, 0, 0.22, 0.49, 1);
+      }
+   }
+   silverType = rmRandInt(1,10);
+   int GoldFarID=rmCreateObjectDef("player silver far");
+   if (mineChance == 2)
+      rmAddObjectDefItem(GoldFarID, "minegold", 1, 0);
+   else
+      rmAddObjectDefItem(GoldFarID, mineType, 1, 0.0);
+   rmAddObjectDefConstraint(GoldFarID, avoidTradeRoute);
+   rmAddObjectDefConstraint(GoldFarID, avoidSocket);
+   rmAddObjectDefConstraint(GoldFarID, coinAvoidCoin);
+   rmAddObjectDefConstraint(GoldFarID, shortAvoidCanyons);
+   rmAddObjectDefConstraint(GoldFarID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(GoldFarID, circleConstraint);
+   rmAddObjectDefConstraint(GoldFarID, avoidAll);
+   rmAddObjectDefConstraint(GoldFarID, farPlayerConstraint);
+   rmAddObjectDefConstraint(GoldFarID, avoidWater10);
+   rmAddObjectDefConstraint(GoldFarID, avoidIce);
+   rmSetObjectDefMinDistance(GoldFarID, 75.0);
+   rmSetObjectDefMaxDistance(GoldFarID, 100.0);
+   if (mineNumber < 6) 
+   { 
+      rmPlaceObjectDefPerPlayer(GoldFarID, false, rmRandInt(1,2));
+   }
+
+   silverType = rmRandInt(1,10);
+   int GoldFartherID=rmCreateObjectDef("player silver farther");
+   if (mineChance == 3)
+      rmAddObjectDefItem(GoldFartherID, "minegold", 1, 0);
+   else
+      rmAddObjectDefItem(GoldFartherID, mineType, 1, 0.0);
+   rmAddObjectDefConstraint(GoldFartherID, avoidTradeRoute);
+   rmAddObjectDefConstraint(GoldFartherID, avoidSocket);
+   rmAddObjectDefConstraint(GoldFartherID, coinAvoidCoin);
+   rmAddObjectDefConstraint(GoldFartherID, shortAvoidCanyons);
+   rmAddObjectDefConstraint(GoldFartherID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(GoldFartherID, circleConstraint);
+   rmAddObjectDefConstraint(GoldFartherID, avoidAll);
+   rmAddObjectDefConstraint(GoldFartherID, avoidIce);
+   rmAddObjectDefConstraint(GoldFartherID, avoidWater10);
+   if (sectionChance > 9)
+   {
+      rmSetObjectDefMinDistance(GoldFartherID, 120.0);
+      rmSetObjectDefMaxDistance(GoldFartherID, 200.0);
+      rmAddObjectDefConstraint(GoldFartherID, enormousPlayerConstraint);
+   }
+   else
+   {
+      rmSetObjectDefMinDistance(GoldFartherID, 90.0);
+      rmSetObjectDefMaxDistance(GoldFartherID, 150.0);
+      rmAddObjectDefConstraint(GoldFartherID, fartherPlayerConstraint);
+   }
+   if (mineNumber < 7) 
+   {
+      if (cNumberNonGaiaPlayers < 4)
+      {
+	   rmPlaceObjectDefPerPlayer(GoldFartherID, false, rmRandInt(1,2));
+      }
+      else if (cNumberNonGaiaPlayers < 6)
+      {
+         if (makeLake == 1)
+	      rmPlaceObjectDefPerPlayer(GoldFartherID, false, 2);
+         else
+	      rmPlaceObjectDefPerPlayer(GoldFartherID, false, rmRandInt(1,2));
+      }
+      else
+      {
+	   rmPlaceObjectDefPerPlayer(GoldFartherID, false, rmRandInt(1,4));
+      }
+   }
+   if (mineNumber == 8)
+   {
+	if (cNumberNonGaiaPlayers < 4)
+         rmPlaceObjectDefAtLoc(GoldFartherID, 0, 0.5, 0.5, 1);
+	else if (cNumberNonGaiaPlayers == 4)
+         rmPlaceObjectDefAtLoc(GoldFartherID, 0, 0.5, 0.5, 2);
+	else
+         rmPlaceObjectDefAtLoc(GoldFartherID, 0, 0.5, 0.5, rmRandInt(2,3));
+   }
+
+// Extra tree clumps near players - to ensure fair access to wood
+   int extraTreesID=rmCreateObjectDef("extra trees");
+   rmAddObjectDefItem(extraTreesID, treeType, 5, 5.0);
+   rmSetObjectDefMinDistance(extraTreesID, 14);
+   rmSetObjectDefMaxDistance(extraTreesID, 18);
+   rmAddObjectDefConstraint(extraTreesID, avoidAll);
+   rmAddObjectDefConstraint(extraTreesID, avoidNuggetSmall);
+   rmAddObjectDefConstraint(extraTreesID, avoidCoin);
+   rmAddObjectDefConstraint(extraTreesID, avoidSocket);
+   rmAddObjectDefConstraint(extraTreesID, avoidTradeRoute);
+   for(i=1; <cNumberPlayers)
+      rmPlaceObjectDefInArea(extraTreesID, 0, rmAreaID("player"+i), 1);
+
+   rmSetObjectDefMinDistance(extraTreesID, 19);
+   rmSetObjectDefMaxDistance(extraTreesID, 30);
+   for(i=1; <cNumberPlayers)
+      rmPlaceObjectDefInArea(extraTreesID, 0, rmAreaID("player"+i), 1);
+
+   // Text
+   rmSetStatusText("",0.70);
+
+// sheep etc
+   if (sheepChance > 0)
+   {
+      int sheepID=rmCreateObjectDef("herdable animal");
+      rmAddObjectDefItem(sheepID, sheepType, 2, 4.0);
+      rmAddObjectDefToClass(sheepID, rmClassID("herdableFood"));
+      rmSetObjectDefMinDistance(sheepID, 38.0);
+      rmSetObjectDefMaxDistance(sheepID, 50.0);
+      rmAddObjectDefConstraint(sheepID, avoidSheep);
+      rmAddObjectDefConstraint(sheepID, avoidAll);
+      rmAddObjectDefConstraint(sheepID, avoidIce);
+      rmAddObjectDefConstraint(sheepID, playerConstraint);
+      rmAddObjectDefConstraint(sheepID, avoidCliffs);
+      rmAddObjectDefConstraint(sheepID, avoidImpassableLand);
+	rmPlaceObjectDefPerPlayer(sheepID, false, 1);
+      if (sheepChance == 2)
+	   rmPlaceObjectDefPerPlayer(sheepID, false, 1);
+
+      rmSetObjectDefMinDistance(sheepID, 47.0);
+      rmSetObjectDefMaxDistance(sheepID, rmXFractionToMeters(0.3));
+	int extraFlocks = rmRandInt(cNumberNonGaiaPlayers,cNumberNonGaiaPlayers*2);
+	sheepChance = rmRandInt(1,2);
+      if (sheepChance == 1)
+         rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+      else 
+         rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*2); 
+      rmAddObjectDefConstraint(sheepID, farPlayerConstraint);
+      rmSetObjectDefMaxDistance(sheepID, rmXFractionToMeters(0.45));
+      rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, extraFlocks); 
+   }
+
+// Central herds
+   int centralHerdID=rmCreateObjectDef("central herd");  
+   rmAddObjectDefItem(centralHerdID, centerHerdType, rmRandInt(7,9), 6.0);
+   rmAddObjectDefToClass(centralHerdID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(centralHerdID, rmXFractionToMeters(0.05));
+   rmSetObjectDefMaxDistance(centralHerdID, rmXFractionToMeters(0.12));
+   rmAddObjectDefConstraint(centralHerdID, avoidTradeRoute);
+   rmAddObjectDefConstraint(centralHerdID, avoidImportantItem);
+   rmAddObjectDefConstraint(centralHerdID, avoidWater10);
+   rmAddObjectDefConstraint(centralHerdID, avoidIce);
+   rmAddObjectDefConstraint(centralHerdID, farPlayerConstraint);
+   rmAddObjectDefConstraint(centralHerdID, longHuntableConstraint);
+   rmSetObjectDefCreateHerd(centralHerdID, true);
+   rmPlaceObjectDefAtLoc(centralHerdID, 0, 0.5, 0.5, 2);
+   // additional of central herd type
+   rmAddObjectDefConstraint(centralHerdID, fartherPlayerConstraint);
+   rmSetObjectDefMinDistance(centralHerdID, rmXFractionToMeters(0.3));
+   rmSetObjectDefMaxDistance(centralHerdID, rmXFractionToMeters(0.38));
+   if (rmRandInt(1,4) > 1)   
+      rmPlaceObjectDefPerPlayer(centralHerdID, false, 1);
+
+// far huntable
+   int farHuntableID=rmCreateObjectDef("far huntable");
+   rmAddObjectDefItem(farHuntableID, deerType, rmRandInt(5,9), 6.0);
+   rmAddObjectDefToClass(farHuntableID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(farHuntableID, rmXFractionToMeters(0.33));
+   rmSetObjectDefMaxDistance(farHuntableID, rmXFractionToMeters(0.4));
+   rmAddObjectDefConstraint(farHuntableID, avoidTradeRoute);
+   rmAddObjectDefConstraint(farHuntableID, avoidImportantItem);
+   rmAddObjectDefConstraint(farHuntableID, avoidWater10);
+   rmAddObjectDefConstraint(farHuntableID, fartherPlayerConstraint);
+   rmAddObjectDefConstraint(farHuntableID, longHuntableConstraint);
+   rmAddObjectDefConstraint(farHuntableID, avoidAll);
+   rmAddObjectDefConstraint(farHuntableID, avoidIce);
+   rmSetObjectDefCreateHerd(farHuntableID, true);
+   rmPlaceObjectDefPerPlayer(farHuntableID, false, 1);
+   if (sheepChance == 0)
+   {
+	if (rmRandInt(1,3) > 1)
+         rmPlaceObjectDefPerPlayer(farHuntableID, false, 1);
+   }
+   else
+   {
+	if (rmRandInt(1,3) == 1)
+         rmPlaceObjectDefPerPlayer(farHuntableID, false, 1);
+   }
+
+// Central forests for highlands, canyons
+   if (clearCenter < 1)
+	makeCentralForestPatch = 1; 
+   if (clearCenter == 1)
+   {
+	if (makeCentralCanyon == 1)
+	   makeCentralForestPatch = 1; 
+   }
+   if (makeCentralCliffArea == 1) // forest for central highlands or canyons
+   {
+      if (makeCentralForestPatch == 1)
+      {  
+         numTries=cNumberNonGaiaPlayers;
+         for (i=0; <numTries)
+         { 
+             int forestPatchID = rmCreateArea("forest patch"+i, rmAreaID("center highlands"));
+             rmAddAreaToClass(forestPatchID, rmClassID("classForest"));
+             rmSetAreaWarnFailure(forestPatchID, false);
+             rmSetAreaSize(forestPatchID, rmAreaTilesToFraction(80), rmAreaTilesToFraction(150));
+             rmSetAreaCoherence(forestPatchID, 0.6);
+        	 if (patternChance == 8)
+	          rmSetAreaForestType(forestPatchID, "rockies snow forest");
+		 else 
+      	    rmSetAreaForestType(forestPatchID, forestType);
+             rmSetAreaForestDensity(forestPatchID, 0.6);
+             rmSetAreaForestClumpiness(forestPatchID, 0.9);
+             rmSetAreaForestUnderbrush(forestPatchID, 0.2);
+             rmSetAreaCoherence(forestPatchID, 0.4);
+             rmSetAreaSmoothDistance(forestPatchID, 10);
+             rmAddAreaConstraint(forestPatchID, avoidAll);
+             rmAddAreaConstraint(forestPatchID, avoidTradeRoute);
+	       rmAddAreaConstraint(forestPatchID, avoidSocket);
+	       rmAddAreaConstraint(forestPatchID, avoidNativesShort);
+             rmBuildArea(forestPatchID);
+
+		 if (forestCoverUp == 1)
+		 {
+      	 int smallForestPatchID = rmCreateArea("small forest patch"+i, rmAreaID("forest patch"+i));   
+      	 rmSetAreaWarnFailure(smallForestPatchID, false);
+	       rmSetAreaSize(smallForestPatchID, rmAreaTilesToFraction(160), rmAreaTilesToFraction(160));
+	       rmSetAreaCoherence(smallForestPatchID, 0.99);
+      	 rmSetAreaMix(smallForestPatchID, baseType);
+	       rmBuildArea(smallForestPatchID);
+		 }
+	   }   
+      }       
+   }
+   else if (patternChance == 8) // for 1 central mt on Rockies
+   {
+	if (numMt == 1)
+	{
+         numTries=3*cNumberNonGaiaPlayers;
+    	   if (cNumberNonGaiaPlayers > 4)
+	      numTries=2*cNumberNonGaiaPlayers;
+         for (i=0; <numTries)
+         { 
+            int snowForestPatchID = rmCreateArea("snow forest patch"+i, rmAreaID("mt patch"+0));
+            rmAddAreaToClass(snowForestPatchID, rmClassID("classForest"));
+            rmSetAreaWarnFailure(snowForestPatchID, false);
+            rmSetAreaSize(snowForestPatchID, rmAreaTilesToFraction(170), rmAreaTilesToFraction(220));
+            rmSetAreaCoherence(snowForestPatchID, 0.6);
+            rmSetAreaForestType(snowForestPatchID, "rockies snow forest");
+            rmSetAreaForestDensity(snowForestPatchID, 1.0);
+            rmSetAreaForestClumpiness(snowForestPatchID, 0.9);
+            rmSetAreaForestUnderbrush(snowForestPatchID, 0.0);
+            rmSetAreaCoherence(snowForestPatchID, 0.4);
+            rmSetAreaSmoothDistance(snowForestPatchID, 10);
+            rmAddAreaConstraint(snowForestPatchID, avoidAll);
+            rmAddAreaConstraint(snowForestPatchID, avoidTradeRoute);
+            rmAddAreaConstraint(snowForestPatchID, avoidSocket);
+            rmAddAreaConstraint(snowForestPatchID, avoidNativesShort);
+            rmBuildArea(snowForestPatchID);
+         }
+	}
+   }
+
+   // Text
+   rmSetStatusText("",0.75);
+
+   // Clearings
+   if (clearCenter < 1)
+   {
+      for (i=0; <cNumberNonGaiaPlayers)   
+      {
+	   int forestClearing=rmCreateArea("forest clearing "+i);
+	   rmSetAreaWarnFailure(forestClearing, false);
+	   rmSetAreaSize(forestClearing, rmAreaTilesToFraction(225), rmAreaTilesToFraction(300));
+	   rmSetAreaMix(forestClearing, baseType);
+	   rmAddAreaToClass(forestClearing, rmClassID("classClearing"));
+	   rmSetAreaMinBlobs(forestClearing, 1);
+	   rmSetAreaMaxBlobs(forestClearing, 3);
+	   rmSetAreaMinBlobDistance(forestClearing, 6.0);
+	   rmSetAreaMaxBlobDistance(forestClearing, 16.0);
+	   rmSetAreaCoherence(forestClearing, 0.5);
+	   rmSetAreaSmoothDistance(forestClearing, 10);
+	   rmAddAreaConstraint(forestClearing, shortAvoidImpassableLand);
+	   rmAddAreaConstraint(forestClearing, avoidClearing);
+	   rmAddAreaConstraint(forestClearing, farPlayerConstraint);
+	   rmAddAreaConstraint(forestClearing, hillConstraint);
+	   rmAddAreaConstraint(forestClearing, avoidCliffs);
+	   rmBuildArea(forestClearing);
+         int clearingTreesID=rmCreateObjectDef("clearing trees "+i);
+         rmAddObjectDefItem(clearingTreesID, treeType, rmRandInt(3,5), 9.0);
+	   rmPlaceObjectDefInArea(clearingTreesID, 0, rmAreaID("forest clearing "+i), rmRandInt(1,2));
+      }
+   }
+
+// Main forests
+   int forestChance = -1;
+   numTries=15*cNumberNonGaiaPlayers;
+   if (cNumberNonGaiaPlayers > 3)
+      numTries=13*cNumberNonGaiaPlayers;  
+   if (cNumberNonGaiaPlayers > 5)
+      numTries=12*cNumberNonGaiaPlayers;  
+   if (cNumberNonGaiaPlayers > 7)
+      numTries=11*cNumberNonGaiaPlayers;  
+   if (reducedForest == 1)
+   {
+      numTries=13*cNumberNonGaiaPlayers;
+      if (cNumberNonGaiaPlayers > 3)
+         numTries=11*cNumberNonGaiaPlayers;  
+      if (cNumberNonGaiaPlayers > 5)
+         numTries=10*cNumberNonGaiaPlayers;  
+      if (cNumberNonGaiaPlayers > 7)
+         numTries=9*cNumberNonGaiaPlayers;    
+   }
+
+   if (clearCenter == 1)
+   {
+      numTries=11*cNumberNonGaiaPlayers;
+      if (cNumberNonGaiaPlayers > 3)
+         numTries=10*cNumberNonGaiaPlayers;  
+      if (cNumberNonGaiaPlayers > 5)
+         numTries=9*cNumberNonGaiaPlayers;  
+      if (cNumberNonGaiaPlayers > 7)
+         numTries=8*cNumberNonGaiaPlayers;   
+   }
+
+   if ((patternChance == 1) || (patternChance == 2) || (patternChance == 3)|| (patternChance == 4) || (patternChance == 5)|| (patternChance == 8) || (patternChance == 14)|| (patternChance == 16) || (patternChance == 18) || (patternChance == 22) || (patternChance == 24)|| (patternChance == 25) || (patternChance == 27) ||(patternChance == 28) || (patternChance == 29) || (patternChance == 30) || (patternChance == 32)|| (patternChance == 34)|| (patternChance == 35) || (patternChance == 37))
+   {
+	if (rmRandInt(1,3) == 1)
+	   denseForest = 1;
+	if (rmRandInt(1,5) < 3)
+	{
+	   if (rmRandInt(1,3) > 1) 
+	      forSize = 4;
+	   else
+	      forSize = 3;
+	}
+   }
+
+   failCount=0;
+   for (i=0; <numTries)
+   {
+      if (forSize == 1)
+         forestSize = rmRandInt(120, 220);
+      if (forSize == 2)
+         forestSize = rmRandInt(150, 300);
+      if (forSize == 3)
+         forestSize = rmRandInt(200, 400);
+      if (forSize == 4)
+         forestSize = rmRandInt(250, 600);
+      patchSize = forestSize + 50;
+      forestChance = rmRandInt(1,4);
+      int forest=rmCreateArea("forest "+i);
+      rmSetAreaWarnFailure(forest, false);
+      rmSetAreaSize(forest, rmAreaTilesToFraction(forestSize), rmAreaTilesToFraction(forestSize));
+	if (dualForest == 1)
+	{
+	   if (rmRandInt(1,2) == 1)
+		rmSetAreaForestType(forest, forestType);
+	   else
+		rmSetAreaForestType(forest, forest2Type);
+	}
+	else
+         rmSetAreaForestType(forest, forestType);
+
+      if (denseForest == 1)
+	{
+         rmSetAreaForestDensity(forest, 0.99);
+         rmSetAreaForestClumpiness(forest, 0.99);
+	}
+	else
+	{
+         rmSetAreaForestDensity(forest, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forest, rmRandFloat(0.5, 0.9));
+	}
+      rmSetAreaForestUnderbrush(forest, rmRandFloat(0.0, 0.5));
+      rmSetAreaCoherence(forest, rmRandFloat(0.4, 0.7));
+      rmSetAreaSmoothDistance(forest, rmRandInt(10,20));
+      if (forestChance == 3)
+      {
+	   rmSetAreaMinBlobs(forest, 1);
+	   rmSetAreaMaxBlobs(forest, 3);					
+	   rmSetAreaMinBlobDistance(forest, 12.0);
+	   rmSetAreaMaxBlobDistance(forest, 24.0);
+	}
+      if (forestChance == 4)
+      {
+	   rmSetAreaMinBlobs(forest, 3);
+	   rmSetAreaMaxBlobs(forest, 5);					
+	   rmSetAreaMinBlobDistance(forest, 16.0);
+	   rmSetAreaMaxBlobDistance(forest, 28.0);
+	   rmSetAreaSmoothDistance(forest, 20);
+	}
+      rmAddAreaToClass(forest, rmClassID("classForest")); 
+	rmAddAreaConstraint(forest, mediumPlayerConstraint);
+      rmAddAreaConstraint(forest, forestConstraint);
+      rmAddAreaConstraint(forest, avoidAll); 
+	rmAddAreaConstraint(forest, avoidCoin);  
+      rmAddAreaConstraint(forest, avoidImpassableLand); 
+      rmAddAreaConstraint(forest, avoidTradeRoute);
+	rmAddAreaConstraint(forest, avoidStartingUnits);
+	rmAddAreaConstraint(forest, avoidSocket);
+	rmAddAreaConstraint(forest, avoidNativesShort);
+      rmAddAreaConstraint(forest, forestsAvoidBison); 
+	rmAddAreaConstraint(forest, hillConstraint);
+	rmAddAreaConstraint(forest, avoidClearing);
+	if ((noCliffForest == 1) || (bareCliffs == 1))
+	   rmAddAreaConstraint(forest, avoidCliffs);
+      if (clearCenter == 1)
+	{
+	   if (cNumberNonGaiaPlayers > 3)
+	   {
+		if (rmRandInt(1,2) == 1) 
+	         rmAddAreaConstraint(forest, centerConstraintForest);
+		else
+		   rmAddAreaConstraint(forest, centerConstraintForest2);
+	   }
+	   else
+	   {
+		if (rmRandInt(1,2) == 1) 
+	         rmAddAreaConstraint(forest, centerConstraintForest3);
+		else
+		   rmAddAreaConstraint(forest, centerConstraintForest4);
+	   }
+	}
+      else
+	{
+	   if (makeCentralCliffArea == 1)
+   	      rmAddAreaConstraint(forest, centerConstraintShort);
+	}
+	if (hillTrees == 1)
+	{
+	   if (rmRandInt(1,2) == 1)
+	   {
+            rmSetAreaBaseHeight(forest, rmRandFloat(3.0,5.0));
+	      rmSetAreaHeightBlend(forest, rmRandFloat(1.7,3.0));
+	   }
+	}
+      if(rmBuildArea(forest)==false)
+      {
+         // Stop trying once we fail 3 times in a row.
+         failCount++;
+         if(failCount==5)
+            break;
+      }
+      else
+         failCount=0; 
+	if (forestCoverUp == 1)
+	{
+         int coverForestPatchID = rmCreateArea("cover forest patch"+i, rmAreaID("forest "+i));   
+         rmSetAreaWarnFailure(coverForestPatchID, false);
+         rmSetAreaSize(coverForestPatchID, rmAreaTilesToFraction(patchSize), rmAreaTilesToFraction(patchSize));
+         rmSetAreaCoherence(coverForestPatchID, 0.99);
+         rmSetAreaMix(coverForestPatchID, baseType);
+         if (bareCliffs == 1)
+            rmAddAreaConstraint(coverForestPatchID, avoidCliffsShort);
+         rmBuildArea(coverForestPatchID);
+	}
+   } 
+
+   // Text
+   rmSetStatusText("",0.80);
+
+// Random trees
+   int StragglerTreeID=rmCreateObjectDef("stragglers");
+   rmAddObjectDefItem(StragglerTreeID, treeType, 1, 0.0);
+   rmAddObjectDefConstraint(StragglerTreeID, avoidAll);
+   rmAddObjectDefConstraint(StragglerTreeID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(StragglerTreeID, hillConstraint);
+   rmAddObjectDefConstraint(StragglerTreeID, avoidCoin);
+   rmAddObjectDefConstraint(StragglerTreeID, patchConstraint);
+   rmAddObjectDefConstraint(StragglerTreeID, avoidWater10);
+   if ((noCliffForest == 1) || (bareCliffs == 1))
+      rmAddObjectDefConstraint(StragglerTreeID, avoidCliffs);
+   rmSetObjectDefMinDistance(StragglerTreeID, 10.0);
+   rmSetObjectDefMaxDistance(StragglerTreeID, rmXFractionToMeters(0.5));
+   for(i=0; <cNumberNonGaiaPlayers*12)
+      rmPlaceObjectDefAtLoc(StragglerTreeID, 0, 0.5, 0.5);   
+
+// Fish
+   int fishID=rmCreateObjectDef("fish");
+   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 26.0);
+   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 7.0);
+   rmAddObjectDefItem(fishID, fishType, 1, 0.0);
+   rmSetObjectDefMinDistance(fishID, 0.0);
+   rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(fishID, fishVsFishID);
+   rmAddObjectDefConstraint(fishID, fishLand);
+   if (cNumberNonGaiaPlayers < 4)
+      rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, rmRandInt(3,5));
+   else
+	rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, rmRandInt(4,6));
+
+   // Text
+   rmSetStatusText("",0.90);
+
+// Patch to cover forest floor in some patterns
+if (coverUp == 1)
+{
+   int coverPatchID = rmCreateArea("cover patch"+i);
+   rmSetAreaLocation(coverPatchID, 0.5, 0.5); 
+   rmSetAreaWarnFailure(coverPatchID, false);
+   rmSetAreaSize(coverPatchID, 0.99, 0.99);
+   rmSetAreaCoherence(coverPatchID, 0.99);
+   rmSetAreaMix(coverPatchID, baseType);
+   if (bareCliffs == 1)
+      rmAddAreaConstraint(coverPatchID, avoidCliffsShort);
+   rmBuildArea(coverPatchID);
+
+   int coverPatch2ID = rmCreateArea("cover patch 2"+1);
+   rmSetAreaLocation(coverPatch2ID, 0.5, 0.5); 
+   rmSetAreaWarnFailure(coverPatch2ID, false);
+   rmSetAreaSize(coverPatch2ID, 0.99, 0.99);
+   rmSetAreaCoherence(coverPatch2ID, 0.99);
+   rmSetAreaMix(coverPatch2ID, baseType);
+   if (bareCliffs == 1)
+      rmAddAreaConstraint(coverPatch2ID, avoidCliffsShort);
+   rmBuildArea(coverPatch2ID);
+}
+
+// Deco
+   // Patches for Araucania, California, Andes, Patagonia
+   if (specialPatch == 1)
+   {
+      for (i=0; <cNumberNonGaiaPlayers*8)   
+      {
+	   int colorPatch=rmCreateArea("color patch "+i);
+	   rmSetAreaWarnFailure(colorPatch, false);
+	   rmSetAreaSize(colorPatch, rmAreaTilesToFraction(250), rmAreaTilesToFraction(400));
+         rmSetAreaMix(colorPatch, patchMixType);
+	   rmAddAreaToClass(colorPatch, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(colorPatch, 1);
+	   rmSetAreaMaxBlobs(colorPatch, 5);
+	   rmSetAreaMinBlobDistance(colorPatch, 16.0);
+	   rmSetAreaMaxBlobDistance(colorPatch, 36.0);
+	   rmSetAreaCoherence(colorPatch, 0.1);
+	   rmSetAreaSmoothDistance(colorPatch, 10);
+	   rmAddAreaConstraint(colorPatch, shortAvoidImpassableLand);
+	   rmAddAreaConstraint(colorPatch, patchConstraint);
+	   rmAddAreaConstraint(colorPatch, avoidWater20);
+	   rmAddAreaConstraint(colorPatch, shortForestConstraint);
+	   rmBuildArea(colorPatch); 
+      }
+
+      for (i=0; <cNumberNonGaiaPlayers*12)   
+      {
+	   int colorPatch2=rmCreateArea("2nd color patch "+i);
+	   rmSetAreaWarnFailure(colorPatch2, false);
+	   rmSetAreaSize(colorPatch2, rmAreaTilesToFraction(60), rmAreaTilesToFraction(150));
+         rmSetAreaMix(colorPatch2, patchMixType);
+	   rmAddAreaToClass(colorPatch2, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(colorPatch2, 1);
+	   rmSetAreaMaxBlobs(colorPatch2, 3);
+	   rmSetAreaMinBlobDistance(colorPatch2, 10.0);
+	   rmSetAreaMaxBlobDistance(colorPatch2, 20.0);
+	   rmSetAreaCoherence(colorPatch2, 0.1);
+	   rmSetAreaSmoothDistance(colorPatch2, 10);
+	   rmAddAreaConstraint(colorPatch2, shortAvoidImpassableLand);
+	   rmAddAreaConstraint(colorPatch2, patchConstraint);
+	   rmAddAreaConstraint(colorPatch2, avoidWater20);
+	   rmAddAreaConstraint(colorPatch2, shortForestConstraint);
+	   rmBuildArea(colorPatch2); 
+      }
+   }
+
+   // Text
+   rmSetStatusText("",0.95);
+
+   // Dirt patches for Carolina
+   if (patternChance == 2 && variantChance == 2)
+   {
+	   for (i=0; <cNumberNonGaiaPlayers*9)   
+         {
+		int dirtPatchC=rmCreateArea("carolina dirt patch "+i);
+		rmSetAreaWarnFailure(dirtPatchC, false);
+		rmSetAreaSize(dirtPatchC, rmAreaTilesToFraction(190), rmAreaTilesToFraction(260));
+		rmSetAreaTerrainType(dirtPatchC, "carolina\ground_grass4_car");
+		rmAddAreaToClass(dirtPatchC, rmClassID("classPatch"));
+		rmSetAreaMinBlobs(dirtPatchC, 3);
+		rmSetAreaMaxBlobs(dirtPatchC, 5);
+		rmSetAreaMinBlobDistance(dirtPatchC, 16.0);
+		rmSetAreaMaxBlobDistance(dirtPatchC, 36.0);
+		rmSetAreaCoherence(dirtPatchC, 0.0);
+		rmSetAreaSmoothDistance(dirtPatchC, 10);
+		rmAddAreaConstraint(dirtPatchC, shortAvoidImpassableLand);
+		rmAddAreaConstraint(dirtPatchC, patchConstraint);
+	      rmAddAreaConstraint(dirtPatchC, shortForestConstraint);
+		rmBuildArea(dirtPatchC); 
+	   }
+   }
+
+   // Dirt patches for Sonora
+   if (patternChance == 13 && twoChoice == 1)
+   {
+	for (i=0; <cNumberNonGaiaPlayers*6)   
+      {
+	   int dirtPatch=rmCreateArea("open dirt patch "+i);
+         rmSetAreaWarnFailure(dirtPatch, false);
+	   rmSetAreaSize(dirtPatch, rmAreaTilesToFraction(150), rmAreaTilesToFraction(230));
+	   rmSetAreaTerrainType(dirtPatch, "sonora\ground7_son");
+	   rmAddAreaToClass(dirtPatch, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(dirtPatch, 1);
+	   rmSetAreaMaxBlobs(dirtPatch, 5);
+	   rmSetAreaMinBlobDistance(dirtPatch, 16.0);
+	   rmSetAreaMaxBlobDistance(dirtPatch, 40.0);
+	   rmSetAreaCoherence(dirtPatch, 0.0);
+	   rmSetAreaSmoothDistance(dirtPatch, 10);
+	   rmAddAreaConstraint(dirtPatch, shortAvoidImpassableLand);
+	   rmAddAreaConstraint(dirtPatch, patchConstraint);
+	   rmBuildArea(dirtPatch); 
+      }
+   }
+
+   // Snow patches for Yukon Tundra
+   if (patternChance == 20)
+   { 
+      for(i=1; <cNumberPlayers*4)
+      {
+         int patchAID=rmCreateArea("PatchA"+i);
+         rmSetAreaSize(patchAID, rmAreaTilesToFraction(185), rmAreaTilesToFraction(250));
+         rmAddAreaToClass(patchAID, rmClassID("classPatch"));
+         rmSetAreaTerrainType(patchAID, "yukon\ground1_yuk");
+         rmAddAreaTerrainLayer(patchAID, "yukon\ground5_yuk", 0, 2);
+         rmAddAreaTerrainLayer(patchAID, "yukon\ground4_yuk", 2, 3);
+         rmAddAreaTerrainLayer(patchAID, "yukon\ground8_yuk", 3, 4);
+         rmSetAreaWarnFailure(patchAID, false);
+         rmSetAreaMinBlobs(patchAID, 2);
+         rmSetAreaMaxBlobs(patchAID, 3);
+         rmSetAreaMinBlobDistance(patchAID, 12.0);
+         rmSetAreaMaxBlobDistance(patchAID, 22.0);
+         rmSetAreaCoherence(patchAID, 0.3);
+         rmAddAreaConstraint(patchAID, playerConstraint);
+         rmAddAreaConstraint(patchAID, shortAvoidImpassableLand);
+         rmAddAreaConstraint(patchAID, patchConstraint);
+         rmSetAreaWarnFailure(patchAID, false);
+         rmBuildArea(patchAID);
+      }
+   }
+
+   // Patches for Great Plains 1
+   if (patternChance == 9)
+   {
+      for (i=0; <cNumberNonGaiaPlayers*13)   
+      {
+	   int gpPatch2=rmCreateArea("GP patch 2"+i);
+	   rmSetAreaWarnFailure(gpPatch2, false);
+	   rmSetAreaSize(gpPatch2, rmAreaTilesToFraction(50), rmAreaTilesToFraction(90));
+	   if (rmRandInt(1,2) == 1)
+	      rmSetAreaTerrainType(gpPatch2, "great_lakes\ground_grass4_gl");
+	   else
+	      rmSetAreaTerrainType(gpPatch2, "great_lakes\ground_grass5_gl");
+	   rmAddAreaToClass(gpPatch2, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatch2, 2);
+	   rmSetAreaMaxBlobs(gpPatch2, 4);
+	   rmSetAreaMinBlobDistance(gpPatch2, 5.0);
+	   rmSetAreaMaxBlobDistance(gpPatch2, 12.0);
+	   rmSetAreaCoherence(gpPatch2, 0.3);
+	   rmSetAreaSmoothDistance(gpPatch2, 10);
+	   rmAddAreaConstraint(gpPatch2, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatch2, avoidCliffsShort);
+	   rmAddAreaConstraint(gpPatch2, patchConstraint);
+	   rmBuildArea(gpPatch2); 
+      }
+   
+      for (i=0; <cNumberNonGaiaPlayers*9)   
+      {
+	   int gpPatch0=rmCreateArea("GP patch 0"+i);
+	   rmSetAreaWarnFailure(gpPatch0, false);
+	   rmSetAreaSize(gpPatch0, rmAreaTilesToFraction(60), rmAreaTilesToFraction(90));
+	   if (rmRandInt(1,2) > 1)
+	      rmSetAreaTerrainType(gpPatch0, "great_plains\ground6_gp");
+	   else
+	      rmSetAreaTerrainType(gpPatch0, "great_plains\ground8_gp");
+	   rmAddAreaToClass(gpPatch0, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatch0, 2);
+	   rmSetAreaMaxBlobs(gpPatch0, 4);
+	   rmSetAreaMinBlobDistance(gpPatch0, 5.0);
+	   rmSetAreaMaxBlobDistance(gpPatch0, 12.0);
+	   rmSetAreaCoherence(gpPatch0, 0.3);
+	   rmSetAreaSmoothDistance(gpPatch0, 10);
+	   rmAddAreaConstraint(gpPatch0, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatch0, avoidCliffsShort);
+	   rmAddAreaConstraint(gpPatch0, forestConstraint);
+	   rmAddAreaConstraint(gpPatch0, patchConstraint);
+	   rmBuildArea(gpPatch0); 
+      }
+
+      for (i=0; <cNumberNonGaiaPlayers*9)   
+      {
+	   int gpPatch1=rmCreateArea("GP patch 1"+i);
+	   rmSetAreaWarnFailure(gpPatch1, false);
+	   rmSetAreaSize(gpPatch1, rmAreaTilesToFraction(50), rmAreaTilesToFraction(80));
+	   if (rmRandInt(1,2) == 1)
+	      rmSetAreaTerrainType(gpPatch1, "great_plains\ground5_gp");
+	   else
+	      rmSetAreaTerrainType(gpPatch1, "great_plains\ground1_gp");
+	   rmAddAreaToClass(gpPatch1, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatch1, 2);
+	   rmSetAreaMaxBlobs(gpPatch1, 4);
+	   rmSetAreaMinBlobDistance(gpPatch1, 12.0);
+	   rmSetAreaMaxBlobDistance(gpPatch1, 18.0);
+	   rmSetAreaCoherence(gpPatch1, 0.1);
+	   rmSetAreaSmoothDistance(gpPatch1, 10);
+	   rmAddAreaConstraint(gpPatch1, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatch1, avoidCliffsShort);
+	   rmAddAreaConstraint(gpPatch1, patchConstraint);
+	   rmBuildArea(gpPatch1); 
+      }
+
+      for (i=0; <cNumberNonGaiaPlayers*12)   
+      {
+	   int gpPatch3=rmCreateArea("GP patch 3"+i);
+	   rmSetAreaWarnFailure(gpPatch3, false);
+	   rmSetAreaSize(gpPatch3, rmAreaTilesToFraction(50), rmAreaTilesToFraction(90));
+	   if (rmRandInt(1,2) == 1)
+	      rmSetAreaTerrainType(gpPatch3, "great_lakes\ground_grass4_gl");
+	   else
+	      rmSetAreaTerrainType(gpPatch3, "great_lakes\ground_grass5_gl");
+	   rmAddAreaToClass(gpPatch3, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatch3, 2);
+	   rmSetAreaMaxBlobs(gpPatch3, 4);
+	   rmSetAreaMinBlobDistance(gpPatch3, 5.0);
+	   rmSetAreaMaxBlobDistance(gpPatch3, 12.0);
+	   rmSetAreaCoherence(gpPatch3, 0.3);
+	   rmSetAreaSmoothDistance(gpPatch3, 10);
+	   rmAddAreaConstraint(gpPatch3, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatch3, avoidCliffsShort);
+	   rmBuildArea(gpPatch3); 
+      }
+   }
+
+   if (patternChance == 10)  // patches for Great Plains 2 - break up the lines!
+   {
+      for (i=0; <cNumberNonGaiaPlayers*12)   
+      {
+	   int gpPatchA=rmCreateArea("GP patch A"+i);
+	   rmSetAreaWarnFailure(gpPatchA, false);
+	   rmSetAreaSize(gpPatchA, rmAreaTilesToFraction(75), rmAreaTilesToFraction(140));
+         rmSetAreaTerrainType(gpPatchA, "great_plains\ground2_gp");
+	   rmAddAreaToClass(gpPatchA, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatchA, 2);
+	   rmSetAreaMaxBlobs(gpPatchA, 4);
+	   rmSetAreaMinBlobDistance(gpPatchA, 5.0);
+	   rmSetAreaMaxBlobDistance(gpPatchA, 12.0);
+	   rmSetAreaCoherence(gpPatchA, 0.3);
+	   rmSetAreaSmoothDistance(gpPatchA, 10);
+	   rmAddAreaConstraint(gpPatchA, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatchA, avoidCliffsShort);
+	   rmAddAreaConstraint(gpPatchA, patchConstraint);
+	   rmBuildArea(gpPatchA); 
+      }
+
+      for (i=0; <cNumberNonGaiaPlayers*10)   // little green patches
+      {
+	   int gpPatchC=rmCreateArea("GP patch C"+i);
+	   rmSetAreaWarnFailure(gpPatchC, false);
+	   rmSetAreaSize(gpPatchC, rmAreaTilesToFraction(15), rmAreaTilesToFraction(45));
+         rmSetAreaTerrainType(gpPatchC, "great_plains\ground8_gp");
+	   rmAddAreaToClass(gpPatchC, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatchC, 2);
+	   rmSetAreaMaxBlobs(gpPatchC, 4);
+	   rmSetAreaMinBlobDistance(gpPatchC, 5.0);
+	   rmSetAreaMaxBlobDistance(gpPatchC, 10.0);
+	   rmSetAreaCoherence(gpPatchC, 0.1);
+	   rmSetAreaSmoothDistance(gpPatchC, 10);
+	   rmAddAreaConstraint(gpPatchC, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatchC, avoidCliffsShort);
+	   rmAddAreaConstraint(gpPatchC, patchConstraint);
+	   rmBuildArea(gpPatchC); 
+      }
+
+      for (i=0; <cNumberNonGaiaPlayers*9)   
+      {
+	   int gpPatchD=rmCreateArea("GP patch D"+i);
+	   rmSetAreaWarnFailure(gpPatchD, false);
+	   rmSetAreaSize(gpPatchD, rmAreaTilesToFraction(50), rmAreaTilesToFraction(70));
+         rmSetAreaTerrainType(gpPatchD, "great_plains\ground3_gp");
+	   rmAddAreaToClass(gpPatchD, rmClassID("classPatch"));
+	   rmSetAreaMinBlobs(gpPatchD, 3);
+	   rmSetAreaMaxBlobs(gpPatchD, 5);
+	   rmSetAreaMinBlobDistance(gpPatchD, 12.0);
+	   rmSetAreaMaxBlobDistance(gpPatchD, 20.0);
+	   rmSetAreaCoherence(gpPatchD, 0.1);
+	   rmSetAreaSmoothDistance(gpPatchD, 10);
+	   rmAddAreaConstraint(gpPatchD, shortAvoidImpassableLand);
+	   if (bareCliffs == 1)
+	      rmAddAreaConstraint(gpPatchD, avoidCliffsShort);
+	   rmAddAreaConstraint(gpPatchD, patchConstraint);
+	   rmBuildArea(gpPatchD); 
+      }
+   }
+   
+   if (patternChance == 3) // Bayou
+   {	
+	int treeClumps = rmRandInt(6,9);
+	for(i=1; < treeClumps)
+	{
+	   int randomWaterTreeID=rmCreateObjectDef("random tree in water"+i);	
+   	   rmAddObjectDefItem(randomWaterTreeID, "treeBayouMarsh", rmRandInt(3,7), 3.0);
+	   rmSetObjectDefMinDistance(randomWaterTreeID, 0.0);
+	   rmSetObjectDefMaxDistance(randomWaterTreeID, rmXFractionToMeters(0.1));
+	   rmPlaceObjectDefInArea(randomWaterTreeID, 0, smalllakeID, rmRandInt(1,2));
+	} 
+
+	int randomTurtlesID=rmCreateObjectDef("random turtles in water");
+	rmAddObjectDefItem(randomTurtlesID, "propTurtles", 1, 3.0);
+	rmSetObjectDefMinDistance(randomTurtlesID, 0.0);
+	rmSetObjectDefMaxDistance(randomTurtlesID, rmXFractionToMeters(0.1));
+	rmAddObjectDefConstraint(randomTurtlesID, nearShore);
+
+	int randomWaterRocksID=rmCreateObjectDef("random rocks in water");
+	rmAddObjectDefItem(randomWaterRocksID, "underbrushLake", rmRandInt(1,3), 3.0);
+	rmSetObjectDefMinDistance(randomWaterRocksID, 0.0);
+	rmSetObjectDefMaxDistance(randomWaterRocksID, rmXFractionToMeters(0.1));
+
+	int randomDucksID=rmCreateObjectDef("random ducks in water");
+	rmAddObjectDefItem(randomDucksID, "DuckFamily", 1, 0.0);
+	rmSetObjectDefMinDistance(randomDucksID, 0.0);
+	rmSetObjectDefMaxDistance(randomDucksID, rmXFractionToMeters(0.1));
+	rmAddObjectDefConstraint(randomDucksID, avoidDucks);
+
+	rmPlaceObjectDefInArea(randomTurtlesID, 0, smalllakeID, rmRandInt(1,2)); 
+	rmPlaceObjectDefInArea(randomWaterRocksID, 0, smalllakeID, rmRandInt(1,2)); 
+	rmPlaceObjectDefInArea(randomDucksID, 0, smalllakeID, rmRandInt(1,2)); 
+   }
+
+   if (patternChance == 12) // Texas desert
+   {
+	int bigDecorationID=rmCreateObjectDef("Big Texas Things");
+	int avoidBigDecoration=rmCreateTypeDistanceConstraint("avoid big decorations", "BigPropTexas", 45.0);
+	rmAddObjectDefItem(bigDecorationID, "BigPropTexas", 1, 0.0);
+	rmSetObjectDefMinDistance(bigDecorationID, 0.0);
+	rmSetObjectDefMaxDistance(bigDecorationID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(bigDecorationID, avoidAll);
+	rmAddObjectDefConstraint(bigDecorationID, avoidImportantItem);
+	rmAddObjectDefConstraint(bigDecorationID, avoidCoin);
+	rmAddObjectDefConstraint(bigDecorationID, avoidImpassableLand);
+	rmAddObjectDefConstraint(bigDecorationID, avoidBigDecoration);
+	rmAddObjectDefConstraint(bigDecorationID, avoidCliffs);
+	rmAddObjectDefConstraint(bigDecorationID, longPlayerConstraint);
+	rmPlaceObjectDefAtLoc(bigDecorationID, 0, 0.5, 0.5, rmRandInt(2,4));
+   }
+
+   if (plainsMap == 1)
+   {
+	int areThereBuffalo=rmRandInt(1, 2);
+	int howManyBuffalo=rmRandInt(2, 3);
+	if ( areThereBuffalo == 1 )
+	{
+		int bisonCarcass=rmCreateGrouping("Bison Carcass", "gp_carcass_bison");
+		rmSetGroupingMinDistance(bisonCarcass, 0.0);
+		rmSetGroupingMaxDistance(bisonCarcass, rmXFractionToMeters(0.5));
+		rmAddGroupingConstraint(bisonCarcass, avoidImpassableLand);
+		rmAddGroupingConstraint(bisonCarcass, playerConstraint);
+		rmAddGroupingConstraint(bisonCarcass, avoidTradeRoute);
+		rmAddGroupingConstraint(bisonCarcass, avoidSocket);
+		rmAddGroupingConstraint(bisonCarcass, avoidStartingUnits);
+		rmAddGroupingConstraint(bisonCarcass, avoidAll);
+		rmAddGroupingConstraint(bisonCarcass, avoidNuggetSmall);
+		rmPlaceGroupingAtLoc(bisonCarcass, 0, 0.5, 0.5, howManyBuffalo);
+	}
+
+	int grassPatchGroupType=-1;
+	int grassPatchGroup=-1;
+	for(i=1; <10*cNumberNonGaiaPlayers)
+      {
+		grassPatchGroupType=rmRandInt(1, 7);
+		grassPatchGroup=rmCreateGrouping("Grass Patch Group"+i, "gp_grasspatch0"+grassPatchGroupType);
+		rmSetGroupingMinDistance(grassPatchGroup, 0.0);
+		rmSetGroupingMaxDistance(grassPatchGroup, rmXFractionToMeters(0.5));
+		rmAddGroupingConstraint(grassPatchGroup, avoidImpassableLand);
+		rmAddGroupingConstraint(grassPatchGroup, playerConstraint);
+		rmAddGroupingConstraint(grassPatchGroup, avoidTradeRoute);
+		rmAddGroupingConstraint(grassPatchGroup, avoidSocket);
+		rmAddGroupingConstraint(grassPatchGroup, avoidNatives);
+		rmAddGroupingConstraint(grassPatchGroup, avoidNuggetSmall);
+		rmAddGroupingConstraint(grassPatchGroup, circleConstraint);
+		rmAddGroupingConstraint(grassPatchGroup, avoidStartingUnits);
+		rmAddGroupingConstraint(grassPatchGroup, avoidAll);
+		rmAddGroupingConstraint(grassPatchGroup, avoidCliffs);
+		rmPlaceGroupingAtLoc(grassPatchGroup, 0, 0.5, 0.5, 1);
+	}
+
+	int flowerPatchGroupType=-1;
+	int flowerPatchGroup=-1;
+	for(i=1; <8*cNumberNonGaiaPlayers)
+      {
+		flowerPatchGroupType=rmRandInt(1, 8);
+		flowerPatchGroup=rmCreateGrouping("Flower Patch Group"+i, "gp_flower0"+flowerPatchGroupType);
+		rmSetGroupingMinDistance(flowerPatchGroup, 0.0);
+		rmSetGroupingMaxDistance(flowerPatchGroup, rmXFractionToMeters(0.5));
+		rmAddGroupingConstraint(flowerPatchGroup, avoidImpassableLand);
+		rmAddGroupingConstraint(flowerPatchGroup, playerConstraint);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidTradeRoute);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidSocket);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidNatives);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidNuggetSmall);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidAll);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidCliffs);
+		rmAddGroupingConstraint(flowerPatchGroup, circleConstraint);
+		rmAddGroupingConstraint(flowerPatchGroup, avoidStartingUnits);
+		rmPlaceGroupingAtLoc(flowerPatchGroup, 0, 0.5, 0.5, 1);
+	}
+   }
+
+   if (vultures == 1)
+   { 
+	int vultureID=rmCreateObjectDef("perching vultures");
+	int avoidVultures=rmCreateTypeDistanceConstraint("avoid other vultures", "PropVulturePerching", 30.0);
+	rmAddObjectDefItem(vultureID, "PropVulturePerching", 1, 0.0);
+	rmSetObjectDefMinDistance(vultureID, 0.0);
+	rmSetObjectDefMaxDistance(vultureID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(vultureID, avoidAll);
+	rmAddObjectDefConstraint(vultureID, avoidImportantItem);
+	rmAddObjectDefConstraint(vultureID, avoidCoin);
+	rmAddObjectDefConstraint(vultureID, avoidImpassableLand);
+	rmAddObjectDefConstraint(vultureID, avoidTradeRoute);
+	rmAddObjectDefConstraint(vultureID, avoidCliffs);
+	rmAddObjectDefConstraint(vultureID, avoidVultures);
+	rmAddObjectDefConstraint(vultureID, avoidWater20);
+	rmAddObjectDefConstraint(vultureID, longPlayerConstraint);
+	rmPlaceObjectDefAtLoc(vultureID, 0, 0.5, 0.5, 2);
+   }
+
+   if (eagles == 1)
+   {
+	int avoidEagles=rmCreateTypeDistanceConstraint("avoids Eagles", "EaglesNest", 40.0);
+	int randomEagleTreeID=rmCreateObjectDef("random eagle tree");
+	rmAddObjectDefItem(randomEagleTreeID, "EaglesNest", 1, 0.0);
+	rmSetObjectDefMinDistance(randomEagleTreeID, 0.0);
+	rmSetObjectDefMaxDistance(randomEagleTreeID, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(randomEagleTreeID, avoidAll);
+	rmAddObjectDefConstraint(randomEagleTreeID, shortAvoidImpassableLand);
+	rmAddObjectDefConstraint(randomEagleTreeID, avoidEagles);
+	rmPlaceObjectDefAtLoc(randomEagleTreeID, 0, 0.5, 0.5, 2);
+   }
+
+   if ((patternChance == 13) || (patternChance == 28))   // for Sonora or Painted Desert     
+   {
+	int buzzardFlockID=rmCreateObjectDef("buzzards");
+	int avoidBuzzards=rmCreateTypeDistanceConstraint("buzzard avoid buzzard", "BuzzardFlock", 70.0);
+	rmAddObjectDefItem(buzzardFlockID, "BuzzardFlock", 1, 3.0);
+	rmSetObjectDefMinDistance(buzzardFlockID, 0.0);
+	rmSetObjectDefMaxDistance(buzzardFlockID, rmXFractionToMeters(0.3));
+	rmAddObjectDefConstraint(buzzardFlockID, avoidBuzzards);
+	rmAddObjectDefConstraint(buzzardFlockID, avoidSocket);
+	rmAddObjectDefConstraint(buzzardFlockID, shortAvoidImpassableLand);
+	rmAddObjectDefConstraint(buzzardFlockID, playerConstraint);
+	rmPlaceObjectDefAtLoc(buzzardFlockID, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
+   }
+
+   if (patternChance == 36) // GL
+   {
+	int avoidGrass=rmCreateTypeDistanceConstraint("avoids grass", "TreeGreatPlainsGrass", 30.0);
+   	int Grass=rmCreateObjectDef("grass");
+	rmAddObjectDefItem(Grass, "TreeGreatPlainsGrass", 1, 0.0);
+	rmSetObjectDefMinDistance(Grass, 0.0);
+	rmSetObjectDefMaxDistance(Grass, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(Grass, avoidAll);
+	rmAddObjectDefConstraint(Grass, avoidImpassableLand);
+	rmAddObjectDefConstraint(Grass, playerConstraint);
+	rmPlaceObjectDefAtLoc(Grass, 0, 0.5, 0.5, 9*cNumberNonGaiaPlayers);
+   }
+   
+   if (patternChance == 17) // Pampas
+   {
+      for (i=0; <9*cNumberNonGaiaPlayers)
+      {
+         int pampasPatch=rmCreateArea("pampas patch "+i);
+         rmSetAreaWarnFailure(pampasPatch, false);
+         rmAddAreaToClass(pampasPatch, rmClassID("classPatch"));
+	   if (cliffVariety < 3) // not used for cliffs!
+	   {
+		rmSetAreaSize(pampasPatch, rmAreaTilesToFraction(200), rmAreaTilesToFraction(300));
+		rmSetAreaTerrainType(pampasPatch, "pampas\ground6_pam");
+	   }
+	   else
+	   {
+		rmSetAreaSize(pampasPatch, rmAreaTilesToFraction(300), rmAreaTilesToFraction(400));
+		rmSetAreaMix(pampasPatch, "pampas_grass");
+	      rmAddAreaConstraint(pampasPatch, shortForestConstraint);
+	   }
+         rmSetAreaMinBlobs(pampasPatch, 1);
+         rmSetAreaMaxBlobs(pampasPatch, 5);
+         rmSetAreaMinBlobDistance(pampasPatch, 14.0);
+         rmSetAreaMaxBlobDistance(pampasPatch, 38.0);
+         rmSetAreaCoherence(pampasPatch, 0.1);
+	   rmSetAreaSmoothDistance(pampasPatch, 10);
+	   rmAddAreaConstraint(pampasPatch, shortAvoidImpassableLand);
+	   rmAddAreaConstraint(pampasPatch, patchConstraint);
+         rmBuildArea(pampasPatch); 
+      }
+
+	int avoidBrush=rmCreateTypeDistanceConstraint("avoids brush", "UnderbrushPampas", 30.0);
+	int decoUnderbrushID=rmCreateObjectDef("underbrush");
+	rmAddObjectDefItem(decoUnderbrushID, "UnderbrushPampas", rmRandInt(4,6), 3.0);
+	rmSetObjectDefMinDistance(decoUnderbrushID, 20.0);
+	rmSetObjectDefMaxDistance(decoUnderbrushID, rmXFractionToMeters(0.5));
+      rmAddObjectDefConstraint(decoUnderbrushID, avoidAll);
+	rmAddObjectDefConstraint(decoUnderbrushID, avoidImpassableLand);
+	rmAddObjectDefConstraint(decoUnderbrushID, playerConstraint);
+	rmAddObjectDefConstraint(decoUnderbrushID, avoidBrush);
+	rmAddObjectDefConstraint(decoUnderbrushID, avoidTradeRoute);
+      rmPlaceObjectDefAtLoc(decoUnderbrushID, 0, 0.5, 0.5, 7*cNumberNonGaiaPlayers);
+   }
+
+   // Text
+   rmSetStatusText("",0.99);
+
+}  
\ No newline at end of file
diff --git a/RMM/unknownstranded.xml b/RMM/UnknownWater.xml
similarity index 51%
rename from RMM/unknownstranded.xml
rename to RMM/UnknownWater.xml
index 9943666..6ee98e1 100644
--- a/RMM/unknownstranded.xml
+++ b/RMM/UnknownWater.xml
@@ -1,6 +1,10 @@
 <?xml version = "1.0" encoding = "UTF-8"?>
-<mapinfo details = "130067" imagepath = "ui\random_map\unknown" displayNameID = "130066" cannotReplace = ""
-		loadDetails="130068" loadBackground="ui\random_map\unknown\unknown_map">
+<mapinfo 
+imagepath = "ui\random_map\africa\unknown" 
+displayNameID = "130066"
+details = "130067" 
+loadDetails = "130068" 
+loadBackground="ui\random_map\africa\unknown\unknown_map">
    <loadss>ui\random_map\unknown\unknown_ss_01</loadss>
    <loadss>ui\random_map\unknown\unknown_ss_02</loadss>
    <loadss>ui\random_map\unknown\unknown_ss_03</loadss>
diff --git a/RMM/UnknownWater.xs b/RMM/UnknownWater.xs
new file mode 100644
index 0000000..76e6d92
--- /dev/null
+++ b/RMM/UnknownWater.xs
@@ -0,0 +1,5922 @@
+// Gandalf's Isles TAD
+// by RF_Gandalf
+// A Random map script for AOE3: The Asian Dynasties
+
+include "mercenaries.xs";
+include "ypAsianInclude.xs";
+include "ypKOTHInclude.xs";
+
+void main(void)
+{
+// Text
+   rmSetStatusText("",0.01);
+
+// Set up for variables
+   string baseType = "";
+   string forestType = "";
+   string treeType = "";
+   string deerType = "";
+   string deer2Type = "";
+   string sheepType = "";
+   string centerHerdType = "";
+   string fishType = "";
+   string fish2Type = "";
+   string whaleType = "";
+   string native1Name = "";
+   string native2Name = "";
+   string mineType = "";
+   string propType = "";
+   string brushType = "";
+   string tradeRouteType = "";
+
+// Pick pattern for trees, terrain, features, etc.
+   int patternChance = rmRandInt(30,38);   
+   if ((patternChance == 5) || (patternChance == 7) || (patternChance == 14) || (patternChance == 16) || (patternChance == 19) || (patternChance == 20) || (patternChance == 25))     // reset frequency for some patterns - less snow and american jungle
+   {
+      if (rmRandInt(1,2) == 2)
+	   patternChance = rmRandInt(1,38);
+   }
+   int variantChance = rmRandInt(1,2);
+   int lightingChance = rmRandInt(1,2);
+   int axisChance = rmRandInt(1,2);
+   int playerSide = rmRandInt(1,2);   
+   int positionChance = rmRandInt(1,2);   
+   int distChance = rmRandInt(1,7);
+   int sectionChance = rmRandInt(0,12);
+   int directionChance = rmRandInt(1,2);
+   int nativePattern = -1;
+   int sheepChance = rmRandInt(1,2);
+   int tropical = 0;
+   int arctic = 0;
+   int placeBerries = 1;
+   int noHeight = 0;
+   int nativeChoice = rmRandInt(1,2);
+   int baseHeight = rmRandInt(1,2);
+   int twoChoice = rmRandInt(1,2);
+   int threeChoice = rmRandInt(1,3);
+   int fourChoice = rmRandInt(1,4);
+   int fiveChoice = rmRandInt(1,5);
+   int sixChoice = rmRandInt(1,6);
+   int extraNativeIs = 0;
+   int forestCoverUp = 0;
+   int lowForest = 0;
+   int cacheChance = rmRandInt(1,2);
+   int cacheType = 0;
+   int llamaCache = 0;
+   int berryCache = 0;
+   int campfireCache = 0;
+   int centeredBigIsland = 0;
+   int eBigIs = 0;
+   int wBigIs = 0;
+   int nBigIs = 0;
+   int sBigIs = 0;
+   int eEdgeIs = 0;
+   int wEdgeIs = 0;
+   int nEdgeIs = 0;
+   int sEdgeIs = 0;
+   int vultures = 0;
+   int eagles = 0;
+   int eaglerock = 0;
+   int kingfishers = 0;
+   int underbrush = 0;
+   int texasProp = 0;
+   int waterNuggets = 0;
+   mineType = "mine";
+
+// Text
+   rmSetStatusText("",0.05);
+
+// Picks the map size
+   int playerTiles=47500;  
+   if (cNumberNonGaiaPlayers == 8)
+	playerTiles = 35000;
+   else if (cNumberNonGaiaPlayers == 7)
+	playerTiles = 37000;  
+   else if (cNumberNonGaiaPlayers == 6)
+	playerTiles = 39000;
+   else if (cNumberNonGaiaPlayers == 5)
+	playerTiles = 41000;  
+   else if (cNumberNonGaiaPlayers == 4)
+	playerTiles = 42500;
+   else if (cNumberNonGaiaPlayers == 3)
+	playerTiles = 44500; 
+
+   int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles/0.8);
+   rmEchoInfo("Map size="+size+"m x "+size+"m");
+   rmSetMapSize(size, size);
+   rmSetSeaLevel(0.0);
+
+// Select terrain pattern details
+
+   if (patternChance == 1) // NE
+   { 
+      rmSetSeaType("new england coast");
+      rmSetMapType("newEngland");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("constantinople");
+	else
+	   rmSetLightingSet("new england");
+      baseType = "newengland_grass";
+	forestType = "new england forest";
+	treeType = "TreeNewEngland";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "moose";         
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "deer";        
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishCod"; 
+      fish2Type = "FishSalmon";
+      whaleType = "minkeWhale";
+	if (rmRandInt(1,2) == 1)  
+	   mineType = "MineTin";
+	cacheType = 1;
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+      nativePattern = 40;
+	eagles = 1;
+   }
+   else if (patternChance == 2) // carolina
+   {
+      rmSetSeaType("atlantic coast");
+      rmSetMapType("carolina");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("312b_washington");
+	else
+	   rmSetLightingSet("carolina");
+      baseType = "carolina_grass";
+	forestType = "carolina pine forest";
+	treeType = "TreeCarolinaGrass";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "turkey";        
+	}
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	cacheType = 1;
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+	noHeight = 1;
+	if (nativeChoice == 1)
+	   nativePattern = 3;
+	else
+	   nativePattern = 40;
+	eagles = 1;
+   }
+   else if (patternChance == 3) // bayou
+   {
+      rmSetSeaType("yucatan Coast");
+      rmSetMapType("bayou");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("berlin dusk");
+	else
+         rmSetLightingSet("bayou");
+
+      baseType = "bayou_grass";
+	forestType = "bayou swamp forest";
+	treeType = "TreeBayou";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "turkey";        
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	cacheType = 3;
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+	if (nativeChoice == 1)
+	   nativePattern = 3;
+	else
+	   nativePattern = 21;
+	eagles = 1;
+	underbrush = 1;
+      brushType = "UnderbrushCarolinasMarsh";
+   }
+   else if (patternChance == 4) // great lakes green
+   {
+      if (variantChance == 1)
+         rmSetSeaType("great lakes");
+      else
+	   rmSetSeaType("new england coast");
+      rmSetMapType("greatlakes");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("constantinople");
+	else
+         rmSetLightingSet("Great Lakes");
+
+      baseType = "greatlakes_grass";
+	forestType = "great lakes forest";
+	treeType = "TreeGreatLakes";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "bison";
+         centerHerdType = "moose";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "moose";        
+	}   
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "minkeWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	cacheType = 1;
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 4;
+	else if (fiveChoice == 2)
+	   nativePattern = 5;
+	else if (fiveChoice == 3)
+	   nativePattern = 40;
+	else if (fiveChoice == 4)
+	   nativePattern = 22;
+	else
+	   nativePattern = 40;
+	eagles = 1;
+   }
+   else if (patternChance == 5) // great lakes winter
+   {
+      rmSetSeaType("great lakes");
+      rmSetMapType("greatlakes");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+	   rmSetLightingSet("308b_caribbeanlight");
+	else
+         rmSetLightingSet("Great Lakes Winter");
+      baseType = "greatlakes_snow";
+	forestType = "great lakes forest snow";
+	treeType = "TreeGreatLakesSnow";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "elk";
+	}
+      else 
+	{     
+         deerType = "bison";
+         deer2Type = "deer";
+         centerHerdType = "moose";       
+	}      
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSalmon";
+      fish2Type = "FishCod";
+      whaleType = "minkeWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	cacheType = 1;
+      placeBerries = 0;
+	noHeight = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 4;
+	else if (fiveChoice == 2)
+	   nativePattern = 5;
+	else if (fiveChoice == 3)
+	   nativePattern = 40;
+	else if (fiveChoice == 4)
+	   nativePattern = 22;
+	else
+	   nativePattern = 5;
+	eagles = 1;
+   }
+   else if (patternChance == 6) // saguenay
+   {
+      rmSetSeaType("hudson bay");
+      rmSetMapType("saguenay");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("lisbon");
+	else
+         rmSetLightingSet("saguenay");
+      baseType = "saguenay grass";
+	forestType = "saguenay forest";
+	treeType = "TreeSaguenay";
+      if (variantChance == 1)
+	{
+         deerType = "caribou";
+         deer2Type = "moose";
+         centerHerdType = "caribou";
+	}
+      else 
+	{     
+         deerType = "caribou";
+         deer2Type = "caribou";
+         centerHerdType = "moose";       
+	}
+      sheepType = "sheep";
+      fishType = "FishSalmon";
+      fish2Type = "FishCod";
+      whaleType = "beluga";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	else
+	   mineType = "MineCopper";
+	cacheType = 1;
+	if (threeChoice == 1)
+	   nativePattern = 5;
+	else if (threeChoice == 2)
+	   nativePattern = 6;
+	else if (threeChoice == 3)
+	   nativePattern = 16;
+	eagles = 1;
+   }
+   else if (patternChance == 7) // yukon
+   {
+      rmSetSeaType("great lakes ice");
+      rmSetMapType("yukon");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+	   rmSetLightingSet("305b");
+	else
+         rmSetLightingSet("yukon");
+      baseType = "yukon snow";
+	forestType = "yukon snow forest";
+	treeType = "TreeYukonSnow";
+      if (variantChance == 1)
+	{
+         deerType = "caribou";
+         deer2Type = "muskOx";
+         centerHerdType = "muskOx";
+	}
+      else 
+	{     
+         deerType = "muskOx";
+         deer2Type = "caribou";
+         centerHerdType = "caribou";       
+	}
+      sheepChance = 0;
+      fishType = "FishSalmon";
+      fish2Type = "FishCod";
+      whaleType = "beluga";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "minegold";
+	cacheType = 1;
+      placeBerries = 0;
+	arctic = 1;
+	noHeight = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 5;
+	else if (fiveChoice == 2)
+	   nativePattern = 6;
+	else if (fiveChoice == 3)
+	   nativePattern = 8;
+	else if (fiveChoice == 4)
+	   nativePattern = 27;
+	else
+	   nativePattern = 28;
+	eagles = 1;
+   }
+   else if (patternChance == 8) // rockies
+   {
+      rmSetSeaType("great lakes");
+      rmSetMapType("rockies");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+	   rmSetLightingSet("305b");
+	else
+         rmSetLightingSet("rockies");
+      baseType = "rockies_grass";
+	forestType = "rockies forest";
+	treeType = "TreeRockies";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "elk";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "elk";
+         deer2Type = "bighornsheep";
+         centerHerdType = "deer";
+	}   
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSalmon";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 2;
+	nativeChoice = rmRandInt(1,5);
+	if (nativeChoice == 1)
+	   nativePattern = 23;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 19;
+	else if (nativeChoice == 4)
+	   nativePattern = 8;
+	else if (nativeChoice == 5)
+	   nativePattern = 28;
+	eagles = 1;
+	underbrush = 1;
+      brushType = "UnderbrushRockies";
+   }
+   else if (patternChance == 9) // great plains 1
+   {
+      rmSetSeaType("Yucatan coast");
+      rmSetMapType("greatPlains");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("ottoman morning");
+	else
+         rmSetLightingSet("great plains");
+      baseType = "great plains grass"; 
+	forestType = "great plains forest";
+	treeType = "TreeGreatPlains";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "pronghorn";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "elk";
+	} 
+      if (sheepChance == 1)
+         sheepType = "cow";
+      else
+         sheepType = "sheep";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "minkeWhale";
+	cacheType = 2;
+	nativeChoice = rmRandInt(1,5);
+	if (nativeChoice == 1)
+	   nativePattern = 23;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 19;
+	else if (nativeChoice == 4)
+	   nativePattern = 8;
+	else if (nativeChoice == 5)
+	   nativePattern = 28;
+	vultures = 1;
+	underbrush = 1;
+      brushType = "underbrushGreatPlains"; 
+   }
+   else if (patternChance == 10) // great plains 2
+   {
+      rmSetSeaType("Yucatan coast");
+      rmSetMapType("greatPlains");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("spc14abuffalo");
+	else
+         rmSetLightingSet("great plains");
+      baseType = "great plains drygrass";
+	forestType = "great plains forest";
+	treeType = "TreeGreatPlains";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "pronghorn";
+         centerHerdType = "bison";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "deer";
+	}
+      sheepType = "cow";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 2;
+	forestCoverUp = 1;
+	lowForest = rmRandInt(0,1);
+	nativeChoice = rmRandInt(1,5);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 8;
+	else if (nativeChoice == 5)
+	   nativePattern = 28;
+	if (rmRandInt(1,2) == 1)
+	   texasProp = 1;
+	else
+	   eaglerock = 1;
+	underbrush = 1;
+      brushType = "underbrushGreatPlains"; 
+   }
+   else if (patternChance == 11) // texas grass
+   {  
+      rmSetSeaType("Atlantic Coast");
+      rmSetMapType("texas");
+	rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("pampas");
+	else
+         rmSetLightingSet("texas");
+      baseType = "texas_grass";
+	forestType = "texas forest";
+	treeType = "TreeTexas";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "deer";
+         centerHerdType = "bison";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "deer";
+	}
+      sheepType = "cow";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 2;
+	noHeight = 1;
+	lowForest = rmRandInt(0,1);
+	nativeChoice = rmRandInt(1,6);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 19;
+	else if (nativeChoice == 5)
+	   nativePattern = 20;
+	else
+	   nativePattern = 9;
+	if (rmRandInt(1,2) == 1)
+	   texasProp = 1;
+	else
+	   vultures = 1;	
+	underbrush = 1;
+      brushType = "underbrushTexasGrass"; 
+   }
+   else if (patternChance == 12) // texas desert
+   { 
+      rmSetSeaType("Atlantic Coast");
+      rmSetMapType("texas");
+	rmSetMapType("grass");
+      if (lightingChance == 1)
+         rmSetLightingSet("seville");
+      else
+         rmSetLightingSet("texas");
+      baseType = "texas_dirt";
+	forestType = "texas forest dirt";
+	treeType = "TreeTexasDirt";
+      if (variantChance == 1)
+	{
+         deerType = "bison";
+         deer2Type = "pronghorn";
+         centerHerdType = "pronghorn";
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bison";
+	}
+      sheepType = "cow";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 2;
+	noHeight = 1;
+	lowForest = rmRandInt(0,1);
+	nativeChoice = rmRandInt(1,6);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 31;
+	else if (nativeChoice == 5)
+	   nativePattern = 38;
+	else
+	   nativePattern = 39;
+	if (rmRandInt(1,2) == 1)
+	   texasProp = 1;
+	else
+	   eaglerock = 1;
+	underbrush = 1;
+	brushType = "UnderbrushDesert";
+   }
+   else if (patternChance == 13) // sonora
+   {  
+      rmSetSeaType("caribbean coast");
+      rmSetMapType("sonora");
+	rmSetMapType("grass");
+   	if (lightingChance == 1)
+         rmSetLightingSet("sonora");
+	else
+         rmSetLightingSet("pampas");
+      baseType = "sonora_dirt";
+	forestType = "sonora forest";
+	treeType = "TreeSonora";
+      if (variantChance == 1)
+	{
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bighornsheep";         
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bighornsheep";
+         centerHerdType = "bison";         
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishSardine";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   cacheType = 2;
+	else
+   	   cacheType = 3;
+	noHeight = 1;
+	lowForest = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 10;
+	else if (fiveChoice == 2)
+	   nativePattern = 31;
+	else if (fiveChoice == 3)
+	   nativePattern = 32;
+	else if (fiveChoice == 4)
+	   nativePattern = 33;
+	else
+	   nativePattern = 37;
+	eaglerock = 1;
+	underbrush = 1;
+	brushType = "UnderbrushDesert";
+   }
+   else if (patternChance == 14) // yucatan
+   {
+      rmSetSeaType("yucatan Coast");
+      rmSetMapType("yucatan");
+      rmSetMapType("tropical");
+	if (lightingChance == 1)
+	   rmSetLightingSet("311b");
+	else
+         rmSetLightingSet("yucatan");
+      baseType = "yucatan_grass";
+	forestType = "yucatan forest";
+	treeType = "TreeYucatan";
+      if (variantChance == 1)
+      {
+         deerType = "tapir";
+         deer2Type = "turkey";
+         centerHerdType = "capybara";
+      }
+      else
+	{
+         deerType = "capybara";
+         deer2Type = "turkey";
+         centerHerdType = "tapir";
+	}
+      sheepChance = 0;
+      tropical = 1;
+      fishType = "FishTarpon";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	cacheType = 5;
+	if (rmRandInt(1,3) < 3)
+	   berryCache = 1;
+	nativeChoice = rmRandInt(1,3);
+	if (nativeChoice == 1)
+	   nativePattern = 12;
+	else if (nativeChoice == 2)
+	   nativePattern = 35;
+	else if (nativeChoice == 3)
+	   nativePattern = 36;
+	kingfishers = 1;
+   }
+   else if (patternChance == 15) // caribbean
+   {
+      rmSetSeaType("caribbean coast");
+      rmSetMapType("caribbean");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("301a_malta");
+	else
+         rmSetLightingSet("caribbean");
+      baseType = "caribbean grass";
+	forestType = "caribbean palm forest";
+	treeType = "TreeCaribbean";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "tapir";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "tapir";
+         centerHerdType = "deer";
+	}
+      sheepChance = 0;
+      tropical = 1;
+      fishType = "FishTarpon";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	cacheType = 3;
+	noHeight = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 12;
+	else if (fiveChoice == 2)
+	   nativePattern = 13;
+	else if (fiveChoice == 3)
+	   nativePattern = 18;
+	else if (fiveChoice == 4)
+	   nativePattern = 36;
+	else
+	   nativePattern = 42;
+	kingfishers = 1;
+   }
+   else if (patternChance == 16) // amazon
+   {
+      rmSetSeaType("yucatan coast");
+      rmSetMapType("amazonia");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("323b_inca");
+	else
+         rmSetLightingSet("amazon");
+      baseType = "amazon grass";
+	forestType = "amazon rain forest";
+	treeType = "TreeAmazon";
+      if (variantChance == 1)
+      {
+         deerType = "tapir";
+         deer2Type = "tapir";
+         centerHerdType = "capybara";
+      }
+      else
+	{
+         deerType = "capybara";
+         deer2Type = "tapir";
+         centerHerdType = "capybara";
+	}
+      sheepChance = 0;
+      tropical = 1;
+      fishType = "FishMahi";
+      fish2Type = "FishTarpon";
+      whaleType = "humpbackWhale";
+	cacheType = 3;
+	if (fiveChoice == 1)
+	   nativePattern = 13;
+	else if (fiveChoice == 2)
+	   nativePattern = 14;
+	else if (fiveChoice == 3)
+	   nativePattern = 15;
+	else if (fiveChoice == 4)
+	   nativePattern = 18;
+	else
+	   nativePattern = 26;
+	kingfishers = 1;
+   }
+   else if (patternChance == 17) // pampas
+   {
+      rmSetSeaType("caribbean coast");
+      rmSetMapType("pampas");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("texas");
+	else
+         rmSetLightingSet("pampas");
+      baseType = "pampas_grass";
+	forestType = "pampas forest";
+	treeType = "TreePampas";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "rhea";
+         centerHerdType = "rhea";
+	}
+      else 
+	{     
+         deerType = "rhea";
+         deer2Type = "deer";
+         centerHerdType = "rhea";
+	}
+      sheepType = "llama";
+      fishType = "FishMahi";
+      fish2Type = "FishTarpon";
+      whaleType = "humpbackWhale";
+	cacheType = 3;
+	lowForest = rmRandInt(0,1);
+	noHeight = 1;
+	if (rmRandInt(1,3) < 3)
+	   llamaCache = 1;
+	if (threeChoice == 1)
+	   nativePattern = 14;
+	else if (threeChoice == 2)
+	   nativePattern = 25;
+	else
+	   nativePattern = 26;
+	vultures = 1;
+	underbrush = 1;
+      brushType = "UnderbrushPampas";
+   }
+   else if (patternChance == 18) // patagonia
+   {
+      rmSetSeaType("hudson bay");
+      rmSetMapType("patagonia");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("paris day");
+	else
+         rmSetLightingSet("patagonia");
+      baseType = "patagonia_grass";
+	forestType = "patagonia forest";
+	treeType = "TreePatagoniaDirt";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "rhea";
+         centerHerdType = "rhea";
+	}
+      else 
+	{     
+         deerType = "rhea";
+         deer2Type = "deer";
+         centerHerdType = "rhea";
+	}
+      sheepType = "llama";
+      fishType = "FishSalmon";
+      fish2Type = "FishSardine";
+      whaleType = "minkeWhale";
+	cacheType = 1;
+
+	if (rmRandInt(1,3) < 3)
+	   llamaCache = 1;
+	if (rmRandInt(1,3) < 3)
+	   berryCache = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 15;
+	else if (fiveChoice == 3)
+	   nativePattern = 24;
+	else if (fiveChoice == 4)
+	   nativePattern = 25;
+	else
+	   nativePattern = 26;
+	eagles = 1;
+   }
+   else if (patternChance == 19) // nwt
+   {
+      rmSetSeaType("Northwest Territory Water");   
+      rmSetMapType("northwestTerritory");
+      rmSetMapType("grass");
+	if (lightingChance == 2)
+	   rmSetLightingSet("nwterritory");
+	else
+         rmSetLightingSet("saguenay");
+      baseType = "nwt_grass1";
+	if (twoChoice == 1)
+	{
+	   forestType = "NW Territory Birch Forest";
+   	   treeType = "TreeGreatLakes";
+	}
+	else
+	{ 
+	   forestType = "NW Territory Forest";
+	   treeType = "TreeGreatPlains";   
+	}
+      if (variantChance == 1)
+	{
+         deerType = "elk";
+         deer2Type = "moose";
+         centerHerdType = "moose";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "moose";
+         centerHerdType = "elk";
+	} 
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fish2Type = "FishSalmon";
+      fishType = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 1;
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+	if (fourChoice == 1)
+	   nativePattern = 27;
+	else if (fourChoice == 2)
+	   nativePattern = 28;
+	else if (fourChoice == 3)
+	   nativePattern = 7;
+	else
+	   nativePattern = 6;
+	kingfishers = 1;
+   }
+   else if (patternChance == 20) // yukon tundra
+   {
+      rmSetSeaType("hudson bay");
+      rmSetMapType("yukon");
+      rmSetMapType("snow");
+	if (lightingChance == 1)
+         rmSetLightingSet("seville morning");
+	else
+         rmSetLightingSet("yukon");
+      baseType = "yukon grass";
+	forestType = "yukon forest";
+	treeType = "TreeYukon";
+      if (variantChance == 1)
+	{
+         deerType = "muskOx";
+         deer2Type = "caribou";
+         centerHerdType = "caribou";
+	}
+      else 
+	{  
+         deerType = "caribou"; 
+         deer2Type = "caribou";
+         centerHerdType = "muskOx";
+	}
+      sheepChance = 0;
+      fishType = "FishSalmon";
+      fish2Type = "FishCod";
+      whaleType = "minkeWhale";
+	cacheType = 1;
+	arctic = 1;
+      placeBerries = 0;
+	if (threeChoice == 1)
+	   nativePattern = 5;
+	else if (threeChoice == 2)
+	   nativePattern = 6;
+	else if (threeChoice == 3)
+	   nativePattern = 16;
+	eagles = 1;
+   }
+   else if (patternChance == 21) // painted desert
+   {   
+      rmSetSeaType("Atlantic Coast");
+      rmSetMapType("sonora");
+	rmSetMapType("grass");
+      if (lightingChance == 1)
+         rmSetLightingSet("seville");
+      else
+         rmSetLightingSet("pampas");
+	if (twoChoice == 1)
+         baseType = "painteddesert_groundmix_2";
+	else
+         baseType = "painteddesert_groundmix_1";
+	forestType = "painteddesert forest";
+	treeType = "TreePaintedDesert";
+      if (variantChance == 1)
+	{
+         deerType = "pronghorn";
+         deer2Type = "bison";
+         centerHerdType = "bighornsheep";         
+	}
+      else 
+	{     
+         deerType = "pronghorn";
+         deer2Type = "bighornsheep";
+         centerHerdType = "bison";         
+	}
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fishType = "FishSardine";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	mineType = "MineCopper";
+	cacheType = 3;
+	lowForest = rmRandInt(0,1);
+	noHeight = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 30;
+	else if (fiveChoice == 2)
+	   nativePattern = 31;
+	else if (fiveChoice == 3)
+	   nativePattern = 32;
+	else if (fiveChoice == 4)
+	   nativePattern = 33;
+	else
+	   nativePattern = 37;
+	eaglerock = 1;
+   }
+   else if (patternChance == 22) // andes
+   {
+      rmSetSeaType("california coast");
+      rmSetMapType("andes");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+         rmSetLightingSet("greatplainstest");
+	else
+	   rmSetLightingSet("andes");
+      baseType = "andes_grass_a";
+	forestType = "andes forest";
+	treeType = "TreeAndes";
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "rhea";
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "rhea";
+         centerHerdType = "guanaco";
+	}
+      sheepType = "llama";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 5;
+	if (rmRandInt(1,3) < 3)
+	   llamaCache = 1;
+	if (rmRandInt(1,3) < 3)
+	   berryCache = 1;
+      tropical = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 24;
+	else if (fiveChoice == 3)
+	   nativePattern = 25;
+	else if (fiveChoice == 4)
+	   nativePattern = 26;
+	else
+	   nativePattern = 34;
+	vultures = 1;
+   }
+   else if (patternChance == 23) // central araucania
+   {
+      rmSetSeaType("Araucania Central Coast");
+      rmSetMapType("araucania");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Araucania Central");
+	else
+         rmSetLightingSet("new england");
+	if (twoChoice == 1)
+	{ 
+         baseType = "araucania_grass_b";
+	   forestCoverUp = 1;
+	}
+	else
+         baseType = "araucania_grass_d";	
+	forestType = "Araucania Forest";
+	treeType = "TreeAraucania";
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	} 
+      sheepType = "llama";
+      fishType = "FishCod";
+      fish2Type = "FishSalmon";
+      whaleType = "humpbackWhale";
+	mineType = "MineCopper";
+	cacheType = 5;
+	if (rmRandInt(1,3) < 3) 
+	   llamaCache = 1;
+	if (rmRandInt(1,3) < 3) 
+	   berryCache = 1;
+      tropical = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 25;
+	else if (fiveChoice == 3)
+	   nativePattern = 25;
+	else if (fiveChoice == 4)
+	   nativePattern = 18;
+	else
+	   nativePattern = 11;
+	kingfishers = 1;
+   }
+   else if (patternChance == 24) // north araucania
+   {
+      rmSetSeaType("Araucania North Coast");
+      rmSetMapType("araucania");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("NthAraucaniaLight");
+	else
+         rmSetLightingSet("constantinople");  
+      baseType = "araucania_north_grass_b";  
+	forestType =  "North Araucania Forest";
+	treeType = "TreeAraucania";
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	} 
+      sheepType = "llama";
+      fishType = "FishCod";
+      fish2Type = "FishSardine";
+      whaleType = "humpbackWhale";
+	mineType = "MineCopper";
+	lowForest = rmRandInt(0,1);
+	if (rmRandInt(1,2) == 1)
+	   cacheType = 5;
+	else
+	   cacheType = 4;
+	if (rmRandInt(1,4) < 4)
+	   llamaCache = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 24;
+	else if (fiveChoice == 3)
+	   nativePattern = 25;
+	else if (fiveChoice == 4)
+	   nativePattern = 26;
+	else
+	   nativePattern = 34;
+	vultures = 1;
+   }
+   else if (patternChance == 25) // south araucania
+   {
+      rmSetSeaType("Araucania Southern Coast");
+      rmSetMapType("araucania");
+      rmSetMapType("grass");
+	if (lightingChance == 2)
+	   rmSetLightingSet("SthAraucaniaLight");
+	else
+	   rmSetLightingSet("303a_boston");     
+      baseType = "araucania_snow_c";
+	forestType = "Patagonia Snow Forest";
+	treeType = "TreePatagoniaSnow";
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "deer";
+	} 
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "llama";
+      fish2Type = "FishCod";
+      fishType = "FishSalmon";
+      whaleType = "humpbackWhale";
+	mineType = "MineCopper";
+	if (rmRandInt(1,2) == 1)
+	   cacheType = 5;
+	else
+	   cacheType = 4;
+	if (rmRandInt(1,3) < 3)
+	   llamaCache = 1;
+      placeBerries = 0;
+	if (fourChoice == 1)
+	   nativePattern = 14;
+	else if (fourChoice == 2)
+	   nativePattern = 25;
+	else if (fourChoice == 3)
+	   nativePattern = 26;
+	else
+	   nativePattern = 11;
+	eagles = 1;
+   }
+   else if (patternChance == 26) // california green
+   {
+      rmSetSeaType("california coast");   
+      rmSetMapType("california");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("california");
+	else
+         rmSetLightingSet("new england");  
+      baseType = "california_grass";
+	if (fourChoice < 3)
+	{ 
+	   forestType = "california redwood forest";
+	   treeType = "TreeRedwood";
+	}
+	else 
+	{ 
+	   forestType = "California pine forest";
+	   treeType = "TreePonderosaPine";
+	}
+      if (variantChance == 1)
+	{
+         deerType = "elk";
+         deer2Type = "deer";
+         centerHerdType = "elk";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "elk";
+         centerHerdType = "elk";
+	} 
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fish2Type = "FishCod";
+      fishType = "FishSalmon";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "minegold";
+	cacheType = 4;
+	if (twoChoice == 1)
+	   nativePattern = 27;
+	else
+	   nativePattern = 28;
+	eagles = 1;
+   }
+   else if (patternChance == 27) // california desert
+   {
+      rmSetSeaType("california coast");   
+      rmSetMapType("california");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("california");
+	else
+         rmSetLightingSet("new england");  
+      baseType = "california_desert2";
+	if (fourChoice < 3)
+	{ 
+	   forestType = "California Desert Forest";
+	   treeType = "TreeSonora";
+	}
+	else 
+	{ 
+	   forestType = "california madrone forest";
+	   treeType = "TreeMadrone";
+	}
+      if (variantChance == 1)
+	{
+         deerType = "elk";
+         deer2Type = "pronghorn";
+         centerHerdType = "elk";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "elk";
+         centerHerdType = "deer";
+	} 
+      if (sheepChance == 1)
+         sheepType = "sheep";
+      else
+         sheepType = "cow";
+      fish2Type = "FishMahi";
+      fishType = "FishSardine";
+      whaleType = "humpbackWhale";
+	lowForest = rmRandInt(0,1);
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mine";
+	else
+	   mineType = "minegold";
+	cacheType = 4;
+	if (twoChoice == 1)
+	   nativePattern = 27;
+	else
+	   nativePattern = 43;
+	vultures = 1;
+	underbrush = 1;
+	brushType = "UnderbrushDesert";
+   }
+   else if (patternChance == 28) // palm desert
+   {   
+      rmSetSeaType("Atlantic Coast");
+      rmSetMapType("sonora");
+	rmSetMapType("grass");
+      if (lightingChance == 1)
+         rmSetLightingSet("seville");
+      else
+         rmSetLightingSet("pampas");
+	if (twoChoice == 1)
+	{
+         baseType = "texas_dirt";
+	}
+	else
+	{
+         baseType = "sonora_dirt";
+	}
+	forestType = "caribbean palm forest";
+	treeType = "TreeCaribbean";
+      if (variantChance == 1)
+	{
+         deerType = "deer";
+         deer2Type = "turkey";
+         centerHerdType = "deer";
+	}
+      else 
+	{     
+         deerType = "deer";
+         deer2Type = "deer";
+         centerHerdType = "turkey";
+	}
+      fishType = "FishSardine";
+      fish2Type = "FishMahi";
+      whaleType = "minkeWhale";
+      sheepType = "cow";
+	cacheType = 5;
+	noHeight = 1;
+	forestCoverUp = 1;
+	lowForest = rmRandInt(0,1);
+	if (fourChoice == 1)
+	   nativePattern = 33;
+	else if (fourChoice == 2)
+	   nativePattern = 35;
+	else if (fourChoice == 3)
+	   nativePattern = 35;
+	else 
+	   nativePattern = 36;
+	vultures = 1;
+	underbrush = 1;
+	brushType = "UnderbrushPampas";
+   }
+   else if (patternChance == 29) // atacama
+   {
+      rmSetSeaType("Araucania North Coast");
+      rmSetMapType("araucania");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("NthAraucaniaLight");
+	else
+         rmSetLightingSet("constantinople");
+      baseType = "araucania_north_grass_a";
+	forestType = "sonora forest";
+	treeType = "TreeSonora";
+      if (variantChance == 1)
+	{
+         deerType = "guanaco";
+         deer2Type = "deer";
+         centerHerdType = "guanaco"; 
+	}
+      else 
+	{     
+         deerType = "guanaco";
+         deer2Type = "guanaco";
+         centerHerdType = "guanaco";
+	} 
+      sheepType = "llama";
+      fishType = "FishMahi";
+      fish2Type = "FishSardine";
+      whaleType = "humpbackWhale";
+	mineType = "MineCopper";
+	if (rmRandInt(1,2) == 1)
+	   cacheType = 5;
+	else
+	   cacheType = 4;
+      placeBerries = 0;
+	forestCoverUp = 1;
+	lowForest = 1;
+	if (rmRandInt(1,4) < 4)
+	   llamaCache = 1;
+	if (fiveChoice == 1)
+	   nativePattern = 14;
+	else if (fiveChoice == 2)
+	   nativePattern = 24;
+	else if (fiveChoice == 3)
+	   nativePattern = 25;
+	else if (fiveChoice == 4)
+	   nativePattern = 26;
+	else
+	   nativePattern = 18;
+	vultures = 1;
+	underbrush = 1;
+	brushType = "UnderbrushPampas"; 
+   }
+   else if (patternChance == 30) // Honshu
+   {
+      rmSetSeaType("Coastal Japan");
+      rmSetMapType("Japan");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Honshu");
+	else
+	   rmSetLightingSet("new england");
+      baseType = "coastal_japan_a";
+	forestType = "Coastal Japan Forest";
+	treeType = "ypTreeJapaneseMaple";
+      if (variantChance == 1)
+	{
+         deerType = "ypSerow";
+         deer2Type = "ypGiantSalamander";
+         centerHerdType = "ypSerow";         
+	}
+      else 
+	{     
+         deerType = "ypSerow";
+         deer2Type = "ypSerow";
+         centerHerdType = "ypGiantSalamander";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishTuna";
+      fish2Type = "ypSquid";
+      whaleType = "minkeWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineTin";
+	cacheType = 7;  
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+      nativePattern = 44;
+	kingfishers = 1;
+      waterNuggets = 1;
+   }
+   else if (patternChance == 31) // Deccan
+   {
+      rmSetSeaType("great lakes");
+      rmSetMapType("deccan");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("deccan");
+	else
+	   rmSetLightingSet("texas");
+	if (twoChoice == 1)
+	{
+         baseType = "deccan_grassy_Dirt_a";
+	}
+	else
+	{
+         baseType = "deccan_grass_a";
+	} 
+	if (threeChoice == 1)
+	{
+ 	   forestType = "Ashoka Forest";
+   	   treeType = "ypTreeAshoka";
+	}
+	else if (threeChoice == 2)
+	{
+ 	   forestType = "Eucalyptus Forest";
+   	   treeType = "ypTreeEucalyptus";
+	}
+	else
+	{
+	   forestType = "Deccan Forest";
+   	   treeType = "ypTreeDeccan";
+	}
+      if (variantChance == 1)
+	{
+         deerType = "Zebra";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "Zebra";         
+	}
+      else 
+	{     
+         deerType = "Zebra";
+         deer2Type = "Zebra";
+         centerHerdType = "ypWildElephant";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishMolaMola";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mineTin";
+	else
+	   mineType = "minegold";
+	cacheType = 6; 
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+	threeChoice = rmRandInt(1,3);
+	if (threeChoice == 1)
+         nativePattern = 45;
+	else if (threeChoice == 2)
+         nativePattern = 46;
+	else if (threeChoice == 3)
+         nativePattern = 47;
+      tropical = 1;
+	kingfishers = 1;
+   }
+   else if (patternChance == 32) // Himalayas
+   {
+      rmSetSeaType("Hudson Bay");
+      rmSetMapType("himalayas");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Himalayas");
+	else
+	   rmSetLightingSet("Yukon");
+      baseType = "himalayas_a";
+	forestType = "Himalayas Forest";
+	treeType = "ypTreeHimalayas";
+      if (variantChance == 1)
+	{
+         deerType = "ypIbex";
+         deer2Type = "ypMarcoPoloSheep";
+         centerHerdType = "ypIbex";         
+	}
+      else 
+	{     
+         deerType = "ypMarcoPoloSheep";
+         deer2Type = "ypIbex";
+         centerHerdType = "ypSerow";        
+	}
+      sheepType = "ypYak";
+      fishType = "ypFishTuna";
+      fish2Type = "FishCod";
+      whaleType = "minkeWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "MineCopper";
+	lowForest = rmRandInt(0,1);
+	cacheType = 6;  
+      nativePattern = 49;
+	eagles = 1;
+   }
+   else if (patternChance == 33) // Indochina-Borneo
+   {
+      rmSetSeaType("borneo coast");
+      rmSetMapType("borneo");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("borneo");
+	else
+	   rmSetLightingSet("bayou");
+      baseType = "borneo_grass_a";
+	if (threeChoice == 1)
+	{
+	   forestType = "Borneo Palm Forest";
+	}
+	else if (threeChoice == 2)
+	{
+	   forestType = "Borneo Canopy Forest";
+	}
+	else
+	{
+	   forestType = "Borneo Forest";
+	}
+	treeType = "ypTreeBorneo";
+      if (variantChance == 1)
+	{
+         deerType = "ypSerow";
+         deer2Type = "ypSerow";
+         centerHerdType = "ypWildElephant";         
+	}
+      else 
+	{     
+         deerType = "ypSerow";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "ypSerow";        
+	}
+      sheepType = "ypWaterBuffalo";
+      fishType = "ypFishMolaMola";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mineTin";
+	else
+	   mineType = "mineCopper";
+	cacheType = 6;  
+      nativePattern = 48;
+      tropical = 1;
+	kingfishers = 1;
+	noHeight = 1;
+      waterNuggets = 1;
+   }
+   else if (patternChance == 34) // Mongolia
+   {
+      rmSetSeaType("great lakes");
+      rmSetMapType("mongolia");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("Mongolia");
+	else
+	   rmSetLightingSet("Pampas");
+	if (twoChoice == 1)
+	{
+         baseType = "mongolia_grass_b";
+	   forestType = "Mongolian Forest";
+	   treeType = "ypTreeMongolianFir";
+	}
+	else
+	{
+         baseType = "mongolia_desert";
+	   forestType = "Saxaul Forest";
+         treeType = "ypTreeSaxaul";
+	}
+      if (variantChance == 1)
+	{
+         deerType = "ypSaiga";
+         deer2Type = "Zebra";
+         centerHerdType = "ypSaiga";         
+	}
+      else 
+	{     
+         deerType = "Zebra";
+         deer2Type = "ypSaiga";
+         centerHerdType = "Zebra";        
+	}
+      sheepType = "ypYak";
+      fishType = "ypFishTuna";
+      fish2Type = "FishSalmon";
+      whaleType = "minkeWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mineTin";
+	lowForest = rmRandInt(0,1);
+	cacheType = 7;  
+      nativePattern = 50;
+	eagles = 1;
+   }
+   else if (patternChance == 35) // Ceylon
+   {
+      rmSetSeaType("ceylon coast");
+      rmSetMapType("ceylon");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("ceylon");
+	else
+	   rmSetLightingSet("Great Lakes");
+      baseType = "ceylon_grass_a";
+	forestType = "Ceylon Forest";
+	treeType = "ypTreeCeylon";
+      if (variantChance == 1)
+	{
+         deerType = "ypSerow";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "ypSerow";         
+	}
+      else 
+	{     
+         deerType = "ypSerow";
+         deer2Type = "ypSerow";
+         centerHerdType = "ypWildElephant";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishMolaMola";
+      fish2Type = "FishMahi";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mineTin";
+	else
+	   mineType = "minegold";
+	cacheType = 6;  
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+      nativePattern = 51;
+      tropical = 1;
+	kingfishers = 1;
+	noHeight = 1;
+      waterNuggets = 1;
+   }
+   else if (patternChance == 36) // Yellow River
+   {
+      rmSetSeaType("Great Lakes");
+      rmSetMapType("yellowRiver");
+      rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("carolina");
+	else
+	   rmSetLightingSet("Great Lakes");
+      baseType = "yellow_river_a";
+	if (twoChoice == 1)
+	{
+ 	  forestType = "Yellow River Forest";
+   	  treeType = "ypTreeBamboo";
+	}
+	else
+	{
+	  forestType = "Ginkgo Forest";
+   	  treeType = "ypTreeGinkgo";
+	}
+      if (variantChance == 1)
+	{
+         deerType = "ypSerow";
+         deer2Type = "ypMuskDeer";
+         centerHerdType = "ypMuskDeer";         
+	}
+      else 
+	{     
+         deerType = "ypMuskDeer";
+         deer2Type = "ypSerow";
+         centerHerdType = "ypSerow";        
+	}
+      if (sheepChance == 1)
+         sheepType = "ypWaterBuffalo";
+      else
+         sheepType = "ypGoat";
+      fishType = "ypFishTuna";
+      fish2Type = "ypSquid";
+      whaleType = "humpbackWhale";
+	if (rmRandInt(1,2) == 1)
+	   mineType = "mineTin";
+	else
+	   mineType = "mineCopper";
+	cacheType = 7;  
+	if (rmRandInt(1,3) == 3)
+	   berryCache = 1;
+      nativePattern = 52;
+	if (rmRandInt(1,3) == 1)
+	   tropical = 1;
+	kingfishers = 1;
+   }
+   else if (patternChance == 37) // Siberia
+   {  
+      rmSetSeaType("Atlantic Coast");
+      rmSetMapType("ceylon");
+	rmSetMapType("grass");
+	if (lightingChance == 1)
+	   rmSetLightingSet("great plains");
+	else
+         rmSetLightingSet("texas");
+      baseType = "texas_grass";
+	forestType = "texas forest";
+	treeType = "TreeTexas";
+      if (variantChance == 1)
+	{
+         deerType = "Zebra";
+         deer2Type = "ypWildElephant";
+         centerHerdType = "Zebra";
+	}
+      else 
+	{     
+         deerType = "ypWildElephant";
+         deer2Type = "Zebra";
+         centerHerdType = "ypWildElephant";
+	}
+      sheepType = "ypWaterBuffalo";
+      fishType = "FishSardine";
+      fish2Type = "FishCod";
+      whaleType = "humpbackWhale";
+	cacheType = 2;
+	noHeight = 1;
+	lowForest = rmRandInt(0,1);
+	nativeChoice = rmRandInt(1,6);
+	if (nativeChoice == 1)
+	   nativePattern = 30;
+	else if (nativeChoice == 2)
+	   nativePattern = 29;
+	else if (nativeChoice == 3)
+	   nativePattern = 32;
+	else if (nativeChoice == 4)
+	   nativePattern = 19;
+	else if (nativeChoice == 5)
+	   nativePattern = 20;
+	else
+	   nativePattern = 9;
+	if (rmRandInt(1,2) == 1)
+	   texasProp = 1;
+	else
+	   vultures = 1;	
+	underbrush = 1;
+      brushType = "underbrushTexasGrass"; 
+   }
+   else if (patternChance == 38) // Green Siberia
+   {
+      rmSetSeaType("Northwest Territory Water");   
+      rmSetMapType("mongolia");
+      rmSetMapType("grass");
+	if (lightingChance == 2)
+	   rmSetLightingSet("nwterritory");
+	else
+         rmSetLightingSet("saguenay");
+      baseType = "nwt_grass1";
+	if (twoChoice == 1)
+	{
+	   forestType = "NW Territory Birch Forest";
+   	   treeType = "TreeGreatLakes";
+	}
+	else
+	{ 
+	   forestType = "NW Territory Forest";
+	   treeType = "TreeGreatPlains";   
+	}
+      if (variantChance == 1)
+	{
+         deerType = "ypMuskDeer";
+         deer2Type = "ypSaiga";
+         centerHerdType = "ypSaiga";         
+	}
+      else 
+	{     
+         deerType = "ypSaiga";
+         deer2Type = "ypMuskDeer";
+         centerHerdType = "ypSaiga";        
+	}
+      sheepType = "ypYak";
+      fish2Type = "FishSalmon";
+      fishType = "FishCod";
+      whaleType = "minkeWhale";
+	cacheType = 7;  
+	if (twoChoice == 1)
+         nativePattern = 52;
+	else 
+         nativePattern = 54;
+      eagles = 1;
+   }
+
+   tradeRouteType = "dirt";
+   if (patternChance > 29)
+      tradeRouteType = "water";
+   
+// Native patterns
+  if (nativePattern == 1)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Iroquois");
+      native2Name = "native iroquois village ";
+  }
+  else if (nativePattern == 2)
+  {
+      rmSetSubCiv(0, "Comanche");
+      native1Name = "native comanche village ";
+      rmSetSubCiv(1, "Lakota");
+      native2Name = "native lakota village ";
+  }
+  else if (nativePattern == 3)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Seminoles");
+      native2Name = "native seminole village ";
+  }
+  else if (nativePattern == 4)
+  {
+      rmSetSubCiv(0, "Cheyenne");
+      native1Name = "native cheyenne village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 5)
+  {
+      rmSetSubCiv(0, "Huron");
+      native1Name = "native huron village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 6)
+  {
+      rmSetSubCiv(0, "Nootka");
+      native1Name = "native nootka village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 7)
+  {
+      rmSetSubCiv(0, "Nootka");
+      native1Name = "native nootka village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 8)
+  {
+      rmSetSubCiv(0, "Cree");
+      native1Name = "native cree village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 9)
+  {
+      rmSetSubCiv(0, "Seminoles");
+      native1Name = "native seminole village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 10)
+  {
+      rmSetSubCiv(0, "Zapotec");
+      native1Name = "native zapotec village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 11)
+  {
+      rmSetSubCiv(0, "Mapuche");
+      native1Name = "native mapuche village ";
+      rmSetSubCiv(1, "Maya");
+      native2Name = "native maya village ";
+  }
+  else if (nativePattern == 12)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Maya");
+      native2Name = "native maya village ";
+  }
+  else if (nativePattern == 13)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Tupi");
+      native2Name = "native tupi village ";
+  }
+  else if (nativePattern == 14)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Tupi");
+      native2Name = "native tupi village ";
+  }
+  else if (nativePattern == 15)
+  {
+      rmSetSubCiv(0, "Maya");
+      native1Name = "native maya village ";
+      rmSetSubCiv(1, "Tupi");
+      native2Name = "native tupi village ";
+  }
+  else if (nativePattern == 16)
+  {
+      rmSetSubCiv(0, "Nootka");
+      native1Name = "native nootka village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 17)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Aztecs");
+      native2Name = "native aztec village ";
+  }
+  else if (nativePattern == 18)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Caribs");
+      native2Name = "native carib village ";
+  }
+  else if (nativePattern == 19)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 20)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 21)
+  {
+      rmSetSubCiv(0, "Seminoles");
+      native1Name = "native seminole village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 22)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 23)
+  {
+      rmSetSubCiv(0, "Comanche");
+      native1Name = "native comanche village ";
+      rmSetSubCiv(1, "Cree");
+      native2Name = "native cree village ";
+  }
+  else if (nativePattern == 24)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Maya");
+      native2Name = "native maya village ";
+  }
+  else if (nativePattern == 25)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Mapuche");
+      native2Name = "native mapuche village ";
+  }
+  else if (nativePattern == 26)
+  {
+      rmSetSubCiv(0, "Tupi");
+      native1Name = "native tupi village ";
+      rmSetSubCiv(1, "Mapuche");
+      native2Name = "native mapuche village ";
+  }
+  else if (nativePattern == 27)
+  {
+      rmSetSubCiv(0, "Klamath");
+      native1Name = "native klamath village ";
+      rmSetSubCiv(1, "Nootka");
+      native2Name = "native nootka village ";
+  }
+  else if (nativePattern == 28)
+  {
+      rmSetSubCiv(0, "Klamath");
+      native1Name = "native klamath village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 29)
+  {
+      rmSetSubCiv(0, "Comanche");
+      native1Name = "native comanche village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 30)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 31)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Navajo");
+      native2Name = "native navajo village ";
+  }
+  else if (nativePattern == 32)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 33)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 34)
+  {
+      rmSetSubCiv(0, "Incas");
+      native1Name = "native inca village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 35)
+  {
+      rmSetSubCiv(0, "Maya");
+      native1Name = "native maya village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 36)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 37)
+  {
+      rmSetSubCiv(0, "Navajo");
+      native1Name = "native navajo village ";
+      rmSetSubCiv(1, "Zapotec");
+      native2Name = "native zapotec village ";
+  }
+  else if (nativePattern == 38)
+  {
+      rmSetSubCiv(0, "Navajo");
+      native1Name = "native navajo village ";
+      rmSetSubCiv(1, "Comanche");
+      native2Name = "native comanche village ";
+  }
+  else if (nativePattern == 39)
+  {
+      rmSetSubCiv(0, "Navajo");
+      native1Name = "native navajo village ";
+      rmSetSubCiv(1, "Cheyenne");
+      native2Name = "native cheyenne village ";
+  }
+  else if (nativePattern == 40)
+  {
+      rmSetSubCiv(0, "Cherokee");
+      native1Name = "native cherokee village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 41)
+  {
+      rmSetSubCiv(0, "Lakota");
+      native1Name = "native lakota village ";
+      rmSetSubCiv(1, "Huron");
+      native2Name = "native huron village ";
+  }
+  else if (nativePattern == 42)
+  {
+      rmSetSubCiv(0, "Caribs");
+      native1Name = "native carib village ";
+      rmSetSubCiv(1, "Seminoles");
+      native2Name = "native seminole village ";
+  }
+  else if (nativePattern == 43)
+  {
+      rmSetSubCiv(0, "Apache");
+      native1Name = "native apache village ";
+      rmSetSubCiv(1, "Klamath");
+      native2Name = "native klamath village ";
+  }
+  else if (nativePattern == 44)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "udasi");
+      native2Name = "native udasi village ";
+  }
+  else if (nativePattern == 45)
+  {
+      rmSetSubCiv(0, "udasi");
+      native1Name = "native udasi village ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ";
+  }
+  else if (nativePattern == 46)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque deccan ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ";
+  }
+  else if (nativePattern == 47)
+  {
+      rmSetSubCiv(0, "udasi");
+      native1Name = "native udasi village ";
+      rmSetSubCiv(1, "sufi");
+      native2Name = "native sufi mosque deccan ";
+  }
+  else if (nativePattern == 48)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque borneo ";
+      rmSetSubCiv(1, "jesuit");
+      native2Name = "native jesuit mission borneo 0";
+  }
+  else if (nativePattern == 49)
+  {
+      rmSetSubCiv(0, "udasi");
+      native1Name = "native udasi village himal ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village himal ";
+  }
+  else if (nativePattern == 50)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque mongol ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ceylon ";
+  }
+  else if (nativePattern == 51)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "bhakti");
+      native2Name = "native bhakti village ceylon ";
+  }
+  else if (nativePattern == 52)
+  {
+      rmSetSubCiv(0, "sufi");
+      native1Name = "native sufi mosque mongol ";
+      rmSetSubCiv(1, "aztecs");
+      native2Name = "native Aztec village ";
+  }
+  else if (nativePattern == 53)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "aztecs");
+      native2Name = "native shaolin temple mongol 0";
+  }
+  else if (nativePattern == 54)
+  {
+      rmSetSubCiv(0, "aztecs");
+      native1Name = "native Aztec village ";
+      rmSetSubCiv(1, "jesuit");
+      native2Name = "native jesuit mission borneo 0";
+  }
+
+// Precipitation
+   if ((patternChance == 14) || (patternChance == 16)) // yucatan, amazon    
+      if (lightingChance == 2)
+         rmSetGlobalRain( 0.5 );
+   if (patternChance == 7) // yukon
+      rmSetGlobalSnow( 1.0 );
+   if ((patternChance == 5) || (patternChance == 20) || (patternChance == 25)) // gl winter, yukon tundra, s araucania 
+      if (lightingChance == 2)    
+         rmSetGlobalSnow( 0.7 );
+   if (patternChance == 8) // rockies
+      if (lightingChance == 2)
+         rmSetGlobalSnow( 0.5 );
+
+   if ((patternChance == 33) || (patternChance == 38)) // himalayas, siberia
+      if (rmRandInt(1,2) == 2)
+         rmSetGlobalRain( 0.3 );
+   if (patternChance == 31) // deccan
+      if (rmRandInt(1,2) == 2)
+         rmSetGlobalRain( 0.3 ); 
+
+   if (patternChance == 19) // nwt
+   {
+	// Make it rain
+	rmSetGlobalRain( 1.0 );
+	rmSetGlobalStormLength(1.0, 0.0);
+
+	// Sets up the rain triggers 
+	rmCreateTrigger("ChangeRain1");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain1"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 20);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 0.3);
+
+	rmCreateTrigger("ChangeRain2");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain2"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 40);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 1.0);
+
+	rmCreateTrigger("ChangeRain3");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain3"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 60);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 0.3);
+
+	rmCreateTrigger("ChangeRain4");
+	rmSwitchToTrigger(rmTriggerID("ChangeRain4"));
+	rmSetTriggerActive(true);
+	rmAddTriggerCondition("Timer");
+	rmSetTriggerConditionParamInt("Param1", 75);
+	rmAddTriggerEffect("Render Rain");
+	rmSetTriggerEffectParamFloat("Percent", 0.0);
+   }
+
+   rmTerrainInitialize("water");
+   rmSetMapType("water");
+   rmSetWorldCircleConstraint(true);
+   rmSetWindMagnitude(2.0);
+
+   chooseMercs();
+
+// Define some classes.
+   int classPlayer=rmDefineClass("player");
+   rmDefineClass("startingUnit");
+   rmDefineClass("classForest");
+   rmDefineClass("importantItem");
+   rmDefineClass("natives");
+   rmDefineClass("nuggets");
+   rmDefineClass("center");
+   rmDefineClass("socketClass");
+   rmDefineClass("classFish");
+   int classHuntable=rmDefineClass("huntableFood");   
+   int classHerdable=rmDefineClass("herdableFood"); 
+   int classMines=rmDefineClass("all mines"); 
+   int classCenterIsland=rmDefineClass("center island");
+   int classBonusIsland=rmDefineClass("bonus island");
+   int classSettlementIsland=rmDefineClass("settlement island");
+   int classNativeIsland=rmDefineClass("native island");
+   int classGoldIsland=rmDefineClass("gold island");
+   int islandsX=rmDefineClass("islandsX");
+   int islandsY=rmDefineClass("islandsY");
+   int islandsZ=rmDefineClass("islandsZ");
+
+// Text
+   rmSetStatusText("",0.10);
+
+// -------------Define constraints
+   // Map edge constraints
+   int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(10), rmZTilesToFraction(10), 1.0-rmXTilesToFraction(10), 1.0-rmZTilesToFraction(10), 0.01);
+   int centerConstraint=rmCreateClassDistanceConstraint("stay away from center", rmClassID("center"), 30.0);
+   int centerConstraintShort=rmCreateClassDistanceConstraint("stay away from center short", rmClassID("center"), 12.0);
+   int centerConstraintFar=rmCreateClassDistanceConstraint("stay away from center far", rmClassID("center"), 70.0);
+   int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int circleEdgeConstraint=rmCreatePieConstraint("circle edge Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.46), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int centralExtraLandConstraint=rmCreatePieConstraint("circle Constraint for extra land", 0.5, 0.5, 0, rmZFractionToMeters(0.17), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int centralExtraLandConstraint2=rmCreatePieConstraint("2nd circle Constraint for extra land", 0.5, 0.5, 0, rmZFractionToMeters(0.12), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+   // Player constraints
+   int playerConstraintShort=rmCreateClassDistanceConstraint("short stay away from players", classPlayer, 15.0);
+   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 45.0);
+   int mediumPlayerConstraint=rmCreateClassDistanceConstraint("medium stay away from players", classPlayer, 25.0);
+   int nuggetPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 60.0);
+   int farPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players more", classPlayer, 85.0);
+   int fartherPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players the most", classPlayer, 105.0);
+   int longPlayerConstraint=rmCreateClassDistanceConstraint("land stays away from players", classPlayer, 75.0);
+
+   float constraintChance = rmRandFloat(0, 1);
+   int constraintNum = 0;
+   if(constraintChance < 0.25)
+      constraintNum = 28;
+   else if(constraintChance < 0.5)
+      constraintNum = 30;
+   else if(constraintChance < 0.75)
+      constraintNum = 32;
+   else 
+      constraintNum = 34;
+   int secondPlayerConstraint=rmCreateClassDistanceConstraint("also stay away from players", classPlayer, constraintNum); 
+
+   // Nature avoidance
+   int forestConstraint2=rmCreateClassDistanceConstraint("forest v forest2", rmClassID("classForest"), 10.0);
+   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 20.0);
+   int avoidCoin=rmCreateClassDistanceConstraint("avoid coin", rmClassID("all mines"), 10.0);
+   int coinAvoidCoin=rmCreateClassDistanceConstraint("coin avoids coin", rmClassID("all mines"), 35.0);
+   int longAvoidCoin=rmCreateClassDistanceConstraint("long avoid coin", rmClassID("all mines"), 90.0);
+   int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 1.0);
+   int avoidSheep=rmCreateClassDistanceConstraint("sheep avoids sheep etc", rmClassID("herdableFood"), 45.0);
+   int huntableConstraint=rmCreateClassDistanceConstraint("huntable constraint", rmClassID("huntableFood"), 35.0);
+
+   // Avoid impassable land, certain features
+   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 4.0);
+   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 2.0);
+   int longAvoidImpassableLand=rmCreateTerrainDistanceConstraint("long avoid impassable land", "Land", false, 18.0);
+   int avoidWater10 = rmCreateTerrainDistanceConstraint("avoid water mid-long", "Land", false, 10.0);
+   int avoidWater15 = rmCreateTerrainDistanceConstraint("avoid water mid-longer", "Land", false, 15.0);
+   int avoidWater20 = rmCreateTerrainDistanceConstraint("avoid water a little more", "Land", false, 20.0);
+   int rockVsLand = rmCreateTerrainDistanceConstraint("rock v. land", "land", true, 2.0);
+   int nearWater = rmCreateTerrainMaxDistanceConstraint("stay near Water", "Water", true, 5.0);
+   int avoidLand10 = rmCreateTerrainDistanceConstraint("avoid land by 10", "land", true, 10.0);
+   int nearShore=rmCreateTerrainMaxDistanceConstraint("stay near shore", "land", true, 5.0);
+
+   // Unit avoidance
+   int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 30.0);
+   int avoidStartingUnitsSmall=rmCreateClassDistanceConstraint("objects avoid starting units small", rmClassID("startingUnit"), 10.0);
+   int avoidImportantItem=rmCreateClassDistanceConstraint("things avoid each other", rmClassID("importantItem"), 10.0);
+   int avoidImportantItemSmall=rmCreateClassDistanceConstraint("important item small avoidance", rmClassID("importantItem"), 7.0);
+   int avoidImportantItemMed=rmCreateClassDistanceConstraint("things avoid each other med", rmClassID("importantItem"), 35.0);
+   int avoidNatives=rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 60.0);
+   int avoidNativesLong=rmCreateClassDistanceConstraint("stuff avoids natives longer", rmClassID("natives"), 90.0);
+   int avoidNativesShort=rmCreateClassDistanceConstraint("stuff avoids natives shorter", rmClassID("natives"), 15.0);
+   int avoidNugget=rmCreateClassDistanceConstraint("stuff avoids nuggets", rmClassID("nuggets"), 40.0);
+   int avoidNuggetSmall=rmCreateClassDistanceConstraint("avoid nuggets by a little", rmClassID("nuggets"), 10.0);
+   int avoidNuggetLong=rmCreateClassDistanceConstraint("avoids nuggets long", rmClassID("nuggets"), 70.0);
+   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
+   int avoidKOTH=rmCreateTypeDistanceConstraint("avoid KOTH", "ypKingsHill", 8.0);
+
+   // Trade route avoidance.
+   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 8.0);
+   int avoidSocket=rmCreateClassDistanceConstraint("avoid sockets", rmClassID("socketClass"), 10.0);
+
+   // New extra stuff for water spawn point avoidance.
+   int flagLand = rmCreateTerrainDistanceConstraint("flag vs land", "land", true, 5.0);
+   int flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same", "HomeCityWaterSpawnFlag", 40);
+   int flagEdgeConstraint = rmCreatePieConstraint("flags stay near edge of map", 0.5, 0.5, rmGetMapXSize()-30, rmGetMapXSize()-5, 0, 0, 0);
+
+   // Center constraint
+   int avoidCenter=rmCreateClassDistanceConstraint("avoid the center", rmClassID("center"), 30.0);
+ 
+   // Island constraints
+   float constraintChance2 = rmRandFloat(0, 1);
+   int constraintNum2 = 0;
+   if(constraintChance2 < 0.33)
+      constraintNum2 = 26;
+   else if(constraintChance2 < 0.66)
+      constraintNum2 = 29;
+   else 
+      constraintNum2 = 32;
+   float constraintChance3 = rmRandFloat(0, 1);
+   int constraintNum3 = 0;
+   if(constraintChance3 < 0.33)
+      constraintNum3 = 27;
+   else if(constraintChance3 < 0.66)
+      constraintNum3 = 30;
+   else
+      constraintNum3 = 32;
+
+   int settlementIslandConstraint=rmCreateClassDistanceConstraint("avoid settlement islands", classSettlementIsland, constraintNum3); 
+   int centerIslandConstraint=rmCreateClassDistanceConstraint("avoid center island", classCenterIsland, constraintNum2);
+   int nativeIslandConstraint=rmCreateClassDistanceConstraint("avoid native island", classNativeIsland, constraintNum3);
+   int nativeIslandConstraintLarge=rmCreateClassDistanceConstraint("avoid native island large", classNativeIsland, rmXFractionToMeters(0.28));
+   int islandsXvsY=rmCreateClassDistanceConstraint("island X avoids Y", islandsY, rmRandInt(27,32));
+   int islandsYvsX=rmCreateClassDistanceConstraint("island Y avoids X", islandsX, rmRandInt(27,32));
+   int islandsXYvsZ=rmCreateClassDistanceConstraint("islands Y and X avoid Z", islandsZ, rmRandInt(27,32));
+   int islandsZvsX=rmCreateClassDistanceConstraint("island Z avoids X", islandsX, rmRandInt(27,32));
+   int islandsZvsY=rmCreateClassDistanceConstraint("island Z avoids Y", islandsY, rmRandInt(27,32));
+
+   // Cardinal Directions - "quadrants" of the map.
+   int Northward=rmCreatePieConstraint("northMapConstraint", 0.5, 0.75, 0, rmZFractionToMeters(0.22), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int Southward=rmCreatePieConstraint("southMapConstraint", 0.5, 0.25, 0, rmZFractionToMeters(0.22), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int Eastward=rmCreatePieConstraint("eastMapConstraint", 0.75, 0.5, 0, rmZFractionToMeters(0.22), rmDegreesToRadians(0), rmDegreesToRadians(360));
+   int Westward=rmCreatePieConstraint("westMapConstraint", 0.25, 0.5, 0, rmZFractionToMeters(0.22), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+// ---------------------------------------------------------------------------------------End constraints
+
+// Text
+   rmSetStatusText("",0.15);
+
+// NATIVES - defined
+   // Village A 
+   int villageAID = -1;
+   int whichNative = rmRandInt(1,2);
+   int villageType = rmRandInt(1,5);
+   if (whichNative == 1)
+	   villageAID = rmCreateGrouping("village A", native1Name+villageType);
+   else if (whichNative == 2)
+	   villageAID = rmCreateGrouping("village A", native2Name+villageType);
+   rmAddGroupingToClass(villageAID, rmClassID("natives"));
+   rmAddGroupingToClass(villageAID, rmClassID("importantItem"));
+   rmSetGroupingMinDistance(villageAID, 34.0);
+   rmSetGroupingMaxDistance(villageAID, rmXFractionToMeters(0.06));
+   rmAddGroupingConstraint(villageAID, avoidImpassableLand);
+   rmAddGroupingConstraint(villageAID, avoidTradeRoute);
+   rmAddGroupingConstraint(villageAID, avoidSocket);
+   rmAddGroupingConstraint(villageAID, avoidWater15);
+   rmAddGroupingConstraint(villageAID, avoidNatives);
+   rmAddGroupingConstraint(villageAID, avoidKOTH);
+
+   // Village D - opposite type from A 
+   int villageDID = -1;
+   villageType = rmRandInt(1,5);
+   if (whichNative == 2)
+	   villageDID = rmCreateGrouping("village D", native1Name+villageType);
+   else if (whichNative == 1)
+	   villageDID = rmCreateGrouping("village D", native2Name+villageType);
+   rmAddGroupingToClass(villageDID, rmClassID("natives"));
+   rmAddGroupingToClass(villageDID, rmClassID("importantItem"));
+   rmSetGroupingMinDistance(villageDID, 0.0);
+   rmSetGroupingMaxDistance(villageDID, rmXFractionToMeters(0.05));
+   rmAddGroupingConstraint(villageDID, avoidImpassableLand);
+   rmAddGroupingConstraint(villageDID, avoidTradeRoute);
+   rmAddGroupingConstraint(villageDID, avoidSocket);
+   rmAddGroupingConstraint(villageDID, avoidWater15);
+   rmAddGroupingConstraint(villageDID, avoidNativesLong);
+   rmAddGroupingConstraint(villageDID, playerConstraint);
+   rmAddGroupingConstraint(villageDID, avoidKOTH);
+
+// Center area
+   int centerArea=rmCreateArea("TheCenter");
+   rmSetAreaSize(centerArea, 0.1, 0.1);
+   rmSetAreaLocation(centerArea, 0.5, 0.5);
+   rmAddAreaToClass(centerArea, rmClassID("center")); 
+
+// --------------------------------------------------------------------------------Done special definitions 
+
+// Text
+   rmSetStatusText("",0.20);
+
+// Set up player starting locations
+int fiveChance = rmRandInt(1,5);
+int fourChance = rmRandInt(1,4);
+int threeChance = rmRandInt(1,3);
+int twoChance = rmRandInt(1,2);
+
+if (sectionChance == 0)
+{
+      directionChance = 0;
+      if (distChance == 1)
+         rmPlacePlayersCircular(0.31, 0.32, 0.0);
+      else if (distChance == 2)
+         rmPlacePlayersCircular(0.32, 0.33, 0.0);
+      else if (distChance == 3)
+         rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	else if (distChance == 4)
+	   rmPlacePlayersCircular(0.34, 0.35, 0.0);
+      else if (distChance == 5)
+	   rmPlacePlayersCircular(0.35, 0.36, 0.0);
+	else if (distChance == 6)
+	   rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	else if (distChance == 7)
+	   rmPlacePlayersCircular(0.37, 0.38, 0.0);
+}
+else
+{
+   if (cNumberNonGaiaPlayers == 2)
+   {   
+	 sectionChance = rmRandInt(1,21);  
+	 distChance = rmRandInt(1,4);
+	 if (sectionChance == 1) // opposite, across axis 1
+	 {
+	    axisChance = 2;
+          rmSetPlacementSection(0.0, 0.5);
+	    if (fiveChance == 1)
+		 eBigIs = 1;
+	    else if (fiveChance == 2)
+	 	 wBigIs = 1;
+	    else if (fiveChance == 3)
+	 	 eEdgeIs = 1;
+	    else if (fiveChance == 4)
+	 	 wEdgeIs = 1;
+	    else if (fiveChance == 5)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		    directionChance = 0;
+		 else
+	       { 
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 1;
+		    else
+                   directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 2) // opposite, across axis 2
+	 {
+	    axisChance = 1;
+          rmSetPlacementSection(0.25, 0.75);
+	    if (fiveChance == 1)
+		 nBigIs = 1;
+	    else if (fiveChance == 2)
+	 	 sBigIs = 1;
+	    else if (fiveChance == 3)
+	 	 nEdgeIs = 1;
+	    else if (fiveChance == 4)
+	 	 sEdgeIs = 1;
+	    else if (fiveChance == 5)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		    directionChance = 0;
+		 else
+	       { 
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 1;
+		    else
+                   directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance < 5) // 3,4 East side of map
+	 {
+	    if (sectionChance == 3)
+             rmSetPlacementSection(0.1, 0.4);
+	    if (sectionChance == 4)
+             rmSetPlacementSection(0.15, 0.35);
+	    if (threeChance == 1)
+		 wBigIs = 1;
+	    else if (threeChance == 2)
+	 	 wEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 1;
+		 }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 1;
+		    else
+                   directionChance = 0;
+		 }
+	    }
+	 }
+	 else if (sectionChance < 7) // 5,6 W side of map
+	 {
+	    if (sectionChance == 5)
+             rmSetPlacementSection(0.6, 0.9);
+	    if (sectionChance == 6)
+             rmSetPlacementSection(0.65, 0.85);
+	    if (threeChance == 1)
+		 eBigIs = 1;
+	    else if (threeChance == 2)
+	 	 eEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 1;
+		 }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 2;
+		    else
+                   directionChance = 0;
+		 }
+	    }
+	 }
+	 else if (sectionChance < 9) // 7,8 S side of map
+	 {
+	    if (sectionChance == 7)
+             rmSetPlacementSection(0.35, 0.65);
+	    if (sectionChance == 8)
+             rmSetPlacementSection(0.4, 0.6);
+	    if (threeChance == 1)
+		 nBigIs = 1;
+	    else if (threeChance == 2)
+	 	 nEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 2;
+		 }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 2;
+		    else
+                   directionChance = 0;
+		 }
+	    }
+	 }
+	 else if (sectionChance < 11) // 9,10 N side of map
+	 {
+	    if (sectionChance == 9)
+             rmSetPlacementSection(0.85, 0.15);
+	    if (sectionChance == 10)
+             rmSetPlacementSection(0.9, 0.1);
+	    if (threeChance == 1)
+		 sBigIs = 1;
+	    else if (threeChance == 2)
+	 	 sEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 2;
+		 }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 1;
+		    else
+                   directionChance = 0;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 11) // next 4 same side, 0.4 of map
+	 {
+          rmSetPlacementSection(0.05, 0.45); // E
+	    if (threeChance == 1)
+		 wBigIs = 1;
+	    else if (threeChance == 2)
+	 	 wEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,2) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 2;
+		 }
+		 else
+		 {
+		    axisChance = 2;
+		    directionChance = 1;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 12)
+	 {
+          rmSetPlacementSection(0.55, 0.95); // W
+	    if (threeChance == 1)
+		 eBigIs = 1;
+	    else if (threeChance == 2)
+	 	 eEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,2) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 2;
+		 }
+		 else
+		 {
+		    axisChance = 2;
+  	          directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 13)
+	 {
+          rmSetPlacementSection(0.3, 0.7); // S
+	    if (threeChance == 1)
+		 nBigIs = 1;
+	    else if (threeChance == 2)
+	 	 nEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,2) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 1;
+		 }
+		 else
+		 {
+		    axisChance = 1;
+		    directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 14)
+	 {
+          rmSetPlacementSection(0.8, 0.2); // N
+	    if (threeChance == 1)
+		 sBigIs = 1;
+	    else if (threeChance == 2)
+	 	 sEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,2) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 1;
+		 }
+		 else
+		 {
+		    axisChance = 1;
+		    directionChance = 1;
+		 }
+          }
+	 }
+	 else if (sectionChance == 15) // opposite, not on axis
+	 {
+             rmSetPlacementSection(0.1, 0.6);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 1;
+		 }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+		    {
+		       if (rmRandInt(1,2) == 1)
+		          directionChance = 1;
+		       else
+                      directionChance = 2;
+		    }
+		 }
+	 }
+	 else if (sectionChance == 16) // opposite, not on axis
+	 {
+             rmSetPlacementSection(0.4, 0.9);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 1;
+		 }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+		    {
+		       if (rmRandInt(1,2) == 1)
+		          directionChance = 1;
+		       else
+                      directionChance = 2;
+		    }
+		 }
+	 }
+	 else if (sectionChance == 17) // opposite, not on axis
+	 {
+             rmSetPlacementSection(0.15, 0.65);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 2;
+		 }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+		    {
+		       if (rmRandInt(1,2) == 1)
+		          directionChance = 1;
+		       else
+                      directionChance = 2;
+		    }
+		 }
+	 }
+	 else if (sectionChance == 18) // opposite, not on axis
+	 {
+             rmSetPlacementSection(0.35, 0.85);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    directionChance = 0;
+		    axisChance = 2;
+		 }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+		    {
+		       if (rmRandInt(1,2) == 1)
+		          directionChance = 1;
+		       else
+                      directionChance = 2;
+		    }
+		 }
+	 }
+	 else if (sectionChance == 19) // asymmetric
+	 {
+          rmSetPlacementSection(0.2, 0.4);
+	    if (threeChance == 1)
+		 wBigIs = 1;
+	    else if (threeChance == 2)
+	 	 wEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+  	       directionChance = 1;
+		 axisChance = 2;
+	    }
+	 }
+	 else if (sectionChance == 20) // asymmetric
+	 {
+          rmSetPlacementSection(0.6, 0.8);
+	    if (threeChance == 1)
+		 eBigIs = 1;
+	    else if (threeChance == 2)
+	 	 eEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+  	       directionChance = 2;
+		 axisChance = 2;
+	    }
+	 }
+	 else if (sectionChance == 21) // asymmetric
+	 {
+             rmSetPlacementSection(0.0, 0.7);
+		 axisChance = 2;
+		 if (rmRandInt(1,2) == 1)
+		 {
+		    directionChance = 0;
+		 }
+		 else
+		 {
+		    directionChance = 1;
+		 }
+	 }
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.31, 0.32, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.34, 0.35, 0.0);
+   }
+   else if (cNumberNonGaiaPlayers == 3)
+   {
+	 sectionChance = rmRandInt(1,15);
+	 distChance = rmRandInt(1,6);
+	 if (sectionChance == 1) // east - next 4 0.5 circ
+	 {
+          rmSetPlacementSection(0.0, 0.5);
+	    if (threeChance == 1)
+		 wBigIs = 1;
+	    else if (threeChance == 2)
+	 	 wEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 1;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 2) // south 
+	 {
+          rmSetPlacementSection(0.25, 0.75);
+	    if (threeChance == 1)
+		 nBigIs = 1;
+	    else if (threeChance == 2)
+	 	 nEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 3) // west
+	 {
+          rmSetPlacementSection(0.5, 0.0);
+	    if (threeChance == 1)
+		 eBigIs = 1;
+	    else if (threeChance == 2)
+	 	 eEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 4) // north
+	 {
+          rmSetPlacementSection(0.75, 0.25);
+	    if (threeChance == 1)
+		 sBigIs = 1;
+	    else if (threeChance == 2)
+	 	 sEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 1;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 5) // east - next 4 0.6 circ 
+	 {
+          rmSetPlacementSection(0.95, 0.55);
+	    if (threeChance == 1)
+		 wBigIs = 1;
+	    else if (threeChance == 2)
+	 	 wEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {		
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 1;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 6) // south 
+	 {
+          rmSetPlacementSection(0.15, 0.85);
+	    if (threeChance == 1)
+		 nBigIs = 1;
+	    else if (threeChance == 2)
+	 	 nEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {	
+             if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 7) // west
+	 {
+          rmSetPlacementSection(0.4, 0.1);
+	    if (threeChance == 1)
+		 eBigIs = 1;
+	    else if (threeChance == 2)
+	 	 eEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {	
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 8) // north
+	 {
+          rmSetPlacementSection(0.65, 0.35);
+	    if (threeChance == 1)
+		 sBigIs = 1;
+	    else if (threeChance == 2)
+	 	 sEdgeIs = 1;
+	    else if (threeChance == 3)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 1;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 9) // east - next 4 0.6 circ, not on axis
+	 {
+          rmSetPlacementSection(0.00, 0.60);
+	    if (twoChance == 1)
+		 wBigIs = 1;
+	    else if (twoChance == 2)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 1;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 10) // south 
+	 {
+          rmSetPlacementSection(0.25, 0.85);
+	    if (twoChance == 1)
+		 nBigIs = 1;
+	    else if (twoChance == 2)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 11) // west
+	 {
+          rmSetPlacementSection(0.50, 0.10);
+	    if (twoChance == 1)
+		 eBigIs = 1;
+	    else if (twoChance == 2)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 2;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 2;
+		 }
+	    }
+	 }
+	 else if (sectionChance == 12) // north
+	 {
+          rmSetPlacementSection(0.75, 0.35);
+	    if (twoChance == 1)
+		 sBigIs = 1;
+	    else if (twoChance == 2)
+	    {
+		 if (rmRandInt(1,3) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+             }
+		 else
+		 {
+		    axisChance = 1;
+		    if (rmRandInt(1,2) == 1)
+		       directionChance = 0;
+		    else
+  	             directionChance = 1;
+		 }
+	    }
+	 }
+	 else   // chance 13, 14, 15 whole circular
+	 {
+	    directionChance = 0;	
+	 }
+	    if (distChance == 1)
+	       rmPlacePlayersCircular(0.31, 0.32, 0.0);
+	    else if (distChance == 2)
+	       rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	    else if (distChance == 3)
+	       rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	    else if (distChance == 4)
+	       rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	    else if (distChance == 5)
+	       rmPlacePlayersCircular(0.35, 0.36, 0.0);
+	    else if (distChance == 6)
+	       rmPlacePlayersCircular(0.36, 0.37, 0.0);
+   }    
+   else 
+   {
+      if (cNumberTeams == 2)
+      {
+        if (cNumberNonGaiaPlayers == 4) // 2 teams, 4 players   
+        {
+	    distChance = rmRandInt(1,6);
+ 	    directionChance = 0;
+
+          if (axisChance == 1)
+          {
+	      if (sectionChance == 9)
+	      {
+		    sBigIs = 1;
+	      }
+	      if (sectionChance == 10)
+	      {
+		    sEdgeIs = 1;
+	      }
+	      if (sectionChance == 11)
+	      {
+		    nBigIs = 1;
+	      }
+	      if (sectionChance == 12)
+	      {
+		    nEdgeIs = 1;
+	      }
+
+           if (playerSide == 1)
+	  	  rmSetPlacementTeam(0);
+           else if (playerSide == 2)
+	        rmSetPlacementTeam(1);
+
+	     if (sectionChance == 1)
+             rmSetPlacementSection(0.17, 0.33);
+	     else if (sectionChance == 2)
+             rmSetPlacementSection(0.15, 0.35);
+	     else if (sectionChance == 3)
+             rmSetPlacementSection(0.13, 0.37);
+	     else if (sectionChance == 4)
+             rmSetPlacementSection(0.11, 0.39);
+	     else if (sectionChance == 5)
+             rmSetPlacementSection(0.1, 0.34); // toward CC
+	     else if (sectionChance == 6)
+             rmSetPlacementSection(0.09, 0.31); // toward CC
+	     else if (sectionChance == 7)
+             rmSetPlacementSection(0.16, 0.4); // toward C
+	     else if (sectionChance == 8)
+             rmSetPlacementSection(0.19, 0.41); // toward C
+	     else if (sectionChance == 9)
+             rmSetPlacementSection(0.12, 0.32); // toward N
+	     else if (sectionChance == 10)
+		 rmSetPlacementSection(0.10, 0.28); // toward N
+	     else if (sectionChance == 11)
+		 rmSetPlacementSection(0.18, 0.38); // toward S
+	     else if (sectionChance == 12)
+             rmSetPlacementSection(0.22, 0.40); // toward S
+
+ 	     if (distChance == 1)
+      	 rmPlacePlayersCircular(0.32, 0.33, 0.0);
+  	     else if (distChance == 2)
+  	       rmPlacePlayersCircular(0.31, 0.32, 0.0);
+ 	     else if (distChance == 3)
+              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	     else if (distChance == 4)
+	        rmPlacePlayersCircular(0.36, 0.37, 0.0);
+           else if (distChance == 5)
+              rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	     else if (distChance == 6)
+	        rmPlacePlayersCircular(0.34, 0.35, 0.0);
+
+	     if (playerSide == 1) 
+		  rmSetPlacementTeam(1);
+  	     else if (playerSide == 2)
+	        rmSetPlacementTeam(0);
+	     
+	     if (sectionChance == 1)
+             rmSetPlacementSection(0.67, 0.83);
+	     else if (sectionChance == 2)
+             rmSetPlacementSection(0.65, 0.85);
+	     else if (sectionChance == 3)
+             rmSetPlacementSection(0.63, 0.87);
+	     else if (sectionChance == 4)
+             rmSetPlacementSection(0.61, 0.89);
+	     else if (sectionChance == 5)
+             rmSetPlacementSection(0.60, 0.84); // cc
+	     else if (sectionChance == 6)
+             rmSetPlacementSection(0.59, 0.81); // cc
+	     else if (sectionChance == 7)
+             rmSetPlacementSection(0.66, 0.90); // c
+	     else if (sectionChance == 8)
+             rmSetPlacementSection(0.69, 0.91); // c
+	     else if (sectionChance == 9)
+             rmSetPlacementSection(0.68, 0.88); // n
+	     else if (sectionChance == 10)
+             rmSetPlacementSection(0.72, 0.90); // n
+	     else if (sectionChance == 11)
+             rmSetPlacementSection(0.62, 0.82); // s
+	     else if (sectionChance == 12)
+             rmSetPlacementSection(0.60, 0.78); // s
+
+ 	     if (distChance == 1)
+      	 rmPlacePlayersCircular(0.32, 0.33, 0.0);
+  	     else if (distChance == 2)
+  	       rmPlacePlayersCircular(0.31, 0.32, 0.0);
+ 	     else if (distChance == 3)
+              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	     else if (distChance == 4)
+	        rmPlacePlayersCircular(0.36, 0.37, 0.0);
+           else if (distChance == 5)
+              rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	     else if (distChance == 6)
+	        rmPlacePlayersCircular(0.34, 0.35, 0.0);
+         }
+         else if (axisChance == 2)
+         {
+	      if (sectionChance == 9)
+	      {
+		    wBigIs = 1;
+	      }
+	      if (sectionChance == 10)
+	      {
+		    wEdgeIs = 1;
+	      }
+	      if (sectionChance == 11)
+	      {
+		    eBigIs = 1;
+	      }
+	      if (sectionChance == 12)
+	      {
+		    eEdgeIs = 1;
+	      }
+
+	    if (playerSide == 1)
+		 rmSetPlacementTeam(0);
+          else if (playerSide == 2)
+		 rmSetPlacementTeam(1);
+
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.42, 0.58);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.40, 0.60);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.38, 0.62);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.36, 0.64);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.35, 0.59); // toward CC
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.34, 0.56); // toward CC
+	    else if (sectionChance == 7)
+             rmSetPlacementSection(0.41, 0.65); // toward C
+	    else if (sectionChance == 8)
+             rmSetPlacementSection(0.44, 0.66); // toward C
+	    else if (sectionChance == 9)
+             rmSetPlacementSection(0.37, 0.57); // toward E
+	    else if (sectionChance == 10)
+             rmSetPlacementSection(0.35, 0.50); // toward E
+	    else if (sectionChance == 11)
+             rmSetPlacementSection(0.43, 0.63); // toward W
+	    else if (sectionChance == 12)
+             rmSetPlacementSection(0.48, 0.65); // toward W
+
+ 	     if (distChance == 1)
+      	 rmPlacePlayersCircular(0.32, 0.33, 0.0);
+  	     else if (distChance == 2)
+  	       rmPlacePlayersCircular(0.31, 0.32, 0.0);
+ 	     else if (distChance == 3)
+              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	     else if (distChance == 4)
+	        rmPlacePlayersCircular(0.36, 0.37, 0.0);
+           else if (distChance == 5)
+              rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	     else if (distChance == 6)
+	        rmPlacePlayersCircular(0.34, 0.35, 0.0);
+
+	    if (playerSide == 1)
+		 rmSetPlacementTeam(1);
+          else if (playerSide == 2)
+		 rmSetPlacementTeam(0);
+	    
+	    if (sectionChance == 1)
+             rmSetPlacementSection(0.92, 0.08);
+	    else if (sectionChance == 2)
+             rmSetPlacementSection(0.90, 0.10);
+	    else if (sectionChance == 3)
+             rmSetPlacementSection(0.88, 0.12);
+	    else if (sectionChance == 4)
+             rmSetPlacementSection(0.86, 0.14);
+	    else if (sectionChance == 5)
+             rmSetPlacementSection(0.85, 0.09); // toward CC
+	    else if (sectionChance == 6)
+             rmSetPlacementSection(0.84, 0.06); // toward CC
+	    else if (sectionChance == 7)
+             rmSetPlacementSection(0.91, 0.15); // toward C
+	    else if (sectionChance == 8)
+             rmSetPlacementSection(0.94, 0.16); // toward C
+	    else if (sectionChance == 9)
+             rmSetPlacementSection(0.93, 0.13); // toward E
+	    else if (sectionChance == 10)
+             rmSetPlacementSection(0.00, 0.15); // toward E
+	    else if (sectionChance == 11)
+             rmSetPlacementSection(0.87, 0.07); // toward W
+	    else if (sectionChance == 12)
+             rmSetPlacementSection(0.85, 0.02); // toward W
+
+ 	     if (distChance == 1)
+      	 rmPlacePlayersCircular(0.32, 0.33, 0.0);
+  	     else if (distChance == 2)
+  	       rmPlacePlayersCircular(0.31, 0.32, 0.0);
+ 	     else if (distChance == 3)
+              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	     else if (distChance == 4)
+	        rmPlacePlayersCircular(0.36, 0.37, 0.0);
+           else if (distChance == 5)
+              rmPlacePlayersCircular(0.33, 0.34, 0.0);
+	     else if (distChance == 6)
+	        rmPlacePlayersCircular(0.34, 0.35, 0.0);
+         }	  
+        }
+        else if (cNumberNonGaiaPlayers < 7) // for 2 teams, for 5-6 players  
+        {
+	    sectionChance = rmRandInt(1,15);
+	    if (sectionChance < 13)
+  	    {
+	       directionChance = 0;
+
+             if (axisChance == 1)
+             { 
+	        if (sectionChance == 9)
+	        {
+	          if (twoChance == 1)
+		     sBigIs = 1;
+	          else if (twoChance == 2)
+	 	     sEdgeIs = 1;
+	        }
+	        if (sectionChance == 10)
+	        {
+	          if (twoChance == 1)
+		     sBigIs = 1;
+	          else if (twoChance == 2)
+	 	     sEdgeIs = 1;
+	        }
+	        if (sectionChance == 11)
+	        {
+	          if (twoChance == 1)
+		     nBigIs = 1;
+	          else if (twoChance == 2)
+	 	     nEdgeIs = 1;
+	        }
+	        if (sectionChance == 12)
+	        {
+	          if (twoChance == 1)
+		     nBigIs = 1;
+	          else if (twoChance == 2)
+	 	     nEdgeIs = 1;
+	        }
+ 
+             if (playerSide == 1)
+	  	    rmSetPlacementTeam(0);
+             else if (playerSide == 2)
+		    rmSetPlacementTeam(1);
+
+	       if (sectionChance == 1)
+                rmSetPlacementSection(0.13, 0.37);
+	       else if (sectionChance == 2)
+                rmSetPlacementSection(0.12, 0.38);
+	       else if (sectionChance == 3)
+                rmSetPlacementSection(0.11, 0.39);
+	       else if (sectionChance == 4)
+                rmSetPlacementSection(0.10, 0.40);
+	       else if (sectionChance == 5)
+                rmSetPlacementSection(0.1, 0.34); // toward CC
+	       else if (sectionChance == 6)
+                rmSetPlacementSection(0.09, 0.31); // toward CC
+	       else if (sectionChance == 7)
+                rmSetPlacementSection(0.16, 0.4); // toward C
+	       else if (sectionChance == 8)
+                rmSetPlacementSection(0.19, 0.41); // toward C
+	       else if (sectionChance == 9)
+                rmSetPlacementSection(0.12, 0.32); // toward N
+	       else if (sectionChance == 10)
+	  	    rmSetPlacementSection(0.07, 0.27); // toward N
+	       else if (sectionChance == 11)
+                rmSetPlacementSection(0.18, 0.38); // toward S
+	       else if (sectionChance == 12)
+                rmSetPlacementSection(0.16, 0.40); // toward S
+
+             if (distChance == 1)
+         	    rmPlacePlayersCircular(0.30, 0.31, 0.0);
+             else if (distChance == 2)
+                rmPlacePlayersCircular(0.31, 0.32, 0.0);
+        	 else if (distChance == 3)
+                rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		 else if (distChance == 4)
+         	    rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	 else if (distChance == 5)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		 else if (distChance == 6)
+	   	    rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.37, 0.38, 0.0);
+
+	       if (playerSide == 1)
+		    rmSetPlacementTeam(1);
+             else if (playerSide == 2)
+		    rmSetPlacementTeam(0);
+
+	       if (sectionChance == 1)
+                rmSetPlacementSection(0.63, 0.87);
+	       else if (sectionChance == 2)
+                rmSetPlacementSection(0.62, 0.88);
+	       else if (sectionChance == 3)
+                rmSetPlacementSection(0.61, 0.89);
+	       else if (sectionChance == 4)
+                rmSetPlacementSection(0.60, 0.90);
+	       else if (sectionChance == 5)
+                rmSetPlacementSection(0.60, 0.84); // cc
+	       else if (sectionChance == 6)
+                rmSetPlacementSection(0.59, 0.81); // cc
+	       else if (sectionChance == 7)
+                rmSetPlacementSection(0.66, 0.90); // c
+	       else if (sectionChance == 8)
+                rmSetPlacementSection(0.69, 0.91); // c
+	       else if (sectionChance == 9)
+                rmSetPlacementSection(0.68, 0.88); // n
+	       else if (sectionChance == 10)
+                rmSetPlacementSection(0.73, 0.93); // n
+	       else if (sectionChance == 11)
+                rmSetPlacementSection(0.62, 0.82); // s
+	       else if (sectionChance == 12)
+                rmSetPlacementSection(0.60, 0.84); // s
+
+             if (distChance == 1)
+         	    rmPlacePlayersCircular(0.30, 0.31, 0.0);
+             else if (distChance == 2)
+                rmPlacePlayersCircular(0.31, 0.32, 0.0);
+        	 else if (distChance == 3)
+                rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		 else if (distChance == 4)
+         	    rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	 else if (distChance == 5)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		 else if (distChance == 6)
+	   	    rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.37, 0.38, 0.0);
+             }
+             else if (axisChance == 2)
+             {
+	        if (sectionChance == 9)
+	        {
+	          if (twoChance == 1)
+		     wBigIs = 1;
+	          else if (twoChance == 2)
+	 	     wEdgeIs = 1;
+	        }
+	        if (sectionChance == 10)
+	        {
+	          if (twoChance == 1)
+		     wBigIs = 1;
+	          else if (twoChance == 2)
+	 	     wEdgeIs = 1;
+	        }
+	        if (sectionChance == 11)
+	        {
+	          if (twoChance == 1)
+		     eBigIs = 1;
+	          else if (twoChance == 2)
+	 	     eEdgeIs = 1;
+	        }
+	        if (sectionChance == 12)
+	        {
+	          if (twoChance == 1)
+		     eBigIs = 1;
+	          else if (twoChance == 2)
+	 	     eEdgeIs = 1;
+	        }
+
+	       if (playerSide == 1)
+		    rmSetPlacementTeam(0);
+             else if (playerSide == 2)
+		    rmSetPlacementTeam(1);
+
+	       if (sectionChance == 1)
+                rmSetPlacementSection(0.38, 0.62);
+	       else if (sectionChance == 3)
+                rmSetPlacementSection(0.37, 0.63);
+	       else if (sectionChance == 2)
+                rmSetPlacementSection(0.36, 0.64);
+	       else if (sectionChance == 4)
+                rmSetPlacementSection(0.35, 0.65);
+	       else if (sectionChance == 5)
+                rmSetPlacementSection(0.35, 0.59); // toward CC
+	       else if (sectionChance == 6)
+                rmSetPlacementSection(0.34, 0.56); // toward CC
+	       else if (sectionChance == 7)
+                rmSetPlacementSection(0.41, 0.65); // toward C
+	       else if (sectionChance == 8)
+                rmSetPlacementSection(0.44, 0.66); // toward C
+	       else if (sectionChance == 9)
+                rmSetPlacementSection(0.37, 0.57); // toward E
+	       else if (sectionChance == 10)
+                rmSetPlacementSection(0.32, 0.52); // toward E
+	       else if (sectionChance == 11)
+                rmSetPlacementSection(0.43, 0.63); // toward W
+	       else if (sectionChance == 12)
+                rmSetPlacementSection(0.41, 0.65); // toward W
+
+             if (distChance == 1)
+         	    rmPlacePlayersCircular(0.30, 0.31, 0.0);
+             else if (distChance == 2)
+                rmPlacePlayersCircular(0.31, 0.32, 0.0);
+        	 else if (distChance == 3)
+                rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		 else if (distChance == 4)
+         	    rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	 else if (distChance == 5)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		 else if (distChance == 6)
+	   	    rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.37, 0.38, 0.0);
+   
+	       if (playerSide == 1)
+	   	    rmSetPlacementTeam(1);
+             else if (playerSide == 2)
+		    rmSetPlacementTeam(0);
+
+	       if (sectionChance == 1)
+                rmSetPlacementSection(0.88, 0.12);
+	       else if (sectionChance == 2)
+                rmSetPlacementSection(0.87, 0.13);
+	       else if (sectionChance == 3)
+                rmSetPlacementSection(0.86, 0.14);
+   	       else if (sectionChance == 4)
+                rmSetPlacementSection(0.85, 0.15);
+	       else if (sectionChance == 5)
+                rmSetPlacementSection(0.85, 0.09); // toward CC
+	       else if (sectionChance == 6)
+                rmSetPlacementSection(0.84, 0.06); // toward CC
+	       else if (sectionChance == 7)
+                rmSetPlacementSection(0.91, 0.15); // toward C
+	       else if (sectionChance == 8)
+                rmSetPlacementSection(0.94, 0.16); // toward C
+	       else if (sectionChance == 9)
+                rmSetPlacementSection(0.93, 0.13); // toward E
+	       else if (sectionChance == 10)
+                rmSetPlacementSection(0.98, 0.18); // toward E
+	       else if (sectionChance == 11)
+                rmSetPlacementSection(0.87, 0.07); // toward W
+	       else if (sectionChance == 12)
+                rmSetPlacementSection(0.85, 0.09); // toward W
+
+             if (distChance == 1)
+         	    rmPlacePlayersCircular(0.30, 0.31, 0.0);
+             else if (distChance == 2)
+                rmPlacePlayersCircular(0.31, 0.32, 0.0);
+        	 else if (distChance == 3)
+                rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		 else if (distChance == 4)
+         	    rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	 else if (distChance == 5)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		 else if (distChance == 6)
+	   	    rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.37, 0.38, 0.0);
+	       } 
+	    }
+	    else if (sectionChance > 12)
+          {
+		 directionChance = 0;
+             if (distChance == 1)
+         	    rmPlacePlayersCircular(0.30, 0.31, 0.0);
+             else if (distChance == 2)
+                rmPlacePlayersCircular(0.31, 0.32, 0.0);
+        	 else if (distChance == 3)
+                rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		 else if (distChance == 4)
+         	    rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	 else if (distChance == 5)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		 else if (distChance == 6)
+	   	    rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.37, 0.38, 0.0);
+          }
+        }
+        else  // for 2 teams, for over 6 players
+        {  
+	     sectionChance = rmRandInt(1,7);
+	     if (sectionChance > 5) // chances 6 and 7, opp sides
+           {
+              if (axisChance == 1)
+              {
+                 if (playerSide == 1)
+	  	       rmSetPlacementTeam(0);
+                 else if (playerSide == 2)
+		       rmSetPlacementTeam(1);
+                 rmSetPlacementSection(0.11, 0.39);
+
+ 	           if (distChance == 1)
+	              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	           else if (distChance == 2)
+	              rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	           else if (distChance == 3)
+	              rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	           else if (distChance == 4)
+	              rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	           else if (distChance == 5)
+	              rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	           else if (distChance == 6)
+	              rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	           else if (distChance == 7)
+	              rmPlacePlayersCircular(0.42, 0.43, 0.0);
+
+	           if (playerSide == 1)
+			 rmSetPlacementTeam(1);
+                 else if (playerSide == 2)
+			 rmSetPlacementTeam(0);
+                 rmSetPlacementSection(0.61, 0.89);
+
+ 	           if (distChance == 1)
+	              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	           else if (distChance == 2)
+	              rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	           else if (distChance == 3)
+	              rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	           else if (distChance == 4)
+	              rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	           else if (distChance == 5)
+	              rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	           else if (distChance == 6)
+	              rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	           else if (distChance == 7)
+	              rmPlacePlayersCircular(0.42, 0.43, 0.0);
+              }
+              else if (axisChance == 2)
+              {
+                 if (playerSide == 1)
+	  	       rmSetPlacementTeam(0);
+                 else if (playerSide == 2)
+		       rmSetPlacementTeam(1);
+                 rmSetPlacementSection(0.36, 0.64);
+
+ 	           if (distChance == 1)
+	              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	           else if (distChance == 2)
+	              rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	           else if (distChance == 3)
+	              rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	           else if (distChance == 4)
+	              rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	           else if (distChance == 5)
+	              rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	           else if (distChance == 6)
+	              rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	           else if (distChance == 7)
+	              rmPlacePlayersCircular(0.42, 0.43, 0.0);
+
+	           if (playerSide == 1)
+			 rmSetPlacementTeam(1);
+                 else if (playerSide == 2)
+			 rmSetPlacementTeam(0);
+                 rmSetPlacementSection(0.86, 0.14);
+
+ 	           if (distChance == 1)
+	              rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	           else if (distChance == 2)
+	              rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	           else if (distChance == 3)
+	              rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	           else if (distChance == 4)
+	              rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	           else if (distChance == 5)
+	              rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	           else if (distChance == 6)
+	              rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	           else if (distChance == 7)
+	              rmPlacePlayersCircular(0.42, 0.43, 0.0);
+              }   
+           }  
+	     else if (sectionChance == 1) // 0.7 of map, gap to E
+           {
+		 eBigIs = 1;	
+             rmSetPlacementSection(0.39, 0.11);
+ 	       if (distChance == 1)
+	          rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	       else if (distChance == 2)
+	          rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	       else if (distChance == 3)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	       else if (distChance == 4)
+	          rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 5)
+	          rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	       else if (distChance == 6)
+	          rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.42, 0.43, 0.0);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+		 }
+		 else
+	       {
+		    axisChance = 2;		     
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+                   directionChance = 2;
+		 }
+           }
+	     else if (sectionChance == 2) // 0.7 of map, gap to W
+           {
+		 wBigIs = 1;	
+             rmSetPlacementSection(0.89, 0.61);
+ 	       if (distChance == 1)
+	          rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	       else if (distChance == 2)
+	          rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	       else if (distChance == 3)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	       else if (distChance == 4)
+	          rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 5)
+	          rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	       else if (distChance == 6)
+	          rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.42, 0.43, 0.0);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    axisChance = 1;
+		    directionChance = 0;
+		 }
+		 else
+	       {
+		    axisChance = 2;		     
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+                   directionChance = 1;
+		 }
+           }
+           else if (sectionChance == 3) // 0.7 of map, gap to S
+           {
+		 sBigIs = 1;	
+             rmSetPlacementSection(0.64, 0.36);
+ 	       if (distChance == 1)
+	          rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	       else if (distChance == 2)
+	          rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	       else if (distChance == 3)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	       else if (distChance == 4)
+	          rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 5)
+	          rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	       else if (distChance == 6)
+	          rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.42, 0.43, 0.0);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+		 }
+		 else
+	       {
+		    axisChance = 1;		     
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+                   directionChance = 1;
+		 }
+           }
+           else if (sectionChance == 4) // 0.7 of map, gap to N
+           {
+		 nBigIs = 1;	
+             rmSetPlacementSection(0.14, 0.86);
+ 	       if (distChance == 1)
+	          rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	       else if (distChance == 2)
+	          rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	       else if (distChance == 3)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	       else if (distChance == 4)
+	          rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 5)
+	          rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	       else if (distChance == 6)
+	          rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.42, 0.43, 0.0);
+		 if (rmRandInt(1,4) == 1)
+		 {
+		    axisChance = 2;
+		    directionChance = 0;
+		 }
+		 else
+	       {
+		    axisChance = 1;		     
+		    if (rmRandInt(1,3) == 1)
+		       directionChance = 0;
+		    else
+                   directionChance = 2;
+             }
+           }
+           else if (sectionChance == 5) // another circular chance
+	     {
+	       directionChance = 0;
+ 	       if (distChance == 1)
+	          rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	       else if (distChance == 2)
+	          rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	       else if (distChance == 3)
+	          rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	       else if (distChance == 4)
+	          rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	       else if (distChance == 5)
+	          rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	       else if (distChance == 6)
+	          rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	       else if (distChance == 7)
+	          rmPlacePlayersCircular(0.42, 0.43, 0.0);
+	     }
+        }
+      }
+      else  // for FFA or over 2 teams
+      {
+	   sectionChance = rmRandInt(1,5);
+	   if (sectionChance > 4) // another chance at circular placement
+	   {
+            directionChance = 0;
+            if (cNumberNonGaiaPlayers < 6) //FFA 4 or 5 pl
+            {
+               if (distChance == 1)
+         	      rmPlacePlayersCircular(0.30, 0.31, 0.0);
+               else if (distChance == 2)
+                  rmPlacePlayersCircular(0.31, 0.32, 0.0);
+      	   else if (distChance == 3)
+                  rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		   else if (distChance == 4)
+         	      rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	   else if (distChance == 5)
+	            rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		   else if (distChance == 6)
+	   	      rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	         else if (distChance == 7)
+	            rmPlacePlayersCircular(0.37, 0.38, 0.0);
+            }
+            else  // over 5 FFA 
+            { 
+ 	         if (distChance == 1)
+	            rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	         else if (distChance == 2)
+	            rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	         else if (distChance == 3)
+	            rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	         else if (distChance == 4)
+	            rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	         else if (distChance == 5)
+	            rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	         else if (distChance == 6)
+	            rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	         else if (distChance == 7)
+                  rmPlacePlayersCircular(0.42, 0.43, 0.0);
+            }
+	   }
+         else 
+         {
+	      if (sectionChance == 1) // 0.7 of map, gap to E	
+		{
+		    if (threeChance == 1)
+			eBigIs = 1;
+		    else if (threeChance == 2)
+		    {
+		       axisChance = 1;
+		       directionChance = 0;
+		    }
+		    else
+	          {
+		       axisChance = 2;		     
+		       if (rmRandInt(1,3) == 1)
+		          directionChance = 0;
+		       else
+                      directionChance = 2;
+		    }
+                rmSetPlacementSection(0.39, 0.11);
+		}
+	      else if (sectionChance == 2) // 0.7 of map, gap to W
+            {
+		    if (threeChance == 1)
+			wBigIs = 1;
+		    else if (threeChance == 2)
+		   {
+		      axisChance = 1;
+		      directionChance = 0;
+		   }
+		   else
+	         {
+		      axisChance = 2;		     
+		      if (rmRandInt(1,3) == 1)
+		         directionChance = 0;
+		      else
+                     directionChance = 1;
+		   }
+               rmSetPlacementSection(0.89, 0.61);
+		}
+            else if (sectionChance == 3) // 0.7 of map, gap to S
+            {	
+		    if (threeChance == 1)
+			sBigIs = 1;
+		    else if (threeChance == 2)
+		   {
+		      axisChance = 2;
+		      directionChance = 0;
+		   }
+		   else
+	         {
+		      axisChance = 1;		     
+		      if (rmRandInt(1,3) == 1)
+		         directionChance = 0;
+		      else
+                     directionChance = 1;
+		   }
+               rmSetPlacementSection(0.64, 0.36);
+            }
+            else if (sectionChance == 4) // 0.7 of map, gap to N
+            {	
+		    if (threeChance == 1)
+			nBigIs = 1;
+		    else if (threeChance == 2)
+		   {
+		      axisChance = 2;
+		      directionChance = 0;
+		   }
+		   else
+	         {
+		      axisChance = 1;		     
+		      if (rmRandInt(1,3) == 1)
+		         directionChance = 0;
+		      else
+                     directionChance = 2;
+               }
+               rmSetPlacementSection(0.14, 0.86);
+            }  
+		if (cNumberNonGaiaPlayers < 6)
+		{
+               if (distChance == 1)
+         	      rmPlacePlayersCircular(0.30, 0.31, 0.0);
+               else if (distChance == 2)
+                  rmPlacePlayersCircular(0.31, 0.32, 0.0);
+      	   else if (distChance == 3)
+                  rmPlacePlayersCircular(0.32, 0.33, 0.0);
+		   else if (distChance == 4)
+         	      rmPlacePlayersCircular(0.33, 0.34, 0.0);
+      	   else if (distChance == 5)
+	            rmPlacePlayersCircular(0.34, 0.35, 0.0);
+		   else if (distChance == 6)
+	   	      rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	         else if (distChance == 7)
+	            rmPlacePlayersCircular(0.37, 0.38, 0.0);
+		}
+		else
+		{
+ 	         if (distChance == 1)
+	            rmPlacePlayersCircular(0.30, 0.31, 0.0);
+	         else if (distChance == 2)
+	            rmPlacePlayersCircular(0.32, 0.33, 0.0);
+	         else if (distChance == 3)
+	            rmPlacePlayersCircular(0.34, 0.35, 0.0);
+	         else if (distChance == 4)
+	            rmPlacePlayersCircular(0.36, 0.37, 0.0);
+	         else if (distChance == 5)
+	            rmPlacePlayersCircular(0.38, 0.39, 0.0);
+	         else if (distChance == 6)
+	            rmPlacePlayersCircular(0.40, 0.41, 0.0);
+	         else if (distChance == 7)
+                  rmPlacePlayersCircular(0.42, 0.43, 0.0);
+		}
+         }
+      }
+   }
+}
+
+// Set up player areas.
+   float playerFraction=rmAreaTilesToFraction(7000 + cNumberNonGaiaPlayers*150);
+   float randomIslandChance=rmRandFloat(0, 1);
+   for(i=1; <cNumberPlayers)
+   {
+      int id=rmCreateArea("Player"+i);
+      rmSetPlayerArea(i, id);
+      rmSetAreaSize(id, 0.95*playerFraction, 1.05*playerFraction);
+      rmAddAreaToClass(id, classPlayer);
+	if (noHeight == 1)
+         rmSetAreaBaseHeight(id, 0.5);
+	else
+         rmSetAreaBaseHeight(id, baseHeight);
+      rmSetAreaSmoothDistance(id, 15);
+	rmSetAreaCoherence(id, 0.8);
+      rmSetAreaElevationVariation(id, 1.0);
+      rmSetAreaElevationMinFrequency(id, 0.09);
+      rmSetAreaElevationOctaves(id, 3);
+      rmSetAreaElevationPersistence(id, 0.2);
+	rmSetAreaElevationNoiseBias(id, 1);
+      rmAddAreaConstraint(id, avoidCenter); 
+      rmAddAreaConstraint(id, mediumPlayerConstraint);
+      rmAddAreaConstraint(id, circleEdgeConstraint);
+      rmSetAreaLocPlayer(id, i);
+      rmSetAreaMix(id, baseType);
+   }
+   rmBuildAllAreas();
+
+// Text
+   rmSetStatusText("",0.25);
+
+// Starting TCs and units 		
+   int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
+   rmSetObjectDefMaxDistance(startingUnits, 10.0);
+   rmAddObjectDefConstraint(startingUnits, avoidAll);
+
+   int startingTCID= rmCreateObjectDef("startingTC");
+   rmSetObjectDefMaxDistance(startingTCID, 10.0);
+   rmAddObjectDefConstraint(startingTCID, avoidAll);
+   rmAddObjectDefConstraint(startingTCID, longAvoidImpassableLand);               
+   if ( rmGetNomadStart())
+   {
+	rmAddObjectDefItem(startingTCID, "CoveredWagon", 1, 0.0);
+   }
+   else
+   {
+      rmAddObjectDefItem(startingTCID, "TownCenter", 1, 0.0);
+   }
+
+   int startingWood= rmCreateObjectDef("startingWood");
+   rmSetObjectDefMinDistance(startingWood, 6.0);
+   rmSetObjectDefMaxDistance(startingWood, 9.0);
+   rmAddObjectDefConstraint(startingWood, avoidAll);
+   rmAddObjectDefItem(startingWood, "CrateOfWood", 2, 0.0);
+
+   for(i=1; <cNumberPlayers)
+   {	
+      rmPlaceObjectDefAtLoc(startingTCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+      rmPlaceObjectDefAtLoc(startingWood, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+
+	vector TCLoc = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startingTCID, i));
+      if(ypIsAsian(i) && rmGetNomadStart() == false)
+        rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+   }
+
+// Big or Center Island
+   int bigIslandID=rmCreateArea("big island");
+   rmSetAreaSize(bigIslandID, rmAreaTilesToFraction(5000 + cNumberNonGaiaPlayers*500), rmAreaTilesToFraction(5500 + cNumberNonGaiaPlayers*500));
+ if (wBigIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.28, 0.5);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.12, 0.5, 0.44, 0.5);
+ }
+ else if (wEdgeIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.2, 0.5);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.19, 0.5, 0.28, 0.69);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.19, 0.5, 0.28, 0.31);
+ }
+ else if (eBigIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.72, 0.5);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.56, 0.5, 0.88, 0.5);
+ } 
+ else if (eEdgeIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.81, 0.5);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.82, 0.5, 0.72, 0.69);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.82, 0.5, 0.72, 0.31);
+ } 
+ else if (sBigIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.5, 0.28);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.12, 0.5, 0.44);
+ }
+ else if (sEdgeIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.5, 0.2);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.19, 0.69, 0.28);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.19, 0.31, 0.28);
+ }
+ else if (nBigIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.5, 0.72);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.88, 0.5, 0.56);
+ }
+ else if (nEdgeIs == 1)
+ {
+   rmSetAreaLocation(bigIslandID, 0.5, 0.8);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.81, 0.69, 0.72);
+   rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.81, 0.31, 0.72);
+ } 
+ else
+ {
+   centeredBigIsland = 1;
+   rmSetAreaLocation(bigIslandID, 0.5, 0.5);
+   if (axisChance == 1)
+   {
+	   if (directionChance == 1)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.28, 0.5, 0.55);           
+	   else if (directionChance == 2)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.72, 0.5, 0.45);
+	   else if (directionChance == 0)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.38, 0.5, 0.62);
+	   if (variantChance == 1)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.45, 0.5, 0.5, 0.5);  
+	   else
+           rmAddAreaInfluenceSegment(bigIslandID, 0.55, 0.5, 0.5, 0.5);  
+
+   }
+   else if (axisChance == 2)
+   {
+	   if (directionChance == 1)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.55, 0.5, 0.28, 0.5);
+	   else if (directionChance == 2)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.45, 0.5, 0.72, 0.5);
+	   else if (directionChance == 0)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.38, 0.5, 0.62, 0.5);
+	   if (variantChance == 1)
+           rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.45, 0.5, 0.5);  
+	   else
+           rmAddAreaInfluenceSegment(bigIslandID, 0.5, 0.55, 0.5, 0.5);  
+   }
+ }
+   rmSetAreaMix(bigIslandID, baseType);
+   rmSetAreaWarnFailure(bigIslandID, false);
+   rmAddAreaConstraint(bigIslandID, playerConstraint); 
+   rmAddAreaToClass(bigIslandID, classSettlementIsland);
+   rmAddAreaToClass(bigIslandID, classCenterIsland);
+   rmAddAreaToClass(bigIslandID, classGoldIsland);
+   rmSetAreaCoherence(bigIslandID, 0.5);
+   rmSetAreaSmoothDistance(bigIslandID, 12);
+   rmSetAreaHeightBlend(bigIslandID, 2);
+   rmSetAreaBaseHeight(bigIslandID, baseHeight);
+   rmBuildArea(bigIslandID);
+
+// Extra Big Island Land
+   int extraCount=cNumberNonGaiaPlayers + 2;  // num players plus some extra
+   if (cNumberNonGaiaPlayers > 6)
+      extraCount=cNumberNonGaiaPlayers + 1;
+  
+   for(i=0; <extraCount)
+   {
+      int extraLandID=rmCreateArea("extraland"+i);
+      rmSetAreaSize(extraLandID, rmAreaTilesToFraction(500 + cNumberNonGaiaPlayers*100), rmAreaTilesToFraction(600 + cNumberNonGaiaPlayers*120));
+      rmSetAreaMix(extraLandID, baseType);
+      rmSetAreaWarnFailure(extraLandID, false);
+	if ((eBigIs == 1) || (eEdgeIs == 1))
+  	   rmAddAreaConstraint(extraLandID, Eastward);
+	else if ((wBigIs == 1) || (wEdgeIs == 1))
+  	   rmAddAreaConstraint(extraLandID, Westward);
+	else if ((nBigIs == 1) || (nEdgeIs == 1))
+  	   rmAddAreaConstraint(extraLandID, Northward);
+	else if ((sBigIs == 1) || (sEdgeIs == 1))
+  	   rmAddAreaConstraint(extraLandID, Southward);
+	else
+	{
+      if (cNumberNonGaiaPlayers > 5)
+         rmAddAreaConstraint(extraLandID, centralExtraLandConstraint2);
+	else	
+         rmAddAreaConstraint(extraLandID, centralExtraLandConstraint);
+	}
+      rmAddAreaConstraint(extraLandID, playerConstraint); 
+      rmAddAreaToClass(extraLandID, classCenterIsland);
+      rmAddAreaToClass(extraLandID, classGoldIsland);
+      rmSetAreaCoherence(extraLandID, 0.55);
+      rmSetAreaSmoothDistance(extraLandID, 20);
+      rmSetAreaHeightBlend(extraLandID, 2);
+      rmSetAreaBaseHeight(extraLandID, baseHeight);
+      rmBuildArea(extraLandID);
+   }
+
+// Text
+   rmSetStatusText("",0.30);
+
+// Trade Route
+int tradeRouteID = rmCreateTradeRoute();
+if (wBigIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.13, 0.5);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.24, 0.525);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.34, 0.475);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.43, 0.5);
+}
+else if (eBigIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.85, 0.5);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.76, 0.525);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.66, 0.475);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.57, 0.5);
+}
+else if (wEdgeIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.27, 0.68);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.2, 0.53);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.2, 0.47);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.27, 0.32);
+}
+else if (eEdgeIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.73, 0.68);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.81, 0.53);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.81, 0.47);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.73, 0.32);
+}
+else if (sBigIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.13);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.52, 0.24);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.48, 0.34);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.43);
+}
+else if (nBigIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.87);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.52, 0.76);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.48, 0.66);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.57);
+}
+else if (sEdgeIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.68, 0.27);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.53, 0.2);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.47, 0.2);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.32, 0.27);
+}
+else if (nEdgeIs == 1)
+{
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.68, 0.73);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.53, 0.81);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.47, 0.81);
+   rmAddTradeRouteWaypoint(tradeRouteID, 0.32, 0.73);
+}
+else
+{
+   if (axisChance == 1) 
+   {
+	if (directionChance == 1)
+	{
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.53);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.475, 0.48);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.525, 0.35);
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.3);
+	}
+	else if (directionChance == 2)
+	{
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.47);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.475, 0.52);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.525, 0.65);
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.7);
+	}
+	else if (directionChance == 0)
+	{
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.39);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.525, 0.44);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.475, 0.56);
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.61);
+	}
+   }
+   else if (axisChance == 2) 
+   {
+	if (directionChance == 1)
+	{
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.53, 0.5);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.48, 0.525);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.35, 0.475);
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.3, 0.5);
+	}
+	else if (directionChance == 2)
+	{
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.47, 0.5);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.52, 0.475);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.65, 0.525);
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.7, 0.5);
+	}
+	else if (directionChance == 0)
+	{
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.39, 0.5);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.44, 0.475);
+  	   rmAddTradeRouteWaypoint(tradeRouteID, 0.56, 0.525);
+	   rmAddTradeRouteWaypoint(tradeRouteID, 0.61, 0.5);
+	}
+   }
+}
+rmBuildTradeRoute(tradeRouteID, tradeRouteType);	
+
+// Trade sockets
+   int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+   rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+   rmSetObjectDefAllowOverlap(socketID, true);
+   rmAddObjectDefToClass(socketID, rmClassID("importantItem"));
+   rmSetObjectDefMinDistance(socketID, 0.0);
+   rmSetObjectDefMaxDistance(socketID, 6.0);
+
+   // add the meeting poles along the trade route.
+   rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+   vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.09);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   if(cNumberNonGaiaPlayers > 5)
+   {
+      socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.5);
+      rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+   }
+   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.91);
+   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
+
+// Text
+   rmSetStatusText("",0.35);
+
+// KOTH game mode - on the center Big Island
+
+  int myKingsHillAvoidImpassableLand=rmCreateTerrainDistanceConstraint("my kings hill avoids impassable land", "Land", false, 4.0);
+  int myKingsHillAvoidAll=rmCreateTypeDistanceConstraint("my kings hill avoids all", "all", 4.0);
+  int myKingsHillAvoidTradeRouteSocket = rmCreateTypeDistanceConstraint("my kings hill avoids trade route socket", "socketTradeRoute", 5.0);
+  int myKingsHillAvoidTradeRoute = rmCreateTradeRouteDistanceConstraint("my kings hill avoids trade route", 6.0);
+
+   if(rmGetIsKOTH())
+   {
+      int myKingsHillID = rmCreateObjectDef("MyKingsHill");
+      rmAddObjectDefItem(myKingsHillID, "ypKingsHill", 1, 0);
+      rmAddObjectDefToClass(myKingsHillID, rmClassID("importantItem"));
+      rmSetObjectDefMinDistance(myKingsHillID, 0.0);
+      rmSetObjectDefMaxDistance(myKingsHillID, 10);
+      rmAddObjectDefConstraint(myKingsHillID, myKingsHillAvoidImpassableLand);
+      rmAddObjectDefConstraint(myKingsHillID, myKingsHillAvoidAll);
+      rmAddObjectDefConstraint(myKingsHillID, myKingsHillAvoidTradeRouteSocket);
+      rmAddObjectDefConstraint(myKingsHillID, myKingsHillAvoidTradeRoute);
+      rmAddObjectDefConstraint(myKingsHillID, avoidWater10);
+	if (cNumberNonGaiaPlayers == 2)
+         rmAddObjectDefConstraint(myKingsHillID, farPlayerConstraint);
+	else
+         rmAddObjectDefConstraint(myKingsHillID, fartherPlayerConstraint);
+      // Place on big island
+      rmPlaceObjectDefInArea(myKingsHillID, 0, rmAreaID("big island"), 1);
+   }
+
+// Player Nuggets
+   int playerNuggetID=rmCreateObjectDef("player nugget");
+   rmAddObjectDefItem(playerNuggetID, "nugget", 1, 0.0);
+   rmAddObjectDefToClass(playerNuggetID, rmClassID("nuggets"));
+   rmSetObjectDefMinDistance(playerNuggetID, 35.0);
+   rmSetObjectDefMaxDistance(playerNuggetID, 55.0);
+   rmAddObjectDefConstraint(playerNuggetID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(playerNuggetID, avoidTradeRoute);
+   rmAddObjectDefConstraint(playerNuggetID, avoidSocket);
+   rmAddObjectDefConstraint(playerNuggetID, avoidNugget);
+   rmAddObjectDefConstraint(playerNuggetID, avoidNativesShort);
+   rmAddObjectDefConstraint(playerNuggetID, circleConstraint);
+   rmAddObjectDefConstraint(playerNuggetID, avoidWater10);
+
+   for(i=1; <cNumberPlayers)
+   {
+ 	rmSetNuggetDifficulty(1, 1);
+	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+ 	rmSetNuggetDifficulty(2, 2);
+	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+ 	rmSetNuggetDifficulty(3, 3);
+	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+	rmPlaceGroupingAtLoc(villageAID, 0, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+   }
+
+// Random Nuggets
+   int nuggetID= rmCreateObjectDef("nugget"); 
+   rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0);
+   rmAddObjectDefToClass(nuggetID, rmClassID("nuggets"));
+   rmAddObjectDefToClass(nuggetID, rmClassID("importantItem"));
+   rmSetObjectDefMinDistance(nuggetID, 0.0);
+   rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.1));
+   rmAddObjectDefConstraint(nuggetID, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(nuggetID, avoidNugget);
+   rmAddObjectDefConstraint(nuggetID, avoidStartingUnits);
+   rmAddObjectDefConstraint(nuggetID, avoidTradeRoute);
+   rmAddObjectDefConstraint(nuggetID, avoidSocket);
+   rmAddObjectDefConstraint(nuggetID, avoidAll);
+   rmAddObjectDefConstraint(nuggetID, farPlayerConstraint);
+   rmAddObjectDefConstraint(nuggetID, circleConstraint);
+   rmAddObjectDefConstraint(nuggetID, avoidWater10);
+
+// Start area trees 
+   int StartAreaTreeID=rmCreateObjectDef("starting trees");
+   rmAddObjectDefItem(StartAreaTreeID, treeType, 1, 0.0);
+   rmSetObjectDefMinDistance(StartAreaTreeID, 8);
+   rmSetObjectDefMaxDistance(StartAreaTreeID, 12);
+   rmAddObjectDefConstraint(StartAreaTreeID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(StartAreaTreeID, avoidTradeRoute);
+   rmAddObjectDefConstraint(StartAreaTreeID, avoidAll);
+   rmPlaceObjectDefPerPlayer(StartAreaTreeID, false, 4);
+
+// Mines
+   int silverType = -1;
+   silverType = rmRandInt(1,10);
+   int playerGoldID=rmCreateObjectDef("player silver closer");
+   rmAddObjectDefItem(playerGoldID, mineType, 1, 0.0);
+   rmAddObjectDefToClass(playerGoldID, rmClassID("all mines"));
+   rmAddObjectDefToClass(playerGoldID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(playerGoldID, avoidTradeRoute);
+   rmAddObjectDefConstraint(playerGoldID, avoidSocket);
+   rmAddObjectDefConstraint(playerGoldID, coinAvoidCoin);
+   rmAddObjectDefConstraint(playerGoldID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(playerGoldID, avoidAll);
+   rmAddObjectDefConstraint(playerGoldID, avoidWater10);
+   rmSetObjectDefMinDistance(playerGoldID, 12.0);
+   rmSetObjectDefMaxDistance(playerGoldID, 23.0);
+   rmPlaceObjectDefPerPlayer(playerGoldID, false, 1);
+
+   silverType = rmRandInt(1,10);
+   int GoldMediumID=rmCreateObjectDef("player silver med");
+   rmAddObjectDefItem(GoldMediumID, mineType, 1, 0.0);
+   rmAddObjectDefToClass(GoldMediumID, rmClassID("all mines"));
+   rmAddObjectDefToClass(GoldMediumID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(GoldMediumID, avoidTradeRoute);
+   rmAddObjectDefConstraint(GoldMediumID, avoidSocket);
+   rmAddObjectDefConstraint(GoldMediumID, coinAvoidCoin);
+   rmAddObjectDefConstraint(GoldMediumID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(GoldMediumID, avoidAll);
+   rmAddObjectDefConstraint(GoldMediumID, avoidWater10);
+   rmSetObjectDefMinDistance(GoldMediumID, 36.0);
+   rmSetObjectDefMaxDistance(GoldMediumID, 60.0);
+   rmPlaceObjectDefPerPlayer(GoldMediumID, false, 1);
+
+   silverType = rmRandInt(1,10);
+   int extraGoldID = rmCreateObjectDef("possible gold mines");
+   if (rmRandInt(1,2) == 1)
+      rmAddObjectDefItem(extraGoldID, "minegold", 1, 0.0);
+   else
+      rmAddObjectDefItem(extraGoldID, mineType, 1, 0.0);
+   rmAddObjectDefToClass(extraGoldID, rmClassID("all mines"));
+   rmAddObjectDefToClass(extraGoldID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(extraGoldID, avoidTradeRoute);
+   rmAddObjectDefConstraint(extraGoldID, avoidSocket);
+   rmAddObjectDefConstraint(extraGoldID, longAvoidCoin);
+   rmAddObjectDefConstraint(extraGoldID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(extraGoldID, avoidWater15);
+   rmAddObjectDefConstraint(extraGoldID, avoidAll);
+   rmSetObjectDefMinDistance(extraGoldID, 10.0);
+   rmSetObjectDefMaxDistance(extraGoldID, 75.0);
+
+   silverType = rmRandInt(1,10);
+   int extraSilverID = rmCreateObjectDef("extra silver mines");
+   rmAddObjectDefItem(extraSilverID, mineType, 1, 0.0);
+   rmAddObjectDefToClass(extraSilverID, rmClassID("all mines"));
+   rmAddObjectDefToClass(extraSilverID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(extraSilverID, avoidTradeRoute);
+   rmAddObjectDefConstraint(extraSilverID, avoidSocket);
+   rmAddObjectDefConstraint(extraSilverID, longAvoidCoin);
+   rmAddObjectDefConstraint(extraSilverID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(extraSilverID, avoidWater10);
+   rmAddObjectDefConstraint(extraSilverID, avoidAll);
+   rmSetObjectDefMinDistance(extraSilverID, 10.0);
+   rmSetObjectDefMaxDistance(extraSilverID, 75.0);
+
+// Berries
+   int berryNum = rmRandInt(2,5);
+   int StartBerryBushID=rmCreateObjectDef("starting berry bush");
+   rmAddObjectDefItem(StartBerryBushID, "BerryBush", rmRandInt(2,4), 4.0);
+   rmSetObjectDefMinDistance(StartBerryBushID, 10.0);
+   rmSetObjectDefMaxDistance(StartBerryBushID, 16.0);
+   rmAddObjectDefConstraint(StartBerryBushID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(StartBerryBushID, avoidAll);
+   if (placeBerries == 1)
+      rmPlaceObjectDefPerPlayer(StartBerryBushID, false, 1);
+   if (tropical == 1)
+   {
+      rmPlaceObjectDefPerPlayer(StartBerryBushID, false, 1);
+      rmPlaceObjectDefInArea(StartBerryBushID, 0, rmAreaID("big island"), rmRandInt(1,3));
+   }
+
+// Start area huntable
+   int deerNum = rmRandInt(4, 6);
+   int startPronghornID=rmCreateObjectDef("starting pronghorn");
+   rmAddObjectDefItem(startPronghornID, deerType, deerNum, 4.0);
+   rmAddObjectDefToClass(startPronghornID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(startPronghornID, 16);
+   rmSetObjectDefMaxDistance(startPronghornID, 22);
+   rmAddObjectDefConstraint(startPronghornID, avoidStartResource);
+   rmAddObjectDefConstraint(startPronghornID, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(startPronghornID, avoidAll);
+   rmSetObjectDefCreateHerd(startPronghornID, true);
+   rmPlaceObjectDefPerPlayer(startPronghornID, false, 1);
+
+// Extra tree clumps near players - to ensure fair access to wood
+   int extraTreesID=rmCreateObjectDef("extra trees");
+   rmAddObjectDefItem(extraTreesID, treeType, 7, 7.0);
+   rmSetObjectDefMinDistance(extraTreesID, 16);
+   rmSetObjectDefMaxDistance(extraTreesID, 20);
+   rmAddObjectDefConstraint(extraTreesID, avoidAll);
+   rmAddObjectDefConstraint(extraTreesID, avoidImportantItem);
+   rmAddObjectDefConstraint(extraTreesID, avoidCoin);
+   rmAddObjectDefConstraint(extraTreesID, avoidSocket);
+   rmAddObjectDefConstraint(extraTreesID, avoidTradeRoute);
+   rmPlaceObjectDefPerPlayer(extraTreesID, false, 1);
+
+// Second huntable
+   int deer2Num = rmRandInt(4, 7);
+   int farPronghornID=rmCreateObjectDef("far pronghorn");
+   rmAddObjectDefItem(farPronghornID, deer2Type, deer2Num, 4.0);
+   rmAddObjectDefToClass(farPronghornID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(farPronghornID, 42.0);
+   rmSetObjectDefMaxDistance(farPronghornID, 65.0);
+   rmAddObjectDefConstraint(farPronghornID, avoidStartResource);
+   rmAddObjectDefConstraint(farPronghornID, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(farPronghornID, avoidNativesShort);
+   rmAddObjectDefConstraint(farPronghornID, huntableConstraint);
+   rmAddObjectDefConstraint(farPronghornID, avoidAll);
+   rmSetObjectDefCreateHerd(farPronghornID, true);
+   rmPlaceObjectDefPerPlayer(farPronghornID, false, 1);
+
+// Sheep etc
+   int sheepID=rmCreateObjectDef("herdable animal");
+   rmAddObjectDefItem(sheepID, sheepType, 2, 4.0);
+   rmAddObjectDefToClass(sheepID, rmClassID("herdableFood"));
+   rmSetObjectDefMinDistance(sheepID, 35.0);
+   rmSetObjectDefMaxDistance(sheepID, 70.0);
+   rmAddObjectDefConstraint(sheepID, avoidSheep);
+   rmAddObjectDefConstraint(sheepID, avoidAll);
+   rmAddObjectDefConstraint(sheepID, avoidImpassableLand);
+   if (sheepChance > 0)
+   {
+      for(i=1; <cNumberPlayers)
+	{
+         rmPlaceObjectDefInArea(sheepID, 0, rmAreaID("player"+i), rmRandInt(2,3));
+	}
+   }
+
+// Big island huntable
+   deer2Num = rmRandInt(4, 7);
+   int huntableID=rmCreateObjectDef("huntable 1");
+   rmAddObjectDefItem(huntableID, centerHerdType, deer2Num, 5.0);
+   rmAddObjectDefToClass(huntableID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(huntableID, 42.0);
+   rmSetObjectDefMaxDistance(huntableID, 65.0);
+   rmAddObjectDefConstraint(huntableID, shortAvoidImpassableLand);
+   rmAddObjectDefConstraint(huntableID, avoidNativesShort);
+   rmAddObjectDefConstraint(huntableID, huntableConstraint);
+   rmAddObjectDefConstraint(huntableID, avoidAll);
+   rmSetObjectDefCreateHerd(huntableID, true);
+
+// More island animals
+   int centralHerdID=rmCreateObjectDef("central herd");  
+   rmAddObjectDefItem(centralHerdID, centerHerdType, rmRandInt(2,3), 4.0);
+   rmAddObjectDefToClass(centralHerdID, rmClassID("huntableFood"));
+   rmSetObjectDefMinDistance(centralHerdID, 0);
+   rmSetObjectDefMaxDistance(centralHerdID, rmXFractionToMeters(0.1));
+   rmAddObjectDefConstraint(centralHerdID, avoidTradeRoute);
+   rmAddObjectDefConstraint(centralHerdID, avoidImportantItem);
+   rmAddObjectDefConstraint(centralHerdID, avoidWater10);
+   rmAddObjectDefConstraint(centralHerdID, longPlayerConstraint);
+   rmAddObjectDefConstraint(centralHerdID, huntableConstraint);
+
+// Big island objects placement
+   rmSetGroupingMinDistance(villageAID, 0.0);
+   rmSetGroupingMaxDistance(villageAID, rmXFractionToMeters(0.05));
+   if (cNumberNonGaiaPlayers > 4)
+   {
+	if (rmRandInt(1,2) == 1)
+         rmPlaceGroupingInArea(villageDID, 0, rmAreaID("big island"), 1);
+	else
+         rmPlaceGroupingInArea(villageAID, 0, rmAreaID("big island"), 1);
+	if (rmRandInt(1,2) == 1)
+         rmPlaceGroupingInArea(villageDID, 0, rmAreaID("big island"), 1);
+	else
+         rmPlaceGroupingInArea(villageAID, 0, rmAreaID("big island"), 1);
+   }
+   else if (cNumberNonGaiaPlayers > 2)
+   {
+	if (rmRandInt(1,2) == 1)
+         rmPlaceGroupingInArea(villageDID, 0, rmAreaID("big island"), 1);
+	else
+         rmPlaceGroupingInArea(villageAID, 0, rmAreaID("big island"), 1);
+   }
+   else if (cNumberNonGaiaPlayers == 2)
+   {
+	if (rmRandInt(1,3) < 3)
+	{
+	   if (rmRandInt(1,2) == 1)
+            rmPlaceGroupingInArea(villageDID, 0, rmAreaID("big island"), 1);
+	   else
+            rmPlaceGroupingInArea(villageAID, 0, rmAreaID("big island"), 1);
+	}
+   }
+   rmPlaceObjectDefInArea(extraGoldID, 0, rmAreaID("big island"), 1);
+   rmPlaceObjectDefInArea(huntableID, 0, rmAreaID("big island"), 2);
+   rmSetNuggetDifficulty(3, 3);
+   rmPlaceObjectDefInArea(nuggetID, 0, rmAreaID("big island"), 1);
+   if (cNumberNonGaiaPlayers > 3)
+      rmPlaceObjectDefInArea(nuggetID, 0, rmAreaID("big island"), 1);
+   rmSetNuggetDifficulty(4, 4);
+   rmPlaceObjectDefInArea(nuggetID, 0, rmAreaID("big island"), 1);
+   rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("big island"), 1);
+   if (cNumberNonGaiaPlayers > 4)
+      rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("big island"), 1);
+   if (cNumberNonGaiaPlayers > 4)
+      rmPlaceObjectDefInArea(extraGoldID, 0, rmAreaID("big island"), 1);
+   if (sheepChance > 0)
+   {
+      rmPlaceObjectDefInArea(sheepID, 0, rmAreaID("big island"), rmRandInt(2,3));
+   }
+
+// Text
+   rmSetStatusText("",0.40);
+
+// Native Islands 
+   int chanceSetup = 0;
+   int constraintChance4 = 0;
+   if (cNumberNonGaiaPlayers > 4)
+      extraNativeIs = 1;
+   else if (cNumberNonGaiaPlayers > 2)
+   {
+	if (rmRandInt(1,3) > 1)
+	   extraNativeIs = 1;
+   }
+   else
+   {
+	if (rmRandInt(1,2) == 1)
+	   extraNativeIs = 1;
+   }
+
+   int nativeIsland1ID=rmCreateArea("native island 1");
+   rmSetAreaSize(nativeIsland1ID, rmAreaTilesToFraction(2500 + cNumberNonGaiaPlayers*200), rmAreaTilesToFraction(3000 + cNumberNonGaiaPlayers*280));
+   rmSetAreaMix(nativeIsland1ID, baseType);
+   rmAddAreaConstraint(nativeIsland1ID, centerIslandConstraint);
+   rmAddAreaConstraint(nativeIsland1ID, circleEdgeConstraint);
+   rmAddAreaConstraint(nativeIsland1ID, playerConstraint);
+   if  (centeredBigIsland == 1) 
+      rmAddAreaConstraint(nativeIsland1ID, nativeIslandConstraintLarge);
+   else
+      rmAddAreaConstraint(nativeIsland1ID, nativeIslandConstraint);
+   rmAddAreaToClass(nativeIsland1ID, classSettlementIsland);
+   rmAddAreaToClass(nativeIsland1ID, classNativeIsland);
+   rmAddAreaToClass(nativeIsland1ID, classGoldIsland);
+   rmSetAreaCoherence(nativeIsland1ID, 0.35);
+   rmSetAreaSmoothDistance(nativeIsland1ID, 12);
+   rmSetAreaHeightBlend(nativeIsland1ID, 2);
+   rmSetAreaBaseHeight(nativeIsland1ID, baseHeight);
+   rmBuildArea(nativeIsland1ID);
+
+   int nativeIsland2ID=rmCreateArea("native island 2");
+   rmSetAreaSize(nativeIsland2ID, rmAreaTilesToFraction(2500 + cNumberNonGaiaPlayers*180), rmAreaTilesToFraction(3000 + cNumberNonGaiaPlayers*250));
+   rmSetAreaMix(nativeIsland2ID, baseType);
+   rmAddAreaConstraint(nativeIsland2ID, settlementIslandConstraint);
+   rmAddAreaConstraint(nativeIsland2ID, centerIslandConstraint);
+   rmAddAreaConstraint(nativeIsland2ID, playerConstraint);
+   if  (centeredBigIsland == 1) 
+      rmAddAreaConstraint(nativeIsland2ID, nativeIslandConstraintLarge);
+   else
+      rmAddAreaConstraint(nativeIsland2ID, nativeIslandConstraint);
+   rmAddAreaConstraint(nativeIsland2ID, circleEdgeConstraint);
+   rmAddAreaToClass(nativeIsland2ID, classSettlementIsland);
+   rmAddAreaToClass(nativeIsland2ID, classNativeIsland);
+   rmAddAreaToClass(nativeIsland2ID, classGoldIsland);
+   rmSetAreaCoherence(nativeIsland2ID, 0.4);
+   rmSetAreaSmoothDistance(nativeIsland2ID, 12);
+   rmSetAreaHeightBlend(nativeIsland2ID, 2);
+   rmSetAreaBaseHeight(nativeIsland2ID, baseHeight);
+   rmBuildArea(nativeIsland2ID);
+
+if (extraNativeIs == 1)
+{
+   int nativeIsland3ID=rmCreateArea("native island 3");
+   rmSetAreaSize(nativeIsland3ID, rmAreaTilesToFraction(2200 + cNumberNonGaiaPlayers*180), rmAreaTilesToFraction(2800 + cNumberNonGaiaPlayers*250));
+   rmSetAreaMix(nativeIsland3ID, baseType);
+   rmAddAreaConstraint(nativeIsland3ID, settlementIslandConstraint);
+   rmAddAreaConstraint(nativeIsland3ID, centerIslandConstraint);
+   rmAddAreaConstraint(nativeIsland3ID, playerConstraint);
+   rmAddAreaConstraint(nativeIsland3ID, nativeIslandConstraint); 
+   rmAddAreaConstraint(nativeIsland3ID, circleEdgeConstraint);
+   rmAddAreaToClass(nativeIsland3ID, classSettlementIsland);
+   rmAddAreaToClass(nativeIsland3ID, classNativeIsland);
+   rmAddAreaToClass(nativeIsland3ID, classGoldIsland);
+   rmSetAreaCoherence(nativeIsland3ID, 0.4);
+   rmSetAreaSmoothDistance(nativeIsland3ID, 12);
+   rmSetAreaHeightBlend(nativeIsland3ID, 2);
+   rmSetAreaBaseHeight(nativeIsland3ID, baseHeight);
+   rmBuildArea(nativeIsland3ID);
+}
+
+// Native Island Objects placement
+   rmPlaceGroupingInArea(villageDID, 0, rmAreaID("native island 1"), 1);
+   rmPlaceGroupingInArea(villageDID, 0, rmAreaID("native island 2"), 1);
+   rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("native island 1"), 1);
+   rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("native island 2"), 1);
+   if (sheepChance > 0)
+   {
+	if (rmRandInt(1,2) == 1)
+         rmPlaceObjectDefInArea(sheepID, 0, rmAreaID("native island 1"), 1);
+	if (rmRandInt(1,2) == 1)
+         rmPlaceObjectDefInArea(sheepID, 0, rmAreaID("native island 2"), 1);
+   }
+   if (extraNativeIs == 1)
+   {
+	if (rmRandInt(1,2) == 1)
+         rmPlaceGroupingInArea(villageDID, 0, rmAreaID("native island 3"), 1);
+	else
+         rmPlaceGroupingInArea(villageAID, 0, rmAreaID("native island 3"), 1);
+      rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("native island 3"), 1);
+      if (sheepChance > 0)
+      {
+	   if (rmRandInt(1,3) > 1)
+            rmPlaceObjectDefInArea(sheepID, 0, rmAreaID("native island 3"), 1);
+	}
+   }
+
+// Text
+   rmSetStatusText("",0.45);
+     
+// More Islands/land - may merge with big island or each other
+   int numIslands = cNumberNonGaiaPlayers - 1;
+   if (cNumberNonGaiaPlayers > 4)
+      numIslands = cNumberNonGaiaPlayers - 2;
+   if (cNumberNonGaiaPlayers > 7)
+      numIslands = cNumberNonGaiaPlayers - 3;
+
+   for(i=0; <numIslands)
+   {
+      int settlementIslandID=rmCreateArea("settlement island"+i);
+      rmSetAreaSize(settlementIslandID, rmAreaTilesToFraction(2500 + cNumberNonGaiaPlayers*150), rmAreaTilesToFraction(3000 + cNumberNonGaiaPlayers*200));
+      rmSetAreaMix(settlementIslandID, baseType);
+      rmSetAreaWarnFailure(settlementIslandID, false);
+
+      constraintChance4 = rmRandFloat(0.0,1.0);
+	if (cNumberNonGaiaPlayers < 5)
+	{
+         if (constraintChance4 > 0.5)
+            rmAddAreaConstraint(settlementIslandID, settlementIslandConstraint);
+	}
+	else 	if (cNumberNonGaiaPlayers < 7)
+	{
+         if (constraintChance4 > 0.5)
+            rmAddAreaConstraint(settlementIslandID, settlementIslandConstraint); 
+	}
+	else 	
+	{
+         if (constraintChance4 > 0.3)
+            rmAddAreaConstraint(settlementIslandID, settlementIslandConstraint); 
+	}
+
+      chanceSetup = rmRandFloat(0.0,1.0);
+	if (cNumberNonGaiaPlayers < 5)
+	{
+         if (chanceSetup < 0.4)
+            rmAddAreaConstraint(settlementIslandID, centerIslandConstraint);
+	}
+	else if (cNumberNonGaiaPlayers < 7)
+	{
+         if (chanceSetup < 0.6)
+            rmAddAreaConstraint(settlementIslandID, centerIslandConstraint);
+	}
+	else 
+	{	
+         if (chanceSetup < 0.7)
+            rmAddAreaConstraint(settlementIslandID, centerIslandConstraint);
+	}
+
+      rmAddAreaConstraint(settlementIslandID, playerConstraint); 
+      rmAddAreaConstraint(settlementIslandID, circleEdgeConstraint);
+	if (rmRandInt(1,3) > 1)
+         rmAddAreaConstraint(settlementIslandID, nativeIslandConstraint);
+      rmAddAreaToClass(settlementIslandID, classSettlementIsland);
+      rmAddAreaToClass(settlementIslandID, classGoldIsland);
+      rmSetAreaCoherence(settlementIslandID, 0.35);
+      rmSetAreaSmoothDistance(settlementIslandID, 12);
+      rmSetAreaHeightBlend(settlementIslandID, 2);
+      rmSetAreaBaseHeight(settlementIslandID, baseHeight);
+      rmBuildArea(settlementIslandID);
+	
+   // Settlement Island Objects placement
+	if (cNumberNonGaiaPlayers > 5)
+	{
+         if (chanceSetup < 0.7)
+            rmPlaceGroupingInArea(villageDID, 0, rmAreaID("settlement island"+i), 1);
+	   else
+	   {
+            if (rmRandInt(1,4) == 1)
+               rmPlaceGroupingInArea(villageDID, 0, rmAreaID("settlement island"+i), 1);
+	   }
+	}
+      rmSetNuggetDifficulty(3, 3);
+      rmPlaceObjectDefInArea(nuggetID, 0, rmAreaID("settlement island"+i), 1);
+      if (rmRandInt(1,4) > 1)
+         rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("settlement island"+i), 1);
+      if (sheepChance > 0)
+      {
+	   if (rmRandInt(1,3) == 1)
+            rmPlaceObjectDefInArea(sheepID, 0, rmAreaID("settlement island"+i), 1);
+	}
+   }
+
+// Text
+   rmSetStatusText("",0.50);
+
+// Bonus Resource Islands - can merge with other extra islands.
+   int bonusCount=cNumberNonGaiaPlayers + 2;  // num players plus some extra
+   if (cNumberNonGaiaPlayers > 5)
+      bonusCount=cNumberNonGaiaPlayers + 1;
+  
+   for(i=0; <bonusCount)
+   {
+      int bonusIslandID=rmCreateArea("bonus island"+i);
+      rmSetAreaSize(bonusIslandID, rmAreaTilesToFraction(1800 + cNumberNonGaiaPlayers*150), rmAreaTilesToFraction(2000 + cNumberNonGaiaPlayers*200));
+      rmSetAreaMix(bonusIslandID, baseType);
+      rmSetAreaWarnFailure(bonusIslandID, false);
+      rmAddAreaConstraint(bonusIslandID, circleEdgeConstraint);
+      if (rmRandInt(1,3) == 1)
+        rmAddAreaConstraint(bonusIslandID, settlementIslandConstraint); 
+	if (cNumberNonGaiaPlayers > 5)
+	{
+         if (rmRandInt(1,10) > 4)
+            rmAddAreaConstraint(bonusIslandID, centerIslandConstraint);
+	}
+	else
+	{
+         if (rmRandInt(1,2) > 1)
+            rmAddAreaConstraint(bonusIslandID, centerIslandConstraint);
+	}
+      if (rmRandInt(1,2) == 1)
+         rmAddAreaConstraint(bonusIslandID, nativeIslandConstraint);
+      rmAddAreaConstraint(bonusIslandID, secondPlayerConstraint); 
+      rmAddAreaToClass(bonusIslandID, classBonusIsland);
+      rmAddAreaToClass(bonusIslandID, classGoldIsland);
+      rmSetAreaCoherence(bonusIslandID, 0.55);
+      rmSetAreaSmoothDistance(bonusIslandID, 20);
+      rmSetAreaHeightBlend(bonusIslandID, 2);
+      rmSetAreaBaseHeight(bonusIslandID, baseHeight);
+
+      // Island avoidance determination
+      randomIslandChance=rmRandFloat(0.0, 1.0);
+      if(randomIslandChance < 0.33)
+      {
+         rmAddAreaToClass(bonusIslandID, islandsX);
+         rmAddAreaConstraint(bonusIslandID, islandsXvsY);
+         rmAddAreaConstraint(bonusIslandID, islandsXYvsZ);
+      }
+      else if(randomIslandChance < 0.66)        
+      {
+         rmAddAreaToClass(bonusIslandID, islandsY);
+         rmAddAreaConstraint(bonusIslandID, islandsYvsX);
+         rmAddAreaConstraint(bonusIslandID, islandsXYvsZ);
+      }
+      else
+      {
+         rmAddAreaToClass(bonusIslandID, islandsZ);
+         rmAddAreaConstraint(bonusIslandID, islandsZvsX);
+         rmAddAreaConstraint(bonusIslandID, islandsZvsY); 
+      }
+      rmBuildArea(bonusIslandID);
+
+	// Bonus Island Objects
+      rmPlaceObjectDefInArea(centralHerdID, 0, rmAreaID("bonus island"+i), 1);
+      if (rmRandInt(1,3) == 1)
+	{
+         rmSetNuggetDifficulty(2, 3);
+         rmPlaceObjectDefInArea(nuggetID, 0, rmAreaID("bonus island"+i), 1);
+	}
+   }
+
+// Text
+   rmSetStatusText("",0.55);
+
+// Caches and bonus objects  
+   // Campfire cache
+   int campfireID=rmCreateObjectDef("campfire cache");
+   if (rmRandInt(1,2) == 1)
+   {
+      rmAddObjectDefItem(campfireID, "Campfire", 1, 0.0);
+      rmAddObjectDefItem(campfireID, "TanningRack", 1, 4.0);
+   }
+   else
+   {
+      if (rmRandInt(1,2) == 1)
+	   rmAddObjectDefItem(campfireID, "SPCSignalFire", 1, 0.0);
+	else
+	   rmAddObjectDefItem(campfireID, "SPCSignalFireLit", 1, 0.0);
+   }
+   if (rmRandInt(1,2) == 1)
+      rmAddObjectDefItem(campfireID, "CrateOfWood", rmRandInt(2,3), 4.0);
+   else
+	rmAddObjectDefItem(campfireID, "CrateOfWoodLarge", 1, 4.0);
+   rmAddObjectDefToClass(campfireID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(campfireID, avoidTradeRoute);
+   rmAddObjectDefConstraint(campfireID, avoidImportantItemMed);
+   rmAddObjectDefConstraint(campfireID, avoidWater10);
+   rmAddObjectDefConstraint(campfireID, fartherPlayerConstraint);
+   if (rmRandInt(1,5) < 5)
+	campfireCache = 1;
+
+   // House cache  ====================================================================================================
+   int cacheContents = rmRandInt(1,5);
+   int houseCacheID=rmCreateObjectDef("house cache");
+   if (cacheType == 1) // northern
+   {
+      rmAddObjectDefItem(houseCacheID, "NativeHouseIroquois", 1, 0.0);
+      rmAddObjectDefItem(houseCacheID, "Campfire", 1, 4.0);
+   }
+   else if (cacheType == 2) // plains
+   {
+	rmAddObjectDefItem(houseCacheID, "Teepee", 1, 6.0);
+      rmAddObjectDefItem(houseCacheID, "Campfire", 1, 5.0);
+   }
+   else if (cacheType == 3) // southern
+   {
+	rmAddObjectDefItem(houseCacheID, "NativeHouseCarib", 2, 6.0);
+	if (rmRandInt(1,2) == 1)
+	   rmAddObjectDefItem(houseCacheID, "Skulls", rmRandInt(1,2), 5.0);
+   }	
+   else if (cacheType == 4) // leanto
+   {
+      rmAddObjectDefItem(houseCacheID, "LeanTo", 2, 6.0);
+	if (rmRandInt(1,2) == 1)
+	   rmAddObjectDefItem(houseCacheID, "Skulls", rmRandInt(1,2), 5.0);
+   }
+   else if (cacheType == 5) // meso
+	rmAddObjectDefItem(houseCacheID, "NativeHouseAztec", 1, 4.0);
+   else if (cacheType == 6) // southern Asian - India/Ceylon/Himalaya/Borneo
+   {
+	if (patternChance == 32) // Himalaya
+	   threeChoice = rmRandInt(1,2);
+	else
+	   threeChoice = rmRandInt(1,3);
+	if (threeChoice == 1)
+	   rmAddObjectDefItem(houseCacheID, "ypNativeTempleBhakti", rmRandInt(1,2), 6.0);
+	else if (threeChoice == 2)
+	   rmAddObjectDefItem(houseCacheID, "ypNativeTempleUdasi", rmRandInt(1,2), 6.0);
+	else if (threeChoice == 3)
+	{
+         rmAddObjectDefItem(houseCacheID, "LeanTo", 2, 6.0);
+         rmAddObjectDefItem(houseCacheID, "Campfire", 1, 3.0);
+	}
+   }
+   else if (cacheType == 7) // northern Asian 
+   {
+      rmAddObjectDefItem(houseCacheID, "ypMonastery", 1, 2.0);
+	if (patternChance == 30) 
+	   rmAddObjectDefItem(houseCacheID, "ypPropsJapaneseBanner", 2, 5.0);
+   }
+   if (cacheType < 5)
+   {
+	if (threeChoice > 1)
+	   rmAddObjectDefItem(houseCacheID, "TanningRack", 1, 4.0);
+   }
+   if (cacheContents == 1) 	    
+      rmAddObjectDefItem(houseCacheID, "CrateOfFood", 2, 5.0);
+   else if (cacheContents == 2) 	    
+	rmAddObjectDefItem(houseCacheID, "CrateOfFoodLarge", 1, 4.0);
+   else if (cacheContents == 3) 	    
+      rmAddObjectDefItem(houseCacheID, "CrateOfCoin", 2, 5.0);
+   else if (cacheContents == 4) 	    
+	rmAddObjectDefItem(houseCacheID, "CrateOfCoinLarge", 1, 4.0);
+   else if (cacheContents == 5)
+   { 	    
+      rmAddObjectDefItem(houseCacheID, "CrateOfFood", 1, 5.0);
+      rmAddObjectDefItem(houseCacheID, "CrateOfCoin", 1, 6.0);
+   }
+   rmAddObjectDefToClass(houseCacheID, rmClassID("importantItem"));
+   rmAddObjectDefConstraint(houseCacheID, avoidTradeRoute);
+   rmAddObjectDefConstraint(houseCacheID, avoidImportantItemMed);
+   rmAddObjectDefConstraint(houseCacheID, avoidWater10);
+   rmAddObjectDefConstraint(houseCacheID, fartherPlayerConstraint);
+   rmPlaceObjectDefInRandomAreaOfClass(houseCacheID, 0, classCenterIsland, rmRandInt(1,2)); 
+   rmPlaceObjectDefInRandomAreaOfClass(houseCacheID, 0, classGoldIsland, 1);
+   if (cNumberNonGaiaPlayers > 2)
+      rmPlaceObjectDefInRandomAreaOfClass(houseCacheID, 0, classSettlementIsland, 1);
+   if (cNumberNonGaiaPlayers > 3)
+      rmPlaceObjectDefInRandomAreaOfClass(houseCacheID, 0, classSettlementIsland, 1);
+   if (cNumberNonGaiaPlayers > 4)
+      rmPlaceObjectDefInRandomAreaOfClass(houseCacheID, 0, classGoldIsland, 1);
+
+   // Shrine cache
+   if ((patternChance == 30) || (patternChance == 32) || (patternChance == 34) || (patternChance == 36))
+   {
+      cacheContents = rmRandInt(1,2);
+      int shrineCacheID=rmCreateObjectDef("shrine cache");
+      rmAddObjectDefItem(shrineCacheID, "ypShrineJapanese", 1, 0.0);
+      if (cacheContents == 1) 	    
+         rmAddObjectDefItem(shrineCacheID, "CrateOfFood", rmRandInt(2,3), 4.0);
+      else if (cacheContents == 2) 	      
+         rmAddObjectDefItem(shrineCacheID, "CrateOfCoin", rmRandInt(2,3), 4.0);
+      rmAddObjectDefItem(shrineCacheID, deer2Type, 4, 5.0);
+      rmAddObjectDefToClass(shrineCacheID, rmClassID("importantItem"));
+      rmAddObjectDefConstraint(shrineCacheID, avoidTradeRoute);
+      rmAddObjectDefConstraint(shrineCacheID, avoidImportantItemMed);
+      rmAddObjectDefConstraint(shrineCacheID, avoidWater10);
+      rmAddObjectDefConstraint(shrineCacheID, fartherPlayerConstraint);
+      rmPlaceObjectDefInRandomAreaOfClass(shrineCacheID, 0, classGoldIsland, 1); 
+      if (cNumberNonGaiaPlayers > 2)  
+         rmPlaceObjectDefInRandomAreaOfClass(shrineCacheID, 0, classGoldIsland, 1);  
+      if (cNumberNonGaiaPlayers > 4)  
+         rmPlaceObjectDefInRandomAreaOfClass(shrineCacheID, 0, classGoldIsland, 1);      
+      if (rmRandInt(1,2)==1)  
+         rmPlaceObjectDefInRandomAreaOfClass(shrineCacheID, 0, classGoldIsland, 1); 
+   }
+
+   // Mural cache
+   if ((patternChance == 13) || (patternChance == 14) || (patternChance == 15) || (patternChance == 28)) // yucatan, sonora, palm desert, caribbean 
+   {
+      int muralCacheID=rmCreateObjectDef("mural cache");
+      rmAddObjectDefItem(muralCacheID, "SPCAztecMural", 1, 0.0);
+      rmAddObjectDefItem(muralCacheID, "CrateOfCoin", 1, 4.0);
+      rmAddObjectDefToClass(muralCacheID, rmClassID("importantItem"));
+      rmAddObjectDefConstraint(muralCacheID, avoidTradeRoute);
+      rmAddObjectDefConstraint(muralCacheID, avoidImportantItemMed);
+      rmAddObjectDefConstraint(muralCacheID, avoidWater10);
+      rmAddObjectDefConstraint(muralCacheID, fartherPlayerConstraint);
+      rmPlaceObjectDefInRandomAreaOfClass(muralCacheID, 0, classGoldIsland, 1); 
+   }
+
+   // Arctic cache
+   if (arctic == 1)
+   {
+      int arcticCacheID=rmCreateObjectDef("arctic cache");
+      rmAddObjectDefItem(arcticCacheID, "Inuksuk", 1, 0.0);
+      rmAddObjectDefItem(arcticCacheID, "CrateOfCoin", rmRandInt(2,3), 6.0);
+      rmAddObjectDefToClass(arcticCacheID, rmClassID("importantItem"));
+      rmAddObjectDefConstraint(arcticCacheID, avoidTradeRoute);
+      rmAddObjectDefConstraint(arcticCacheID, avoidImportantItemMed);
+      rmAddObjectDefConstraint(arcticCacheID, avoidWater10);
+      rmAddObjectDefConstraint(arcticCacheID, fartherPlayerConstraint);
+      rmPlaceObjectDefInRandomAreaOfClass(arcticCacheID, 0, classCenterIsland, 1);
+      rmPlaceObjectDefInRandomAreaOfClass(arcticCacheID, 0, classGoldIsland, 1);
+   }
+
+   // Inca outpost cache
+   if ((patternChance == 16) || (patternChance == 22) || (patternChance == 23) || (patternChance == 24) || (patternChance == 29))  // amazon, andes, atacama, central and north araucania 
+   {
+      int incaCacheID=rmCreateObjectDef("inca cache");
+      rmAddObjectDefItem(incaCacheID, "SPCIncaOutpost", 1, 0.0);
+      rmAddObjectDefItem(incaCacheID, "CrateOfCoin", rmRandInt(2,3), 4.0);
+      rmAddObjectDefToClass(incaCacheID, rmClassID("importantItem"));
+      rmAddObjectDefConstraint(incaCacheID, avoidTradeRoute);
+      rmAddObjectDefConstraint(incaCacheID, avoidImportantItemMed);
+      rmAddObjectDefConstraint(incaCacheID, avoidWater10);
+      rmAddObjectDefConstraint(incaCacheID, fartherPlayerConstraint);
+      rmPlaceObjectDefInRandomAreaOfClass(incaCacheID, 0, classCenterIsland, 1);
+      rmPlaceObjectDefInRandomAreaOfClass(incaCacheID, 0, classSettlementIsland, 1);
+      if (cNumberNonGaiaPlayers > 4)
+      {
+         rmPlaceObjectDefInRandomAreaOfClass(incaCacheID, 0, classSettlementIsland, 1);
+	}	
+   }
+
+   if (berryCache == 1) // Berry patches
+   {
+         int berryPatchType = rmRandInt(1,4);
+         int berryPatch = 0;
+         berryPatch = rmCreateGrouping("Berry patch", "BerryPatch "+berryPatchType);
+         rmSetGroupingMinDistance(berryPatch, 0.0);
+         rmSetGroupingMaxDistance(berryPatch, 12.0);
+         rmAddGroupingToClass(berryPatch, rmClassID("importantItem"));
+         rmAddGroupingConstraint(berryPatch, avoidAll);
+         rmAddGroupingConstraint(berryPatch, avoidWater10);
+         rmAddGroupingConstraint(berryPatch, avoidImportantItemMed);
+	   if ((patternChance == 30) || (patternChance == 31) || (patternChance == 35) || (patternChance == 36))
+	   {
+	      rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("big island"), 1);
+            for(i=0; <numIslands)
+            {
+	         if (rmRandInt(1,3) == 1)  
+	            rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("settlement island"+i), 1);
+		}
+	   }
+	   else
+   	   {
+	      rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("big island"), 1);
+	      if (rmRandInt(1,3) == 1)
+	         rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("big island"), 1);
+	      if (rmRandInt(1,2) == 1)
+	         rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("native island 2"), 1);
+	      if (rmRandInt(1,2) == 1)
+	         rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("native island 1"), 1);
+            for(i=0; <numIslands)
+            {
+	         if (rmRandInt(1,2) == 1)  
+	            rmPlaceGroupingInArea(berryPatch, 0, rmAreaID("settlement island"+i), 1);
+	      }
+	   }
+   }
+   if (llamaCache == 1) // Herdable pen
+   {        
+         int herdablePenType = rmRandInt(1,4);
+         int herdablePen = 0;
+         herdablePen = rmCreateGrouping("Herdable Pen", "Araucania_HerdablePen "+herdablePenType);
+         rmSetGroupingMinDistance(herdablePen, 0.0);
+         rmSetGroupingMaxDistance(herdablePen, 20.0);
+         rmAddGroupingToClass(herdablePen, rmClassID("importantItem"));
+         rmAddGroupingConstraint(herdablePen, avoidImportantItemMed);
+         rmAddGroupingConstraint(herdablePen, avoidAll);
+         rmAddGroupingConstraint(herdablePen, avoidWater10);
+	   rmPlaceGroupingInArea(herdablePen, 0, rmAreaID("big island"), 1);
+	   if (rmRandInt(1,3) == 1)
+	      rmPlaceGroupingInArea(herdablePen, 0, rmAreaID("big island"), 1);
+	   if (rmRandInt(1,2) == 1)
+	      rmPlaceGroupingInArea(herdablePen, 0, rmAreaID("native island 2"), 1);
+	   if (rmRandInt(1,2) == 1)
+	      rmPlaceGroupingInArea(herdablePen, 0, rmAreaID("native island 1"), 1);
+         for(i=0; <numIslands)
+         {
+	      if (rmRandInt(1,2) == 1) 
+	         rmPlaceGroupingInArea(herdablePen, 0, rmAreaID("settlement island"+i), 1);
+	   }
+	   if (berryCache == 1)
+	      campfireCache = 0;
+   }
+
+   if (campfireCache == 1) 
+   {
+      rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classCenterIsland, 1);
+	rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classSettlementIsland, 1);
+      rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classBonusIsland, 1);
+	if (rmRandInt(1,2) == 1)
+	   rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classBonusIsland, 1);
+	if (rmRandInt(1,2) == 1)
+	   rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classSettlementIsland, 1);
+      if (cNumberNonGaiaPlayers > 4)
+      {
+	   rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classCenterIsland, 1);
+	   rmPlaceObjectDefInRandomAreaOfClass(campfireID, 0, classSettlementIsland, 1);
+	}
+   }
+
+// Additional Island Mines
+   rmPlaceObjectDefInRandomAreaOfClass(extraGoldID, 0, classSettlementIsland, 1);
+   if (cNumberNonGaiaPlayers > 3)
+      rmPlaceObjectDefInRandomAreaOfClass(extraGoldID, 0, classBonusIsland, 1);
+   rmPlaceObjectDefInRandomAreaOfClass(extraGoldID, 0, classGoldIsland, 1);
+   rmPlaceObjectDefInRandomAreaOfClass(extraGoldID, 0, classGoldIsland, 1);
+   rmPlaceObjectDefInRandomAreaOfClass(extraSilverID, 0, classGoldIsland, 1);
+   rmPlaceObjectDefInRandomAreaOfClass(extraSilverID, 0, classGoldIsland, 1);
+   if (cNumberNonGaiaPlayers > 4)
+   {
+      rmPlaceObjectDefInRandomAreaOfClass(extraSilverID, 0, classGoldIsland, 1);
+      rmPlaceObjectDefInRandomAreaOfClass(extraSilverID, 0, classBonusIsland, 1);
+   }
+   if (cNumberNonGaiaPlayers > 6)
+   {
+      rmPlaceObjectDefInRandomAreaOfClass(extraSilverID, 0, classGoldIsland, 1);
+      rmPlaceObjectDefInRandomAreaOfClass(extraSilverID, 0, classBonusIsland, 1);
+   }
+
+// Forests
+// Large player forests.
+   int failCount = 0;
+   for(i=1; <cNumberPlayers)
+   {
+      failCount=0;
+      int forestID=rmCreateArea("player"+i+"forest", rmAreaID("player"+i));
+	if (lowForest == 1)
+         rmSetAreaSize(forestID, rmAreaTilesToFraction(180), rmAreaTilesToFraction(250));
+	else
+         rmSetAreaSize(forestID, rmAreaTilesToFraction(250), rmAreaTilesToFraction(290));
+      rmSetAreaWarnFailure(forestID, false);
+      rmSetAreaForestType(forestID, forestType);
+      rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+      rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+      rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+      rmSetAreaCoherence(forestID, rmRandFloat(0.5, 0.8));
+      rmAddAreaConstraint(forestID, avoidStartingUnits);
+      rmAddAreaConstraint(forestID, avoidNativesShort);
+      rmAddAreaConstraint(forestID, avoidWater10);
+      rmAddAreaConstraint(forestID, avoidAll);
+      rmAddAreaConstraint(forestID, forestConstraint);
+      rmAddAreaConstraint(forestID, shortAvoidImpassableLand);
+      rmAddAreaToClass(forestID, rmClassID("classForest")); 
+      rmSetAreaMinBlobs(forestID, 1);
+      rmSetAreaMaxBlobs(forestID, 3);
+      rmSetAreaMinBlobDistance(forestID, 10.0);
+      rmSetAreaMaxBlobDistance(forestID, 15.0);
+      rmSetAreaSmoothDistance(forestID, rmRandInt(10,20));
+      rmSetAreaBaseHeight(forestID, rmRandFloat(3.0, 4.0));
+      rmSetAreaHeightBlend(forestID, 1);
+      if(rmBuildArea(forestID)==false)
+      {
+         // Stop trying once we fail 3 times in a row.
+         failCount++;
+         if(failCount==3)
+            break;
+      }
+      else
+         failCount=0;
+
+	if (forestCoverUp == 1)
+	{
+      int coverForestPatchID = rmCreateArea("cover forest patch"+i, rmAreaID("player"+i+"forest"));   
+      rmSetAreaWarnFailure(coverForestPatchID, false);
+	if (lowForest == 1)
+         rmSetAreaSize(coverForestPatchID, rmAreaTilesToFraction(270), rmAreaTilesToFraction(270));
+	else
+         rmSetAreaSize(coverForestPatchID, rmAreaTilesToFraction(315), rmAreaTilesToFraction(315));
+      rmSetAreaCoherence(coverForestPatchID, 0.99);
+      rmSetAreaMix(coverForestPatchID, baseType);
+      rmBuildArea(coverForestPatchID);
+	}
+   }
+
+   for(j=0; <2)   
+   {
+      for(k=1; <cNumberPlayers)
+      {
+         failCount=0;
+         forestID=rmCreateArea(("another player"+k+"forest"+j), rmAreaID("player"+k));
+	   if (lowForest == 1)
+            rmSetAreaSize(forestID, rmAreaTilesToFraction(170), rmAreaTilesToFraction(200));
+	   else
+            rmSetAreaSize(forestID, rmAreaTilesToFraction(200), rmAreaTilesToFraction(230));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidStartingUnits);
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, forestConstraint);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand);
+         rmAddAreaToClass(forestID, rmClassID("classForest")); 
+         rmSetAreaMinBlobs(forestID, 1);
+         rmSetAreaMaxBlobs(forestID, 3);
+         rmSetAreaMinBlobDistance(forestID, 12.0);
+         rmSetAreaMaxBlobDistance(forestID, 25.0);
+         rmSetAreaSmoothDistance(forestID, rmRandInt(10,20));
+         rmSetAreaBaseHeight(forestID, rmRandFloat(3.0, 4.0));
+         rmSetAreaHeightBlend(forestID, 1);
+         if(rmBuildArea(forestID)==false)
+         {
+            // Stop trying once we fail 3 times in a row.
+            failCount++;
+            if(failCount==3)
+               break;
+         }
+         else
+            failCount=0;
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch2ID = rmCreateArea(("cover forest patch two"+j+k), rmAreaID("another player"+k+"forest"+j));   
+         rmSetAreaWarnFailure(coverForestPatch2ID, false);
+	   if (lowForest == 1)
+            rmSetAreaSize(coverForestPatch2ID, rmAreaTilesToFraction(220), rmAreaTilesToFraction(220));
+	   else
+            rmSetAreaSize(coverForestPatch2ID, rmAreaTilesToFraction(245), rmAreaTilesToFraction(245));
+         rmSetAreaCoherence(coverForestPatch2ID, 0.99);
+         rmSetAreaMix(coverForestPatch2ID, baseType);
+         rmBuildArea(coverForestPatch2ID);
+   	   }
+      }
+   }
+
+// Text
+   rmSetStatusText("",0.60);
+
+// Smaller player forests
+   int forestCount=rmRandInt(7, 8);
+   if (lowForest == 1)
+      forestCount=rmRandInt(2, 3);
+   for(i=1; <cNumberPlayers)
+   {
+      failCount=0;
+      for(j=0; <forestCount)
+      {
+         forestID=rmCreateArea("player"+i+"small forest"+j, rmAreaID("player"+i));
+	   if (lowForest == 1)
+            rmSetAreaSize(forestID, rmAreaTilesToFraction(120), rmAreaTilesToFraction(160));
+	   else
+            rmSetAreaSize(forestID, rmAreaTilesToFraction(150), rmAreaTilesToFraction(180));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidStartingUnits);
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, forestConstraint);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand);
+         rmAddAreaToClass(forestID, rmClassID("classForest")); 
+         rmSetAreaMinBlobs(forestID, 1);
+         rmSetAreaMaxBlobs(forestID, 3);
+         rmSetAreaMinBlobDistance(forestID, 8.0);
+         rmSetAreaMaxBlobDistance(forestID, 12.0);
+	   rmSetAreaSmoothDistance(forestID, rmRandInt(10,20));
+         if(rmBuildArea(forestID)==false)
+         {
+            // Stop trying once we fail 3 times in a row.
+            failCount++;
+            if(failCount==3)
+               break;
+         }
+         else
+            failCount=0;
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch3ID = rmCreateArea(("cover forest patch three"+i+j), rmAreaID("player"+i+"small forest"+j));   
+         rmSetAreaWarnFailure(coverForestPatch3ID, false);
+	   if (lowForest == 1)
+            rmSetAreaSize(coverForestPatch3ID, rmAreaTilesToFraction(180), rmAreaTilesToFraction(180));
+	   else
+            rmSetAreaSize(coverForestPatch3ID, rmAreaTilesToFraction(195), rmAreaTilesToFraction(195));
+         rmSetAreaCoherence(coverForestPatch3ID, 0.99);
+         rmSetAreaMix(coverForestPatch3ID, baseType);
+         rmBuildArea(coverForestPatch3ID);
+   	   }
+      }
+   }
+
+// Big island forests
+   int forestNo = rmRandInt(6,7);
+   if (cNumberNonGaiaPlayers > 5)
+     forestNo = rmRandInt(8,9);
+   else if (cNumberNonGaiaPlayers > 3)
+     forestNo = rmRandInt(7,8);
+
+   if (lowForest == 1)
+   {
+	if (cNumberNonGaiaPlayers > 5)
+         forestCount=rmRandInt(4, 5);
+	else
+         forestCount=rmRandInt(3, 4);
+   }
+
+   for(i=0; < forestNo)
+   {
+         forestID=rmCreateArea("big island forest"+i, rmAreaID("big island"));
+         rmAddAreaToClass(forestID, rmClassID("classForest"));
+	   if (lowForest == 1)
+            rmSetAreaSize(forestID, rmAreaTilesToFraction(120), rmAreaTilesToFraction(160));
+	   else 
+            rmSetAreaSize(forestID, rmAreaTilesToFraction(145), rmAreaTilesToFraction(175));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, forestConstraint2);
+         rmAddAreaConstraint(forestID, avoidTradeRoute);
+         rmAddAreaConstraint(forestID, avoidSocket);
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand); 
+         if(rmRandFloat(0.0, 1.0)<0.4)
+            rmSetAreaBaseHeight(forestID, rmRandFloat(3.0, 4.0)); 
+         rmBuildArea(forestID);
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch4ID = rmCreateArea(("big island forest cover"+i), rmAreaID("big island forest"+i));   
+         rmSetAreaWarnFailure(coverForestPatch4ID, false);
+	   if (lowForest == 1)
+            rmSetAreaSize(coverForestPatch4ID, rmAreaTilesToFraction(175), rmAreaTilesToFraction(175));
+	   else 
+            rmSetAreaSize(coverForestPatch4ID, rmAreaTilesToFraction(190), rmAreaTilesToFraction(190));
+         rmSetAreaCoherence(coverForestPatch4ID, 0.99);
+         rmSetAreaMix(coverForestPatch4ID, baseType);
+         rmBuildArea(coverForestPatch4ID);
+   	   }
+   }
+
+// Text
+   rmSetStatusText("",0.65);
+
+// Settlement island forests
+   for(i=0; <numIslands)
+   {
+      forestCount=rmRandInt(3,4);
+      if (lowForest == 1)
+         forestCount=2;
+      for(j=0; <forestCount)
+      {
+         forestID=rmCreateArea("settlement island"+i+"forest"+j, rmAreaID("settlement island"+i));
+         rmAddAreaToClass(forestID, rmClassID("classForest")); 
+         rmSetAreaSize(forestID, rmAreaTilesToFraction(140), rmAreaTilesToFraction(185));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, forestConstraint2);
+         rmAddAreaConstraint(forestID, avoidTradeRoute);
+         rmAddAreaConstraint(forestID, avoidSocket);
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand); 
+         rmBuildArea(forestID);
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch5ID = rmCreateArea(("5th forest cover"+i+j), rmAreaID("settlement island"+i+"forest"+j));   
+         rmSetAreaWarnFailure(coverForestPatch5ID, false);
+         rmSetAreaSize(coverForestPatch5ID, rmAreaTilesToFraction(200), rmAreaTilesToFraction(200));
+         rmSetAreaCoherence(coverForestPatch5ID, 0.99);
+         rmSetAreaMix(coverForestPatch5ID, baseType);
+         rmBuildArea(coverForestPatch5ID);
+   	   }
+      }
+   }
+
+// Text
+   rmSetStatusText("",0.70);
+
+// Native island forests
+   int natForest = rmRandInt(3,4);
+   if (lowForest == 1)
+      natForest=2;
+   for(i=0; < natForest)
+   {
+         forestID=rmCreateArea("native island 1 forest"+i, rmAreaID("native island 1"));
+         rmAddAreaToClass(forestID, rmClassID("classForest"));  
+         rmSetAreaSize(forestID, rmAreaTilesToFraction(150), rmAreaTilesToFraction(180));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, forestConstraint2);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand);
+         rmBuildArea(forestID);
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch6ID = rmCreateArea(("6th forest cover"+i), rmAreaID("native island 1 forest"+i));   
+         rmSetAreaWarnFailure(coverForestPatch6ID, false);
+         rmSetAreaSize(coverForestPatch6ID, rmAreaTilesToFraction(200), rmAreaTilesToFraction(200));
+         rmSetAreaCoherence(coverForestPatch6ID, 0.99);
+         rmSetAreaMix(coverForestPatch6ID, baseType);
+         rmBuildArea(coverForestPatch6ID);
+   	   }
+   }
+
+   for(i=0; < natForest)
+   {
+         forestID=rmCreateArea("native island 2 forest"+i, rmAreaID("native island 2")); 
+         rmAddAreaToClass(forestID, rmClassID("classForest")); 
+         rmSetAreaSize(forestID, rmAreaTilesToFraction(150), rmAreaTilesToFraction(180));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, forestConstraint2);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand);
+         rmBuildArea(forestID);
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch7ID = rmCreateArea(("7th forest cover"+i), rmAreaID("native island 2 forest"+i));   
+         rmSetAreaWarnFailure(coverForestPatch7ID, false);
+         rmSetAreaSize(coverForestPatch7ID, rmAreaTilesToFraction(200), rmAreaTilesToFraction(200));
+         rmSetAreaCoherence(coverForestPatch7ID, 0.99);
+         rmSetAreaMix(coverForestPatch7ID, baseType);
+         rmBuildArea(coverForestPatch7ID);
+	   }
+   }
+
+   if (extraNativeIs == 1)
+   {
+      for(i=1; < natForest)
+      {
+         forestID=rmCreateArea("native island 3 forest"+i, rmAreaID("native island 3")); 
+         rmAddAreaToClass(forestID, rmClassID("classForest")); 
+         rmSetAreaSize(forestID, rmAreaTilesToFraction(120), rmAreaTilesToFraction(150));
+         rmSetAreaWarnFailure(forestID, false);
+         rmSetAreaForestType(forestID, forestType);
+         rmSetAreaForestDensity(forestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(forestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(forestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(forestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(forestID, avoidNativesShort);
+         rmAddAreaConstraint(forestID, avoidAll);
+         rmAddAreaConstraint(forestID, avoidWater10);
+         rmAddAreaConstraint(forestID, forestConstraint2);
+         rmAddAreaConstraint(forestID, shortAvoidImpassableLand);
+         rmBuildArea(forestID);
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch8ID = rmCreateArea(("8th forest cover"+i), rmAreaID("native island 3 forest"+i));   
+         rmSetAreaWarnFailure(coverForestPatch8ID, false);
+         rmSetAreaSize(coverForestPatch8ID, rmAreaTilesToFraction(170), rmAreaTilesToFraction(170));
+         rmSetAreaCoherence(coverForestPatch8ID, 0.99);
+         rmSetAreaMix(coverForestPatch8ID, baseType);
+         rmBuildArea(coverForestPatch8ID);
+	   }
+      }
+   }
+
+// Text
+   rmSetStatusText("",0.75);
+
+// Bonus island forests.
+   for(i=0; <bonusCount)
+   {
+      forestCount=rmRandInt(2, 3);
+      if (lowForest == 1)
+         forestCount=rmRandInt(1,2);
+      for(j=0; <forestCount)
+      {
+         int bonusForestID=rmCreateArea("bonus"+i+"forest"+j, rmAreaID("bonus island"+i));
+         rmAddAreaToClass(bonusForestID, rmClassID("classForest"));  
+	   rmSetAreaSize(bonusForestID, rmAreaTilesToFraction(140), rmAreaTilesToFraction(170));
+         rmSetAreaWarnFailure(bonusForestID, false);
+         rmSetAreaForestType(bonusForestID, forestType);
+         rmSetAreaForestDensity(bonusForestID, rmRandFloat(0.7, 1.0));
+         rmSetAreaForestClumpiness(bonusForestID, rmRandFloat(0.5, 0.9));
+         rmSetAreaForestUnderbrush(bonusForestID, rmRandFloat(0.0, 0.5));
+         rmSetAreaCoherence(bonusForestID, rmRandFloat(0.4, 0.7));
+         rmAddAreaConstraint(bonusForestID, avoidNativesShort);
+         rmAddAreaConstraint(bonusForestID, avoidAll);
+         rmAddAreaConstraint(bonusForestID, forestConstraint2);
+         rmAddAreaConstraint(bonusForestID, avoidTradeRoute);
+         rmAddAreaConstraint(bonusForestID, avoidSocket);
+         rmAddAreaConstraint(bonusForestID, shortAvoidImpassableLand);
+         rmBuildArea(bonusForestID);
+
+	   if (forestCoverUp == 1)
+	   {
+         int coverForestPatch9ID = rmCreateArea(("9th forest cover"+i+j), rmAreaID("bonus"+i+"forest"+j));   
+         rmSetAreaWarnFailure(coverForestPatch9ID, false);
+         rmSetAreaSize(coverForestPatch9ID, rmAreaTilesToFraction(190), rmAreaTilesToFraction(190));
+         rmSetAreaCoherence(coverForestPatch9ID, 0.99);
+         rmSetAreaMix(coverForestPatch9ID, baseType);
+         rmBuildArea(coverForestPatch9ID);
+	   }
+      }
+   }
+
+// Text
+   rmSetStatusText("",0.80);
+
+// Trees
+   int randomTreeID=rmCreateObjectDef("random tree");
+   rmAddObjectDefItem(randomTreeID, treeType, 1, 0.0);
+   rmSetObjectDefMinDistance(randomTreeID, 8);
+   rmSetObjectDefMaxDistance(randomTreeID, 15);
+   rmAddObjectDefConstraint(randomTreeID, avoidStartingUnitsSmall);
+   rmAddObjectDefConstraint(randomTreeID, avoidImportantItemSmall);
+   rmAddObjectDefConstraint(randomTreeID, avoidTradeRoute);
+   rmAddObjectDefConstraint(randomTreeID, avoidAll);
+   rmAddObjectDefConstraint(randomTreeID, avoidWater10);
+   for(i=1; <cNumberPlayers)
+      rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("Player"+i), 6);
+   rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("big island"), rmRandInt(6,10));
+   for(i=0; <numIslands)
+      rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("settlement island"+i), rmRandInt(2,4));
+   for(i=0; <bonusCount)
+      rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("bonus island"+i), rmRandInt(2,4));
+   for(i=0; <extraCount)
+      rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("extraland"+i), 2);
+   rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("native island 1"), 3);
+   rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("native island 2"), 3);
+   if (extraNativeIs == 1)
+      rmPlaceObjectDefInArea(randomTreeID, 0, rmAreaID("native island 3"), 3);
+
+// Spanish shpwreck
+   int avoidWreck=rmCreateTypeDistanceConstraint("avoids wreck", "SPCSpanishShipRuins", 100.0);
+   int shipRuinsID=rmCreateObjectDef("island ship ruins");
+   rmAddObjectDefItem(shipRuinsID, "SPCSpanishShipRuins", 1, 0);
+   rmSetObjectDefMinDistance(shipRuinsID, 0.0);
+   rmSetObjectDefMaxDistance(shipRuinsID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(shipRuinsID, fartherPlayerConstraint);
+   rmAddObjectDefConstraint(shipRuinsID, nearWater);
+   rmAddObjectDefConstraint(shipRuinsID, avoidWreck);
+   rmAddObjectDefConstraint(shipRuinsID, avoidImportantItemMed);
+   if (sixChoice == 1)
+      rmPlaceObjectDefInArea(shipRuinsID, 0, rmAreaID("native island 1"));
+   else if (sixChoice == 2)
+      rmPlaceObjectDefInArea(shipRuinsID, 0, rmAreaID("native island 2"));
+   else if (sixChoice == 3)
+      rmPlaceObjectDefInRandomAreaOfClass(shipRuinsID, 0, classSettlementIsland, 1);
+   else 
+	rmPlaceObjectDefInArea(shipRuinsID, 0, rmAreaID("big island"));
+   if (cNumberNonGaiaPlayers > 3)
+   {
+      if (sixChoice == 4)
+         rmPlaceObjectDefInArea(shipRuinsID, 0, rmAreaID("native island 1"));
+      else if (sixChoice == 5)
+         rmPlaceObjectDefInArea(shipRuinsID, 0, rmAreaID("native island 2"));
+      else if (sixChoice == 6)
+	   rmPlaceObjectDefInRandomAreaOfClass(shipRuinsID, 0, classSettlementIsland, 1);
+      else 
+	   rmPlaceObjectDefInArea(shipRuinsID, 0, rmAreaID("big island"));
+   }
+
+// Text
+   rmSetStatusText("",0.85);
+
+// Deco
+   if (eaglerock == 1)
+	propType = "PropEaglesRocks";
+   else if (eagles == 1)
+	propType = "EaglesNest";
+   else if (vultures == 1)
+	propType = "PropVulturePerching";
+   else if (kingfishers == 1)
+	propType = "PropKingfisher";
+   else if (texasProp == 1)
+	propType = "BigPropTexas";
+
+   int avoidProp=rmCreateTypeDistanceConstraint("avoids prop", propType, 90.0);
+   int specialPropID=rmCreateObjectDef("special prop");
+   rmAddObjectDefItem(specialPropID, propType, 1, 0.0);
+   rmSetObjectDefMinDistance(specialPropID, 0.0);
+   rmSetObjectDefMaxDistance(specialPropID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(specialPropID, avoidAll);
+   rmAddObjectDefConstraint(specialPropID, avoidProp);
+   rmAddObjectDefConstraint(specialPropID, shortAvoidImpassableLand);
+   if ((vultures == 1) || (eaglerock == 1)) 
+	rmAddObjectDefConstraint(specialPropID, avoidWater20);
+   else
+	rmAddObjectDefConstraint(specialPropID, avoidWater10);
+   rmAddObjectDefConstraint(specialPropID, avoidImportantItem);
+   rmAddObjectDefConstraint(specialPropID, longPlayerConstraint);
+   rmPlaceObjectDefAtLoc(specialPropID, 0, 0.5, 0.5, (cNumberNonGaiaPlayers + 1));
+
+   if (underbrush == 1)
+   {
+	int avoidBrush=rmCreateTypeDistanceConstraint("avoids brush", brushType, 30.0);
+	int decoUnderbrushID=rmCreateObjectDef("underbrush");
+	rmAddObjectDefItem(decoUnderbrushID, brushType, rmRandInt(2,4), 4.0);
+	rmSetObjectDefMinDistance(decoUnderbrushID, 0.0);
+	rmSetObjectDefMaxDistance(decoUnderbrushID, rmXFractionToMeters(0.5));
+      rmAddObjectDefConstraint(decoUnderbrushID, avoidAll);
+      rmAddObjectDefConstraint(decoUnderbrushID, avoidWater10);
+	rmAddObjectDefConstraint(decoUnderbrushID, avoidImpassableLand);
+	rmAddObjectDefConstraint(decoUnderbrushID, playerConstraintShort);
+	rmAddObjectDefConstraint(decoUnderbrushID, avoidBrush);
+	rmAddObjectDefConstraint(decoUnderbrushID, avoidTradeRoute);
+      rmPlaceObjectDefAtLoc(decoUnderbrushID, 0, 0.5, 0.5, 20*cNumberNonGaiaPlayers);
+   }
+
+// Water Flag
+   int waterFlagID=-1;
+   for(i=1; <cNumberPlayers)
+   {
+      rmClearClosestPointConstraints();
+      waterFlagID=rmCreateObjectDef("HC water flag "+i);
+      rmAddObjectDefItem(waterFlagID, "HomeCityWaterSpawnFlag", 1, 1.0);
+      rmAddObjectDefItem(waterFlagID, fishType, 2, 3.0);
+      rmAddClosestPointConstraint(flagEdgeConstraint);
+      rmAddClosestPointConstraint(flagVsFlag);
+      rmAddClosestPointConstraint(flagLand);
+      vector TCLocation = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startingTCID, i));
+      vector closestPoint = rmFindClosestPointVector(TCLocation, rmXFractionToMeters(1.0));
+      rmPlaceObjectDefAtLoc(waterFlagID, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+      rmClearClosestPointConstraints();
+   }
+
+// Text
+   rmSetStatusText("",0.90);
+
+// Fish
+   int fishVsFishID=rmCreateClassDistanceConstraint("fish v fish", rmClassID("classFish"), rmRandInt(23,27));
+   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 5.0);
+   int fishID=rmCreateObjectDef("fish");
+   rmAddObjectDefItem(fishID, fishType, 2, 5.0);
+   rmAddObjectDefToClass(fishID, rmClassID("classFish"));
+   rmSetObjectDefMinDistance(fishID, 0.0);
+   rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(fishID, fishVsFishID);
+   rmAddObjectDefConstraint(fishID, fishLand);
+   if (cNumberNonGaiaPlayers < 4)
+      rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*12);
+   else if (cNumberNonGaiaPlayers < 6)
+      rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*10);
+   else
+      rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*9);
+
+   int fishVsFish2ID=rmCreateClassDistanceConstraint("another fish v fish", rmClassID("classFish"), rmRandInt(18,22));
+   int fish2ID=rmCreateObjectDef("second type fish");
+   int fishLand2 = rmCreateTerrainDistanceConstraint("second fish land", "land", true, 3.0);
+   rmAddObjectDefItem(fish2ID, fish2Type, 1, 5.0);
+   rmAddObjectDefToClass(fish2ID, rmClassID("classFish"));
+   rmSetObjectDefMinDistance(fish2ID, 0.0);
+   rmSetObjectDefMaxDistance(fish2ID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(fish2ID, fishVsFish2ID);
+   rmAddObjectDefConstraint(fish2ID, fishLand2);
+   if (cNumberNonGaiaPlayers < 4)
+      rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*16);
+   else if (cNumberNonGaiaPlayers < 6)
+      rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*14);
+   else if (cNumberNonGaiaPlayers == 6)
+      rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*13);
+   else
+      rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*12);
+
+// Text
+   rmSetStatusText("",0.95);
+
+// Whales
+   int whaleID=rmCreateObjectDef("whale");
+   int whaleLand = rmCreateTerrainDistanceConstraint("whale v. land", "land", true, 18.0);
+   int whaleVsWhaleID=rmCreateTypeDistanceConstraint("whale v whale", whaleType, 70.0);
+   rmAddObjectDefItem(whaleID, whaleType, 1, 5.0);
+   rmSetObjectDefMinDistance(whaleID, 0.0);
+   rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(1.0));
+   rmAddObjectDefConstraint(whaleID, whaleVsWhaleID);
+   rmAddObjectDefConstraint(whaleID, whaleLand);
+   if (cNumberNonGaiaPlayers == 2)
+      rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.5, 7*cNumberNonGaiaPlayers);
+   else if (cNumberNonGaiaPlayers < 5)
+      rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
+   else
+      rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+
+// Water nuggets - random type - works for Asian map types only
+if (waterNuggets < 1)  
+{
+   if (patternChance > 28)
+   {
+      waterNuggets = 1;
+      threeChoice = rmRandInt(1,3);
+      if (threeChoice == 1) 
+ 	   rmSetMapType("Ceylon");
+      else if (threeChoice == 2) 
+    	   rmSetMapType("Borneo");
+      else if (threeChoice == 3) 
+ 	   rmSetMapType("Japan");
+   }
+}
+
+if (waterNuggets == 1)  
+{
+   int nuggetW= rmCreateObjectDef("nugget water"); 
+   rmAddObjectDefItem(nuggetW, "ypNuggetBoat", 1, 0.0);
+   rmAddObjectDefToClass(nuggetW, rmClassID("nuggets"));   
+   rmSetNuggetDifficulty(5, 5);
+   rmSetObjectDefMinDistance(nuggetW, 0.0);
+   rmSetObjectDefMaxDistance(nuggetW, size*0.5);
+   rmAddObjectDefConstraint(nuggetW, avoidLand10);
+   rmAddObjectDefConstraint(nuggetW, avoidNuggetLong);
+   rmAddObjectDefConstraint(nuggetW, flagVsFlag);
+   rmPlaceObjectDefAtLoc(nuggetW, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+}
+
+// Text
+   rmSetStatusText("",0.99);
+}  
diff --git a/RMM/amazonia.xs b/RMM/amazonia.xs
index e46d715..ad4e172 100644
--- a/RMM/amazonia.xs
+++ b/RMM/amazonia.xs
@@ -353,11 +353,11 @@ void main(void)
 
 	// Player placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 
-  // Text
-   rmSetStatusText("",0.20);
-
 
    // Text
    rmSetStatusText("",0.30);
@@ -933,16 +933,6 @@ void main(void)
     rmEchoInfo("YLOC = "+(1.0-xLoc));
   }
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
  // Resources that can be placed after forests
   
diff --git a/RMM/andes.xs b/RMM/andes.xs
index bf05145..6b2f73f 100644
--- a/RMM/andes.xs
+++ b/RMM/andes.xs
@@ -161,6 +161,9 @@ void main(void)
    rmSetStatusText("",0.10);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 12.0);
+	rmSetObjectDefMaxDistance(startingUnits, 20.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	if(cNumberTeams > 2) //ffa
 	{
 		rmSetPlacementSection(0.52, 0.90);
@@ -560,16 +563,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.60);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // KOTH check
   
diff --git a/RMM/araucania.xs b/RMM/araucania.xs
index bfcf347..a8bdc35 100644
--- a/RMM/araucania.xs
+++ b/RMM/araucania.xs
@@ -894,16 +894,6 @@ int classStartingUnits = rmDefineClass("Starting Units");
          forestFailCount = 0; 
    }
 
-    // Place random flags
-    int avoidFlags2 = rmCreateTypeDistanceConstraint("flags avoid flags 2", "ControlFlag", 70);
-    for ( i =1; <13 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags2);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/asianrandom.set b/RMM/asianrandom.set
index ed4aea4..107d962 100644
--- a/RMM/asianrandom.set
+++ b/RMM/asianrandom.set
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<randomMaps displayNameID="66519" imagepath="ui\random_map\asian_maps" helpTextID="66521" cannotReplace="">
+<randomMaps displayNameID="66519" imagepath="ui\random_map\africa\afroasianmaps" helpTextID="66521" cannotReplace="">
   <map>Mongolia</map>
   <map>Deccan</map>
   <map>Honshu</map>
   <map>borneo</map>
   <map>indochina</map>
   <map>Himalayas</map>
+  <map>himalayasUpper</map>
   <map>siberia</map>
   <map>silkRoad</map>
   <map>yellow riverDry</map>
   <map>Ceylon</map>
+  <map>Congo</map>
+  <map>Kilimanjaro</map>
+  <map>Madagascar</map>
+  <map>Nile River</map>
+  <map>Savanna Grass</map>
+  <map>Sahara</map>
+  <map>Indonesia</map>
+  <map>newzealand</map>
+  <map>australia</map>
 </randomMaps>
diff --git a/RMM/australia.xml b/RMM/australia.xml
new file mode 100644
index 0000000..b28b3cc
--- /dev/null
+++ b/RMM/australia.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\australia" 
+displayNameID = "130106"
+details = "130107" 
+loadDetails = "130108" 
+loadBackground="ui\random_map\africa\australia\australia_map">
+   <loadss>ui\random_map\africa\australia\australia_ss_01</loadss>
+   <loadss>ui\random_map\africa\australia\australia_ss_02</loadss>
+   <loadss>ui\random_map\africa\australia\australia_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/australia.xs b/RMM/australia.xs
new file mode 100644
index 0000000..520d91f
--- /dev/null
+++ b/RMM/australia.xs
@@ -0,0 +1,441 @@
+	/* Durokan's gold rush - Jan 18 2016 1.1 --Finished and released 2v2*/
+	include "mercenaries.xs";
+	include "ypAsianInclude.xs";
+	include "ypKOTHInclude.xs";
+ 
+	void main(void) {
+ 
+		rmSetStatusText("",0.1);
+
+		float playerTiles=12000;
+			if (cNumberNonGaiaPlayers>4)
+				playerTiles = 10000;
+			if (cNumberNonGaiaPlayers>6)
+				playerTiles = 8500;			
+		int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+		rmSetMapSize(size, size);
+        rmSetMapType("land");
+        rmSetMapType("grass");
+        rmSetMapType("bayou");
+        rmTerrainInitialize("grass");
+        rmSetLightingSet("texas");
+       
+        rmDefineClass("classForest");
+ 
+        int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+        int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+        int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 50.0);
+        int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+        int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+        int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+        int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 5.0);
+        int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+        int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+        int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+        int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+        int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+        int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+        int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+        int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);  
+        int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0);
+        int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0);
+        int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 10.0);
+	int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int classPatch = rmDefineClass("patch");
+		
+		int avoidRush=rmCreateTypeDistanceConstraint("avoid rush by a lot", "AbstractRush", 75.0);
+       
+        Float spawnSwitch = rmRandFloat(0,1.2);
+		
+	if (cNumberTeams == 2){
+		if (spawnSwitch <=0.6){
+			rmSetPlacementTeam(0);
+			rmPlacePlayersLine(0.2, 0.3, 0.2, 0.7, 0, 0);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersLine(0.8, 0.7, 0.8, 0.3, 0, 0);
+		}else if(spawnSwitch <=1.2){
+			rmSetPlacementTeam(1);
+			rmPlacePlayersLine(0.2, 0.3, 0.2, 0.7, 0, 0);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersLine(0.8, 0.7, 0.8, 0.3, 0, 0);
+		}
+	}else{
+			rmSetPlacementSection(0.16, 0.84);
+			rmPlacePlayersCircular(0.4, 0.4, 0.02);
+	}
+
+        chooseMercs();
+       
+		rmSetStatusText("",0.2);
+
+        int continent = rmCreateArea("continent");
+        rmSetAreaSize(continent, 1.0, 1.0);
+        rmSetAreaLocation(continent, 0.5, 0.0);
+        rmSetAreaTerrainType(continent, "andes\ground25_and");
+        rmSetAreaBaseHeight(continent, 0.0);
+        rmSetAreaCoherence(continent, 1.0);
+        rmSetAreaSmoothDistance(continent, 10);
+        rmSetAreaHeightBlend(continent, 1);
+        //rmSetAreaEdgeFilling(continent, 5);
+        rmSetAreaElevationNoiseBias(continent, 0);
+        rmSetAreaElevationEdgeFalloffDist(continent, 10);
+        rmSetAreaElevationVariation(continent, 3);
+        rmSetAreaElevationPersistence(continent, .2);
+        rmSetAreaElevationOctaves(continent, 3);
+        rmSetAreaElevationMinFrequency(continent, 0.04);
+        rmSetAreaElevationType(continent, cElevTurbulence);  
+        rmBuildArea(continent);  
+	
+	
+        int island = rmCreateArea("island");
+        rmSetAreaSize(island, 0.1, 0.1);
+        rmSetAreaLocation(island, 0.505, 0.88);
+        rmSetAreaTerrainType(island, "andes\ground25_and");
+        rmSetAreaBaseHeight(island, -3.0);
+        rmSetAreaCoherence(island, 0.95);
+	rmSetAreaElevationEdgeFalloffDist(island, 10);
+	rmAddAreaInfluenceSegment(island, 0.48, 0.88, 0.53, 0.88);
+        rmBuildArea(island);
+
+       
+        int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+        rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+        rmSetObjectDefAllowOverlap(socketID, true);
+        rmSetObjectDefMinDistance(socketID, 0.0);
+        rmSetObjectDefMaxDistance(socketID, 6.0);      
+       
+        int tradeRouteID = rmCreateTradeRoute();
+        rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+        rmAddTradeRouteWaypoint(tradeRouteID, 0.4, 0.01); // -1
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.4, 0.6, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.4, 0.7, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.2, 0.9, 2, 3); // -5
+        rmBuildTradeRoute(tradeRouteID, "dirt");
+ 
+        vector socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.15);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+        socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.50);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+        socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.85);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+//END TR
+ 
+//TR 2
+ 
+		rmSetStatusText("",0.3);
+
+        int socket2ID=rmCreateObjectDef("sockets to dock Trade Posts 2");
+        rmAddObjectDefItem(socket2ID, "SocketTradeRoute", 1, 0.0);
+        rmSetObjectDefAllowOverlap(socket2ID, true);
+        rmSetObjectDefMinDistance(socket2ID, 0.0);
+        rmSetObjectDefMaxDistance(socket2ID, 6.0);    
+ 
+        int tradeRoute2ID = rmCreateTradeRoute();
+        rmSetObjectDefTradeRouteID(socket2ID, tradeRoute2ID);
+       
+        rmAddTradeRouteWaypoint(tradeRoute2ID, 0.6, 0.01); // -1
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.6, 0.6, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.6, 0.7, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.8, 0.9, 2, 3); // -5
+ 
+        rmBuildTradeRoute(tradeRoute2ID, "dirt");
+ 
+        vector socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.15);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+       
+        socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.50);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+       
+        socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.85);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+          
+       
+// END TR 2
+ 
+		rmSetStatusText("",0.4);
+
+         int topgold = rmCreateObjectDef("goldrush");
+        rmAddObjectDefItem(topgold, "minegold", 1, 1.0);
+        rmSetObjectDefMinDistance(topgold, 0.0);
+        rmSetObjectDefMaxDistance(topgold, rmXFractionToMeters(0.1));
+        rmAddObjectDefConstraint(topgold, avoidCoin);
+        //rmAddObjectDefConstraint(topgold, avoidNatives);
+        rmAddObjectDefConstraint(topgold, avoidTownCenterMore);
+        rmAddObjectDefConstraint(topgold, avoidSocket);
+        rmAddObjectDefConstraint(topgold, AvoidWaterShort2);
+        rmAddObjectDefConstraint(topgold, forestConstraintShort);
+        rmAddObjectDefConstraint(topgold, circleConstraint);
+		rmAddObjectDefConstraint(topgold, avoidRush);
+        rmPlaceObjectDefAtLoc(topgold, 0, 0.505, 0.88, 11);
+
+        int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+        rmSetObjectDefMinDistance(playerStart, 7.0);
+        rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+       
+        int goldID = rmCreateObjectDef("starting gold");
+        rmAddObjectDefItem(goldID, "MineCopper", 1, 8.0);
+        rmSetObjectDefMinDistance(goldID, 15.0);
+        rmSetObjectDefMaxDistance(goldID, 15.0);
+       
+        int gold2ID = rmCreateObjectDef("starting gold 2");
+        rmAddObjectDefItem(gold2ID, "mine", 1, 16.0);
+        rmSetObjectDefMinDistance(gold2ID, 15.0);
+        rmSetObjectDefMaxDistance(gold2ID, 15.0);
+        rmAddObjectDefConstraint(gold2ID, avoidCoin);
+ 
+        int berryID = rmCreateObjectDef("starting berries");
+        rmAddObjectDefItem(berryID, "BerryBush", 2, 6.0);
+        rmSetObjectDefMinDistance(berryID, 8.0);
+        rmSetObjectDefMaxDistance(berryID, 12.0);
+        rmAddObjectDefConstraint(berryID, avoidCoin);
+ 
+        int treeID = rmCreateObjectDef("starting trees");
+        rmAddObjectDefItem(treeID, "TreeSonora", rmRandInt(6,9), 10.0);
+        rmAddObjectDefItem(treeID, "UnderbrushTexas", rmRandInt(8,10), 12.0);
+        rmSetObjectDefMinDistance(treeID, 12.0);
+        rmSetObjectDefMaxDistance(treeID, 18.0);
+        rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+        rmAddObjectDefConstraint(treeID, avoidCoin);
+ 
+        int foodID = rmCreateObjectDef("starting hunt");
+        rmAddObjectDefItem(foodID, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID, 10.0);
+        rmSetObjectDefMaxDistance(foodID, 10.0);
+        rmSetObjectDefCreateHerd(foodID, true);
+ 
+		rmSetStatusText("",0.5);
+
+        int foodID2 = rmCreateObjectDef("starting hunt 2");
+        rmAddObjectDefItem(foodID2, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID2, 40.0);
+        rmSetObjectDefMaxDistance(foodID2, 40.0);
+        rmSetObjectDefCreateHerd(foodID2, true);
+               
+		int foodID3 = rmCreateObjectDef("starting hunt 3");
+        rmAddObjectDefItem(foodID3, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID3, 70.0);
+        rmSetObjectDefMaxDistance(foodID3, 70.0);
+        rmSetObjectDefCreateHerd(foodID3, true);
+	      
+
+        for(i=1; <cNumberPlayers) {
+    int id=rmCreateArea("Player"+i);
+    rmSetPlayerArea(i, id);
+    int startID = rmCreateObjectDef("object"+i);
+    rmAddObjectDefItem(startID, "TownCenter", 1, 5.0);
+    rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(gold2ID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID2, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+  }
+ 
+        for (j=0; < (4*4)) {  
+                int StartAreaTree2ID=rmCreateObjectDef("starting trees dirt"+j);
+                rmAddObjectDefItem(StartAreaTree2ID, "TreeSonora", rmRandInt(8,10), rmRandFloat(8.0,16.0));
+                rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest"));
+                rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+                rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRoute);
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocket);
+                //rmAddObjectDefConstraint(StartAreaTree2ID, avoidNatives);
+                rmAddObjectDefConstraint(StartAreaTree2ID, circleConstraint);
+                rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+                //rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenter);  
+                rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);  
+				rmAddObjectDefConstraint(StartAreaTree2ID, avoidRush);
+                rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 5*4);
+        }
+
+		for (i=0; < cNumberNonGaiaPlayers*50){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "andes\ground25_and", "andes\ground22_and");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+
+		rmSetStatusText("",0.6);
+
+        int leftmines = rmCreateObjectDef("left gold mines");
+        rmAddObjectDefItem(leftmines, "MineCopper", 1, 1.0);
+        rmSetObjectDefMinDistance(leftmines, 0.0);
+        rmSetObjectDefMaxDistance(leftmines, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftmines, avoidCoinMed);
+        rmAddObjectDefConstraint(leftmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(leftmines, avoidSocket);
+        rmAddObjectDefConstraint(leftmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(leftmines, forestConstraintShort);
+        rmAddObjectDefConstraint(leftmines, circleConstraint);
+		rmAddObjectDefConstraint(leftmines, avoidRush);
+        rmPlaceObjectDefAtLoc(leftmines, 0, 0.25, 0.35, 6);
+		
+        int rightmines = rmCreateObjectDef("right gold mines");
+        rmAddObjectDefItem(rightmines, "MineCopper", 1, 1.0);
+        rmSetObjectDefMinDistance(rightmines, 0.0);
+        rmSetObjectDefMaxDistance(rightmines, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightmines, avoidCoinMed);
+        rmAddObjectDefConstraint(rightmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(rightmines, avoidSocket);
+        rmAddObjectDefConstraint(rightmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(rightmines, forestConstraintShort);
+        rmAddObjectDefConstraint(rightmines, circleConstraint);
+		rmAddObjectDefConstraint(rightmines, avoidRush);
+        rmPlaceObjectDefAtLoc(rightmines, 0, 0.75, 0.35, 6);
+		
+	
+	int ambiental = rmCreateObjectDef("ambiental");
+	rmAddObjectDefItem(ambiental, "UnderbrushAus", 1, 5.0);
+	rmSetObjectDefMinDistance(ambiental, 0);
+	rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(ambiental, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(ambiental, avoidNuggetSmall);
+	rmAddObjectDefConstraint(ambiental, avoidSocketMore);
+	rmAddObjectDefConstraint(ambiental, avoidCoin);
+	rmAddObjectDefConstraint(ambiental, avoidAll);
+	rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 80*cNumberNonGaiaPlayers);	
+    
+
+        int rheaxID = rmCreateObjectDef("caribou hunts");
+        rmAddObjectDefItem(rheaxID, "rhea", rmRandInt(7,7), 10.0);
+        rmSetObjectDefCreateHerd(rheaxID, true);
+        rmSetObjectDefMinDistance(rheaxID, 0);
+        rmSetObjectDefMaxDistance(rheaxID, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(rheaxID, circleConstraint);
+        rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+        rmAddObjectDefConstraint(rheaxID, avoidHunt);
+		rmAddObjectDefConstraint(rheaxID, avoidRush);
+        rmPlaceObjectDefAtLoc(rheaxID, 0, 0.5, 0.5, 20);
+
+		rmSetStatusText("",0.7);
+
+        /*
+        int herdableID=rmCreateObjectDef("cow");
+        rmAddObjectDefItem(herdableID, "cow", 1, 4.0);
+        rmSetObjectDefMinDistance(herdableID, 0.0);
+        rmSetObjectDefMaxDistance(herdableID, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(rheaxID, circleConstraint);
+        rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+        rmAddObjectDefConstraint(rheaxID, avoidHunt);
+        rmPlaceObjectDefAtLoc(herdableID, 0, 0.5, 0.5, 12);
+  */
+
+        int leftnuggeteasy= rmCreateObjectDef("leftnuggeteasy");
+        rmAddObjectDefItem(leftnuggeteasy, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(leftnuggeteasy, 0.0);
+        rmSetObjectDefMaxDistance(leftnuggeteasy, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidNugget);
+        rmAddObjectDefConstraint(leftnuggeteasy, circleConstraint);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidTownCenter);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidCoin);
+        rmAddObjectDefConstraint(leftnuggeteasy, forestConstraintShort);
+        //rmAddObjectDefConstraint(leftnuggeteasy, avoidNatives);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidWaterShort);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidSocket);
+		rmAddObjectDefConstraint(leftnuggeteasy, avoidRush);
+        rmSetNuggetDifficulty(1, 1);
+        rmPlaceObjectDefAtLoc(leftnuggeteasy, 0, 0.25, 0.35, 3);  
+		
+        int leftnuggetmed= rmCreateObjectDef("leftnuggetmed");
+        rmAddObjectDefItem(leftnuggetmed, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(leftnuggetmed, 0.0);
+        rmSetObjectDefMaxDistance(leftnuggetmed, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftnuggetmed, avoidNugget);
+        rmAddObjectDefConstraint(leftnuggetmed, circleConstraint);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidTownCenter);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidCoin);
+        rmAddObjectDefConstraint(leftnuggetmed, forestConstraintShort);
+        //rmAddObjectDefConstraint(leftnuggetmed, avoidNatives);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidWaterShort);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidSocket);
+		rmAddObjectDefConstraint(leftnuggetmed, avoidRush);
+        rmSetNuggetDifficulty(2, 2);
+        rmPlaceObjectDefAtLoc(leftnuggetmed, 0, 0.25, 0.35, 4);  		
+		
+		rmSetStatusText("",0.8);
+
+        int rightnuggeteasy= rmCreateObjectDef("rightnuggeteasy");
+        rmAddObjectDefItem(rightnuggeteasy, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(rightnuggeteasy, 0.0);
+        rmSetObjectDefMaxDistance(rightnuggeteasy, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidNugget);
+        rmAddObjectDefConstraint(rightnuggeteasy, circleConstraint);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidTownCenter);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidCoin);
+        rmAddObjectDefConstraint(rightnuggeteasy, forestConstraintShort);
+        //rmAddObjectDefConstraint(rightnuggeteasy, avoidNatives);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidWaterShort);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidSocket);
+		rmAddObjectDefConstraint(rightnuggeteasy, avoidRush);
+        rmSetNuggetDifficulty(1, 1);
+        rmPlaceObjectDefAtLoc(rightnuggeteasy, 0, 0.75, 0.35, 3);  		
+  
+
+        int rightnuggetmed= rmCreateObjectDef("rightnuggetmed");
+        rmAddObjectDefItem(rightnuggetmed, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(rightnuggetmed, 0.0);
+        rmSetObjectDefMaxDistance(rightnuggetmed, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightnuggetmed, avoidNugget);
+        rmAddObjectDefConstraint(rightnuggetmed, circleConstraint);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidTownCenter);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidCoin);
+        rmAddObjectDefConstraint(rightnuggetmed, forestConstraintShort);
+        //rmAddObjectDefConstraint(rightnuggetmed, avoidNatives);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidWaterShort);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidSocket);
+		rmAddObjectDefConstraint(rightnuggetmed, avoidRush);
+        rmSetNuggetDifficulty(2, 2);
+        rmPlaceObjectDefAtLoc(rightnuggetmed, 0, 0.75, 0.35, 4); 
+		
+		rmSetStatusText("",0.9);
+
+        int nuggethard= rmCreateObjectDef("nuggethard");
+        rmAddObjectDefItem(nuggethard, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(nuggethard, 0.0);
+        rmSetObjectDefMaxDistance(nuggethard, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(nuggethard, avoidNugget);
+        rmAddObjectDefConstraint(nuggethard, circleConstraint);
+        rmAddObjectDefConstraint(nuggethard, avoidTownCenter);
+        rmAddObjectDefConstraint(nuggethard, avoidCoin);
+        rmAddObjectDefConstraint(nuggethard, forestConstraintShort);
+        //rmAddObjectDefConstraint(nuggethard, avoidNatives);
+        rmAddObjectDefConstraint(nuggethard, avoidWaterShort);
+        rmAddObjectDefConstraint(nuggethard, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(nuggethard, avoidSocket);
+		rmAddObjectDefConstraint(nuggethard, avoidRush);
+        rmSetNuggetDifficulty(4, 4);
+        rmPlaceObjectDefAtLoc(nuggethard, 0, 0.505, 0.88, 4);  
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.5;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+		rmSetStatusText("",1.0);
+				
+}
\ No newline at end of file
diff --git a/RMM/australialarge.xml b/RMM/australialarge.xml
new file mode 100644
index 0000000..cce86ce
--- /dev/null
+++ b/RMM/australialarge.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\australia" 
+displayNameID = "130109"
+details = "130110" 
+loadDetails = "130108" 
+loadBackground="ui\random_map\africa\australia\australia_map">
+   <loadss>ui\random_map\africa\australia\australia_ss_01</loadss>
+   <loadss>ui\random_map\africa\australia\australia_ss_02</loadss>
+   <loadss>ui\random_map\africa\australia\australia_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/australialarge.xs b/RMM/australialarge.xs
new file mode 100644
index 0000000..5eabac6
--- /dev/null
+++ b/RMM/australialarge.xs
@@ -0,0 +1,441 @@
+	/* Durokan's gold rush - Jan 18 2016 1.1 --Finished and released 2v2*/
+	include "mercenaries.xs";
+	include "ypAsianInclude.xs";
+	include "ypKOTHInclude.xs";
+ 
+	void main(void) {
+ 
+		rmSetStatusText("",0.1);
+
+		float playerTiles=18000;
+			if (cNumberNonGaiaPlayers>4)
+				playerTiles = 16000;
+			if (cNumberNonGaiaPlayers>6)
+				playerTiles = 14000;			
+		int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+		rmSetMapSize(size, size);
+        rmSetMapType("land");
+        rmSetMapType("grass");
+        rmSetMapType("bayou");
+        rmTerrainInitialize("grass");
+        rmSetLightingSet("texas");
+       
+        rmDefineClass("classForest");
+ 
+        int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+        int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+        int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 50.0);
+        int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+        int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+        int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+        int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 5.0);
+        int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+        int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+        int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+        int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+        int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+        int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+        int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+        int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);  
+        int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0);
+        int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0);
+        int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 10.0);
+	int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int classPatch = rmDefineClass("patch");
+		
+		int avoidRush=rmCreateTypeDistanceConstraint("avoid rush by a lot", "AbstractRush", 75.0);
+       
+        Float spawnSwitch = rmRandFloat(0,1.2);
+		
+	if (cNumberTeams == 2){
+		if (spawnSwitch <=0.6){
+			rmSetPlacementTeam(0);
+			rmPlacePlayersLine(0.2, 0.3, 0.2, 0.7, 0, 0);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersLine(0.8, 0.7, 0.8, 0.3, 0, 0);
+		}else if(spawnSwitch <=1.2){
+			rmSetPlacementTeam(1);
+			rmPlacePlayersLine(0.2, 0.3, 0.2, 0.7, 0, 0);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersLine(0.8, 0.7, 0.8, 0.3, 0, 0);
+		}
+	}else{
+			rmSetPlacementSection(0.16, 0.84);
+			rmPlacePlayersCircular(0.4, 0.4, 0.02);
+	}
+
+        chooseMercs();
+       
+		rmSetStatusText("",0.2);
+
+        int continent = rmCreateArea("continent");
+        rmSetAreaSize(continent, 1.0, 1.0);
+        rmSetAreaLocation(continent, 0.5, 0.0);
+        rmSetAreaTerrainType(continent, "andes\ground25_and");
+        rmSetAreaBaseHeight(continent, 0.0);
+        rmSetAreaCoherence(continent, 1.0);
+        rmSetAreaSmoothDistance(continent, 10);
+        rmSetAreaHeightBlend(continent, 1);
+        //rmSetAreaEdgeFilling(continent, 5);
+        rmSetAreaElevationNoiseBias(continent, 0);
+        rmSetAreaElevationEdgeFalloffDist(continent, 10);
+        rmSetAreaElevationVariation(continent, 3);
+        rmSetAreaElevationPersistence(continent, .2);
+        rmSetAreaElevationOctaves(continent, 3);
+        rmSetAreaElevationMinFrequency(continent, 0.04);
+        rmSetAreaElevationType(continent, cElevTurbulence);  
+        rmBuildArea(continent);  
+	
+	
+        int island = rmCreateArea("island");
+        rmSetAreaSize(island, 0.1, 0.1);
+        rmSetAreaLocation(island, 0.505, 0.88);
+        rmSetAreaTerrainType(island, "andes\ground25_and");
+        rmSetAreaBaseHeight(island, -3.0);
+        rmSetAreaCoherence(island, 0.95);
+	rmSetAreaElevationEdgeFalloffDist(island, 10);
+	rmAddAreaInfluenceSegment(island, 0.48, 0.88, 0.53, 0.88);
+        rmBuildArea(island);
+
+       
+        int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+        rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+        rmSetObjectDefAllowOverlap(socketID, true);
+        rmSetObjectDefMinDistance(socketID, 0.0);
+        rmSetObjectDefMaxDistance(socketID, 6.0);      
+       
+        int tradeRouteID = rmCreateTradeRoute();
+        rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+        rmAddTradeRouteWaypoint(tradeRouteID, 0.4, 0.01); // -1
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.4, 0.6, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.4, 0.7, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.2, 0.9, 2, 3); // -5
+        rmBuildTradeRoute(tradeRouteID, "dirt");
+ 
+        vector socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.15);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+        socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.50);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+        socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.85);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+//END TR
+ 
+//TR 2
+ 
+		rmSetStatusText("",0.3);
+
+        int socket2ID=rmCreateObjectDef("sockets to dock Trade Posts 2");
+        rmAddObjectDefItem(socket2ID, "SocketTradeRoute", 1, 0.0);
+        rmSetObjectDefAllowOverlap(socket2ID, true);
+        rmSetObjectDefMinDistance(socket2ID, 0.0);
+        rmSetObjectDefMaxDistance(socket2ID, 6.0);    
+ 
+        int tradeRoute2ID = rmCreateTradeRoute();
+        rmSetObjectDefTradeRouteID(socket2ID, tradeRoute2ID);
+       
+        rmAddTradeRouteWaypoint(tradeRoute2ID, 0.6, 0.01); // -1
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.6, 0.6, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.6, 0.7, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.8, 0.9, 2, 3); // -5
+ 
+        rmBuildTradeRoute(tradeRoute2ID, "dirt");
+ 
+        vector socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.15);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+       
+        socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.50);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+       
+        socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.85);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+          
+       
+// END TR 2
+ 
+		rmSetStatusText("",0.4);
+
+         int topgold = rmCreateObjectDef("goldrush");
+        rmAddObjectDefItem(topgold, "minegold", 1, 1.0);
+        rmSetObjectDefMinDistance(topgold, 0.0);
+        rmSetObjectDefMaxDistance(topgold, rmXFractionToMeters(0.1));
+        rmAddObjectDefConstraint(topgold, avoidCoin);
+        //rmAddObjectDefConstraint(topgold, avoidNatives);
+        rmAddObjectDefConstraint(topgold, avoidTownCenterMore);
+        rmAddObjectDefConstraint(topgold, avoidSocket);
+        rmAddObjectDefConstraint(topgold, AvoidWaterShort2);
+        rmAddObjectDefConstraint(topgold, forestConstraintShort);
+        rmAddObjectDefConstraint(topgold, circleConstraint);
+		rmAddObjectDefConstraint(topgold, avoidRush);
+        rmPlaceObjectDefAtLoc(topgold, 0, 0.505, 0.88, 15);
+
+        int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+        rmSetObjectDefMinDistance(playerStart, 7.0);
+        rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+       
+        int goldID = rmCreateObjectDef("starting gold");
+        rmAddObjectDefItem(goldID, "MineCopper", 1, 8.0);
+        rmSetObjectDefMinDistance(goldID, 15.0);
+        rmSetObjectDefMaxDistance(goldID, 15.0);
+       
+        int gold2ID = rmCreateObjectDef("starting gold 2");
+        rmAddObjectDefItem(gold2ID, "mine", 1, 16.0);
+        rmSetObjectDefMinDistance(gold2ID, 15.0);
+        rmSetObjectDefMaxDistance(gold2ID, 15.0);
+        rmAddObjectDefConstraint(gold2ID, avoidCoin);
+ 
+        int berryID = rmCreateObjectDef("starting berries");
+        rmAddObjectDefItem(berryID, "BerryBush", 2, 6.0);
+        rmSetObjectDefMinDistance(berryID, 8.0);
+        rmSetObjectDefMaxDistance(berryID, 12.0);
+        rmAddObjectDefConstraint(berryID, avoidCoin);
+ 
+        int treeID = rmCreateObjectDef("starting trees");
+        rmAddObjectDefItem(treeID, "TreeSonora", rmRandInt(6,9), 10.0);
+        rmAddObjectDefItem(treeID, "UnderbrushTexas", rmRandInt(8,10), 12.0);
+        rmSetObjectDefMinDistance(treeID, 12.0);
+        rmSetObjectDefMaxDistance(treeID, 18.0);
+        rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+        rmAddObjectDefConstraint(treeID, avoidCoin);
+ 
+        int foodID = rmCreateObjectDef("starting hunt");
+        rmAddObjectDefItem(foodID, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID, 10.0);
+        rmSetObjectDefMaxDistance(foodID, 10.0);
+        rmSetObjectDefCreateHerd(foodID, true);
+ 
+		rmSetStatusText("",0.5);
+
+        int foodID2 = rmCreateObjectDef("starting hunt 2");
+        rmAddObjectDefItem(foodID2, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID2, 40.0);
+        rmSetObjectDefMaxDistance(foodID2, 40.0);
+        rmSetObjectDefCreateHerd(foodID2, true);
+               
+		int foodID3 = rmCreateObjectDef("starting hunt 3");
+        rmAddObjectDefItem(foodID3, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID3, 70.0);
+        rmSetObjectDefMaxDistance(foodID3, 70.0);
+        rmSetObjectDefCreateHerd(foodID3, true);
+	      
+
+        for(i=1; <cNumberPlayers) {
+    int id=rmCreateArea("Player"+i);
+    rmSetPlayerArea(i, id);
+    int startID = rmCreateObjectDef("object"+i);
+    rmAddObjectDefItem(startID, "TownCenter", 1, 5.0);
+    rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(gold2ID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID2, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+  }
+ 
+        for (j=0; < (4*4)) {  
+                int StartAreaTree2ID=rmCreateObjectDef("starting trees dirt"+j);
+                rmAddObjectDefItem(StartAreaTree2ID, "TreeSonora", rmRandInt(8,10), rmRandFloat(8.0,16.0));
+                rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest"));
+                rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+                rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRoute);
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocket);
+                //rmAddObjectDefConstraint(StartAreaTree2ID, avoidNatives);
+                rmAddObjectDefConstraint(StartAreaTree2ID, circleConstraint);
+                rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+                //rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenter);  
+                rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);  
+				rmAddObjectDefConstraint(StartAreaTree2ID, avoidRush);
+                rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 6*5);
+        }
+
+		for (i=0; < cNumberNonGaiaPlayers*60){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "andes\ground25_and", "andes\ground22_and");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+
+		rmSetStatusText("",0.6);
+
+        int leftmines = rmCreateObjectDef("left gold mines");
+        rmAddObjectDefItem(leftmines, "MineCopper", 1, 1.0);
+        rmSetObjectDefMinDistance(leftmines, 0.0);
+        rmSetObjectDefMaxDistance(leftmines, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftmines, avoidCoinMed);
+        rmAddObjectDefConstraint(leftmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(leftmines, avoidSocket);
+        rmAddObjectDefConstraint(leftmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(leftmines, forestConstraintShort);
+        rmAddObjectDefConstraint(leftmines, circleConstraint);
+		rmAddObjectDefConstraint(leftmines, avoidRush);
+        rmPlaceObjectDefAtLoc(leftmines, 0, 0.25, 0.35, 6);
+		
+        int rightmines = rmCreateObjectDef("right gold mines");
+        rmAddObjectDefItem(rightmines, "MineCopper", 1, 1.0);
+        rmSetObjectDefMinDistance(rightmines, 0.0);
+        rmSetObjectDefMaxDistance(rightmines, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightmines, avoidCoinMed);
+        rmAddObjectDefConstraint(rightmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(rightmines, avoidSocket);
+        rmAddObjectDefConstraint(rightmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(rightmines, forestConstraintShort);
+        rmAddObjectDefConstraint(rightmines, circleConstraint);
+		rmAddObjectDefConstraint(rightmines, avoidRush);
+        rmPlaceObjectDefAtLoc(rightmines, 0, 0.75, 0.35, 6);
+		
+	
+	int ambiental = rmCreateObjectDef("ambiental");
+	rmAddObjectDefItem(ambiental, "UnderbrushAus", 1, 5.0);
+	rmSetObjectDefMinDistance(ambiental, 0);
+	rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(ambiental, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(ambiental, avoidNuggetSmall);
+	rmAddObjectDefConstraint(ambiental, avoidSocketMore);
+	rmAddObjectDefConstraint(ambiental, avoidCoin);
+	rmAddObjectDefConstraint(ambiental, avoidAll);
+	rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 80*cNumberNonGaiaPlayers);	
+    
+
+        int rheaxID = rmCreateObjectDef("caribou hunts");
+        rmAddObjectDefItem(rheaxID, "rhea", rmRandInt(7,7), 10.0);
+        rmSetObjectDefCreateHerd(rheaxID, true);
+        rmSetObjectDefMinDistance(rheaxID, 0);
+        rmSetObjectDefMaxDistance(rheaxID, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(rheaxID, circleConstraint);
+        rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+        rmAddObjectDefConstraint(rheaxID, avoidHunt);
+		rmAddObjectDefConstraint(rheaxID, avoidRush);
+        rmPlaceObjectDefAtLoc(rheaxID, 0, 0.5, 0.5, 20);
+
+		rmSetStatusText("",0.7);
+
+        /*
+        int herdableID=rmCreateObjectDef("cow");
+        rmAddObjectDefItem(herdableID, "cow", 1, 4.0);
+        rmSetObjectDefMinDistance(herdableID, 0.0);
+        rmSetObjectDefMaxDistance(herdableID, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(rheaxID, circleConstraint);
+        rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+        rmAddObjectDefConstraint(rheaxID, avoidHunt);
+        rmPlaceObjectDefAtLoc(herdableID, 0, 0.5, 0.5, 12);
+  */
+
+        int leftnuggeteasy= rmCreateObjectDef("leftnuggeteasy");
+        rmAddObjectDefItem(leftnuggeteasy, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(leftnuggeteasy, 0.0);
+        rmSetObjectDefMaxDistance(leftnuggeteasy, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidNugget);
+        rmAddObjectDefConstraint(leftnuggeteasy, circleConstraint);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidTownCenter);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidCoin);
+        rmAddObjectDefConstraint(leftnuggeteasy, forestConstraintShort);
+        //rmAddObjectDefConstraint(leftnuggeteasy, avoidNatives);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidWaterShort);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidSocket);
+		rmAddObjectDefConstraint(leftnuggeteasy, avoidRush);
+        rmSetNuggetDifficulty(1, 1);
+        rmPlaceObjectDefAtLoc(leftnuggeteasy, 0, 0.25, 0.35, 3);  
+		
+        int leftnuggetmed= rmCreateObjectDef("leftnuggetmed");
+        rmAddObjectDefItem(leftnuggetmed, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(leftnuggetmed, 0.0);
+        rmSetObjectDefMaxDistance(leftnuggetmed, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftnuggetmed, avoidNugget);
+        rmAddObjectDefConstraint(leftnuggetmed, circleConstraint);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidTownCenter);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidCoin);
+        rmAddObjectDefConstraint(leftnuggetmed, forestConstraintShort);
+        //rmAddObjectDefConstraint(leftnuggetmed, avoidNatives);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidWaterShort);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidSocket);
+		rmAddObjectDefConstraint(leftnuggetmed, avoidRush);
+        rmSetNuggetDifficulty(2, 2);
+        rmPlaceObjectDefAtLoc(leftnuggetmed, 0, 0.25, 0.35, 4);  		
+		
+		rmSetStatusText("",0.8);
+
+        int rightnuggeteasy= rmCreateObjectDef("rightnuggeteasy");
+        rmAddObjectDefItem(rightnuggeteasy, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(rightnuggeteasy, 0.0);
+        rmSetObjectDefMaxDistance(rightnuggeteasy, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidNugget);
+        rmAddObjectDefConstraint(rightnuggeteasy, circleConstraint);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidTownCenter);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidCoin);
+        rmAddObjectDefConstraint(rightnuggeteasy, forestConstraintShort);
+        //rmAddObjectDefConstraint(rightnuggeteasy, avoidNatives);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidWaterShort);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidSocket);
+		rmAddObjectDefConstraint(rightnuggeteasy, avoidRush);
+        rmSetNuggetDifficulty(1, 1);
+        rmPlaceObjectDefAtLoc(rightnuggeteasy, 0, 0.75, 0.35, 3);  		
+  
+
+        int rightnuggetmed= rmCreateObjectDef("rightnuggetmed");
+        rmAddObjectDefItem(rightnuggetmed, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(rightnuggetmed, 0.0);
+        rmSetObjectDefMaxDistance(rightnuggetmed, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightnuggetmed, avoidNugget);
+        rmAddObjectDefConstraint(rightnuggetmed, circleConstraint);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidTownCenter);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidCoin);
+        rmAddObjectDefConstraint(rightnuggetmed, forestConstraintShort);
+        //rmAddObjectDefConstraint(rightnuggetmed, avoidNatives);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidWaterShort);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidSocket);
+		rmAddObjectDefConstraint(rightnuggetmed, avoidRush);
+        rmSetNuggetDifficulty(2, 2);
+        rmPlaceObjectDefAtLoc(rightnuggetmed, 0, 0.75, 0.35, 4); 
+		
+		rmSetStatusText("",0.9);
+
+        int nuggethard= rmCreateObjectDef("nuggethard");
+        rmAddObjectDefItem(nuggethard, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(nuggethard, 0.0);
+        rmSetObjectDefMaxDistance(nuggethard, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(nuggethard, avoidNugget);
+        rmAddObjectDefConstraint(nuggethard, circleConstraint);
+        rmAddObjectDefConstraint(nuggethard, avoidTownCenter);
+        rmAddObjectDefConstraint(nuggethard, avoidCoin);
+        rmAddObjectDefConstraint(nuggethard, forestConstraintShort);
+        //rmAddObjectDefConstraint(nuggethard, avoidNatives);
+        rmAddObjectDefConstraint(nuggethard, avoidWaterShort);
+        rmAddObjectDefConstraint(nuggethard, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(nuggethard, avoidSocket);
+		rmAddObjectDefConstraint(nuggethard, avoidRush);
+        rmSetNuggetDifficulty(4, 4);
+        rmPlaceObjectDefAtLoc(nuggethard, 0, 0.505, 0.88, 4);  
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.5;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+		rmSetStatusText("",1.0);
+				
+}
\ No newline at end of file
diff --git a/RMM/australiaregicide.xml b/RMM/australiaregicide.xml
new file mode 100644
index 0000000..58289da
--- /dev/null
+++ b/RMM/australiaregicide.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\australia" 
+displayNameID = "130111"
+details = "130112" 
+loadDetails = "130113" 
+loadBackground="ui\random_map\africa\australia\australia_map">
+   <loadss>ui\random_map\africa\australia\australia_ss_01</loadss>
+   <loadss>ui\random_map\africa\australia\australia_ss_02</loadss>
+   <loadss>ui\random_map\africa\australia\australia_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/australiaregicide.xs b/RMM/australiaregicide.xs
new file mode 100644
index 0000000..a07924a
--- /dev/null
+++ b/RMM/australiaregicide.xs
@@ -0,0 +1,486 @@
+	/* Durokan's gold rush - Jan 18 2016 1.1 --Finished and released 2v2*/
+	include "mercenaries.xs";
+	include "ypAsianInclude.xs";
+	include "ypKOTHInclude.xs";
+ 
+	void main(void) {
+ 
+		rmSetStatusText("",0.1);
+
+		float playerTiles=15000;
+			if (cNumberNonGaiaPlayers>4)
+				playerTiles = 13000;
+			if (cNumberNonGaiaPlayers>6)
+				playerTiles = 11000;			
+		int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+		rmSetMapSize(size, size);
+        rmSetMapType("land");
+        rmSetMapType("grass");
+        rmSetMapType("bayou");
+        rmTerrainInitialize("grass");
+        rmSetLightingSet("texas");
+       
+        rmDefineClass("classForest");
+ 
+        int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.49), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+        int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);
+        int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 50.0);
+        int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+        int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+        int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+        int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 5.0);
+        int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 6);
+        int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+        int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+        int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+        int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+        int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+        int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 18.0);
+        int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);  
+        int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0);
+        int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0);
+        int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
+	int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+        int classPatch = rmDefineClass("patch");
+	int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 4.0);
+		
+		int avoidRush=rmCreateTypeDistanceConstraint("avoid rush by a lot", "AbstractRush", 75.0);
+       
+        Float spawnSwitch = rmRandFloat(0,1.2);
+		
+	if (cNumberTeams == 2){
+		if (spawnSwitch <=0.6){
+			rmSetPlacementTeam(0);
+			rmPlacePlayersLine(0.2, 0.3, 0.2, 0.7, 0, 0);
+			rmSetPlacementTeam(1);
+			rmPlacePlayersLine(0.8, 0.7, 0.8, 0.3, 0, 0);
+		}else if(spawnSwitch <=1.2){
+			rmSetPlacementTeam(1);
+			rmPlacePlayersLine(0.2, 0.3, 0.2, 0.7, 0, 0);
+			rmSetPlacementTeam(0);
+			rmPlacePlayersLine(0.8, 0.7, 0.8, 0.3, 0, 0);
+		}
+	}else{
+			rmSetPlacementSection(0.16, 0.84);
+			rmPlacePlayersCircular(0.38, 0.38, 0.02);
+	}
+
+        chooseMercs();
+       
+		rmSetStatusText("",0.2);
+
+        int continent = rmCreateArea("continent");
+        rmSetAreaSize(continent, 1.0, 1.0);
+        rmSetAreaLocation(continent, 0.5, 0.0);
+        rmSetAreaTerrainType(continent, "andes\ground25_and");
+        rmSetAreaBaseHeight(continent, 0.0);
+        rmSetAreaCoherence(continent, 1.0);
+        rmSetAreaSmoothDistance(continent, 10);
+        rmSetAreaHeightBlend(continent, 1);
+        //rmSetAreaEdgeFilling(continent, 5);
+        rmSetAreaElevationNoiseBias(continent, 0);
+        rmSetAreaElevationEdgeFalloffDist(continent, 10);
+        rmSetAreaElevationVariation(continent, 3);
+        rmSetAreaElevationPersistence(continent, .2);
+        rmSetAreaElevationOctaves(continent, 3);
+        rmSetAreaElevationMinFrequency(continent, 0.04);
+        rmSetAreaElevationType(continent, cElevTurbulence);  
+        rmBuildArea(continent);  
+	
+	
+        int island = rmCreateArea("island");
+        rmSetAreaSize(island, 0.1, 0.1);
+        rmSetAreaLocation(island, 0.505, 0.88);
+        rmSetAreaTerrainType(island, "andes\ground25_and");
+        rmSetAreaBaseHeight(island, -3.0);
+        rmSetAreaCoherence(island, 0.95);
+	rmSetAreaElevationEdgeFalloffDist(island, 10);
+	rmAddAreaInfluenceSegment(island, 0.48, 0.88, 0.53, 0.88);
+        rmBuildArea(island);
+
+       
+        int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+        rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+        rmSetObjectDefAllowOverlap(socketID, true);
+        rmSetObjectDefMinDistance(socketID, 0.0);
+        rmSetObjectDefMaxDistance(socketID, 6.0);      
+       
+        int tradeRouteID = rmCreateTradeRoute();
+        rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+        rmAddTradeRouteWaypoint(tradeRouteID, 0.49, 0.01); // -1
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.4, 0.6, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.4, 0.7, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.2, 0.9, 2, 3); // -5
+        rmBuildTradeRoute(tradeRouteID, "dirt");
+ 
+        vector socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.20);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+        socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.50);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+        socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.85);
+        rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+       
+//END TR
+ 
+//TR 2
+ 
+		rmSetStatusText("",0.3);
+
+        int socket2ID=rmCreateObjectDef("sockets to dock Trade Posts 2");
+        rmAddObjectDefItem(socket2ID, "SocketTradeRoute", 1, 0.0);
+        rmSetObjectDefAllowOverlap(socket2ID, true);
+        rmSetObjectDefMinDistance(socket2ID, 0.0);
+        rmSetObjectDefMaxDistance(socket2ID, 6.0);    
+ 
+        int tradeRoute2ID = rmCreateTradeRoute();
+        rmSetObjectDefTradeRouteID(socket2ID, tradeRoute2ID);
+       
+        rmAddTradeRouteWaypoint(tradeRoute2ID, 0.52, 0.01); // -1
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.6, 0.6, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.6, 0.7, 2, 3); // -2
+        rmAddRandomTradeRouteWaypoints(tradeRoute2ID, 0.8, 0.9, 2, 3); // -5
+ 
+        rmBuildTradeRoute(tradeRoute2ID, "dirt");
+ 
+        vector socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.20);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+       
+        socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.50);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+       
+        socketLoc2 = rmGetTradeRouteWayPoint(tradeRoute2ID, 0.85);
+        rmPlaceObjectDefAtPoint(socket2ID, 0, socketLoc2);
+          
+       
+// END TR 2
+ 
+		rmSetStatusText("",0.4);
+
+         int topgold = rmCreateObjectDef("goldrush");
+        rmAddObjectDefItem(topgold, "minegold", 1, 1.0);
+        rmSetObjectDefMinDistance(topgold, 0.0);
+        rmSetObjectDefMaxDistance(topgold, rmXFractionToMeters(0.1));
+        rmAddObjectDefConstraint(topgold, avoidCoin);
+        //rmAddObjectDefConstraint(topgold, avoidNatives);
+        rmAddObjectDefConstraint(topgold, avoidTownCenterMore);
+        rmAddObjectDefConstraint(topgold, avoidSocket);
+        rmAddObjectDefConstraint(topgold, AvoidWaterShort2);
+        rmAddObjectDefConstraint(topgold, forestConstraintShort);
+        rmAddObjectDefConstraint(topgold, circleConstraint);
+		rmAddObjectDefConstraint(topgold, avoidRush);
+        rmPlaceObjectDefAtLoc(topgold, 0, 0.505, 0.88, 12);
+
+        int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+        rmSetObjectDefMinDistance(playerStart, 7.0);
+        rmSetObjectDefMaxDistance(playerStart, 12.0);
+	rmAddObjectDefConstraint(playerStart, avoidAll);
+       
+        int goldID = rmCreateObjectDef("starting gold");
+        rmAddObjectDefItem(goldID, "MineCopper", 1, 8.0);
+        rmSetObjectDefMinDistance(goldID, 15.0);
+        rmSetObjectDefMaxDistance(goldID, 15.0);
+       
+        int gold2ID = rmCreateObjectDef("starting gold 2");
+        rmAddObjectDefItem(gold2ID, "mine", 1, 16.0);
+        rmSetObjectDefMinDistance(gold2ID, 15.0);
+        rmSetObjectDefMaxDistance(gold2ID, 15.0);
+        rmAddObjectDefConstraint(gold2ID, avoidCoin);
+ 
+        int berryID = rmCreateObjectDef("starting berries");
+        rmAddObjectDefItem(berryID, "BerryBush", 2, 6.0);
+        rmSetObjectDefMinDistance(berryID, 8.0);
+        rmSetObjectDefMaxDistance(berryID, 12.0);
+        rmAddObjectDefConstraint(berryID, avoidCoin);
+ 
+        int treeID = rmCreateObjectDef("starting trees");
+        rmAddObjectDefItem(treeID, "TreeSonora", rmRandInt(6,9), 10.0);
+        rmAddObjectDefItem(treeID, "UnderbrushTexas", rmRandInt(8,10), 12.0);
+        rmSetObjectDefMinDistance(treeID, 12.0);
+        rmSetObjectDefMaxDistance(treeID, 18.0);
+        rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+        rmAddObjectDefConstraint(treeID, avoidCoin);
+ 
+        int foodID = rmCreateObjectDef("starting hunt");
+        rmAddObjectDefItem(foodID, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID, 10.0);
+        rmSetObjectDefMaxDistance(foodID, 10.0);
+        rmSetObjectDefCreateHerd(foodID, true);
+ 
+		rmSetStatusText("",0.5);
+
+        int foodID2 = rmCreateObjectDef("starting hunt 2");
+        rmAddObjectDefItem(foodID2, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID2, 40.0);
+        rmSetObjectDefMaxDistance(foodID2, 40.0);
+        rmSetObjectDefCreateHerd(foodID2, true);
+               
+		int foodID3 = rmCreateObjectDef("starting hunt 3");
+        rmAddObjectDefItem(foodID3, "Capybara", 5, 8.0);
+        rmSetObjectDefMinDistance(foodID3, 70.0);
+        rmSetObjectDefMaxDistance(foodID3, 70.0);
+        rmSetObjectDefCreateHerd(foodID3, true);
+	 
+    
+// regicide objects
+  int playerCastle = rmCreateObjectDef("Castle");
+  rmAddObjectDefItem(playerCastle, "ypCastleRegicide", 1, 0.0);
+  rmAddObjectDefConstraint(playerCastle, avoidAll);
+  rmAddObjectDefConstraint(playerCastle, avoidImpassableLand);
+  rmSetObjectDefMinDistance(playerCastle, 17.0);	
+  rmSetObjectDefMaxDistance(playerCastle, 22.0);
+
+  int playerWalls = rmCreateGrouping("regicide walls", "regicide_walls");
+  rmAddGroupingToClass(playerWalls, rmClassID("importantItem"));
+  rmSetGroupingMinDistance(playerWalls, 0.0);
+  rmSetGroupingMaxDistance(playerWalls, 2.0);
+
+  int playerDaimyo = rmCreateObjectDef("Daimyo");
+  rmAddObjectDefItem(playerDaimyo, "ypDaimyoRegicide", 1, 0.0);
+  rmAddObjectDefConstraint(playerDaimyo, avoidAll);
+  rmSetObjectDefMinDistance(playerDaimyo, 7.0);
+  rmSetObjectDefMaxDistance(playerDaimyo, 10.0);
+
+        for(i=1; <cNumberPlayers) {
+    int id=rmCreateArea("Player"+i);
+    rmSetPlayerArea(i, id);
+    int startID = rmCreateObjectDef("object"+i);
+    rmAddObjectDefItem(startID, "TownCenter", 1, 5.0);
+    rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+
+	vector TCLocation=rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startID, i));
+      rmPlaceGroupingAtLoc(playerWalls, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
+      rmPlaceObjectDefAtLoc(playerCastle, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
+      rmPlaceObjectDefAtLoc(playerDaimyo, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
+
+        rmPlaceObjectDefAtLoc(goldID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(gold2ID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(foodID2, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+        rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+  }
+ 
+        for (j=0; < (4*4)) {  
+                int StartAreaTree2ID=rmCreateObjectDef("starting trees dirt"+j);
+                rmAddObjectDefItem(StartAreaTree2ID, "TreeSonora", rmRandInt(8,10), rmRandFloat(8.0,16.0));
+                rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest"));
+                rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+                rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRoute);
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocket);
+                //rmAddObjectDefConstraint(StartAreaTree2ID, avoidNatives);
+                rmAddObjectDefConstraint(StartAreaTree2ID, circleConstraint);
+                rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+                //rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+                rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenter);  
+                rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);  
+				rmAddObjectDefConstraint(StartAreaTree2ID, avoidRush);
+                rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 5*4);
+        }
+
+		for (i=0; < cNumberNonGaiaPlayers*55){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "andes\ground25_and", "andes\ground22_and");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+
+		rmSetStatusText("",0.6);
+
+        int leftmines = rmCreateObjectDef("left gold mines");
+        rmAddObjectDefItem(leftmines, "MineCopper", 1, 1.0);
+        rmSetObjectDefMinDistance(leftmines, 0.0);
+        rmSetObjectDefMaxDistance(leftmines, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftmines, avoidCoinMed);
+        rmAddObjectDefConstraint(leftmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(leftmines, avoidSocket);
+        rmAddObjectDefConstraint(leftmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(leftmines, forestConstraintShort);
+        rmAddObjectDefConstraint(leftmines, circleConstraint);
+		rmAddObjectDefConstraint(leftmines, avoidRush);
+        rmPlaceObjectDefAtLoc(leftmines, 0, 0.25, 0.35, 6);
+		
+        int rightmines = rmCreateObjectDef("right gold mines");
+        rmAddObjectDefItem(rightmines, "MineCopper", 1, 1.0);
+        rmSetObjectDefMinDistance(rightmines, 0.0);
+        rmSetObjectDefMaxDistance(rightmines, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightmines, avoidCoinMed);
+        rmAddObjectDefConstraint(rightmines, avoidTownCenterMore);
+        rmAddObjectDefConstraint(rightmines, avoidSocket);
+        rmAddObjectDefConstraint(rightmines, AvoidWaterShort2);
+        rmAddObjectDefConstraint(rightmines, forestConstraintShort);
+        rmAddObjectDefConstraint(rightmines, circleConstraint);
+		rmAddObjectDefConstraint(rightmines, avoidRush);
+        rmPlaceObjectDefAtLoc(rightmines, 0, 0.75, 0.35, 6);
+		
+	
+	int ambiental = rmCreateObjectDef("ambiental");
+	rmAddObjectDefItem(ambiental, "UnderbrushAus", 1, 5.0);
+	rmSetObjectDefMinDistance(ambiental, 0);
+	rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(ambiental, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(ambiental, avoidNuggetSmall);
+	rmAddObjectDefConstraint(ambiental, avoidSocketMore);
+	rmAddObjectDefConstraint(ambiental, avoidCoin);
+	rmAddObjectDefConstraint(ambiental, avoidAll);
+	rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 80*cNumberNonGaiaPlayers);	
+    
+
+        int rheaxID = rmCreateObjectDef("caribou hunts");
+        rmAddObjectDefItem(rheaxID, "rhea", rmRandInt(7,7), 10.0);
+        rmSetObjectDefCreateHerd(rheaxID, true);
+        rmSetObjectDefMinDistance(rheaxID, 0);
+        rmSetObjectDefMaxDistance(rheaxID, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(rheaxID, circleConstraint);
+        rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+        rmAddObjectDefConstraint(rheaxID, avoidHunt);
+		rmAddObjectDefConstraint(rheaxID, avoidRush);
+        rmPlaceObjectDefAtLoc(rheaxID, 0, 0.5, 0.5, 20);
+
+		rmSetStatusText("",0.7);
+
+        /*
+        int herdableID=rmCreateObjectDef("cow");
+        rmAddObjectDefItem(herdableID, "cow", 1, 4.0);
+        rmSetObjectDefMinDistance(herdableID, 0.0);
+        rmSetObjectDefMaxDistance(herdableID, rmXFractionToMeters(0.5));
+        rmAddObjectDefConstraint(rheaxID, circleConstraint);
+        rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+        rmAddObjectDefConstraint(rheaxID, avoidHunt);
+        rmPlaceObjectDefAtLoc(herdableID, 0, 0.5, 0.5, 12);
+  */
+
+        int leftnuggeteasy= rmCreateObjectDef("leftnuggeteasy");
+        rmAddObjectDefItem(leftnuggeteasy, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(leftnuggeteasy, 0.0);
+        rmSetObjectDefMaxDistance(leftnuggeteasy, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidNugget);
+        rmAddObjectDefConstraint(leftnuggeteasy, circleConstraint);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidTownCenter);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidCoin);
+        rmAddObjectDefConstraint(leftnuggeteasy, forestConstraintShort);
+        //rmAddObjectDefConstraint(leftnuggeteasy, avoidNatives);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidWaterShort);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(leftnuggeteasy, avoidSocket);
+		rmAddObjectDefConstraint(leftnuggeteasy, avoidRush);
+        rmSetNuggetDifficulty(1, 1);
+        rmPlaceObjectDefAtLoc(leftnuggeteasy, 0, 0.25, 0.35, 3);  
+		
+        int leftnuggetmed= rmCreateObjectDef("leftnuggetmed");
+        rmAddObjectDefItem(leftnuggetmed, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(leftnuggetmed, 0.0);
+        rmSetObjectDefMaxDistance(leftnuggetmed, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(leftnuggetmed, avoidNugget);
+        rmAddObjectDefConstraint(leftnuggetmed, circleConstraint);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidTownCenter);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidCoin);
+        rmAddObjectDefConstraint(leftnuggetmed, forestConstraintShort);
+        //rmAddObjectDefConstraint(leftnuggetmed, avoidNatives);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidWaterShort);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(leftnuggetmed, avoidSocket);
+		rmAddObjectDefConstraint(leftnuggetmed, avoidRush);
+        rmSetNuggetDifficulty(2, 2);
+        rmPlaceObjectDefAtLoc(leftnuggetmed, 0, 0.25, 0.35, 4);  		
+		
+		rmSetStatusText("",0.8);
+
+        int rightnuggeteasy= rmCreateObjectDef("rightnuggeteasy");
+        rmAddObjectDefItem(rightnuggeteasy, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(rightnuggeteasy, 0.0);
+        rmSetObjectDefMaxDistance(rightnuggeteasy, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidNugget);
+        rmAddObjectDefConstraint(rightnuggeteasy, circleConstraint);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidTownCenter);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidCoin);
+        rmAddObjectDefConstraint(rightnuggeteasy, forestConstraintShort);
+        //rmAddObjectDefConstraint(rightnuggeteasy, avoidNatives);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidWaterShort);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(rightnuggeteasy, avoidSocket);
+		rmAddObjectDefConstraint(rightnuggeteasy, avoidRush);
+        rmSetNuggetDifficulty(1, 1);
+        rmPlaceObjectDefAtLoc(rightnuggeteasy, 0, 0.75, 0.35, 3);  		
+  
+
+        int rightnuggetmed= rmCreateObjectDef("rightnuggetmed");
+        rmAddObjectDefItem(rightnuggetmed, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(rightnuggetmed, 0.0);
+        rmSetObjectDefMaxDistance(rightnuggetmed, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(rightnuggetmed, avoidNugget);
+        rmAddObjectDefConstraint(rightnuggetmed, circleConstraint);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidTownCenter);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidCoin);
+        rmAddObjectDefConstraint(rightnuggetmed, forestConstraintShort);
+        //rmAddObjectDefConstraint(rightnuggetmed, avoidNatives);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidWaterShort);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(rightnuggetmed, avoidSocket);
+		rmAddObjectDefConstraint(rightnuggetmed, avoidRush);
+        rmSetNuggetDifficulty(2, 2);
+        rmPlaceObjectDefAtLoc(rightnuggetmed, 0, 0.75, 0.35, 4); 
+		
+		rmSetStatusText("",0.9);
+
+        int nuggethard= rmCreateObjectDef("nuggethard");
+        rmAddObjectDefItem(nuggethard, "Nugget", 1, 0.0);
+        rmSetObjectDefMinDistance(nuggethard, 0.0);
+        rmSetObjectDefMaxDistance(nuggethard, rmXFractionToMeters(0.25));
+        rmAddObjectDefConstraint(nuggethard, avoidNugget);
+        rmAddObjectDefConstraint(nuggethard, circleConstraint);
+        rmAddObjectDefConstraint(nuggethard, avoidTownCenter);
+        rmAddObjectDefConstraint(nuggethard, avoidCoin);
+        rmAddObjectDefConstraint(nuggethard, forestConstraintShort);
+        //rmAddObjectDefConstraint(nuggethard, avoidNatives);
+        rmAddObjectDefConstraint(nuggethard, avoidWaterShort);
+        rmAddObjectDefConstraint(nuggethard, avoidTradeRouteSmall);
+        rmAddObjectDefConstraint(nuggethard, avoidSocket);
+		rmAddObjectDefConstraint(nuggethard, avoidRush);
+        rmSetNuggetDifficulty(4, 4);
+        rmPlaceObjectDefAtLoc(nuggethard, 0, 0.505, 0.88, 4);  
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.5;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+// Regicide Trigger
+for(i=1; <= cNumberNonGaiaPlayers)
+{   
+    // Lose on Daimyo's death
+    rmCreateTrigger("DaimyoDeath"+i);
+    rmSwitchToTrigger(rmTriggerID("DaimyoDeath"+i));
+    rmSetTriggerPriority(4); 
+    rmSetTriggerActive(true);
+    rmSetTriggerRunImmediately(true);
+    rmSetTriggerLoop(false);
+    
+    rmAddTriggerCondition("Is Dead");
+    rmSetTriggerConditionParamInt("SrcObject", rmGetUnitPlacedOfPlayer(playerDaimyo, i), false);
+    
+    rmAddTriggerEffect("Set Player Defeated");
+    rmSetTriggerEffectParamInt("Player", i, false);
+    
+}
+
+		rmSetStatusText("",1.0);
+				
+}
\ No newline at end of file
diff --git a/RMM/bayou.xs b/RMM/bayou.xs
index d7be1dc..1588956 100644
--- a/RMM/bayou.xs
+++ b/RMM/bayou.xs
@@ -417,8 +417,9 @@ void main(void)
 	// Set up player starting locations. These are just used to place Caravels away from each other.
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 2.0);
-	rmSetObjectDefMaxDistance(startingUnits, 4.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefToClass(startingUnits, rmClassID("player"));
 
@@ -575,16 +576,6 @@ if ( cNumberTeams == 2 )
 
 // *********************************** TREASURES *******************************
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/bayou2backup.xs b/RMM/bayou2backup.xs
deleted file mode 100644
index 355d999..0000000
--- a/RMM/bayou2backup.xs
+++ /dev/null
@@ -1,651 +0,0 @@
-// BAYOU Joes revision
-
-// Main entry point for random map script
-include "mercenaries.xs";
-void main(void)
-{
-
-   // Text
-   // These status text lines are used to manually animate the map generation progress bar
-   rmSetStatusText("",0.01);
-
-   int subCiv0=-1;
-   int subCiv1=-1;
-   int subCiv2=-1;
-   int subCiv3=-1;
-   int subCiv4=-1;
-
-   if (rmAllocateSubCivs(5) == true)
-   {
-		subCiv0=rmGetCivID("Seminoles");
-		rmEchoInfo("subCiv0 is Seminole "+subCiv0);
-      if (subCiv0 >= 0)
-			rmSetSubCiv(0, "Seminoles");
-		
-		subCiv1=rmGetCivID("Cherokee");
-		rmEchoInfo("subCiv1 is Cherokee "+subCiv1);
-		if (subCiv1 >= 0)
-			rmSetSubCiv(1, "Cherokee");
-
-		subCiv2=rmGetCivID("Cherokee");
-		rmEchoInfo("subCiv2 is Cherokee "+subCiv2);
-		if (subCiv2 >= 0)
-			rmSetSubCiv(2, "Cherokee");
-
-		subCiv3=rmGetCivID("Seminoles");
-		rmEchoInfo("subCiv3 is Seminoles "+subCiv3);
-		if (subCiv3 >= 0)
-			rmSetSubCiv(3, "Seminoles");
-		
-		if (rmRandFloat(0,1) < 0.5)
-		{
-			subCiv4=rmGetCivID("Seminoles");
-			rmEchoInfo("subCiv4 is Seminoles "+subCiv4);
-			if (subCiv4 >= 0)
-				rmSetSubCiv(4, "Seminoles");
-		}
-	}			
-
-   // Picks the map size
-   int playerTiles=14400;
-   int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
-   rmEchoInfo("Map size="+size+"m x "+size+"m");
-   rmSetMapSize(size, size);
-
-   // Picks a default water height
-   rmSetSeaLevel(1.0);
-
-   // Picks default terrain and water
-
-// rmSetMapElevationParameters(long type, float minFrequency, long numberOctaves, float persistence, float heightVariation)
-//	rmSetMapElevationParameters(cElevTurbulence, 0.1, 4, 0.3, 2.0);
-	rmSetSeaType("new england coast");
-   rmEnableLocalWater(false);
-	rmSetBaseTerrainMix("carolina_marsh");
-   rmTerrainInitialize("water");
-	rmSetMapType("bayou");
-	rmSetMapType("water");
-//	rmSetMapType("grass");
-	rmSetWorldCircleConstraint(true);
-
-	// Choose mercs.
-	chooseMercs();
-
-   // Define some classes. These are used later for constraints.
-   int classPlayer=rmDefineClass("player");
-   rmDefineClass("classCliff");
-   rmDefineClass("classPatch");
-   int classbigContinent=rmDefineClass("big continent");
-   rmDefineClass("classForest");
-   rmDefineClass("importantItem");
-	rmDefineClass("secrets");
-	int classBay=rmDefineClass("bay");
-
-   int classIsland=rmDefineClass("island");
-   int classBonusIsland=rmDefineClass("bonus island");
-   int classSideIsland=rmDefineClass("side island");
-   rmDefineClass("corner");
-
-
-
-   // -------------Define constraints
-   // These are used to have objects and areas avoid each other
-   
-   // Map edge constraints
-   int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(20), rmZTilesToFraction(20), 1.0-rmXTilesToFraction(20), 1.0-rmZTilesToFraction(20), 0.01);
-   int longPlayerConstraint=rmCreateClassDistanceConstraint("continent stays away from players", classPlayer, 40.0);
-
-   // Player constraints
-	int islandConstraint=rmCreateClassDistanceConstraint("stay away from islands", classIsland, 20.0);
-	int playerConstraint=rmCreateClassDistanceConstraint("bonus Settlement stay away from players", classPlayer, 10);
-	int bonusIslandConstraint=rmCreateClassDistanceConstraint("avoid bonus island", classBonusIsland, 10.0);
-	int longBonusIslandConstraint=rmCreateClassDistanceConstraint("long avoid bonus island", classBonusIsland, 30.0);
-	int longSideIslandConstraint=rmCreateClassDistanceConstraint("long avoid side island", classSideIsland, 30.0);
-	int cornerConstraint=rmCreateClassDistanceConstraint("stay away from corner", rmClassID("corner"), 15.0);
-	int cornerOverlapConstraint=rmCreateClassDistanceConstraint("don't overlap corner", rmClassID("corner"), 2.0);
-	int bayConstraint=rmCreateClassDistanceConstraint("avoid bay", classBay, 3);
-
-	int smallMapPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 70.0);
-	int flagConstraint=rmCreateHCGPConstraint("flags avoid same", 30.0);
-	int nearWater10 = rmCreateTerrainDistanceConstraint("near water", "Water", true, 10.0);
-	int avoidBoats=rmCreateTypeDistanceConstraint("avoid boats", "caravel", 30.0);
-
-	// Bonus area constraint.
-	 int bigContinentConstraint=rmCreateClassDistanceConstraint("avoid big island", classbigContinent, 20.0);
-
-	// Resource avoidance
-	int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
-	int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 1.0);
-	int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "gold", 50.0);
-	int farAvoidCoin=rmCreateTypeDistanceConstraint("silver avoid coin", "gold", 70.0);
-	int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "nugget", 50.0);
-	int avoidDeer=rmCreateTypeDistanceConstraint("food avoids food", "deer", 70.0);
-	int avoidTurkey=rmCreateTypeDistanceConstraint("avoid turkeys", "turkey", 50.0);
-	int avoidCotton=rmCreateTypeDistanceConstraint("avoid cotton", "cotton", 50.0);
-	int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 18.0);
-	int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
-
-   // Avoid impassable land
-   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 10.0);
-   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 1.0);
-   int avoidCliffs=rmCreateClassDistanceConstraint("cliff vs. cliff", rmClassID("classCliff"), 30.0);
-   int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
-
-   // Decoration avoidance
-   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
-
-   // VP avoidance
-   int avoidImportantItem = rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 80.0);
-
-   // Constraint to avoid water.
-   int avoidWater8 = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 8.0);
-
-
-  // Text
-   rmSetStatusText("",0.10);
-
-
-	 // Create center section
-   int centerIslandID=rmCreateArea("Center Island area");
-   rmSetAreaSize(centerIslandID, 0.06, 0.10);
-   rmSetAreaLocation(centerIslandID, 0.5, 0.5);
-   rmSetAreaMix(centerIslandID, "carolina_marsh");
-   rmSetAreaBaseHeight(centerIslandID, 4.0); // Was 10
-   rmSetAreaMinBlobs(centerIslandID, 8);
-   rmSetAreaMaxBlobs(centerIslandID, 10);
-   rmSetAreaMinBlobDistance(centerIslandID, 10);
-   rmSetAreaMaxBlobDistance(centerIslandID, 20);
-   rmSetAreaSmoothDistance(centerIslandID, 50);
-   rmSetAreaCoherence(centerIslandID, 0.50);
-	rmAddAreaToClass(centerIslandID, rmClassID("bay"));
-   rmSetAreaObeyWorldCircleConstraint(centerIslandID, false);
-    rmBuildArea(centerIslandID);
-
-//  ********************************** Island fingers *******************************
-   
-      int bonusIsland1ID=rmCreateArea("bonus island 1");
-      rmSetAreaSize(bonusIsland1ID, 0.04, 0.04);
-	  rmSetAreaLocation(bonusIsland1ID, 0.23, 0.5);
-      rmSetAreaMix(bonusIsland1ID, "carolina_marsh");
-      rmSetAreaWarnFailure(bonusIsland1ID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-      rmAddAreaConstraint(bonusIsland1ID, bonusIslandConstraint);
-      rmAddAreaToClass(bonusIsland1ID, classIsland);
-      rmAddAreaToClass(bonusIsland1ID, classBonusIsland);
-      //rmAddAreaConstraint(bonusIsland1ID, bayConstraint);
-	  //rmAddAreaConstraint(bonusIsland1ID, playerEdgeConstraint);
-      rmSetAreaCoherence(bonusIsland1ID, 0.25);
-      rmSetAreaSmoothDistance(bonusIsland1ID, 12);
-	  rmSetAreaElevationType(bonusIsland1ID, cElevTurbulence);
-	  rmSetAreaElevationVariation(bonusIsland1ID, 2.0);
-		rmSetAreaBaseHeight(bonusIsland1ID, 4.0);
-		rmSetAreaElevationMinFrequency(bonusIsland1ID, 0.09);
-		rmSetAreaElevationOctaves(bonusIsland1ID, 3);
-		rmSetAreaElevationPersistence(bonusIsland1ID, 0.2);      
-  
-int bonusIsland2ID=rmCreateArea("bonus island 2");
-      rmSetAreaSize(bonusIsland2ID, 0.04, 0.04);
-	  rmSetAreaLocation(bonusIsland2ID, 0.4, 0.30);
-      rmSetAreaMix(bonusIsland2ID, "carolina_marsh");
-      rmSetAreaWarnFailure(bonusIsland2ID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-      rmAddAreaConstraint(bonusIsland2ID, bonusIslandConstraint);
-      rmAddAreaToClass(bonusIsland2ID, classIsland);
-      rmAddAreaToClass(bonusIsland2ID, classBonusIsland);
-     // rmAddAreaConstraint(bonusIsland2ID, bayConstraint);
-	 // rmAddAreaConstraint(bonusIsland2ID, playerEdgeConstraint);
-      rmSetAreaCoherence(bonusIsland2ID, 0.25);
-      rmSetAreaSmoothDistance(bonusIsland2ID, 12);
-	  rmSetAreaElevationType(bonusIsland2ID, cElevTurbulence);
-		rmSetAreaElevationVariation(bonusIsland2ID, 2.0);
-		rmSetAreaBaseHeight(bonusIsland2ID, 4.0);
-		rmSetAreaElevationMinFrequency(bonusIsland2ID, 0.09);
-		rmSetAreaElevationOctaves(bonusIsland2ID, 3);
-		rmSetAreaElevationPersistence(bonusIsland2ID, 0.2);     
-
-		int bonusIsland3ID=rmCreateArea("bonus island 3");
-      rmSetAreaSize(bonusIsland3ID, 0.025, 0.04);
-	  rmSetAreaLocation(bonusIsland3ID, 0.4, 0.75);
-      rmSetAreaMix(bonusIsland3ID, "carolina_marsh");
-      rmSetAreaWarnFailure(bonusIsland3ID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-      rmAddAreaConstraint(bonusIsland3ID, bonusIslandConstraint);
-      rmAddAreaToClass(bonusIsland3ID, classIsland);
-      rmAddAreaToClass(bonusIsland3ID, classBonusIsland);
-      //rmAddAreaConstraint(bonusIsland3ID, bayConstraint);
-	  //rmAddAreaConstraint(bonusIsland3ID, playerEdgeConstraint);
-      rmSetAreaCoherence(bonusIsland3ID, 0.25);
-      rmSetAreaSmoothDistance(bonusIsland3ID, 12);
-	  rmSetAreaElevationType(bonusIsland3ID, cElevTurbulence);
-		rmSetAreaElevationVariation(bonusIsland3ID, 2.0);
-		rmSetAreaBaseHeight(bonusIsland3ID, 4.0);
-		rmSetAreaElevationMinFrequency(bonusIsland3ID, 0.09);
-		rmSetAreaElevationOctaves(bonusIsland3ID, 3);
-		rmSetAreaElevationPersistence(bonusIsland3ID, 0.2);     
-
-
-		rmSetStatusText("",0.20);
-
-
-		int bonusIsland4ID=rmCreateArea("bonus island 4");
-      rmSetAreaSize(bonusIsland4ID, 0.04, 0.04);
-	  rmSetAreaLocation(bonusIsland4ID, 0.75, 0.5);
-      rmSetAreaMix(bonusIsland4ID, "carolina_marsh");
-      rmSetAreaWarnFailure(bonusIsland4ID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-      rmAddAreaConstraint(bonusIsland4ID, bonusIslandConstraint);
-      rmAddAreaToClass(bonusIsland4ID, classIsland);
-      rmAddAreaToClass(bonusIsland4ID, classBonusIsland);
-    //  rmAddAreaConstraint(bonusIsland4ID, bayConstraint);
-	 // rmAddAreaConstraint(bonusIsland4ID, playerEdgeConstraint);
-      rmSetAreaCoherence(bonusIsland4ID, 0.25);
-      rmSetAreaSmoothDistance(bonusIsland4ID, 12);
-	  rmSetAreaElevationType(bonusIsland4ID, cElevTurbulence);
-		rmSetAreaElevationVariation(bonusIsland4ID, 2.0);
-		rmSetAreaBaseHeight(bonusIsland4ID, 4.0);
-		rmSetAreaElevationMinFrequency(bonusIsland4ID, 0.09);
-		rmSetAreaElevationOctaves(bonusIsland4ID, 3);
-		rmSetAreaElevationPersistence(bonusIsland4ID, 0.2);     
-
-		int bonusIsland5ID=rmCreateArea("bonus island 5");
-      rmSetAreaSize(bonusIsland5ID, 0.02, 0.04);
-	  rmSetAreaLocation(bonusIsland5ID, 0.65, 0.25);
-      rmSetAreaMix(bonusIsland5ID, "carolina_marsh");
-      rmSetAreaWarnFailure(bonusIsland5ID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-      rmAddAreaConstraint(bonusIsland5ID, bonusIslandConstraint);
-      rmAddAreaToClass(bonusIsland5ID, classIsland);
-      rmAddAreaToClass(bonusIsland5ID, classBonusIsland);
-     // rmAddAreaConstraint(bonusIsland5ID, bayConstraint);
-	 // rmAddAreaConstraint(bonusIsland5ID, playerEdgeConstraint);
-      rmSetAreaCoherence(bonusIsland5ID, 0.25);
-      rmSetAreaSmoothDistance(bonusIsland5ID, 12);
-	  rmSetAreaElevationType(bonusIsland5ID, cElevTurbulence);
-		rmSetAreaElevationVariation(bonusIsland5ID, 2.0);
-		rmSetAreaBaseHeight(bonusIsland5ID, 4.0);
-		rmSetAreaElevationMinFrequency(bonusIsland5ID, 0.09);
-		rmSetAreaElevationOctaves(bonusIsland5ID, 3);
-		rmSetAreaElevationPersistence(bonusIsland5ID, 0.2);     
-
-		int bonusIsland6ID=rmCreateArea("bonus island 6");
-      rmSetAreaSize(bonusIsland6ID, 0.04, 0.04);
-	  rmSetAreaLocation(bonusIsland6ID, 0.65, 0.70);
-      rmSetAreaMix(bonusIsland6ID, "carolina_marsh");
-      rmSetAreaWarnFailure(bonusIsland6ID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-      rmAddAreaConstraint(bonusIsland6ID, bonusIslandConstraint);
-      rmAddAreaToClass(bonusIsland6ID, classIsland);
-      rmAddAreaToClass(bonusIsland6ID, classBonusIsland);
-      //rmAddAreaConstraint(bonusIsland6ID, bayConstraint);
-	  //rmAddAreaConstraint(bonusIsland6ID, playerEdgeConstraint);
-      rmSetAreaCoherence(bonusIsland6ID, 0.25);
-      rmSetAreaSmoothDistance(bonusIsland6ID, 12);
-	  rmSetAreaElevationType(bonusIsland6ID, cElevTurbulence);
-		rmSetAreaElevationVariation(bonusIsland6ID, 2.0);
-		rmSetAreaBaseHeight(bonusIsland6ID, 4.0);
-		rmSetAreaElevationMinFrequency(bonusIsland6ID, 0.09);
-		rmSetAreaElevationOctaves(bonusIsland6ID, 3);
-		rmSetAreaElevationPersistence(bonusIsland6ID, 0.2);     
-  
-   rmBuildAllAreas();
-
-int smallPondID=rmCreateArea("small pond");
-		rmSetAreaSize(smallPondID, 0.01, 0.01);
-		rmSetAreaWaterType(smallPondID, "great plains pond");
-		rmSetAreaBaseHeight(smallPondID, 4);
-		rmSetAreaMinBlobs(smallPondID, 4);
-		rmSetAreaMaxBlobs(smallPondID, 6);
-		rmSetAreaMinBlobDistance(smallPondID, 5.0);
-		rmSetAreaMaxBlobDistance(smallPondID, 30.0);
-		rmSetAreaCoherence(smallPondID, 0.3);
-		rmSetAreaSmoothDistance(smallPondID, 5);
-		rmSetAreaLocation(smallPondID, 0.5, 0.5); 
-		rmBuildArea(smallPondID);
-
-
-// text
-rmSetStatusText("",0.30);
-
- //  rmBuildConnection(shallowsID);
-
-
-	// Add Natives
-
-	float nativeLoc = rmRandFloat(0,1);
-
-	if (subCiv0 == rmGetCivID("Seminoles"))
-   {   
-      int SeminolesVillageID = -1;
-      int SeminolesVillageType = rmRandInt(1,10);
-      SeminolesVillageID = rmCreateGrouping("Seminole village", "native seminole village "+SeminolesVillageType);
-      rmSetGroupingMinDistance(SeminolesVillageID, 0.0);
-      rmSetGroupingMaxDistance(SeminolesVillageID, rmXFractionToMeters(0.05));
-      rmAddGroupingConstraint(SeminolesVillageID, avoidImpassableLand);
-      rmAddGroupingConstraint(SeminolesVillageID, avoidImportantItem);
-      rmAddGroupingToClass(SeminolesVillageID, rmClassID("importantItem"));
-		if (nativeLoc < 0.5)
-			rmPlaceGroupingAtLoc(SeminolesVillageID, 0, 0.75, 0.5);
-		else
-			rmPlaceGroupingAtLoc(SeminolesVillageID, 0, 0.4, 0.3);
-	}
-
-	if (subCiv1 == rmGetCivID("Cherokee"))
-   {   
-      int CherokeeVillageID = -1;
-      int CherokeeVillageType = rmRandInt(1,10);
-      CherokeeVillageID = rmCreateGrouping("Cherokee village", "native Cherokee village "+CherokeeVillageType);
-      rmSetGroupingMinDistance(CherokeeVillageID, 0.0);
-      rmSetGroupingMaxDistance(CherokeeVillageID, rmXFractionToMeters(0.05));
-      rmAddGroupingConstraint(CherokeeVillageID, avoidImpassableLand);
-		rmAddGroupingConstraint(CherokeeVillageID, avoidImportantItem);
-      rmAddGroupingToClass(CherokeeVillageID, rmClassID("importantItem"));
-		if (nativeLoc < 0.5)
-			rmPlaceGroupingAtLoc(CherokeeVillageID, 0, 0.4, 0.75);
-		else
-			rmPlaceGroupingAtLoc(CherokeeVillageID, 0, 0.4, 0.75);
-	}
-
-	if (subCiv2 == rmGetCivID("Cherokee"))
-   {   
-      int Cherokee2VillageID = -1;
-      int Cherokee2VillageType = rmRandInt(1,10);
-      Cherokee2VillageID = rmCreateGrouping("Cherokee2 village", "native cherokee village "+Cherokee2VillageType);
-      rmSetGroupingMinDistance(Cherokee2VillageID, 0.0);
-      rmSetGroupingMaxDistance(Cherokee2VillageID, rmXFractionToMeters(0.05));
-      rmAddGroupingConstraint(Cherokee2VillageID, avoidImpassableLand);
-		rmAddGroupingConstraint(Cherokee2VillageID, avoidImportantItem);
-      rmAddGroupingToClass(Cherokee2VillageID, rmClassID("importantItem"));
-		if (nativeLoc < 0.5)
-			rmPlaceGroupingAtLoc(Cherokee2VillageID, 0, 0.23, 0.5);
-		else
-			rmPlaceGroupingAtLoc(Cherokee2VillageID, 0, 0.65, 0.7);
-	}
-  
-	if (subCiv3 == rmGetCivID("Seminoles"))
-   {   
-      int Seminoles2VillageID = -1;
-      int Seminoles2VillageType = rmRandInt(1,10);
-      Seminoles2VillageID = rmCreateGrouping("Seminole2 village", "native seminole village "+Seminoles2VillageType);
-      rmSetGroupingMinDistance(Seminoles2VillageID, 0.0);
-      rmSetGroupingMaxDistance(Seminoles2VillageID, rmXFractionToMeters(0.05));
-      rmAddGroupingConstraint(Seminoles2VillageID, avoidImpassableLand);
-		rmAddGroupingConstraint(Seminoles2VillageID, avoidImportantItem);
-      rmAddGroupingToClass(Seminoles2VillageID, rmClassID("importantItem"));
-		if (nativeLoc < 0.5)
-			rmPlaceGroupingAtLoc(Seminoles2VillageID, 0, 0.65, 0.25);
-		else
-			rmPlaceGroupingAtLoc(Seminoles2VillageID, 0, 0.65, 0.25);
-	}
-
-	if (subCiv4 == rmGetCivID("Seminoles"))
-   {   
-      int Seminoles3VillageID = -1;
-      int Seminoles3VillageType = rmRandInt(1,10);
-      Seminoles3VillageID = rmCreateGrouping("Seminole3 village", "native seminole village "+Seminoles3VillageType);
-      rmSetGroupingMinDistance(Seminoles3VillageID, 0.0);
-      rmSetGroupingMaxDistance(Seminoles3VillageID, rmXFractionToMeters(0.05));
-      rmAddGroupingConstraint(Seminoles3VillageID, avoidImpassableLand);
-		rmAddGroupingConstraint(Seminoles3VillageID, avoidImportantItem);
-      rmAddGroupingToClass(Seminoles3VillageID, rmClassID("importantItem"));
-		if (nativeLoc < 0.5)
-			rmPlaceGroupingAtLoc(Seminoles3VillageID, 0, 0.5, 0.5);
-		else
-			rmPlaceGroupingAtLoc(Seminoles3VillageID, 0, 0.5, 0.5);
-	}
-
-	// Set up player starting locations. These are just used to place Caravels away from each other.
-
-//   rmSetPlacementSection(0.9, 0.3);
-//   rmSetPlayerPlacementArea(0, 0, 0.35, 0.35);
-//   rmSetTeamSpacingModifier(0.50);
-   rmPlacePlayersCircular(0.48, 0.48, 0);
-
-
-    // Set up player areas.
-   float playerFraction=rmAreaTilesToFraction(1000);
-   for(i=1; <cNumberPlayers)
-   {
-      // Create the area.
-      int id=rmCreateArea("Player"+i);
-      // Assign to the player.
-      rmSetPlayerArea(i, id);
-      // Set the size.
-//	  rmSetAreaMix(id, "yukon snow");
-//	  rmSetAreaBaseHeight(id, 4);
-      rmSetAreaSize(id, playerFraction, playerFraction);
-      rmAddAreaToClass(id, classPlayer);
-      rmSetAreaMinBlobs(id, 1);
-      rmSetAreaMaxBlobs(id, 1);
-      rmAddAreaConstraint(id, playerConstraint); 
-      rmAddAreaConstraint(id, playerEdgeConstraint); 
-      rmSetAreaLocPlayer(id, i);
-  //    rmSetAreaTerrainType(id, "saguenay\ground5_sag");
-   //   rmSetAreaBaseHeight(id, 10.0);
-      rmSetAreaWarnFailure(id, false);
-   }
-
-   // Build the areas.
-   rmBuildAllAreas();
-
-
-   // Text
-   rmSetStatusText("",0.60);
-
-   int colonyShipID=rmCreateObjectDef("colony ship");
-   rmAddObjectDefItem(colonyShipID, "caravel", 1, 0.0);
-   rmSetObjectDefGarrisonStartingUnits(colonyShipID, true);
-   rmSetObjectDefMinDistance(colonyShipID, 0.0);
-   rmSetObjectDefMaxDistance(colonyShipID, 5.0);
-
-  // Set up for finding closest land points.
-   rmAddClosestPointConstraint(avoidWater8);
-	rmAddClosestPointConstraint(playerEdgeConstraint);
-	rmAddClosestPointConstraint(flagConstraint);
-	rmAddClosestPointConstraint(nearWater10);
-   
-   for(i=1; <cNumberPlayers)
-   {
-      // Place boat.
-      int count = rmPlaceObjectDefAtLoc(colonyShipID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-      if(count<1)
-      {
-         rmEchoError("Failed to place player "+i);
-         continue;
-      }
-
-      // Get where it placed.
-      vector colonyShipLocation=rmGetUnitPosition(rmGetUnitPlacedOfPlayer(colonyShipID, i));
-      
-      // Find closest point.
-      vector closestPoint = rmFindClosestPointVector(colonyShipLocation, rmXFractionToMeters(0.25));
-      rmEchoInfo("0.25 Fraction to Meters = "+rmXFractionToMeters(0.25));
-
-      // Set HCGP.
-      rmSetHomeCityGatherPoint(i, closestPoint);
-   }
-   
-
-
-   // ***************************** side islands *****************************
-for(i=0; <rmRandInt(28,30))
-   {
-      int smallIslandID=rmCreateArea("small island"+i);
-      rmSetAreaSize(smallIslandID, 0.03, 0.04);
-      rmSetAreaMix(smallIslandID, "carolina_marsh");
-      rmSetAreaWarnFailure(smallIslandID, false);
-    //  if(rmRandFloat(0.0, 1.0)<0.70)
-         rmAddAreaConstraint(smallIslandID, longBonusIslandConstraint);
-	//	 rmAddAreaConstraint(smallIslandID, longSideIslandConstraint);
-      rmAddAreaToClass(smallIslandID, classIsland);
-      rmAddAreaToClass(smallIslandID, classBonusIsland);
-	  rmAddAreaToClass(smallIslandID, classSideIsland);
-      rmAddAreaConstraint(smallIslandID, bayConstraint);
-	  rmAddAreaConstraint(smallIslandID, longPlayerConstraint);
-	  rmAddAreaConstraint(smallIslandID, avoidBoats);
-      rmSetAreaCoherence(smallIslandID, 0.25);
-      rmSetAreaSmoothDistance(smallIslandID, 12);
-	   rmSetAreaElevationType(smallIslandID, cElevTurbulence);
-		rmSetAreaElevationVariation(smallIslandID, 2.0);
-		rmSetAreaBaseHeight(smallIslandID, 4.0);
-		rmSetAreaElevationMinFrequency(smallIslandID, 0.09);
-		rmSetAreaObeyWorldCircleConstraint(smallIslandID, false);
-		rmSetAreaElevationOctaves(smallIslandID, 3);
-		rmSetAreaElevationPersistence(smallIslandID, 0.2);      
-      }   
-rmBuildAllAreas();
-
-
-// text
-rmSetStatusText("",0.70);
-	
-
-
-	int cottonType = -1;
-	int cottonID = -1;
-	for(i=0; <(2+cNumberNonGaiaPlayers))
-   {
-		cottonType = rmRandInt(1,4);
-      cottonID = rmCreateGrouping("cotton "+i, "resource cotton "+cottonType);
-      rmSetGroupingMinDistance(cottonID, 0.0);
-      rmSetGroupingMaxDistance(cottonID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(cottonID, avoidCoin);
-      rmAddGroupingConstraint(cottonID, shortAvoidImpassableLand);
-	   rmAddGroupingConstraint(cottonID, avoidCotton);
-
-		rmPlaceGroupingAtLoc(cottonID, 0, 0.5, 0.5);
-   }
-
-	int silverType = rmRandInt(1,10);
-	int silverID = -1;
-	int silver2ID = -1;
-	int silverCount = (cNumberNonGaiaPlayers*3);
-	int bonusSilverCount = (cNumberNonGaiaPlayers);	
-	rmEchoInfo("silver count = "+silverCount);
-	rmEchoInfo("bonus silver count = "+bonusSilverCount);
-
-	for(i=0; < silverCount)
-	{
-		silverType = rmRandInt(1,10);
-      silverID = rmCreateGrouping("silver "+i, "resource silver ore "+silverType);
-      rmSetGroupingMinDistance(silverID, 0.0);
-      rmSetGroupingMaxDistance(silverID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(silverID, farAvoidCoin);
-		rmAddGroupingConstraint(silverID, avoidAll);
-      rmAddGroupingConstraint(silverID, avoidImpassableLand);
-		rmPlaceGroupingAtLoc(silverID, 0, 0.5, 0.5);
-   }
-
-	for(i=0; < bonusSilverCount)
-	{
-		silverType = rmRandInt(1,10);
-      silver2ID = rmCreateGrouping("bonus silver "+i, "resource silver ore "+silverType);
-      rmSetGroupingMinDistance(silver2ID, 0.0);
-      rmSetGroupingMaxDistance(silver2ID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(silver2ID, avoidCoin);
-		rmAddGroupingConstraint(silver2ID, avoidAll);
-      rmAddGroupingConstraint(silver2ID, avoidImpassableLand);
-		rmPlaceGroupingAtLoc(silver2ID, 0, 0.5, 0.5);
-   }
-
-	// text
-rmSetStatusText("",0.90);
-
-	int nuggetID= rmCreateObjectDef("nugget"); 
-	rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0);
-	rmSetObjectDefMinDistance(nuggetID, 0.0);
-	rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(nuggetID, avoidImpassableLand);
-	rmAddObjectDefConstraint(nuggetID, avoidNugget);
-	rmAddObjectDefConstraint(nuggetID, avoidAll);
-	rmPlaceObjectDefAtLoc(nuggetID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*rmRandInt(9,10));
-
-	int deerID=rmCreateObjectDef("deer herd");
-   rmAddObjectDefItem(deerID, "deer", rmRandInt(8,10), 10.0);
-   rmSetObjectDefMinDistance(deerID, 0.0);
-   rmSetObjectDefMaxDistance(deerID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(deerID, avoidDeer);
-	rmAddObjectDefConstraint(deerID, avoidAll);
-   rmAddObjectDefConstraint(deerID, shortAvoidImpassableLand);
-    rmAddObjectDefConstraint(deerID, longSideIslandConstraint);
-   rmSetObjectDefCreateHerd(deerID, true);
-	rmPlaceObjectDefAtLoc(deerID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*2);
-
-	int turkeyID=rmCreateObjectDef("turkey flock");
-   rmAddObjectDefItem(turkeyID, "turkey", rmRandInt(10,14), 10.0);
-   rmSetObjectDefMinDistance(turkeyID, 0.0);
-   rmSetObjectDefMaxDistance(turkeyID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(turkeyID, avoidDeer);
-   rmAddObjectDefConstraint(turkeyID, avoidTurkey);
-	rmAddObjectDefConstraint(turkeyID, avoidAll);
-   rmAddObjectDefConstraint(turkeyID, shortAvoidImpassableLand);
-       rmAddObjectDefConstraint(turkeyID, longSideIslandConstraint);
-   rmSetObjectDefCreateHerd(turkeyID, true);
-	rmPlaceObjectDefAtLoc(turkeyID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*4);
-
-   // Define and place Forests
-   int forestTreeID = 0;
-   int numTries=6*cNumberNonGaiaPlayers;
-   int failCount=0;
-   for (i=0; <numTries)
-      {   
-         int forest=rmCreateArea("forest "+i);
-         rmSetAreaWarnFailure(forest, false);
-         rmSetAreaSize(forest, rmAreaTilesToFraction(200), rmAreaTilesToFraction(500));
-         rmSetAreaForestType(forest, "carolina marsh forest");
-         rmSetAreaForestDensity(forest, 1.0);
-         rmSetAreaForestClumpiness(forest, 0.0);
-         rmSetAreaForestUnderbrush(forest, 0.7);
-         rmSetAreaMinBlobs(forest, 1);
-         rmSetAreaMaxBlobs(forest, 5);
-         rmSetAreaMinBlobDistance(forest, 16.0);
-         rmSetAreaMaxBlobDistance(forest, 40.0);
-         rmSetAreaCoherence(forest, 0.4);
-         rmSetAreaSmoothDistance(forest, 10);
-         rmAddAreaToClass(forest, rmClassID("classForest")); 
-         rmAddAreaConstraint(forest, forestConstraint);
-         rmAddAreaConstraint(forest, avoidAll);
-         rmAddAreaConstraint(forest, shortAvoidImpassableLand); 
-         if(rmBuildArea(forest)==false)
-         {
-            // Stop trying once we fail 3 times in a row.
-            failCount++;
-            if(failCount==5)
-               break;
-         }
-         else
-            failCount=0; 
-      } 
-
-   // wood resources
-   /*
-	int randomTreeID=rmCreateObjectDef("random tree");
-   rmAddObjectDefItem(randomTreeID, "treeBayou", 1, 0.0);
-   rmSetObjectDefMinDistance(randomTreeID, 0.0);
-   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(randomTreeID, avoidAll);
-   rmAddObjectDefConstraint(randomTreeID, shortAvoidImpassableLand);
-
-   rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 20*cNumberNonGaiaPlayers);
-*/
-   int treeVsLand = rmCreateTerrainDistanceConstraint("tree v. land", "land", true, 2.0);
-   int nearShore=rmCreateTerrainMaxDistanceConstraint("tree v. water", "land", true, 14.0);
-
-   int randomWaterTreeID=rmCreateObjectDef("random tree in water");
-   rmAddObjectDefItem(randomWaterTreeID, "treeBayou", 1, 0.0);
-   rmSetObjectDefMinDistance(randomWaterTreeID, 0.0);
-   rmSetObjectDefMaxDistance(randomWaterTreeID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(randomWaterTreeID, nearShore);
-   rmAddObjectDefConstraint(randomWaterTreeID, treeVsLand);
-
-	  int fishID=rmCreateObjectDef("fish");
-   rmAddObjectDefItem(fishID, "FishSalmon", 5, 9.0);
-   rmSetObjectDefMinDistance(fishID, 0.0);
-   rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(fishID, fishVsFishID);
-   rmAddObjectDefConstraint(fishID, fishLand);
-   rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
-
-   rmPlaceObjectDefAtLoc(randomWaterTreeID, 0, 0.5, 0.5, 50*cNumberNonGaiaPlayers);
-// text
-rmSetStatusText("",0.99);
-}
\ No newline at end of file
diff --git a/RMM/borneo.xs b/RMM/borneo.xs
index beb6eef..28528a5 100644
--- a/RMM/borneo.xs
+++ b/RMM/borneo.xs
@@ -230,7 +230,7 @@ void main(void)
   rmAddObjectDefConstraint(startSilverID, avoidTradeRoute);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -833,16 +833,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.85);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
     // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/california.xs b/RMM/california.xs
index 1b573f6..ab6cea5 100644
--- a/RMM/california.xs
+++ b/RMM/california.xs
@@ -93,6 +93,9 @@ void main(void)
    rmSetLightingSet("california");
 	chooseMercs();
 
+   // Decoration avoidance
+   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.9);
+
 	// Define some classes. These are used later for constraints.
 	int classPlayer=rmDefineClass("player");
 	rmDefineClass("classCliff");
@@ -110,6 +113,9 @@ void main(void)
 	int randomClass = rmDefineClass("randomAreaClass");
 	// Player placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
    // -------------Define constraints
    // These are used to have objects and areas avoid each other
@@ -173,9 +179,6 @@ void main(void)
    // Unit avoidance
    int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 10.0);
 
-   // Decoration avoidance
-   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.9);
-
    // VP avoidance
    int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 12.0);
    int avoidTradeRouteShort = rmCreateTradeRouteDistanceConstraint("trade route short", 8.0);
@@ -716,16 +719,6 @@ void main(void)
 
    // Define and place Nuggets
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/californialarge.xs b/RMM/californialarge.xs
index 9537198..252c5ab 100644
--- a/RMM/californialarge.xs
+++ b/RMM/californialarge.xs
@@ -93,6 +93,9 @@ void main(void)
    rmSetLightingSet("california");
 	chooseMercs();
 
+   // Decoration avoidance
+   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.9);
+
 	// Define some classes. These are used later for constraints.
 	int classPlayer=rmDefineClass("player");
 	rmDefineClass("classCliff");
@@ -110,6 +113,9 @@ void main(void)
 	int randomClass = rmDefineClass("randomAreaClass");
 	// Player placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
    // -------------Define constraints
    // These are used to have objects and areas avoid each other
@@ -716,16 +722,6 @@ void main(void)
 
    // Define and place Nuggets
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <14 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/caribbean.xs b/RMM/caribbean.xs
index 02e6f31..e704741 100644
--- a/RMM/caribbean.xs
+++ b/RMM/caribbean.xs
@@ -403,6 +403,9 @@ void main(void)
 	rmSetStatusText("",0.50);
 	
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	int TCfloat = -1;
   if (cNumberTeams == 2)
@@ -532,16 +535,6 @@ void main(void)
 
  // Define and place Nuggets
  
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <14 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/carolina.xs b/RMM/carolina.xs
index 62340e2..5d2196a 100644
--- a/RMM/carolina.xs
+++ b/RMM/carolina.xs
@@ -712,16 +712,6 @@ void main(void)
 
 	// Place extra nuggets not per player
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/carolinaLarge.xs b/RMM/carolinaLarge.xs
index 16c05ca..09804b8 100644
--- a/RMM/carolinaLarge.xs
+++ b/RMM/carolinaLarge.xs
@@ -724,16 +724,6 @@ void main(void)
 
 	// Place extra nuggets not per player
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/deccan.xs b/RMM/deccan.xs
index 0894c9a..91ab6af 100644
--- a/RMM/deccan.xs
+++ b/RMM/deccan.xs
@@ -134,7 +134,7 @@ void main(void)
   int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 10.0);
 
   // general avoidance
-  int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);
+  int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 5.0);
 
   // Trade route avoidance.
   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 5.0);
@@ -575,6 +575,9 @@ void main(void)
 
 	// Player placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
   
 	int TCID = rmCreateObjectDef("player TC");
 	if (rmGetNomadStart()) {
@@ -833,16 +836,6 @@ void main(void)
   // Text
   rmSetStatusText("",0.90);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/deccanLarge.xs b/RMM/deccanLarge.xs
index 063ceb9..1490663 100644
--- a/RMM/deccanLarge.xs
+++ b/RMM/deccanLarge.xs
@@ -134,7 +134,7 @@ void main(void)
   int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 10.0);
 
   // general avoidance
-  int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);
+  int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 5.0);
 
   // Trade route avoidance.
   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 5.0);
@@ -575,6 +575,9 @@ void main(void)
 
 	// Player placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
   
 	int TCID = rmCreateObjectDef("player TC");
 	if (rmGetNomadStart()) {
@@ -833,16 +836,6 @@ void main(void)
   // Text
   rmSetStatusText("",0.90);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/fastrandom.set b/RMM/fastrandom.set
index b985dda..495033b 100644
--- a/RMM/fastrandom.set
+++ b/RMM/fastrandom.set
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<randomMaps displayNameID="33470" imagepath="ui\random_map\standard_maps" helpTextID="18882" cannotReplace="">
+<randomMaps displayNameID="33470" imagepath="ui\random_map\africa\americanmaps" helpTextID="18882" cannotReplace="">
   <map>Amazonia</map>
   <map>Bayou</map>
   <map>Caribbean</map>
@@ -23,6 +23,6 @@
   <map>Northwest Territory</map>
   <map>Hispaniola</map>
   <map>Araucania</map>
-  <map>Unknown</map>
   <map>Painted Desert</map>
+  <map>RockiesLower</map>
 </randomMaps>
diff --git a/RMM/great lakes.xs b/RMM/great lakes.xs
index 1ee3472..903c006 100644
--- a/RMM/great lakes.xs	
+++ b/RMM/great lakes.xs	
@@ -364,16 +364,6 @@ if (seasonPicker < 0.5)
 
    //mineType = rmRandInt(1,10);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
@@ -537,8 +527,9 @@ if (seasonPicker < 0.5)
 	//rmPlaceObjectDefPerPlayer(startingTCID, true);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 10.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 
 	int StartAreaTreeID=rmCreateObjectDef("starting trees");
diff --git a/RMM/great lakesbck.xs b/RMM/great lakesbck.xs
deleted file mode 100644
index 25d5bc8..0000000
--- a/RMM/great lakesbck.xs	
+++ /dev/null
@@ -1,1128 +0,0 @@
-// GREAT LAKES
-// March 2004 - JG
-// Main entry point for random map script
-void main(void)
-{
-   // Text
-   // These status text lines are used to manually animate the map generation progress bar
-   rmSetStatusText("",0.01);
-
-   //Chooses which natives appear on the map
-   int subCiv0=-1;
-   int subCiv1=-1;
-   int subCiv2=-1;
-	int subCiv3=-1;
-
-   if (rmAllocateSubCivs(4) == true)
-   {
-		// Always "Big" Comanche
-		subCiv0=rmGetCivID("Comanche");
-		if (subCiv0 >= 0)
-			rmSetSubCiv(0, "Comanche", true);
-
-
-		// Usually Lakota, sometimes Iroquois
-	 
-			subCiv1=rmGetCivID("Iroquois");
-			if (subCiv1 >= 0)
-				rmSetSubCiv(1, "Iroquois");
-	
-	
-			subCiv2=rmGetCivID("Lakota");
-		   if (subCiv2 >= 0)
-			   rmSetSubCiv(2, "Lakota");
-	  
-
-	  
-
-	  // Usually Aztec, sometimes Maya
-	  if(rmRandFloat(0,1) < 0.35)
-	  {
-	  		subCiv3=rmGetCivID("Cherokee");
-			if (subCiv3 >= 0)
-				rmSetSubCiv(3, "Cherokee");
-
-	  }
-	  else
-	  {
-			subCiv3=rmGetCivID("Cherokee");
-		   if (subCiv3 >= 0)
-			   rmSetSubCiv(3, "Cherokee");
-	  }
-	}
-
-   // Chooses which Mercenaries appear on the map
-   if (rmRandFloat(0,1) < 0.4)
-      rmAddMerc("MercSwissPikeman", rmRandInt(4,8)*cNumberNonGaiaPlayers);
-   else
-   {
-      if (rmRandFloat(0,1) < 0.75)
-	     rmAddMerc("MercLandsknecht", rmRandInt(4,8)*cNumberNonGaiaPlayers);
-      else
-	     rmAddMerc("MercRonin", rmRandInt(4,8)*cNumberNonGaiaPlayers);
-   }
-
-   if (rmRandFloat(0,1) < 0.5)
-      rmAddMerc("MercHighlander", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-   else
-      rmAddMerc("MercJaeger", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-   
-   if (rmRandFloat(0,1) < 0.4)
-      rmAddMerc("MercStradiot", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-   else
-   {  if (rmRandFloat(0,1) < 0.5)
-	     rmAddMerc("MercMameluke", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-      else
-	     rmAddMerc("MercHackapell", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-	}
-
-	if (rmRandFloat(0,1) < 0.5) 
-	{
-		if (rmRandFloat(0,1) < 0.5)
-			rmAddMerc("MercBlackRider", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-		 else
-			rmAddMerc("MercManchu", rmRandInt(3,5)*cNumberNonGaiaPlayers);
-	}
-
-   // Picks the map size
-   int playerTiles=14000;		// DAL modified from 16K
-   if(cMapSize == 1)
-   {
-      playerTiles = 16000;			// DAL modified from 18K
-      rmEchoInfo("Large map");
-   }
-   int size=2.5*sqrt(cNumberNonGaiaPlayers*playerTiles);
-   rmEchoInfo("Map size="+size+"m x "+size+"m");
-   rmSetMapSize(size, size);
-
-	// rmSetMapElevationParameters(cElevTurbulence, 0.4, 6, 0.5, 3.0);  // DAL - original
-	rmSetMapElevationParameters(cElevTurbulence, 0.4, 6, 0.7, 5.0);
-	rmSetMapElevationHeightBlend(1);
-	
-	// Picks a default water height
-   rmSetSeaLevel(8.0);
-
-   // Picks default terrain and water
-   rmSetSeaType("new england coast");
-	rmEnableLocalWater(false);
-   rmTerrainInitialize("saguenay\ground5_sag", 5.0);
-	rmSetMapType("greatlakes");
-	rmSetMapType("grass");
-	rmSetMapType("water");
-
-	// Corner constraint.
-	rmSetWorldCircleConstraint(true);
-
-   // Define some classes. These are used later for constraints.
-   int classPlayer=rmDefineClass("player");
-   rmDefineClass("classHill");
-   rmDefineClass("classPatch");
-   rmDefineClass("starting settlement");
-   rmDefineClass("startingUnit");
-   rmDefineClass("classForest");
-   rmDefineClass("importantItem");
-   rmDefineClass("natives");
-	rmDefineClass("classCliff");
-	rmDefineClass("secrets");
-	rmDefineClass("nuggets");
-	rmDefineClass("center");
-	rmDefineClass("tradeIslands");
-	int classGreatLake=rmDefineClass("great lake");
-
-   // -------------Define constraints
-   // These are used to have objects and areas avoid each other
-   
-   // Map edge constraints
-   int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(10), rmZTilesToFraction(10), 1.0-rmXTilesToFraction(10), 1.0-rmZTilesToFraction(10), 0.01);
-	int bisonEdgeConstraint=rmCreateBoxConstraint("bison edge of map", rmXTilesToFraction(20), rmZTilesToFraction(20), 1.0-rmXTilesToFraction(20), 1.0-rmZTilesToFraction(20), 0.01);
-   int longPlayerConstraint=rmCreateClassDistanceConstraint("land stays away from players", classPlayer, 70.0);  //DAL - was 24
-	// int goldCenterConstraint=rmCreateBoxConstraint("gold keeps away from middle", 0.2, 0.2, 0.8, 0.8, 0.01);
-	int centerConstraint=rmCreateClassDistanceConstraint("stay away from center", rmClassID("center"), 30.0);
-	int centerConstraintFar=rmCreateClassDistanceConstraint("stay away from center far", rmClassID("center"), 60.0);
-
-
-   // Cardinal Directions
-   int Northward=rmCreatePieConstraint("northMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(315), rmDegreesToRadians(135));
-   int Southward=rmCreatePieConstraint("southMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(135), rmDegreesToRadians(315));
-   int Eastward=rmCreatePieConstraint("eastMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(45), rmDegreesToRadians(225));
-   int Westward=rmCreatePieConstraint("westMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(225), rmDegreesToRadians(45));
-
-   // Player constraints
-   int playerConstraintForest=rmCreateClassDistanceConstraint("forests kinda stay away from players", classPlayer, 20.0);
-	int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 45.0);
-	int avoidTradeIslands=rmCreateClassDistanceConstraint("stay away from trade islands", rmClassID("tradeIslands"), 40.0);
-   int smallMapPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 70.0);
-
-   // Nature avoidance
-   // int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 18.0);
-   // int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
-   int forestObjConstraint=rmCreateTypeDistanceConstraint("forest obj", "all", 6.0);
-   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
-   int avoidResource=rmCreateTypeDistanceConstraint("resource avoid resource", "resource", 20.0);
-   int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "gold", 40.0);
-	int shortAvoidCoin=rmCreateTypeDistanceConstraint("short avoid coin", "gold", 10.0);
-   int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 1.0);
-   
-   // Avoid impassable land
-   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 4.0);
-   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 2.0);
-   int longAvoidImpassableLand=rmCreateTerrainDistanceConstraint("long avoid impassable land", "Land", false, 10.0);
-   int hillConstraint=rmCreateClassDistanceConstraint("hill vs. hill", rmClassID("classHill"), 10.0);
-   int shortHillConstraint=rmCreateClassDistanceConstraint("patches vs. hill", rmClassID("classHill"), 5.0);
-   int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
-	int avoidCliffs=rmCreateClassDistanceConstraint("cliff vs. cliff", rmClassID("classCliff"), 30.0);
-
-	int nearShore=rmCreateTerrainMaxDistanceConstraint("near shore", "water", false, 10.0);
-
-   // Unit avoidance
-   int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 45.0);
-   int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 20.0);
-   int avoidNatives=rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 30.0);
-	int avoidSecrets=rmCreateClassDistanceConstraint("stuff avoids secrets", rmClassID("secrets"), 20.0);
-	int avoidNuggets=rmCreateClassDistanceConstraint("stuff avoids nuggets", rmClassID("nuggets"), 50.0);
-	int fortConstraint=rmCreateTypeDistanceConstraint("avoid the fort", "SecretRuinAbandonedFort", 20.0);
-	int deerConstraint=rmCreateTypeDistanceConstraint("avoid the deer", "deer", 30.0);
-	int shortDeerConstraint=rmCreateTypeDistanceConstraint("short avoid the deer", "deer", 10.0);
-	int mooseConstraint=rmCreateTypeDistanceConstraint("avoid the moose", "moose", 20.0);
-   // Decoration avoidance
-   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
-
-     // Trade route avoidance.
-   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 5.0);
-   int avoidTradeRouteFar = rmCreateTradeRouteDistanceConstraint("trade route far", 20.0);
-
-   // -------------Define objects
-   // These objects are all defined so they can be placed later
-
-	
-   int bisonID=rmCreateObjectDef("bison herd center");
-   rmAddObjectDefItem(bisonID, "bison", rmRandInt(10,12), 6.0);
-	rmSetObjectDefCreateHerd(bisonID, true);
-   rmSetObjectDefMinDistance(bisonID, 0.0);
-   rmSetObjectDefMaxDistance(bisonID, 5.0);
-	// rmAddObjectDefConstraint(bisonID, playerConstraint);
-	// rmAddObjectDefConstraint(bisonID, bisonEdgeConstraint);
-	// rmAddObjectDefConstraint(bisonID, avoidResource);
-   // rmAddObjectDefConstraint(bisonID, avoidImpassableLand);
-	// rmAddObjectDefConstraint(bisonID, Northward);
-
-
-   // wood resources
-   int randomTreeID=rmCreateObjectDef("random tree");
-   rmAddObjectDefItem(randomTreeID, "longleafPine", 1, 0.0);
-   rmSetObjectDefMinDistance(randomTreeID, 0.0);
-   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(randomTreeID, avoidResource);
-   rmAddObjectDefConstraint(randomTreeID, avoidImpassableLand);
-
-   // starting resources
-	int StartAreaTreeID=rmCreateObjectDef("starting trees");
-	rmAddObjectDefItem(StartAreaTreeID, "longleafPine", 1, 0.0);
-	rmSetObjectDefMinDistance(StartAreaTreeID, 2);
-	rmSetObjectDefMaxDistance(StartAreaTreeID, 12);
-	rmAddObjectDefConstraint(StartAreaTreeID, avoidStartResource);
-	rmAddObjectDefConstraint(StartAreaTreeID, shortAvoidImpassableLand);
-	rmAddObjectDefConstraint(StartAreaTreeID, avoidTradeRoute);
-	rmAddObjectDefConstraint(StartAreaTreeID, avoidNatives);
-
-	// DAL - taken out now 'cause it's silly with the new model.
-	/*
-	int StartAreaSilverID=rmCreateObjectDef("starting silver");
-	rmAddObjectDefItem(StartAreaSilverID, "silverOre", 1, 0.0);
-	rmSetObjectDefMinDistance(StartAreaSilverID, 2);
-	rmSetObjectDefMaxDistance(StartAreaSilverID, 12);
-	rmAddObjectDefConstraint(StartAreaSilverID, avoidStartResource);
-	rmAddObjectDefConstraint(StartAreaSilverID, shortAvoidImpassableLand);
-	rmAddObjectDefConstraint(StartAreaSilverID, avoidTradeRoute);
-	rmAddObjectDefConstraint(StartAreaSilverID, avoidNatives);
-	*/
-
-	int StartPronghornID=rmCreateObjectDef("starting pronghorn");
-	rmAddObjectDefItem(StartPronghornID, "pronghorn", 1, 0.0);
-	rmSetObjectDefCreateHerd(StartPronghornID, true);
-	rmSetObjectDefMinDistance(StartPronghornID, 3);
-	rmSetObjectDefMaxDistance(StartPronghornID, 12);
-	rmAddObjectDefConstraint(StartPronghornID, avoidStartResource);
-	rmAddObjectDefConstraint(StartPronghornID, shortAvoidImpassableLand);
-	rmAddObjectDefConstraint(StartPronghornID, avoidNatives);
-
-	// -------------Done defining objects
-   // Text
-   rmSetStatusText("",0.10);
-
-   // Text
-   rmSetStatusText("",0.10);
-
-	// ************************ LAKE MICHIGAN *******************************
-	int michiganID=rmCreateArea("Lake Michigan 1");
-   rmSetAreaSize(michiganID, 0.09, 0.09);
-   rmSetAreaLocation(michiganID, 0.05, 0.6);
-   rmSetAreaWaterType(michiganID, "new england coast");
-   rmAddAreaToClass(michiganID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(michiganID, 0.0);
-	rmAddAreaInfluencePoint(michiganID, 0.5, 0.5);
-	rmSetAreaObeyWorldCircleConstraint(michiganID, false);
-   rmSetAreaMinBlobs(michiganID, 20);
-   rmSetAreaMaxBlobs(michiganID, 30);
-   rmSetAreaMinBlobDistance(michiganID, 20);
-   rmSetAreaMaxBlobDistance(michiganID, 40);
-   rmSetAreaSmoothDistance(michiganID, 10);
-   rmSetAreaCoherence(michiganID, 0.05);
-   rmBuildArea(michiganID); 
-
-	int michigan2ID=rmCreateArea("Lake Michigan 2");
-   rmSetAreaSize(michigan2ID, 0.06, 0.06);
-   rmSetAreaLocation(michigan2ID, 0.05, 0.75);
-   rmSetAreaWaterType(michigan2ID, "new england coast");
-   rmAddAreaToClass(michigan2ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(michigan2ID, 0.0);
-	rmSetAreaObeyWorldCircleConstraint(michigan2ID, false);
-	rmAddAreaInfluencePoint(michigan2ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(michigan2ID, 20);
-   rmSetAreaMaxBlobs(michigan2ID, 30);
-   rmSetAreaMinBlobDistance(michigan2ID, 20);
-   rmSetAreaMaxBlobDistance(michigan2ID, 40);
-   rmSetAreaSmoothDistance(michigan2ID, 10);
-   rmSetAreaCoherence(michigan2ID, 0.05);
-   rmBuildArea(michigan2ID); 
-
-	int michigan3ID=rmCreateArea("Lake Michigan 3");
-   rmSetAreaSize(michigan3ID, 0.04, 0.04);
-   rmSetAreaLocation(michigan3ID, 0.30, 0.50);
-   rmSetAreaWaterType(michigan3ID, "new england coast");
-   rmAddAreaToClass(michigan3ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(michigan3ID, 0.0);
-	rmAddAreaInfluencePoint(michigan3ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(michigan3ID, 20);
-   rmSetAreaMaxBlobs(michigan3ID, 30);
-   rmSetAreaMinBlobDistance(michigan3ID, 20);
-   rmSetAreaMaxBlobDistance(michigan3ID, 40);
-   rmSetAreaSmoothDistance(michigan3ID, 10);
-   rmSetAreaCoherence(michigan3ID, 0.25);
-   rmBuildArea(michigan3ID); 
-
-	int michigan4ID=rmCreateArea("Lake Michigan 4");
-   rmSetAreaSize(michigan4ID, 0.05, 0.05);
-   rmSetAreaLocation(michigan4ID, 0.30, 0.62);
-   rmSetAreaWaterType(michigan4ID, "new england coast");
-   rmAddAreaToClass(michigan4ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(michigan4ID, 0.0);
-	rmAddAreaInfluencePoint(michigan4ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(michigan4ID, 20);
-   rmSetAreaMaxBlobs(michigan4ID, 30);
-   rmSetAreaMinBlobDistance(michigan4ID, 20);
-   rmSetAreaMaxBlobDistance(michigan4ID, 40);
-   rmSetAreaSmoothDistance(michigan4ID, 10);
-   rmSetAreaCoherence(michigan4ID, 0.25);
-   rmBuildArea(michigan4ID); 
-
-	int michigan5ID=rmCreateArea("Lake Michigan 5");
-   rmSetAreaSize(michigan5ID, 0.03, 0.03);
-   rmSetAreaLocation(michigan5ID, 0.45, 0.5);
-   rmSetAreaWaterType(michigan5ID, "new england coast");
-   rmAddAreaToClass(michigan5ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(michigan5ID, 0.0);
-	rmAddAreaInfluencePoint(michigan5ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(michigan5ID, 10);
-   rmSetAreaMaxBlobs(michigan5ID, 20);
-   rmSetAreaMinBlobDistance(michigan5ID, 10);
-   rmSetAreaMaxBlobDistance(michigan5ID, 20);
-   rmSetAreaSmoothDistance(michigan5ID, 10);
-   rmSetAreaCoherence(michigan5ID, 0.25);
-   rmBuildArea(michigan5ID); 
-
-
-// ****************************** LAKE HURON *************************************
-	int huron1ID=rmCreateArea("Lake Huron 1");
-   rmSetAreaSize(huron1ID, 0.06, 0.06);
-   rmSetAreaLocation(huron1ID, 0.75, 0.0);
-   rmSetAreaWaterType(huron1ID, "new england coast");
-   rmAddAreaToClass(huron1ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(huron1ID, 0.0);
-	rmSetAreaObeyWorldCircleConstraint(huron1ID, false);
-	rmAddAreaInfluencePoint(huron1ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(huron1ID, 20);
-   rmSetAreaMaxBlobs(huron1ID, 30);
-   rmSetAreaMinBlobDistance(huron1ID, 20);
-   rmSetAreaMaxBlobDistance(huron1ID, 40);
-   rmSetAreaSmoothDistance(huron1ID, 10);
-   rmSetAreaCoherence(huron1ID, 0.05);
-   rmBuildArea(huron1ID); 
-
-	int huron2ID=rmCreateArea("Lake Huron 2");
-   rmSetAreaSize(huron2ID, 0.06, 0.06);
-   rmSetAreaLocation(huron2ID, 0.70, 0.10);
-   rmSetAreaWaterType(huron2ID, "new england coast");
-   rmAddAreaToClass(huron2ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(huron2ID, 0.0);
-	rmSetAreaObeyWorldCircleConstraint(huron2ID, false);
-	rmAddAreaInfluencePoint(huron2ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(huron2ID, 20);
-   rmSetAreaMaxBlobs(huron2ID, 30);
-   rmSetAreaMinBlobDistance(huron2ID, 20);
-   rmSetAreaMaxBlobDistance(huron2ID, 40);
-   rmSetAreaSmoothDistance(huron2ID, 10);
-   rmSetAreaCoherence(huron2ID, 0.05);
-   rmBuildArea(huron2ID); 
-
-	int huron3ID=rmCreateArea("Lake Huron 3");
-   rmSetAreaSize(huron3ID, 0.04, 0.04);
-   rmSetAreaLocation(huron3ID, 0.70, 0.25);
-   rmSetAreaWaterType(huron3ID, "new england coast");
-   rmAddAreaToClass(huron3ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(huron3ID, 0.0);
-	rmAddAreaInfluencePoint(huron3ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(huron3ID, 20);
-   rmSetAreaMaxBlobs(huron3ID, 30);
-   rmSetAreaMinBlobDistance(huron3ID, 20);
-   rmSetAreaMaxBlobDistance(huron3ID, 40);
-   rmSetAreaSmoothDistance(huron3ID, 10);
-   rmSetAreaCoherence(huron3ID, 0.25);
-   rmBuildArea(huron3ID); 
-
-	int huron4ID=rmCreateArea("Lake Huron 4");
-   rmSetAreaSize(huron4ID, 0.04, 0.04);
-   rmSetAreaLocation(huron4ID, 0.70, 0.30);
-   rmSetAreaWaterType(huron4ID, "new england coast");
-   rmAddAreaToClass(huron4ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(huron4ID, 0.0);
-	rmAddAreaInfluencePoint(huron4ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(huron4ID, 20);
-   rmSetAreaMaxBlobs(huron4ID, 30);
-   rmSetAreaMinBlobDistance(huron4ID, 20);
-   rmSetAreaMaxBlobDistance(huron4ID, 40);
-   rmSetAreaSmoothDistance(huron4ID, 10);
-   rmSetAreaCoherence(huron4ID, 0.25);
-   rmBuildArea(huron4ID); 
-
-	int huron5ID=rmCreateArea("Lake Huron 5");
-   rmSetAreaSize(huron5ID, 0.03, 0.03);
-   rmSetAreaLocation(huron5ID, 0.57, 0.35);
-   rmSetAreaWaterType(huron5ID, "new england coast");
-   rmAddAreaToClass(huron5ID, rmClassID("great lake"));
-//   rmSetAreaBaseHeight(huron5ID, 0.0);
-	rmAddAreaInfluencePoint(huron5ID, 0.7, 0.5);
-   rmSetAreaMinBlobs(huron5ID, 10);
-   rmSetAreaMaxBlobs(huron5ID, 20);
-   rmSetAreaMinBlobDistance(huron5ID, 20);
-   rmSetAreaMaxBlobDistance(huron5ID, 30);
-   rmSetAreaSmoothDistance(huron5ID, 10);
-   rmSetAreaCoherence(huron5ID, 0.15);
-   rmBuildArea(huron5ID); 
-
-	int greatLakesConstraint=rmCreateClassDistanceConstraint("avoid the great lakes", classGreatLake, 10.0);
-	int farGreatLakesConstraint=rmCreateClassDistanceConstraint("far avoid the great lakes", classGreatLake, 20.0);
-	
-// ********************* create Trade islands *********************
-
-	int tradeIslandA=rmCreateArea("trade island A");
-   rmSetAreaSize(tradeIslandA, rmAreaTilesToFraction(400), rmAreaTilesToFraction(400));
-   rmSetAreaLocation(tradeIslandA, 0.15, 0.6);
-   rmAddAreaToClass(tradeIslandA, rmClassID("great lake"));
-	rmAddAreaToClass(tradeIslandA, rmClassID("tradeIslands"));
-   rmSetAreaBaseHeight(tradeIslandA, 2.0);
-	rmSetAreaMix(tradeIslandA, "carolina grass");
-   rmSetAreaMinBlobs(tradeIslandA, 3);
-   rmSetAreaMaxBlobs(tradeIslandA, 5);
-   rmSetAreaMinBlobDistance(tradeIslandA, 5);
-   rmSetAreaMaxBlobDistance(tradeIslandA, 10);
-   rmSetAreaSmoothDistance(tradeIslandA, 20);
-   rmSetAreaCoherence(tradeIslandA, 0.15);
-   rmBuildArea(tradeIslandA); 
-
-	int tradeIslandB=rmCreateArea("trade island B");
-   rmSetAreaSize(tradeIslandB, rmAreaTilesToFraction(400), rmAreaTilesToFraction(400));
-   rmSetAreaLocation(tradeIslandB, 0.70, 0.15);
-   rmAddAreaToClass(tradeIslandB, rmClassID("great lake"));
-	rmAddAreaToClass(tradeIslandB, rmClassID("tradeIslands"));
-   rmSetAreaBaseHeight(tradeIslandB, 2.0);
-	rmSetAreaMix(tradeIslandB, "carolina grass");
-   rmSetAreaMinBlobs(tradeIslandB, 3);
-   rmSetAreaMaxBlobs(tradeIslandB, 5);
-   rmSetAreaMinBlobDistance(tradeIslandB, 5);
-   rmSetAreaMaxBlobDistance(tradeIslandB, 10);
-   rmSetAreaSmoothDistance(tradeIslandB, 20);
-   rmSetAreaCoherence(tradeIslandB, 0.15);
-   rmBuildArea(tradeIslandB); 
-
-	int socketID=rmCreateObjectDef("socket for trade post in lake");
-   rmAddObjectDefItem(socketID, "socket", 1, 0.0);
-   rmAddObjectDefItem(socketID, "socketIconTradeRoute", 1, 0.0);
-	rmSetObjectDefAllowOverlap(socketID, true);
-   rmSetObjectDefMinDistance(socketID, 0.0);
-   rmSetObjectDefMaxDistance(socketID, 12.0);
-
-   
-
-	int teamZeroCount = rmGetNumberPlayersOnTeam(0);
-	int teamOneCount = rmGetNumberPlayersOnTeam(1);
-
-	if ( cNumberTeams == 2 )
-	{
-		if ( teamZeroCount == 3 )
-		{	
-			rmSetPlacementTeam(0);
-		//	rmSetPlacementSection(0.1, 0.4);
-			rmSetPlacementSection(0.77, 0.8);
-			rmSetTeamSpacingModifier(0.3); 
-			rmPlacePlayersCircular(0.47, 0.47, 0);
-		//	rmPlacePlayersLine(0.15, 0.10, 0.25, 0.10, 0, 0.05);
-		}
-		else
-		{
-			rmSetPlacementTeam(0);
-		//	rmSetPlacementSection(0.1, 0.4);
-			rmSetPlacementSection(0.75, 0.85);
-			rmSetTeamSpacingModifier(0.5); 
-			rmPlacePlayersCircular(0.47, 0.47, 0);
-		//	rmPlacePlayersLine(0.15, 0.10, 0.15, 0.6, 0, 0.15);
-		}
-
-		if (teamOneCount == 3 )
-		{
-			rmSetPlacementTeam(1);
-		//	rmSetPlacementSection(0.6, 0.9);
-			rmSetPlacementSection(0.4, 0.45);
-			rmSetTeamSpacingModifier(0.3); 
-			rmPlacePlayersCircular(0.47, 0.47, 0);
-		//	rmPlacePlayersLine(0.75, 0.6, 0.85, 0.6, 0, 0.05);
-		}
-		else
-		{
-			rmSetPlacementTeam(1);
-		//	rmSetPlacementSection(0.6, 0.9);
-			rmSetPlacementSection(0.4, 0.45);
-			rmSetTeamSpacingModifier(0.3); 
-			rmPlacePlayersCircular(0.47, 0.47, 0);
-		//	rmPlacePlayersLine(0.85, 0.10, 0.85, 0.6, 0, 0.15);
-		}
-	}
-	else
-	{
-  		rmSetPlacementSection(0.0, 0.95);
-		rmPlacePlayersSquare(0.35, 0.05, 0.1);
-	}
-	
-
-	float playerFraction=rmAreaTilesToFraction(100);
-   for(i=1; <cNumberPlayers)
-   {
-      // Create the area.
-      int id=rmCreateArea("Player"+i);
-      // Assign to the player.
-      rmSetPlayerArea(i, id);
-      // Set the size.
-      rmSetAreaSize(id, playerFraction, playerFraction);
-      rmAddAreaToClass(id, classPlayer);
-      rmSetAreaMinBlobs(id, 1);
-      rmSetAreaMaxBlobs(id, 1);
-      rmAddAreaConstraint(id, playerConstraint); 
-      rmAddAreaConstraint(id, playerEdgeConstraint); 
-//		rmAddAreaConstraint(id, avoidWater);
-		rmAddAreaConstraint(id, longAvoidImpassableLand);
-		rmSetAreaLocPlayer(id, i);
-		rmSetAreaWarnFailure(id, false);
-   }
-
-	// Build the areas.
-   rmBuildAllAreas();
-	
-	int avoidWater4 = rmCreateTerrainDistanceConstraint("avoid water", "Land", false, 4.0);
-	int colonyShipID=rmCreateObjectDef("colony ship");
-   rmAddObjectDefItem(colonyShipID, "caravel", 1, 0.0);
-   rmSetObjectDefGarrisonStartingUnits(colonyShipID, true);
-   rmSetObjectDefMinDistance(colonyShipID, 0.0);
-   rmSetObjectDefMaxDistance(colonyShipID, 10.0);
- 
-   // Set up for finding closest land points.
-	int avoidHCFlags=rmCreateHCGPConstraint("avoid HC flags", 20);
-   rmAddClosestPointConstraint(avoidImpassableLand);
-	rmAddClosestPointConstraint(avoidTradeIslands);
-	rmAddClosestPointConstraint(avoidHCFlags);
-
-   
-   for(i=1; <cNumberPlayers)
-   {
-      // Place boat.
-      int count = rmPlaceObjectDefAtLoc(colonyShipID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-      if(count<1)
-      {
-         rmEchoError("Failed to place player "+i);
-         continue;
-      }
-      
-      // Get where it placed.
-      vector colonyShipLocation=rmGetUnitPosition(rmGetUnitPlacedOfPlayer(colonyShipID, i));
-      
-      // Find closest point.
-      vector closestPoint = rmFindClosestPointVector(colonyShipLocation, 200.0);
-      
-      // Set HCGP.
-      rmSetHomeCityGatherPoint(i, closestPoint);
-   }
-   
-   // Clear out constraints for good measure.
-   rmClearClosestPointConstraints();
-
-
-// ************************* PLACE THE UBER FORT SECRET **************************
-
-	int abandonedFortID=rmCreateObjectDef("capturable fort");
-   rmAddObjectDefItem(abandonedFortID, "SecretRuinAbandonedFort", 1, 0.0);
-//	rmAddObjectDefItem(abandonedFortID, "SecretRuinWildTales", 1, 10.0);
-   rmSetObjectDefMinDistance(abandonedFortID, 0.0);
-   rmSetObjectDefMaxDistance(abandonedFortID, 20.0);
-	rmAddObjectDefConstraint(abandonedFortID, farGreatLakesConstraint);
-	rmAddObjectDefConstraint(abandonedFortID, nearShore);
-	rmPlaceObjectDefAtLoc(abandonedFortID, 0, 0.42, 0.34);
-
-
-// **************************** PLACE WATER TRADE ROUTE ***************************
-
-	int tradeRouteID = rmCreateTradeRoute();
-	rmAddTradeRouteWaypoint(tradeRouteID, 0.15, 0.6);
-	 rmAddTradeRouteWaypoint(tradeRouteID, 0.35, 0.56);
-    rmAddTradeRouteWaypoint(tradeRouteID, 0.45, 0.64);
-	 rmAddTradeRouteWaypoint(tradeRouteID, 0.6, 0.4);
-	rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.7, 0.15, 2, 2);
-	bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID, "dirt");
-	if(placedTradeRoute == false)
-		rmEchoError("Failed to place trade route #1");
-
-	
-	
-	rmPlaceObjectDefInArea(socketID, 0, tradeIslandA);
-	rmPlaceObjectDefInArea(socketID, 0, tradeIslandB);
-
-
-
-
-   // Text
-   rmSetStatusText("",0.20);
-
-   // Text
-   rmSetStatusText("",0.30);
-
-	// Text
-	rmSetStatusText("",0.50);
-	int numTries = -1;
-	int failCount = -1;
-
-	// Define and place the Native Villages and Secrets of the New World
-	// Text
-	rmSetStatusText("",0.50);
-
-	float NativeVillageLoc = rmRandFloat(0,1);
-	float ComancheVillageLoc = rmRandFloat(0,1);
-
-	// Comanche, Iroquois, Aztec rules (DAL - these are stub for now.)
-	if (subCiv0 == rmGetCivID("Comanche"))
-	{  
-		int comancheVillageID = -1;
-		int comancheVillageType = rmRandInt(1,3);
-		comancheVillageID = rmCreateGrouping("comanche village", "native comanche village "+comancheVillageType);
-		rmSetGroupingMinDistance(comancheVillageID, 0.0);
-		rmSetGroupingMaxDistance(comancheVillageID, 20.0);
-		rmAddGroupingConstraint(comancheVillageID, greatLakesConstraint);
-		rmAddGroupingConstraint(comancheVillageID, nearShore);
-		rmAddGroupingToClass(comancheVillageID, rmClassID("natives"));
-		rmAddGroupingToClass(comancheVillageID, rmClassID("importantItem"));
-
-		if ( ComancheVillageLoc < 0.5 )
-		{
-			rmPlaceGroupingAtLoc(comancheVillageID, 0, 0.3, 0.75);
-		}
-		else
-		{
-			rmPlaceGroupingAtLoc(comancheVillageID, 0, 0.3, 0.75);
-		}
-	}
-
-	if (subCiv1 == rmGetCivID("Iroquois"))
-	{
-		int iroquoisVillageID = -1;
-		int iroquoisVillageType = rmRandInt(1,3);
-		iroquoisVillageID = rmCreateGrouping("iroquois village", "native iroquois village "+iroquoisVillageType);
-		rmSetGroupingMinDistance(iroquoisVillageID, 0.0);
-		rmSetGroupingMaxDistance(iroquoisVillageID, 20.0);
-		rmAddGroupingConstraint(iroquoisVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(iroquoisVillageID, rmClassID("natives"));
-		rmAddGroupingToClass(iroquoisVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(iroquoisVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(iroquoisVillageID, avoidTradeRoute);
-
-		if (NativeVillageLoc < 0.5)
-		{
-		  rmPlaceGroupingAtLoc(iroquoisVillageID, 0, 0.2, 0.38);
-		}
-		else
-		{
-		  rmPlaceGroupingAtLoc(iroquoisVillageID, 0, 0.2, 0.38);
-		}
-	}
-	
-	if (subCiv2 == rmGetCivID("Lakota"))
-	{
-		int lakotaVillageID = -1;
-		int lakotaVillageType = rmRandInt(1,3);
-		lakotaVillageID = rmCreateGrouping("lakota village", "native lakota village "+lakotaVillageType);
-		rmSetGroupingMinDistance(lakotaVillageID, 0.0);
-		rmSetGroupingMaxDistance(lakotaVillageID, 20.0);
-		rmAddGroupingConstraint(lakotaVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(lakotaVillageID, rmClassID("natives"));
-		rmAddGroupingToClass(lakotaVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(lakotaVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(lakotaVillageID, avoidTradeRoute);
-
-		if (NativeVillageLoc < 0.5)
-		{
-		  rmPlaceGroupingAtLoc(lakotaVillageID, 0, 0.8, 0.45);
-		}
-		else
-		{
-		  rmPlaceGroupingAtLoc(lakotaVillageID, 0, 0.8, 0.45);
-		}
-	}
-
-	if (subCiv3 == rmGetCivID("Cherokee"))
-	{   
-		int aztecVillageID = -1;
-		int cherokeeVillageType = rmRandInt(1,3);
-		aztecVillageID = rmCreateGrouping("cherokee village", "native cherokee village "+cherokeeVillageType);
-		rmSetGroupingMinDistance(aztecVillageID, 0.0);
-		rmSetGroupingMaxDistance(aztecVillageID, 20.0);
-		rmAddGroupingConstraint(aztecVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(aztecVillageID, rmClassID("natives"));
-		rmAddGroupingToClass(aztecVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(aztecVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(aztecVillageID, avoidTradeRoute);
-		rmAddGroupingConstraint(aztecVillageID, avoidNatives);
-
-		if (NativeVillageLoc < 0.5)
-		{
-		  rmPlaceGroupingAtLoc(aztecVillageID, 0, 0.5, 0.2);
-		}
-		else
-		{
-		  rmPlaceGroupingAtLoc(aztecVillageID, 0, 0.5, 0.2);
-		}
-	}
-	else
-	{   
-		int mayaVillageID = -1;
-		int mayaVillageType = rmRandInt(1,3);
-		mayaVillageID = rmCreateGrouping("maya village", "native maya village "+mayaVillageType);
-		rmSetGroupingMinDistance(mayaVillageID, 0.0);
-		rmSetGroupingMaxDistance(mayaVillageID, 20.0);
-		rmAddGroupingConstraint(mayaVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(mayaVillageID, rmClassID("natives"));
-		rmAddGroupingToClass(mayaVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(mayaVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(mayaVillageID, avoidTradeRoute);
-		rmAddGroupingConstraint(mayaVillageID, avoidNatives);
-
-		if (NativeVillageLoc < 0.5)
-		{
-		  rmPlaceGroupingAtLoc(mayaVillageID, 0, 0.53, 0.2);
-		}
-		else
-		{
-		  rmPlaceGroupingAtLoc(mayaVillageID, 0, 0.53, 0.2);
-		}
-	}
-
-// ************************* the other 2 Secrets **********************************
-	float SecretLoc = rmRandFloat(0,1);
-	float RandomSecret = rmRandFloat(0,1);
-/*
-	int secretID1= rmCreateObjectDef("Secret Ruin Number One"); 
-	if ( 	RandomSecret < 0.5)
-	{
-		rmAddObjectDefItem(secretID1, "secretRuinAmbush", 1, 0.0);
-	}
-	else
-	{
-		rmAddObjectDefItem(secretID1, "secretRuinSecretPath", 1, 0.0);
-	}
-	rmSetObjectDefMinDistance(secretID1, 0.0);
-	rmSetObjectDefMaxDistance(secretID1, 0.05);
-	rmAddObjectDefConstraint(secretID1, avoidImpassableLand);
-	rmAddObjectDefToClass(secretID1, rmClassID("importantItem"));
-	rmAddObjectDefToClass(secretID1, rmClassID("secrets"));
-	rmPlaceObjectDefAtLoc(secretID1, 0, 0.85, 0.7);
-
-	int secretID2= rmCreateObjectDef("Secret Ruin Number Two"); 
-	if ( 	RandomSecret < 0.99)
-	{
-		rmAddObjectDefItem(secretID2, "secretRuinBuccaneer", 1, 0.0);
-	}
-	else
-	{
-		rmAddObjectDefItem(secretID2, "secretRuinIcelanders", 1, 0.0);
-	}
-	rmSetObjectDefMinDistance(secretID2, 0.0);
-	rmSetObjectDefMaxDistance(secretID2, 0.05);
-	rmAddObjectDefConstraint(secretID2, avoidImpassableLand);
-	rmAddObjectDefToClass(secretID2, rmClassID("importantItem"));
-	rmAddObjectDefToClass(secretID2, rmClassID("secrets"));
-	rmPlaceObjectDefAtLoc(secretID2, 0, 0.58, 0.85);
-
-*/
-
-	// Define and place Nuggets
-	int nuggetID = 0;
-	for(i=0; <cNumberNonGaiaPlayers*4)
-	{
-		nuggetID= rmCreateObjectDef("nugget "+i); 
-		rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0);
-		rmSetObjectDefMinDistance(nuggetID, 0.0);
-		rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(nuggetID, playerConstraint);
-		rmAddObjectDefConstraint(nuggetID, avoidImpassableLand);
-		rmAddObjectDefToClass(nuggetID, rmClassID("importantItem"));
-		rmAddObjectDefToClass(nuggetID, rmClassID("nuggets"));
-//		rmAddObjectDefConstraint(nuggetID, avoidResource);
-//		rmAddObjectDefConstraint(nuggetID, avoidImportantItem);
-//		rmAddObjectDefConstraint(nuggetID, avoidSecrets);
-		rmAddObjectDefConstraint(nuggetID, avoidNuggets);
-		rmAddObjectDefConstraint(nuggetID, playerEdgeConstraint);
-		rmPlaceObjectDefAtLoc(nuggetID, 0, 0.5, 0.5);
-	}
-
-	// make Mainland more pretty by placing patches of terrain
-      // For this map, place patches before cliffs so they can avoid impassable land by a lot
-      for (i=0; <80)
-      {
-         int patch=rmCreateArea("first patch "+i);
-         rmSetAreaWarnFailure(patch, false);
-         rmSetAreaSize(patch, rmAreaTilesToFraction(50), rmAreaTilesToFraction(100));
-         rmSetAreaTerrainType(patch, "saguenay\ground6_sag");
-         rmAddAreaTerrainLayer(patch, "saguenay\ground4_sag", 0, 1);
-         rmAddAreaToClass(patch, rmClassID("classPatch"));
-         rmSetAreaMinBlobs(patch, 1);
-         rmSetAreaMaxBlobs(patch, 5);
-         rmSetAreaMinBlobDistance(patch, 16.0);
-         rmSetAreaMaxBlobDistance(patch, 40.0);
-         rmSetAreaCoherence(patch, 0.0);
-			rmAddAreaConstraint(patch, shortAvoidImpassableLand);
-         rmBuildArea(patch); 
-      }
-
-// Define and place forests - north and south
-	int forestTreeID = 0;
-	
-	numTries=5*cNumberNonGaiaPlayers;  // DAL - 4 here, 4 below
-	failCount=0;
-	for (i=0; <numTries)
-		{   
-			int northForest=rmCreateArea("northforest"+i);
-			rmSetAreaWarnFailure(northForest, false);
-			rmSetAreaSize(northForest, rmAreaTilesToFraction(500), rmAreaTilesToFraction(700));
-			rmSetAreaForestType(northForest, "saguenay forest");
-			rmSetAreaForestDensity(northForest, 0.8);
-			rmAddAreaToClass(northForest, rmClassID("classForest"));
-			rmSetAreaForestClumpiness(northForest, 0.5);		//DAL more forest with more clumps
-			rmSetAreaForestUnderbrush(northForest, 0.6);
-			rmSetAreaMinBlobs(northForest, 1);
-			rmSetAreaMaxBlobs(northForest, 3);					//DAL was 5
-			rmSetAreaMinBlobDistance(northForest, 16.0);
-			rmSetAreaMaxBlobDistance(northForest, 30.0);
-			rmSetAreaCoherence(northForest, 0.4);
-			rmSetAreaSmoothDistance(northForest, 10);
-			rmAddAreaConstraint(northForest, avoidImportantItem);		   // DAL added, to try and make sure natives got on the map w/o override.
-			rmAddAreaConstraint(northForest, avoidSecrets);
-			rmAddAreaConstraint(northForest, greatLakesConstraint);
-//			rmAddAreaConstraint(northForest, playerConstraintForest);		// DAL adeed, to keep forests away from the player.
-			rmAddAreaConstraint(northForest, forestConstraint);   // DAL adeed, to keep forests away from each other.
-			rmAddAreaConstraint(northForest, Northward);				// DAL adeed, to keep forests in the north.
-//			rmAddAreaConstraint(northForest, avoidTradeRoute);
-			if(rmBuildArea(northForest)==false)
-			{
-				// Stop trying once we fail 5 times in a row.  
-				failCount++;
-				if(failCount==5)
-					break;
-			}
-			else
-				failCount=0; 
-		}
-
-	
-	numTries=3*cNumberNonGaiaPlayers;  // DAL - 4 here, 4 above.
-	failCount=0;
-	for (i=0; <numTries)
-		{   
-			int southForest=rmCreateArea("southforest"+i);
-			rmSetAreaWarnFailure(southForest, false);
-			rmSetAreaSize(southForest, rmAreaTilesToFraction(200), rmAreaTilesToFraction(300));
-			rmSetAreaForestType(southForest, "saguenay forest");
-			rmSetAreaForestDensity(southForest, 0.8);
-			rmAddAreaToClass(southForest, rmClassID("classForest"));
-			rmSetAreaForestClumpiness(southForest, 0.5);		//DAL more forest with more clumps
-			rmSetAreaForestUnderbrush(southForest, 0.6);
-			rmSetAreaMinBlobs(southForest, 1);
-			rmSetAreaMaxBlobs(southForest, 3);						//DAL was 5
-			rmSetAreaMinBlobDistance(southForest, 16.0);
-			rmSetAreaMaxBlobDistance(southForest, 30.0);
-			rmSetAreaCoherence(southForest, 0.4);
-			rmSetAreaSmoothDistance(southForest, 10);
-			rmAddAreaConstraint(southForest, avoidImportantItem); // DAL added, to try and make sure natives got on the map w/o override.
-			rmAddAreaConstraint(southForest, avoidSecrets);
-			rmAddAreaConstraint(southForest, greatLakesConstraint);
-//			rmAddAreaConstraint(southForest, playerConstraintForest);   // DAL adeed, to keep forests away from the player.
-			rmAddAreaConstraint(southForest, forestConstraint);   // DAL adeed, to keep forests away from each other.
-			rmAddAreaConstraint(southForest, Southward);				// DAL adeed, to keep forests in the south.
-			rmAddAreaConstraint(southForest, fortConstraint);
-			if(rmBuildArea(southForest)==false)
-			{
-				// Stop trying once we fail 5 times in a row.  
-				failCount++;
-				if(failCount==5)
-					break;
-			}
-			else
-				failCount=0; 
-		} 
-
-// Silver mines
-   int mineType = -1;
-   int mineID = -1;
-	int silverTries=2*cNumberNonGaiaPlayers;
-   
-   for(i=0; <silverTries)
-   {
-	   mineType = rmRandInt(1,10);
-      int northSilverID = rmCreateGrouping("north silver "+i, "resource silver ore "+mineType);
-      rmSetGroupingMinDistance(northSilverID, 0.0);
-      rmSetGroupingMaxDistance(northSilverID, rmXFractionToMeters(0.50));
-		rmAddGroupingConstraint(northSilverID, avoidCoin);
-      rmAddGroupingConstraint(northSilverID, avoidImpassableLand);
-      rmAddGroupingConstraint(northSilverID, avoidTradeRoute);
-		rmAddGroupingConstraint(northSilverID, avoidAll);
-		rmAddGroupingConstraint(northSilverID, Northward);
-		rmAddGroupingConstraint(northSilverID, greatLakesConstraint);
-		rmPlaceGroupingAtLoc(northSilverID, 0, 0.5, 0.5);
-   }
-
-   for(i=0; <silverTries)
-   {
-	   mineType = rmRandInt(1,10);
-      int southSilverID = rmCreateGrouping("south silver "+i, "resource silver ore "+mineType);
-      rmSetGroupingMinDistance(southSilverID, 0.0);
-      rmSetGroupingMaxDistance(southSilverID, rmXFractionToMeters(0.50));
-		rmAddGroupingConstraint(southSilverID, avoidCoin);
-      rmAddGroupingConstraint(southSilverID, avoidImpassableLand);
-      rmAddGroupingConstraint(southSilverID, avoidTradeRoute);
-		rmAddGroupingConstraint(southSilverID, avoidAll);
-		rmAddGroupingConstraint(southSilverID, Southward);
-		rmAddGroupingConstraint(southSilverID, greatLakesConstraint);
-		rmPlaceGroupingAtLoc(southSilverID, 0, 0.5, 0.2);
-   }
-
-   
-// Place some extra deer herds.  
-   int deerHerdID=rmCreateObjectDef("northern deer herd");
-   rmAddObjectDefItem(deerHerdID, "deer", rmRandInt(6,8), 6.0);
-	rmSetObjectDefCreateHerd(deerHerdID, true);
-   rmSetObjectDefMinDistance(deerHerdID, 0.0);
-   rmSetObjectDefMaxDistance(deerHerdID, rmXFractionToMeters(0.50));
-	rmAddObjectDefConstraint(deerHerdID, avoidCoin);
-	rmAddObjectDefConstraint(deerHerdID, greatLakesConstraint);
-	rmAddObjectDefConstraint(deerHerdID, avoidAll);
-	rmAddObjectDefConstraint(deerHerdID, avoidImpassableLand);
-	rmAddObjectDefConstraint(deerHerdID, deerConstraint);
-	rmAddObjectDefConstraint(deerHerdID, Northward);
-	numTries=2*cNumberNonGaiaPlayers;
-	for (i=0; <numTries)
-	{
-		rmPlaceObjectDefAtLoc(deerHerdID, 0, 0.5, 0.5);
-	}
-	// Text
-	rmSetStatusText("",0.70);
-
-	int deerHerdID2=rmCreateObjectDef("southern deer herd");
-   rmAddObjectDefItem(deerHerdID2, "deer", rmRandInt(6,8), 6.0);
-	rmSetObjectDefCreateHerd(deerHerdID2, true);
-   rmSetObjectDefMinDistance(deerHerdID2, 0.0);
-   rmSetObjectDefMaxDistance(deerHerdID2, rmXFractionToMeters(0.50));
-	rmAddObjectDefConstraint(deerHerdID2, shortAvoidCoin);
-	rmAddObjectDefConstraint(deerHerdID2, greatLakesConstraint);
-	rmAddObjectDefConstraint(deerHerdID2, avoidAll);
-	rmAddObjectDefConstraint(deerHerdID2, avoidImpassableLand);
-	rmAddObjectDefConstraint(deerHerdID2, deerConstraint);
-	rmAddObjectDefConstraint(deerHerdID2, Southward);
-	numTries=2*cNumberNonGaiaPlayers;
-	for (i=0; <numTries)
-	{
-		rmPlaceObjectDefAtLoc(deerHerdID2, 0, 0.5, 0.5);
-	}
-	// Text
-	rmSetStatusText("",0.70);
-
-
-// Place some extra deer herds.  
-   int mooseHerdID=rmCreateObjectDef("moose herd");
-   rmAddObjectDefItem(mooseHerdID, "moose", rmRandInt(2,4), 6.0);
-	rmSetObjectDefCreateHerd(mooseHerdID, true);
-   rmSetObjectDefMinDistance(mooseHerdID, 0.0);
-   rmSetObjectDefMaxDistance(mooseHerdID, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(mooseHerdID, shortAvoidCoin);
-	rmAddObjectDefConstraint(mooseHerdID, greatLakesConstraint);
-	rmAddObjectDefConstraint(mooseHerdID, avoidAll);
-	rmAddObjectDefConstraint(mooseHerdID, avoidImpassableLand);
-	rmAddObjectDefConstraint(mooseHerdID, Northward);
-	rmAddObjectDefConstraint(mooseHerdID, mooseConstraint);
-	rmAddObjectDefConstraint(mooseHerdID, shortDeerConstraint);
-	numTries=2*cNumberNonGaiaPlayers;
-	for (i=0; <numTries)
-	{
-		rmPlaceObjectDefAtLoc(mooseHerdID, 0, 0.5, 0.5);
-	}
-	// Text
-	rmSetStatusText("",0.70);
-
-
-	int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 18.0);
-   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
-
-	int fishID=rmCreateObjectDef("fish");
-   rmAddObjectDefItem(fishID, "FishSalmon", 3, 9.0);
-   rmSetObjectDefMinDistance(fishID, 0.0);
-   rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(fishID, fishVsFishID);
-   rmAddObjectDefConstraint(fishID, fishLand);
-   rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
-	/*
-      
-*/
-	// Placement order
-	// Trade Route -> Players and player stuff -> Natives -> Secrets -> Cliffs -> Nuggets
-	// Place other objects that were defined earlier
-
-	// DAL added - two trade routes placed
-
-/*
-	
-
-   int playerGoldID=rmCreateObjectDef("player silver ore");
-	int silverType = rmRandInt(1,10);
-
-*/	
-	// Player placement
-
-/*
-	
-*/
-	
-	
-	// Define and place cliffs
-	
-/*
-
-	numTries=cNumberNonGaiaPlayers*4;
-	failCount=0;
-	for(i=0; <numTries)
-	{
-		int cliffID=rmCreateArea("cliff"+i);
-	   rmSetAreaSize(cliffID, rmAreaTilesToFraction(100), rmAreaTilesToFraction(900));  // DAL - larger cliffs?
-		rmSetAreaWarnFailure(cliffID, false);
-		rmSetAreaCliffType(cliffID, "Amazon");
-		rmAddAreaToClass(cliffID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
-		int edgeRand=rmRandInt(0,100);
-		rmSetAreaCliffEdge(cliffID, 1, 0.6, 0.1, 1.0, 0);
-		rmSetAreaCliffPainting(cliffID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffID, 6, 1.0, 1.0);
-		rmSetAreaHeightBlend(cliffID, 1);
-		rmAddAreaTerrainLayer(cliffID, "carolinas\grass4", 0, 2);
-
-		rmAddAreaConstraint(cliffID, avoidCliffs);		// Avoid cliffs, please!
-		rmAddAreaConstraint(cliffID, playerConstraint); // Keep cliffs away from the player.
-		rmAddAreaConstraint(cliffID, avoidImportantItem);
-		rmAddAreaConstraint(cliffID, avoidTradeRoute);
-		rmAddAreaConstraint(cliffID, greatLakesConstraint);
-		rmAddAreaConstraint(cliffID, avoidSecrets);			// And especially freakin' secrets!
-		rmSetAreaMinBlobs(cliffID, 3);
-		rmSetAreaMaxBlobs(cliffID, 5);
-		rmSetAreaMinBlobDistance(cliffID, 16.0);
-		rmSetAreaMaxBlobDistance(cliffID, 40.0);
-		rmSetAreaCoherence(cliffID, 0.0);
-		rmSetAreaSmoothDistance(cliffID, 30);	// DAL - used to be 10
-		rmSetAreaCoherence(cliffID, 0.25);
-
-		if(rmBuildArea(cliffID)==false)
-		{
-			// Stop trying once we fail 3 times in a row
-			failCount++;
-			if(failCount==3)
-				break;
-		}
-		else
-			failCount=0;
-	}
-*/
-	// Text
-	rmSetStatusText("",0.60);
-	// */
-
-	
-/*
-	// Text
-	rmSetStatusText("",0.70);
-
-	
-
-
-
-	
-	
-
-	// Text
-	rmSetStatusText("",0.80);
-
-	// Resources that can be placed after forests - bison and random straggler trees.
-	// rmPlaceObjectDefPerPlayer(bisonID, false, 1);
-	// rmPlaceObjectDefPerPlayer(bisonID2, false, 1);
-
-	// rmPlaceObjectDefAtLoc(bisonID, 0, 0.5, 0.5, 1);
-
-	rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);  //DAL used to be 18.
-
-		// Text
-	rmSetStatusText("",0.90);
-
-	// Define and place decorations: rocks and grass and stuff 
-	int rockID=rmCreateObjectDef("lone rock");
-	int avoidRock=rmCreateTypeDistanceConstraint("avoid rock", "underbrushRock", 8.0);
-	rmAddObjectDefItem(rockID, "underbrushRock", 1, 0.0);
-	rmSetObjectDefMinDistance(rockID, 0.0);
-	rmSetObjectDefMaxDistance(rockID, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(rockID, avoidAll);
-	rmAddObjectDefConstraint(rockID, avoidImpassableLand);
-	rmAddObjectDefConstraint(rockID, avoidRock);
-	rmPlaceObjectDefAtLoc(rockID, 0, 0.5, 0.5, 15*cNumberNonGaiaPlayers);
-
-	int Grass=rmCreateObjectDef("grass");
-	rmAddObjectDefItem(Grass, "underbrushShrub", 1, 0.0);
-	rmSetObjectDefMinDistance(Grass, 0.0);
-	rmSetObjectDefMaxDistance(Grass, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(Grass, avoidAll);
-	rmAddObjectDefConstraint(Grass, avoidImpassableLand);
-	rmAddObjectDefConstraint(Grass, avoidRock);
-	rmPlaceObjectDefAtLoc(Grass, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
-
-	int rockAndGrass=rmCreateObjectDef("grass and rock");
-	rmAddObjectDefItem(rockAndGrass, "underbrushShrub", 2, 2.0);
-	rmAddObjectDefItem(rockAndGrass, "underbrushRock", 1, 2.0);
-	rmSetObjectDefMinDistance(rockAndGrass, 0.0);
-	rmSetObjectDefMaxDistance(rockAndGrass, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(rockAndGrass, avoidAll);
-	rmAddObjectDefConstraint(rockAndGrass, avoidImpassableLand);
-	rmAddObjectDefConstraint(rockAndGrass, avoidRock);
-	rmPlaceObjectDefAtLoc(rockAndGrass, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
-*/
-	// Text
-	rmSetStatusText("",1.0);
-   
-	}  
-
-}  
diff --git a/RMM/great plains.xs b/RMM/great plains.xs
index 61d942f..49ad8a2 100644
--- a/RMM/great plains.xs	
+++ b/RMM/great plains.xs	
@@ -368,6 +368,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 7.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	int startingTCID = rmCreateObjectDef("startingTC");
 	if ( rmGetNomadStart())
@@ -873,16 +874,6 @@ void main(void)
 			failCount=0; 
    }
    
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/great plainsLarge.xs b/RMM/great plainsLarge.xs
index 64a073c..4e1c28f 100644
--- a/RMM/great plainsLarge.xs	
+++ b/RMM/great plainsLarge.xs	
@@ -359,6 +359,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 7.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	int startingTCID = rmCreateObjectDef("startingTC");
 	if ( rmGetNomadStart())
@@ -864,16 +865,6 @@ void main(void)
 			failCount=0; 
    }
    
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/groupings/native aztec village 1.xml b/RMM/groupings/native aztec village 1.xml
index 2ef84e3..7bc40d3 100644
--- a/RMM/groupings/native aztec village 1.xml	
+++ b/RMM/groupings/native aztec village 1.xml	
@@ -1,108 +1,176 @@
 <?xml version="1.0"?>
 
 <grouping>
-	<width>17</width>
-	<height>12</height>
+	<width>12</width>
+	<height>13</height>
 	<ignoreplacementrules>1</ignoreplacementrules>
 	<selectassingleunit>1</selectassingleunit>
 	<units>
-		<unit variation ="13" posx ="-6.4696" posz ="-9.9113" orientx ="0.3824" orienty ="0.0000" orientz ="0.9240">PropsNative</unit>
-		<unit variation ="51" posx ="-6.9619" posz ="-9.4890" orientx ="0.3832" orienty ="0.0000" orientz ="-0.9237">UnderbrushRockies</unit>
-		<unit variation ="9" posx ="3.3656" posz ="-10.5234" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-1.3855" posz ="-10.8761" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="10.6468" posz ="-8.8899" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="11.5014" posz ="-9.5953" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="51" posx ="15.4690" posz ="-9.8141" orientx ="0.3822" orienty ="0.0000" orientz ="0.9241">UnderbrushRockies</unit>
-		<unit variation ="8" posx ="-3.8465" posz ="-8.8132" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-3.6451" posz ="-9.7453" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-2.6217" posz ="-10.1510" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-2.0801" posz ="-10.9181" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-2.8312" posz ="-10.6706" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="12.7892" posz ="-9.2932" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="11.7687" posz ="-10.2347" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="129" posx ="13.8235" posz ="-10.1724" orientx ="0.3825" orienty ="0.0000" orientz ="0.9240">UnderbrushTexas</unit>
-		<unit variation ="8" posx ="4.3584" posz ="-10.4959" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="4.0428" posz ="-11.0741" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="120" posx ="-0.4101" posz ="-7.3471" orientx ="-0.0004" orienty ="0.0000" orientz ="1.0000">NativeHouseAztec</unit>
-		<unit variation ="186" posx ="-1.5798" posz ="-6.9002" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="147" posx ="3.2884" posz ="-6.4691" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="184" posx ="-6.0161" posz ="-6.0022" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="129" posx ="-9.7724" posz ="-8.1076" orientx ="0.3825" orienty ="0.0000" orientz ="0.9240">UnderbrushTexas</unit>
-		<unit variation ="179" posx ="11.9456" posz ="-7.2860" orientx ="-0.9998" orienty ="0.0000" orientz ="0.0212">SMIncanPickerSitting</unit>
-		<unit variation ="172" posx ="4.7583" posz ="-8.6031" orientx ="0.9976" orienty ="0.0000" orientz ="0.0696">SMIncanStoryTelling</unit>
-		<unit variation ="214" posx ="11.2375" posz ="-5.7417" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="204" posx ="-8.6769" posz ="-3.1277" orientx ="0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="0" posx ="7.8899" posz ="-6.0945" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="13" posx ="-11.6398" posz ="-6.5213" orientx ="-0.7069" orienty ="0.0000" orientz ="-0.7073">PropsNative</unit>
-		<unit variation ="8" posx ="-10.1000" posz ="-6.0552" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-10.3169" posz ="-5.0950" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="43" posx ="-7.7545" posz ="-5.4108" orientx ="-0.5587" orienty ="0.0000" orientz ="0.8294">SMIncanCookpot</unit>
-		<unit variation ="34" posx ="11.2813" posz ="-3.2936" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="178" posx ="2.4255" posz ="-3.2151" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="8" posx ="3.4405" posz ="-3.2983" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="11" posx ="12.1801" posz ="-2.8755" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">PropsNative</unit>
-		<unit variation ="8" posx ="-10.2232" posz ="-4.2159" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="6.5773" posz ="-0.8105" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="68" posx ="14.9933" posz ="-2.6635" orientx ="-0.3827" orienty ="0.0000" orientz ="0.9239">UnderbrushAmazon</unit>
-		<unit variation ="8" posx ="5.5888" posz ="-1.0858" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="22" posx ="-5.7541" posz ="1.0955" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="97" posx ="-11.1272" posz ="2.8862" orientx ="0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="14" posx ="-7.8610" posz ="-0.1113" orientx ="-0.7070" orienty ="0.0000" orientz ="-0.7073">PropsNative</unit>
-		<unit variation ="2" posx ="-9.5695" posz ="-0.3782" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="8" posx ="11.2184" posz ="-0.4522" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="9" posx ="-12.8259" posz ="1.4282" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-13.7067" posz ="1.3311" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="9" posx ="6.1396" posz ="-0.1327" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="213" posx ="14.2004" posz ="-0.9049" orientx ="-0.3717" orienty ="0.0000" orientz ="0.9284">SMIncanFence</unit>
-		<unit variation ="114" posx ="9.6196" posz ="1.3365" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeHouseAztec</unit>
-		<unit variation ="8" posx ="-15.1629" posz ="2.2210" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-15.6175" posz ="3.1281" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-15.7294" posz ="2.3391" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-7.3835" posz ="3.3481" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-2.4702" posz ="2.9753" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="227" posx ="2.4985" posz ="4.9400" orientx ="0.0001" orienty ="0.0000" orientz ="-1.0000">SocketAztec</unit>
-		<unit variation ="150" posx ="-9.3702" posz ="5.4583" orientx ="0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="8" posx ="-6.9085" posz ="3.6833" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="8" posx ="-7.5984" posz ="3.8317" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="9" posx ="-1.5299" posz ="3.5855" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="51" posx ="8.5978" posz ="4.2338" orientx ="0.0005" orienty ="0.0000" orientz ="-1.0000">UnderbrushRockies</unit>
-		<unit variation ="8" posx ="-2.4262" posz ="3.8121" orientx ="-0.7073" orienty ="0.0000" orientz ="0.7070">PropsNative</unit>
-		<unit variation ="247" posx ="-11.5071" posz ="3.3723" orientx ="0.3357" orienty ="0.0000" orientz ="-0.9420">SMIncanMixerPoker</unit>
-		<unit variation ="119" posx ="-4.7252" posz ="6.5959" orientx ="0.0002" orienty ="0.0000" orientz ="-1.0000">NativeHouseAztec</unit>
-		<unit variation ="51" posx ="-14.7843" posz ="6.2537" orientx ="0.9237" orienty ="0.0000" orientz ="0.3832">UnderbrushRockies</unit>
-		<unit variation ="51" posx ="-9.3870" posz ="6.6922" orientx ="0.9241" orienty ="0.0000" orientz ="-0.3822">UnderbrushRockies</unit>
-		<unit variation ="13" posx ="-10.6132" posz ="8.6884" orientx ="0.3829" orienty ="0.0000" orientz ="-0.9238">PropsNative</unit>
-		<unit variation ="51" posx ="-10.0040" posz ="9.0964" orientx ="0.9241" orienty ="0.0000" orientz ="-0.3822">UnderbrushRockies</unit>
+		<unit variation ="62" posx ="0.3926" posz ="-11.0746" orientx ="-0.7071" orienty ="0.0000" orientz ="0.7071">ypSPCSaltpeterSite</unit>
+		<unit variation ="56" posx ="-0.3593" posz ="-7.1598" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
+		<unit variation ="2" posx ="-6.1095" posz ="-8.5531" orientx ="0.9901" orienty ="0.0000" orientz ="-0.1400">ypSMJesuitAccessory</unit>
+		<unit variation ="51" posx ="0.3783" posz ="-8.4939" orientx ="0.8878" orienty ="0.0000" orientz ="-0.4603">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="154" posx ="-1.3544" posz ="-8.7540" orientx ="-0.3172" orienty ="0.0000" orientz ="0.9483">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="68" posx ="-0.3937" posz ="-7.0516" orientx ="0.5907" orienty ="0.0000" orientz ="0.8069">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="103" posx ="-4.7934" posz ="-7.8998" orientx ="0.4215" orienty ="0.0000" orientz ="-0.9068">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="234" posx ="1.9401" posz ="-7.5974" orientx ="-0.8612" orienty ="0.0000" orientz ="0.5082">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="5.2514" posz ="-7.0776" orientx ="0.0408" orienty ="0.0000" orientz ="-0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="41" posx ="-5.8099" posz ="-1.6390" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">SocketAztec</unit>
+		<unit variation ="68" posx ="5.7168" posz ="-4.2271" orientx ="-0.9239" orienty ="0.0000" orientz ="0.3827">ypSPCSaltpeterSite</unit>
+		<unit variation ="82" posx ="5.3442" posz ="-1.6463" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
+		<unit variation ="99" posx ="-0.6259" posz ="-4.1619" orientx ="-0.9951" orienty ="0.0000" orientz ="0.0987">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="8.7178" posz ="-4.3477" orientx ="0.9387" orienty ="0.0000" orientz ="-0.3446">ypSMJesuitAccessory</unit>
+		<unit variation ="53" posx ="6.0377" posz ="-4.4887" orientx ="-0.7734" orienty ="0.0000" orientz ="0.6339">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="53" posx ="2.3000" posz ="-2.3070" orientx ="0.9571" orienty ="0.0000" orientz ="-0.2896">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="201" posx ="7.0227" posz ="-2.3458" orientx ="-0.6087" orienty ="0.0000" orientz ="-0.7934">ypSMSaltpeterElephant</unit>
+		<unit variation ="41" posx ="5.6884" posz ="-0.0753" orientx ="1.0000" orienty ="0.0000" orientz ="-0.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="31" posx ="4.5914" posz ="-0.9417" orientx ="-0.9990" orienty ="0.0000" orientz ="0.0453">ypSMSaltpeterMan</unit>
+		<unit variation ="171" posx ="-0.1694" posz ="3.9862" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
+		<unit variation ="249" posx ="0.2868" posz ="0.4361" orientx ="-0.2941" orienty ="0.0000" orientz ="-0.9558">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="9.1836" posz ="0.0555" orientx ="0.9992" orienty ="0.0000" orientz ="0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="201" posx ="6.3477" posz ="1.8011" orientx ="-0.9914" orienty ="0.0000" orientz ="-0.1307">ypSMSaltpeterElephant</unit>
+		<unit variation ="91" posx ="0.8386" posz ="3.4924" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">ypSPCSaltpeterSite</unit>
+		<unit variation ="166" posx ="-9.0712" posz ="5.3296" orientx ="0.7061" orienty ="0.0000" orientz ="-0.7081">NativeTownObstruction</unit>
+		<unit variation ="128" posx ="5.3574" posz ="3.2258" orientx ="-0.9239" orienty ="0.0000" orientz ="0.3827">ypSPCSaltpeterSite</unit>
+		<unit variation ="170" posx ="-9.2753" posz ="3.2380" orientx ="0.0940" orienty ="0.0000" orientz ="0.9956">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="173" posx ="-9.1048" posz ="2.7495" orientx ="-0.4919" orienty ="0.0000" orientz ="-0.8707">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="194" posx ="-3.0795" posz ="5.1708" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="25" posx ="-7.3930" posz ="6.0021" orientx ="-0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="120" posx ="-8.3927" posz ="4.7914" orientx ="-0.8644" orienty ="0.0000" orientz ="-0.5029">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="128" posx ="-5.3426" posz ="5.7268" orientx ="-0.4417" orienty ="0.0000" orientz ="0.8972">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="251" posx ="-7.1475" posz ="5.5494" orientx ="0.4543" orienty ="0.0000" orientz ="-0.8909">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="31" posx ="-6.5426" posz ="4.6464" orientx ="0.4242" orienty ="0.0000" orientz ="0.9056">ypSMSaltpeterMan</unit>
+		<unit variation ="254" posx ="-0.1583" posz ="4.8757" orientx ="0.1547" orienty ="0.0000" orientz ="-0.9880">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="249" posx ="-1.5244" posz ="4.6363" orientx ="-0.9956" orienty ="0.0000" orientz ="-0.0940">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="87" posx ="-10.6662" posz ="5.5263" orientx ="-0.8813" orienty ="0.0000" orientz ="0.4725">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="53" posx ="5.0005" posz ="4.3984" orientx ="-0.7734" orienty ="0.0000" orientz ="0.6339">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="6.2509" posz ="4.5173" orientx ="0.3446" orienty ="0.0000" orientz ="0.9387">ypSMJesuitAccessory</unit>
+		<unit variation ="43" posx ="-3.4725" posz ="10.5679" orientx ="0.7068" orienty ="0.0000" orientz ="-0.7074">NativeTownObstruction</unit>
+		<unit variation ="42" posx ="4.0476" posz ="6.8044" orientx ="0.2829" orienty ="0.0000" orientz ="-0.9591">ypSMJesuitAccessory</unit>
+		<unit variation ="55" posx ="0.4382" posz ="6.5925" orientx ="0.7548" orienty ="0.0000" orientz ="0.6559">ypSMJesuitAccessory</unit>
+		<unit variation ="31" posx ="-9.5867" posz ="6.8644" orientx ="-0.0453" orienty ="0.0000" orientz ="-0.9990">ypSMSaltpeterMan</unit>
+		<unit variation ="41" posx ="-3.5074" posz ="8.4326" orientx ="-0.9692" orienty ="0.0000" orientz ="0.2464">ypSMSaltpeterElephant</unit>
+		<unit variation ="202" posx ="-9.8288" posz ="9.4328" orientx ="0.9428" orienty ="0.0000" orientz ="-0.3332">ypSMJesuitAccessory</unit>
+		<unit variation ="21" posx ="-7.7432" posz ="11.2318" orientx ="-0.8113" orienty ="0.0000" orientz ="0.5846">ypSMJesuitAccessory</unit>
+		<unit variation ="231" posx ="0.4313" posz ="10.6868" orientx ="0.6776" orienty ="0.0000" orientz ="0.7354">ypSMJesuitAccessory</unit>
+		<unit variation ="39" posx ="-9.0413" posz ="11.1402" orientx ="-0.6630" orienty ="0.0000" orientz ="-0.7486">ypSMJesuitAccessory</unit>
 	</units>
 	<tiles>
-		<tilegroup type ="PassableLand" subtype ="terrain\sonora\ground6_son">
-			<block startx ="-6" startz ="-1" endx ="-6" endz ="0"></block>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt5_deccan">
+			<block startx ="-6" startz ="-6" endx ="-6" endz ="-6"></block>
+			<block startx ="-5" startz ="-6" endx ="-5" endz ="-6"></block>
 			<block startx ="-5" startz ="-1" endx ="-5" endz ="0"></block>
-			<block startx ="-4" startz ="-1" endx ="-4" endz ="0"></block>
-			<block startx ="-3" startz ="-1" endx ="-3" endz ="0"></block>
-			<block startx ="-2" startz ="-1" endx ="-2" endz ="1"></block>
-			<block startx ="3" startz ="-5" endx ="3" endz ="-5"></block>
-			<block startx ="-1" startz ="-1" endx ="-1" endz ="1"></block>
-			<block startx ="0" startz ="-1" endx ="0" endz ="1"></block>
-			<block startx ="1" startz ="-1" endx ="1" endz ="0"></block>
-			<block startx ="2" startz ="-1" endx ="2" endz ="-1"></block>
-			<block startx ="3" startz ="-4" endx ="3" endz ="-1"></block>
-			<block startx ="4" startz ="-4" endx ="4" endz ="-3"></block>
+			<block startx ="-4" startz ="1" endx ="-4" endz ="1"></block>
+			<block startx ="-3" startz ="-1" endx ="-3" endz ="1"></block>
+			<block startx ="-2" startz ="0" endx ="-2" endz ="0"></block>
+			<block startx ="3" startz ="-4" endx ="3" endz ="-4"></block>
+			<block startx ="3" startz ="-1" endx ="3" endz ="-1"></block>
+			<block startx ="-4" startz ="-6" endx ="-4" endz ="-6"></block>
+			<block startx ="-1" startz ="-6" endx ="-1" endz ="-6"></block>
+			<block startx ="0" startz ="-6" endx ="0" endz ="-6"></block>
+			<block startx ="1" startz ="-6" endx ="1" endz ="-6"></block>
+			<block startx ="4" startz ="-3" endx ="4" endz ="-3"></block>
 			<block startx ="5" startz ="-3" endx ="5" endz ="-3"></block>
 		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt4_deccan">
+			<block startx ="-6" startz ="-5" endx ="-6" endz ="-3"></block>
+			<block startx ="-6" startz ="1" endx ="-6" endz ="2"></block>
+			<block startx ="-5" startz ="-5" endx ="-5" endz ="-4"></block>
+			<block startx ="-5" startz ="-2" endx ="-5" endz ="-2"></block>
+			<block startx ="-5" startz ="1" endx ="-5" endz ="2"></block>
+			<block startx ="-4" startz ="-5" endx ="-4" endz ="-5"></block>
+			<block startx ="-4" startz ="-3" endx ="-4" endz ="0"></block>
+			<block startx ="-4" startz ="2" endx ="-4" endz ="2"></block>
+			<block startx ="-3" startz ="-5" endx ="-3" endz ="-2"></block>
+			<block startx ="-2" startz ="-5" endx ="-2" endz ="-1"></block>
+			<block startx ="-2" startz ="1" endx ="-2" endz ="1"></block>
+			<block startx ="-1" startz ="-5" endx ="-1" endz ="-5"></block>
+			<block startx ="-1" startz ="-1" endx ="-1" endz ="0"></block>
+			<block startx ="0" startz ="-5" endx ="0" endz ="-4"></block>
+			<block startx ="0" startz ="-2" endx ="0" endz ="0"></block>
+			<block startx ="1" startz ="-5" endx ="1" endz ="-4"></block>
+			<block startx ="1" startz ="-1" endx ="1" endz ="0"></block>
+			<block startx ="1" startz ="2" endx ="1" endz ="2"></block>
+			<block startx ="2" startz ="-5" endx ="2" endz ="-5"></block>
+			<block startx ="2" startz ="-1" endx ="2" endz ="1"></block>
+			<block startx ="3" startz ="-5" endx ="3" endz ="-5"></block>
+			<block startx ="3" startz ="-3" endx ="3" endz ="-2"></block>
+			<block startx ="-3" startz ="-6" endx ="-3" endz ="-6"></block>
+			<block startx ="-2" startz ="-6" endx ="-2" endz ="-6"></block>
+			<block startx ="2" startz ="-6" endx ="2" endz ="-6"></block>
+			<block startx ="-6" startz ="3" endx ="-6" endz ="3"></block>
+			<block startx ="-6" startz ="6" endx ="-6" endz ="6"></block>
+			<block startx ="-5" startz ="3" endx ="-5" endz ="3"></block>
+			<block startx ="-5" startz ="6" endx ="-5" endz ="6"></block>
+			<block startx ="-4" startz ="5" endx ="-4" endz ="6"></block>
+			<block startx ="-3" startz ="5" endx ="-3" endz ="5"></block>
+			<block startx ="-2" startz ="4" endx ="-2" endz ="5"></block>
+			<block startx ="-1" startz ="4" endx ="-1" endz ="5"></block>
+			<block startx ="0" startz ="3" endx ="0" endz ="5"></block>
+			<block startx ="1" startz ="5" endx ="1" endz ="6"></block>
+			<block startx ="2" startz ="4" endx ="2" endz ="5"></block>
+			<block startx ="3" startz ="4" endx ="3" endz ="5"></block>
+			<block startx ="4" startz ="4" endx ="4" endz ="6"></block>
+			<block startx ="5" startz ="3" endx ="5" endz ="6"></block>
+			<block startx ="5" startz ="-6" endx ="5" endz ="-6"></block>
+			<block startx ="4" startz ="-5" endx ="4" endz ="-4"></block>
+			<block startx ="4" startz ="-2" endx ="4" endz ="-2"></block>
+			<block startx ="4" startz ="0" endx ="4" endz ="1"></block>
+			<block startx ="5" startz ="-5" endx ="5" endz ="-4"></block>
+			<block startx ="5" startz ="-2" endx ="5" endz ="-2"></block>
+			<block startx ="5" startz ="0" endx ="5" endz ="2"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt2_deccan">
+			<block startx ="-6" startz ="-2" endx ="-6" endz ="0"></block>
+			<block startx ="-5" startz ="-3" endx ="-5" endz ="-3"></block>
+			<block startx ="-4" startz ="-4" endx ="-4" endz ="-4"></block>
+			<block startx ="-3" startz ="2" endx ="-3" endz ="2"></block>
+			<block startx ="-2" startz ="2" endx ="-2" endz ="2"></block>
+			<block startx ="-1" startz ="-4" endx ="-1" endz ="-2"></block>
+			<block startx ="-1" startz ="1" endx ="-1" endz ="2"></block>
+			<block startx ="0" startz ="-3" endx ="0" endz ="-3"></block>
+			<block startx ="0" startz ="1" endx ="0" endz ="2"></block>
+			<block startx ="1" startz ="-3" endx ="1" endz ="-2"></block>
+			<block startx ="1" startz ="1" endx ="1" endz ="1"></block>
+			<block startx ="2" startz ="-4" endx ="2" endz ="-2"></block>
+			<block startx ="2" startz ="2" endx ="2" endz ="2"></block>
+			<block startx ="3" startz ="0" endx ="3" endz ="2"></block>
+			<block startx ="3" startz ="-6" endx ="3" endz ="-6"></block>
+			<block startx ="-6" startz ="4" endx ="-6" endz ="5"></block>
+			<block startx ="-5" startz ="4" endx ="-5" endz ="5"></block>
+			<block startx ="-4" startz ="3" endx ="-4" endz ="4"></block>
+			<block startx ="-3" startz ="3" endx ="-3" endz ="4"></block>
+			<block startx ="-3" startz ="6" endx ="-3" endz ="6"></block>
+			<block startx ="-2" startz ="3" endx ="-2" endz ="3"></block>
+			<block startx ="-2" startz ="6" endx ="-2" endz ="6"></block>
+			<block startx ="-1" startz ="3" endx ="-1" endz ="3"></block>
+			<block startx ="-1" startz ="6" endx ="-1" endz ="6"></block>
+			<block startx ="0" startz ="6" endx ="0" endz ="6"></block>
+			<block startx ="1" startz ="3" endx ="1" endz ="4"></block>
+			<block startx ="2" startz ="3" endx ="2" endz ="3"></block>
+			<block startx ="2" startz ="6" endx ="2" endz ="6"></block>
+			<block startx ="3" startz ="3" endx ="3" endz ="3"></block>
+			<block startx ="3" startz ="6" endx ="3" endz ="6"></block>
+			<block startx ="4" startz ="3" endx ="4" endz ="3"></block>
+			<block startx ="4" startz ="-6" endx ="4" endz ="-6"></block>
+			<block startx ="4" startz ="-1" endx ="4" endz ="-1"></block>
+			<block startx ="4" startz ="2" endx ="4" endz ="2"></block>
+			<block startx ="5" startz ="-1" endx ="5" endz ="-1"></block>
+		</tilegroup>
 		<heights>
-			<tiles x ="-8" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-8" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
 		</heights>
 	</tiles>
 </grouping>
\ No newline at end of file
diff --git a/RMM/groupings/native aztec village 2.xml b/RMM/groupings/native aztec village 2.xml
index 0ef4d7b..9e312f5 100644
--- a/RMM/groupings/native aztec village 2.xml	
+++ b/RMM/groupings/native aztec village 2.xml	
@@ -1,107 +1,134 @@
 <?xml version="1.0"?>
 
 <grouping>
-	<width>18</width>
-	<height>12</height>
+	<width>10</width>
+	<height>11</height>
 	<ignoreplacementrules>1</ignoreplacementrules>
 	<selectassingleunit>1</selectassingleunit>
 	<units>
-		<unit variation ="9" posx ="8.4272" posz ="-9.6590" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">PropsNative</unit>
-		<unit variation ="6" posx ="7.5494" posz ="-8.8420" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="51" posx ="14.9330" posz ="-11.3956" orientx ="0.7074" orienty ="0.0000" orientz ="-0.7068">UnderbrushRockies</unit>
-		<unit variation ="134" posx ="11.5207" posz ="-7.4746" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="227" posx ="3.3421" posz ="-7.7512" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">SocketAztec</unit>
-		<unit variation ="8" posx ="-12.4698" posz ="-7.4738" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="8" posx ="-11.7565" posz ="-7.9440" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="-12.7316" posz ="-8.5283" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="8" posx ="-6.5019" posz ="-7.7446" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="-7.1106" posz ="-7.4056" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="8.5078" posz ="-8.5134" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="8" posx ="-12.3144" posz ="-6.7118" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="8" posx ="-6.5719" posz ="-6.8572" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="51" posx ="-2.8450" posz ="-8.2267" orientx ="-0.0005" orienty ="0.0000" orientz ="1.0000">UnderbrushRockies</unit>
-		<unit variation ="9" posx ="-10.2533" posz ="-7.0153" orientx ="-0.1307" orienty ="0.0000" orientz ="0.9914">Campfire</unit>
-		<unit variation ="40" posx ="13.2044" posz ="-8.5669" orientx ="-0.9815" orienty ="0.0000" orientz ="0.1916">SMIncanCookpot</unit>
-		<unit variation ="26" posx ="-4.7647" posz ="-4.6632" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="102" posx ="-11.3603" posz ="-4.5946" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="158" posx ="12.2814" posz ="-6.6428" orientx ="0.0001" orienty ="0.0000" orientz ="-1.0000">UnderbrushYucatan</unit>
-		<unit variation ="244" posx ="-5.6148" posz ="-5.4558" orientx ="-0.9987" orienty ="0.0000" orientz ="0.0505">SMIncanMixerPoker</unit>
-		<unit variation ="114" posx ="-14.2601" posz ="-4.7399" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">NativeHouseAztec</unit>
-		<unit variation ="134" posx ="10.7116" posz ="-1.1971" orientx ="0.3839" orienty ="0.0000" orientz ="-0.9234">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="-11.5163" posz ="-0.9824" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="8" posx ="-6.5690" posz ="-2.8752" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="230" posx ="-0.2298" posz ="-3.5275" orientx ="-0.3827" orienty ="0.0000" orientz ="0.9239">UnderbrushAmazon</unit>
-		<unit variation ="6" posx ="1.4175" posz ="-3.0487" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="14" posx ="9.6075" posz ="-4.7683" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">PropsNative</unit>
-		<unit variation ="8" posx ="13.4205" posz ="-3.6851" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="183" posx ="11.7826" posz ="0.1965" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">NativeHouseAztec</unit>
-		<unit variation ="51" posx ="-15.9473" posz ="-1.8570" orientx ="0.9240" orienty ="0.0000" orientz ="-0.3823">UnderbrushRockies</unit>
-		<unit variation ="8" posx ="-6.4584" posz ="-1.9432" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="8" posx ="-5.4631" posz ="-1.1055" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="1.6446" posz ="-2.0823" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="0.9166" posz ="-1.9540" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="8" posx ="10.7794" posz ="-2.4262" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">PropsNative</unit>
-		<unit variation ="51" posx ="16.0465" posz ="-1.8395" orientx ="-0.3823" orienty ="0.0000" orientz ="-0.9240">UnderbrushRockies</unit>
-		<unit variation ="172" posx ="-10.4377" posz ="-1.1398" orientx ="0.9482" orienty ="0.0000" orientz ="-0.3178">SMIncanStoryTelling</unit>
-		<unit variation ="134" posx ="3.3767" posz ="0.3830" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="-4.2009" posz ="1.5652" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="6.5876" posz ="2.6601" orientx ="0.9244" orienty ="0.0000" orientz ="-0.3815">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="-9.5878" posz ="3.0581" orientx ="0.9244" orienty ="0.0000" orientz ="-0.3815">NativeTownObstruction</unit>
-		<unit variation ="8" posx ="-5.7972" posz ="-0.1472" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="5" posx ="4.3781" posz ="0.6413" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">PropsNative</unit>
-		<unit variation ="11" posx ="1.4215" posz ="0.0362" orientx ="-0.7071" orienty ="0.0000" orientz ="0.7071">PropsNative</unit>
-		<unit variation ="8" posx ="7.8836" posz ="-0.0839" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">PropsNative</unit>
-		<unit variation ="1" posx ="8.2983" posz ="-0.6137" orientx ="0.0000" orienty ="0.0000" orientz ="1.0000">PropsNative</unit>
-		<unit variation ="158" posx ="7.3376" posz ="1.0175" orientx ="0.0001" orienty ="0.0000" orientz ="-1.0000">UnderbrushYucatan</unit>
-		<unit variation ="134" posx ="-1.2144" posz ="4.8786" orientx ="0.9244" orienty ="0.0000" orientz ="-0.3815">NativeTownObstruction</unit>
-		<unit variation ="51" posx ="-13.7077" posz ="1.7118" orientx ="-0.7074" orienty ="0.0000" orientz ="0.7068">UnderbrushRockies</unit>
-		<unit variation ="3" posx ="-6.0655" posz ="1.4305" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="244" posx ="-10.3518" posz ="2.8372" orientx ="0.9033" orienty ="0.0000" orientz ="-0.4289">SMIncanMixerPoker</unit>
-		<unit variation ="134" posx ="-6.4044" posz ="6.6539" orientx ="0.3839" orienty ="0.0000" orientz ="-0.9234">NativeTownObstruction</unit>
-		<unit variation ="14" posx ="-5.4970" posz ="3.1884" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="6" posx ="-6.4550" posz ="4.9082" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="51" posx ="10.1081" posz ="4.4243" orientx ="0.3831" orienty ="0.0000" orientz ="-0.9237">UnderbrushRockies</unit>
-		<unit variation ="179" posx ="6.2140" posz ="3.3291" orientx ="-0.4023" orienty ="0.0000" orientz ="-0.9155">SMIncanPickerSitting</unit>
-		<unit variation ="6" posx ="-5.5008" posz ="6.3686" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="-6.1744" posz ="6.1689" orientx ="-0.9238" orienty ="0.0000" orientz ="-0.3828">PropsNative</unit>
-		<unit variation ="6" posx ="-7.9207" posz ="5.3179" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="5" posx ="-8.7725" posz ="6.0452" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="129" posx ="2.8097" posz ="6.2914" orientx ="0.7071" orienty ="0.0000" orientz ="0.7071">UnderbrushTexas</unit>
-		<unit variation ="51" posx ="2.1865" posz ="5.7254" orientx ="-0.7074" orienty ="0.0000" orientz ="0.7068">UnderbrushRockies</unit>
-		<unit variation ="13" posx ="-0.6297" posz ="6.9994" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">PropsNative</unit>
-		<unit variation ="51" posx ="-10.8396" posz ="7.0255" orientx ="0.9237" orienty ="0.0000" orientz ="0.3831">UnderbrushRockies</unit>
-		<unit variation ="42" posx ="-5.3451" posz ="8.3925" orientx ="0.5341" orienty ="0.0000" orientz ="-0.8454">SMIncanCookpot</unit>
+		<unit variation ="4" posx ="-0.7787" posz ="-9.4665" orientx ="-0.6307" orienty ="0.0000" orientz ="-0.7760">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="155" posx ="0.8806" posz ="-8.4388" orientx ="-0.7371" orienty ="0.0000" orientz ="-0.6758">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="221" posx ="-1.6289" posz ="-9.0500" orientx ="-0.7366" orienty ="0.0000" orientz ="-0.6764">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="102" posx ="-1.2389" posz ="-8.4887" orientx ="0.7937" orienty ="0.0000" orientz ="0.6084">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="241" posx ="-5.2874" posz ="-6.6995" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="59" posx ="2.3376" posz ="-6.5112" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="99" posx ="-3.6304" posz ="-7.2841" orientx ="-0.5400" orienty ="0.0000" orientz ="0.8417">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="0.4152" posz ="-7.2424" orientx ="0.0408" orienty ="0.0000" orientz ="-0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="62" posx ="2.4149" posz ="-7.1823" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="5.8118" posz ="-6.0317" orientx ="0.4201" orienty ="0.0000" orientz ="-0.9075">ypSMJesuitAccessory</unit>
+		<unit variation ="245" posx ="3.8427" posz ="-3.5098" orientx ="-0.9239" orienty ="0.0000" orientz ="-0.3826">ypSPCSaltpeterSite</unit>
+		<unit variation ="231" posx ="-7.8870" posz ="-4.5898" orientx ="0.3505" orienty ="0.0000" orientz ="0.9366">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="43" posx ="-3.5439" posz ="-4.1067" orientx ="0.1748" orienty ="0.0000" orientz ="-0.9846">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="201" posx ="4.3807" posz ="-4.6006" orientx ="-0.9914" orienty ="0.0000" orientz ="-0.1306">ypSMSaltpeterElephant</unit>
+		<unit variation ="62" posx ="2.7051" posz ="-4.9659" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="63" posx ="-1.5865" posz ="-4.2877" orientx ="0.8287" orienty ="0.0000" orientz ="-0.5597">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="65" posx ="-7.4983" posz ="-3.5815" orientx ="0.1131" orienty ="0.0000" orientz ="-0.9936">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="31" posx ="0.7645" posz ="-3.4179" orientx ="0.9403" orienty ="0.0000" orientz ="0.3404">ypSMSaltpeterMan</unit>
+		<unit variation ="41" posx ="-5.5366" posz ="0.8835" orientx ="-1.0000" orienty ="0.0000" orientz ="0.0000">SocketAztec</unit>
+		<unit variation ="136" posx ="1.4696" posz ="-0.6065" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="231" posx ="-0.6661" posz ="-1.5232" orientx ="-0.9992" orienty ="0.0000" orientz ="-0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="62" posx ="0.9169" posz ="-1.3621" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="8.3711" posz ="-1.3406" orientx ="0.9992" orienty ="0.0000" orientz ="0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="201" posx ="5.8466" posz ="-0.3191" orientx ="-0.9914" orienty ="0.0000" orientz ="-0.1306">ypSMSaltpeterElephant</unit>
+		<unit variation ="245" posx ="6.3513" posz ="0.5741" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="117" posx ="2.0596" posz ="1.0437" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="102" posx ="0.8334" posz ="1.0186" orientx ="0.1310" orienty ="0.0000" orientz ="0.9914">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="136" posx ="3.3535" posz ="4.6803" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="31" posx ="0.5479" posz ="2.2058" orientx ="-0.9403" orienty ="0.0000" orientz ="-0.3403">ypSMSaltpeterMan</unit>
+		<unit variation ="62" posx ="5.4190" posz ="2.5585" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="31" posx ="5.9952" posz ="3.2519" orientx ="-0.6743" orienty ="0.0000" orientz ="0.7385">ypSMSaltpeterMan</unit>
+		<unit variation ="231" posx ="-0.1614" posz ="4.0778" orientx ="-0.9387" orienty ="0.0000" orientz ="0.3446">ypSMJesuitAccessory</unit>
+		<unit variation ="213" posx ="0.5846" posz ="4.8948" orientx ="0.1770" orienty ="0.0000" orientz ="-0.9842">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="189" posx ="-8.5342" posz ="5.9646" orientx ="0.3169" orienty ="0.0000" orientz ="0.9485">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="201" posx ="4.3647" posz ="5.5791" orientx ="-0.6087" orienty ="0.0000" orientz ="-0.7934">ypSMSaltpeterElephant</unit>
+		<unit variation ="62" posx ="2.0565" posz ="4.2113" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="7.9761" posz ="4.3340" orientx ="0.9992" orienty ="0.0000" orientz ="0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="98" posx ="-1.5313" posz ="7.7964" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="109" posx ="-5.4464" posz ="6.7050" orientx ="0.8627" orienty ="0.0000" orientz ="0.5058">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="4.4241" posz ="7.6053" orientx ="-0.0408" orienty ="0.0000" orientz ="0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="62" posx ="1.3640" posz ="6.8747" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="47" posx ="-5.6166" posz ="8.1830" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
 	</units>
 	<tiles>
-		<tilegroup type ="PassableLand" subtype ="terrain\sonora\ground6_son">
-			<block startx ="-6" startz ="-4" endx ="-6" endz ="-1"></block>
-			<block startx ="-5" startz ="-4" endx ="-5" endz ="1"></block>
-			<block startx ="-4" startz ="-3" endx ="-4" endz ="2"></block>
-			<block startx ="-3" startz ="-2" endx ="-3" endz ="3"></block>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt2_deccan">
+			<block startx ="-5" startz ="-5" endx ="-5" endz ="-4"></block>
+			<block startx ="-4" startz ="-4" endx ="-4" endz ="-4"></block>
+			<block startx ="-5" startz ="-3" endx ="-5" endz ="-1"></block>
+			<block startx ="-4" startz ="-3" endx ="-4" endz ="-3"></block>
+			<block startx ="-4" startz ="3" endx ="-4" endz ="3"></block>
+			<block startx ="-3" startz ="4" endx ="-3" endz ="4"></block>
+			<block startx ="-2" startz ="-1" endx ="-2" endz ="0"></block>
+			<block startx ="-2" startz ="4" endx ="-2" endz ="4"></block>
+			<block startx ="-1" startz ="-1" endx ="-1" endz ="0"></block>
+			<block startx ="0" startz ="-2" endx ="0" endz ="-2"></block>
+			<block startx ="0" startz ="0" endx ="0" endz ="0"></block>
+			<block startx ="1" startz ="1" endx ="1" endz ="1"></block>
+			<block startx ="2" startz ="2" endx ="2" endz ="2"></block>
+			<block startx ="3" startz ="2" endx ="3" endz ="4"></block>
+			<block startx ="4" startz ="2" endx ="4" endz ="4"></block>
+			<block startx ="-1" startz ="-5" endx ="-1" endz ="-4"></block>
+			<block startx ="0" startz ="-5" endx ="0" endz ="-4"></block>
+			<block startx ="1" startz ="-5" endx ="1" endz ="-5"></block>
+			<block startx ="3" startz ="-5" endx ="3" endz ="-4"></block>
 			<block startx ="4" startz ="-5" endx ="4" endz ="-5"></block>
-			<block startx ="-2" startz ="-3" endx ="-2" endz ="2"></block>
-			<block startx ="-1" startz ="-2" endx ="-1" endz ="0"></block>
-			<block startx ="0" startz ="-3" endx ="0" endz ="-1"></block>
-			<block startx ="1" startz ="-4" endx ="1" endz ="-1"></block>
-			<block startx ="2" startz ="-3" endx ="2" endz ="0"></block>
-			<block startx ="3" startz ="-4" endx ="3" endz ="0"></block>
-			<block startx ="4" startz ="-4" endx ="4" endz ="-1"></block>
-			<block startx ="5" startz ="-4" endx ="5" endz ="-2"></block>
-			<block startx ="6" startz ="-3" endx ="6" endz ="-3"></block>
+			<block startx ="-2" startz ="5" endx ="-2" endz ="5"></block>
+			<block startx ="3" startz ="5" endx ="3" endz ="5"></block>
+			<block startx ="4" startz ="5" endx ="4" endz ="5"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt4_deccan">
+			<block startx ="-4" startz ="-5" endx ="-4" endz ="-5"></block>
+			<block startx ="-3" startz ="-5" endx ="-3" endz ="-4"></block>
+			<block startx ="-5" startz ="0" endx ="-5" endz ="1"></block>
+			<block startx ="-5" startz ="4" endx ="-5" endz ="4"></block>
+			<block startx ="-4" startz ="-2" endx ="-4" endz ="1"></block>
+			<block startx ="-4" startz ="4" endx ="-4" endz ="4"></block>
+			<block startx ="-3" startz ="-3" endx ="-3" endz ="3"></block>
+			<block startx ="-2" startz ="-3" endx ="-2" endz ="-2"></block>
+			<block startx ="-2" startz ="1" endx ="-2" endz ="3"></block>
+			<block startx ="-1" startz ="-3" endx ="-1" endz ="-2"></block>
+			<block startx ="-1" startz ="1" endx ="-1" endz ="4"></block>
+			<block startx ="0" startz ="-3" endx ="0" endz ="-3"></block>
+			<block startx ="0" startz ="-1" endx ="0" endz ="-1"></block>
+			<block startx ="0" startz ="1" endx ="0" endz ="2"></block>
+			<block startx ="1" startz ="-3" endx ="1" endz ="0"></block>
+			<block startx ="1" startz ="2" endx ="1" endz ="4"></block>
+			<block startx ="2" startz ="-3" endx ="2" endz ="1"></block>
+			<block startx ="2" startz ="3" endx ="2" endz ="4"></block>
+			<block startx ="3" startz ="-3" endx ="3" endz ="-2"></block>
+			<block startx ="3" startz ="0" endx ="3" endz ="1"></block>
+			<block startx ="4" startz ="-3" endx ="4" endz ="-2"></block>
+			<block startx ="4" startz ="1" endx ="4" endz ="1"></block>
+			<block startx ="-2" startz ="-5" endx ="-2" endz ="-4"></block>
+			<block startx ="1" startz ="-4" endx ="1" endz ="-4"></block>
+			<block startx ="2" startz ="-5" endx ="2" endz ="-4"></block>
+			<block startx ="4" startz ="-4" endx ="4" endz ="-4"></block>
+			<block startx ="-5" startz ="5" endx ="-5" endz ="5"></block>
+			<block startx ="-4" startz ="5" endx ="-4" endz ="5"></block>
+			<block startx ="-3" startz ="5" endx ="-3" endz ="5"></block>
+			<block startx ="-1" startz ="5" endx ="-1" endz ="5"></block>
+			<block startx ="0" startz ="5" endx ="0" endz ="5"></block>
+			<block startx ="2" startz ="5" endx ="2" endz ="5"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt5_deccan">
+			<block startx ="-5" startz ="2" endx ="-5" endz ="3"></block>
+			<block startx ="-4" startz ="2" endx ="-4" endz ="2"></block>
+			<block startx ="0" startz ="3" endx ="0" endz ="4"></block>
+			<block startx ="3" startz ="-1" endx ="3" endz ="-1"></block>
+			<block startx ="4" startz ="-1" endx ="4" endz ="0"></block>
+			<block startx ="1" startz ="5" endx ="1" endz ="5"></block>
 		</tilegroup>
 		<heights>
-			<tiles x ="-9" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-9" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
 		</heights>
 	</tiles>
 </grouping>
\ No newline at end of file
diff --git a/RMM/groupings/native aztec village 3.xml b/RMM/groupings/native aztec village 3.xml
index a562d7d..af4004b 100644
--- a/RMM/groupings/native aztec village 3.xml	
+++ b/RMM/groupings/native aztec village 3.xml	
@@ -1,73 +1,150 @@
 <?xml version="1.0"?>
 
 <grouping>
-	<width>14</width>
+	<width>9</width>
 	<height>14</height>
 	<ignoreplacementrules>1</ignoreplacementrules>
 	<selectassingleunit>1</selectassingleunit>
 	<units>
-		<unit variation ="13" posx ="-0.6625" posz ="-12.4306" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="13" posx ="5.4038" posz ="-11.4669" orientx ="0.3827" orienty ="0.0000" orientz ="-0.9239">PropsNative</unit>
-		<unit variation ="51" posx ="1.0508" posz ="-11.3815" orientx ="-0.7079" orienty ="0.0000" orientz ="0.7063">UnderbrushRockies</unit>
-		<unit variation ="51" posx ="6.5207" posz ="-10.9045" orientx ="-0.9243" orienty ="0.0000" orientz ="0.3816">UnderbrushRockies</unit>
-		<unit variation ="227" posx ="4.3549" posz ="-7.7109" orientx ="0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="39" posx ="-3.2434" posz ="-7.8244" orientx ="0.7071" orienty ="0.0000" orientz ="0.7071">NativeHouseAztec</unit>
-		<unit variation ="11" posx ="8.0835" posz ="-9.1493" orientx ="-0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="70" posx ="-4.7604" posz ="-4.8506" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">NativeTownObstruction</unit>
-		<unit variation ="51" posx ="-7.4108" posz ="-7.1202" orientx ="-0.9244" orienty ="0.0000" orientz ="0.3815">UnderbrushRockies</unit>
-		<unit variation ="2" posx ="7.3489" posz ="-6.8036" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">PropsNative</unit>
-		<unit variation ="133" posx ="6.8137" posz ="-5.4145" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="166" posx ="-8.6753" posz ="-5.9297" orientx ="0.5841" orienty ="0.0000" orientz ="-0.8117">SMIncanFence</unit>
-		<unit variation ="88" posx ="-9.5444" posz ="-0.9064" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
-		<unit variation ="6" posx ="4.7280" posz ="-3.0950" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="242" posx ="8.9526" posz ="-3.8443" orientx ="0.2455" orienty ="0.0000" orientz ="-0.9694">SMIncanPickerSitting</unit>
-		<unit variation ="142" posx ="-0.9140" posz ="-1.9122" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="9" posx ="4.1880" posz ="-2.2169" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="51" posx ="11.7915" posz ="-2.2211" orientx ="-0.7063" orienty ="0.0000" orientz ="-0.7079">UnderbrushRockies</unit>
-		<unit variation ="186" posx ="-5.5425" posz ="-2.6772" orientx ="-0.9607" orienty ="0.0000" orientz ="0.2775">SMIncanStoryTelling</unit>
-		<unit variation ="51" posx ="-13.5573" posz ="-0.1728" orientx ="0.9234" orienty ="0.0000" orientz ="0.3838">UnderbrushRockies</unit>
-		<unit variation ="14" posx ="-6.2153" posz ="-0.1561" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="139" posx ="-11.3627" posz ="-0.8134" orientx ="0.7255" orienty ="0.0000" orientz ="0.6882">SMIncanCookpot</unit>
-		<unit variation ="130" posx ="-7.8406" posz ="3.8337" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="237" posx ="7.2123" posz ="2.8008" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">SocketAztec</unit>
-		<unit variation ="0" posx ="2.1929" posz ="1.2288" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">Campfire</unit>
-		<unit variation ="153" posx ="-0.9440" posz ="5.9090" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="8" posx ="-1.7971" posz ="4.9552" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="7" posx ="-0.9394" posz ="5.1785" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="5" posx ="-2.3180" posz ="5.8199" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="3" posx ="-4.6012" posz ="6.3339" orientx ="-0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="240" posx ="0.8651" posz ="5.7691" orientx ="-0.2699" orienty ="0.0000" orientz ="-0.9629">SMIncanMixerPoker</unit>
-		<unit variation ="80" posx ="-6.1331" posz ="9.0171" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeHouseAztec</unit>
-		<unit variation ="51" posx ="-9.7577" posz ="11.2842" orientx ="-0.7063" orienty ="0.0000" orientz ="-0.7079">UnderbrushRockies</unit>
-		<unit variation ="51" posx ="-2.1358" posz ="11.4267" orientx ="-0.7063" orienty ="0.0000" orientz ="-0.7079">UnderbrushRockies</unit>
+		<unit variation ="80" posx ="-2.2313" posz ="-12.5162" orientx ="-0.2549" orienty ="0.0000" orientz ="-0.9670">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="-4.2973" posz ="-13.2035" orientx ="-0.3454" orienty ="0.0000" orientz ="-0.9384">ypSMJesuitAccessory</unit>
+		<unit variation ="4" posx ="-1.5883" posz ="-11.2070" orientx ="-0.9581" orienty ="0.0000" orientz ="0.2866">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="220" posx ="-3.1732" posz ="-11.9335" orientx ="-0.4243" orienty ="0.0000" orientz ="-0.9055">ypSMSaltpeterMan</unit>
+		<unit variation ="231" posx ="-6.2837" posz ="-11.9247" orientx ="0.9994" orienty ="0.0000" orientz ="0.0337">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="0.0971" posz ="-11.2524" orientx ="0.9382" orienty ="0.0000" orientz ="-0.3461">ypSMJesuitAccessory</unit>
+		<unit variation ="196" posx ="-1.2271" posz ="-11.3397" orientx ="1.0000" orienty ="0.0000" orientz ="-0.0008">ypSPCSaltpeterSite</unit>
+		<unit variation ="225" posx ="-4.2734" posz ="-9.2908" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="201" posx ="-2.5604" posz ="-9.3857" orientx ="-0.9916" orienty ="0.0000" orientz ="-0.1297">ypSMSaltpeterElephant</unit>
+		<unit variation ="62" posx ="-6.9933" posz ="-9.3712" orientx ="-0.2895" orienty ="0.0000" orientz ="0.9572">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="-7.4658" posz ="-9.2330" orientx ="-0.9992" orienty ="0.0000" orientz ="-0.0400">ypSMJesuitAccessory</unit>
+		<unit variation ="109" posx ="-4.4667" posz ="-7.2978" orientx ="1.0000" orienty ="0.0000" orientz ="-0.0008">ypSPCSaltpeterSite</unit>
+		<unit variation ="113" posx ="-6.9605" posz ="-7.2048" orientx ="-0.4965" orienty ="0.0000" orientz ="-0.8680">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="220" posx ="-4.1423" posz ="-7.1181" orientx ="-0.3404" orienty ="0.0000" orientz ="0.9403">ypSMSaltpeterMan</unit>
+		<unit variation ="79" posx ="3.1078" posz ="-4.7530" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="231" posx ="-4.3638" posz ="-5.9963" orientx ="-0.0399" orienty ="0.0000" orientz ="0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="231" posx ="4.6846" posz ="-6.8698" orientx ="0.9994" orienty ="0.0000" orientz ="0.0337">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="223" posx ="6.2743" posz ="-4.4670" orientx ="-1.0000" orienty ="0.0000" orientz ="0.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="208" posx ="4.8573" posz ="-4.4832" orientx ="-0.2915" orienty ="0.0000" orientz ="0.9566">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="41" posx ="-4.2066" posz ="-1.2380" orientx ="-1.0000" orienty ="0.0000" orientz ="0.0001">SocketAztec</unit>
+		<unit variation ="252" posx ="3.5400" posz ="-2.1377" orientx ="0.6577" orienty ="0.0000" orientz ="-0.7533">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="66" posx ="5.2356" posz ="0.1674" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="122" posx ="3.2058" posz ="1.3350" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="83" posx ="-0.2318" posz ="-0.4436" orientx ="-0.4617" orienty ="0.0000" orientz ="-0.8870">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="-0.0784" posz ="0.5800" orientx ="0.9992" orienty ="0.0000" orientz ="0.0404">ypSMJesuitAccessory</unit>
+		<unit variation ="245" posx ="-0.1802" posz ="1.0525" orientx ="-0.7169" orienty ="0.0000" orientz ="-0.6971">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="3.7694" posz ="1.2657" orientx ="-0.7351" orienty ="0.0000" orientz ="0.6779">ypSMJesuitAccessory</unit>
+		<unit variation ="131" posx ="-3.9906" posz ="4.8789" orientx ="0.9961" orienty ="0.0000" orientz ="-0.0880">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="-3.1729" posz ="3.9899" orientx ="-0.3448" orienty ="0.0000" orientz ="-0.9387">ypSMJesuitAccessory</unit>
+		<unit variation ="4" posx ="-1.0579" posz ="4.1530" orientx ="-0.9948" orienty ="0.0000" orientz ="-0.1019">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="68" posx ="5.2626" posz ="7.7273" orientx ="0.9237" orienty ="0.0000" orientz ="-0.3831">ypSPCSaltpeterSite</unit>
+		<unit variation ="211" posx ="-4.0066" posz ="6.6051" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="220" posx ="-3.1074" posz ="6.5197" orientx ="0.4233" orienty ="0.0000" orientz ="0.9060">ypSMSaltpeterMan</unit>
+		<unit variation ="231" posx ="7.1568" posz ="5.6403" orientx ="0.9386" orienty ="0.0000" orientz ="-0.3449">ypSMJesuitAccessory</unit>
+		<unit variation ="220" posx ="2.5126" posz ="6.4011" orientx ="0.9990" orienty ="0.0000" orientz ="-0.0454">ypSMSaltpeterMan</unit>
+		<unit variation ="4" posx ="-7.0287" posz ="6.3320" orientx ="-0.9581" orienty ="0.0000" orientz ="0.2866">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="196" posx ="0.1822" posz ="7.8786" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="231" posx ="-6.2156" posz ="8.2508" orientx ="-0.9992" orienty ="0.0000" orientz ="-0.0406">ypSMJesuitAccessory</unit>
+		<unit variation ="201" posx ="0.7102" posz ="8.7088" orientx ="-0.2596" orienty ="0.0000" orientz ="-0.9657">ypSMSaltpeterElephant</unit>
+		<unit variation ="201" posx ="4.5299" posz ="7.1901" orientx ="-0.2596" orienty ="0.0000" orientz ="-0.9657">ypSMSaltpeterElephant</unit>
+		<unit variation ="80" posx ="3.0674" posz ="7.3779" orientx ="-0.9910" orienty ="0.0000" orientz ="-0.1337">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="80" posx ="0.5319" posz ="8.5977" orientx ="-0.9910" orienty ="0.0000" orientz ="-0.1337">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="80" posx ="-4.9779" posz ="8.0729" orientx ="-0.9910" orienty ="0.0000" orientz ="-0.1337">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="109" posx ="-3.0173" posz ="10.0127" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="201" posx ="-3.3564" posz ="9.1908" orientx ="-0.9915" orienty ="0.0000" orientz ="-0.1298">ypSMSaltpeterElephant</unit>
+		<unit variation ="80" posx ="-2.9432" posz ="9.2003" orientx ="-0.9910" orienty ="0.0000" orientz ="-0.1337">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="6.1039" posz ="10.3686" orientx ="0.6778" orienty ="0.0000" orientz ="0.7352">ypSMJesuitAccessory</unit>
+		<unit variation ="231" posx ="-2.7827" posz ="12.2395" orientx ="-0.0406" orienty ="0.0000" orientz ="0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="231" posx ="1.8291" posz ="12.1182" orientx ="0.3449" orienty ="0.0000" orientz ="0.9386">ypSMJesuitAccessory</unit>
 	</units>
 	<tiles>
-		<tilegroup type ="PassableLand" subtype ="terrain\sonora\ground6_son">
-			<block startx ="-6" startz ="1" endx ="-6" endz ="1"></block>
-			<block startx ="-5" startz ="-2" endx ="-5" endz ="1"></block>
-			<block startx ="-4" startz ="-2" endx ="-4" endz ="1"></block>
-			<block startx ="-3" startz ="-2" endx ="-3" endz ="1"></block>
-			<block startx ="-2" startz ="-2" endx ="-2" endz ="1"></block>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt2_deccan">
+			<block startx ="-4" startz ="-7" endx ="-4" endz ="-7"></block>
+			<block startx ="-3" startz ="-7" endx ="-3" endz ="-7"></block>
+			<block startx ="-2" startz ="-7" endx ="-2" endz ="-7"></block>
+			<block startx ="-4" startz ="-5" endx ="-4" endz ="-4"></block>
+			<block startx ="-4" startz ="0" endx ="-4" endz ="0"></block>
+			<block startx ="-3" startz ="-6" endx ="-3" endz ="-6"></block>
+			<block startx ="-3" startz ="0" endx ="-3" endz ="0"></block>
+			<block startx ="-2" startz ="-6" endx ="-2" endz ="-6"></block>
+			<block startx ="-2" startz ="-1" endx ="-2" endz ="0"></block>
+			<block startx ="-1" startz ="-6" endx ="-1" endz ="-5"></block>
 			<block startx ="-1" startz ="-3" endx ="-1" endz ="0"></block>
-			<block startx ="0" startz ="-5" endx ="0" endz ="0"></block>
-			<block startx ="1" startz ="-4" endx ="1" endz ="-2"></block>
-			<block startx ="-6" startz ="2" endx ="-6" endz ="2"></block>
+			<block startx ="0" startz ="-6" endx ="0" endz ="-6"></block>
+			<block startx ="0" startz ="-1" endx ="0" endz ="1"></block>
+			<block startx ="1" startz ="0" endx ="1" endz ="0"></block>
+			<block startx ="2" startz ="-5" endx ="2" endz ="-2"></block>
+			<block startx ="3" startz ="-3" endx ="3" endz ="-2"></block>
+			<block startx ="3" startz ="0" endx ="3" endz ="1"></block>
+			<block startx ="4" startz ="-3" endx ="4" endz ="-1"></block>
+			<block startx ="4" startz ="1" endx ="4" endz ="1"></block>
+			<block startx ="-1" startz ="-7" endx ="-1" endz ="-7"></block>
+			<block startx ="0" startz ="-7" endx ="0" endz ="-7"></block>
+			<block startx ="-4" startz ="3" endx ="-4" endz ="4"></block>
+			<block startx ="-3" startz ="3" endx ="-3" endz ="6"></block>
+			<block startx ="-2" startz ="6" endx ="-2" endz ="6"></block>
+			<block startx ="2" startz ="3" endx ="2" endz ="3"></block>
+			<block startx ="2" startz ="5" endx ="2" endz ="6"></block>
+			<block startx ="3" startz ="6" endx ="3" endz ="6"></block>
+			<block startx ="4" startz ="2" endx ="4" endz ="2"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt4_deccan">
+			<block startx ="-4" startz ="-6" endx ="-4" endz ="-6"></block>
+			<block startx ="-4" startz ="-3" endx ="-4" endz ="-1"></block>
+			<block startx ="-4" startz ="1" endx ="-4" endz ="1"></block>
+			<block startx ="-3" startz ="-5" endx ="-3" endz ="-4"></block>
+			<block startx ="-3" startz ="1" endx ="-3" endz ="1"></block>
+			<block startx ="-2" startz ="-5" endx ="-2" endz ="-3"></block>
+			<block startx ="-2" startz ="1" endx ="-2" endz ="1"></block>
+			<block startx ="-1" startz ="-4" endx ="-1" endz ="-4"></block>
+			<block startx ="-1" startz ="1" endx ="-1" endz ="1"></block>
+			<block startx ="0" startz ="-5" endx ="0" endz ="-2"></block>
+			<block startx ="1" startz ="-6" endx ="1" endz ="-1"></block>
+			<block startx ="1" startz ="1" endx ="1" endz ="1"></block>
+			<block startx ="2" startz ="-6" endx ="2" endz ="-6"></block>
+			<block startx ="2" startz ="-1" endx ="2" endz ="1"></block>
+			<block startx ="3" startz ="-6" endx ="3" endz ="-4"></block>
+			<block startx ="3" startz ="-1" endx ="3" endz ="-1"></block>
+			<block startx ="4" startz ="-6" endx ="4" endz ="-4"></block>
+			<block startx ="4" startz ="0" endx ="4" endz ="0"></block>
+			<block startx ="1" startz ="-7" endx ="1" endz ="-7"></block>
+			<block startx ="2" startz ="-7" endx ="2" endz ="-7"></block>
+			<block startx ="3" startz ="-7" endx ="3" endz ="-7"></block>
+			<block startx ="4" startz ="-7" endx ="4" endz ="-7"></block>
+			<block startx ="-4" startz ="2" endx ="-4" endz ="2"></block>
+			<block startx ="-4" startz ="5" endx ="-4" endz ="6"></block>
+			<block startx ="-3" startz ="2" endx ="-3" endz ="2"></block>
+			<block startx ="-2" startz ="2" endx ="-2" endz ="5"></block>
+			<block startx ="-1" startz ="2" endx ="-1" endz ="5"></block>
+			<block startx ="0" startz ="2" endx ="0" endz ="4"></block>
+			<block startx ="1" startz ="2" endx ="1" endz ="5"></block>
+			<block startx ="2" startz ="2" endx ="2" endz ="2"></block>
+			<block startx ="2" startz ="4" endx ="2" endz ="4"></block>
+			<block startx ="3" startz ="2" endx ="3" endz ="5"></block>
+			<block startx ="4" startz ="4" endx ="4" endz ="6"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt5_deccan">
+			<block startx ="-3" startz ="-3" endx ="-3" endz ="-1"></block>
+			<block startx ="-2" startz ="-2" endx ="-2" endz ="-2"></block>
+			<block startx ="-1" startz ="6" endx ="-1" endz ="6"></block>
+			<block startx ="0" startz ="5" endx ="0" endz ="6"></block>
+			<block startx ="1" startz ="6" endx ="1" endz ="6"></block>
+			<block startx ="4" startz ="3" endx ="4" endz ="3"></block>
 		</tilegroup>
 		<heights>
-			<tiles x ="-7" z ="-7">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-7">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-4" z ="6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
 		</heights>
 	</tiles>
 </grouping>
\ No newline at end of file
diff --git a/RMM/groupings/native aztec village 4.xml b/RMM/groupings/native aztec village 4.xml
index 1199cca..7bc40d3 100644
--- a/RMM/groupings/native aztec village 4.xml	
+++ b/RMM/groupings/native aztec village 4.xml	
@@ -1,76 +1,176 @@
 <?xml version="1.0"?>
 
 <grouping>
-	<width>11</width>
+	<width>12</width>
 	<height>13</height>
 	<ignoreplacementrules>1</ignoreplacementrules>
 	<selectassingleunit>1</selectassingleunit>
 	<units>
-		<unit variation ="8" posx ="0.8300" posz ="-9.9370" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="134" posx ="3.3337" posz ="-7.7359" orientx ="0.3839" orienty ="0.0000" orientz ="-0.9234">NativeTownObstruction</unit>
-		<unit variation ="0" posx ="-0.1882" posz ="-10.4084" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">SPCPathBlock3</unit>
-		<unit variation ="13" posx ="-6.1343" posz ="-8.4779" orientx ="0.7071" orienty ="0.0000" orientz ="0.7071">PropsNative</unit>
-		<unit variation ="174" posx ="2.8610" posz ="-8.8295" orientx ="-0.5052" orienty ="0.0000" orientz ="0.8630">SMIncanCookpot</unit>
-		<unit variation ="213" posx ="-2.4063" posz ="-9.7925" orientx ="-0.9999" orienty ="0.0000" orientz ="0.0123">SMIncanFence</unit>
-		<unit variation ="0" posx ="-2.6371" posz ="-8.3906" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">SPCPathBlock3</unit>
-		<unit variation ="166" posx ="-3.4015" posz ="-6.8253" orientx ="0.8507" orienty ="0.0000" orientz ="-0.5257">SMIncanStoryTelling</unit>
-		<unit variation ="0" posx ="-3.2391" posz ="-6.2407" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">SPCPathBlock3</unit>
-		<unit variation ="134" posx ="3.3362" posz ="-1.0411" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="14" posx ="3.3350" posz ="-3.4263" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="13" posx ="8.8208" posz ="-3.2520" orientx ="1.0000" orienty ="0.0000" orientz ="0.0000">PropsNative</unit>
-		<unit variation ="51" posx ="8.6819" posz ="-3.1712" orientx ="0.7062" orienty ="0.0000" orientz ="0.7080">UnderbrushRockies</unit>
-		<unit variation ="150" posx ="-4.8146" posz ="-0.9743" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">SocketAztec</unit>
-		<unit variation ="137" posx ="7.5725" posz ="0.1431" orientx ="-0.7071" orienty ="0.0000" orientz ="0.7071">UnderbrushTexas</unit>
-		<unit variation ="134" posx ="3.7644" posz ="2.2271" orientx ="1.0000" orienty ="0.0000" orientz ="0.0013">NativeTownObstruction</unit>
-		<unit variation ="10" posx ="0.1603" posz ="0.9406" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="7" posx ="3.0120" posz ="1.5594" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="1" posx ="2.4255" posz ="2.1095" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="33" posx ="4.8968" posz ="1.4526" orientx ="-0.7082" orienty ="0.0000" orientz ="-0.7060">SMIncanMixerPoker</unit>
-		<unit variation ="134" posx ="2.0477" posz ="6.0084" orientx ="0.7080" orienty ="0.0000" orientz ="-0.7062">NativeTownObstruction</unit>
-		<unit variation ="5" posx ="-0.0835" posz ="4.9396" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="6" posx ="0.9099" posz ="4.8125" orientx ="0.9239" orienty ="0.0000" orientz ="-0.3827">PropsNative</unit>
-		<unit variation ="134" posx ="-2.0772" posz ="7.2096" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="51" posx ="-6.7242" posz ="6.9094" orientx ="0.3815" orienty ="0.0000" orientz ="0.9244">UnderbrushRockies</unit>
-		<unit variation ="249" posx ="0.3177" posz ="7.4024" orientx ="-0.9707" orienty ="0.0000" orientz ="-0.2403">SMIncanPickerSitting</unit>
-		<unit variation ="0" posx ="-3.3896" posz ="9.4158" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="51" posx ="5.1536" posz ="8.0526" orientx ="-0.0013" orienty ="0.0000" orientz ="1.0000">UnderbrushRockies</unit>
-		<unit variation ="11" posx ="-4.3852" posz ="11.3330" orientx ="0.3827" orienty ="0.0000" orientz ="-0.9239">PropsNative</unit>
-		<unit variation ="51" posx ="-1.1257" posz ="11.4278" orientx ="-0.0013" orienty ="0.0000" orientz ="1.0000">UnderbrushRockies</unit>
+		<unit variation ="62" posx ="0.3926" posz ="-11.0746" orientx ="-0.7071" orienty ="0.0000" orientz ="0.7071">ypSPCSaltpeterSite</unit>
+		<unit variation ="56" posx ="-0.3593" posz ="-7.1598" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
+		<unit variation ="2" posx ="-6.1095" posz ="-8.5531" orientx ="0.9901" orienty ="0.0000" orientz ="-0.1400">ypSMJesuitAccessory</unit>
+		<unit variation ="51" posx ="0.3783" posz ="-8.4939" orientx ="0.8878" orienty ="0.0000" orientz ="-0.4603">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="154" posx ="-1.3544" posz ="-8.7540" orientx ="-0.3172" orienty ="0.0000" orientz ="0.9483">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="68" posx ="-0.3937" posz ="-7.0516" orientx ="0.5907" orienty ="0.0000" orientz ="0.8069">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="103" posx ="-4.7934" posz ="-7.8998" orientx ="0.4215" orienty ="0.0000" orientz ="-0.9068">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="234" posx ="1.9401" posz ="-7.5974" orientx ="-0.8612" orienty ="0.0000" orientz ="0.5082">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="5.2514" posz ="-7.0776" orientx ="0.0408" orienty ="0.0000" orientz ="-0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="41" posx ="-5.8099" posz ="-1.6390" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">SocketAztec</unit>
+		<unit variation ="68" posx ="5.7168" posz ="-4.2271" orientx ="-0.9239" orienty ="0.0000" orientz ="0.3827">ypSPCSaltpeterSite</unit>
+		<unit variation ="82" posx ="5.3442" posz ="-1.6463" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
+		<unit variation ="99" posx ="-0.6259" posz ="-4.1619" orientx ="-0.9951" orienty ="0.0000" orientz ="0.0987">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="8.7178" posz ="-4.3477" orientx ="0.9387" orienty ="0.0000" orientz ="-0.3446">ypSMJesuitAccessory</unit>
+		<unit variation ="53" posx ="6.0377" posz ="-4.4887" orientx ="-0.7734" orienty ="0.0000" orientz ="0.6339">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="53" posx ="2.3000" posz ="-2.3070" orientx ="0.9571" orienty ="0.0000" orientz ="-0.2896">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="201" posx ="7.0227" posz ="-2.3458" orientx ="-0.6087" orienty ="0.0000" orientz ="-0.7934">ypSMSaltpeterElephant</unit>
+		<unit variation ="41" posx ="5.6884" posz ="-0.0753" orientx ="1.0000" orienty ="0.0000" orientz ="-0.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="31" posx ="4.5914" posz ="-0.9417" orientx ="-0.9990" orienty ="0.0000" orientz ="0.0453">ypSMSaltpeterMan</unit>
+		<unit variation ="171" posx ="-0.1694" posz ="3.9862" orientx ="0.7071" orienty ="0.0000" orientz ="-0.7071">NativeTownObstruction</unit>
+		<unit variation ="249" posx ="0.2868" posz ="0.4361" orientx ="-0.2941" orienty ="0.0000" orientz ="-0.9558">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="9.1836" posz ="0.0555" orientx ="0.9992" orienty ="0.0000" orientz ="0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="201" posx ="6.3477" posz ="1.8011" orientx ="-0.9914" orienty ="0.0000" orientz ="-0.1307">ypSMSaltpeterElephant</unit>
+		<unit variation ="91" posx ="0.8386" posz ="3.4924" orientx ="-0.7071" orienty ="0.0000" orientz ="-0.7071">ypSPCSaltpeterSite</unit>
+		<unit variation ="166" posx ="-9.0712" posz ="5.3296" orientx ="0.7061" orienty ="0.0000" orientz ="-0.7081">NativeTownObstruction</unit>
+		<unit variation ="128" posx ="5.3574" posz ="3.2258" orientx ="-0.9239" orienty ="0.0000" orientz ="0.3827">ypSPCSaltpeterSite</unit>
+		<unit variation ="170" posx ="-9.2753" posz ="3.2380" orientx ="0.0940" orienty ="0.0000" orientz ="0.9956">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="173" posx ="-9.1048" posz ="2.7495" orientx ="-0.4919" orienty ="0.0000" orientz ="-0.8707">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="194" posx ="-3.0795" posz ="5.1708" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="25" posx ="-7.3930" posz ="6.0021" orientx ="-0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="120" posx ="-8.3927" posz ="4.7914" orientx ="-0.8644" orienty ="0.0000" orientz ="-0.5029">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="128" posx ="-5.3426" posz ="5.7268" orientx ="-0.4417" orienty ="0.0000" orientz ="0.8972">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="251" posx ="-7.1475" posz ="5.5494" orientx ="0.4543" orienty ="0.0000" orientz ="-0.8909">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="31" posx ="-6.5426" posz ="4.6464" orientx ="0.4242" orienty ="0.0000" orientz ="0.9056">ypSMSaltpeterMan</unit>
+		<unit variation ="254" posx ="-0.1583" posz ="4.8757" orientx ="0.1547" orienty ="0.0000" orientz ="-0.9880">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="249" posx ="-1.5244" posz ="4.6363" orientx ="-0.9956" orienty ="0.0000" orientz ="-0.0940">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="87" posx ="-10.6662" posz ="5.5263" orientx ="-0.8813" orienty ="0.0000" orientz ="0.4725">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="53" posx ="5.0005" posz ="4.3984" orientx ="-0.7734" orienty ="0.0000" orientz ="0.6339">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="6.2509" posz ="4.5173" orientx ="0.3446" orienty ="0.0000" orientz ="0.9387">ypSMJesuitAccessory</unit>
+		<unit variation ="43" posx ="-3.4725" posz ="10.5679" orientx ="0.7068" orienty ="0.0000" orientz ="-0.7074">NativeTownObstruction</unit>
+		<unit variation ="42" posx ="4.0476" posz ="6.8044" orientx ="0.2829" orienty ="0.0000" orientz ="-0.9591">ypSMJesuitAccessory</unit>
+		<unit variation ="55" posx ="0.4382" posz ="6.5925" orientx ="0.7548" orienty ="0.0000" orientz ="0.6559">ypSMJesuitAccessory</unit>
+		<unit variation ="31" posx ="-9.5867" posz ="6.8644" orientx ="-0.0453" orienty ="0.0000" orientz ="-0.9990">ypSMSaltpeterMan</unit>
+		<unit variation ="41" posx ="-3.5074" posz ="8.4326" orientx ="-0.9692" orienty ="0.0000" orientz ="0.2464">ypSMSaltpeterElephant</unit>
+		<unit variation ="202" posx ="-9.8288" posz ="9.4328" orientx ="0.9428" orienty ="0.0000" orientz ="-0.3332">ypSMJesuitAccessory</unit>
+		<unit variation ="21" posx ="-7.7432" posz ="11.2318" orientx ="-0.8113" orienty ="0.0000" orientz ="0.5846">ypSMJesuitAccessory</unit>
+		<unit variation ="231" posx ="0.4313" posz ="10.6868" orientx ="0.6776" orienty ="0.0000" orientz ="0.7354">ypSMJesuitAccessory</unit>
+		<unit variation ="39" posx ="-9.0413" posz ="11.1402" orientx ="-0.6630" orienty ="0.0000" orientz ="-0.7486">ypSMJesuitAccessory</unit>
 	</units>
 	<tiles>
-		<tilegroup type ="PassableLand" subtype ="terrain\sonora\ground6_son">
-			<block startx ="-3" startz ="-4" endx ="-3" endz ="-4"></block>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt5_deccan">
+			<block startx ="-6" startz ="-6" endx ="-6" endz ="-6"></block>
+			<block startx ="-5" startz ="-6" endx ="-5" endz ="-6"></block>
+			<block startx ="-5" startz ="-1" endx ="-5" endz ="0"></block>
+			<block startx ="-4" startz ="1" endx ="-4" endz ="1"></block>
+			<block startx ="-3" startz ="-1" endx ="-3" endz ="1"></block>
+			<block startx ="-2" startz ="0" endx ="-2" endz ="0"></block>
+			<block startx ="3" startz ="-4" endx ="3" endz ="-4"></block>
+			<block startx ="3" startz ="-1" endx ="3" endz ="-1"></block>
+			<block startx ="-4" startz ="-6" endx ="-4" endz ="-6"></block>
+			<block startx ="-1" startz ="-6" endx ="-1" endz ="-6"></block>
+			<block startx ="0" startz ="-6" endx ="0" endz ="-6"></block>
+			<block startx ="1" startz ="-6" endx ="1" endz ="-6"></block>
+			<block startx ="4" startz ="-3" endx ="4" endz ="-3"></block>
+			<block startx ="5" startz ="-3" endx ="5" endz ="-3"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt4_deccan">
+			<block startx ="-6" startz ="-5" endx ="-6" endz ="-3"></block>
+			<block startx ="-6" startz ="1" endx ="-6" endz ="2"></block>
+			<block startx ="-5" startz ="-5" endx ="-5" endz ="-4"></block>
+			<block startx ="-5" startz ="-2" endx ="-5" endz ="-2"></block>
+			<block startx ="-5" startz ="1" endx ="-5" endz ="2"></block>
+			<block startx ="-4" startz ="-5" endx ="-4" endz ="-5"></block>
+			<block startx ="-4" startz ="-3" endx ="-4" endz ="0"></block>
+			<block startx ="-4" startz ="2" endx ="-4" endz ="2"></block>
+			<block startx ="-3" startz ="-5" endx ="-3" endz ="-2"></block>
+			<block startx ="-2" startz ="-5" endx ="-2" endz ="-1"></block>
+			<block startx ="-2" startz ="1" endx ="-2" endz ="1"></block>
+			<block startx ="-1" startz ="-5" endx ="-1" endz ="-5"></block>
+			<block startx ="-1" startz ="-1" endx ="-1" endz ="0"></block>
+			<block startx ="0" startz ="-5" endx ="0" endz ="-4"></block>
+			<block startx ="0" startz ="-2" endx ="0" endz ="0"></block>
+			<block startx ="1" startz ="-5" endx ="1" endz ="-4"></block>
+			<block startx ="1" startz ="-1" endx ="1" endz ="0"></block>
+			<block startx ="1" startz ="2" endx ="1" endz ="2"></block>
+			<block startx ="2" startz ="-5" endx ="2" endz ="-5"></block>
+			<block startx ="2" startz ="-1" endx ="2" endz ="1"></block>
+			<block startx ="3" startz ="-5" endx ="3" endz ="-5"></block>
+			<block startx ="3" startz ="-3" endx ="3" endz ="-2"></block>
+			<block startx ="-3" startz ="-6" endx ="-3" endz ="-6"></block>
+			<block startx ="-2" startz ="-6" endx ="-2" endz ="-6"></block>
+			<block startx ="2" startz ="-6" endx ="2" endz ="-6"></block>
+			<block startx ="-6" startz ="3" endx ="-6" endz ="3"></block>
+			<block startx ="-6" startz ="6" endx ="-6" endz ="6"></block>
+			<block startx ="-5" startz ="3" endx ="-5" endz ="3"></block>
+			<block startx ="-5" startz ="6" endx ="-5" endz ="6"></block>
+			<block startx ="-4" startz ="5" endx ="-4" endz ="6"></block>
+			<block startx ="-3" startz ="5" endx ="-3" endz ="5"></block>
+			<block startx ="-2" startz ="4" endx ="-2" endz ="5"></block>
+			<block startx ="-1" startz ="4" endx ="-1" endz ="5"></block>
+			<block startx ="0" startz ="3" endx ="0" endz ="5"></block>
+			<block startx ="1" startz ="5" endx ="1" endz ="6"></block>
+			<block startx ="2" startz ="4" endx ="2" endz ="5"></block>
+			<block startx ="3" startz ="4" endx ="3" endz ="5"></block>
+			<block startx ="4" startz ="4" endx ="4" endz ="6"></block>
+			<block startx ="5" startz ="3" endx ="5" endz ="6"></block>
+			<block startx ="5" startz ="-6" endx ="5" endz ="-6"></block>
+			<block startx ="4" startz ="-5" endx ="4" endz ="-4"></block>
+			<block startx ="4" startz ="-2" endx ="4" endz ="-2"></block>
+			<block startx ="4" startz ="0" endx ="4" endz ="1"></block>
+			<block startx ="5" startz ="-5" endx ="5" endz ="-4"></block>
+			<block startx ="5" startz ="-2" endx ="5" endz ="-2"></block>
+			<block startx ="5" startz ="0" endx ="5" endz ="2"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt2_deccan">
+			<block startx ="-6" startz ="-2" endx ="-6" endz ="0"></block>
+			<block startx ="-5" startz ="-3" endx ="-5" endz ="-3"></block>
+			<block startx ="-4" startz ="-4" endx ="-4" endz ="-4"></block>
 			<block startx ="-3" startz ="2" endx ="-3" endz ="2"></block>
-			<block startx ="-2" startz ="-4" endx ="-2" endz ="-3"></block>
-			<block startx ="-2" startz ="1" endx ="-2" endz ="2"></block>
-			<block startx ="-1" startz ="-4" endx ="-1" endz ="-1"></block>
+			<block startx ="-2" startz ="2" endx ="-2" endz ="2"></block>
+			<block startx ="-1" startz ="-4" endx ="-1" endz ="-2"></block>
 			<block startx ="-1" startz ="1" endx ="-1" endz ="2"></block>
-			<block startx ="0" startz ="-5" endx ="0" endz ="2"></block>
-			<block startx ="1" startz ="-5" endx ="1" endz ="2"></block>
-			<block startx ="2" startz ="-3" endx ="2" endz ="-3"></block>
-			<block startx ="2" startz ="-1" endx ="2" endz ="0"></block>
-			<block startx ="3" startz ="-3" endx ="3" endz ="0"></block>
-			<block startx ="-3" startz ="3" endx ="-3" endz ="3"></block>
+			<block startx ="0" startz ="-3" endx ="0" endz ="-3"></block>
+			<block startx ="0" startz ="1" endx ="0" endz ="2"></block>
+			<block startx ="1" startz ="-3" endx ="1" endz ="-2"></block>
+			<block startx ="1" startz ="1" endx ="1" endz ="1"></block>
+			<block startx ="2" startz ="-4" endx ="2" endz ="-2"></block>
+			<block startx ="2" startz ="2" endx ="2" endz ="2"></block>
+			<block startx ="3" startz ="0" endx ="3" endz ="2"></block>
+			<block startx ="3" startz ="-6" endx ="3" endz ="-6"></block>
+			<block startx ="-6" startz ="4" endx ="-6" endz ="5"></block>
+			<block startx ="-5" startz ="4" endx ="-5" endz ="5"></block>
+			<block startx ="-4" startz ="3" endx ="-4" endz ="4"></block>
+			<block startx ="-3" startz ="3" endx ="-3" endz ="4"></block>
+			<block startx ="-3" startz ="6" endx ="-3" endz ="6"></block>
 			<block startx ="-2" startz ="3" endx ="-2" endz ="3"></block>
-			<block startx ="-1" startz ="3" endx ="-1" endz ="5"></block>
-			<block startx ="0" startz ="3" endx ="0" endz ="4"></block>
+			<block startx ="-2" startz ="6" endx ="-2" endz ="6"></block>
+			<block startx ="-1" startz ="3" endx ="-1" endz ="3"></block>
+			<block startx ="-1" startz ="6" endx ="-1" endz ="6"></block>
+			<block startx ="0" startz ="6" endx ="0" endz ="6"></block>
 			<block startx ="1" startz ="3" endx ="1" endz ="4"></block>
 			<block startx ="2" startz ="3" endx ="2" endz ="3"></block>
+			<block startx ="2" startz ="6" endx ="2" endz ="6"></block>
+			<block startx ="3" startz ="3" endx ="3" endz ="3"></block>
+			<block startx ="3" startz ="6" endx ="3" endz ="6"></block>
+			<block startx ="4" startz ="3" endx ="4" endz ="3"></block>
+			<block startx ="4" startz ="-6" endx ="4" endz ="-6"></block>
+			<block startx ="4" startz ="-1" endx ="4" endz ="-1"></block>
+			<block startx ="4" startz ="2" endx ="4" endz ="2"></block>
+			<block startx ="5" startz ="-1" endx ="5" endz ="-1"></block>
 		</tilegroup>
 		<heights>
-			<tiles x ="-5" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-5" z ="6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-6" z ="6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
 		</heights>
 	</tiles>
 </grouping>
\ No newline at end of file
diff --git a/RMM/groupings/native aztec village 5.xml b/RMM/groupings/native aztec village 5.xml
index 8f2d25c..9e312f5 100644
--- a/RMM/groupings/native aztec village 5.xml	
+++ b/RMM/groupings/native aztec village 5.xml	
@@ -1,104 +1,134 @@
 <?xml version="1.0"?>
 
 <grouping>
-	<width>15</width>
-	<height>13</height>
+	<width>10</width>
+	<height>11</height>
 	<ignoreplacementrules>1</ignoreplacementrules>
 	<selectassingleunit>1</selectassingleunit>
 	<units>
-		<unit variation ="7" posx ="-4.1719" posz ="-10.4677" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="-4.9445" posz ="-10.3857" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="3.0044" posz ="-9.9642" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="5" posx ="8.7074" posz ="-10.7992" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="7" posx ="7.9754" posz ="-10.3773" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="8.0067" posz ="-11.1348" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="3.0139" posz ="-9.1604" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="-7.4499" posz ="-7.7087" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="150" posx ="-1.3726" posz ="-6.6641" orientx ="0.0008" orienty ="0.0000" orientz ="-1.0000">SocketAztec</unit>
-		<unit variation ="115" posx ="10.8133" posz ="-7.0134" orientx ="-1.0000" orienty ="0.0000" orientz ="-0.0009">NativeHouseAztec</unit>
-		<unit variation ="134" posx ="6.7815" posz ="-6.6534" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="5" posx ="-6.8374" posz ="-7.3811" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="7" posx ="-7.5971" posz ="-7.1004" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="-10.1282" posz ="-7.1079" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="9.0225" posz ="-5.7391" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="8.4269" posz ="-6.1044" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="114" posx ="-8.6460" posz ="-5.3024" orientx ="-0.0018" orienty ="0.0000" orientz ="1.0000">NativeHouseAztec</unit>
-		<unit variation ="13" posx ="-13.5051" posz ="-4.0421" orientx ="-0.9235" orienty ="0.0000" orientz ="-0.3836">PropsNative</unit>
-		<unit variation ="51" posx ="-12.5038" posz ="-4.5445" orientx ="0.3798" orienty ="0.0000" orientz ="0.9251">UnderbrushRockies</unit>
-		<unit variation ="5" posx ="2.9604" posz ="-4.4120" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="7" posx ="3.7821" posz ="-4.0228" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="5" posx ="8.2201" posz ="-4.8840" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="7" posx ="8.4117" posz ="-5.5306" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="5" posx ="2.2820" posz ="-3.7335" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="5" posx ="3.4045" posz ="-3.3096" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="4" posx ="6.9079" posz ="-2.3120" orientx ="-0.0010" orienty ="0.0000" orientz ="1.0000">Campfire</unit>
-		<unit variation ="51" posx ="14.7535" posz ="-2.6463" orientx ="0.7048" orienty ="0.0000" orientz ="0.7094">UnderbrushRockies</unit>
-		<unit variation ="1" posx ="10.3712" posz ="-2.2249" orientx ="0.9234" orienty ="0.0000" orientz ="0.3839">PropsNative</unit>
-		<unit variation ="134" posx ="11.2208" posz ="-0.0423" orientx ="1.0000" orienty ="0.0000" orientz ="0.0013">NativeTownObstruction</unit>
-		<unit variation ="7" posx ="6.4391" posz ="-0.3448" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="5.7024" posz ="-0.4487" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="5" posx ="10.6227" posz ="-1.3033" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="134" posx ="-8.2593" posz ="1.7114" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="6.7257" posz ="1.3703" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="-1.3981" posz ="1.5044" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="134" posx ="9.0293" posz ="3.8056" orientx ="0.7080" orienty ="0.0000" orientz ="-0.7062">NativeTownObstruction</unit>
-		<unit variation ="5" posx ="-9.6343" posz ="2.1237" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="5" posx ="-8.6010" posz ="1.9983" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="14" posx ="3.3121" posz ="1.6093" orientx ="-0.9242" orienty ="0.0000" orientz ="0.3818">PropsNative</unit>
-		<unit variation ="1" posx ="5.1167" posz ="1.8381" orientx ="0.9234" orienty ="0.0000" orientz ="0.3839">PropsNative</unit>
-		<unit variation ="33" posx ="11.7375" posz ="0.2913" orientx ="-1.0000" orienty ="0.0000" orientz ="0.0008">SMIncanMixerPoker</unit>
-		<unit variation ="134" posx ="-4.8005" posz ="6.0534" orientx ="0.3839" orienty ="0.0000" orientz ="-0.9234">NativeTownObstruction</unit>
-		<unit variation ="7" posx ="-5.5841" posz ="3.6964" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="1" posx ="3.3870" posz ="3.6415" orientx ="0.9234" orienty ="0.0000" orientz ="0.3839">PropsNative</unit>
-		<unit variation ="7" posx ="-6.3249" posz ="3.7771" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="166" posx ="-4.2719" posz ="2.1922" orientx ="0.8516" orienty ="0.0000" orientz ="-0.5241">SMIncanStoryTelling</unit>
-		<unit variation ="166" posx ="-3.4736" posz ="4.0097" orientx ="0.9730" orienty ="0.0000" orientz ="0.2307">SMIncanStoryTelling</unit>
-		<unit variation ="116" posx ="-8.4011" posz ="5.3805" orientx ="0.3835" orienty ="0.0000" orientz ="-0.9235">NativeHouseAztec</unit>
-		<unit variation ="134" posx ="4.7786" posz ="5.8366" orientx ="0.0013" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
-		<unit variation ="1" posx ="-5.1866" posz ="4.5185" orientx ="0.9234" orienty ="0.0000" orientz ="0.3839">PropsNative</unit>
-		<unit variation ="7" posx ="-2.8340" posz ="6.1982" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="3.4456" posz ="4.5404" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="4.2480" posz ="4.8841" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="7" posx ="2.6420" posz ="6.0468" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="5" posx ="-12.6447" posz ="6.5015" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="5" posx ="-3.5908" posz ="6.5791" orientx ="-0.3815" orienty ="0.0000" orientz ="-0.9244">PropsNative</unit>
-		<unit variation ="7" posx ="2.3755" posz ="6.5789" orientx ="0.3850" orienty ="0.0000" orientz ="-0.9229">PropsNative</unit>
-		<unit variation ="51" posx ="11.9844" posz ="6.6413" orientx ="-0.3856" orienty ="0.0000" orientz ="0.9227">UnderbrushRockies</unit>
-		<unit variation ="13" posx ="10.4062" posz ="6.7058" orientx ="-0.7064" orienty ="0.0000" orientz ="-0.7078">PropsNative</unit>
-		<unit variation ="174" posx ="6.0824" posz ="6.3880" orientx ="0.1373" orienty ="0.0000" orientz ="-0.9905">SMIncanCookpot</unit>
-		<unit variation ="114" posx ="-1.1354" posz ="8.0639" orientx ="0.0009" orienty ="0.0000" orientz ="-1.0000">NativeHouseAztec</unit>
-		<unit variation ="13" posx ="-5.3667" posz ="10.0136" orientx ="0.0010" orienty ="0.0000" orientz ="-1.0000">PropsNative</unit>
-		<unit variation ="51" posx ="-5.0229" posz ="10.0892" orientx ="-0.9251" orienty ="0.0000" orientz ="0.3798">UnderbrushRockies</unit>
+		<unit variation ="4" posx ="-0.7787" posz ="-9.4665" orientx ="-0.6307" orienty ="0.0000" orientz ="-0.7760">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="155" posx ="0.8806" posz ="-8.4388" orientx ="-0.7371" orienty ="0.0000" orientz ="-0.6758">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="221" posx ="-1.6289" posz ="-9.0500" orientx ="-0.7366" orienty ="0.0000" orientz ="-0.6764">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="102" posx ="-1.2389" posz ="-8.4887" orientx ="0.7937" orienty ="0.0000" orientz ="0.6084">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="241" posx ="-5.2874" posz ="-6.6995" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="59" posx ="2.3376" posz ="-6.5112" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="99" posx ="-3.6304" posz ="-7.2841" orientx ="-0.5400" orienty ="0.0000" orientz ="0.8417">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="0.4152" posz ="-7.2424" orientx ="0.0408" orienty ="0.0000" orientz ="-0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="62" posx ="2.4149" posz ="-7.1823" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="5.8118" posz ="-6.0317" orientx ="0.4201" orienty ="0.0000" orientz ="-0.9075">ypSMJesuitAccessory</unit>
+		<unit variation ="245" posx ="3.8427" posz ="-3.5098" orientx ="-0.9239" orienty ="0.0000" orientz ="-0.3826">ypSPCSaltpeterSite</unit>
+		<unit variation ="231" posx ="-7.8870" posz ="-4.5898" orientx ="0.3505" orienty ="0.0000" orientz ="0.9366">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="43" posx ="-3.5439" posz ="-4.1067" orientx ="0.1748" orienty ="0.0000" orientz ="-0.9846">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="201" posx ="4.3807" posz ="-4.6006" orientx ="-0.9914" orienty ="0.0000" orientz ="-0.1306">ypSMSaltpeterElephant</unit>
+		<unit variation ="62" posx ="2.7051" posz ="-4.9659" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="63" posx ="-1.5865" posz ="-4.2877" orientx ="0.8287" orienty ="0.0000" orientz ="-0.5597">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="65" posx ="-7.4983" posz ="-3.5815" orientx ="0.1131" orienty ="0.0000" orientz ="-0.9936">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="31" posx ="0.7645" posz ="-3.4179" orientx ="0.9403" orienty ="0.0000" orientz ="0.3404">ypSMSaltpeterMan</unit>
+		<unit variation ="41" posx ="-5.5366" posz ="0.8835" orientx ="-1.0000" orienty ="0.0000" orientz ="0.0000">SocketAztec</unit>
+		<unit variation ="136" posx ="1.4696" posz ="-0.6065" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="231" posx ="-0.6661" posz ="-1.5232" orientx ="-0.9992" orienty ="0.0000" orientz ="-0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="62" posx ="0.9169" posz ="-1.3621" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="8.3711" posz ="-1.3406" orientx ="0.9992" orienty ="0.0000" orientz ="0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="201" posx ="5.8466" posz ="-0.3191" orientx ="-0.9914" orienty ="0.0000" orientz ="-0.1306">ypSMSaltpeterElephant</unit>
+		<unit variation ="245" posx ="6.3513" posz ="0.5741" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
+		<unit variation ="117" posx ="2.0596" posz ="1.0437" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">NativeTownObstruction</unit>
+		<unit variation ="102" posx ="0.8334" posz ="1.0186" orientx ="0.1310" orienty ="0.0000" orientz ="0.9914">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="136" posx ="3.3535" posz ="4.6803" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="31" posx ="0.5479" posz ="2.2058" orientx ="-0.9403" orienty ="0.0000" orientz ="-0.3403">ypSMSaltpeterMan</unit>
+		<unit variation ="62" posx ="5.4190" posz ="2.5585" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="31" posx ="5.9952" posz ="3.2519" orientx ="-0.6743" orienty ="0.0000" orientz ="0.7385">ypSMSaltpeterMan</unit>
+		<unit variation ="231" posx ="-0.1614" posz ="4.0778" orientx ="-0.9387" orienty ="0.0000" orientz ="0.3446">ypSMJesuitAccessory</unit>
+		<unit variation ="213" posx ="0.5846" posz ="4.8948" orientx ="0.1770" orienty ="0.0000" orientz ="-0.9842">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="189" posx ="-8.5342" posz ="5.9646" orientx ="0.3169" orienty ="0.0000" orientz ="0.9485">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="201" posx ="4.3647" posz ="5.5791" orientx ="-0.6087" orienty ="0.0000" orientz ="-0.7934">ypSMSaltpeterElephant</unit>
+		<unit variation ="62" posx ="2.0565" posz ="4.2113" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="7.9761" posz ="4.3340" orientx ="0.9992" orienty ="0.0000" orientz ="0.0408">ypSMJesuitAccessory</unit>
+		<unit variation ="98" posx ="-1.5313" posz ="7.7964" orientx ="-0.3827" orienty ="0.0000" orientz ="-0.9239">ypSPCSaltpeterSite</unit>
+		<unit variation ="109" posx ="-5.4464" posz ="6.7050" orientx ="0.8627" orienty ="0.0000" orientz ="0.5058">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="231" posx ="4.4241" posz ="7.6053" orientx ="-0.0408" orienty ="0.0000" orientz ="0.9992">ypSMJesuitAccessory</unit>
+		<unit variation ="62" posx ="1.3640" posz ="6.8747" orientx ="0.4722" orienty ="0.0000" orientz ="0.8815">ypSPCSaltpeterAccessory</unit>
+		<unit variation ="47" posx ="-5.6166" posz ="8.1830" orientx ="0.0000" orienty ="0.0000" orientz ="-1.0000">ypSPCSaltpeterSite</unit>
 	</units>
 	<tiles>
-		<tilegroup type ="PassableLand" subtype ="terrain\sonora\ground6_son">
-			<block startx ="-5" startz ="-1" endx ="-5" endz ="0"></block>
-			<block startx ="-4" startz ="0" endx ="-4" endz ="0"></block>
-			<block startx ="-3" startz ="-1" endx ="-3" endz ="2"></block>
-			<block startx ="-2" startz ="0" endx ="-2" endz ="2"></block>
-			<block startx ="-1" startz ="-1" endx ="-1" endz ="1"></block>
-			<block startx ="0" startz ="-1" endx ="0" endz ="2"></block>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt2_deccan">
+			<block startx ="-5" startz ="-5" endx ="-5" endz ="-4"></block>
+			<block startx ="-4" startz ="-4" endx ="-4" endz ="-4"></block>
+			<block startx ="-5" startz ="-3" endx ="-5" endz ="-1"></block>
+			<block startx ="-4" startz ="-3" endx ="-4" endz ="-3"></block>
+			<block startx ="-4" startz ="3" endx ="-4" endz ="3"></block>
+			<block startx ="-3" startz ="4" endx ="-3" endz ="4"></block>
+			<block startx ="-2" startz ="-1" endx ="-2" endz ="0"></block>
+			<block startx ="-2" startz ="4" endx ="-2" endz ="4"></block>
+			<block startx ="-1" startz ="-1" endx ="-1" endz ="0"></block>
+			<block startx ="0" startz ="-2" endx ="0" endz ="-2"></block>
+			<block startx ="0" startz ="0" endx ="0" endz ="0"></block>
+			<block startx ="1" startz ="1" endx ="1" endz ="1"></block>
+			<block startx ="2" startz ="2" endx ="2" endz ="2"></block>
+			<block startx ="3" startz ="2" endx ="3" endz ="4"></block>
+			<block startx ="4" startz ="2" endx ="4" endz ="4"></block>
+			<block startx ="-1" startz ="-5" endx ="-1" endz ="-4"></block>
+			<block startx ="0" startz ="-5" endx ="0" endz ="-4"></block>
+			<block startx ="1" startz ="-5" endx ="1" endz ="-5"></block>
+			<block startx ="3" startz ="-5" endx ="3" endz ="-4"></block>
+			<block startx ="4" startz ="-5" endx ="4" endz ="-5"></block>
+			<block startx ="-2" startz ="5" endx ="-2" endz ="5"></block>
+			<block startx ="3" startz ="5" endx ="3" endz ="5"></block>
+			<block startx ="4" startz ="5" endx ="4" endz ="5"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt4_deccan">
+			<block startx ="-4" startz ="-5" endx ="-4" endz ="-5"></block>
+			<block startx ="-3" startz ="-5" endx ="-3" endz ="-4"></block>
+			<block startx ="-5" startz ="0" endx ="-5" endz ="1"></block>
+			<block startx ="-5" startz ="4" endx ="-5" endz ="4"></block>
+			<block startx ="-4" startz ="-2" endx ="-4" endz ="1"></block>
+			<block startx ="-4" startz ="4" endx ="-4" endz ="4"></block>
+			<block startx ="-3" startz ="-3" endx ="-3" endz ="3"></block>
+			<block startx ="-2" startz ="-3" endx ="-2" endz ="-2"></block>
+			<block startx ="-2" startz ="1" endx ="-2" endz ="3"></block>
+			<block startx ="-1" startz ="-3" endx ="-1" endz ="-2"></block>
+			<block startx ="-1" startz ="1" endx ="-1" endz ="4"></block>
+			<block startx ="0" startz ="-3" endx ="0" endz ="-3"></block>
+			<block startx ="0" startz ="-1" endx ="0" endz ="-1"></block>
+			<block startx ="0" startz ="1" endx ="0" endz ="2"></block>
+			<block startx ="1" startz ="-3" endx ="1" endz ="0"></block>
+			<block startx ="1" startz ="2" endx ="1" endz ="4"></block>
+			<block startx ="2" startz ="-3" endx ="2" endz ="1"></block>
+			<block startx ="2" startz ="3" endx ="2" endz ="4"></block>
+			<block startx ="3" startz ="-3" endx ="3" endz ="-2"></block>
+			<block startx ="3" startz ="0" endx ="3" endz ="1"></block>
+			<block startx ="4" startz ="-3" endx ="4" endz ="-2"></block>
+			<block startx ="4" startz ="1" endx ="4" endz ="1"></block>
+			<block startx ="-2" startz ="-5" endx ="-2" endz ="-4"></block>
 			<block startx ="1" startz ="-4" endx ="1" endz ="-4"></block>
-			<block startx ="1" startz ="-1" endx ="1" endz ="1"></block>
-			<block startx ="2" startz ="-5" endx ="2" endz ="1"></block>
-			<block startx ="3" startz ="-5" endx ="3" endz ="-5"></block>
-			<block startx ="3" startz ="-2" endx ="3" endz ="1"></block>
-			<block startx ="4" startz ="-1" endx ="4" endz ="1"></block>
+			<block startx ="2" startz ="-5" endx ="2" endz ="-4"></block>
+			<block startx ="4" startz ="-4" endx ="4" endz ="-4"></block>
+			<block startx ="-5" startz ="5" endx ="-5" endz ="5"></block>
+			<block startx ="-4" startz ="5" endx ="-4" endz ="5"></block>
+			<block startx ="-3" startz ="5" endx ="-3" endz ="5"></block>
+			<block startx ="-1" startz ="5" endx ="-1" endz ="5"></block>
+			<block startx ="0" startz ="5" endx ="0" endz ="5"></block>
+			<block startx ="2" startz ="5" endx ="2" endz ="5"></block>
+		</tilegroup>
+		<tilegroup type ="PassableLand" subtype ="terrain\deccan\ground_dirt5_deccan">
+			<block startx ="-5" startz ="2" endx ="-5" endz ="3"></block>
+			<block startx ="-4" startz ="2" endx ="-4" endz ="2"></block>
+			<block startx ="0" startz ="3" endx ="0" endz ="4"></block>
+			<block startx ="3" startz ="-1" endx ="3" endz ="-1"></block>
+			<block startx ="4" startz ="-1" endx ="4" endz ="0"></block>
+			<block startx ="1" startz ="5" endx ="1" endz ="5"></block>
 		</tilegroup>
 		<heights>
-			<tiles x ="-7" z ="-6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
-			<tiles x ="-7" z ="6">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="-1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="0">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="1">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="2">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="3">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="4">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
+			<tiles x ="-5" z ="5">0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 </tiles>
 		</heights>
 	</tiles>
 </grouping>
\ No newline at end of file
diff --git a/RMM/himalayas.xs b/RMM/himalayas.xs
index 5aa847f..bd8923b 100644
--- a/RMM/himalayas.xs
+++ b/RMM/himalayas.xs
@@ -411,8 +411,9 @@ void main(void)
   rmSetObjectDefMaxDistance(startingTCID, 8.0);
 
   int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-  rmSetObjectDefMinDistance(startingUnits, 4.0);
-  rmSetObjectDefMaxDistance(startingUnits, 8.0);
+  rmSetObjectDefMinDistance(startingUnits, 6.0);
+  rmSetObjectDefMaxDistance(startingUnits, 10.0);
+  rmAddObjectDefConstraint(startingUnits, avoidAll);
   
   int StartFoodID=rmCreateObjectDef("starting food");
   rmAddObjectDefItem(StartFoodID, huntable1, 10, 10.0);
@@ -642,16 +643,6 @@ void main(void)
   rmSetNuggetDifficulty(4, 4);
   rmPlaceObjectDefPerPlayer(nuggetID2, false, 1);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
     // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/himalayasUpper.xs b/RMM/himalayasUpper.xs
index b3521c4..a891a8c 100644
--- a/RMM/himalayasUpper.xs
+++ b/RMM/himalayasUpper.xs
@@ -424,8 +424,9 @@ void main(void)
   rmSetObjectDefMaxDistance(startingTCID, 8.0);
 
   int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-  rmSetObjectDefMinDistance(startingUnits, 4.0);
-  rmSetObjectDefMaxDistance(startingUnits, 8.0);
+  rmSetObjectDefMinDistance(startingUnits, 6.0);
+  rmSetObjectDefMaxDistance(startingUnits, 10.0);
+  rmAddObjectDefConstraint(startingUnits, avoidAll);
   rmAddObjectDefConstraint(startingUnits, avoidStartingUnitsSmall);
   
   int StartFoodID=rmCreateObjectDef("starting food");
@@ -698,16 +699,6 @@ void main(void)
   rmSetNuggetDifficulty(4, 4);
   rmPlaceObjectDefPerPlayer(nuggetID3, false, 1);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
     // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/honshu.xs b/RMM/honshu.xs
index e15ede5..4da79e2 100644
--- a/RMM/honshu.xs
+++ b/RMM/honshu.xs
@@ -282,16 +282,6 @@ int sfBuildBigIsland (string bigIslandName = "", float x_loc = 0.0, float y_loc
     vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.5);
     rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);  
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
       // check for KOTH game mode
     if(rmGetIsKOTH()) {
@@ -835,8 +825,8 @@ void main(void)
     	
 	//Prepare to place Explorers, Explorer's dog, Explorer's Taun Taun, etc.
 	int startingUnits = rmCreateStartingUnitsObjectDef(4.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-	rmSetObjectDefMaxDistance(startingUnits, 8.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
 
diff --git a/RMM/honshuRegicide.xs b/RMM/honshuRegicide.xs
index c7079f2..3be3357 100644
--- a/RMM/honshuRegicide.xs
+++ b/RMM/honshuRegicide.xs
@@ -284,16 +284,6 @@ int sfBuildBigIsland (string bigIslandName = "", float x_loc = 0.0, float y_loc
     //~ socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.8);
     //~ rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
     // check for KOTH game mode
     if(rmGetIsKOTH()) {
@@ -785,8 +775,8 @@ void main(void)
     	
 	//Prepare to place Explorers, Explorer's dog, Explorer's Taun Taun, etc.
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-	rmSetObjectDefMaxDistance(startingUnits, 8.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
 
diff --git a/RMM/indochina.xs b/RMM/indochina.xs
index 98896d3..d059481 100644
--- a/RMM/indochina.xs
+++ b/RMM/indochina.xs
@@ -214,7 +214,7 @@ void main(void)
 	rmAddObjectDefConstraint(startSilverID, avoidImpassableLand);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -726,16 +726,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.85);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/indochinaRegicide.xml b/RMM/indochinaRegicide.xml
index 296bac3..5f23d2d 100644
--- a/RMM/indochinaRegicide.xml
+++ b/RMM/indochinaRegicide.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mapinfo details="130070" imagepath="ui\random_map\indochina" displayNameID="130069" cannotReplace="" loadDetails="130071" loadBackground="ui\random_map\indochina\indochina_map">
+  <loadss>ui\random_map\indochina\indochina_ss_01</loadss>
   <loadss>ui\random_map\indochina\indochina_ss_02</loadss>
   <loadss>ui\random_map\indochina\indochina_ss_03</loadss>
 </mapinfo>
diff --git a/RMM/indochinaRegicide.xs b/RMM/indochinaRegicide.xs
index 95e5b24..2f91b8f 100644
--- a/RMM/indochinaRegicide.xs
+++ b/RMM/indochinaRegicide.xs
@@ -182,16 +182,6 @@ int sfBuildBigIsland (string bigIslandName = "", float x_loc = 0.0, float y_loc
     socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.7);
     rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);   
     
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <13 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
     // check for KOTH game mode
     if(rmGetIsKOTH())
@@ -622,8 +612,8 @@ void main(void)
     	
 //Prepare to place Explorers, Explorer's dog, Explorer's Taun Taun, etc.
 	int startingUnits = rmCreateStartingUnitsObjectDef(4.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-	rmSetObjectDefMaxDistance(startingUnits, 8.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
 
diff --git a/RMM/indonesia.xml b/RMM/indonesia.xml
new file mode 100644
index 0000000..5dd126c
--- /dev/null
+++ b/RMM/indonesia.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\indonesia" 
+displayNameID = "130117"
+details = "130118" 
+loadDetails = "130119" 
+loadBackground="ui\random_map\africa\indonesia\indonesia_map">
+   <loadss>ui\random_map\africa\indonesia\indonesia_ss_01</loadss>
+   <loadss>ui\random_map\africa\indonesia\indonesia_ss_02</loadss>
+   <loadss>ui\random_map\africa\indonesia\indonesia_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/landrandom.set b/RMM/landrandom.set
index 03583c4..4938d56 100644
--- a/RMM/landrandom.set
+++ b/RMM/landrandom.set
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<randomMaps displayNameID="780833" imagepath="ui\random_map\randomland" helpTextID="780834" cannotReplace="">
+<randomMaps displayNameID="780833" imagepath="ui\random_map\africa\landmaps" helpTextID="780834" cannotReplace="">
   <map>Great Plains</map>
   <map>Rockies</map>
   <map>Sonora</map>
@@ -7,10 +7,20 @@
   <map>Yukon</map>
   <map>Andes</map>
   <map>Ozarks</map>
+  <map>Pampas</map>
   <map>Painted Desert</map>
   <map>Mongolia</map>
   <map>Deccan</map>
   <map>Himalayas</map>
+  <map>himalayasUpper</map>
   <map>siberia</map>
   <map>silkRoad</map>
+  <map>Nile River</map>
+  <map>Savanna Grass</map>
+  <map>Sahara</map>
+  <map>Congo</map>
+  <map>Kilimanjaro</map>
+  <map>indochina</map>
+  <map>UnknownLand</map>
+  <map>australia</map>
 </randomMaps>
diff --git a/RMM/mongolia.xs b/RMM/mongolia.xs
index cb8446e..9f7a268 100644
--- a/RMM/mongolia.xs
+++ b/RMM/mongolia.xs
@@ -510,6 +510,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 7.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	int startingTCID = rmCreateObjectDef("startingTC");
 	if ( rmGetNomadStart())
@@ -920,16 +921,6 @@ void main(void)
     }
   }
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <12 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/mongolialarge.xs b/RMM/mongolialarge.xs
index ca4fa7d..02783f4 100644
--- a/RMM/mongolialarge.xs
+++ b/RMM/mongolialarge.xs
@@ -510,6 +510,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 7.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	int startingTCID = rmCreateObjectDef("startingTC");
 	if ( rmGetNomadStart())
@@ -920,16 +921,6 @@ void main(void)
     }
   }
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/native test.xs b/RMM/native test.xs
deleted file mode 100644
index 4eaf57f..0000000
--- a/RMM/native test.xs	
+++ /dev/null
@@ -1,457 +0,0 @@
-// TEXAS
-// October 2003
-// Main entry point for random map script
-void main(void)
-{
-   // Text
-   // These status text lines are used to manually animate the map generation progress bar
-   rmSetStatusText("",0.01);
-
-   //Chooses which natives appear on the map
-   int subCiv0=-1;
-   int subCiv1=-1;
-   int subCiv2=-1;
-   int subCiv3=-1;
-   int subCiv4=-1;
-   int subCiv5=-1;
-   int subCiv6=-1;
-   int subCiv7=-1;
-   int subCiv8=-1;
-   int subCiv9=-1;
-   int subCiv10=-1;
-   int subCiv11=-1;
-
-   if (rmAllocateSubCivs(12) == true)
-   {
-		subCiv0=rmGetCivID("Comanche");
-      if (subCiv0 >= 0)
-         rmSetSubCiv(0, "Comanche");
-
-		subCiv1=rmGetCivID("Iroquois");
-      if (subCiv1 >= 0)
-         rmSetSubCiv(1, "Iroquois"); 
-
-		subCiv2=rmGetCivID("Aztecs");
-      if (subCiv2 >= 0)
-         rmSetSubCiv(2, "Aztecs");
-
-		subCiv3=rmGetCivID("Maya");
-      if (subCiv3 >= 0)
-         rmSetSubCiv(3, "Maya");
-
-		subCiv4=rmGetCivID("Lakota");
-      if (subCiv4 >= 0)
-         rmSetSubCiv(4, "Lakota");
-
-		subCiv5=rmGetCivID("Nootka");
-      if (subCiv5 >= 0)
-         rmSetSubCiv(5, "Nootka");
-
-		subCiv6=rmGetCivID("Cherokee");
-      if (subCiv6 >= 0)
-         rmSetSubCiv(6, "Cherokee");
-
-		subCiv7=rmGetCivID("Cree");
-      if (subCiv7 >= 0)
-         rmSetSubCiv(7, "Cree");
-
-		subCiv8=rmGetCivID("Tupi");
-      if (subCiv8 >= 0)
-         rmSetSubCiv(8, "Tupi");
-
-		subCiv9=rmGetCivID("Caribs");
-      if (subCiv9 >= 0)
-         rmSetSubCiv(9, "Caribs");
-
-		subCiv10=rmGetCivID("Seminoles");
-      if (subCiv10 >= 0)
-         rmSetSubCiv(10, "Seminoles");
-
-		subCiv11=rmGetCivID("Incas");
-      if (subCiv11 >= 0)
-         rmSetSubCiv(11, "Incas"); 
-
-	}
-
-
-
-   // Picks the map size
-   int playerTiles=12000;		// DAL modified from 16K
-   if(cMapSize == 1)
-   {
-      playerTiles = 15000;			// DAL modified from 18K
-      rmEchoInfo("Large map");
-   }
-   int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
-   rmEchoInfo("Map size="+size+"m x "+size+"m");
-   rmSetMapSize(size, size);
-
-	// Picks a default water height
-   rmSetSeaLevel(4.0);
-
-   // Picks default terrain and water
-   rmSetSeaType("Amazon River");
-   rmTerrainInitialize("carolinas\grass4");
-
-   // Define some classes. These are used later for constraints.
-   int classPlayer=rmDefineClass("player");
-   rmDefineClass("classHill");
-   rmDefineClass("classPatch");
-   rmDefineClass("corner");
-   rmDefineClass("starting settlement");
-   rmDefineClass("startingUnit");
-   rmDefineClass("classForest");
-   rmDefineClass("importantItem");
-   rmDefineClass("natives");
-	rmDefineClass("classCliff");
-
-   // -------------Define constraints
-   // These are used to have objects and areas avoid each other
-   
-   // Map edge constraints
-   int playerEdgeConstraint=rmCreateBoxConstraint("player edge of map", rmXTilesToFraction(6), rmZTilesToFraction(6), 1.0-rmXTilesToFraction(6), 1.0-rmZTilesToFraction(6), 0.01);
-   int longPlayerConstraint=rmCreateClassDistanceConstraint("land stays away from players", classPlayer, 24.0);
-
-   // Cardinal Directions
-   int Northward=rmCreatePieConstraint("northMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(315), rmDegreesToRadians(135));
-   int Southward=rmCreatePieConstraint("southMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(135), rmDegreesToRadians(315));
-   int Eastward=rmCreatePieConstraint("eastMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(45), rmDegreesToRadians(225));
-   int Westward=rmCreatePieConstraint("westMapConstraint", 0.5, 0.5, 0, rmZFractionToMeters(0.5), rmDegreesToRadians(225), rmDegreesToRadians(45));
-
-   // Player constraints
-   int playerConstraint=rmCreateClassDistanceConstraint("stay away from players", classPlayer, 30.0);
-   int smallMapPlayerConstraint=rmCreateClassDistanceConstraint("stay away from players a lot", classPlayer, 70.0);
- 
-   // Nature avoidance
-   // int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fish", 18.0);
-   // int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
-   int forestObjConstraint=rmCreateTypeDistanceConstraint("forest obj", "all", 6.0);
-   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 50.0);
-   int avoidResource=rmCreateTypeDistanceConstraint("resource avoid resource", "resource", 10.0);
-   int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "gold", 30.0);
-   int avoidStartResource=rmCreateTypeDistanceConstraint("start resource no overlap", "resource", 1.0);
-   
-   // Avoid impassable land
-   int avoidImpassableLand=rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 4.0);
-   int shortAvoidImpassableLand=rmCreateTerrainDistanceConstraint("short avoid impassable land", "Land", false, 2.0);
-   int longAvoidImpassableLand=rmCreateTerrainDistanceConstraint("long avoid impassable land", "Land", false, 10.0);
-   int hillConstraint=rmCreateClassDistanceConstraint("hill vs. hill", rmClassID("classHill"), 10.0);
-   int shortHillConstraint=rmCreateClassDistanceConstraint("patches vs. hill", rmClassID("classHill"), 5.0);
-   int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
-	int avoidCliffs=rmCreateClassDistanceConstraint("cliff vs. cliff", rmClassID("classCliff"), 30.0);
-
-
-   // Specify true so constraint stays outside of circle (i.e. inside corners)
-   int cornerConstraint0=rmCreateCornerConstraint("in corner 0", 0, true);
-   int cornerConstraint1=rmCreateCornerConstraint("in corner 1", 1, true);
-   int cornerConstraint2=rmCreateCornerConstraint("in corner 2", 2, true);
-   int cornerConstraint3=rmCreateCornerConstraint("in corner 3", 3, true);
-   int insideCircleConstraint=rmCreateCornerConstraint("inside circle", -1, false);
-
-   // Unit avoidance
-   int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 40.0);
-   int avoidImportantItem=rmCreateClassDistanceConstraint("secrets etc avoid each other", rmClassID("importantItem"), 20.0);
-   int avoidNatives=rmCreateClassDistanceConstraint("stuff avoids natives", rmClassID("natives"), 12.0);
-
-   // Decoration avoidance
-   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 6.0);
-
-     // Trade route avoidance.
-   int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 5.0);
-   int avoidTradeRouteFar = rmCreateTradeRouteDistanceConstraint("trade route far", 20.0);
-
-   // -------------Define objects
-   // These objects are all defined so they can be placed later
-
-	//colony ship
-	/*
-   int colonyShipID=rmCreateObjectDef("colony ship");
-   rmAddObjectDefItem(colonyShipID, "caravel", 1, 0.0);
-   rmSetObjectDefGarrisonStartingUnits(colonyShipID, true);
-   rmSetObjectDefMinDistance(colonyShipID, 0.0);
-   rmSetObjectDefMaxDistance(colonyShipID, 0.0);
-   rmAddObjectDefConstraint(colonyShipID, playerEdgeConstraint);
-   rmAddObjectDefConstraint(colonyShipID, fishLand);
-	*/
-
-	// DAL Define the "Fort" Here instead!
-   int playerFortID = -1;
-   int playerFortType = 1;
-   playerFortID = rmCreateGrouping("player fort", "texas fort "+playerFortType);
-	// playerFortID = rmCreateGrouping("player fort", "native tupi village "+playerFortType);
-
-   // rmSetGroupingMinDistance(playerFortID, 0.0);
-   // rmSetGroupingMaxDistance(playerFortID, rmXFractionToMeters(0.35));
-   
-	// Groupings
-	// rmAddGroupingConstraint(playerFortID, avoidImpassableLand);
-	//   rmAddGroupingToClass(playerFortID, rmClassID("importantItem"));
-   
-	// Removed all constraints for now - DAL
-
-	// rmAddGroupingConstraint(playerFortID, avoidImportantItem);
-   // rmAddGroupingConstraint(playerFortID, insideCircleConstraint);
-   // rmAddGroupingConstraint(playerFortID, avoidTradeRoute);
-	// rmAddGroupingConstraint(playerFortID, playerConstraint);
-   // rmAddObjectDefConstraint(playerFortID, Southward);
-
-
-	//EXAMPLE OF PLACING OBJECTS AWAY FROM PLAYER
-	//  int farGoldID=rmCreateObjectDef("far gold");
-	//  rmAddObjectDefItem(farGoldID, "Gold mine", 1, 0.0);
-	//  rmSetObjectDefMinDistance(farGoldID, 60);
-	//  rmSetObjectDefMaxDistance(farGoldID, 160.0);
-	//  rmAddObjectDefConstraint(farGoldID, avoidGold);
-	//  rmAddObjectDefConstraint(farGoldID, avoidImpassableLand);
-
-	//  rmPlaceObjectDefPerPlayer(farGoldID, false, 3);
-   
-	// food resources
-
-
-   // Text
-   rmSetStatusText("",0.10);
-
-   // Text
-   rmSetStatusText("",0.10);
-
-   // *** Set up player starting locations. Circular around the outside of the map.
-   // rmPlacePlayersCircular(0.1, 0.9, rmDegreesToRadians(5.0));
-	rmSetPlacementTeam(0);
-	rmSetPlacementSection(0.1, 0.4);
-	rmPlacePlayersCircular(0.38, 0.42, 0.0);
-
-	rmSetPlacementTeam(1);
-	rmSetPlacementSection(0.6, 0.9);
-	rmPlacePlayersCircular(0.38, 0.42, 0.0);
-
-   // Set up player areas.
-   float playerFraction=rmAreaTilesToFraction(100);
-   for(i=1; <cNumberPlayers)
-   {
-      // Create the area.
-      int id=rmCreateArea("Player"+i);
-      // Assign to the player.
-      rmSetPlayerArea(i, id);
-      // Set the size.
-      rmSetAreaSize(id, playerFraction, playerFraction);
-      rmAddAreaToClass(id, classPlayer);
-      rmSetAreaMinBlobs(id, 1);
-      rmSetAreaMaxBlobs(id, 1);
-      rmAddAreaConstraint(id, playerConstraint); 
-      rmAddAreaConstraint(id, playerEdgeConstraint); 
-      rmSetAreaLocPlayer(id, i);
-		// rmSetAreaTerrainType(id, "carolina\marshflats");
-		// rmSetAreaBaseHeight(id, 8.0);
-      rmSetAreaWarnFailure(id, false);
-   }
-
-
-   rmBuildAllAreas();
-
-   // Text
-   rmSetStatusText("",0.20);
-
-   // Text
-   rmSetStatusText("",0.30);
-
-
-
-	// Placement order
-	// Players -> Trade route -> River (none on this map) -> Natives -> Secrets -> Cliffs -> Nuggets
-	// Place other objects that were defined earlier
-	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-   // rmSetObjectDefMinDistance(startingUnits, 10.0);
-   // rmSetObjectDefMaxDistance(startingUnits, 20.0);
-
-	// Player placement
-	for(i=1; <cNumberPlayers)
-	{
-		// DAL Stuff taken out.
-		rmPlaceGroupingAtLoc(playerFortID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-		
-		/*	
-		if (rmGetNumberUnitsPlaced(playerFortID) > 0)
-		{
-		  vector playerFortLocation=rmGetUnitPosition(rmGetUnitPlacedOfPlayer(playerFortID, i));
-		  // rmSetHomeCityGatherPoint(i, rmGetAreaClosestPoint(-1, playerFortLocation, 8.0));
-		}
-		*/
-
-		// Test of Marcin's Starting Units stuff...
-		rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-
-		// Place starting resources - DAL
-
-		vector closestPoint=rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startingUnits, i));
-		rmSetHomeCityGatherPoint(i, closestPoint);
-	}
-
-	// Text
-	rmSetStatusText("",0.40);
-
-
-
-	// Define and place the Native Villages and Secrets of the New World
-	// Text
-	rmSetStatusText("",0.50);
-
-	if (subCiv0 == rmGetCivID("Comanche"))
-	{  
-		int comancheVillageID = -1;
-		comancheVillageID = rmCreateGrouping("comanche village", "native comanche village 1");
-		rmSetGroupingMinDistance(comancheVillageID, 0.0);
-		rmSetGroupingMaxDistance(comancheVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(comancheVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(comancheVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(comancheVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(comancheVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(comancheVillageID, 0, 0.5, 0.5);
-	} 
-
-	if (subCiv1 == rmGetCivID("iroquois"))
-	{  
-		int iroquoisVillageID = -1;
-		iroquoisVillageID = rmCreateGrouping("iroquois village", "native iroquois village 1");
-		rmSetGroupingMinDistance(iroquoisVillageID, 0.0);
-		rmSetGroupingMaxDistance(iroquoisVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(iroquoisVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(iroquoisVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(iroquoisVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(iroquoisVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(iroquoisVillageID, 0, 0.5, 0.5);
-	} 
-
-	if (subCiv2 == rmGetCivID("aztecs"))
-	{  
-		int aztecsVillageID = -1;
-		aztecsVillageID = rmCreateGrouping("aztecs village", "native aztec village 1");
-		rmSetGroupingMinDistance(aztecsVillageID, 0.0);
-		rmSetGroupingMaxDistance(aztecsVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(aztecsVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(aztecsVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(aztecsVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(aztecsVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(aztecsVillageID, 0, 0.5, 0.5);
-	}
-
-	if (subCiv3 == rmGetCivID("maya"))
-	{  
-		int mayaVillageID = -1;
-		mayaVillageID = rmCreateGrouping("maya village", "native maya village 1");
-		rmSetGroupingMinDistance(mayaVillageID, 0.0);
-		rmSetGroupingMaxDistance(mayaVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(mayaVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(mayaVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(mayaVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(mayaVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(mayaVillageID, 0, 0.5, 0.5);
-	} 
-	
-	if (subCiv4 == rmGetCivID("lakota"))
-	{  
-		int lakotaVillageID = -1;
-		lakotaVillageID = rmCreateGrouping("lakota village", "native lakota village 1");
-		rmSetGroupingMinDistance(lakotaVillageID, 0.0);
-		rmSetGroupingMaxDistance(lakotaVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(lakotaVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(lakotaVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(lakotaVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(lakotaVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(lakotaVillageID, 0, 0.5, 0.5);
-	} 
-
-	if (subCiv5 == rmGetCivID("nootka"))
-	{  
-		int nootkaVillageID = -1;
-		nootkaVillageID = rmCreateGrouping("nootka village", "native nootka village 1");
-		rmSetGroupingMinDistance(nootkaVillageID, 0.0);
-		rmSetGroupingMaxDistance(nootkaVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(nootkaVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(nootkaVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(nootkaVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(nootkaVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(nootkaVillageID, 0, 0.5, 0.5);
-	} 
-		
-	if (subCiv6 == rmGetCivID("cherokee"))
-	{  
-		int cherokeeVillageID = -1;
-		cherokeeVillageID = rmCreateGrouping("cherokee village", "native cherokee village 1");
-		rmSetGroupingMinDistance(cherokeeVillageID, 0.0);
-		rmSetGroupingMaxDistance(cherokeeVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(cherokeeVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(cherokeeVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(cherokeeVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(cherokeeVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(cherokeeVillageID, 0, 0.5, 0.5);
-	} 
-				
-	if (subCiv7 == rmGetCivID("cree"))
-	{  
-		int creeVillageID = -1;
-		creeVillageID = rmCreateGrouping("cree village", "native cree village 1");
-		rmSetGroupingMinDistance(creeVillageID, 0.0);
-		rmSetGroupingMaxDistance(creeVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(creeVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(creeVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(creeVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(creeVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(creeVillageID, 0, 0.5, 0.5);
-	} 
-
-	if (subCiv8 == rmGetCivID("tupi"))
-	{  
-		int tupiVillageID = -1;
-		tupiVillageID = rmCreateGrouping("tupi village", "native tupi village 1");
-		rmSetGroupingMinDistance(tupiVillageID, 0.0);
-		rmSetGroupingMaxDistance(tupiVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(tupiVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(tupiVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(tupiVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(tupiVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(tupiVillageID, 0, 0.5, 0.5);
-	}
-				
-	if (subCiv9 == rmGetCivID("caribs"))
-	{  
-		int caribsVillageID = -1;
-		caribsVillageID = rmCreateGrouping("caribs village", "native carib village 1");
-		rmSetGroupingMinDistance(caribsVillageID, 0.0);
-		rmSetGroupingMaxDistance(caribsVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(caribsVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(caribsVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(caribsVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(caribsVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(caribsVillageID, 0, 0.5, 0.5);
-	} 
-		
-	if (subCiv10 == rmGetCivID("seminoles"))
-	{  
-		int seminolesVillageID = -1;
-		seminolesVillageID = rmCreateGrouping("seminoles village", "native seminole village 1");
-		rmSetGroupingMinDistance(seminolesVillageID, 0.0);
-		rmSetGroupingMaxDistance(seminolesVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(seminolesVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(seminolesVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(seminolesVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(seminolesVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(seminolesVillageID, 0, 0.5, 0.5);
-	} 
-			
-	if (subCiv11 == rmGetCivID("incas"))
-	{  
-		int incasVillageID = -1;
-		incasVillageID = rmCreateGrouping("incas village", "native inca village 1");
-		rmSetGroupingMinDistance(incasVillageID, 0.0);
-		rmSetGroupingMaxDistance(incasVillageID, rmXFractionToMeters(0.5));
-		rmAddGroupingConstraint(incasVillageID, avoidImpassableLand);
-		rmAddGroupingToClass(incasVillageID, rmClassID("importantItem"));
-		rmAddGroupingConstraint(incasVillageID, avoidImportantItem);
-		rmAddGroupingConstraint(incasVillageID, insideCircleConstraint);
-		rmPlaceGroupingAtLoc(incasVillageID, 0, 0.5, 0.5);
-	} 
-
-
-
-}  
diff --git a/RMM/new england.xs b/RMM/new england.xs
index 0640731..bed319c 100644
--- a/RMM/new england.xs	
+++ b/RMM/new england.xs	
@@ -650,7 +650,7 @@ void main(void)
 
    // Starting Unit placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
 	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
@@ -1053,16 +1053,6 @@ void main(void)
    // Text
    rmSetStatusText("",0.9);
    
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // Water nuggets
   
diff --git a/RMM/new englandLarge.xs b/RMM/new englandLarge.xs
index f9514c8..8341668 100644
--- a/RMM/new englandLarge.xs	
+++ b/RMM/new englandLarge.xs	
@@ -650,7 +650,7 @@ void main(void)
 
    // Starting Unit placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
 	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
@@ -1053,16 +1053,6 @@ void main(void)
    // Text
    rmSetStatusText("",0.9);
    
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <14 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // Water nuggets
   
diff --git a/RMM/newzealand.xml b/RMM/newzealand.xml
new file mode 100644
index 0000000..ddd875a
--- /dev/null
+++ b/RMM/newzealand.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<mapinfo 
+imagepath = "ui\random_map\africa\newzealand" 
+displayNameID = "130114"
+details = "130115" 
+loadDetails = "130116" 
+loadBackground="ui\random_map\africa\newzealand\newzealand_map">
+   <loadss>ui\random_map\africa\newzealand\newzealand_ss_01</loadss>
+   <loadss>ui\random_map\africa\newzealand\newzealand_ss_02</loadss>
+   <loadss>ui\random_map\africa\newzealand\newzealand_ss_03</loadss>
+</mapinfo>
\ No newline at end of file
diff --git a/RMM/newzealand.xs b/RMM/newzealand.xs
new file mode 100644
index 0000000..d9bceb9
--- /dev/null
+++ b/RMM/newzealand.xs
@@ -0,0 +1,723 @@
+/* Durokan's  Jebel Musa - April 5 2016 Version 1.2*/
+	/*=======================Changes from 1.0=======================
+
+	Natives:
+	-removed 1 apache camp, there is now only 1 jesuit and 1 apache, both on each side of the anvil
+
+	Resources:
+	- added constraints for a single guaranteed mine and level 2 treasure in the corner of the map. assuming the map looks like a "+" shape in brown, it would be on the horizontal "-" corners
+	-added constraints and applicable map areas to keep items tagged as "anvil" on the hammer shaped outcrop
+		^This includes a set of gold mines, level 2 treasures, and avoidance for level 1,3 treasures and other mines
+	-Forests now avoid the TC by more to give the TC more space. They also use different constraints to spawn more evenly. They now avoid the trade route by a long distance instead of avoiding treasures which was sloppy code.
+	-starting trees should no longer entangle mines or berries
+	-hunts no longer spawn on the low side of cliffs due to their removal
+	-The treasures now spawn accordingly: level 3's in the corner area, level 2's on the anvil, and level 1's in the valley.
+
+	Spawn + TC:
+	-shifted spawns in 1v1 closer to the x axis by .1 
+	-shifted the spawn points for team away from the edges of the plateau by .03 in the z direction.
+
+	Textures/Terrain:	
+	-added a texturing function; the map is less monotonous now.
+	-changed map textures to texas 4,5 in the dry area, california 8,9 in the wet area. changed the water to texas pond, removed cliffs on water edge
+	-map now spawns with grass and a few trees on the water edge due to texas pond
+	-cliff texture changed to Texas from Araucania North Coast
+	-Changed coherence of the anvil from .85 to .8, giving it a less round shape
+	
+	Misc:
+	-Added the 'Durokan <3's Aiz' function to the top of the anvil. This spawns two neutral alligator buddies which can be duelled for a marginal amount of xp. 
+	-Starting hunts are tagged as 'bison' for the express purpose of making sure they spawn correctly and fairly. There are 3 sets per player. They will be reverted to 'ypIbex' before the map is completed
+	-map loading bar improved though it does hover around .5 for a long time
+
+	Things to be adressed:
+	Resource balance, mines/hunts still spawn unfairly on occasion. I plan on adding 3 zones to accomodate this. They will be Plateau1, Plateau2, and Valley. They will all be initialized differently in each area to balance it better.
+
+	=======================Changes from 1.1=======================
+	Natives:
+
+	Resources:
+	-made starting hunts avoid water, pushing the hunts for the tc's close to shore back onto the plateau or closer to it
+	-mines now spawn along the valley and on cliffs seperately. 
+	-There is now a modified hunt spawn for 1v1; it disregards the 3rd starting hunt and places it differently.
+	-re-ordered the guaranteed corner resources to now place in order of gold>hunts>nugget instead of hunt>nugget>gold. this reduces/eliminates bugs where the gold won't spawn due to the hitbox of the treasure
+	
+	Spawn + TC:
+	-team tc's z axis increased by .03 to .21 from .18
+	
+	Textures:	
+
+	Misc:
+
+	Things to be adressed:
+	-still alot of open space on the valley region
+	
+	=======================Changes from 1.2=======================
+	-Hunts renamed to ypIbex from bison
+	
+*/
+
+	include "mercenaries.xs";
+	include "ypAsianInclude.xs";
+	include "ypKOTHInclude.xs";
+
+	void main(void) { 
+
+		rmSetStatusText("",0.1);
+
+		float playerTiles=13000;
+			if (cNumberNonGaiaPlayers>4)
+				playerTiles = 11000;
+			if (cNumberNonGaiaPlayers>6)
+				playerTiles = 9000;			
+		int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
+		rmSetMapSize(size, size);
+		rmSetSeaType("New Zealand Coast");
+		rmSetSeaLevel(-7);
+		rmSetMapType("land");
+		rmSetMapType("grass");
+		rmSetMapType("Japan");
+		rmTerrainInitialize("water"); 
+		rmSetLightingSet("Pampas");
+		
+		rmDefineClass("classForest");
+
+		int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+		int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 30.0);
+		int forestConstraintShort=rmCreateClassDistanceConstraint("object vs. forest", rmClassID("classForest"), 4.0);	
+		int avoidHunt=rmCreateTypeDistanceConstraint("hunts avoid hunts", "huntable", 45.0);
+		int avoidHuntBase=rmCreateTypeDistanceConstraint("stuff avoid hunts", "huntable", 4.0);
+		int avoidCoin=rmCreateTypeDistanceConstraint("avoid coin", "Mine", 10.0);
+		int avoidCoinMed=rmCreateTypeDistanceConstraint("avoid coin medium", "Mine", 60.0);
+		int avoidWaterShort = rmCreateTerrainDistanceConstraint("avoid water short", "Land", false, 6.0);
+		int avoidWaterLong = rmCreateTerrainDistanceConstraint("avoid water long", "Land", false, 20.0);
+		int AvoidWaterShort2 = rmCreateTerrainDistanceConstraint("avoid water short 2", "Land", false, 15.0);
+		int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("objects avoid trade route", 12);
+		int avoidTradeRouteFar = rmCreateTradeRouteDistanceConstraint("objects avoid trade route far", 30);
+		int avoidTradeRouteSmall = rmCreateTradeRouteDistanceConstraint("objects avoid trade route small", 4.0);
+		int avoidSocket=rmCreateClassDistanceConstraint("socket avoidance", rmClassID("socketClass"), 5.0);
+		int avoidSocketMore=rmCreateClassDistanceConstraint("bigger socket avoidance", rmClassID("socketClass"), 15.0);
+		int avoidTownCenter=rmCreateTypeDistanceConstraint("avoid Town Center", "townCenter", 35.0);
+		int avoidTownCenterSmall=rmCreateTypeDistanceConstraint("avoid Town Center small", "townCenter", 15.0);
+		int avoidTownCenterMedium=rmCreateTypeDistanceConstraint("avoid Town Center medium", "townCenter", 21.0);
+		int avoidTownCenterMore=rmCreateTypeDistanceConstraint("avoid Town Center more", "townCenter", 40.0);	
+		int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "AbstractNugget", 50.0); 
+		int avoidNuggetSmall=rmCreateTypeDistanceConstraint("avoid nuggets by a little", "AbstractNugget", 10.0); 
+		
+		int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "fishSalmon", 20.0);
+		int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 8.0);
+		int whaleVsWhaleID=rmCreateTypeDistanceConstraint("whale v whale", "HumpbackWhale", 50.0);
+		int whaleLand = rmCreateTerrainDistanceConstraint("whale land", "land", true, 15.0);
+
+		int avoidLand = rmCreateTerrainDistanceConstraint("avoid land ", "Land", true, 8.0);
+		int avoidNuggetWater = rmCreateTypeDistanceConstraint("avoid nugget water", "AbstractNugget", 70.0);
+		int avoidEdge = rmCreatePieConstraint("Avoid Edge", 0.5, 0.5, rmXFractionToMeters(0.0), rmXFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+		int flagLand = rmCreateTerrainDistanceConstraint("flag vs land", "land", true, 20.0);
+		int flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same", "HomeCityWaterSpawnFlag", 20);
+		int flagEdgeConstraint = rmCreatePieConstraint("flag edge of map", 0.5, 0.5, 0, rmGetMapXSize()-25, 0, 0, 0);
+		int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 8.0);
+		int avoidImpassableLand = rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 10.0);
+
+		int avoidEdgeMore = rmCreatePieConstraint("Avoid Edge More",0.5,0.5, rmXFractionToMeters(0.0),rmXFractionToMeters(0.38), rmDegreesToRadians(0),rmDegreesToRadians(360));
+
+		rmDefineClass("classPlateau");
+		int avoidPlateau=rmCreateClassDistanceConstraint("stuff vs. cliffs", rmClassID("classPlateau"), 5.0);
+		rmDefineClass("classAnvil");
+		int avoidAnvil=rmCreateClassDistanceConstraint("stuff vs. Anvil", rmClassID("classAnvil"), 5.0);
+		rmDefineClass("classContinent");
+		int avoidContinent=rmCreateClassDistanceConstraint("stuff vs. Continent", rmClassID("classContinent"), 5.0);
+		
+
+		float spawnSwitch = rmRandFloat(0,1.2);
+	
+		if(cNumberNonGaiaPlayers == 2){
+			if (spawnSwitch<0.6) {	
+			rmPlacePlayer(1, 0.2, 0.25);
+			rmPlacePlayer(2, 0.8, 0.25);
+			}else{
+			rmPlacePlayer(1, 0.8, 0.25);
+			rmPlacePlayer(2, 0.2, 0.25);
+			}
+		}else if (cNumberTeams == 2){
+			if (spawnSwitch<0.6) {	
+				rmSetPlacementTeam(1);
+				rmPlacePlayersLine(0.2, 0.21, 0.2, 0.47, 0, 0);
+				rmSetPlacementTeam(0);
+				rmPlacePlayersLine(0.8, 0.21, 0.8, 0.47, 0, 0);
+			}else{
+				rmSetPlacementTeam(0);
+				rmPlacePlayersLine(0.2, 0.21, 0.2, 0.47, 0, 0);
+				rmSetPlacementTeam(1);
+				rmPlacePlayersLine(0.8, 0.21, 0.8, 0.47, 0, 0);
+			}
+
+		}else{
+			rmSetPlacementSection(0.25, 0.75);
+			rmPlacePlayersCircular(0.4, 0.4, 0.02);
+		}
+		chooseMercs();
+		rmSetStatusText("",0.10);
+
+		int continent = rmCreateArea("big huge continent");
+		rmAddAreaToClass(continent, rmClassID("classContinent"));
+		rmSetAreaSize(continent, 0.64, 0.64);
+		rmSetAreaLocation(continent, 0.5, 0.15);
+		rmSetAreaTerrainType(continent, "araucania\ground_grass3_ara");
+		rmSetAreaBaseHeight(continent, -4.5);
+		rmSetAreaCoherence(continent, .8);
+		rmAddAreaInfluenceSegment(continent, 0.0, 0.25, 1.0, 0.25); 
+		rmSetAreaSmoothDistance(continent, 1);
+		rmSetAreaElevationEdgeFalloffDist(continent, 10);
+		rmSetAreaElevationVariation(continent, 5);
+		rmSetAreaElevationPersistence(continent, 0.5);
+		rmSetAreaElevationOctaves(continent, 5);
+		rmSetAreaElevationMinFrequency(continent, 0.01);
+		rmSetAreaElevationType(continent, cElevTurbulence);   
+		rmBuildArea(continent);
+
+		
+		int cape = rmCreateArea("cape left");
+		rmAddAreaToClass(cape, rmClassID("classAnvil"));
+		rmSetAreaSize(cape, 0.015, 0.015);
+		rmSetAreaSmoothDistance(cape, 1);
+		rmSetAreaLocation(cape, 0.40, 0.8);
+		rmSetAreaTerrainType(cape, "araucania\ground_grass3_ara");
+		rmSetAreaBaseHeight(cape, -4.5);
+		rmSetAreaCoherence(cape, 0.8);
+		rmSetAreaElevationEdgeFalloffDist(cape, 10);
+		rmSetAreaElevationVariation(cape, 5);
+		rmSetAreaElevationPersistence(cape, 0.5);
+		rmSetAreaElevationOctaves(cape, 5);
+		rmSetAreaElevationMinFrequency(cape, 0.01);
+		rmSetAreaElevationType(cape, cElevTurbulence);   
+		rmBuildArea(cape); 
+		
+		int cape2 = rmCreateArea("cape right");
+		rmAddAreaToClass(cape2, rmClassID("classAnvil"));
+		rmSetAreaSmoothDistance(cape2, 1);
+		rmSetAreaSize(cape2, 0.015, 0.015);
+		rmSetAreaLocation(cape2, 0.60, 0.8);
+		rmSetAreaTerrainType(cape2, "araucania\ground_grass3_ara");
+		rmSetAreaBaseHeight(cape2, -4.5);
+		rmSetAreaCoherence(cape2, 0.8);
+		rmSetAreaElevationEdgeFalloffDist(cape2, 10);
+		rmSetAreaElevationVariation(cape2, 5);
+		rmSetAreaElevationPersistence(cape2, 0.5);
+		rmSetAreaElevationOctaves(cape2, 5);
+		rmSetAreaElevationMinFrequency(cape2, 0.01);
+		rmSetAreaElevationType(cape2, cElevTurbulence);   
+		rmBuildArea(cape2); 
+		
+		int cape3 = rmCreateArea("cape middle top");
+		rmAddAreaToClass(cape3, rmClassID("classAnvil"));
+		rmSetAreaSize(cape3, 0.015, 0.015);
+		rmSetAreaLocation(cape3, 0.50, 0.8);
+		rmSetAreaSmoothDistance(cape3, 1);
+		rmSetAreaTerrainType(cape3, "araucania\ground_grass3_ara");
+		rmSetAreaBaseHeight(cape3, -4.5);
+		rmSetAreaCoherence(cape3, 0.8);
+		rmSetAreaElevationEdgeFalloffDist(cape3, 10);
+		rmSetAreaElevationVariation(cape3, 5);
+		rmSetAreaElevationPersistence(cape3, 0.5);
+		rmSetAreaElevationOctaves(cape3, 5);
+		rmSetAreaElevationMinFrequency(cape3, 0.01);
+		rmSetAreaElevationType(cape3, cElevTurbulence);   
+		rmBuildArea(cape3); 
+		
+		int cape4 = rmCreateArea("cape middle bottom");
+		rmAddAreaToClass(cape4, rmClassID("classAnvil"));
+		rmSetAreaSize(cape4, 0.015, 0.015);
+		rmSetAreaLocation(cape4, 0.5, 0.68);
+		rmSetAreaTerrainType(cape4, "araucania\ground_grass3_ara");
+		rmSetAreaBaseHeight(cape4, -4.5);
+		rmSetAreaCoherence(cape4, 0.9);
+		rmSetAreaElevationEdgeFalloffDist(cape4, 10);
+		rmSetAreaElevationVariation(cape4, 5);
+		rmSetAreaElevationPersistence(cape4, 0.5);
+		rmSetAreaElevationOctaves(cape4, 5);
+		rmSetAreaElevationMinFrequency(cape4, 0.01);
+		rmSetAreaElevationType(cape4, cElevTurbulence);   
+		rmBuildArea(cape4); 
+		
+	int ambiental = rmCreateObjectDef("ambiental");
+	rmAddObjectDefItem(ambiental, "UnderbrushForest", 1, 5.0);
+	rmSetObjectDefMinDistance(ambiental, 0);
+	rmSetObjectDefMaxDistance(ambiental, rmXFractionToMeters(0.5));
+	rmAddObjectDefConstraint(ambiental, avoidTownCenterSmall);
+	rmAddObjectDefConstraint(ambiental, avoidWaterShort);
+	rmAddObjectDefConstraint(ambiental, avoidTradeRoute);
+	rmAddObjectDefConstraint(ambiental, avoidAll);
+	rmPlaceObjectDefAtLoc(ambiental, 0, 0.5, 0.5, 90*cNumberNonGaiaPlayers);
+
+		int socketID=rmCreateObjectDef("sockets to dock Trade Posts");
+		rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
+		rmSetObjectDefAllowOverlap(socketID, true);
+		rmSetObjectDefMinDistance(socketID, 0.0);
+		rmSetObjectDefMaxDistance(socketID, 6.0);
+		int tradeRouteID = rmCreateTradeRoute();
+		rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
+		rmAddTradeRouteWaypoint(tradeRouteID, 0.5, -0.1);
+		rmAddTradeRouteWaypoint(tradeRouteID, 0.5, 0.75);
+		rmBuildTradeRoute(tradeRouteID, "dirt");
+
+		vector socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.15);
+		rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+		socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.7);
+		rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+		socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.4);
+		rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+		socketLoc1 = rmGetTradeRouteWayPoint(tradeRouteID, 0.92);
+		rmPlaceObjectDefAtPoint(socketID, 0, socketLoc1);
+		rmSetStatusText("",0.20);
+
+		int classPatch = rmDefineClass("patch");
+		int avoidPatch = rmCreateClassDistanceConstraint("avoid patch", rmClassID("patch"), 22.0);
+		int circleConstraint2=rmCreatePieConstraint("circle Constraint2", 0.5, 0.5, 0, rmZFractionToMeters(0.48), rmDegreesToRadians(0), rmDegreesToRadians(360));
+
+		int leftPlateau = rmCreateArea("plateau left");
+		rmSetAreaSize(leftPlateau, 0.2, 0.2); 
+		rmAddAreaToClass(leftPlateau, rmClassID("classPlateau"));
+		rmAddAreaTerrainReplacement(leftPlateau, "araucania\ground_grass3_ara", "araucania\ground_grass1_ara");//great_plains\ground8_gp
+		rmSetAreaCliffType(leftPlateau, "Araucania Central");
+		rmSetAreaCliffEdge(leftPlateau, 1, 1, 0.0, 0.0, 1); 
+		rmSetAreaCliffPainting(leftPlateau, true, true, true, 1.5, true);
+		rmSetAreaCliffHeight(leftPlateau, 4, 0.1, 0.5);
+		rmSetAreaCoherence(leftPlateau, .95);
+		rmSetAreaLocation(leftPlateau, .05, .3);
+		rmAddAreaInfluenceSegment(leftPlateau, 0.2, 0.0, 0.2, 0.4);
+		rmBuildArea(leftPlateau);	
+
+		int rightPlateau = rmCreateArea("plateau right");
+		rmAddAreaToClass(rightPlateau, rmClassID("classPlateau"));
+		rmSetAreaSize(rightPlateau, 0.2, 0.2); 
+		rmAddAreaTerrainReplacement(rightPlateau, "araucania\ground_grass3_ara", "araucania\ground_grass1_ara");
+		rmSetAreaCliffType(rightPlateau, "Araucania Central");
+		rmSetAreaCliffEdge(rightPlateau, 1, 1, 0.0, 0.0, 1); 
+		rmSetAreaCliffPainting(rightPlateau, true, true, true, 1.5, true);
+		rmSetAreaCliffHeight(rightPlateau, 4, 0.1, 0.5);
+		rmSetAreaCoherence(rightPlateau, .95);
+		rmSetAreaLocation(rightPlateau, .85, .3);
+		rmAddAreaInfluenceSegment(rightPlateau, 0.8, .0, 0.8, .4);
+		rmBuildArea(rightPlateau);	
+		
+		int rampNumbers = 8;
+				
+		for(i=i; < rampNumbers) { 
+		int rampLarge = rmCreateArea("top left center basin left ramp"+i);
+		rmAddAreaTerrainReplacement(rampLarge, "texas\cliff_top_tex", "amazon\river1_am");
+		rmSetAreaSize(rampLarge, 0.0044, 0.0044);
+		rmSetAreaBaseHeight(rampLarge, -3.6);
+		rmSetAreaSmoothDistance(rampLarge, -8);
+		rmSetAreaCoherence(rampLarge, 1);
+		if(i == 1){
+		rmSetAreaLocation(rampLarge, 0.33, 0.5);
+		}else if(i == 2){
+		rmSetAreaLocation(rampLarge, 0.67, 0.5);
+		}else if(i == 3){
+		rmSetAreaLocation(rampLarge, 0.62, 0.12);
+		}else if(i == 4){
+		rmSetAreaLocation(rampLarge, 0.38, 0.12);
+		}else if(i == 5){
+		rmSetAreaLocation(rampLarge, 0.62, 0.35);
+		}else if(i == 6){
+		rmSetAreaLocation(rampLarge, 0.38, 0.35);
+		}else if(i == 7){
+		rmSetAreaLocation(rampLarge, 0.92, 0.525);
+		}else{
+		rmSetAreaLocation(rampLarge, 0.08, 0.525);
+		}
+		rmBuildArea(rampLarge); 
+		}
+						
+		for (i=0; < cNumberNonGaiaPlayers*125){
+			int patchID = rmCreateArea("the redder stuff"+i);
+			rmSetAreaWarnFailure(patchID, false);
+			rmSetAreaSize(patchID, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID, "araucania\ground_grass3_ara", "araucania\ground_dirt2_ara");
+			rmPaintAreaTerrain(patchID);
+			rmAddAreaToClass(patchID, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID, 1.0);
+			rmAddAreaConstraint(patchID, circleConstraint2);
+			rmBuildArea(patchID); 
+		}
+		
+		for (i=0; < cNumberNonGaiaPlayers*125){
+			int patchID2 = rmCreateArea("the redder stuff2"+i);
+			rmSetAreaWarnFailure(patchID2, false);
+			rmSetAreaSize(patchID2, rmAreaTilesToFraction(11), rmAreaTilesToFraction(17));
+			rmAddAreaTerrainReplacement(patchID2, "araucania\ground_grass3_ara", "araucania\ground_dirt2_ara");
+			rmPaintAreaTerrain(patchID2);
+			rmAddAreaToClass(patchID2, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID2, 1.0);
+			rmAddAreaConstraint(patchID2, circleConstraint2);
+			rmBuildArea(patchID2); 
+		}
+		rmSetStatusText("",0.30);
+
+		for (i=0; < cNumberNonGaiaPlayers*125){
+			int patchID3 = rmCreateArea("the redder stuff3"+i);
+			rmSetAreaWarnFailure(patchID3, false);
+			rmSetAreaSize(patchID3, rmAreaTilesToFraction(30), rmAreaTilesToFraction(51));
+			rmAddAreaTerrainReplacement(patchID3, "araucania\ground_grass1_ara", "araucania\ground_grass2_ara");
+			rmPaintAreaTerrain(patchID3);
+			rmAddAreaToClass(patchID3, rmClassID("patch"));
+			rmSetAreaSmoothDistance(patchID3, 1.0);
+			rmAddAreaConstraint(patchID3, circleConstraint2);
+			rmBuildArea(patchID3); 
+		}
+
+		int playerStart = rmCreateStartingUnitsObjectDef(5.0);
+		rmSetObjectDefMinDistance(playerStart, 7.0);
+		rmSetObjectDefMaxDistance(playerStart, 12.0);
+		rmAddObjectDefConstraint(playerStart, avoidAll);
+				
+				
+	//Natives
+	int nativeSwitch = rmRandInt(0,1);
+	
+	int subCiv0 = -1;
+	int subCiv1 = -1;
+	subCiv0 = rmGetCivID("Jesuit");
+	subCiv1= rmGetCivID("Jesuit");
+	rmSetSubCiv(0, "Jesuit");
+	rmSetSubCiv(1, "Jesuit");
+	
+	int nativeID0 = -1;
+    int nativeID2 = -1;
+				
+	nativeID0 = rmCreateGrouping("Apache village", "native jesuit mission borneo 0"+4);
+    rmSetGroupingMinDistance(nativeID0, 0.00);
+    rmSetGroupingMaxDistance(nativeID0, 0.00);
+	rmAddGroupingToClass(nativeID0, rmClassID("natives"));
+	
+	nativeID2 = rmCreateGrouping("Jesuit village ", "native jesuit mission borneo 0"+5);
+    rmSetGroupingMinDistance(nativeID2, 0.00);
+    rmSetGroupingMaxDistance(nativeID2, 0.00);
+	rmAddGroupingToClass(nativeID2, rmClassID("natives"));
+
+	if(nativeSwitch == 0){
+	rmPlaceGroupingAtLoc(nativeID0, 0, 0.60, 0.8);
+	rmPlaceGroupingAtLoc(nativeID2, 0, 0.40, 0.8); 
+	}else{
+	rmPlaceGroupingAtLoc(nativeID0, 0, 0.40, 0.8);
+	rmPlaceGroupingAtLoc(nativeID2, 0, 0.60, 0.8); 
+	}
+	rmSetStatusText("",0.40);
+
+		int berryID = rmCreateObjectDef("starting berries"); 
+		rmAddObjectDefItem(berryID, "BerryBush", 4, 6.0); 
+		rmSetObjectDefMinDistance(berryID, 8.0); 
+		rmSetObjectDefMaxDistance(berryID, 12.0); 
+		rmAddObjectDefConstraint(berryID, avoidCoin);
+
+		int treeID = rmCreateObjectDef("starting trees"); 
+		rmAddObjectDefItem(treeID, "TreeCarolinaGrass", rmRandInt(6,9), 10.0); 
+		rmAddObjectDefItem(treeID, "UnderbrushForest", rmRandInt(8,10), 12.0);
+		rmSetObjectDefMinDistance(treeID, 20.0); 
+		rmSetObjectDefMaxDistance(treeID, 25.0);
+		rmAddObjectDefConstraint(treeID, avoidTownCenterSmall);
+		rmAddObjectDefConstraint(treeID, avoidCoin);
+		rmAddObjectDefConstraint(treeID, avoidHunt);
+
+		int foodID = rmCreateObjectDef("starting hunt1"); 
+		rmAddObjectDefItem(foodID, "ypIbex", 8, 12.0); 
+		rmSetObjectDefMinDistance(foodID, 10.0); 
+		rmSetObjectDefMaxDistance(foodID, 10.0); 	
+		rmAddObjectDefConstraint(foodID, circleConstraint);
+		rmAddObjectDefConstraint(foodID, avoidWaterLong);
+		rmSetObjectDefCreateHerd(foodID, true);
+
+		int foodID2 = rmCreateObjectDef("starting hunt2"); 
+		rmAddObjectDefItem(foodID2, "ypIbex", 8, 13.0); 
+		rmSetObjectDefMinDistance(foodID2, 40.0); 
+		rmSetObjectDefMaxDistance(foodID2, 40.0); 
+		rmAddObjectDefConstraint(foodID2, circleConstraint);
+		rmAddObjectDefConstraint(foodID2, avoidWaterLong);
+		rmSetObjectDefCreateHerd(foodID2, true);
+		
+		rmSetStatusText("",0.50);
+
+		int foodID3 = rmCreateObjectDef("starting hunt3"); 
+		rmAddObjectDefItem(foodID3, "ypIbex", 8, 12.0); 
+		rmSetObjectDefMinDistance(foodID3, 60.0); 
+		rmSetObjectDefMaxDistance(foodID3, 60.0); 		
+		rmAddObjectDefConstraint(foodID3, circleConstraint);
+		rmAddObjectDefConstraint(foodID3, avoidWaterLong);
+		rmSetObjectDefCreateHerd(foodID3, true);
+
+		for(i=1; <cNumberPlayers) { 
+		int id=rmCreateArea("Player"+i); 
+		rmSetPlayerArea(i, id); 
+		int startID = rmCreateObjectDef("object"+i); 
+		rmAddObjectDefItem(startID, "TownCenter", 1, 5.0); 
+		rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i)); 
+		rmPlaceObjectDefAtLoc(berryID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		rmPlaceObjectDefAtLoc(treeID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		rmPlaceObjectDefAtLoc(foodID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		rmPlaceObjectDefAtLoc(foodID2, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		if (cNumberNonGaiaPlayers>2){
+		rmPlaceObjectDefAtLoc(foodID3, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		}
+		rmPlaceObjectDefAtLoc(playerStart, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+
+		int placedTC = rmPlaceObjectDefAtLoc(startID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
+		vector TCLocation=rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startID, i));
+
+    // Place water spawn points for the players
+		int waterSpawnPointID=rmCreateObjectDef("colony ship "+i);
+		rmAddObjectDefItem(waterSpawnPointID, "HomeCityWaterSpawnFlag", 1, 10.0);
+		rmAddClosestPointConstraint(flagVsFlag);
+		rmAddClosestPointConstraint(flagLand);
+		rmAddClosestPointConstraint(flagEdgeConstraint);
+		vector closestPoint = rmFindClosestPointVector(TCLocation, rmXFractionToMeters(1.0));
+		rmPlaceObjectDefAtLoc(waterSpawnPointID, i, rmXMetersToFraction(xsVectorGetX(closestPoint)), rmZMetersToFraction(xsVectorGetZ(closestPoint)));
+
+    rmClearClosestPointConstraints();
+
+	  }
+
+		rmSetStatusText("",0.60);
+
+		int cornerMines = rmCreateObjectDef(" cornerMines");
+		rmAddObjectDefItem(cornerMines, "mine", 1, 1.0);
+		rmSetObjectDefMinDistance(cornerMines, 0.0);
+		rmSetObjectDefMaxDistance(cornerMines, rmXFractionToMeters(0.01));
+		rmAddObjectDefConstraint(cornerMines, circleConstraint);
+		rmPlaceObjectDefAtLoc(cornerMines, 0, 0.09, 0.605, 1);   
+		rmPlaceObjectDefAtLoc(cornerMines, 0, 0.91, 0.605, 1);   
+
+		int cornerHunts = rmCreateObjectDef("guarenteed corner hunts");
+		rmAddObjectDefItem(cornerHunts, "ypIbex", rmRandInt(8,8), 10.0);
+		rmSetObjectDefCreateHerd(cornerHunts, true);
+		rmSetObjectDefMinDistance(cornerHunts, 0);
+		rmSetObjectDefMaxDistance(cornerHunts, rmXFractionToMeters(0.01));
+		rmAddObjectDefConstraint(cornerHunts, circleConstraint);
+		rmPlaceObjectDefAtLoc(cornerHunts, 0, 0.09, 0.605, 1);
+		rmPlaceObjectDefAtLoc(cornerHunts, 0, 0.91, 0.605, 1);
+		if (cNumberNonGaiaPlayers==2){
+		rmPlaceObjectDefAtLoc(cornerHunts, 0, 0.25, 0.4, 1);
+		rmPlaceObjectDefAtLoc(cornerHunts, 0, 0.75, 0.4, 1);
+		}
+
+		int cornerNugget= rmCreateObjectDef("corner nugs"); 
+		rmAddObjectDefItem(cornerNugget, "Nugget", 1, 0.0); 
+		rmSetObjectDefMinDistance(cornerNugget, 0.0); 
+		rmSetObjectDefMaxDistance(cornerNugget, rmXFractionToMeters(0.01)); 
+		rmAddObjectDefConstraint(cornerNugget, circleConstraint);
+		rmSetNuggetDifficulty(3, 3); 
+		rmPlaceObjectDefAtLoc(cornerNugget, 0, 0.1, 0.606, 1);   
+		rmPlaceObjectDefAtLoc(cornerNugget, 0, 0.9, 0.606, 1);   
+		
+
+		int rheaxID = rmCreateObjectDef("ibex hunts");
+		rmAddObjectDefItem(rheaxID, "ypIbex", rmRandInt(8,8), 10.0);
+		rmSetObjectDefCreateHerd(rheaxID, true);
+		rmSetObjectDefMinDistance(rheaxID, 0);
+		rmSetObjectDefMaxDistance(rheaxID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(rheaxID, circleConstraint);
+		rmAddObjectDefConstraint(rheaxID, avoidTownCenterMedium);
+		rmAddObjectDefConstraint(rheaxID, avoidHunt);
+		rmAddObjectDefConstraint(rheaxID, AvoidWaterShort2); 
+		rmAddObjectDefConstraint(rheaxID, avoidPlateau); 
+		rmPlaceObjectDefAtLoc(rheaxID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+			 
+		int anvilNuggets = rmCreateObjectDef("nuggets on the anvil"); 
+		rmAddObjectDefItem(anvilNuggets, "Nugget", 1, 0.0); 
+		rmSetObjectDefMinDistance(anvilNuggets, 0.0); 
+		rmSetObjectDefMaxDistance(anvilNuggets, rmXFractionToMeters(0.2)); 
+		rmAddObjectDefConstraint(anvilNuggets, avoidNugget); 
+		rmAddObjectDefConstraint(anvilNuggets, circleConstraint);
+		rmAddObjectDefConstraint(anvilNuggets, avoidCoin); 
+		rmAddObjectDefConstraint(anvilNuggets, forestConstraintShort);
+		rmAddObjectDefConstraint(anvilNuggets, avoidWaterShort); 
+		rmAddObjectDefConstraint(anvilNuggets, avoidTradeRoute);
+		rmAddObjectDefConstraint(anvilNuggets, avoidSocket); 
+		rmAddObjectDefConstraint(anvilNuggets, avoidPlateau); 
+		rmSetNuggetDifficulty(2, 2); 
+		rmPlaceObjectDefAtLoc(anvilNuggets, 0, 0.5, 0.8, 2*cNumberNonGaiaPlayers); 
+		
+		int anvilMines = rmCreateObjectDef("anvilMines gold");
+		rmAddObjectDefItem(anvilMines, "mineGold", 1, 1.0);
+		rmSetObjectDefMinDistance(anvilMines, 0.0);
+		rmSetObjectDefMaxDistance(anvilMines, rmXFractionToMeters(0.09));
+		rmAddObjectDefConstraint(anvilMines, avoidCoinMed);
+		rmAddObjectDefConstraint(anvilMines, avoidSocket);
+		rmAddObjectDefConstraint(anvilMines, AvoidWaterShort2);
+		rmAddObjectDefConstraint(anvilMines, forestConstraintShort);
+		rmAddObjectDefConstraint(anvilMines, circleConstraint);
+		rmPlaceObjectDefAtLoc(anvilMines, 0, 0.5, 0.8, .5*cNumberNonGaiaPlayers);
+
+		rmSetStatusText("",0.70);
+
+	  	int mines = rmCreateObjectDef(" Mines");
+		rmAddObjectDefItem(mines, "mine", 1, 1.0);
+		rmSetObjectDefMinDistance(mines, 0.0);
+		rmSetObjectDefMaxDistance(mines, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(mines, avoidCoinMed);
+		rmAddObjectDefConstraint(mines, avoidTownCenterMore);
+		rmAddObjectDefConstraint(mines, avoidSocket);
+		rmAddObjectDefConstraint(mines, AvoidWaterShort2);
+		rmAddObjectDefConstraint(mines, forestConstraintShort);
+		rmAddObjectDefConstraint(mines, circleConstraint);
+		rmAddObjectDefConstraint(mines, avoidAnvil);
+		rmAddObjectDefConstraint(mines, avoidPlateau);
+		rmPlaceObjectDefAtLoc(mines, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+
+		int leftMines = rmCreateObjectDef("leftMines");
+		rmAddObjectDefItem(leftMines, "mine", 1, 1.0);
+		rmSetObjectDefMinDistance(leftMines, 0.0);
+		rmSetObjectDefMaxDistance(leftMines, rmXFractionToMeters(0.35));
+		rmAddObjectDefConstraint(leftMines, avoidCoinMed);
+		rmAddObjectDefConstraint(leftMines, avoidTownCenterMore);
+		rmAddObjectDefConstraint(leftMines, avoidSocket);
+		rmAddObjectDefConstraint(leftMines, AvoidWaterShort2);
+		rmAddObjectDefConstraint(leftMines, forestConstraintShort);
+		rmAddObjectDefConstraint(leftMines, circleConstraint);
+		rmAddObjectDefConstraint(leftMines, avoidAnvil);
+		rmAddObjectDefConstraint(leftMines, avoidTradeRouteFar);
+		rmPlaceObjectDefAtLoc(leftMines, 0, 0.25, 0.45, 1*cNumberNonGaiaPlayers);
+
+		int rightMines = rmCreateObjectDef("rightMines");
+		rmAddObjectDefItem(rightMines, "mine", 1, 1.0);
+		rmSetObjectDefMinDistance(rightMines, 0.0);
+		rmSetObjectDefMaxDistance(rightMines, rmXFractionToMeters(0.35));
+		rmAddObjectDefConstraint(rightMines, avoidCoinMed);
+		rmAddObjectDefConstraint(rightMines, avoidTownCenterMore);
+		rmAddObjectDefConstraint(rightMines, avoidSocket);
+		rmAddObjectDefConstraint(rightMines, AvoidWaterShort2);
+		rmAddObjectDefConstraint(rightMines, forestConstraintShort);
+		rmAddObjectDefConstraint(rightMines, circleConstraint);
+		rmAddObjectDefConstraint(rightMines, avoidAnvil);
+		rmAddObjectDefConstraint(rightMines, avoidTradeRouteFar);
+		rmPlaceObjectDefAtLoc(rightMines, 0, 0.75, 0.45, 1*cNumberNonGaiaPlayers);
+
+		int nuggetID= rmCreateObjectDef("nuggets small"); 
+		rmAddObjectDefItem(nuggetID, "Nugget", 1, 0.0); 
+		rmSetObjectDefMinDistance(nuggetID, 0.0); 
+		rmSetObjectDefMaxDistance(nuggetID, rmXFractionToMeters(0.5)); 
+		rmAddObjectDefConstraint(nuggetID, avoidNugget); 
+		rmAddObjectDefConstraint(nuggetID, circleConstraint);
+		rmAddObjectDefConstraint(nuggetID, avoidTownCenter);
+		rmAddObjectDefConstraint(nuggetID, avoidCoin); 
+		rmAddObjectDefConstraint(nuggetID, forestConstraintShort);
+		rmAddObjectDefConstraint(nuggetID, avoidWaterShort); 
+		rmAddObjectDefConstraint(nuggetID, avoidTradeRouteSmall);
+		rmAddObjectDefConstraint(nuggetID, avoidSocket); 
+		rmAddObjectDefConstraint(nuggetID, avoidPlateau); 
+		rmAddObjectDefConstraint(nuggetID, avoidAnvil); 
+		rmSetNuggetDifficulty(1, 1); 
+		rmPlaceObjectDefAtLoc(nuggetID, 0, 0.5, 0.5, 3*(cNumberNonGaiaPlayers + 1));   
+		
+		int avoidGrass=rmCreateClassDistanceConstraint("tree vs. grasses", rmClassID("patch"), 1.0);
+		
+			for (j=0; < (8*cNumberNonGaiaPlayers)) {   
+			int StartAreaTree2ID=rmCreateObjectDef("plateau trees"+j);
+			rmAddObjectDefItem(StartAreaTree2ID, "TreeCarolinaGrass", rmRandInt(13,16), rmRandFloat(15.0,20.0));
+			rmAddObjectDefToClass(StartAreaTree2ID, rmClassID("classForest")); 
+			rmSetObjectDefMinDistance(StartAreaTree2ID, 0);
+			rmSetObjectDefMaxDistance(StartAreaTree2ID, rmXFractionToMeters(0.45));
+			rmAddObjectDefConstraint(StartAreaTree2ID, avoidTradeRouteFar);
+			rmAddObjectDefConstraint(StartAreaTree2ID, avoidSocketMore);
+			rmAddObjectDefConstraint(StartAreaTree2ID, circleConstraint);
+			rmAddObjectDefConstraint(StartAreaTree2ID, forestConstraint);
+			rmAddObjectDefConstraint(StartAreaTree2ID, avoidCoin);
+			rmAddObjectDefConstraint(StartAreaTree2ID, avoidTownCenterMore);	
+			rmAddObjectDefConstraint(StartAreaTree2ID, AvoidWaterShort2);	
+			rmPlaceObjectDefAtLoc(StartAreaTree2ID, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
+		}
+		
+		rmSetStatusText("",0.80);
+
+	 // Water nuggets
+	int nuggetwcount = 4+1*cNumberNonGaiaPlayers;
+	
+	for (i=0; < nuggetwcount)
+	{
+		int nuggetW= rmCreateObjectDef("nugget water"+i); 
+		rmAddObjectDefItem(nuggetW, "ypNuggetBoat", 1, 0.0);
+		rmSetNuggetDifficulty(5, 5);
+		rmSetObjectDefMinDistance(nuggetW, rmXFractionToMeters(0.0));
+		rmSetObjectDefMaxDistance(nuggetW, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(nuggetW, avoidLand);
+		rmAddObjectDefConstraint(nuggetW, avoidEdge);
+		rmAddObjectDefConstraint(nuggetW, avoidNuggetWater);
+		rmPlaceObjectDefAtLoc(nuggetW, 0, 0.50, 0.50);
+	}
+
+		int fishID=rmCreateObjectDef("fish Mahi");
+		rmAddObjectDefItem(fishID, "FishMahi", 1, 0.0);
+		rmSetObjectDefMinDistance(fishID, 0.0);
+		rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(fishID, fishVsFishID);
+		rmAddObjectDefConstraint(fishID, fishLand);
+		rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+
+		int fish2ID=rmCreateObjectDef("fish Tarpon");
+		rmAddObjectDefItem(fish2ID, "FishTarpon", 1, 0.0);
+		rmSetObjectDefMinDistance(fish2ID, 0.0);
+		rmSetObjectDefMaxDistance(fish2ID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(fish2ID, fishVsFishID);
+		rmAddObjectDefConstraint(fish2ID, fishLand);
+		rmPlaceObjectDefAtLoc(fish2ID, 0, 0.5, 0.5, 5*cNumberNonGaiaPlayers);
+		rmSetStatusText("",0.90);
+
+		int whaleID=rmCreateObjectDef("whale");
+		rmAddObjectDefItem(whaleID, "HumpbackWhale", 1, 0.0);
+		rmSetObjectDefMinDistance(whaleID, 0.0);
+		rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.5));
+		rmAddObjectDefConstraint(whaleID, whaleVsWhaleID);
+		rmAddObjectDefConstraint(whaleID, whaleLand);
+		rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
+	  
+	  	int mineb=rmAddFairLoc("TownCenter", false, false, 18, 19, 12, 5); 
+
+   if(rmPlaceFairLocs())
+   {
+   mineb=rmCreateObjectDef("mine behind");
+   rmAddObjectDefItem(mineb, "mine", 1, 0.0);
+   for(i=1; <cNumberNonGaiaPlayers+1)
+      {
+   for(j=0; <rmGetNumberFairLocs(i))
+         {
+   rmPlaceObjectDefAtLoc(mineb, i, rmFairLocXFraction(i, j), rmFairLocZFraction(i, j), 1);
+         }
+      }
+   }
+
+	int minef=rmAddFairLoc("TownCenter", true, true, 18, 19, 12, 5);
+
+	if(rmPlaceFairLocs()){
+		minef=rmCreateObjectDef("forward mine");
+		rmAddObjectDefItem(minef, "mine", 1, 0.0);
+			for(i=1; <cNumberNonGaiaPlayers+1){
+				for(j=1; <rmGetNumberFairLocs(i)){
+					rmPlaceObjectDefAtLoc(minef, i, rmFairLocXFraction(i, j), rmFairLocZFraction(i, j), 1);
+				}
+			}
+	}
+   
+		int Durokan = rmCreateObjectDef("Durokan <3's Aiz");
+        rmAddObjectDefItem(Durokan, "Alligator", 2, 6.0);
+        rmSetObjectDefMinDistance(Durokan, 0);
+        rmSetObjectDefMaxDistance(Durokan, 0);
+		rmPlaceObjectDefAtLoc(Durokan, 0, 0.5, 0.89, 1);
+
+  // check for KOTH game mode
+  if(rmGetIsKOTH()) {
+    
+    int randLoc = rmRandInt(1,2);
+    float xLoc = 0.5;
+    float yLoc = 0.8;
+    float walk = 0.015;
+    
+    ypKingsHillPlacer(xLoc, yLoc, walk, 0);
+    rmEchoInfo("XLOC = "+xLoc);
+    rmEchoInfo("XLOC = "+yLoc);
+  }
+
+		rmSetStatusText("", 1.0);
+
+	}
+
+
+	
\ No newline at end of file
diff --git a/RMM/northwest territory.xs b/RMM/northwest territory.xs
index 7dbc9e2..4c876a1 100644
--- a/RMM/northwest territory.xs	
+++ b/RMM/northwest territory.xs	
@@ -484,8 +484,9 @@ void main(void)
 
    // Starting Unit placement - this can move more in weird configurations
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
 	rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	if (( teamZeroCount >= teamOneCount * 2 ) || ( teamOneCount >= teamZeroCount * 2 ))
 	{
 		rmSetObjectDefMaxDistance(startingUnits, 20.0);
@@ -644,16 +645,6 @@ void main(void)
 
 	// Define and place Nuggets
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/ozarks.xs b/RMM/ozarks.xs
index 9cd5459..9ce128a 100644
--- a/RMM/ozarks.xs
+++ b/RMM/ozarks.xs
@@ -145,6 +145,9 @@ void main(void)
 	rmSetStatusText("",0.10);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 		// ****************************** PLACE PLAYERS ******************************
 
@@ -426,6 +429,28 @@ void main(void)
    rmAddObjectDefConstraint(playerTreeID, avoidAll);
    rmAddObjectDefConstraint(playerTreeID, avoidImpassableLand);
 
+  int playerSaloonID=rmCreateObjectDef("player saloon");
+  rmAddObjectDefItem(playerSaloonID, "Mill", 1, 0.0);
+  rmSetObjectDefMinDistance(playerSaloonID, 12.0);
+  rmSetObjectDefMaxDistance(playerSaloonID, 16.0);
+	rmAddObjectDefConstraint(playerSaloonID, avoidAll);
+	rmAddObjectDefConstraint(playerSaloonID, avoidImpassableLand);
+  
+  int playerFirepitID=rmCreateObjectDef("player firepit");
+  rmAddObjectDefItem(playerFirepitID, "Farm", 1, 0.0);
+  rmSetObjectDefMinDistance(playerFirepitID, 12.0);
+  rmSetObjectDefMaxDistance(playerFirepitID, 16.0);
+	rmAddObjectDefConstraint(playerFirepitID, avoidAll);
+	rmAddObjectDefConstraint(playerFirepitID, avoidImpassableLand);
+  
+  int playerMonID=rmCreateObjectDef("player monastery");
+  rmAddObjectDefItem(playerMonID, "ypRicePaddy", 1, 0.0);
+  rmSetObjectDefMinDistance(playerMonID, 12.0);
+  rmSetObjectDefMaxDistance(playerMonID, 16.0);
+	rmAddObjectDefConstraint(playerMonID, avoidAll);
+	rmAddObjectDefConstraint(playerMonID, avoidImpassableLand);
+
+
 	for(i = 1; < cNumberPlayers)
    {
 	rmPlaceObjectDefAtLoc(TCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
@@ -436,10 +461,25 @@ void main(void)
 	rmPlaceObjectDefAtLoc(playerturkeyID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
 	rmPlaceObjectDefAtLoc(playerNuggetID, 0, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
      
-    if(ypIsAsian(i) && rmGetNomadStart() == false)
-      rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i, 1), i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
-   rmClearClosestPointConstraints();
-   }
+    if (rmGetNomadStart() == false) {
+      
+      if (rmGetPlayerCiv(i) == rmGetCivID("Chinese") || rmGetPlayerCiv(i) == rmGetCivID("Japanese") || rmGetPlayerCiv(i) == rmGetCivID("Indians")) {
+        rmPlaceObjectDefAtLoc(playerMonID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+      }
+
+			else if ( rmGetPlayerCiv(i) ==  rmGetCivID("XPIroquois") ||
+						rmGetPlayerCiv(i) ==  rmGetCivID("XPSioux") ||
+						rmGetPlayerCiv(i) ==  rmGetCivID("XPAztec"))
+			{
+				rmPlaceObjectDefAtLoc(playerFirepitID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+			}
+
+			else
+			{
+				rmPlaceObjectDefAtLoc(playerSaloonID, i, rmXMetersToFraction(xsVectorGetX(TCLoc)), rmZMetersToFraction(xsVectorGetZ(TCLoc)));
+			}
+		}
+	}
 
 	// Text
 	rmSetStatusText("",0.60);
@@ -465,7 +505,7 @@ void main(void)
 			rmSetAreaSize(smallMesaID, rmAreaTilesToFraction(1600), rmAreaTilesToFraction(1600));  //First # is minimum square meters of material it will use to build.  Second # is maximum.  Currently I have them both set to the same because I want a certain size mountain every time.
 		}
 
-  		rmSetAreaCliffType(smallMesaID, "araucania central");
+  		rmSetAreaCliffType(smallMesaID, "Ozarks");
 		//rmAddAreaToClass(centerCliffs, rmClassID("canyon"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(smallMesaID, 1, 1.0, 0.1, 1.0, 0);
 		rmSetAreaCliffHeight(smallMesaID, rmRandInt(4, 6), 1.0, 1.0);  //was rmRandInt(6, 8)
@@ -494,7 +534,7 @@ void main(void)
 			rmSetAreaSize(smallMesaID2, rmAreaTilesToFraction(1600), rmAreaTilesToFraction(1600));  //First # is minimum square meters of material it will use to build.  Second # is maximum.  Currently I have them both set to the same because I want a certain size mountain every time.
 		}
 
-  		rmSetAreaCliffType(smallMesaID2, "araucania central");
+  		rmSetAreaCliffType(smallMesaID2, "Ozarks");
 		//rmAddAreaToClass(centerCliffs, rmClassID("canyon"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(smallMesaID2, 1, 1.0, 0.1, 1.0, 0);
 		rmSetAreaCliffHeight(smallMesaID2, rmRandInt(4, 6), 1.0, 1.0);  //was rmRandInt(6, 8)
@@ -526,7 +566,7 @@ void main(void)
 			rmSetAreaSize(smallMesaID3, rmAreaTilesToFraction(1600), rmAreaTilesToFraction(1600));  //First # is minimum square meters of material it will use to build.  Second # is maximum.  Currently I have them both set to the same because I want a certain size mountain every time.
 		}
 
-  		rmSetAreaCliffType(smallMesaID3, "araucania central");
+  		rmSetAreaCliffType(smallMesaID3, "Ozarks");
 		//rmAddAreaToClass(centerCliffs, rmClassID("canyon"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(smallMesaID3, 1, 1.0, 0.1, 1.0, 0);
 		rmSetAreaCliffHeight(smallMesaID3, rmRandInt(4, 6), 1.0, 1.0);  //was rmRandInt(6, 8)
@@ -847,17 +887,6 @@ void main(void)
 
 	// Text
 	
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
-
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
     
diff --git a/RMM/painted desert.xs b/RMM/painted desert.xs
index 261b0c4..73813ac 100644
--- a/RMM/painted desert.xs	
+++ b/RMM/painted desert.xs	
@@ -188,6 +188,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 8.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidStartingUnits);
 
@@ -781,16 +782,6 @@ rmSetStatusText("",0.4);
 		rmAddObjectDefConstraint(nugget4, shortAvoidImportantItem);			// Added New
 		rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(0,3));
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/pampas.xs b/RMM/pampas.xs
index ef318db..a809836 100644
--- a/RMM/pampas.xs
+++ b/RMM/pampas.xs
@@ -38,18 +38,18 @@ void main(void)
 	}
 
 // *************************** MAP PARAMETERS **************************
-   //int playerTiles=11000;		// OLD SIZE
-	int playerTiles = 10000;
+   //int playerTiles=13000;		// OLD SIZE
+	int playerTiles = 12000;
 	if (cNumberNonGaiaPlayers >4)
-		playerTiles = 8000;
+		playerTiles = 10000;
 	if (cNumberNonGaiaPlayers >6)
-		playerTiles = 6000;		
+		playerTiles = 8000;		
 	if(cMapSize == 1)
 	{
 		playerTiles = 15000;			// DAL modified from 18K
 		rmEchoInfo("Large map");
 	}
-	int size=1.7*sqrt(cNumberNonGaiaPlayers*playerTiles);
+	int size=1.9*sqrt(cNumberNonGaiaPlayers*playerTiles);
 	int longSide=1.4*size;      // 'Longside' is used to make the map rectangular
 	rmEchoInfo("Map size="+size+"m x "+longSide+"m");
 	rmSetMapSize(longSide, size);
@@ -530,8 +530,8 @@ void main(void)
 	//rmPlaceObjectDefPerPlayer(startSilverID, true);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-    rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmSetObjectDefMinDistance(startingUnits, 8.0);
+	rmSetObjectDefMaxDistance(startingUnits, 12.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	//rmAddObjectDefConstraint(startingUnits, avoidResource);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -1112,16 +1112,6 @@ numTries=8*cNumberNonGaiaPlayers;  // DAL - 3 here, three above.
 	}
 */
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/patagonia.xs b/RMM/patagonia.xs
index 351a13f..4899e15 100644
--- a/RMM/patagonia.xs
+++ b/RMM/patagonia.xs
@@ -97,7 +97,7 @@ void main(void)
    int whaleLand = rmCreateTerrainDistanceConstraint("whale v. land", "land", true, 20.0);
 	int avoidFastCoin=rmCreateTypeDistanceConstraint("fast coin avoids coin", "gold", 60.0);
 	int avoidFastCoinForest=rmCreateTypeDistanceConstraint("forests avoid fast coin", "gold", 10.0);
-   int avoidNuggetWater=rmCreateTypeDistanceConstraint("nugget vs. nugget water", "AbstractNugget", 80.0);
+   int avoidNuggetWater=rmCreateTypeDistanceConstraint("nugget vs. nugget water", "AbstractNugget", 60.0);
    int avoidLand = rmCreateTerrainDistanceConstraint("ship avoid land", "land", true, 15.0);
 
    // Avoid impassable land
@@ -428,7 +428,7 @@ void main(void)
 
       // Starting Unit placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
 	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
@@ -780,16 +780,6 @@ void main(void)
 	rmClearClosestPointConstraints();
    */
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/plymouth.xs b/RMM/plymouth.xs
index 85bc232..15b196a 100644
--- a/RMM/plymouth.xs
+++ b/RMM/plymouth.xs
@@ -40,9 +40,9 @@ void main(void)
    rmSetSubCiv(3, "Huron", true);
 
    // Picks the map size
-	int playerTiles = 12500;
+	int playerTiles = 11500;
    if (cNumberNonGaiaPlayers >4)
-		playerTiles = 11500;
+		playerTiles = 10500;
 
    // Picks default terrain and water
    rmSetSeaType("new england coast");
@@ -62,7 +62,7 @@ void main(void)
 	rmSetMapType("water");
 	rmSetWorldCircleConstraint(true);
 	rmSetWindMagnitude(2.0);
-	rmSetLightingSet("new england");
+	rmSetLightingSet("yellow_river_dry");
 	rmSetMapType("grass");
 
 	// Choose mercs.
@@ -370,7 +370,7 @@ void main(void)
 
    // Starting Unit placement
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
 	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
@@ -590,7 +590,7 @@ void main(void)
 
 	// FORESTS
    int forestTreeID = 0;
-   numTries = 6*cNumberNonGaiaPlayers;
+   numTries = 7*cNumberNonGaiaPlayers;
    failCount = 0;
 
    for (i = 0; <numTries)
@@ -598,7 +598,7 @@ void main(void)
       int forest = rmCreateArea("forest "+i, rmAreaID("big continent"));
       rmSetAreaWarnFailure(forest, false);
       rmSetAreaSize(forest, rmAreaTilesToFraction(200), rmAreaTilesToFraction(250));
-      rmSetAreaForestType(forest, "new england forest");
+      rmSetAreaForestType(forest, "Plymouth Forest");
       rmSetAreaForestDensity(forest, 1.0);
       rmSetAreaForestClumpiness(forest, 0.9);
       rmSetAreaForestUnderbrush(forest, 0.0);
diff --git a/RMM/randommaps.set b/RMM/randommaps.set
index 091721d..8bc81d9 100644
--- a/RMM/randommaps.set
+++ b/RMM/randommaps.set
@@ -23,7 +23,6 @@
   <map>Northwest Territory</map>
   <map>Hispaniola</map>
   <map>Araucania</map>
-  <map>Unknown</map>
   <map>Painted Desert</map>
   <map>Mongolia</map>
   <map>Deccan</map>
@@ -31,8 +30,21 @@
   <map>borneo</map>
   <map>indochina</map>
   <map>Himalayas</map>
+  <map>himalayasUpper</map>
   <map>siberia</map>
   <map>silkRoad</map>
   <map>yellow riverDry</map>
   <map>Ceylon</map>
+  <map>RockiesLower</map>
+  <map>Congo</map>
+  <map>Kilimanjaro</map>
+  <map>Madagascar</map>
+  <map>Nile River</map>
+  <map>Savanna Grass</map>
+  <map>Sahara</map>
+  <map>Indonesia</map>
+  <map>newzealand</map>
+  <map>australia</map>
+  <map>UnknownLand</map>
+  <map>UnknownWater</map>
 </randomMaps>
\ No newline at end of file
diff --git a/RMM/regicidemaps.set b/RMM/regicidemaps.set
index 9d65e51..d4a22ac 100644
--- a/RMM/regicidemaps.set
+++ b/RMM/regicidemaps.set
@@ -9,4 +9,6 @@
   <map>yellow riverRegicide</map>
   <map>siberiaRegicide</map>
   <map>indochinaRegicide</map>
+  <map>MadagascarRegicide</map>
+  <map>australiaregicide</map>
 </randomMaps>
diff --git a/RMM/rockies.xs b/RMM/rockies.xs
index f300937..d62cc4a 100644
--- a/RMM/rockies.xs
+++ b/RMM/rockies.xs
@@ -428,8 +428,9 @@ void main(void)
 	rmSetObjectDefMaxDistance(startingTCID, 16.0);
 
    int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-	rmSetObjectDefMaxDistance(startingUnits, 8.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidStartingUnitsSmall);
 	
 	int StartAreaTreeID=rmCreateObjectDef("starting trees");
@@ -757,16 +758,6 @@ void main(void)
 		rmPlaceObjectDefInArea(nuggetID, 0, centralValleyID, 1);
 	}
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/saguenay.xs b/RMM/saguenay.xs
index b4a2cb4..b083395 100644
--- a/RMM/saguenay.xs
+++ b/RMM/saguenay.xs
@@ -126,7 +126,7 @@ void main(void)
    int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
    int whaleLand = rmCreateTerrainDistanceConstraint("whale v. land", "land", true, 15.0);
    int avoidSheep=rmCreateTypeDistanceConstraint("sheep avoids sheep", "sheep", 40.0);
-    int avoidNuggetWater=rmCreateTypeDistanceConstraint("nugget vs. nugget water", "AbstractNugget", 80.0);
+    int avoidNuggetWater=rmCreateTypeDistanceConstraint("nugget vs. nugget water", "AbstractNugget", 60.0);
    int avoidLand = rmCreateTerrainDistanceConstraint("ship avoid land", "land", true, 15.0);
 
    // Avoid impassable land
@@ -382,8 +382,8 @@ void main(void)
 	// DAL OLD - player setup/starting units for non-colony-ship guys
 	/*
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 2.0);
-	rmSetObjectDefMaxDistance(startingUnits, 4.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	// Extra crates for the starting guys.
@@ -1051,16 +1051,6 @@ void main(void)
 	   	rmPlaceObjectDefAtLoc(colonyShipID, i, 1.0, 1.0, 1);
 	}   
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/saguenayLarge.xs b/RMM/saguenayLarge.xs
index 13390dc..7c92c83 100644
--- a/RMM/saguenayLarge.xs
+++ b/RMM/saguenayLarge.xs
@@ -378,8 +378,8 @@ void main(void)
 	// DAL OLD - player setup/starting units for non-colony-ship guys
 	/*
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 2.0);
-	rmSetObjectDefMaxDistance(startingUnits, 4.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
+	rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	// Extra crates for the starting guys.
@@ -1049,16 +1049,6 @@ void main(void)
 	   	rmPlaceObjectDefAtLoc(colonyShipID, i, 1.0, 1.0, 1);
 	}   
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/siberia.xs b/RMM/siberia.xs
index b92de53..73b4b62 100644
--- a/RMM/siberia.xs
+++ b/RMM/siberia.xs
@@ -433,7 +433,7 @@ void main(void)
 	rmAddObjectDefConstraint(startSilverID, avoidImpassableLand);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -634,16 +634,6 @@ void main(void)
   rmAddObjectDefConstraint(nugget4, circleConstraint);
   rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(2,3));
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/siberiaLarge.xs b/RMM/siberiaLarge.xs
index 79fb316..b9cb217 100644
--- a/RMM/siberiaLarge.xs
+++ b/RMM/siberiaLarge.xs
@@ -433,7 +433,7 @@ void main(void)
 	rmAddObjectDefConstraint(startSilverID, avoidImpassableLand);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -634,16 +634,6 @@ void main(void)
   rmAddObjectDefConstraint(nugget4, circleConstraint);
   rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(2,3));
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/siberiaRegicide.xs b/RMM/siberiaRegicide.xs
index f361f69..c5ce1ff 100644
--- a/RMM/siberiaRegicide.xs
+++ b/RMM/siberiaRegicide.xs
@@ -438,7 +438,7 @@ else if (cNumberTeams == 2)
 	rmAddObjectDefConstraint(startSilverID, avoidImpassableLand);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -712,16 +712,6 @@ else if (cNumberTeams == 2)
   rmAddObjectDefConstraint(nugget4, circleConstraint);
   rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(2,3));
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <14 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/silkRoad.xs b/RMM/silkRoad.xs
index 0a049b6..4ee98f7 100644
--- a/RMM/silkRoad.xs
+++ b/RMM/silkRoad.xs
@@ -498,7 +498,7 @@ void main(void)
 	rmAddObjectDefConstraint(startSilverID, avoidImpassableLand);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -809,16 +809,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.85);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/silkRoadLarge.xs b/RMM/silkRoadLarge.xs
index c2c0256..bc71ca4 100644
--- a/RMM/silkRoadLarge.xs
+++ b/RMM/silkRoadLarge.xs
@@ -498,7 +498,7 @@ void main(void)
 	rmAddObjectDefConstraint(startSilverID, avoidImpassableLand);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -809,16 +809,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.85);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/sonora.xs b/RMM/sonora.xs
index 3444a41..6cc786f 100644
--- a/RMM/sonora.xs
+++ b/RMM/sonora.xs
@@ -63,11 +63,11 @@ void main(void)
 // ********************* MAP PARAMETERS ************************
 	// Picks the map size
 	//  int playerTiles=10000; old setting
-	int playerTiles = 9000;
+	int playerTiles = 10000;
 	if (cNumberNonGaiaPlayers >4)
-		playerTiles = 8000;
+		playerTiles = 9000;
 	if (cNumberNonGaiaPlayers >6)
-		playerTiles = 6000;		
+		playerTiles = 7000;		
 	/*
    if(cMapSize == 1)
    {
@@ -148,6 +148,7 @@ void main(void)
 	int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 8.0);
 	int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
 	int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);
 
 		
 		// starting resources
@@ -170,6 +171,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 8.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidStartingUnits);
 
@@ -345,16 +347,6 @@ if ( cNumberTeams == 2 )
 	// Text
 	rmSetStatusText("",0.8);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 	// ******************************* UBER MINE AT CENTER **************************************
 	float centerType = rmRandFloat(0.0, 1.0);
diff --git a/RMM/sonoraLarge.xs b/RMM/sonoraLarge.xs
index b6275eb..1172967 100644
--- a/RMM/sonoraLarge.xs
+++ b/RMM/sonoraLarge.xs
@@ -148,6 +148,7 @@ void main(void)
 	int avoidStartingUnits=rmCreateClassDistanceConstraint("objects avoid starting units", rmClassID("startingUnit"), 8.0);
 	int circleConstraint=rmCreatePieConstraint("circle Constraint", 0.5, 0.5, 0, rmZFractionToMeters(0.47), rmDegreesToRadians(0), rmDegreesToRadians(360));
 	int patchConstraint=rmCreateClassDistanceConstraint("patch vs. patch", rmClassID("classPatch"), 5.0);
+	int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 7.0);
 
 		
 		// starting resources
@@ -170,6 +171,7 @@ void main(void)
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
 	rmSetObjectDefMinDistance(startingUnits, 8.0);
 	rmSetObjectDefMaxDistance(startingUnits, 12.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
 	rmAddObjectDefConstraint(startingUnits, avoidStartingUnits);
 
@@ -345,16 +347,6 @@ if ( cNumberTeams == 2 )
 	// Text
 	rmSetStatusText("",0.8);
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
 	// ******************************* UBER MINE AT CENTER **************************************
 	float centerType = rmRandFloat(0.0, 1.0);
diff --git a/RMM/texas.xs b/RMM/texas.xs
index bd58a66..6927eb5 100644
--- a/RMM/texas.xs
+++ b/RMM/texas.xs
@@ -224,14 +224,6 @@ void main(void)
    rmSetObjectDefMinDistance(bisonID, 0.0);
    rmSetObjectDefMaxDistance(bisonID, 5.0);
 
-   // wood resources
-   int randomTreeID=rmCreateObjectDef("random tree");
-   rmAddObjectDefItem(randomTreeID, "TreeTexasDirt", 1, 0.0);
-   rmSetObjectDefMinDistance(randomTreeID, 0.0);
-   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(randomTreeID, avoidResource);
-   rmAddObjectDefConstraint(randomTreeID, avoidImpassableLand);
-
    // starting resources
 	int StartAreaTreeID=rmCreateObjectDef("starting trees");
 	rmAddObjectDefItem(StartAreaTreeID, "TreeTexasDirt", 1, 0.0);
@@ -428,7 +420,7 @@ void main(void)
    */
 	
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-   rmSetObjectDefMinDistance(startingUnits, 5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
    rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
@@ -918,7 +910,7 @@ void main(void)
 		rmAddAreaToClass(cliffEastID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(cliffEastID, 2, 0.4, 0.1, 1.0, 0);
 		rmSetAreaCliffPainting(cliffEastID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffEastID, 7, 1.0, 1.0);
+		rmSetAreaCliffHeight(cliffEastID, 5, 1.0, 1.0);
 		rmSetAreaHeightBlend(cliffEastID, 1);
 		rmAddAreaTerrainLayer(cliffEastID, "texas\ground2_tex", 0, 2);
 
@@ -959,7 +951,7 @@ void main(void)
 		rmAddAreaToClass(cliffWestID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(cliffWestID, 2, 0.4, 0.1, 1.0, 0);
 		rmSetAreaCliffPainting(cliffWestID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffWestID, 7, 1.0, 1.0);
+		rmSetAreaCliffHeight(cliffWestID, 5, 1.0, 1.0);
 		rmSetAreaHeightBlend(cliffWestID, 1);
 		rmAddAreaTerrainLayer(cliffWestID, "texas\ground2_tex", 0, 2);
 
@@ -1140,16 +1132,6 @@ void main(void)
 
 	// */
 	
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
@@ -1203,9 +1185,19 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.80);
 
-	/*
-	rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
-	*/
+   // wood resources
+   int randomTreeID=rmCreateObjectDef("random tree");
+   rmAddObjectDefItem(randomTreeID, "TreeTexasDirt", 1, 1);
+   rmSetObjectDefMinDistance(randomTreeID, 0.0);
+   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(randomTreeID, avoidAll);
+   rmAddObjectDefConstraint(randomTreeID, avoidResource);
+   rmAddObjectDefConstraint(randomTreeID, avoidImpassableLand);
+   rmAddObjectDefConstraint(randomTreeID, avoidCliffs);
+   rmAddObjectDefConstraint(randomTreeID, avoidTradeRoute);
+   rmAddObjectDefConstraint(randomTreeID, avoidCoin);
+   rmAddObjectDefConstraint(randomTreeID, forestsAvoidBison);
+   rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
 
 	// Text
 	rmSetStatusText("",0.90);
diff --git a/RMM/texasLarge.xs b/RMM/texasLarge.xs
index d32cb68..0ac10ed 100644
--- a/RMM/texasLarge.xs
+++ b/RMM/texasLarge.xs
@@ -217,14 +217,6 @@ void main(void)
    rmSetObjectDefMinDistance(bisonID, 0.0);
    rmSetObjectDefMaxDistance(bisonID, 5.0);
 
-   // wood resources
-   int randomTreeID=rmCreateObjectDef("random tree");
-   rmAddObjectDefItem(randomTreeID, "TreeTexasDirt", 1, 0.0);
-   rmSetObjectDefMinDistance(randomTreeID, 0.0);
-   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(randomTreeID, avoidResource);
-   rmAddObjectDefConstraint(randomTreeID, avoidImpassableLand);
-
    // starting resources
 	int StartAreaTreeID=rmCreateObjectDef("starting trees");
 	rmAddObjectDefItem(StartAreaTreeID, "TreeTexasDirt", 1, 0.0);
@@ -421,7 +413,7 @@ void main(void)
    */
 	
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-   rmSetObjectDefMinDistance(startingUnits, 5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
    rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
@@ -910,7 +902,7 @@ void main(void)
 		rmAddAreaToClass(cliffEastID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(cliffEastID, 2, 0.4, 0.1, 1.0, 0);
 		rmSetAreaCliffPainting(cliffEastID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffEastID, 7, 1.0, 1.0);
+		rmSetAreaCliffHeight(cliffEastID, 5, 1.0, 1.0);
 		rmSetAreaHeightBlend(cliffEastID, 1);
 		rmAddAreaTerrainLayer(cliffEastID, "texas\ground2_tex", 0, 2);
 
@@ -951,7 +943,7 @@ void main(void)
 		rmAddAreaToClass(cliffWestID, rmClassID("classCliff"));	// Attempt to keep cliffs away from each other.
 		rmSetAreaCliffEdge(cliffWestID, 2, 0.4, 0.1, 1.0, 0);
 		rmSetAreaCliffPainting(cliffWestID, true, true, true, 1.5, true);
-		rmSetAreaCliffHeight(cliffWestID, 7, 1.0, 1.0);
+		rmSetAreaCliffHeight(cliffWestID, 5, 1.0, 1.0);
 		rmSetAreaHeightBlend(cliffWestID, 1);
 		rmAddAreaTerrainLayer(cliffWestID, "texas\ground2_tex", 0, 2);
 
@@ -1132,16 +1124,6 @@ void main(void)
 
 	// */
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <16 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
@@ -1201,9 +1183,17 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.80);
 
-	/*
-	rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
-	*/
+   // wood resources
+   int randomTreeID=rmCreateObjectDef("random tree");
+   rmAddObjectDefItem(randomTreeID, "TreeTexasDirt", 2, 4.0);
+   rmSetObjectDefMinDistance(randomTreeID, 0.0);
+   rmSetObjectDefMaxDistance(randomTreeID, rmXFractionToMeters(0.5));
+   rmAddObjectDefConstraint(randomTreeID, avoidAll);
+   rmAddObjectDefConstraint(randomTreeID, avoidResource);
+   rmAddObjectDefConstraint(randomTreeID, avoidImpassableLand);
+   rmAddObjectDefConstraint(randomTreeID, avoidCliffs);
+   rmAddObjectDefConstraint(randomTreeID, avoidTradeRoute);
+   rmPlaceObjectDefAtLoc(randomTreeID, 0, 0.5, 0.5, 8*cNumberNonGaiaPlayers);
 
 	// Text
 	rmSetStatusText("",0.90);
diff --git a/RMM/unknown.xs b/RMM/unknown.xs
deleted file mode 100644
index 04f9b7f..0000000
--- a/RMM/unknown.xs
+++ /dev/null
@@ -1,1573 +0,0 @@
-// Land Unknown adapted to Rocket
-// ver 11 Jan 2005
-
-include "ypAsianInclude.xs";
-include "ypKOTHInclude.xs";
-
-void main(void)
-{
-
-  // Text
-   rmSetStatusText("",0.01);
-
-  // Set size.
-
-   int playerTiles=12000;
-
-   	if(rmRandFloat(0,1) > 0.25)
-	{
-		playerTiles=16000;
-		rmEchoInfo("Extra large map");
-	}
-	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
-	rmEchoInfo("Map size="+size+"m x "+size+"m");
-	rmSetMapSize(size, size);
-	rmSetMapElevationParameters(cElevTurbulence, 0.02, rmRandFloat(2, 4), 0.7, 8.0);
-
-// ============= Base terrain ============= 
-
-	float baseTerrain = rmRandFloat(0,1);
-	int amazonMap = -1;
-	int carolinaMap = -1;
-	int saguenayMap = -1;
-	int rockiesMap = -1;
-	int sonoraMap = -1;
-	string riverName = "";
-	string oceanName = "";
-	string pondName = "";
-	string cliffName = "";
-	string forestName = "";
-	string landName = "";
-	string treeName = "";
-	string critterOneName = "";
-	string critterTwoName = "";
-	string livestockName = "";
-	string fishName = "";
-	string whaleName = "";
-
-	if(baseTerrain < 0.2)
-	{
-		rmEchoInfo("Amazon terrain");
-		amazonMap = 1;
-		rmSetBaseTerrainMix("amazon grass");
-		rmTerrainInitialize("pampas\ground5_pam", 6);
-		rmSetMapType("yucatan");
-		rmSetMapType("tropical");
-		rmSetMapType("land");
-	   rmSetLightingSet("amazon");
-		riverName = "Amazon River";
-		oceanName = "Amazon River Basin";
-		pondName = "Bayou";
-		cliffName = "Amazon";
-		forestName = "Amazon Rain Forest";
-		landName = "amazon grass";
-		treeName = "treeAmazon";
-		critterOneName = "capybara";
-		critterTwoName = "tapir";
-		livestockName = "cow";
-		fishName = "fishMahi";
-		whaleName = "humpbackWhale";
-	}
-
-	else if(baseTerrain < 0.4)
-	{
-		rmEchoInfo("Carolina terrain");
-		carolinaMap = 1;
-		rmSetBaseTerrainMix("carolina_grass");
-		rmTerrainInitialize("pampas\ground5_pam", 6);
-		rmSetMapType("carolina");
-		rmSetMapType("grass");
-		rmSetMapType("land");
-		rmSetLightingSet("carolina");
-		riverName = "Pampas River";
-		oceanName = "Atlantic Coast";
-		pondName = "Texas Pond";
-		cliffName = "Carolina Inland";
-		forestName = "Carolina Pine Forest";
-		landName = "carolina_grass";
-		treeName = "treeCarolinaGrass";
-		critterOneName = "turkey";
-		critterTwoName = "deer";
-		livestockName = "sheep";
-		fishName = "fishCod";
-		whaleName = "humpbackWhale";
-	}
-
-	else if(baseTerrain < 0.6)
-	{
-		rmEchoInfo("Saguenay terrain");
-		saguenayMap = 1;
-		rmSetBaseTerrainMix("saguenay tundra");
-		rmTerrainInitialize("saguenay\ground1_sag",6);
-		rmSetMapType("saguenay");
-		rmSetMapType("grass");
-		rmSetMapType("land");
-	   rmSetLightingSet("saguenay");
-		riverName = "Amazon River";
-		oceanName = "Hudson Bay";
-		pondName = "Saguenay Lake";
-		cliffName = "New England Inland";
-		forestName = "Saguenay Forest";
-		landName = "saguenay tundra";
-		treeName = "treeSaguenay";
-		critterOneName = "elk";
-		critterTwoName = "moose";
-		livestockName = "sheep";
-		fishName = "fishSalmon";
-		whaleName = "minkeWhale";
-	}
-
-	else if(baseTerrain < 0.8)
-	{
-		rmEchoInfo("Rockies terrain");
-		rockiesMap = 1;
-		rmSetBaseTerrainMix("rockies_snow");
-		rmTerrainInitialize("rockies\groundsnow1_roc", 6);	
-		rmSetMapType("rockies");
-		rmSetMapType("land");
-		rmSetLightingSet("rockies");
-		riverName = "Yukon River";
-		oceanName = "Great Lakes Ice";
-		pondName = "Great Lakes Ice";
-		cliffName = "Rocky Mountain2";
-		forestName = "Rockies Snow Forest";
-		landName = "rockies_snow";
-		treeName = "treeRockies";
-		critterOneName = "caribou";
-		critterTwoName = "muskOx";
-		livestockName = "cow";
-		fishName = "fishSardine";
-		whaleName = "beluga";
-	}
-
-	else
-	{
-		rmEchoInfo("Sonora terrain");
-		sonoraMap = 1;
-		rmSetBaseTerrainMix("sonora_dirt");
-		rmTerrainInitialize("sonora\ground2_son", 6);
-		rmSetMapType("sonora");
-		rmSetMapType("grass");
-		rmSetMapType("land");
-		rmSetLightingSet("Sonora");
-		riverName = "Pampas River";
-		oceanName = "Great Lakes";
-		pondName = "Great Lakes"; 
-		cliffName = "Sonora";
-		forestName = "Sonora Forest";
-		landName = "sonora_dirt";
-		treeName = "treeSonora";
-		critterOneName = "turkey";
-		critterTwoName = "rhea";
-		livestockName = "llama";
-		fishName = "fishTarpon";
-		whaleName = "humpbackWhale";
-
-	}
-
-	// Text
-   rmSetStatusText("", 0.1);
-
-
-
-// ============= Classes =============
-
-	int classPlayer=rmDefineClass("player");
-	int classNatives=rmDefineClass("natives");
-	int classCanyon=rmDefineClass("canyon");
-	int pondClass=rmDefineClass("pond");
-	rmDefineClass("startingUnit");
-	rmDefineClass("classForest");
-
-
-
-// ============= Constraints =============
-
-	int avoidImpassableLand = rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 24.0);
-	int playerAvoidImpassableLand = rmCreateTerrainDistanceConstraint("player avoid impassable land", "Land", false, 18.0);
-	int mediumAvoidImpassableLand = rmCreateTerrainDistanceConstraint("slightly avoid impassable", "Land", false, 12.0);
-	int shortAvoidImpassableLand = rmCreateTerrainDistanceConstraint("just barely avoid impassable", "Land", false, 4.0);
-	int TCAvoidImpassableLand = rmCreateTerrainDistanceConstraint("TCs vs impassable land", "Land", false, 8.0);
-	int avoidPlayers = rmCreateClassDistanceConstraint("stay away from players medium", classPlayer, 15.0);
-	int avoidPlayersFar = rmCreateClassDistanceConstraint("stay away from players far", classPlayer, 50.0);
-	int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 10.0);
-	int avoidTradeRouteSocket = rmCreateTypeDistanceConstraint("avoid trade route sockets", "sockettraderoute", 15.0);
-	int avoidNatives = rmCreateClassDistanceConstraint("stay away from natives", classNatives, 60.0);
-	int nativesAvoidPlayers = rmCreateClassDistanceConstraint("natives vs. players", classPlayer, 50.0);
-   int edgeConstraint=rmCreatePieConstraint("continent avoids edge",  0.5, 0.5, 0, rmGetMapXSize()-30, 0, 0, 0);
-	int avoidCanyon = rmCreateClassDistanceConstraint("don't place on mesa where you can't path", classCanyon, 2.0);
-   int pondConstraint=rmCreateClassDistanceConstraint("ponds avoid ponds", rmClassID("pond"), 30.0);
-   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 20.0);
-	int avoidTC=rmCreateTypeDistanceConstraint("vs. TC", "TownCenter", 20.0);
-	int avoidCW=rmCreateTypeDistanceConstraint("vs. CW", "CoveredWagon", 20.0);
-   int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "abstractNugget", 30.0);
-   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "abstractFish", 10.0);
-   int whaleVsWhaleID=rmCreateTypeDistanceConstraint("whale v whale", "abstractWhale", 25.0);
-   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
-   int whaleLand = rmCreateTerrainDistanceConstraint("whale v. land", "land", true, 20.0);
-	int flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same", "HomeCityWaterSpawnFlag", 20);
-   int avoidFood = rmCreateTypeDistanceConstraint("food avoids food", "food", 40.0);
-	int avoidSilver = rmCreateTypeDistanceConstraint("fast coin avoids coin", "gold", 40.0);
-   int avoidNuggetWater=rmCreateTypeDistanceConstraint("nugget vs. nugget water", "AbstractNugget", 80.0);
-   int avoidLand = rmCreateTerrainDistanceConstraint("ship avoid land", "land", true, 15.0);
-
-   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);
-
-
-
-// ============= Land and Water Configuration =============
-
-	int allLand = 1;
-	int riverExists = -1;
-	int oceanMiddle = -1;
-	int oceanOffCenter = -1;
-	int oceanRing = -1;
-	int plateauMiddle = -1;
-	int forestMiddle = -1;
-	int blockedMiddle = -1; // used to determine if trade route should be a circle
-	
-	float landConfig = rmRandFloat(0,1);
-
-// temp for testing XXXXXXXXXXXXXXXXXXXXX
-
-	//~ landConfig = 0.95;
-  if(rmGetIsKOTH()){
-  
-    if(landConfig < 0.5)
-      landConfig = rmRandFloat(0, 0.34);
-
-    else 
-      landConfig = rmRandFloat(0.54, 0.78);
-  }
-
-// ============= Land Only =============
-	if(landConfig < 0.25)
-		rmEchoInfo("just land");
-
-// ============= River Across Middle =============
-	else if(landConfig < 0.35)
-	{
-		rmEchoInfo("river exists");
-		allLand = -1;
-		riverExists = 1;
-		int unknownRiver = rmRiverCreate(-1, riverName, 30, 15, 5, 8);
-		float riverPosition = rmRandFloat(0,1);
-
-		// Spin river randomly around the edge		
-		if(riverPosition < 0.12)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.5, 1.0, 0.5);
-		else if(riverPosition < 0.24)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.0, 1.0, 1.0);
-		else if(riverPosition < 0.36)
-			rmRiverSetConnections(unknownRiver, 0.5, 0.0, 0.5, 1.0);
-		else if(riverPosition < 0.48)
-			rmRiverSetConnections(unknownRiver, 0.0, 1.0, 1.0, 0.0);
-		else if(riverPosition < 0.60)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.25, 1.0, 0.75);
-		else if(riverPosition < 0.72)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.75, 1.0, 0.25);
-		else if(riverPosition < 0.84)
-			rmRiverSetConnections(unknownRiver, 0.25, 0.0, 0.75, 1.0);
-		else
-			rmRiverSetConnections(unknownRiver, 0.75, 0.0, 0.25, 1.0);
-		
-		// River always has 2 shallows and usually 3
-		rmRiverSetShallowRadius(unknownRiver, rmRandInt(10, 12));
-		rmRiverAddShallow(unknownRiver, rmRandFloat(0.1, 0.35)); 
-
-		if(rmRandFloat(0,1) < 0.66)
-		{
-			rmRiverSetShallowRadius(unknownRiver, rmRandInt(10, 12));
-			rmRiverAddShallow(unknownRiver, 0.5);
-		}
-
-		rmRiverSetShallowRadius(unknownRiver, rmRandInt(10, 12));
-		rmRiverAddShallow(unknownRiver, rmRandFloat(0.65, 0.95));
-		rmRiverSetBankNoiseParams(unknownRiver, 0.07, 2, 1.5, 10.0, 0.667, 3.0);
-
-		rmRiverBuild(unknownRiver);
-	}
-
-// ============= Great Lakes Style Ocean =============
-	else if(landConfig < 0.53)
-	{
-		rmEchoInfo("ocean in middle");
-		allLand = -1;
-		oceanMiddle = 1;
-		blockedMiddle = 1;
-
-		// But don't build ocean every single time
-		if(rmRandFloat(0,1) < 0.9)
-		{
-			int lakeOfTheUnknown=rmCreateArea("big lake in middle");
-			rmSetAreaWaterType(lakeOfTheUnknown, oceanName);
-			if(rmRandFloat(0,1) < 0.6)
-			{
-				rmSetAreaSize(lakeOfTheUnknown, 0.07, 0.15);
-				rmEchoInfo("larger lake");
-			}
-			else
-			{
-				rmSetAreaSize(lakeOfTheUnknown, 0.02, 0.05);
-				rmEchoInfo("smaller lake");
-			}
-			rmSetAreaLocation(lakeOfTheUnknown, 0.5, 0.5);
-			rmAddAreaConstraint(lakeOfTheUnknown, avoidPlayers);
-			rmSetAreaSmoothDistance(lakeOfTheUnknown, 50);
-			rmSetAreaCoherence(lakeOfTheUnknown, 0.25);
-		}
-	} 
-
-// Build the lake later to avoid players
-
-// ============= Saguenay Style Ocean =============
-	else if(landConfig < 0.64)
-	{
-		rmEchoInfo("ocean off center");
-		allLand = -1;
-		oceanOffCenter = 1;
-		float bayPosition = rmRandFloat(0,1);
-		int unknownBay=rmCreateArea("big bay on edge");
-		rmSetAreaWaterType(unknownBay, oceanName);
-		rmSetAreaWarnFailure(unknownBay, false);
-		rmSetAreaSize(unknownBay, 0.08, 0.15);
-
-		// Spin bay randomly around the edge		
-		if(bayPosition < 0.12)
-			rmSetAreaLocation(unknownBay, 0.0, 0.0);
-		else if(bayPosition < 0.24)
-			rmSetAreaLocation(unknownBay, 0.0, 0.5);
-		else if(bayPosition < 0.36)
-			rmSetAreaLocation(unknownBay, 0.0, 1.0);
-		else if(bayPosition < 0.48)
-			rmSetAreaLocation(unknownBay, 0.5, 1.0);
-		else if(bayPosition < 0.60)
-			rmSetAreaLocation(unknownBay, 1.0, 1.0);
-		else if(bayPosition < 0.72)
-			rmSetAreaLocation(unknownBay, 1.0, 0.5);
-		else if(bayPosition < 0.84)
-			rmSetAreaLocation(unknownBay, 1.0, 0.0);
-		else
-			rmSetAreaLocation(unknownBay, 0.5, 0.0);
-
-  		rmSetAreaObeyWorldCircleConstraint(unknownBay, false);
-		rmAddAreaConstraint(unknownBay, avoidPlayers);
-	   rmSetAreaSmoothDistance(unknownBay, 50);
-	   rmSetAreaCoherence(unknownBay, 0.15);
-	}
-
-	// Build bay later to avoid players
-
-// ============= Midgard Style Ocean  =============
-	else if(landConfig < 0.80)
-	{
-		rmEchoInfo("ocean ring");
-		allLand = -1;
-		oceanRing = 1;
-
-		int worldOcean=rmCreateArea("ocean that covers whole map");
-		rmSetAreaWaterType(worldOcean, oceanName);
-		rmSetAreaSize(worldOcean, 1, 1);
-		rmSetAreaLocation(worldOcean, 0.5, 0.5);
-		rmSetAreaWarnFailure(worldOcean, false);
-      rmSetAreaObeyWorldCircleConstraint(worldOcean, false);
-		rmBuildArea(worldOcean);
-
-		int continent=rmCreateArea("island continent in ocean");
-		rmSetAreaMix(continent, landName);
-      rmSetAreaElevationType(continent, cElevTurbulence);
-      rmSetAreaElevationVariation(continent, 4.0);
-      rmSetAreaBaseHeight(continent, 3.5);
-      rmSetAreaElevationMinFrequency(continent, 0.09);
-      rmSetAreaElevationOctaves(continent, 3);
-      rmSetAreaElevationPersistence(continent, 0.2);
-		rmSetAreaElevationNoiseBias(continent, 1);
-		rmSetAreaSize(continent, 0.32, 0.32);
-		rmSetAreaLocation(continent, 0.5, 0.5);
-	   rmSetAreaSmoothDistance(continent, 50);
-	   rmSetAreaCoherence(continent, 0.25);
-		rmAddAreaConstraint(continent, edgeConstraint);
-		rmBuildArea(continent);
-	}
-
-// ============= Sonora Style Plateau / Canyon =============
-	else if(landConfig < 0.90)
-	{
-		rmEchoInfo("plateau in middle");
-		allLand = -1;
-		plateauMiddle = 1;
-		blockedMiddle = 1;
-		int centerMesa=rmCreateArea("large mesa or canyon in middle");
-		rmSetAreaSize(centerMesa, 0.05, 0.12);  
-		rmSetAreaCliffType(centerMesa, cliffName);
-
-		if(rmRandFloat(0,1) < 0.8)
-		{		
-			rmSetAreaCliffEdge(centerMesa, 1, 1.0, 0.1, 1.0, 0);
-			rmAddAreaToClass(centerMesa, classCanyon);
-			rmEchoInfo("no ramps");	
-		}
-		else
-		{
-			rmSetAreaCliffEdge(centerMesa, 4, 0.2, 0.0, 1.0, 0); 
-			rmEchoInfo("ramps");
-		}
-		if(rmRandFloat(0,1) < 0.6)
-			rmSetAreaCliffHeight(centerMesa, rmRandInt(6,8), 1.0, 1.0);
-		else
-			rmSetAreaCliffHeight(centerMesa, rmRandInt(-8,-6), 1.0, 1.0);
-		rmSetAreaMinBlobs(centerMesa, 3);
-		rmSetAreaMaxBlobs(centerMesa, 5);
-		rmSetAreaMinBlobDistance(centerMesa, 3.0);
-		rmSetAreaMaxBlobDistance(centerMesa, 5.0);
-		rmSetAreaCoherence(centerMesa, 0.3);
-		rmSetAreaLocation(centerMesa, 0.5, 0.5);
-	   rmSetAreaSmoothDistance(centerMesa, 20);
-		rmAddAreaConstraint(centerMesa, avoidPlayers); 
-	}
-
-// Build canyon later to avoid players
-
-// ============= Oasis Style Forest =============
-	else
-	{
-		rmEchoInfo("forest in middle");
-		allLand = -1;
-		forestMiddle = 1;
-		int greatUnknownForest=rmCreateArea("large central forest");
-      rmSetAreaWarnFailure(greatUnknownForest, false);
-      rmSetAreaSize(greatUnknownForest, 0.08, 0.08);
-      rmSetAreaForestType(greatUnknownForest, forestName);
-      rmSetAreaForestDensity(greatUnknownForest, 0.8);
-      rmSetAreaForestClumpiness(greatUnknownForest, 0.6);
-      rmSetAreaForestUnderbrush(greatUnknownForest, 0.0);
-      rmSetAreaMinBlobs(greatUnknownForest, 1);
-      rmSetAreaMaxBlobs(greatUnknownForest, 5);
-      rmSetAreaMinBlobDistance(greatUnknownForest, 16.0);
-      rmSetAreaMaxBlobDistance(greatUnknownForest, 70.0);
-      rmSetAreaCoherence(greatUnknownForest, 0.15);
-      rmSetAreaSmoothDistance(greatUnknownForest, 0);
-      rmAddAreaToClass(greatUnknownForest, rmClassID("classForest"));
-		rmSetAreaLocation(greatUnknownForest, 0.5, 0.5);
-      rmAddAreaConstraint(greatUnknownForest, avoidPlayers); 
-	}
-	
-// Build forest later to avoid players
-
-
-	// Text
-   rmSetStatusText("", 0.2);
-
-
-// ============= Player Configurations =============
-
-// Sometimes teams closer together
-
-	if (riverExists == 1)
-	{
-		rmSetTeamSpacingModifier(1.0);
-		rmEchoInfo("Teams spaced normal because of river");
-	}
-	else if (rmRandFloat(0,1) < 0.33)
-	{
-		rmSetTeamSpacingModifier(0.50);
-		rmEchoInfo("Teams close together");
-	}
-	else if (rmRandFloat(0,1) < 0.33)
-	{
-		rmSetTeamSpacingModifier(0.25);
-		rmEchoInfo("Teams very close together");
-	}
-	else
-		rmEchoInfo("Teams spaced normal");
-
-
-	if (oceanMiddle == 1)
-	{
-		rmPlacePlayersCircular(0.38, 0.40, 0);
-		rmEchoInfo("players nearer edge because ocean in middle");
-	}
-	else if(oceanRing == 1)
-	{
-		rmPlacePlayersCircular(0.25, 0.25, 0);
-		rmEchoInfo("players very far from edge because of continent");
-	}
-	else if(oceanOffCenter == 1)
-	{
-		rmPlacePlayersCircular(0.25, 0.25, 0);
-		rmEchoInfo("players very far from edge because of off center bay");
-	}
-	else
-	{
-		rmPlacePlayersCircular(0.27, 0.40, 0);
-		rmEchoInfo("players can be farther from edge");
-	}
-	
-
-	float playerFraction = rmAreaTilesToFraction(1000);
-
-	for(i=1; <cNumberPlayers)
-   {
-      // Create the area.
-      int id=rmCreateArea("Player"+i);
-      // Assign to the player.
-      rmSetPlayerArea(i, id);
-      // Set the size.
-      rmSetAreaSize(id, playerFraction, playerFraction);
-      rmAddAreaToClass(id, classPlayer);
-      rmSetAreaMinBlobs(id, 1);
-      rmSetAreaMaxBlobs(id, 1);
-      rmAddAreaConstraint(id, avoidPlayers);
-		// for testing areas
- //     rmSetAreaTerrainType(id, "rockies\groundsnow1_roc");
-	   rmSetAreaCoherence(id, 0.35);
-	   rmSetAreaSmoothDistance(id, 20);
-		rmAddAreaConstraint(id, playerAvoidImpassableLand);
-		rmSetAreaLocPlayer(id, i);
-		rmSetAreaWarnFailure(id, false);
-   }
-	rmBuildAllAreas();
-
-	// Text
-   rmSetStatusText("", 0.3);
-
-
-// ============= Trade Route =============
-
-
-	int tradeRouteID = rmCreateTradeRoute();
-
-   int socketID=rmCreateObjectDef("sockets for Trade Route");
-
-	float XStart = -1;
-	float ZStart = -1;
-	float XStop = -1;
-	float ZStop = -1;
-	float routePosition = rmRandFloat(0,1);
-
-   rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
-	rmAddObjectDefConstraint(socketID, shortAvoidImpassableLand);
-   rmSetObjectDefAllowOverlap(socketID, true);
-   rmSetObjectDefMinDistance(socketID, 0.0);
-   rmSetObjectDefMaxDistance(socketID, 8.0);
-	rmAddClosestPointConstraint(shortAvoidImpassableLand);
-   vector tradeRoutePoint = cOriginVector;
-
-	// Trade route circular if center mesa or ocean, else linear
-	if(blockedMiddle == 1)
-	{
-		tradeRoutePoint = rmFindClosestPoint(0.08, 0.55, 30);
-		rmAddTradeRouteWaypoint(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)));
-		tradeRoutePoint = rmFindClosestPoint(0.20, 0.83, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.45, 0.93, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.67, 0.89, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.78, 0.78, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.84, 0.70, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.86, 0.68, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.88, 0.40, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.81, 0.23, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.70, 0.10, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.50, 0.08, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.30, 0.15, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.15, 0.23, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.08, 0.55, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-
-	}
-	else // nothing big in middle so go linear
-	{
-		// If continet, scoot linear trade route in a bit
-		if(oceanRing == 1)
-		{
-			// Spin trade route points around edge
-			if(routePosition < 0.12)
-			{
-				XStart = 0.25;
-				ZStart = 0.5;
-				XStop = 0.75;
-				ZStop = 0.5;
-			}
-			else if(routePosition < 0.24)
-			{
-				XStart = 0.25;
-				ZStart = 0.25;
-				XStop = 0.75;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.36)
-			{
-				XStart = 0.5;
-				ZStart = 0.25;
-				XStop = 0.5;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.48)
-			{
-				XStart = 0.25;
-				ZStart = 0.75;
-				XStop = 0.75;
-				ZStop = 0.25;
-			}
-			else if(routePosition < 0.60)
-			{
-				XStart = 0.25;
-				ZStart = 0.25;
-				XStop = 0.75;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.72)
-			{	
-				XStart = 0.25;
-				ZStart = 0.75;
-				XStop = 0.75;
-				ZStop = 0.25;
-			}
-			else if(routePosition < 0.84)
-			{
-				XStart = 0.25;
-				ZStart = 0.25;
-				XStop = 0.75;
-				ZStop = 0.75;
-			}
-			else
-			{
-				XStart = 0.75;
-				ZStart = 0.25;
-				XStop = 0.25;
-				ZStop = 0.75;
-			}
-		}
-		else
-		// Otherwise extend trade route to edge
-		{
-			// Spin trade route points around edge
-			if(routePosition < 0.12)
-			{
-				XStart = 0.0;
-				ZStart = 0.5;
-				XStop = 1.0;
-				ZStop = 0.5;
-			}
-			else if(routePosition < 0.24)
-			{
-				XStart = 0.0;
-				ZStart = 0.0;
-				XStop = 1.0;
-				ZStop = 1.0;
-			}
-			else if(routePosition < 0.36)
-			{
-				XStart = 0.5;
-				ZStart = 0.0;
-				XStop = 0.5;
-				ZStop = 1.0;
-			}
-			else if(routePosition < 0.48)
-			{
-				XStart = 0.0;
-				ZStart = 1.0;
-				XStop = 1.0;
-				ZStop = 0.0;
-			}
-			else if(routePosition < 0.60)
-			{
-				XStart = 0.0;
-				ZStart = 0.25;
-				XStop = 1.0;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.72)
-			{	
-				XStart = 0.0;
-				ZStart = 0.75;
-				XStop = 1.0;
-				ZStop = 0.25;
-			}
-			else if(routePosition < 0.84)
-			{
-				XStart = 0.25;
-				ZStart = 0.0;
-				XStop = 0.75;
-				ZStop = 1.0;
-			}
-			else
-			{
-				XStart = 0.75;
-				ZStart = 0.0;
-				XStop = 0.25;
-				ZStop = 1.0;
-			}
-		}
-
-		// Assign trade route waypoints
-		tradeRoutePoint = rmFindClosestPoint(XStart, ZStart, 100.0);
-		rmAddTradeRouteWaypoint(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)));
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.5, 0.5, 6, 6);
-		tradeRoutePoint = rmFindClosestPoint(XStop, ZStop, 100.0);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-	}	
-
-   bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID, "dirt");
-   if(placedTradeRoute == false)
-      rmEchoError("Failed to place trade route");  
-
-   // add the sockets along the trade route.
-   rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
-   vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.20);
-   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-
-	// If continent, then 2 slots. Otherwise 3 or 4.
-	if(oceanRing < 1)
-	{
-		if(rmRandFloat(0,1) < 0.4)
-		{
-			socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.50);
-			rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-		}
-		else
-		{
-			socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.40);
-			rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-	
-			socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.60);
-			rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-		}
-	}
-
-   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.80);
-   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-
-	rmClearClosestPointConstraints();
-
-
-	// Text
-   rmSetStatusText("", 0.4);
-
-// ============= Starting Units =============
-
-	int startingTCID= rmCreateObjectDef("startingTC");
-	if (rmGetNomadStart())
-		rmAddObjectDefItem(startingTCID, "CoveredWagon", 1);
-	else
-		rmAddObjectDefItem(startingTCID, "townCenter", 1);
-	rmSetObjectDefMinDistance(startingTCID, 0.0);
-	rmSetObjectDefMaxDistance(startingTCID, 20.0);
-	// For FFA, allow more of a float distance.
-	if ( cNumberTeams > 2 )
-	{
-		rmSetObjectDefMaxDistance(startingTCID, 30.0);
-	}
-	rmAddObjectDefConstraint(startingTCID, TCAvoidImpassableLand);
-	rmAddObjectDefConstraint(startingTCID, avoidTradeRoute);
-	rmAddObjectDefConstraint(startingTCID, avoidTradeRouteSocket);
-	rmAddObjectDefToClass(startingTCID, rmClassID("player"));
-
-	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-	rmSetObjectDefMaxDistance(startingUnits, 12.0);
-	rmAddObjectDefConstraint(startingUnits, shortAvoidImpassableLand);
-	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
-
-// Place Starting Units now so other stuff can avoid them
-	for(i=1; <cNumberPlayers)
-	{
-		rmPlaceObjectDefAtLoc(startingTCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-		//rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-	}
-
-	// Text
-   rmSetStatusText("", 0.5);
-
-
-
-// ============= Choose Natives =============
-
-	int ZapotecVillageID = -1;
-	int CaribsVillageID = -1;
-	int CherokeeVillageID = -1;
-	int ComancheVillageID = -1;
-	int CreeVillageID = -1;
-	int IncasVillageID = -1;
-	int KlamathVillageID = -1;
-	int CheyenneVillageID = -1;
-	int MayaVillageID = -1;
-	int NootkaVillageID = -1;
-	int SeminolesVillageID = -1;
-	int TupiVillageID = -1;
-	int NavajoVillageID = -1;
-	int HuronVillageID = -1;
-	int MapucheVillageID = -1;
-
-	float nativeChance = -1;
-
-// Usually 3 to 4, but rarely more or less
-
-	int nativeNumber = rmRandInt(3,4);
-	if(rmRandFloat(0,1) < 0.25)
-		nativeNumber = rmRandInt(5,6);
-	else if(rmRandFloat(0,1) < 0.15)
-		nativeNumber = rmRandInt(1,2);
-	rmEchoInfo("Native number = "+nativeNumber);
-
-// For each native, randomly determine tribe
-
-	for(i = 0; <nativeNumber)
-	{
-		nativeChance = rmRandFloat(0,1);
-		if(nativeChance < 0.06)
-		{
-			rmSetSubCiv(i, "Zapotec");
-			rmEchoInfo("subCiv"+i+" is Zapotec");
-			ZapotecVillageID = rmCreateGrouping("zapotec village "+i, "native zapotec village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(ZapotecVillageID, 0);
-			rmSetGroupingMaxDistance(ZapotecVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(ZapotecVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(ZapotecVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(ZapotecVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidNatives);
-			rmAddGroupingConstraint(ZapotecVillageID, edgeConstraint);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(ZapotecVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.12)
-		{
-			rmSetSubCiv(i, "Caribs");
-			rmEchoInfo("subCiv"+i+" is Caribs");
-			CaribsVillageID = rmCreateGrouping("carib village "+i, "native carib village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CaribsVillageID, 0);
-			rmSetGroupingMaxDistance(CaribsVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CaribsVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CaribsVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CaribsVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CaribsVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CaribsVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CaribsVillageID, avoidNatives);
-			rmAddGroupingConstraint(CaribsVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CaribsVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CaribsVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.18)
-		{
-			rmSetSubCiv(i, "Huron");
-			rmEchoInfo("subCiv"+i+" is Huron");
-			HuronVillageID = rmCreateGrouping("huron village "+i, "native huron village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(HuronVillageID, 0);
-			rmSetGroupingMaxDistance(HuronVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(HuronVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(HuronVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(HuronVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(HuronVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(HuronVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(HuronVillageID, avoidNatives);
-			rmAddGroupingConstraint(HuronVillageID, edgeConstraint);
-			rmAddGroupingConstraint(HuronVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(HuronVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.24)
-		{
-			rmSetSubCiv(i, "Cherokee");
-			rmEchoInfo("subCiv"+i+" is Cherokee");
-			CherokeeVillageID = rmCreateGrouping("cherokee village "+i, "native cherokee village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CherokeeVillageID, 0);
-			rmSetGroupingMaxDistance(CherokeeVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CherokeeVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CherokeeVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CherokeeVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidNatives);
-			rmAddGroupingConstraint(CherokeeVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CherokeeVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.30)
-		{	
-			rmSetSubCiv(i, "Comanche");
-			rmEchoInfo("subCiv"+i+" is Comanche");
-			ComancheVillageID = rmCreateGrouping("comanche village "+i, "native comanche village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(ComancheVillageID, 0);
-			rmSetGroupingMaxDistance(ComancheVillageID, rmXFractionToMeters(0.50));
-			rmAddGroupingToClass(ComancheVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(ComancheVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(ComancheVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(ComancheVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(ComancheVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(ComancheVillageID, avoidNatives);
-			rmAddGroupingConstraint(ComancheVillageID, edgeConstraint);
-			rmAddGroupingConstraint(ComancheVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(ComancheVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.36)
-		{
-			rmSetSubCiv(i, "Cree");
-			rmEchoInfo("subCiv"+i+" is Cree");
-			CreeVillageID = rmCreateGrouping("cree village "+i, "native cree village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CreeVillageID, 0);
-			rmSetGroupingMaxDistance(CreeVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CreeVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CreeVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CreeVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CreeVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CreeVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CreeVillageID, avoidNatives);
-			rmAddGroupingConstraint(CreeVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CreeVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CreeVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.42)
-		{
-			rmSetSubCiv(i, "Incas");
-			rmEchoInfo("subCiv"+i+" is Incas");
-			IncasVillageID = rmCreateGrouping("inca village "+i, "native inca village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(IncasVillageID, 0);
-			rmSetGroupingMaxDistance(IncasVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(IncasVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(IncasVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(IncasVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(IncasVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(IncasVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(IncasVillageID, avoidNatives);
-			rmAddGroupingConstraint(IncasVillageID, edgeConstraint);
-			rmAddGroupingConstraint(IncasVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(IncasVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.48)
-		{
-			rmSetSubCiv(i, "Mapuche");
-			rmEchoInfo("subCiv"+i+" is Mapuche");
-			MapucheVillageID = rmCreateGrouping("mapuche village "+i, "native mapuche village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(MapucheVillageID, 0);
-			rmSetGroupingMaxDistance(MapucheVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(MapucheVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(MapucheVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(MapucheVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(MapucheVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(MapucheVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(MapucheVillageID, avoidNatives);
-			rmAddGroupingConstraint(MapucheVillageID, edgeConstraint);
-			rmAddGroupingConstraint(MapucheVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(MapucheVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.54)
-		{
-			rmSetSubCiv(i, "Klamath");
-			rmEchoInfo("subCiv"+i+" is Klamath");
-			KlamathVillageID = rmCreateGrouping("klamath village "+i, "native klamath village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(KlamathVillageID, 0);
-			rmSetGroupingMaxDistance(KlamathVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(KlamathVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(KlamathVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(KlamathVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(KlamathVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(KlamathVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(KlamathVillageID, avoidNatives);
-			rmAddGroupingConstraint(KlamathVillageID, edgeConstraint);
-			rmAddGroupingConstraint(KlamathVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(KlamathVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.60)
-		{
-			rmSetSubCiv(i, "Cheyenne");
-			rmEchoInfo("subCiv"+i+" is Cheyenne");
-			CheyenneVillageID = rmCreateGrouping("cheyenne village "+i, "native cheyenne village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CheyenneVillageID, 0);
-			rmSetGroupingMaxDistance(CheyenneVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CheyenneVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CheyenneVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CheyenneVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidNatives);
-			rmAddGroupingConstraint(CheyenneVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CheyenneVillageID, 0, 0.5, 0.5);
-		}		
-		else if(nativeChance < 0.66)
-		{
-			rmSetSubCiv(i, "Maya");
-			rmEchoInfo("subCiv"+i+" is Maya");
-			MayaVillageID = rmCreateGrouping("maya village "+i, "native maya village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(MayaVillageID, 0);
-			rmSetGroupingMaxDistance(MayaVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(MayaVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(MayaVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(MayaVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(MayaVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(MayaVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(MayaVillageID, avoidNatives);
-			rmAddGroupingConstraint(MayaVillageID, edgeConstraint);
-			rmAddGroupingConstraint(MayaVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(MayaVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.71)
-		{
-			rmSetSubCiv(i, "Nootka");
-			rmEchoInfo("subCiv"+i+" is Nootka");
-			NootkaVillageID = rmCreateGrouping("nootka village "+i, "native nootka village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(NootkaVillageID, 0);
-			rmSetGroupingMaxDistance(NootkaVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(NootkaVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(NootkaVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(NootkaVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(NootkaVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(NootkaVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(NootkaVillageID, avoidNatives);
-			rmAddGroupingConstraint(NootkaVillageID, edgeConstraint);
-			rmAddGroupingConstraint(NootkaVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(NootkaVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.79)
-		{
-			rmSetSubCiv(i, "Navajo");
-			rmEchoInfo("subCiv"+i+" is Navajo");
-			NavajoVillageID = rmCreateGrouping("navajo village "+i, "native navajo village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(NavajoVillageID, 0);
-			rmSetGroupingMaxDistance(NavajoVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(NavajoVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(NavajoVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(NavajoVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(NavajoVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(NavajoVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(NavajoVillageID, avoidNatives);
-			rmAddGroupingConstraint(NavajoVillageID, edgeConstraint);
-			rmAddGroupingConstraint(NavajoVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(NavajoVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.92)
-		{
-			rmSetSubCiv(i, "Seminoles");
-			rmEchoInfo("subCiv"+i+" is Seminoles");
-			SeminolesVillageID = rmCreateGrouping("seminoles village "+i, "native seminole village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(SeminolesVillageID, 0);
-			rmSetGroupingMaxDistance(SeminolesVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(SeminolesVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(SeminolesVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(SeminolesVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidNatives);
-			rmAddGroupingConstraint(SeminolesVillageID, edgeConstraint);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(SeminolesVillageID, 0, 0.5, 0.5);
-		}		
-		else
-		{
-			rmSetSubCiv(i, "Tupi");
-			rmEchoInfo("subCiv"+i+" is Tupi");
-			TupiVillageID = rmCreateGrouping("tupi village "+i, "native tupi village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(TupiVillageID, 0);
-			rmSetGroupingMaxDistance(TupiVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(TupiVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(TupiVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(TupiVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(TupiVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(TupiVillageID, avoidPlayers);
-			rmAddGroupingConstraint(TupiVillageID, avoidNatives);
-			rmAddGroupingConstraint(TupiVillageID, edgeConstraint);
-			rmAddGroupingConstraint(TupiVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(TupiVillageID, 0, 0.5, 0.5);
-		}	
-	}
-
-
-	// Text
-   rmSetStatusText("", 0.6);
-
-
-// ============= Add Cliffs =============
-
-   int numTries=0;
-   int failCount=0;
-
-	if(oceanRing == 1) // no cliffs for continent
-	{
-		numTries = 0;
-	}
-	else if(allLand == 1) // might have lots of cliffs if land
-	{
-		if(rmRandFloat(0,1) > 0.4)
-			numTries = 8*cNumberNonGaiaPlayers;
-	}
-	else if(plateauMiddle == 1) // might have lots of cliffs if center mesa
-	{
-		if(rmRandFloat(0,1) > 0.7)
-			numTries = 8*cNumberNonGaiaPlayers;
-	}
-	else
-	{
-		numTries = 4*cNumberNonGaiaPlayers;
-	}
-	
-		if(rmRandFloat(0,1) < 0.40) // only do cliffs 40% of the time in any case
-		{		
-			for(i=0; <numTries)
-			{
-				int smallCliffHeight=rmRandInt(0,10);
-				int smallMesaID=rmCreateArea("small cliff "+i);
-				rmSetAreaSize(smallMesaID, rmAreaTilesToFraction(100), rmAreaTilesToFraction(400));
-				rmSetAreaWarnFailure(smallMesaID, false);
-				rmSetAreaCliffType(smallMesaID, cliffName);
-				rmAddAreaToClass(smallMesaID, classCanyon);
-				rmSetAreaCliffEdge(smallMesaID, 1, 1.0, 0.1, 1.0, 0);
-				rmSetAreaCliffHeight(smallMesaID, rmRandInt(6,8), 1.0, 1.0);
-				rmSetAreaMinBlobs(smallMesaID, 3);
-				rmSetAreaMaxBlobs(smallMesaID, 5);
-				rmSetAreaMinBlobDistance(smallMesaID, 3.0);
-				rmSetAreaMaxBlobDistance(smallMesaID, 5.0);
-				rmSetAreaCoherence(smallMesaID, 0.3);
-				rmSetAreaSmoothDistance(smallMesaID, 10);
-				rmAddAreaConstraint(smallMesaID, avoidCanyon);
-				rmAddAreaConstraint(smallMesaID, avoidImpassableLand);
-				rmAddAreaConstraint(smallMesaID, avoidPlayers); 
-				rmAddAreaConstraint(smallMesaID, avoidNatives); 
-				rmAddAreaConstraint(smallMesaID, avoidTradeRouteSocket);
-				rmAddAreaConstraint(smallMesaID, avoidTradeRoute);
-				if(rmBuildArea(smallMesaID)==false)
-				{
-					// Stop trying once we fail 3 times in a row.
-					failCount++;
-					if(failCount==20)
-						break;
-				}
-				else
-					failCount=0;
-			}
-		}
-	
-
-// ============= Add Ponds =============
-
-
-	if(rmRandFloat(0,1) < 0.45)
-	{
-		rmEchoInfo("ponds exist");
-		int numPonds=rmRandInt(2, 5);
-		for(i=0; <numPonds)
-		{
-			int smallPondID=rmCreateArea("small pond "+i);
-			rmSetAreaSize(smallPondID, rmAreaTilesToFraction(170), rmAreaTilesToFraction(400));
-			rmSetAreaWaterType(smallPondID, pondName);
-			rmSetAreaMinBlobs(smallPondID, 1);
-			rmSetAreaMaxBlobs(smallPondID, 5);
-			rmSetAreaBaseHeight(smallPondID, 4);
-			rmSetAreaMinBlobDistance(smallPondID, 5.0);
-			rmSetAreaMaxBlobDistance(smallPondID, 70.0);
-			rmAddAreaToClass(smallPondID, pondClass);
-			rmSetAreaCoherence(smallPondID, 0.5);
-			rmSetAreaSmoothDistance(smallPondID, 5);
-			rmAddAreaConstraint(smallPondID, pondConstraint);
-			rmAddAreaConstraint(smallPondID, avoidPlayers);
-			rmAddAreaConstraint(smallPondID, avoidNatives);
-			rmAddAreaConstraint(smallPondID, mediumAvoidImpassableLand);
-			rmAddAreaConstraint(smallPondID, avoidCanyon);
-			rmAddAreaConstraint(smallPondID, edgeConstraint);
-			rmAddAreaConstraint(smallPondID, avoidTradeRoute);
-			rmSetAreaWarnFailure(smallPondID, false);
-			rmBuildArea(smallPondID);
-		}
-	}
-
-	// Text
-   rmSetStatusText("", 0.7);
-
-// ============= Add Forests =============
-
-	numTries=6*cNumberNonGaiaPlayers;
-	failCount = 0;
-	int sparseForests = -1;
-
-	if(rmRandFloat(0,1) > 0.9)
-	{
-		numTries = 3*cNumberNonGaiaPlayers;
-		rmEchoInfo("sparse forests");
-		sparseForests = 1;
-	}
-
-   for (i=0; <numTries)
-	{   
-      int forest=rmCreateArea("forest "+i);
-      rmSetAreaWarnFailure(forest, false);
-      rmSetAreaSize(forest, rmAreaTilesToFraction(200), rmAreaTilesToFraction(400));
-      rmSetAreaForestType(forest, forestName);
-      rmSetAreaForestDensity(forest, 0.8);
-      rmSetAreaForestClumpiness(forest, 0.6);
-      rmSetAreaForestUnderbrush(forest, 0.0);
-      rmSetAreaMinBlobs(forest, 1);
-      rmSetAreaMaxBlobs(forest, 5);
-      rmSetAreaMinBlobDistance(forest, 16.0);
-      rmSetAreaMaxBlobDistance(forest, 70.0);
-      rmSetAreaCoherence(forest, 0.4);
-      rmSetAreaSmoothDistance(forest, 0);
-      rmAddAreaToClass(forest, rmClassID("classForest")); 
-      rmAddAreaConstraint(forest, forestConstraint);
-      rmAddAreaConstraint(forest, avoidTC);
-      rmAddAreaConstraint(forest, avoidCW);
-      rmAddAreaConstraint(forest, avoidAll);
-      rmAddAreaConstraint(forest, avoidCanyon);
-      rmAddAreaConstraint(forest, mediumAvoidImpassableLand); 
-      rmAddAreaConstraint(forest, avoidTradeRoute);
-
-      if(rmBuildArea(forest)==false)
-      {
-         // Stop trying once we fail 3 times in a row.
-         failCount++;
-         if(failCount==5)
-            break;
-      }
-      else
-         failCount=0; 
-	}
-	
-	// Text
-   rmSetStatusText("", 0.8);
-
-// ============= Starting Resources =============
-
-// Silver
-
-	int playerSilverID = rmCreateObjectDef("player silver");
-	rmAddObjectDefItem(playerSilverID, "mine", 1, 0);
-	rmAddObjectDefConstraint(playerSilverID, avoidTradeRoute);
-	rmSetObjectDefMinDistance(playerSilverID, 18.0);
-	rmSetObjectDefMaxDistance(playerSilverID, 22.0);
-	rmAddObjectDefConstraint(playerSilverID, avoidAll);
-   rmAddObjectDefConstraint(playerSilverID, shortAvoidImpassableLand);
-
-	int playerBerryID=rmCreateObjectDef("player berries");
-   rmAddObjectDefItem(playerBerryID, "berryBush", rmRandInt(2,3), 2.0);
-   rmSetObjectDefMinDistance(playerBerryID, 10);
-   rmSetObjectDefMaxDistance(playerBerryID, 15);
-	rmAddObjectDefConstraint(playerBerryID, avoidAll);
-   rmAddObjectDefConstraint(playerBerryID, shortAvoidImpassableLand);
-
-	int playerTreeID=rmCreateObjectDef("player trees");
-   rmAddObjectDefItem(playerTreeID, treeName, 1, 0.0);
-	rmAddObjectDefConstraint(playerTreeID, avoidTradeRoute);
-   rmSetObjectDefMinDistance(playerTreeID, 8);
-   rmSetObjectDefMaxDistance(playerTreeID, 12);
-	rmAddObjectDefConstraint(playerTreeID, avoidAll);
-   rmAddObjectDefConstraint(playerTreeID, shortAvoidImpassableLand);
-
-   int nearDeerID=rmCreateObjectDef("herds near town");
-   rmAddObjectDefItem(nearDeerID, critterOneName, rmRandInt(8,10), 10.0);
-   rmSetObjectDefMinDistance(nearDeerID, 30);
-   rmSetObjectDefMaxDistance(nearDeerID, 40);
-   rmAddObjectDefConstraint(nearDeerID, avoidFood);
-	rmAddObjectDefConstraint(nearDeerID, avoidAll);
-   rmAddObjectDefConstraint(nearDeerID, avoidImpassableLand);
-   rmSetObjectDefCreateHerd(nearDeerID, true);
-
-	int farDeerID=rmCreateObjectDef("herds far away");
-	int bonusChance=rmRandFloat(0, 1);
-   if(bonusChance<0.5)   
-      rmAddObjectDefItem(farDeerID, critterTwoName, rmRandInt(6,8), 10.0);
-   else
-      rmAddObjectDefItem(farDeerID, critterTwoName, rmRandInt(9,12), 10.0);
-   rmSetObjectDefMinDistance(farDeerID, 100);
-   rmSetObjectDefMaxDistance(farDeerID, rmXFractionToMeters(0.25));
-   rmAddObjectDefConstraint(farDeerID, avoidFood);
-	rmAddObjectDefConstraint(farDeerID, avoidAll);
-	if(oceanRing == 1)
-		rmAddObjectDefConstraint(farDeerID, avoidPlayers);
-	else
-		rmAddObjectDefConstraint(farDeerID, avoidPlayersFar);
-   rmAddObjectDefConstraint(farDeerID, avoidImpassableLand);
-   rmAddObjectDefConstraint(farDeerID, avoidCanyon);
-   rmSetObjectDefCreateHerd(farDeerID, true);
-
-	int nugget1= rmCreateObjectDef("nugget easy"); 
-	rmAddObjectDefItem(nugget1, "Nugget", 1, 0.0);
-	rmSetNuggetDifficulty(1, 1);
-	rmAddObjectDefConstraint(nugget1, shortAvoidImpassableLand);
-  	rmAddObjectDefConstraint(nugget1, avoidNugget);
-  	rmAddObjectDefConstraint(nugget1, avoidTradeRoute);
-  	rmAddObjectDefConstraint(nugget1, avoidAll);
-	rmSetObjectDefMinDistance(nugget1, 40.0);
-	rmSetObjectDefMaxDistance(nugget1, 60.0);
-
-	int nugget2= rmCreateObjectDef("nugget medium"); 
-	rmAddObjectDefItem(nugget2, "Nugget", 1, 0.0);
-	rmSetNuggetDifficulty(2, 2);
-	rmSetObjectDefMinDistance(nugget2, 0.0);
-	rmSetObjectDefMaxDistance(nugget2, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(nugget2, shortAvoidImpassableLand);
-  	rmAddObjectDefConstraint(nugget2, avoidNugget);
-  	rmAddObjectDefConstraint(nugget2, avoidTC);
-  	rmAddObjectDefConstraint(nugget2, avoidCW);
-  	rmAddObjectDefConstraint(nugget2, avoidCanyon);
-  	rmAddObjectDefConstraint(nugget2, avoidTradeRoute);
-  	rmAddObjectDefConstraint(nugget2, avoidAll);
-	rmSetObjectDefMinDistance(nugget2, 80.0);
-	rmSetObjectDefMaxDistance(nugget2, 120.0);
-
-	int waterFlagID=rmCreateObjectDef("HC water flag");
-	int placeWaterFlag = -1;
-	rmAddObjectDefItem(waterFlagID, "HomeCityWaterSpawnFlag", 1, 0.0);
-	rmSetObjectDefMinDistance(waterFlagID, 0.0);
-	rmSetObjectDefMaxDistance(waterFlagID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(waterFlagID, edgeConstraint);
-	rmAddObjectDefConstraint(waterFlagID, flagVsFlag);
-	rmAddObjectDefConstraint(waterFlagID, fishLand);
-
-	// Define a parm for placing water flags on water maps
-	if (oceanMiddle == 1)
-		placeWaterFlag = 1;
-	else if (oceanOffCenter == 1)
-		placeWaterFlag = 1;
-	else if (oceanRing == 1)
-		placeWaterFlag = 1;
-
-	// Now place all these definitions
-
-	float bonusSilverChance = rmRandFloat(0,1);
-	float bonusTreeChance = rmRandFloat(0,1);
-	float bonusNuggetChance1 = rmRandFloat(0,1);
-	float bonusNuggetChance2 = rmRandFloat(0,1);
-	float berryChance = rmRandFloat(0,1);
-	float bonusFoodChance = rmRandFloat(0,1);
-
-	for(i=1; <cNumberPlayers)
-	{
-		vector TCLocation = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startingTCID, i));
-		vector closestPoint = rmFindClosestPointVector(TCLocation, rmXFractionToMeters(1.0));
-
-		rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// SILVER
-		// Always one silver, but possible for 2 or 3
-		rmPlaceObjectDefAtLoc(playerSilverID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusSilverChance > 0.4)
-			rmPlaceObjectDefAtLoc(playerSilverID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusSilverChance > 0.8)
-			rmPlaceObjectDefAtLoc(playerSilverID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		
-		// TREES
-		// Have 4-6 trees, unless sparse
-		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
- 		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusTreeChance > 0.5)
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusTreeChance > 0.8)
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		// If sparse forests, add extra trees
-		if (sparseForests == 1)
-		{
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
- 			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		}
-
-		// NUGGETS
-		// Always 1 of type I. Can have +1 or +2 of type I and +1 or +2 of type II
-		rmPlaceObjectDefAtLoc(nugget1, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance1 > 0.5)
-			rmPlaceObjectDefAtLoc(nugget1, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance1 > 0.9)
-			rmPlaceObjectDefAtLoc(nugget1, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance2 > 0.8)
-			rmPlaceObjectDefAtLoc(nugget2, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance2 > 0.95)
-			rmPlaceObjectDefAtLoc(nugget2, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// FOOD
-		// Always 1 near and 1 far. Sometimes +1 or +2 far.
-		rmPlaceObjectDefAtLoc(nearDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		rmPlaceObjectDefAtLoc(farDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusFoodChance > 0.70)
-			rmPlaceObjectDefAtLoc(farDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusFoodChance > 0.90)
-			rmPlaceObjectDefAtLoc(farDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// BERRIES
-		// 30% of the time
-		if (berryChance > 0.7)
-			rmPlaceObjectDefAtLoc(playerBerryID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-
-    // Monastery
-    if(ypIsAsian(i) && rmGetNomadStart() == false)
-      rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i, 1), i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// WATER FLAG
-		if (placeWaterFlag == 1)
-			rmPlaceObjectDefAtLoc(waterFlagID, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-	}
-
-
-	// Text
-   rmSetStatusText("", 0.9);
-
-
-// ============= Other Resources =============
-
-// Silver
-
-	int silverID = -1;
-	int silverCount = (cNumberNonGaiaPlayers*2 + rmRandInt(3,6));
-	rmEchoInfo("silver count = "+silverCount);
-
-	for(i=0; < silverCount)
-	{
-      silverID = rmCreateObjectDef("silver "+i);
-	   rmAddObjectDefItem(silverID, "mine", 1, 0.0);
-      rmSetObjectDefMinDistance(silverID, 0.0);
-      rmSetObjectDefMaxDistance(silverID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(silverID, avoidSilver);
-      rmAddObjectDefConstraint(silverID, avoidAll);
-		if(oceanRing == 1)
-			rmAddObjectDefConstraint(silverID, avoidPlayers);
-		else
-			rmAddObjectDefConstraint(silverID, avoidPlayersFar);
-      rmAddObjectDefConstraint(silverID, avoidImpassableLand);
-      rmAddObjectDefConstraint(silverID, avoidTradeRoute);
-		rmPlaceObjectDefAtLoc(silverID, 0, 0.5, 0.5);
-   }
-
-// Livestock
-
-	int sheepID=rmCreateObjectDef("livestock");
-	rmAddObjectDefItem(sheepID, livestockName, 2, 4.0);
-	rmSetObjectDefMinDistance(sheepID, 0.0);
-	rmSetObjectDefMaxDistance(sheepID, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(sheepID, avoidFood);
-	rmAddObjectDefConstraint(sheepID, avoidAll);
-	if(oceanRing == 1)
-		rmAddObjectDefConstraint(sheepID, avoidPlayers);
-	else
-		rmAddObjectDefConstraint(sheepID, avoidPlayersFar);
-	rmAddObjectDefConstraint(sheepID, avoidCanyon);
-	rmAddObjectDefConstraint(sheepID, avoidImpassableLand);
-	if(rmRandFloat(0,1) > 0.85)
-		rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*2);
-
-// Treasures
-   
-	int nugget3= rmCreateObjectDef("nugget hard"); 
-	rmAddObjectDefItem(nugget3, "Nugget", 1, 0.0);
-	rmSetNuggetDifficulty(3, 3);
-	rmSetObjectDefMinDistance(nugget3, 0.0);
-	rmSetObjectDefMaxDistance(nugget3, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(nugget3, shortAvoidImpassableLand);
-  	rmAddObjectDefConstraint(nugget3, avoidNugget);
-  	rmAddObjectDefConstraint(nugget3, avoidPlayersFar);
-  	rmAddObjectDefConstraint(nugget3, avoidTradeRoute);
-  	rmAddObjectDefConstraint(nugget3, avoidAll);
-	if(rmRandFloat(0,1) < 0.7)
-		rmPlaceObjectDefAtLoc(nugget3, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
-	else
-		rmPlaceObjectDefAtLoc(nugget3, 0, 0.5, 0.5, cNumberNonGaiaPlayers*rmRandInt(2,4));
-
-	if (rmRandFloat(0,1) > 0.9)
-	{
-		int nugget4= rmCreateObjectDef("nugget nuts"); 
-		rmAddObjectDefItem(nugget4, "Nugget", 1, 0.0);
-		rmSetNuggetDifficulty(4, 4);
-		rmSetObjectDefMinDistance(nugget4, 0.0);
-		rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(nugget4, shortAvoidImpassableLand);
-  		rmAddObjectDefConstraint(nugget4, avoidNugget);
-  		rmAddObjectDefConstraint(nugget4, avoidPlayersFar);
-  		rmAddObjectDefConstraint(nugget4, avoidTradeRoute);
-  		rmAddObjectDefConstraint(nugget4, avoidAll);
-		rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(0,5));
-	}
-
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
-
-  // check for KOTH game mode
-  if(rmGetIsKOTH()) {
-    
-    int randLoc = rmRandInt(1,3);
-    float xLoc = 0.5;
-    float yLoc = 0.5;
-    float walk = 0.05;
-    
-    //~ if(randLoc == 1 && blockedMiddle != 1)
-      //~ yLoc = .5;
-      
-    //~ if(cNumberTeams > 2 && blockedMiddle != 1) {
-      //~ yLoc = rmRandFloat(.25, .75);
-      //~ walk = 0.25;
-    //~ }
-    
-    //~ else if(cNumberTeams > 2){
-      //~ yLoc = .3;
-      //~ walk = 0.5;
-    //~ }
-    
-    ypKingsHillPlacer(xLoc, yLoc, walk, avoidCanyon);
-    rmEchoInfo("XLOC = "+xLoc);
-    rmEchoInfo("XLOC = "+yLoc);
-  }
-
-  // Water nuggets
-  
-  int nuggetW= rmCreateObjectDef("nugget water"); 
-  rmAddObjectDefItem(nuggetW, "ypNuggetBoat", 1, 0.0);
-  rmSetNuggetDifficulty(5, 5);
-  rmSetObjectDefMinDistance(nuggetW, rmXFractionToMeters(0.0));
-  rmSetObjectDefMaxDistance(nuggetW, rmXFractionToMeters(0.5));
-  rmAddObjectDefConstraint(nuggetW, avoidLand);
-  rmAddObjectDefConstraint(nuggetW, avoidNuggetWater);
-  rmPlaceObjectDefAtLoc(nuggetW, 0, 0.5, 0.5, cNumberNonGaiaPlayers*4);
-    
-	// Text
-	rmSetStatusText("",0.99);
-
-// add fish if ocean
-	if (placeWaterFlag == 1)
-	{
-		int fishID=rmCreateObjectDef("fish");
-		rmAddObjectDefItem(fishID, fishName, 1, 0.0);
-		rmSetObjectDefMinDistance(fishID, 0.0);
-		rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(fishID, fishVsFishID);
-		rmAddObjectDefConstraint(fishID, fishLand);
-		rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
-
-		int whaleID=rmCreateObjectDef("whale");
-		rmAddObjectDefItem(whaleID, whaleName, 1, 9.0);
-		rmSetObjectDefMinDistance(whaleID, 0.0);
-		rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(whaleID, whaleVsWhaleID);
-		rmAddObjectDefConstraint(whaleID, whaleLand);
-		if(rmRandFloat(0,1) < 0.5)
-			rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
-	}
-
-  // Text
-   rmSetStatusText("",1.0);
-
-	// DONE!!!!
-
-
-}
\ No newline at end of file
diff --git a/RMM/unknownstranded.xs b/RMM/unknownstranded.xs
deleted file mode 100644
index 02ab893..0000000
--- a/RMM/unknownstranded.xs
+++ /dev/null
@@ -1,1583 +0,0 @@
-// Land Unknown adapted to Rocket
-// ver 11 Jan 2005
-
-include "ypAsianInclude.xs";
-include "ypKOTHInclude.xs";
-
-void main(void)
-{
-
-  // Text
-   rmSetStatusText("",0.01);
-
-  // Set size.
-
-   int playerTiles=12000;
-
-   	if(rmRandFloat(0,1) > 0.25)
-	{
-		playerTiles=16000;
-		rmEchoInfo("Extra large map");
-	}
-	int size=2.0*sqrt(cNumberNonGaiaPlayers*playerTiles);
-	rmEchoInfo("Map size="+size+"m x "+size+"m");
-	rmSetMapSize(size, size);
-	rmSetMapElevationParameters(cElevTurbulence, 0.02, rmRandFloat(2, 4), 0.7, 8.0);
-
-// ============= Base terrain ============= 
-
-	float baseTerrain = rmRandFloat(0,1);
-	int amazonMap = -1;
-	int carolinaMap = -1;
-	int saguenayMap = -1;
-	int rockiesMap = -1;
-	int sonoraMap = -1;
-	string riverName = "";
-	string oceanName = "";
-	string pondName = "";
-	string cliffName = "";
-	string forestName = "";
-	string landName = "";
-	string treeName = "";
-	string critterOneName = "";
-	string critterTwoName = "";
-	string livestockName = "";
-	string fishName = "";
-	string whaleName = "";
-
-	if(baseTerrain < 0.2)
-	{
-		rmEchoInfo("Amazon terrain");
-		amazonMap = 1;
-		rmSetBaseTerrainMix("amazon grass");
-		rmTerrainInitialize("pampas\ground5_pam", 6);
-		rmSetMapType("yucatan");
-		rmSetMapType("tropical");
-		rmSetMapType("land");
-	   rmSetLightingSet("amazon");
-		riverName = "Amazon River";
-		oceanName = "Amazon River Basin";
-		pondName = "Bayou";
-		cliffName = "Amazon";
-		forestName = "Amazon Rain Forest";
-		landName = "amazon grass";
-		treeName = "treeAmazon";
-		critterOneName = "capybara";
-		critterTwoName = "tapir";
-		livestockName = "cow";
-		fishName = "fishMahi";
-		whaleName = "humpbackWhale";
-	}
-
-	else if(baseTerrain < 0.4)
-	{
-		rmEchoInfo("Carolina terrain");
-		carolinaMap = 1;
-		rmSetBaseTerrainMix("carolina_grass");
-		rmTerrainInitialize("pampas\ground5_pam", 6);
-		rmSetMapType("carolina");
-		rmSetMapType("grass");
-		rmSetMapType("land");
-		rmSetLightingSet("carolina");
-		riverName = "Pampas River";
-		oceanName = "Atlantic Coast";
-		pondName = "Texas Pond";
-		cliffName = "Carolina Inland";
-		forestName = "Carolina Pine Forest";
-		landName = "carolina_grass";
-		treeName = "treeCarolinaGrass";
-		critterOneName = "turkey";
-		critterTwoName = "deer";
-		livestockName = "sheep";
-		fishName = "fishCod";
-		whaleName = "humpbackWhale";
-	}
-
-	else if(baseTerrain < 0.6)
-	{
-		rmEchoInfo("Saguenay terrain");
-		saguenayMap = 1;
-		rmSetBaseTerrainMix("saguenay tundra");
-		rmTerrainInitialize("saguenay\ground1_sag",6);
-		rmSetMapType("saguenay");
-		rmSetMapType("grass");
-		rmSetMapType("land");
-	   rmSetLightingSet("saguenay");
-		riverName = "Amazon River";
-		oceanName = "Hudson Bay";
-		pondName = "Saguenay Lake";
-		cliffName = "New England Inland";
-		forestName = "Saguenay Forest";
-		landName = "saguenay tundra";
-		treeName = "treeSaguenay";
-		critterOneName = "elk";
-		critterTwoName = "moose";
-		livestockName = "sheep";
-		fishName = "fishSalmon";
-		whaleName = "minkeWhale";
-	}
-
-	else if(baseTerrain < 0.8)
-	{
-		rmEchoInfo("Rockies terrain");
-		rockiesMap = 1;
-		rmSetBaseTerrainMix("rockies_snow");
-		rmTerrainInitialize("rockies\groundsnow1_roc", 6);	
-		rmSetMapType("rockies");
-		rmSetMapType("land");
-		rmSetLightingSet("rockies");
-		riverName = "Yukon River";
-		oceanName = "Great Lakes Ice";
-		pondName = "Great Lakes Ice";
-		cliffName = "Rocky Mountain2";
-		forestName = "Rockies Snow Forest";
-		landName = "rockies_snow";
-		treeName = "treeRockies";
-		critterOneName = "caribou";
-		critterTwoName = "muskOx";
-		livestockName = "cow";
-		fishName = "fishSardine";
-		whaleName = "beluga";
-	}
-
-	else
-	{
-		rmEchoInfo("Sonora terrain");
-		sonoraMap = 1;
-		rmSetBaseTerrainMix("sonora_dirt");
-		rmTerrainInitialize("sonora\ground2_son", 6);
-		rmSetMapType("sonora");
-		rmSetMapType("grass");
-		rmSetMapType("land");
-		rmSetLightingSet("Sonora");
-		riverName = "Pampas River";
-		oceanName = "Great Lakes";
-		pondName = "Great Lakes"; 
-		cliffName = "Sonora";
-		forestName = "Sonora Forest";
-		landName = "sonora_dirt";
-		treeName = "treeSonora";
-		critterOneName = "turkey";
-		critterTwoName = "rhea";
-		livestockName = "llama";
-		fishName = "fishTarpon";
-		whaleName = "humpbackWhale";
-
-	}
-
-	// Text
-   rmSetStatusText("", 0.1);
-
-
-
-// ============= Classes =============
-
-	int classPlayer=rmDefineClass("player");
-	int classNatives=rmDefineClass("natives");
-	int classCanyon=rmDefineClass("canyon");
-	int pondClass=rmDefineClass("pond");
-	rmDefineClass("startingUnit");
-	rmDefineClass("classForest");
-
-
-
-// ============= Constraints =============
-
-	int avoidImpassableLand = rmCreateTerrainDistanceConstraint("avoid impassable land", "Land", false, 24.0);
-	int playerAvoidImpassableLand = rmCreateTerrainDistanceConstraint("player avoid impassable land", "Land", false, 18.0);
-	int mediumAvoidImpassableLand = rmCreateTerrainDistanceConstraint("slightly avoid impassable", "Land", false, 12.0);
-	int shortAvoidImpassableLand = rmCreateTerrainDistanceConstraint("just barely avoid impassable", "Land", false, 4.0);
-	int TCAvoidImpassableLand = rmCreateTerrainDistanceConstraint("TCs vs impassable land", "Land", false, 8.0);
-	int avoidPlayers = rmCreateClassDistanceConstraint("stay away from players medium", classPlayer, 15.0);
-	int avoidPlayersFar = rmCreateClassDistanceConstraint("stay away from players far", classPlayer, 50.0);
-	int avoidTradeRoute = rmCreateTradeRouteDistanceConstraint("trade route", 10.0);
-	int avoidTradeRouteSocket = rmCreateTypeDistanceConstraint("avoid trade route sockets", "sockettraderoute", 15.0);
-	int avoidNatives = rmCreateClassDistanceConstraint("stay away from natives", classNatives, 60.0);
-	int nativesAvoidPlayers = rmCreateClassDistanceConstraint("natives vs. players", classPlayer, 50.0);
-   int edgeConstraint=rmCreatePieConstraint("continent avoids edge",  0.5, 0.5, 0, rmGetMapXSize()-30, 0, 0, 0);
-	int avoidCanyon = rmCreateClassDistanceConstraint("don't place on mesa where you can't path", classCanyon, 2.0);
-   int pondConstraint=rmCreateClassDistanceConstraint("ponds avoid ponds", rmClassID("pond"), 30.0);
-   int forestConstraint=rmCreateClassDistanceConstraint("forest vs. forest", rmClassID("classForest"), 20.0);
-	int avoidTC=rmCreateTypeDistanceConstraint("vs. TC", "TownCenter", 20.0);
-	int avoidCW=rmCreateTypeDistanceConstraint("vs. CW", "CoveredWagon", 20.0);
-   int avoidNugget=rmCreateTypeDistanceConstraint("nugget avoid nugget", "abstractNugget", 30.0);
-   int fishVsFishID=rmCreateTypeDistanceConstraint("fish v fish", "abstractFish", 10.0);
-   int whaleVsWhaleID=rmCreateTypeDistanceConstraint("whale v whale", "abstractWhale", 25.0);
-   int fishLand = rmCreateTerrainDistanceConstraint("fish land", "land", true, 6.0);
-   int whaleLand = rmCreateTerrainDistanceConstraint("whale v. land", "land", true, 20.0);
-	int flagVsFlag = rmCreateTypeDistanceConstraint("flag avoid same", "HomeCityWaterSpawnFlag", 20);
-   int avoidFood = rmCreateTypeDistanceConstraint("food avoids food", "food", 40.0);
-	int avoidSilver = rmCreateTypeDistanceConstraint("fast coin avoids coin", "gold", 40.0);
-   int avoidNuggetWater=rmCreateTypeDistanceConstraint("nugget vs. nugget water", "AbstractNugget", 80.0);
-   int avoidLand = rmCreateTerrainDistanceConstraint("ship avoid land", "land", true, 15.0);
-
-   int avoidAll=rmCreateTypeDistanceConstraint("avoid all", "all", 4.0);
-
-
-
-// ============= Land and Water Configuration =============
-
-	int allLand = 1;
-	int riverExists = -1;
-	int oceanMiddle = -1;
-	int oceanOffCenter = -1;
-	int oceanRing = -1;
-	int plateauMiddle = -1;
-	int forestMiddle = -1;
-	int blockedMiddle = -1; // used to determine if trade route should be a circle
-	
-	float landConfig = rmRandFloat(0,1);
-
-// temp for testing XXXXXXXXXXXXXXXXXXXXX
-
-	//~ landConfig = 0.95;
-  if(rmGetIsKOTH()){
-  
-    if(landConfig < 0.5)
-      landConfig = rmRandFloat(0, 0.34);
-
-    else 
-      landConfig = rmRandFloat(0.54, 0.78);
-  }
-
-// ============= Land Only =============
-	if(landConfig < 0.25)
-		rmEchoInfo("just land");
-
-// ============= River Across Middle =============
-	else if(landConfig < 0.35)
-	{
-		rmEchoInfo("river exists");
-		allLand = -1;
-		riverExists = 1;
-		int unknownRiver = rmRiverCreate(-1, riverName, 30, 15, 5, 8);
-		float riverPosition = rmRandFloat(0,1);
-
-		// Spin river randomly around the edge		
-		if(riverPosition < 0.12)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.5, 1.0, 0.5);
-		else if(riverPosition < 0.24)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.0, 1.0, 1.0);
-		else if(riverPosition < 0.36)
-			rmRiverSetConnections(unknownRiver, 0.5, 0.0, 0.5, 1.0);
-		else if(riverPosition < 0.48)
-			rmRiverSetConnections(unknownRiver, 0.0, 1.0, 1.0, 0.0);
-		else if(riverPosition < 0.60)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.25, 1.0, 0.75);
-		else if(riverPosition < 0.72)
-			rmRiverSetConnections(unknownRiver, 0.0, 0.75, 1.0, 0.25);
-		else if(riverPosition < 0.84)
-			rmRiverSetConnections(unknownRiver, 0.25, 0.0, 0.75, 1.0);
-		else
-			rmRiverSetConnections(unknownRiver, 0.75, 0.0, 0.25, 1.0);
-		
-		// River always has 2 shallows and usually 3
-		rmRiverSetShallowRadius(unknownRiver, rmRandInt(10, 12));
-		rmRiverAddShallow(unknownRiver, rmRandFloat(0.1, 0.35)); 
-
-		if(rmRandFloat(0,1) < 0.66)
-		{
-			rmRiverSetShallowRadius(unknownRiver, rmRandInt(10, 12));
-			rmRiverAddShallow(unknownRiver, 0.5);
-		}
-
-		rmRiverSetShallowRadius(unknownRiver, rmRandInt(10, 12));
-		rmRiverAddShallow(unknownRiver, rmRandFloat(0.65, 0.95));
-		rmRiverSetBankNoiseParams(unknownRiver, 0.07, 2, 1.5, 10.0, 0.667, 3.0);
-
-		rmRiverBuild(unknownRiver);
-	}
-
-// ============= Great Lakes Style Ocean =============
-	else if(landConfig < 0.53)
-	{
-		rmEchoInfo("ocean in middle");
-		allLand = -1;
-		oceanMiddle = 1;
-		blockedMiddle = 1;
-
-		// But don't build ocean every single time
-		if(rmRandFloat(0,1) < 0.9)
-		{
-			int lakeOfTheUnknown=rmCreateArea("big lake in middle");
-			rmSetAreaWaterType(lakeOfTheUnknown, oceanName);
-			if(rmRandFloat(0,1) < 0.6)
-			{
-				rmSetAreaSize(lakeOfTheUnknown, 0.07, 0.15);
-				rmEchoInfo("larger lake");
-			}
-			else
-			{
-				rmSetAreaSize(lakeOfTheUnknown, 0.02, 0.05);
-				rmEchoInfo("smaller lake");
-			}
-			rmSetAreaLocation(lakeOfTheUnknown, 0.5, 0.5);
-			rmAddAreaConstraint(lakeOfTheUnknown, avoidPlayers);
-			rmSetAreaSmoothDistance(lakeOfTheUnknown, 50);
-			rmSetAreaCoherence(lakeOfTheUnknown, 0.25);
-		}
-	} 
-
-// Build the lake later to avoid players
-
-// ============= Saguenay Style Ocean =============
-	else if(landConfig < 0.64)
-	{
-		rmEchoInfo("ocean off center");
-		allLand = -1;
-		oceanOffCenter = 1;
-		float bayPosition = rmRandFloat(0,1);
-		int unknownBay=rmCreateArea("big bay on edge");
-		rmSetAreaWaterType(unknownBay, oceanName);
-		rmSetAreaWarnFailure(unknownBay, false);
-		rmSetAreaSize(unknownBay, 0.08, 0.15);
-
-		// Spin bay randomly around the edge		
-		if(bayPosition < 0.12)
-			rmSetAreaLocation(unknownBay, 0.0, 0.0);
-		else if(bayPosition < 0.24)
-			rmSetAreaLocation(unknownBay, 0.0, 0.5);
-		else if(bayPosition < 0.36)
-			rmSetAreaLocation(unknownBay, 0.0, 1.0);
-		else if(bayPosition < 0.48)
-			rmSetAreaLocation(unknownBay, 0.5, 1.0);
-		else if(bayPosition < 0.60)
-			rmSetAreaLocation(unknownBay, 1.0, 1.0);
-		else if(bayPosition < 0.72)
-			rmSetAreaLocation(unknownBay, 1.0, 0.5);
-		else if(bayPosition < 0.84)
-			rmSetAreaLocation(unknownBay, 1.0, 0.0);
-		else
-			rmSetAreaLocation(unknownBay, 0.5, 0.0);
-
-  		rmSetAreaObeyWorldCircleConstraint(unknownBay, false);
-		rmAddAreaConstraint(unknownBay, avoidPlayers);
-	   rmSetAreaSmoothDistance(unknownBay, 50);
-	   rmSetAreaCoherence(unknownBay, 0.15);
-	}
-
-	// Build bay later to avoid players
-
-// ============= Midgard Style Ocean  =============
-	else if(landConfig < 0.80)
-	{
-		rmEchoInfo("ocean ring");
-		allLand = -1;
-		oceanRing = 1;
-
-		int worldOcean=rmCreateArea("ocean that covers whole map");
-		rmSetAreaWaterType(worldOcean, oceanName);
-		rmSetAreaSize(worldOcean, 1, 1);
-		rmSetAreaLocation(worldOcean, 0.5, 0.5);
-		rmSetAreaWarnFailure(worldOcean, false);
-      rmSetAreaObeyWorldCircleConstraint(worldOcean, false);
-		rmBuildArea(worldOcean);
-
-		int continent=rmCreateArea("island continent in ocean");
-		rmSetAreaMix(continent, landName);
-      rmSetAreaElevationType(continent, cElevTurbulence);
-      rmSetAreaElevationVariation(continent, 4.0);
-      rmSetAreaBaseHeight(continent, 3.5);
-      rmSetAreaElevationMinFrequency(continent, 0.09);
-      rmSetAreaElevationOctaves(continent, 3);
-      rmSetAreaElevationPersistence(continent, 0.2);
-		rmSetAreaElevationNoiseBias(continent, 1);
-		rmSetAreaSize(continent, 0.32, 0.32);
-		rmSetAreaLocation(continent, 0.5, 0.5);
-	   rmSetAreaSmoothDistance(continent, 50);
-	   rmSetAreaCoherence(continent, 0.25);
-		rmAddAreaConstraint(continent, edgeConstraint);
-		rmBuildArea(continent);
-	}
-
-// ============= Sonora Style Plateau / Canyon =============
-	else if(landConfig < 0.90)
-	{
-		rmEchoInfo("plateau in middle");
-		allLand = -1;
-		plateauMiddle = 1;
-		blockedMiddle = 1;
-		int centerMesa=rmCreateArea("large mesa or canyon in middle");
-		rmSetAreaSize(centerMesa, 0.05, 0.12);  
-		rmSetAreaCliffType(centerMesa, cliffName);
-
-		if(rmRandFloat(0,1) < 0.8)
-		{		
-			rmSetAreaCliffEdge(centerMesa, 1, 1.0, 0.1, 1.0, 0);
-			rmAddAreaToClass(centerMesa, classCanyon);
-			rmEchoInfo("no ramps");	
-		}
-		else
-		{
-			rmSetAreaCliffEdge(centerMesa, 4, 0.2, 0.0, 1.0, 0); 
-			rmEchoInfo("ramps");
-		}
-		if(rmRandFloat(0,1) < 0.6)
-			rmSetAreaCliffHeight(centerMesa, rmRandInt(6,8), 1.0, 1.0);
-		else
-			rmSetAreaCliffHeight(centerMesa, rmRandInt(-8,-6), 1.0, 1.0);
-		rmSetAreaMinBlobs(centerMesa, 3);
-		rmSetAreaMaxBlobs(centerMesa, 5);
-		rmSetAreaMinBlobDistance(centerMesa, 3.0);
-		rmSetAreaMaxBlobDistance(centerMesa, 5.0);
-		rmSetAreaCoherence(centerMesa, 0.3);
-		rmSetAreaLocation(centerMesa, 0.5, 0.5);
-	   rmSetAreaSmoothDistance(centerMesa, 20);
-		rmAddAreaConstraint(centerMesa, avoidPlayers); 
-	}
-
-// Build canyon later to avoid players
-
-// ============= Oasis Style Forest =============
-	else
-	{
-		rmEchoInfo("forest in middle");
-		allLand = -1;
-		forestMiddle = 1;
-		int greatUnknownForest=rmCreateArea("large central forest");
-      rmSetAreaWarnFailure(greatUnknownForest, false);
-      rmSetAreaSize(greatUnknownForest, 0.08, 0.08);
-      rmSetAreaForestType(greatUnknownForest, forestName);
-      rmSetAreaForestDensity(greatUnknownForest, 0.8);
-      rmSetAreaForestClumpiness(greatUnknownForest, 0.6);
-      rmSetAreaForestUnderbrush(greatUnknownForest, 0.0);
-      rmSetAreaMinBlobs(greatUnknownForest, 1);
-      rmSetAreaMaxBlobs(greatUnknownForest, 5);
-      rmSetAreaMinBlobDistance(greatUnknownForest, 16.0);
-      rmSetAreaMaxBlobDistance(greatUnknownForest, 70.0);
-      rmSetAreaCoherence(greatUnknownForest, 0.15);
-      rmSetAreaSmoothDistance(greatUnknownForest, 0);
-      rmAddAreaToClass(greatUnknownForest, rmClassID("classForest"));
-		rmSetAreaLocation(greatUnknownForest, 0.5, 0.5);
-      rmAddAreaConstraint(greatUnknownForest, avoidPlayers); 
-	}
-	
-// Build forest later to avoid players
-
-
-	// Text
-   rmSetStatusText("", 0.2);
-
-
-// ============= Player Configurations =============
-
-// Sometimes teams closer together
-
-	if (riverExists == 1)
-	{
-		rmSetTeamSpacingModifier(1.0);
-		rmEchoInfo("Teams spaced normal because of river");
-	}
-	else if (rmRandFloat(0,1) < 0.33)
-	{
-		rmSetTeamSpacingModifier(0.50);
-		rmEchoInfo("Teams close together");
-	}
-	else if (rmRandFloat(0,1) < 0.33)
-	{
-		rmSetTeamSpacingModifier(0.25);
-		rmEchoInfo("Teams very close together");
-	}
-	else
-		rmEchoInfo("Teams spaced normal");
-
-
-	if (oceanMiddle == 1)
-	{
-		rmPlacePlayersCircular(0.38, 0.40, 0);
-		rmEchoInfo("players nearer edge because ocean in middle");
-	}
-	else if(oceanRing == 1)
-	{
-		rmPlacePlayersCircular(0.25, 0.25, 0);
-		rmEchoInfo("players very far from edge because of continent");
-	}
-	else if(oceanOffCenter == 1)
-	{
-		rmPlacePlayersCircular(0.25, 0.25, 0);
-		rmEchoInfo("players very far from edge because of off center bay");
-	}
-	else
-	{
-		rmPlacePlayersCircular(0.27, 0.40, 0);
-		rmEchoInfo("players can be farther from edge");
-	}
-	
-
-	float playerFraction = rmAreaTilesToFraction(1000);
-
-	for(i=1; <cNumberPlayers)
-   {
-      // Create the area.
-      int id=rmCreateArea("Player"+i);
-      // Assign to the player.
-      rmSetPlayerArea(i, id);
-      // Set the size.
-      rmSetAreaSize(id, playerFraction, playerFraction);
-      rmAddAreaToClass(id, classPlayer);
-      rmSetAreaMinBlobs(id, 1);
-      rmSetAreaMaxBlobs(id, 1);
-      rmAddAreaConstraint(id, avoidPlayers);
-		// for testing areas
- //     rmSetAreaTerrainType(id, "rockies\groundsnow1_roc");
-	   rmSetAreaCoherence(id, 0.35);
-	   rmSetAreaSmoothDistance(id, 20);
-		rmAddAreaConstraint(id, playerAvoidImpassableLand);
-		rmSetAreaLocPlayer(id, i);
-		rmSetAreaWarnFailure(id, false);
-   }
-	rmBuildAllAreas();
-
-	// Text
-   rmSetStatusText("", 0.3);
-
-
-// ============= Trade Route =============
-
-
-	int tradeRouteID = rmCreateTradeRoute();
-
-   int socketID=rmCreateObjectDef("sockets for Trade Route");
-
-	float XStart = -1;
-	float ZStart = -1;
-	float XStop = -1;
-	float ZStop = -1;
-	float routePosition = rmRandFloat(0,1);
-
-   rmAddObjectDefItem(socketID, "SocketTradeRoute", 1, 0.0);
-	rmAddObjectDefConstraint(socketID, shortAvoidImpassableLand);
-   rmSetObjectDefAllowOverlap(socketID, true);
-   rmSetObjectDefMinDistance(socketID, 0.0);
-   rmSetObjectDefMaxDistance(socketID, 8.0);
-	rmAddClosestPointConstraint(shortAvoidImpassableLand);
-   vector tradeRoutePoint = cOriginVector;
-
-	// Trade route circular if center mesa or ocean, else linear
-	if(blockedMiddle == 1)
-	{
-		tradeRoutePoint = rmFindClosestPoint(0.08, 0.55, 30);
-		rmAddTradeRouteWaypoint(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)));
-		tradeRoutePoint = rmFindClosestPoint(0.20, 0.83, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.45, 0.93, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.67, 0.89, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.78, 0.78, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.84, 0.70, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.86, 0.68, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.88, 0.40, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.81, 0.23, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.70, 0.10, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.50, 0.08, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.30, 0.15, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.15, 0.23, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-		tradeRoutePoint = rmFindClosestPoint(0.08, 0.55, 30);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-
-	}
-	else // nothing big in middle so go linear
-	{
-		// If continet, scoot linear trade route in a bit
-		if(oceanRing == 1)
-		{
-			// Spin trade route points around edge
-			if(routePosition < 0.12)
-			{
-				XStart = 0.25;
-				ZStart = 0.5;
-				XStop = 0.75;
-				ZStop = 0.5;
-			}
-			else if(routePosition < 0.24)
-			{
-				XStart = 0.25;
-				ZStart = 0.25;
-				XStop = 0.75;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.36)
-			{
-				XStart = 0.5;
-				ZStart = 0.25;
-				XStop = 0.5;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.48)
-			{
-				XStart = 0.25;
-				ZStart = 0.75;
-				XStop = 0.75;
-				ZStop = 0.25;
-			}
-			else if(routePosition < 0.60)
-			{
-				XStart = 0.25;
-				ZStart = 0.25;
-				XStop = 0.75;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.72)
-			{	
-				XStart = 0.25;
-				ZStart = 0.75;
-				XStop = 0.75;
-				ZStop = 0.25;
-			}
-			else if(routePosition < 0.84)
-			{
-				XStart = 0.25;
-				ZStart = 0.25;
-				XStop = 0.75;
-				ZStop = 0.75;
-			}
-			else
-			{
-				XStart = 0.75;
-				ZStart = 0.25;
-				XStop = 0.25;
-				ZStop = 0.75;
-			}
-		}
-		else
-		// Otherwise extend trade route to edge
-		{
-			// Spin trade route points around edge
-			if(routePosition < 0.12)
-			{
-				XStart = 0.0;
-				ZStart = 0.5;
-				XStop = 1.0;
-				ZStop = 0.5;
-			}
-			else if(routePosition < 0.24)
-			{
-				XStart = 0.0;
-				ZStart = 0.0;
-				XStop = 1.0;
-				ZStop = 1.0;
-			}
-			else if(routePosition < 0.36)
-			{
-				XStart = 0.5;
-				ZStart = 0.0;
-				XStop = 0.5;
-				ZStop = 1.0;
-			}
-			else if(routePosition < 0.48)
-			{
-				XStart = 0.0;
-				ZStart = 1.0;
-				XStop = 1.0;
-				ZStop = 0.0;
-			}
-			else if(routePosition < 0.60)
-			{
-				XStart = 0.0;
-				ZStart = 0.25;
-				XStop = 1.0;
-				ZStop = 0.75;
-			}
-			else if(routePosition < 0.72)
-			{	
-				XStart = 0.0;
-				ZStart = 0.75;
-				XStop = 1.0;
-				ZStop = 0.25;
-			}
-			else if(routePosition < 0.84)
-			{
-				XStart = 0.25;
-				ZStart = 0.0;
-				XStop = 0.75;
-				ZStop = 1.0;
-			}
-			else
-			{
-				XStart = 0.75;
-				ZStart = 0.0;
-				XStop = 0.25;
-				ZStop = 1.0;
-			}
-		}
-
-		// Assign trade route waypoints
-		tradeRoutePoint = rmFindClosestPoint(XStart, ZStart, 100.0);
-		rmAddTradeRouteWaypoint(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)));
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, 0.5, 0.5, 6, 6);
-		tradeRoutePoint = rmFindClosestPoint(XStop, ZStop, 100.0);
-		rmAddRandomTradeRouteWaypoints(tradeRouteID, rmXMetersToFraction(xsVectorGetX(tradeRoutePoint)), rmZMetersToFraction(xsVectorGetZ(tradeRoutePoint)), 4, 6);
-	}	
-
-   bool placedTradeRoute = rmBuildTradeRoute(tradeRouteID, "dirt");
-   if(placedTradeRoute == false)
-      rmEchoError("Failed to place trade route");  
-
-   // add the sockets along the trade route.
-   rmSetObjectDefTradeRouteID(socketID, tradeRouteID);
-   vector socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.20);
-   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-
-	// If continent, then 2 slots. Otherwise 3 or 4.
-	if(oceanRing < 1)
-	{
-		if(rmRandFloat(0,1) < 0.4)
-		{
-			socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.50);
-			rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-		}
-		else
-		{
-			socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.40);
-			rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-	
-			socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.60);
-			rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-		}
-	}
-
-   socketLoc = rmGetTradeRouteWayPoint(tradeRouteID, 0.80);
-   rmPlaceObjectDefAtPoint(socketID, 0, socketLoc);
-
-	rmClearClosestPointConstraints();
-
-
-	// Text
-   rmSetStatusText("", 0.4);
-
-// ============= Starting Units =============
-
-	int startingTCID= rmCreateObjectDef("startingTC");
-	if (rmGetNomadStart())
-		rmAddObjectDefItem(startingTCID, "CoveredWagon", 1);
-	else
-		rmAddObjectDefItem(startingTCID, "townCenter", 1);
-	rmSetObjectDefMinDistance(startingTCID, 0.0);
-	rmSetObjectDefMaxDistance(startingTCID, 20.0);
-	// For FFA, allow more of a float distance.
-	if ( cNumberTeams > 2 )
-	{
-		rmSetObjectDefMaxDistance(startingTCID, 30.0);
-	}
-	rmAddObjectDefConstraint(startingTCID, TCAvoidImpassableLand);
-	rmAddObjectDefConstraint(startingTCID, avoidTradeRoute);
-	rmAddObjectDefConstraint(startingTCID, avoidTradeRouteSocket);
-	rmAddObjectDefToClass(startingTCID, rmClassID("player"));
-
-	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
-	rmSetObjectDefMaxDistance(startingUnits, 12.0);
-	rmAddObjectDefConstraint(startingUnits, shortAvoidImpassableLand);
-	rmAddObjectDefToClass(startingUnits, rmClassID("startingUnit"));
-
-// Place Starting Units now so other stuff can avoid them
-	for(i=1; <cNumberPlayers)
-	{
-		rmPlaceObjectDefAtLoc(startingTCID, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-		//rmPlaceObjectDefAtLoc(startingUnits, i, rmPlayerLocXFraction(i), rmPlayerLocZFraction(i));
-	}
-
-	// Text
-   rmSetStatusText("", 0.5);
-
-
-
-// ============= Choose Natives =============
-
-	int ZapotecVillageID = -1;
-	int CaribsVillageID = -1;
-	int CherokeeVillageID = -1;
-	int ComancheVillageID = -1;
-	int CreeVillageID = -1;
-	int IncasVillageID = -1;
-	int KlamathVillageID = -1;
-	int CheyenneVillageID = -1;
-	int MayaVillageID = -1;
-	int NootkaVillageID = -1;
-	int SeminolesVillageID = -1;
-	int TupiVillageID = -1;
-	int NavajoVillageID = -1;
-	int HuronVillageID = -1;
-	int MapucheVillageID = -1;
-
-	float nativeChance = -1;
-
-// Usually 3 to 4, but rarely more or less
-
-	int nativeNumber = rmRandInt(3,4);
-	if(rmRandFloat(0,1) < 0.25)
-		nativeNumber = rmRandInt(5,6);
-	else if(rmRandFloat(0,1) < 0.15)
-		nativeNumber = rmRandInt(1,2);
-	rmEchoInfo("Native number = "+nativeNumber);
-
-// For each native, randomly determine tribe
-
-	for(i = 0; <nativeNumber)
-	{
-		nativeChance = rmRandFloat(0,1);
-		if(nativeChance < 0.06)
-		{
-			rmSetSubCiv(i, "Zapotec");
-			rmEchoInfo("subCiv"+i+" is Zapotec");
-			ZapotecVillageID = rmCreateGrouping("zapotec village "+i, "native zapotec village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(ZapotecVillageID, 0);
-			rmSetGroupingMaxDistance(ZapotecVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(ZapotecVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(ZapotecVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(ZapotecVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidNatives);
-			rmAddGroupingConstraint(ZapotecVillageID, edgeConstraint);
-			rmAddGroupingConstraint(ZapotecVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(ZapotecVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.12)
-		{
-			rmSetSubCiv(i, "Caribs");
-			rmEchoInfo("subCiv"+i+" is Caribs");
-			CaribsVillageID = rmCreateGrouping("carib village "+i, "native carib village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CaribsVillageID, 0);
-			rmSetGroupingMaxDistance(CaribsVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CaribsVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CaribsVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CaribsVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CaribsVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CaribsVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CaribsVillageID, avoidNatives);
-			rmAddGroupingConstraint(CaribsVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CaribsVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CaribsVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.18)
-		{
-			rmSetSubCiv(i, "Huron");
-			rmEchoInfo("subCiv"+i+" is Huron");
-			HuronVillageID = rmCreateGrouping("huron village "+i, "native huron village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(HuronVillageID, 0);
-			rmSetGroupingMaxDistance(HuronVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(HuronVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(HuronVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(HuronVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(HuronVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(HuronVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(HuronVillageID, avoidNatives);
-			rmAddGroupingConstraint(HuronVillageID, edgeConstraint);
-			rmAddGroupingConstraint(HuronVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(HuronVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.24)
-		{
-			rmSetSubCiv(i, "Cherokee");
-			rmEchoInfo("subCiv"+i+" is Cherokee");
-			CherokeeVillageID = rmCreateGrouping("cherokee village "+i, "native cherokee village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CherokeeVillageID, 0);
-			rmSetGroupingMaxDistance(CherokeeVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CherokeeVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CherokeeVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CherokeeVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidNatives);
-			rmAddGroupingConstraint(CherokeeVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CherokeeVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CherokeeVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.30)
-		{	
-			rmSetSubCiv(i, "Comanche");
-			rmEchoInfo("subCiv"+i+" is Comanche");
-			ComancheVillageID = rmCreateGrouping("comanche village "+i, "native comanche village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(ComancheVillageID, 0);
-			rmSetGroupingMaxDistance(ComancheVillageID, rmXFractionToMeters(0.50));
-			rmAddGroupingToClass(ComancheVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(ComancheVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(ComancheVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(ComancheVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(ComancheVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(ComancheVillageID, avoidNatives);
-			rmAddGroupingConstraint(ComancheVillageID, edgeConstraint);
-			rmAddGroupingConstraint(ComancheVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(ComancheVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.36)
-		{
-			rmSetSubCiv(i, "Cree");
-			rmEchoInfo("subCiv"+i+" is Cree");
-			CreeVillageID = rmCreateGrouping("cree village "+i, "native cree village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CreeVillageID, 0);
-			rmSetGroupingMaxDistance(CreeVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CreeVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CreeVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CreeVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CreeVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CreeVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CreeVillageID, avoidNatives);
-			rmAddGroupingConstraint(CreeVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CreeVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CreeVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.42)
-		{
-			rmSetSubCiv(i, "Incas");
-			rmEchoInfo("subCiv"+i+" is Incas");
-			IncasVillageID = rmCreateGrouping("inca village "+i, "native inca village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(IncasVillageID, 0);
-			rmSetGroupingMaxDistance(IncasVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(IncasVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(IncasVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(IncasVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(IncasVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(IncasVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(IncasVillageID, avoidNatives);
-			rmAddGroupingConstraint(IncasVillageID, edgeConstraint);
-			rmAddGroupingConstraint(IncasVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(IncasVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.48)
-		{
-			rmSetSubCiv(i, "Mapuche");
-			rmEchoInfo("subCiv"+i+" is Mapuche");
-			MapucheVillageID = rmCreateGrouping("mapuche village "+i, "native mapuche village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(MapucheVillageID, 0);
-			rmSetGroupingMaxDistance(MapucheVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(MapucheVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(MapucheVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(MapucheVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(MapucheVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(MapucheVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(MapucheVillageID, avoidNatives);
-			rmAddGroupingConstraint(MapucheVillageID, edgeConstraint);
-			rmAddGroupingConstraint(MapucheVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(MapucheVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.54)
-		{
-			rmSetSubCiv(i, "Klamath");
-			rmEchoInfo("subCiv"+i+" is Klamath");
-			KlamathVillageID = rmCreateGrouping("klamath village "+i, "native klamath village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(KlamathVillageID, 0);
-			rmSetGroupingMaxDistance(KlamathVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(KlamathVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(KlamathVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(KlamathVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(KlamathVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(KlamathVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(KlamathVillageID, avoidNatives);
-			rmAddGroupingConstraint(KlamathVillageID, edgeConstraint);
-			rmAddGroupingConstraint(KlamathVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(KlamathVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.60)
-		{
-			rmSetSubCiv(i, "Cheyenne");
-			rmEchoInfo("subCiv"+i+" is Cheyenne");
-			CheyenneVillageID = rmCreateGrouping("cheyenne village "+i, "native cheyenne village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(CheyenneVillageID, 0);
-			rmSetGroupingMaxDistance(CheyenneVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(CheyenneVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(CheyenneVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(CheyenneVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidNatives);
-			rmAddGroupingConstraint(CheyenneVillageID, edgeConstraint);
-			rmAddGroupingConstraint(CheyenneVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(CheyenneVillageID, 0, 0.5, 0.5);
-		}		
-		else if(nativeChance < 0.66)
-		{
-			rmSetSubCiv(i, "Maya");
-			rmEchoInfo("subCiv"+i+" is Maya");
-			MayaVillageID = rmCreateGrouping("maya village "+i, "native maya village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(MayaVillageID, 0);
-			rmSetGroupingMaxDistance(MayaVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(MayaVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(MayaVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(MayaVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(MayaVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(MayaVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(MayaVillageID, avoidNatives);
-			rmAddGroupingConstraint(MayaVillageID, edgeConstraint);
-			rmAddGroupingConstraint(MayaVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(MayaVillageID, 0, 0.5, 0.5);
-		}
-		else if(nativeChance < 0.71)
-		{
-			rmSetSubCiv(i, "Nootka");
-			rmEchoInfo("subCiv"+i+" is Nootka");
-			NootkaVillageID = rmCreateGrouping("nootka village "+i, "native nootka village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(NootkaVillageID, 0);
-			rmSetGroupingMaxDistance(NootkaVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(NootkaVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(NootkaVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(NootkaVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(NootkaVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(NootkaVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(NootkaVillageID, avoidNatives);
-			rmAddGroupingConstraint(NootkaVillageID, edgeConstraint);
-			rmAddGroupingConstraint(NootkaVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(NootkaVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.79)
-		{
-			rmSetSubCiv(i, "Navajo");
-			rmEchoInfo("subCiv"+i+" is Navajo");
-			NavajoVillageID = rmCreateGrouping("navajo village "+i, "native navajo village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(NavajoVillageID, 0);
-			rmSetGroupingMaxDistance(NavajoVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(NavajoVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(NavajoVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(NavajoVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(NavajoVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(NavajoVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(NavajoVillageID, avoidNatives);
-			rmAddGroupingConstraint(NavajoVillageID, edgeConstraint);
-			rmAddGroupingConstraint(NavajoVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(NavajoVillageID, 0, 0.5, 0.5);
-		}	
-		else if(nativeChance < 0.92)
-		{
-			rmSetSubCiv(i, "Seminoles");
-			rmEchoInfo("subCiv"+i+" is Seminoles");
-			SeminolesVillageID = rmCreateGrouping("seminoles village "+i, "native seminole village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(SeminolesVillageID, 0);
-			rmSetGroupingMaxDistance(SeminolesVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(SeminolesVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(SeminolesVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(SeminolesVillageID, nativesAvoidPlayers);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidNatives);
-			rmAddGroupingConstraint(SeminolesVillageID, edgeConstraint);
-			rmAddGroupingConstraint(SeminolesVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(SeminolesVillageID, 0, 0.5, 0.5);
-		}		
-		else
-		{
-			rmSetSubCiv(i, "Tupi");
-			rmEchoInfo("subCiv"+i+" is Tupi");
-			TupiVillageID = rmCreateGrouping("tupi village "+i, "native tupi village "+rmRandInt(1,5));
-			rmSetGroupingMinDistance(TupiVillageID, 0);
-			rmSetGroupingMaxDistance(TupiVillageID, rmXFractionToMeters(0.45));
-			rmAddGroupingToClass(TupiVillageID, rmClassID("natives"));
-			rmAddGroupingConstraint(TupiVillageID, avoidImpassableLand);
-			rmAddGroupingConstraint(TupiVillageID, avoidTradeRoute);
-			rmAddGroupingConstraint(TupiVillageID, avoidTradeRouteSocket);
-			rmAddGroupingConstraint(TupiVillageID, avoidPlayers);
-			rmAddGroupingConstraint(TupiVillageID, avoidNatives);
-			rmAddGroupingConstraint(TupiVillageID, edgeConstraint);
-			rmAddGroupingConstraint(TupiVillageID, avoidCanyon);
-			rmPlaceGroupingAtLoc(TupiVillageID, 0, 0.5, 0.5);
-		}	
-	}
-
-
-	// Text
-   rmSetStatusText("", 0.6);
-
-
-// ============= Add Cliffs =============
-
-   int numTries=0;
-   int failCount=0;
-
-	if(oceanRing == 1) // no cliffs for continent
-	{
-		numTries = 0;
-	}
-	else if(allLand == 1) // might have lots of cliffs if land
-	{
-		if(rmRandFloat(0,1) > 0.4)
-			numTries = 8*cNumberNonGaiaPlayers;
-	}
-	else if(plateauMiddle == 1) // might have lots of cliffs if center mesa
-	{
-		if(rmRandFloat(0,1) > 0.7)
-			numTries = 8*cNumberNonGaiaPlayers;
-	}
-	else
-	{
-		numTries = 4*cNumberNonGaiaPlayers;
-	}
-	
-		if(rmRandFloat(0,1) < 0.40) // only do cliffs 40% of the time in any case
-		{		
-			for(i=0; <numTries)
-			{
-				int smallCliffHeight=rmRandInt(0,10);
-				int smallMesaID=rmCreateArea("small cliff "+i);
-				rmSetAreaSize(smallMesaID, rmAreaTilesToFraction(100), rmAreaTilesToFraction(400));
-				rmSetAreaWarnFailure(smallMesaID, false);
-				rmSetAreaCliffType(smallMesaID, cliffName);
-				rmAddAreaToClass(smallMesaID, classCanyon);
-				rmSetAreaCliffEdge(smallMesaID, 1, 1.0, 0.1, 1.0, 0);
-				rmSetAreaCliffHeight(smallMesaID, rmRandInt(6,8), 1.0, 1.0);
-				rmSetAreaMinBlobs(smallMesaID, 3);
-				rmSetAreaMaxBlobs(smallMesaID, 5);
-				rmSetAreaMinBlobDistance(smallMesaID, 3.0);
-				rmSetAreaMaxBlobDistance(smallMesaID, 5.0);
-				rmSetAreaCoherence(smallMesaID, 0.3);
-				rmSetAreaSmoothDistance(smallMesaID, 10);
-				rmAddAreaConstraint(smallMesaID, avoidCanyon);
-				rmAddAreaConstraint(smallMesaID, avoidImpassableLand);
-				rmAddAreaConstraint(smallMesaID, avoidPlayers); 
-				rmAddAreaConstraint(smallMesaID, avoidNatives); 
-				rmAddAreaConstraint(smallMesaID, avoidTradeRouteSocket);
-				rmAddAreaConstraint(smallMesaID, avoidTradeRoute);
-				if(rmBuildArea(smallMesaID)==false)
-				{
-					// Stop trying once we fail 3 times in a row.
-					failCount++;
-					if(failCount==20)
-						break;
-				}
-				else
-					failCount=0;
-			}
-		}
-	
-
-// ============= Add Ponds =============
-
-
-	if(rmRandFloat(0,1) < 0.45)
-	{
-		rmEchoInfo("ponds exist");
-		int numPonds=rmRandInt(2, 5);
-		for(i=0; <numPonds)
-		{
-			int smallPondID=rmCreateArea("small pond "+i);
-			rmSetAreaSize(smallPondID, rmAreaTilesToFraction(170), rmAreaTilesToFraction(400));
-			rmSetAreaWaterType(smallPondID, pondName);
-			rmSetAreaMinBlobs(smallPondID, 1);
-			rmSetAreaMaxBlobs(smallPondID, 5);
-			rmSetAreaBaseHeight(smallPondID, 4);
-			rmSetAreaMinBlobDistance(smallPondID, 5.0);
-			rmSetAreaMaxBlobDistance(smallPondID, 70.0);
-			rmAddAreaToClass(smallPondID, pondClass);
-			rmSetAreaCoherence(smallPondID, 0.5);
-			rmSetAreaSmoothDistance(smallPondID, 5);
-			rmAddAreaConstraint(smallPondID, pondConstraint);
-			rmAddAreaConstraint(smallPondID, avoidPlayers);
-			rmAddAreaConstraint(smallPondID, avoidNatives);
-			rmAddAreaConstraint(smallPondID, mediumAvoidImpassableLand);
-			rmAddAreaConstraint(smallPondID, avoidCanyon);
-			rmAddAreaConstraint(smallPondID, edgeConstraint);
-			rmAddAreaConstraint(smallPondID, avoidTradeRoute);
-			rmSetAreaWarnFailure(smallPondID, false);
-			rmBuildArea(smallPondID);
-		}
-	}
-
-	// Text
-   rmSetStatusText("", 0.7);
-
-// ============= Add Forests =============
-
-	numTries=6*cNumberNonGaiaPlayers;
-	failCount = 0;
-	int sparseForests = -1;
-
-	if(rmRandFloat(0,1) > 0.9)
-	{
-		numTries = 3*cNumberNonGaiaPlayers;
-		rmEchoInfo("sparse forests");
-		sparseForests = 1;
-	}
-
-   for (i=0; <numTries)
-	{   
-      int forest=rmCreateArea("forest "+i);
-      rmSetAreaWarnFailure(forest, false);
-      rmSetAreaSize(forest, rmAreaTilesToFraction(200), rmAreaTilesToFraction(400));
-      rmSetAreaForestType(forest, forestName);
-      rmSetAreaForestDensity(forest, 0.8);
-      rmSetAreaForestClumpiness(forest, 0.6);
-      rmSetAreaForestUnderbrush(forest, 0.0);
-      rmSetAreaMinBlobs(forest, 1);
-      rmSetAreaMaxBlobs(forest, 5);
-      rmSetAreaMinBlobDistance(forest, 16.0);
-      rmSetAreaMaxBlobDistance(forest, 70.0);
-      rmSetAreaCoherence(forest, 0.4);
-      rmSetAreaSmoothDistance(forest, 0);
-      rmAddAreaToClass(forest, rmClassID("classForest")); 
-      rmAddAreaConstraint(forest, forestConstraint);
-      rmAddAreaConstraint(forest, avoidTC);
-      rmAddAreaConstraint(forest, avoidCW);
-      rmAddAreaConstraint(forest, avoidAll);
-      rmAddAreaConstraint(forest, avoidCanyon);
-      rmAddAreaConstraint(forest, mediumAvoidImpassableLand); 
-      rmAddAreaConstraint(forest, avoidTradeRoute);
-
-      if(rmBuildArea(forest)==false)
-      {
-         // Stop trying once we fail 3 times in a row.
-         failCount++;
-         if(failCount==5)
-            break;
-      }
-      else
-         failCount=0; 
-	}
-	
-	// Text
-   rmSetStatusText("", 0.8);
-
-// ============= Starting Resources =============
-
-// Silver
-
-	int playerSilverID = rmCreateObjectDef("player silver");
-	rmAddObjectDefItem(playerSilverID, "mine", 1, 0);
-	rmAddObjectDefConstraint(playerSilverID, avoidTradeRoute);
-	rmSetObjectDefMinDistance(playerSilverID, 18.0);
-	rmSetObjectDefMaxDistance(playerSilverID, 22.0);
-	rmAddObjectDefConstraint(playerSilverID, avoidAll);
-   rmAddObjectDefConstraint(playerSilverID, shortAvoidImpassableLand);
-
-	int playerBerryID=rmCreateObjectDef("player berries");
-   rmAddObjectDefItem(playerBerryID, "berryBush", rmRandInt(2,3), 2.0);
-   rmSetObjectDefMinDistance(playerBerryID, 10);
-   rmSetObjectDefMaxDistance(playerBerryID, 15);
-	rmAddObjectDefConstraint(playerBerryID, avoidAll);
-   rmAddObjectDefConstraint(playerBerryID, shortAvoidImpassableLand);
-
-	int playerTreeID=rmCreateObjectDef("player trees");
-   rmAddObjectDefItem(playerTreeID, treeName, 1, 0.0);
-	rmAddObjectDefConstraint(playerTreeID, avoidTradeRoute);
-   rmSetObjectDefMinDistance(playerTreeID, 8);
-   rmSetObjectDefMaxDistance(playerTreeID, 12);
-	rmAddObjectDefConstraint(playerTreeID, avoidAll);
-   rmAddObjectDefConstraint(playerTreeID, shortAvoidImpassableLand);
-
-   int nearDeerID=rmCreateObjectDef("herds near town");
-   rmAddObjectDefItem(nearDeerID, critterOneName, rmRandInt(8,10), 10.0);
-   rmSetObjectDefMinDistance(nearDeerID, 30);
-   rmSetObjectDefMaxDistance(nearDeerID, 40);
-   rmAddObjectDefConstraint(nearDeerID, avoidFood);
-	rmAddObjectDefConstraint(nearDeerID, avoidAll);
-   rmAddObjectDefConstraint(nearDeerID, avoidImpassableLand);
-   rmSetObjectDefCreateHerd(nearDeerID, true);
-
-	int farDeerID=rmCreateObjectDef("herds far away");
-	int bonusChance=rmRandFloat(0, 1);
-   if(bonusChance<0.5)   
-      rmAddObjectDefItem(farDeerID, critterTwoName, rmRandInt(6,8), 10.0);
-   else
-      rmAddObjectDefItem(farDeerID, critterTwoName, rmRandInt(9,12), 10.0);
-   rmSetObjectDefMinDistance(farDeerID, 100);
-   rmSetObjectDefMaxDistance(farDeerID, rmXFractionToMeters(0.25));
-   rmAddObjectDefConstraint(farDeerID, avoidFood);
-	rmAddObjectDefConstraint(farDeerID, avoidAll);
-	if(oceanRing == 1)
-		rmAddObjectDefConstraint(farDeerID, avoidPlayers);
-	else
-		rmAddObjectDefConstraint(farDeerID, avoidPlayersFar);
-   rmAddObjectDefConstraint(farDeerID, avoidImpassableLand);
-   rmAddObjectDefConstraint(farDeerID, avoidCanyon);
-   rmSetObjectDefCreateHerd(farDeerID, true);
-
-	int nugget1= rmCreateObjectDef("nugget easy"); 
-	rmAddObjectDefItem(nugget1, "Nugget", 1, 0.0);
-	rmSetNuggetDifficulty(1, 1);
-	rmAddObjectDefConstraint(nugget1, shortAvoidImpassableLand);
-  	rmAddObjectDefConstraint(nugget1, avoidNugget);
-  	rmAddObjectDefConstraint(nugget1, avoidTradeRoute);
-  	rmAddObjectDefConstraint(nugget1, avoidAll);
-	rmSetObjectDefMinDistance(nugget1, 40.0);
-	rmSetObjectDefMaxDistance(nugget1, 60.0);
-
-	int nugget2= rmCreateObjectDef("nugget medium"); 
-	rmAddObjectDefItem(nugget2, "Nugget", 1, 0.0);
-	rmSetNuggetDifficulty(2, 2);
-	rmSetObjectDefMinDistance(nugget2, 0.0);
-	rmSetObjectDefMaxDistance(nugget2, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(nugget2, shortAvoidImpassableLand);
-  	rmAddObjectDefConstraint(nugget2, avoidNugget);
-  	rmAddObjectDefConstraint(nugget2, avoidTC);
-  	rmAddObjectDefConstraint(nugget2, avoidCW);
-  	rmAddObjectDefConstraint(nugget2, avoidCanyon);
-  	rmAddObjectDefConstraint(nugget2, avoidTradeRoute);
-  	rmAddObjectDefConstraint(nugget2, avoidAll);
-	rmSetObjectDefMinDistance(nugget2, 80.0);
-	rmSetObjectDefMaxDistance(nugget2, 120.0);
-
-	int waterFlagID=rmCreateObjectDef("HC water flag");
-	int placeWaterFlag = -1;
-	rmAddObjectDefItem(waterFlagID, "HomeCityWaterSpawnFlag", 1, 0.0);
-	rmSetObjectDefMinDistance(waterFlagID, 0.0);
-	rmSetObjectDefMaxDistance(waterFlagID, rmXFractionToMeters(0.5));
-   rmAddObjectDefConstraint(waterFlagID, edgeConstraint);
-	rmAddObjectDefConstraint(waterFlagID, flagVsFlag);
-	rmAddObjectDefConstraint(waterFlagID, fishLand);
-
-	// Define a parm for placing water flags on water maps
-	if (oceanMiddle == 1)
-		placeWaterFlag = 1;
-	else if (oceanOffCenter == 1)
-		placeWaterFlag = 1;
-	else if (oceanRing == 1)
-		placeWaterFlag = 1;
-
-	// Now place all these definitions
-
-	float bonusSilverChance = rmRandFloat(0,1);
-	float bonusTreeChance = rmRandFloat(0,1);
-	float bonusNuggetChance1 = rmRandFloat(0,1);
-	float bonusNuggetChance2 = rmRandFloat(0,1);
-	float berryChance = rmRandFloat(0,1);
-	float bonusFoodChance = rmRandFloat(0,1);
-
-	for(i=1; <cNumberPlayers)
-	{
-		vector TCLocation = rmGetUnitPosition(rmGetUnitPlacedOfPlayer(startingTCID, i));
-		vector closestPoint = rmFindClosestPointVector(TCLocation, rmXFractionToMeters(1.0));
-
-		rmPlaceObjectDefAtLoc(startingUnits, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// SILVER
-		// Always one silver, but possible for 2 or 3
-		rmPlaceObjectDefAtLoc(playerSilverID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusSilverChance > 0.4)
-			rmPlaceObjectDefAtLoc(playerSilverID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusSilverChance > 0.8)
-			rmPlaceObjectDefAtLoc(playerSilverID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		
-		// TREES
-		// Have 4-6 trees, unless sparse
-		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
- 		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusTreeChance > 0.5)
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusTreeChance > 0.8)
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		// If sparse forests, add extra trees
-		if (sparseForests == 1)
-		{
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
- 			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-			rmPlaceObjectDefAtLoc(playerTreeID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		}
-
-		// NUGGETS
-		// Always 1 of type I. Can have +1 or +2 of type I and +1 or +2 of type II
-		rmPlaceObjectDefAtLoc(nugget1, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance1 > 0.5)
-			rmPlaceObjectDefAtLoc(nugget1, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance1 > 0.9)
-			rmPlaceObjectDefAtLoc(nugget1, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance2 > 0.8)
-			rmPlaceObjectDefAtLoc(nugget2, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusNuggetChance2 > 0.95)
-			rmPlaceObjectDefAtLoc(nugget2, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// FOOD
-		// Always 1 near and 1 far. Sometimes +1 or +2 far.
-		rmPlaceObjectDefAtLoc(nearDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		rmPlaceObjectDefAtLoc(farDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusFoodChance > 0.70)
-			rmPlaceObjectDefAtLoc(farDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-		if (bonusFoodChance > 0.90)
-			rmPlaceObjectDefAtLoc(farDeerID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// BERRIES
-		// 30% of the time
-		if (berryChance > 0.7)
-			rmPlaceObjectDefAtLoc(playerBerryID, 0, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-
-    // Monastery
-    if(ypIsAsian(i) && rmGetNomadStart() == false)
-      rmPlaceObjectDefAtLoc(ypMonasteryBuilder(i, 1), i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-		// WATER FLAG
-		if (placeWaterFlag == 1)
-			rmPlaceObjectDefAtLoc(waterFlagID, i, rmXMetersToFraction(xsVectorGetX(TCLocation)), rmZMetersToFraction(xsVectorGetZ(TCLocation)));
-
-	}
-
-
-	// Text
-   rmSetStatusText("", 0.9);
-
-
-// ============= Other Resources =============
-
-// Silver
-
-	int silverID = -1;
-	int silverCount = (cNumberNonGaiaPlayers*2 + rmRandInt(3,6));
-	rmEchoInfo("silver count = "+silverCount);
-
-	for(i=0; < silverCount)
-	{
-      silverID = rmCreateObjectDef("silver "+i);
-	   rmAddObjectDefItem(silverID, "mine", 1, 0.0);
-      rmSetObjectDefMinDistance(silverID, 0.0);
-      rmSetObjectDefMaxDistance(silverID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(silverID, avoidSilver);
-      rmAddObjectDefConstraint(silverID, avoidAll);
-		if(oceanRing == 1)
-			rmAddObjectDefConstraint(silverID, avoidPlayers);
-		else
-			rmAddObjectDefConstraint(silverID, avoidPlayersFar);
-      rmAddObjectDefConstraint(silverID, avoidImpassableLand);
-      rmAddObjectDefConstraint(silverID, avoidTradeRoute);
-		rmPlaceObjectDefAtLoc(silverID, 0, 0.5, 0.5);
-   }
-
-// Livestock
-
-	int sheepID=rmCreateObjectDef("livestock");
-	rmAddObjectDefItem(sheepID, livestockName, 2, 4.0);
-	rmSetObjectDefMinDistance(sheepID, 0.0);
-	rmSetObjectDefMaxDistance(sheepID, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(sheepID, avoidFood);
-	rmAddObjectDefConstraint(sheepID, avoidAll);
-	if(oceanRing == 1)
-		rmAddObjectDefConstraint(sheepID, avoidPlayers);
-	else
-		rmAddObjectDefConstraint(sheepID, avoidPlayersFar);
-	rmAddObjectDefConstraint(sheepID, avoidCanyon);
-	rmAddObjectDefConstraint(sheepID, avoidImpassableLand);
-	if(rmRandFloat(0,1) > 0.85)
-		rmPlaceObjectDefAtLoc(sheepID, 0, 0.5, 0.5, cNumberNonGaiaPlayers*2);
-
-// Treasures
-   
-	int nugget3= rmCreateObjectDef("nugget hard"); 
-	rmAddObjectDefItem(nugget3, "Nugget", 1, 0.0);
-	rmSetNuggetDifficulty(3, 3);
-	rmSetObjectDefMinDistance(nugget3, 0.0);
-	rmSetObjectDefMaxDistance(nugget3, rmXFractionToMeters(0.5));
-	rmAddObjectDefConstraint(nugget3, shortAvoidImpassableLand);
-  	rmAddObjectDefConstraint(nugget3, avoidNugget);
-  	rmAddObjectDefConstraint(nugget3, avoidPlayersFar);
-  	rmAddObjectDefConstraint(nugget3, avoidTradeRoute);
-  	rmAddObjectDefConstraint(nugget3, avoidAll);
-	if(rmRandFloat(0,1) < 0.7)
-		rmPlaceObjectDefAtLoc(nugget3, 0, 0.5, 0.5, cNumberNonGaiaPlayers);
-	else
-		rmPlaceObjectDefAtLoc(nugget3, 0, 0.5, 0.5, cNumberNonGaiaPlayers*rmRandInt(2,4));
-
-	if (rmRandFloat(0,1) > 0.9)
-	{
-		int nugget4= rmCreateObjectDef("nugget nuts"); 
-		rmAddObjectDefItem(nugget4, "Nugget", 1, 0.0);
-		rmSetNuggetDifficulty(4, 4);
-		rmSetObjectDefMinDistance(nugget4, 0.0);
-		rmSetObjectDefMaxDistance(nugget4, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(nugget4, shortAvoidImpassableLand);
-  		rmAddObjectDefConstraint(nugget4, avoidNugget);
-  		rmAddObjectDefConstraint(nugget4, avoidPlayersFar);
-  		rmAddObjectDefConstraint(nugget4, avoidTradeRoute);
-  		rmAddObjectDefConstraint(nugget4, avoidAll);
-		rmPlaceObjectDefAtLoc(nugget4, 0, 0.5, 0.5, rmRandInt(0,5));
-	}
-
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
-
-  // check for KOTH game mode
-  if(rmGetIsKOTH()) {
-    
-    int randLoc = rmRandInt(1,3);
-    float xLoc = 0.5;
-    float yLoc = 0.5;
-    float walk = 0.05;
-    
-    //~ if(randLoc == 1 && blockedMiddle != 1)
-      //~ yLoc = .5;
-      
-    //~ if(cNumberTeams > 2 && blockedMiddle != 1) {
-      //~ yLoc = rmRandFloat(.25, .75);
-      //~ walk = 0.25;
-    //~ }
-    
-    //~ else if(cNumberTeams > 2){
-      //~ yLoc = .3;
-      //~ walk = 0.5;
-    //~ }
-    
-    ypKingsHillPlacer(xLoc, yLoc, walk, avoidCanyon);
-    rmEchoInfo("XLOC = "+xLoc);
-    rmEchoInfo("XLOC = "+yLoc);
-  }
-
-  // Water nuggets
-  
-  int nuggetW= rmCreateObjectDef("nugget water"); 
-  rmAddObjectDefItem(nuggetW, "ypNuggetBoat", 1, 0.0);
-  rmSetNuggetDifficulty(5, 5);
-  rmSetObjectDefMinDistance(nuggetW, rmXFractionToMeters(0.0));
-  rmSetObjectDefMaxDistance(nuggetW, rmXFractionToMeters(0.5));
-  rmAddObjectDefConstraint(nuggetW, avoidLand);
-  rmAddObjectDefConstraint(nuggetW, avoidNuggetWater);
-  rmPlaceObjectDefAtLoc(nuggetW, 0, 0.5, 0.5, cNumberNonGaiaPlayers*4);
-    
-	// Text
-	rmSetStatusText("",0.99);
-
-for(i=1;<=cNumberNonGaiaPlayers) {
-   rmCreateTrigger("Tech Status"+i);
-   rmSwitchToTrigger(rmTriggerID("Tech Status"+i));
-   rmSetTriggerActive(true);
-   rmAddTriggerEffect("Set Tech Status");
-   rmSetTriggerEffectParamInt("PlayerID", i);
-   rmSetTriggerEffectParamInt("TechID", 9);  // HCBlockadeNative
-   rmSetTriggerEffectParamInt("Status", 2);
-}
-
-// add fish if ocean
-	if (placeWaterFlag == 1)
-	{
-		int fishID=rmCreateObjectDef("fish");
-		rmAddObjectDefItem(fishID, fishName, 1, 0.0);
-		rmSetObjectDefMinDistance(fishID, 0.0);
-		rmSetObjectDefMaxDistance(fishID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(fishID, fishVsFishID);
-		rmAddObjectDefConstraint(fishID, fishLand);
-		rmPlaceObjectDefAtLoc(fishID, 0, 0.5, 0.5, 6*cNumberNonGaiaPlayers);
-
-		int whaleID=rmCreateObjectDef("whale");
-		rmAddObjectDefItem(whaleID, whaleName, 1, 9.0);
-		rmSetObjectDefMinDistance(whaleID, 0.0);
-		rmSetObjectDefMaxDistance(whaleID, rmXFractionToMeters(0.5));
-		rmAddObjectDefConstraint(whaleID, whaleVsWhaleID);
-		rmAddObjectDefConstraint(whaleID, whaleLand);
-		if(rmRandFloat(0,1) < 0.5)
-			rmPlaceObjectDefAtLoc(whaleID, 0, 0.5, 0.5, 3*cNumberNonGaiaPlayers);
-	}
-
-  // Text
-   rmSetStatusText("",1.0);
-
-	// DONE!!!!
-
-
-}
\ No newline at end of file
diff --git a/RMM/waterrandom.set b/RMM/waterrandom.set
new file mode 100644
index 0000000..72f6127
--- /dev/null
+++ b/RMM/waterrandom.set
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<randomMaps displayNameID="781330" imagepath="ui\random_map\africa\watermaps" helpTextID="781319" cannotReplace="">
+  <map>Amazonia</map>
+  <map>Caribbean</map>
+  <map>Carolina</map>
+  <map>Yucatan</map>
+  <map>California</map>
+  <map>Plymouth</map>
+  <map>Hispaniola</map>
+  <map>Araucania</map>
+  <map>New England</map>
+  <map>Great Lakes</map>
+  <map>Saguenay</map>
+  <map>Patagonia</map>
+  <map>Honshu</map>
+  <map>borneo</map>
+  <map>Ceylon</map>
+  <map>Madagascar</map>
+  <map>Indonesia</map>
+  <map>newzealand</map>
+  <map>UnknownWater</map>
+</randomMaps>
diff --git a/RMM/yellow riverDry.xs b/RMM/yellow riverDry.xs
index d3789f2..76097d1 100644
--- a/RMM/yellow riverDry.xs	
+++ b/RMM/yellow riverDry.xs	
@@ -887,7 +887,7 @@ void main(void)
   rmAddObjectDefConstraint(startSilverID, avoidNatives);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidResource);
@@ -913,16 +913,6 @@ void main(void)
 	int waterSpawnPointID = 0;
 	rmClearClosestPointConstraints();
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/yellow riverLarge.xs b/RMM/yellow riverLarge.xs
index 96958e5..40b5cf3 100644
--- a/RMM/yellow riverLarge.xs	
+++ b/RMM/yellow riverLarge.xs	
@@ -887,7 +887,7 @@ void main(void)
   rmAddObjectDefConstraint(startSilverID, avoidNatives);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidResource);
@@ -913,16 +913,6 @@ void main(void)
 	int waterSpawnPointID = 0;
 	rmClearClosestPointConstraints();
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/yellow riverRegicide.xs b/RMM/yellow riverRegicide.xs
index 76dc923..3817c1c 100644
--- a/RMM/yellow riverRegicide.xs	
+++ b/RMM/yellow riverRegicide.xs	
@@ -1086,7 +1086,7 @@ void main(void)
   rmAddObjectDefConstraint(startSilverID, avoidNatives);
 
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
   rmSetObjectDefMaxDistance(startingUnits, 10.0);
 	rmAddObjectDefConstraint(startingUnits, avoidAll);
 	rmAddObjectDefConstraint(startingUnits, avoidResource);
@@ -1110,17 +1110,6 @@ void main(void)
 	int waterSpawnPointID = 0;
 	rmClearClosestPointConstraints();
 
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <14 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
-
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
     
diff --git a/RMM/yucatan.xs b/RMM/yucatan.xs
index 925bde8..ac85029 100644
--- a/RMM/yucatan.xs
+++ b/RMM/yucatan.xs
@@ -541,7 +541,7 @@ void main(void)
    int subCiv = -1;
  
    int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-   rmSetObjectDefMinDistance(startingUnits, 5.0);
+   rmSetObjectDefMinDistance(startingUnits, 6.0);
    rmSetObjectDefMaxDistance(startingUnits, 10.0);
    rmAddObjectDefConstraint(startingUnits, avoidAll);
    rmAddObjectDefConstraint(startingUnits, avoidImpassableLand);
@@ -1020,16 +1020,6 @@ void main(void)
   if (cNumberTeams > 2 || (teamZeroCount - teamOneCount) > 1 || (teamOneCount - teamZeroCount) > 1)
     weird = true;
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/RMM/yukon.xs b/RMM/yukon.xs
index a630454..c09da62 100644
--- a/RMM/yukon.xs
+++ b/RMM/yukon.xs
@@ -415,8 +415,9 @@ void main(void)
 
     //STARTING UNITS and RESOURCES DEFS
 	int startingUnits = rmCreateStartingUnitsObjectDef(5.0);
-	rmSetObjectDefMinDistance(startingUnits, 5.0);
+	rmSetObjectDefMinDistance(startingUnits, 6.0);
 	rmSetObjectDefMaxDistance(startingUnits, 10.0);
+	rmAddObjectDefConstraint(startingUnits, avoidAll);
 
 	int startingTCID = rmCreateObjectDef("startingTC");
 	if ( rmGetNomadStart())
@@ -840,16 +841,6 @@ void main(void)
 	// Text
 	rmSetStatusText("",0.80);
   
-    // Place random flags
-    int avoidFlags = rmCreateTypeDistanceConstraint("flags avoid flags", "ControlFlag", 70);
-    for ( i =1; <11 ) {
-    int flagID = rmCreateObjectDef("random flag"+i);
-    rmAddObjectDefItem(flagID, "ControlFlag", 1, 0.0);
-    rmSetObjectDefMinDistance(flagID, 0.0);
-    rmSetObjectDefMaxDistance(flagID, rmXFractionToMeters(0.40));
-    rmAddObjectDefConstraint(flagID, avoidFlags);
-    rmPlaceObjectDefAtLoc(flagID, 0, 0.5, 0.5);
-    }
 
   // check for KOTH game mode
   if(rmGetIsKOTH()) {
diff --git a/Sound/impmod/SwedishSettlerMaleBuild.wav b/Sound/impmod/SwedishSettlerMaleBuild.wav
index 657d42b..0cbb086 100644
Binary files a/Sound/impmod/SwedishSettlerMaleBuild.wav and b/Sound/impmod/SwedishSettlerMaleBuild.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleFarm.wav b/Sound/impmod/SwedishSettlerMaleFarm.wav
index c58dbc4..acd2d6b 100644
Binary files a/Sound/impmod/SwedishSettlerMaleFarm.wav and b/Sound/impmod/SwedishSettlerMaleFarm.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleGather.wav b/Sound/impmod/SwedishSettlerMaleGather.wav
index 98e50eb..2499a7e 100644
Binary files a/Sound/impmod/SwedishSettlerMaleGather.wav and b/Sound/impmod/SwedishSettlerMaleGather.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleGatherWood.wav b/Sound/impmod/SwedishSettlerMaleGatherWood.wav
index f2d42c3..7bd0528 100644
Binary files a/Sound/impmod/SwedishSettlerMaleGatherWood.wav and b/Sound/impmod/SwedishSettlerMaleGatherWood.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleHunt.wav b/Sound/impmod/SwedishSettlerMaleHunt.wav
index c993379..15d3595 100644
Binary files a/Sound/impmod/SwedishSettlerMaleHunt.wav and b/Sound/impmod/SwedishSettlerMaleHunt.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleMine.wav b/Sound/impmod/SwedishSettlerMaleMine.wav
index cc021a9..863b48d 100644
Binary files a/Sound/impmod/SwedishSettlerMaleMine.wav and b/Sound/impmod/SwedishSettlerMaleMine.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleMove1.wav b/Sound/impmod/SwedishSettlerMaleMove1.wav
index 09bd691..d048017 100644
Binary files a/Sound/impmod/SwedishSettlerMaleMove1.wav and b/Sound/impmod/SwedishSettlerMaleMove1.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleMove2.wav b/Sound/impmod/SwedishSettlerMaleMove2.wav
index d47c9ae..ebf251c 100644
Binary files a/Sound/impmod/SwedishSettlerMaleMove2.wav and b/Sound/impmod/SwedishSettlerMaleMove2.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleMove3.wav b/Sound/impmod/SwedishSettlerMaleMove3.wav
new file mode 100644
index 0000000..d048017
Binary files /dev/null and b/Sound/impmod/SwedishSettlerMaleMove3.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleSelect.wav b/Sound/impmod/SwedishSettlerMaleSelect.wav
deleted file mode 100644
index 0e8ad35..0000000
Binary files a/Sound/impmod/SwedishSettlerMaleSelect.wav and /dev/null differ
diff --git a/Sound/impmod/SwedishSettlerMaleSelect1.wav b/Sound/impmod/SwedishSettlerMaleSelect1.wav
new file mode 100644
index 0000000..3cc4353
Binary files /dev/null and b/Sound/impmod/SwedishSettlerMaleSelect1.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleSelect2.wav b/Sound/impmod/SwedishSettlerMaleSelect2.wav
index bf82751..0ffc692 100644
Binary files a/Sound/impmod/SwedishSettlerMaleSelect2.wav and b/Sound/impmod/SwedishSettlerMaleSelect2.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleSelect3.wav b/Sound/impmod/SwedishSettlerMaleSelect3.wav
index cc75f46..2f7a0ca 100644
Binary files a/Sound/impmod/SwedishSettlerMaleSelect3.wav and b/Sound/impmod/SwedishSettlerMaleSelect3.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleSelect4.wav b/Sound/impmod/SwedishSettlerMaleSelect4.wav
index b4aac81..770a9ef 100644
Binary files a/Sound/impmod/SwedishSettlerMaleSelect4.wav and b/Sound/impmod/SwedishSettlerMaleSelect4.wav differ
diff --git a/Sound/impmod/SwedishSettlerMaleSelect5.wav b/Sound/impmod/SwedishSettlerMaleSelect5.wav
index b4aac81..770a9ef 100644
Binary files a/Sound/impmod/SwedishSettlerMaleSelect5.wav and b/Sound/impmod/SwedishSettlerMaleSelect5.wav differ
diff --git a/Sound/impmod/flagwave.wav b/Sound/impmod/flagwave.wav
new file mode 100644
index 0000000..ffe9a1b
Binary files /dev/null and b/Sound/impmod/flagwave.wav differ
diff --git a/Sound/impmod/koreanattack1.wav b/Sound/impmod/koreanattack1.wav
new file mode 100644
index 0000000..e4b452b
Binary files /dev/null and b/Sound/impmod/koreanattack1.wav differ
diff --git a/Sound/impmod/koreanattack2.wav b/Sound/impmod/koreanattack2.wav
new file mode 100644
index 0000000..0690bad
Binary files /dev/null and b/Sound/impmod/koreanattack2.wav differ
diff --git a/Sound/impmod/koreanattack3.wav b/Sound/impmod/koreanattack3.wav
new file mode 100644
index 0000000..66af9da
Binary files /dev/null and b/Sound/impmod/koreanattack3.wav differ
diff --git a/Sound/impmod/koreanmove1.wav b/Sound/impmod/koreanmove1.wav
new file mode 100644
index 0000000..2d979c0
Binary files /dev/null and b/Sound/impmod/koreanmove1.wav differ
diff --git a/Sound/impmod/koreanmove2.wav b/Sound/impmod/koreanmove2.wav
new file mode 100644
index 0000000..88de84a
Binary files /dev/null and b/Sound/impmod/koreanmove2.wav differ
diff --git a/Sound/impmod/koreanmove3.wav b/Sound/impmod/koreanmove3.wav
new file mode 100644
index 0000000..10941b1
Binary files /dev/null and b/Sound/impmod/koreanmove3.wav differ
diff --git a/Sound/impmod/koreanselect1.wav b/Sound/impmod/koreanselect1.wav
new file mode 100644
index 0000000..c571878
Binary files /dev/null and b/Sound/impmod/koreanselect1.wav differ
diff --git a/Sound/impmod/koreanselect2.wav b/Sound/impmod/koreanselect2.wav
new file mode 100644
index 0000000..caf1888
Binary files /dev/null and b/Sound/impmod/koreanselect2.wav differ
diff --git a/Sound/impmod/koreanselect3.wav b/Sound/impmod/koreanselect3.wav
new file mode 100644
index 0000000..76547ab
Binary files /dev/null and b/Sound/impmod/koreanselect3.wav differ
diff --git a/Sound/impmod/mongolattack1.wav b/Sound/impmod/mongolattack1.wav
new file mode 100644
index 0000000..f5f4116
Binary files /dev/null and b/Sound/impmod/mongolattack1.wav differ
diff --git a/Sound/impmod/mongolattack2.wav b/Sound/impmod/mongolattack2.wav
new file mode 100644
index 0000000..c62a868
Binary files /dev/null and b/Sound/impmod/mongolattack2.wav differ
diff --git a/Sound/impmod/mongolattack3.wav b/Sound/impmod/mongolattack3.wav
new file mode 100644
index 0000000..5a03dd9
Binary files /dev/null and b/Sound/impmod/mongolattack3.wav differ
diff --git a/Sound/impmod/mongolmove1.wav b/Sound/impmod/mongolmove1.wav
new file mode 100644
index 0000000..780be3b
Binary files /dev/null and b/Sound/impmod/mongolmove1.wav differ
diff --git a/Sound/impmod/mongolmove2.wav b/Sound/impmod/mongolmove2.wav
new file mode 100644
index 0000000..6e2b2a0
Binary files /dev/null and b/Sound/impmod/mongolmove2.wav differ
diff --git a/Sound/impmod/mongolmove3.wav b/Sound/impmod/mongolmove3.wav
new file mode 100644
index 0000000..458ff28
Binary files /dev/null and b/Sound/impmod/mongolmove3.wav differ
diff --git a/Sound/impmod/mongolselect1.wav b/Sound/impmod/mongolselect1.wav
new file mode 100644
index 0000000..95ff9c3
Binary files /dev/null and b/Sound/impmod/mongolselect1.wav differ
diff --git a/Sound/impmod/mongolselect2.wav b/Sound/impmod/mongolselect2.wav
new file mode 100644
index 0000000..2f96e4a
Binary files /dev/null and b/Sound/impmod/mongolselect2.wav differ
diff --git a/Sound/impmod/mongolselect3.wav b/Sound/impmod/mongolselect3.wav
new file mode 100644
index 0000000..31d8e10
Binary files /dev/null and b/Sound/impmod/mongolselect3.wav differ
diff --git a/Sound/impmod/saracenattack1.wav b/Sound/impmod/saracenattack1.wav
new file mode 100644
index 0000000..888a7aa
Binary files /dev/null and b/Sound/impmod/saracenattack1.wav differ
diff --git a/Sound/impmod/saracenattack2.wav b/Sound/impmod/saracenattack2.wav
new file mode 100644
index 0000000..b3e851c
Binary files /dev/null and b/Sound/impmod/saracenattack2.wav differ
diff --git a/Sound/impmod/saracenattack3.wav b/Sound/impmod/saracenattack3.wav
new file mode 100644
index 0000000..754c3d7
Binary files /dev/null and b/Sound/impmod/saracenattack3.wav differ
diff --git a/Sound/impmod/saracenmove1.wav b/Sound/impmod/saracenmove1.wav
new file mode 100644
index 0000000..9aaa445
Binary files /dev/null and b/Sound/impmod/saracenmove1.wav differ
diff --git a/Sound/impmod/saracenmove2.wav b/Sound/impmod/saracenmove2.wav
new file mode 100644
index 0000000..3506176
Binary files /dev/null and b/Sound/impmod/saracenmove2.wav differ
diff --git a/Sound/impmod/saracenmove3.wav b/Sound/impmod/saracenmove3.wav
new file mode 100644
index 0000000..5ae1c63
Binary files /dev/null and b/Sound/impmod/saracenmove3.wav differ
diff --git a/Sound/impmod/saracenselect1.wav b/Sound/impmod/saracenselect1.wav
new file mode 100644
index 0000000..1a904d4
Binary files /dev/null and b/Sound/impmod/saracenselect1.wav differ
diff --git a/Sound/impmod/saracenselect2.wav b/Sound/impmod/saracenselect2.wav
new file mode 100644
index 0000000..11155e3
Binary files /dev/null and b/Sound/impmod/saracenselect2.wav differ
diff --git a/Sound/impmod/saracenselect3.wav b/Sound/impmod/saracenselect3.wav
new file mode 100644
index 0000000..6d7e45e
Binary files /dev/null and b/Sound/impmod/saracenselect3.wav differ
diff --git a/Sound/musicm/battle/AoE3War.mp3 b/Sound/musicm/battle/AoE3War.mp3
deleted file mode 100644
index ffc5ac7..0000000
Binary files a/Sound/musicm/battle/AoE3War.mp3 and /dev/null differ
diff --git a/Sound/musicm/battle/Avenger.mp3 b/Sound/musicm/battle/Avenger.mp3
deleted file mode 100644
index 3d978d5..0000000
Binary files a/Sound/musicm/battle/Avenger.mp3 and /dev/null differ
diff --git a/Sound/musicm/battle/Battling.mp3 b/Sound/musicm/battle/Battling.mp3
deleted file mode 100644
index 5b5f2fd..0000000
Binary files a/Sound/musicm/battle/Battling.mp3 and /dev/null differ
diff --git a/Sound/musicm/interface/AcrossTheOcean.mp3 b/Sound/musicm/interface/AcrossTheOcean.mp3
deleted file mode 100644
index 3a07f8a..0000000
Binary files a/Sound/musicm/interface/AcrossTheOcean.mp3 and /dev/null differ
diff --git a/Sound/musicm/interface/GeluAustrinum.mp3 b/Sound/musicm/interface/GeluAustrinum.mp3
deleted file mode 100644
index d0269db..0000000
Binary files a/Sound/musicm/interface/GeluAustrinum.mp3 and /dev/null differ
diff --git a/Sound/musicm/interface/OldTimer.mp3 b/Sound/musicm/interface/OldTimer.mp3
deleted file mode 100644
index 0b55fcc..0000000
Binary files a/Sound/musicm/interface/OldTimer.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/AoE3.mp3 b/Sound/musicm/standard/AoE3.mp3
deleted file mode 100644
index 8cf3792..0000000
Binary files a/Sound/musicm/standard/AoE3.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/AoEO.mp3 b/Sound/musicm/standard/AoEO.mp3
deleted file mode 100644
index 4f7c48a..0000000
Binary files a/Sound/musicm/standard/AoEO.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/AoEO1.mp3 b/Sound/musicm/standard/AoEO1.mp3
deleted file mode 100644
index b5a89c2..0000000
Binary files a/Sound/musicm/standard/AoEO1.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/AoEO2.mp3 b/Sound/musicm/standard/AoEO2.mp3
deleted file mode 100644
index fb58fdb..0000000
Binary files a/Sound/musicm/standard/AoEO2.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/AoEO3.mp3 b/Sound/musicm/standard/AoEO3.mp3
deleted file mode 100644
index 7bc43b7..0000000
Binary files a/Sound/musicm/standard/AoEO3.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/AsianFeel.mp3 b/Sound/musicm/standard/AsianFeel.mp3
deleted file mode 100644
index f51b9d4..0000000
Binary files a/Sound/musicm/standard/AsianFeel.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/DidntSeeItComing.mp3 b/Sound/musicm/standard/DidntSeeItComing.mp3
deleted file mode 100644
index b555a9b..0000000
Binary files a/Sound/musicm/standard/DidntSeeItComing.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/MarchtoWar.mp3 b/Sound/musicm/standard/MarchtoWar.mp3
deleted file mode 100644
index f8dcee7..0000000
Binary files a/Sound/musicm/standard/MarchtoWar.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/TAD.mp3 b/Sound/musicm/standard/TAD.mp3
deleted file mode 100644
index 5625209..0000000
Binary files a/Sound/musicm/standard/TAD.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/TWC.mp3 b/Sound/musicm/standard/TWC.mp3
deleted file mode 100644
index 6c28caf..0000000
Binary files a/Sound/musicm/standard/TWC.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/aom.mp3 b/Sound/musicm/standard/aom.mp3
deleted file mode 100644
index ac2e74b..0000000
Binary files a/Sound/musicm/standard/aom.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/asian1.mp3 b/Sound/musicm/standard/asian1.mp3
deleted file mode 100644
index 0bbd946..0000000
Binary files a/Sound/musicm/standard/asian1.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/asian2.mp3 b/Sound/musicm/standard/asian2.mp3
deleted file mode 100644
index 84cfb7c..0000000
Binary files a/Sound/musicm/standard/asian2.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/asian3.mp3 b/Sound/musicm/standard/asian3.mp3
deleted file mode 100644
index 6c4107d..0000000
Binary files a/Sound/musicm/standard/asian3.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/asian4.mp3 b/Sound/musicm/standard/asian4.mp3
deleted file mode 100644
index ed6da81..0000000
Binary files a/Sound/musicm/standard/asian4.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/asian5.mp3 b/Sound/musicm/standard/asian5.mp3
deleted file mode 100644
index ab874ce..0000000
Binary files a/Sound/musicm/standard/asian5.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/black1.mp3 b/Sound/musicm/standard/black1.mp3
deleted file mode 100644
index 775c89d..0000000
Binary files a/Sound/musicm/standard/black1.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/black2.mp3 b/Sound/musicm/standard/black2.mp3
deleted file mode 100644
index ae672a4..0000000
Binary files a/Sound/musicm/standard/black2.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/feloniousjunk.mp3 b/Sound/musicm/standard/feloniousjunk.mp3
deleted file mode 100644
index 09f8d4b..0000000
Binary files a/Sound/musicm/standard/feloniousjunk.mp3 and /dev/null differ
diff --git a/Sound/musicm/standard/getyesum.mp3 b/Sound/musicm/standard/getyesum.mp3
deleted file mode 100644
index 5a588b6..0000000
Binary files a/Sound/musicm/standard/getyesum.mp3 and /dev/null differ
diff --git a/Sound/ypack/music/interface/MainTitlm.mp3 b/Sound/ypack/music/interface/MainTitlm.mp3
index d63fe35..1d10078 100644
Binary files a/Sound/ypack/music/interface/MainTitlm.mp3 and b/Sound/ypack/music/interface/MainTitlm.mp3 differ
diff --git a/age3m.exe b/age3m.exe
index fd33603..f87e22b 100644
Binary files a/age3m.exe and b/age3m.exe differ
diff --git a/startup/imp.cfg b/startup/imp.cfg
new file mode 100644
index 0000000..0ef629c
--- /dev/null
+++ b/startup/imp.cfg
@@ -0,0 +1 @@
+ExtraPop: 100
\ No newline at end of file