Fix condition swaps

Author: powerof3

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 set(NAME "po3_BaseObjectSwapper" CACHE STRING "")
-set(VERSION 3.1.0 CACHE STRING "")
+set(VERSION 3.1.1 CACHE STRING "")
 set(VR_VERSION 1)
 set(AE_VERSION 1)
 

src/ConditionalData.cpp

@@ -1,6 +1,7 @@
 #include "ConditionalData.h"
 
-ConditionFilters::ConditionFilters(std::vector<std::string>& a_conditions)
+ConditionFilters::ConditionFilters(std::string a_conditionID, std::vector<std::string>& a_conditions) :
+	conditionID(std::move(a_conditionID))
 {
 	NOT.reserve(a_conditions.size());
 	MATCH.reserve(a_conditions.size());

src/ConditionalData.h

@@ -4,37 +4,35 @@ struct ConditionFilters
 {
 public:
 	ConditionFilters() = default;
-	ConditionFilters(std::vector<std::string>& a_conditions);
+	ConditionFilters(std::string a_conditionID, std::vector<std::string>& a_conditions);
 
-	// members
-	std::vector<FormIDStr> NOT{};
-	std::vector<FormIDStr> MATCH{};
-};
+	bool operator==(const ConditionFilters& a_rhs) const
+	{
+		return conditionID == a_rhs.conditionID;
+	}
 
-template <class T>
-struct ConditionalData
-{
-public:
-	ConditionalData() = default;
-	ConditionalData(const ConditionFilters& a_filters, const T& a_data) :
-		filters(a_filters)
+	bool operator<(const ConditionFilters& a_rhs) const
 	{
-		data.push_back(a_data);
+		return conditionID < a_rhs.conditionID;
 	}
 
 	// members
-	ConditionFilters filters;
-	std::vector<T>   data;
+	std::string            conditionID{}; // path|condition1,condition2
+	std::vector<FormIDStr> NOT{};
+	std::vector<FormIDStr> MATCH{};
 };
 
+template <class T>
+using ConditionalData = std::map<ConditionFilters, std::vector<T>>;
+
 struct ConditionalInput
 {
 	ConditionalInput(const RE::TESObjectREFR* a_ref, const RE::TESForm* a_form) :
 		ref(a_ref),
 		base(a_form),
 		currentCell(a_ref->GetSaveParentCell()),
 		currentLocation(a_ref->GetCurrentLocation()),
-		currentRegionList(currentCell ? currentCell->GetRegionList(false): nullptr)
+		currentRegionList(currentCell ? currentCell->GetRegionList(false) : nullptr)
 	{}
 
 	[[nodiscard]] bool IsValid(RE::FormID a_formID) const;

src/Manager.cpp

@@ -47,7 +47,7 @@ namespace FormSwap
 
 					logger::info("\treading [{}] : {} conditions", splitSection[0], conditions.size());
 
-					ConditionFilters processedConditions(conditions);
+					ConditionFilters processedConditions(path.substr(5) + "|" + splitSection[1], conditions);
 
 					CSimpleIniA::TNamesDepend values;
 					ini.GetAllKeys(section.c_str(), values);
@@ -58,14 +58,14 @@ namespace FormSwap
 							logger::info("\t\t\t{} form swaps found", values.size());
 							for (const auto& key : values) {
 								SwapFormData::GetForms(path, key.pItem, [&](const RE::FormID a_baseID, const SwapFormData& a_swapData) {
-									swapFormsConditional[a_baseID].emplace_back(processedConditions, a_swapData);
+									swapFormsConditional[a_baseID][processedConditions].emplace_back(a_swapData);
 								});
 							}
 						} else {
 							logger::info("\t\t\t{} ref property overrides found", values.size());
 							for (const auto& key : values) {
 								ObjectData::GetProperties(path, key.pItem, [&](const RE::FormID a_baseID, const ObjectData& a_objectData) {
-									refPropertiesConditional[a_baseID].emplace_back(processedConditions, a_objectData);
+									refPropertiesConditional[a_baseID][processedConditions].emplace_back(a_objectData);
 								});
 							}
 						}
@@ -158,12 +158,12 @@ namespace FormSwap
 		if (const auto it = swapFormsConditional.find(a_base->GetFormID()); it != swapFormsConditional.end()) {
 			const ConditionalInput input(a_ref, a_base);
 
-			auto result = std::ranges::find_if(it->second | std::views::reverse, [&](auto& conditionalData) { return input.IsValid(conditionalData.filters); });
-
-			if (result != it->second.rend()) {
-				for (auto& swapData : result->data | std::ranges::views::reverse) {
-					if (auto swapObject = swapData.GetSwapBase(a_ref)) {
-						return { swapObject, swapData.properties };
+			for (auto& [filters, swapDataVec] : it->second | std::ranges::views::reverse) {
+				if (input.IsValid(filters)) {
+					for (auto& swapData : swapDataVec | std::ranges::views::reverse) {
+						if (auto swapObject = swapData.GetSwapBase(a_ref)) {
+							return { swapObject, swapData.properties };
+						}
 					}
 				}
 			}
@@ -177,12 +177,12 @@ namespace FormSwap
 		if (const auto it = refPropertiesConditional.find(a_base->GetFormID()); it != refPropertiesConditional.end()) {
 			const ConditionalInput input(a_ref, a_base);
 
-			auto result = std::ranges::find_if(it->second | std::views::reverse, [&](auto& conditionalData) { return input.IsValid(conditionalData.filters); });
-
-			if (result != it->second.rend()) {
-				for (auto& objectData : result->data | std::ranges::views::reverse) {
-					if (objectData.HasValidProperties(a_ref)) {
-						return objectData.properties;
+			for (auto& [filters, objectDataVec] : it->second | std::ranges::views::reverse) {
+				if (input.IsValid(filters)) {
+					for (auto& objectData : objectDataVec | std::ranges::views::reverse) {
+						if (objectData.HasValidProperties(a_ref)) {
+							return objectData.properties;
+						}
 					}
 				}
 			}

src/Manager.h

@@ -22,12 +22,12 @@ namespace FormSwap
 		void LoadForms();
 
 		// members
-		FormIDMap<SwapFormDataVec>                      swapRefs{};
-		FormIDMap<std::vector<SwapFormDataConditional>> swapFormsConditional{};
-		FormIDMap<SwapFormDataVec>                      swapForms{};
+		FormIDMap<SwapFormDataVec>         swapRefs{};
+		FormIDMap<SwapFormDataConditional> swapFormsConditional{};
+		FormIDMap<SwapFormDataVec>         swapForms{};
 
-		FormIDMap<ObjectDataVec>                      refProperties{};
-		FormIDMap<std::vector<ObjectDataConditional>> refPropertiesConditional{};
+		FormIDMap<ObjectDataVec>         refProperties{};
+		FormIDMap<ObjectDataConditional> refPropertiesConditional{};
 
 		Set<RE::FormID> swappedLeveledItemRefs{};
 

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "base-object-swapper",
-  "version-string": "3.1.0",
+  "version-string": "3.1.1",
   "description": "Base Object Swapper",
   "homepage": "",
   "license": "MIT",