Fix RMG to place special dwellings like elemental conflux

CI/mac/before_install.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 brew update
-brew pin [email protected]
+#brew pin [email protected]
 brew install smpeg2 libpng freetype qt5 ffmpeg@4 ninja boost tbb luajit
 brew install sdl2 sdl2_ttf sdl2_image sdl2_mixer
 

lib/rmg/CRmgTemplateZone.cpp

@@ -1401,8 +1401,11 @@ bool CRmgTemplateZone::createRequiredObjects()
 		auto tilesBlockedByObject = obj.first->getBlockedOffsets();
 
 		bool finished = false;
-		while (!finished)
+		bool attempt = true;
+		while (!finished && attempt)
 		{
+			attempt = false;
+
 			std::vector<int3> tiles(possibleTiles.begin(), possibleTiles.end());
 			//new tiles vector after each object has been placed, OR misplaced area has been sealed off
 
@@ -1433,12 +1436,13 @@ bool CRmgTemplateZone::createRequiredObjects()
 			for (auto tile : tiles)
 			{
 				//code partially adapted from findPlaceForObject()
-
-				if (areAllTilesAvailable(obj.first, tile, tilesBlockedByObject))
+				if(areAllTilesAvailable(obj.first, tile, tilesBlockedByObject))
 					gen->setOccupied(pos, ETileType::BLOCKED); //why?
 				else
 					continue;
 
+				attempt = true;
+
 				EObjectPlacingResult::EObjectPlacingResult result = tryToPlaceObjectAndConnectToPath(obj.first, tile);
 				if (result == EObjectPlacingResult::SUCCESS)
 				{
@@ -2243,41 +2247,48 @@ void CRmgTemplateZone::addAllPossibleObjects()
 	oi.maxPerZone = std::numeric_limits<ui32>().max();
 
 	//dwellings
+	auto dwellingTypes = {Obj::CREATURE_GENERATOR1, Obj::CREATURE_GENERATOR4};
 
-	auto subObjects = VLC->objtypeh->knownSubObjects(Obj::CREATURE_GENERATOR1);
-
-	//don't spawn original "neutral" dwellings that got replaced by Conflux dwellings in AB
-	static int elementalConfluxROE[] = { 7, 13, 16, 47 };
-	for (int i = 0; i < 4; i++)
-		vstd::erase_if_present(subObjects, elementalConfluxROE[i]);
-
-	for (auto secondaryID : subObjects)
+	for(auto dwellingType : dwellingTypes)
 	{
-		auto dwellingHandler = dynamic_cast<const CDwellingInstanceConstructor*>(VLC->objtypeh->getHandlerFor(Obj::CREATURE_GENERATOR1, secondaryID).get());
-		auto creatures = dwellingHandler->getProducedCreatures();
-		if (creatures.empty())
-			continue;
+		auto subObjects = VLC->objtypeh->knownSubObjects(dwellingType);
+
+		if(dwellingType == Obj::CREATURE_GENERATOR1)
+		{
+			//don't spawn original "neutral" dwellings that got replaced by Conflux dwellings in AB
+			static int elementalConfluxROE[] = {7, 13, 16, 47};
+			for(int i = 0; i < 4; i++)
+				vstd::erase_if_present(subObjects, elementalConfluxROE[i]);
+		}
 
-		auto cre = creatures.front();
-		if (cre->faction == townType)
+		for(auto secondaryID : subObjects)
 		{
-			float nativeZonesCount = static_cast<float>(gen->getZoneCount(cre->faction));
-			oi.value = static_cast<ui32>(cre->AIValue * cre->growth * (1 + (nativeZonesCount / gen->getTotalZoneCount()) + (nativeZonesCount / 2)));
-			oi.probability = 40;
+			auto dwellingHandler = dynamic_cast<const CDwellingInstanceConstructor *>(VLC->objtypeh->getHandlerFor(dwellingType, secondaryID).get());
+			auto creatures = dwellingHandler->getProducedCreatures();
+			if(creatures.empty())
+				continue;
 
-			for (auto temp : dwellingHandler->getTemplates())
+			auto cre = creatures.front();
+			if(cre->faction == townType)
 			{
-				if (temp.canBePlacedAt(terrainType))
+				float nativeZonesCount = static_cast<float>(gen->getZoneCount(cre->faction));
+				oi.value = static_cast<ui32>(cre->AIValue * cre->growth * (1 + (nativeZonesCount / gen->getTotalZoneCount()) + (nativeZonesCount / 2)));
+				oi.probability = 40;
+
+				for(auto tmplate : dwellingHandler->getTemplates())
 				{
-					oi.generateObject = [temp, secondaryID]() -> CGObjectInstance *
+					if(tmplate.canBePlacedAt(terrainType))
 					{
-						auto obj = VLC->objtypeh->getHandlerFor(Obj::CREATURE_GENERATOR1, secondaryID)->create(temp);
-						obj->tempOwner = PlayerColor::NEUTRAL;
-						return obj;
-					};
+						oi.generateObject = [tmplate, secondaryID, dwellingType]() -> CGObjectInstance *
+						{
+							auto obj = VLC->objtypeh->getHandlerFor(dwellingType, secondaryID)->create(tmplate);
+							obj->tempOwner = PlayerColor::NEUTRAL;
+							return obj;
+						};
 
-					oi.templ = temp;
-					possibleObjects.push_back(oi);
+						oi.templ = tmplate;
+						possibleObjects.push_back(oi);
+					}
 				}
 			}
 		}