Move ObjectConfig to ObjectInfo.cpp. Preliminary version of banning object categories.

2025-11-27 22:49:25 +02:00 · 2024-08-24 15:12:22 +02:00
parent 85ee859b6e
commit 64fc2e5ed0
8 changed files with 250 additions and 113 deletions
--- a/lib/rmg/ObjectInfo.cpp
+++ b/lib/rmg/ObjectInfo.cpp
@@ -9,11 +9,14 @@
 */

 #include "StdInc.h"
+#include <boost/bimap.hpp>
+#include <boost/assign.hpp>
 #include "ObjectInfo.h"

 #include "../VCMI_Lib.h"
 #include "../mapObjectConstructors/CObjectClassesHandler.h"
 #include "../mapObjectConstructors/AObjectTypeHandler.h"
+#include "../serializer/JsonSerializeFormat.h"

 VCMI_LIB_NAMESPACE_BEGIN

@@ -56,16 +59,121 @@ void ObjectInfo::setTemplates(MapObjectID type, MapObjectSubID subtype, TerrainI
 	templates = templHandler->getTemplates(terrainType);
 }

-/*
-bool ObjectInfo::matchesId(const CompoundMapObjectID & id) const
+void ObjectConfig::addBannedObject(const CompoundMapObjectID & objid)
 {
-	for (const auto & templ : templates)
-	{
-		if (id.primaryID == templ->id && id.secondaryID == templ->subid)
-			return true;
-	}
-	return false;
+	// FIXME: We do not need to store the object info, just the id
+
+	bannedObjects.push_back(objid);
+
+	logGlobal->info("Banned object of type %d.%d", objid.primaryID, objid.secondaryID);
+}
+
+void ObjectConfig::serializeJson(JsonSerializeFormat & handler)
+{
+	// TODO: We need serializer utility for list of enum values
+
+	static const boost::bimap<EObjectCategory, std::string> OBJECT_CATEGORY_STRINGS = boost::assign::list_of<boost::bimap<EObjectCategory, std::string>::relation>
+		(EObjectCategory::OTHER, "other")
+		(EObjectCategory::ALL, "all")
+		(EObjectCategory::NONE, "none")
+		(EObjectCategory::CREATURE_BANK, "creatureBank")
+		(EObjectCategory::PERMANENT_BONUS, "permanentBonus")
+		(EObjectCategory::NEXT_BATTLE_BONUS, "nextBattleBonus")
+		(EObjectCategory::DWELLING, "dwelling")
+		(EObjectCategory::RESOURCE, "resource")
+		(EObjectCategory::RESOURCE_GENERATOR, "resourceGenerator")
+		(EObjectCategory::SPELL_SCROLL, "spellScroll")
+		(EObjectCategory::RANDOM_ARTIFACT, "randomArtifact")
+		(EObjectCategory::PANDORAS_BOX, "pandorasBox")
+		(EObjectCategory::QUEST_ARTIFACT, "questArtifact");
+
+	auto categories = handler.enterArray("bannedCategories");
+	if (handler.saving)
+	{
+		for (const auto& category : bannedObjectCategories)
+		{
+			auto str = OBJECT_CATEGORY_STRINGS.left.at(category);
+			categories.serializeString(categories.size(), str);
+		}
+	}
+	else
+	{
+		std::vector<std::string> categoryNames;
+		categories.serializeArray(categoryNames);
+
+		for (const auto & categoryName : categoryNames)
+		{
+			auto it = OBJECT_CATEGORY_STRINGS.right.find(categoryName);
+			if (it != OBJECT_CATEGORY_STRINGS.right.end())
+			{
+				bannedObjectCategories.push_back(it->second);
+			}
+		}
+	}
+	
+	auto bannedObjectData = handler.enterArray("bannedObjects");	
+	if (handler.saving)
+	{
+
+		// FIXME: Do we even need to serialize / store banned objects?
+		/*
+		for (const auto & object : bannedObjects)
+		{
+			// TODO: Translate id back to string?
+
+
+			JsonNode node;
+			node.String() = VLC->objtypeh->getHandlerFor(object.primaryID, object.secondaryID);
+			// TODO: Check if AI-generated code is right
+
+
+		}
+		// handler.serializeRaw("bannedObjects", node, std::nullopt);
+
+		*/
+	}
+	else
+	{
+		/*
+			auto zonesData = handler.enterStruct("zones");
+			for(const auto & idAndZone : zonesData->getCurrent().Struct())
+			{
+				auto guard = handler.enterStruct(idAndZone.first);
+				auto zone = std::make_shared<ZoneOptions>();
+				zone->setId(decodeZoneId(idAndZone.first));
+				zone->serializeJson(handler);
+				zones[zone->getId()] = zone;
+			}
+		*/
+		std::vector<std::string> objectNames;
+		bannedObjectData.serializeArray(objectNames);
+
+		for (const auto & objectName : objectNames)
+		{
+			VLC->objtypeh->resolveObjectCompoundId(objectName,
+				[this](CompoundMapObjectID objid)
+				{
+					addBannedObject(objid);
+				}
+			);
+			
+		}
+	}
+}
+
+const std::vector<ObjectInfo> & ObjectConfig::getCustomObjects() const
+{
+	return customObjects;
+}
+
+const std::vector<CompoundMapObjectID> & ObjectConfig::getBannedObjects() const
+{
+	return bannedObjects;
+}
+
+const std::vector<ObjectConfig::EObjectCategory> & ObjectConfig::getBannedObjectCategories() const
+{
+	return bannedObjectCategories;
 }
-*/

 VCMI_LIB_NAMESPACE_END