Merge branch 'master' of https://github.com/powerof3/BaseObjectSwapper

alandtse · alandtse · commit 2cd41e878b82 · 2025-07-30T00:20:26.000-07:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,4 +30,4 @@ jobs:
       FOMOD_AE_DESCR: 'Select this if you are using Skyrim Anniversary Edition v1.6.1130 or higher (latest update).'
       FOMOD_AE_MIN_GAME_VERSION: '1.6.1130.0'
       PUBLISH_ARCHIVE_TYPE: '7z'
-      VCPKG_COMMIT_ID: 'f7423ee180c4b7f40d43402c2feb3859161ef625'
+      VCPKG_COMMIT_ID: '53b9816594558d0b78529ecce2bf4a97d0a0729e'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 set(NAME "po3_BaseObjectSwapper" CACHE STRING "")
-set(VERSION 3.1.1 CACHE STRING "")
+set(VERSION 3.4.1 CACHE STRING "")
 set(VR_VERSION 1)
 set(AE_VERSION 1)
 
@@ -134,6 +134,7 @@ else ()
 endif()
 
 find_package(unordered_dense CONFIG REQUIRED)
+find_package(boost_container_hash CONFIG REQUIRED)
 
 find_path(SRELL_INCLUDE_DIRS "srell.hpp")
 find_path(MERGEMAPPER_INCLUDE_DIRS "MergeMapperPluginAPI.h")
@@ -200,6 +201,7 @@ target_link_libraries(
 	PRIVATE
 		${CommonLibName}::${CommonLibName}
 		unordered_dense::unordered_dense
+		Boost::container_hash
 )
 
 target_precompile_headers(
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -11,7 +11,8 @@
       "hidden": true,
       "cacheVariables": {
         "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:W0 $penv{CXXFLAGS}",
+        "CMAKE_CXX_FLAGS_RELEASE": "/O2 /DNDEBUG"
       },
       "errors": {
         "deprecated": true
diff --git a/cmake/ports/clib-util/portfile.cmake b/cmake/ports/clib-util/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO powerof3/CLibUtil
-    REF a491e2f7919211eac6d32dd2814b7908134ec1b2
-    SHA512 e6b830a061d7fc99115ee7d28de0165b8c6281006df6d053342e6b5b85606a46a846ebb30f3e4598aa976c25cfe7a9dffd1c4eb72942829d1a4615d81e62cf3c
+    REF a7a877a0551592cba58f7fc36d94d1a6d1a14db9
+    SHA512 cfebe14121c41f2400bc85deeb881d631ecf0a9216bca7e963b5c7ef5de46d4048752dae1552915fb9927d25f71d430c6d2f92be195a8130ec15a5457491d473
     HEAD_REF master
 )
 
diff --git a/cmake/ports/clib-util/vcpkg.json b/cmake/ports/clib-util/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "clib-util",
-  "version-string": "1.4.0",
+  "version-string": "1.4.4",
   "port-version": 1,
   "description": "",
   "homepage": "https://github.com/powerof3/CLibUtil"
diff --git a/extern/CommonLibSSE b/extern/CommonLibSSE
@@ -1 +1 @@
-Subproject commit 7e55b89ac555612b060ffd4fc68a29eca0cac575
+Subproject commit a3ca17a13559d5c12b689c6c01779fd0a4acbc65
diff --git a/extern/CommonLibVR b/extern/CommonLibVR
@@ -1 +1 @@
-Subproject commit db1e020ee5e5924a5fc7c6cbff6991065509ce4b
+Subproject commit 545cc78ca7e787adf4de6474a9e77b3b2e781b2c
diff --git a/src/ConditionalData.cpp b/src/ConditionalData.cpp
@@ -48,6 +48,11 @@ bool ConditionalInput::IsValid(RE::FormID a_formID) const
 			}
 		case RE::FormType::Cell:
 			return currentCell == form;
+		case RE::FormType::WorldSpace:
+			{
+				const auto worldspace = form->As<RE::TESWorldSpace>();
+				return currentWorldspace && (currentWorldspace == worldspace || currentWorldspace->parentWorld == worldspace);
+			}
 		default:
 			break;
 		}
diff --git a/src/ConditionalData.h b/src/ConditionalData.h
@@ -17,7 +17,7 @@ struct ConditionFilters
 	}
 
 	// members
-	std::string            conditionID{}; // path|condition1,condition2
+	std::string            conditionID{};  // path|condition1,condition2
 	std::vector<FormIDStr> NOT{};
 	std::vector<FormIDStr> MATCH{};
 };
@@ -31,6 +31,7 @@ struct ConditionalInput
 		ref(a_ref),
 		base(a_form),
 		currentCell(a_ref->GetSaveParentCell()),
+		currentWorldspace(a_ref->GetWorldspace()),
 		currentLocation(a_ref->GetCurrentLocation()),
 		currentRegionList(currentCell ? currentCell->GetRegionList(false) : nullptr)
 	{}
@@ -45,6 +46,7 @@ struct ConditionalInput
 	const RE::TESObjectREFR* ref;
 	const RE::TESForm*       base;
 	RE::TESObjectCELL*       currentCell;
+	RE::TESWorldSpace*       currentWorldspace;
 	RE::BGSLocation*         currentLocation;
 	RE::TESRegionList*       currentRegionList;
 };
diff --git a/src/Manager.cpp b/src/Manager.cpp
@@ -217,25 +217,27 @@ namespace FormSwap
 			return { nullptr, std::nullopt };
 		};
 
+		// references -> conditional forms -> forms
 		if (!a_ref->IsDynamicForm()) {
 			swapData = get_swap_base(a_ref, swapRefs);
 		}
-
 		if (!swapData.first) {
 			swapData = GetSwapFormConditional(a_ref, a_base);
 		}
-
 		if (!swapData.first) {
 			swapData = get_swap_base(a_base, swapForms);
 		}
 
+		// process leveled swaps. do not swap if leveled item has encounter zone
 		if (const auto swapLvlBase = swapData.first ? swapData.first->As<RE::TESLevItem>() : nullptr) {
 			if (a_ref->GetEncounterZone() == nullptr) {
 				RE::BSScrapArray<RE::CALCED_OBJECT> calcedObjects{};
 				swapLvlBase->CalculateCurrentFormList(a_ref->GetCalcLevel(false), 1, calcedObjects, 0, true);
 				if (!calcedObjects.empty()) {
 					swapData.first = static_cast<RE::TESBoundObject*>(calcedObjects.front().form);
 				}
+			} else {
+				swapData.first = nullptr;
 			}
 		}
 
@@ -255,14 +257,13 @@ namespace FormSwap
 			return a_result && a_result->IsValid();
 		};
 
+		// references -> conditional forms -> forms
 		if (!has_properties(swapData.second) && !a_ref->IsDynamicForm()) {
 			swapData.second = get_properties(a_ref);
 		}
-
 		if (!has_properties(swapData.second)) {
 			swapData.second = GetObjectPropertiesConditional(a_ref, a_base);
 		}
-
 		if (!has_properties(swapData.second)) {
 			swapData.second = get_properties(a_base);
 		}
diff --git a/src/Manager.h b/src/Manager.h
@@ -4,7 +4,7 @@
 
 namespace FormSwap
 {
-	class Manager : public ISingleton<Manager>
+	class Manager : public REX::Singleton<Manager>
 	{
 	public:
 		void LoadFormsOnce();
diff --git a/src/ObjectProperties.cpp b/src/ObjectProperties.cpp
@@ -1,7 +1,7 @@
 #include "ObjectProperties.h"
 
-RandValueParams::RandValueParams(CHANCE_TYPE a_type, const RE::TESObjectREFR* a_ref) :
-	rng(a_type, a_ref)
+RandValueParams::RandValueParams(Chance a_chance, const RE::TESObjectREFR* a_ref) :
+	rng(a_chance, a_ref)
 {}
 
 FloatRange::FloatRange(const std::string& a_str)
@@ -139,15 +139,15 @@ bool ObjectProperties::IsValid() const
 	return location || rotation || refScale || recordFlagsSet != 0 || recordFlagsUnset != 0;
 }
 
-void ObjectProperties::SetChanceType(CHANCE_TYPE a_type)
+void ObjectProperties::SetChance(Chance a_chance)
 {
-	chanceType = a_type;
+	chance = a_chance;
 }
 
 void ObjectProperties::SetTransform(RE::TESObjectREFR* a_refr) const
 {
 	if (location || rotation || refScale) {
-		RandValueParams params(chanceType, a_refr);
+		RandValueParams params(chance, a_refr);
 		if (location) {
 			location->SetTransform(a_refr->data.location, params);
 		}
diff --git a/src/ObjectProperties.h b/src/ObjectProperties.h
@@ -4,7 +4,7 @@
 
 struct RandValueParams
 {
-	RandValueParams(CHANCE_TYPE a_type, const RE::TESObjectREFR* a_ref);
+	RandValueParams(Chance a_chance, const RE::TESObjectREFR* a_ref);
 
 	BOS_RNG rng{};
 	bool    clamp{ false };
@@ -72,15 +72,15 @@ class ObjectProperties
 
 	bool IsValid() const;
 
-	void SetChanceType(CHANCE_TYPE a_type);
+	void SetChance(Chance a_chance);
 	void SetTransform(RE::TESObjectREFR* a_refr) const;
 	void SetRecordFlags(RE::TESObjectREFR* a_refr) const;
 
 private:
 	void assign_record_flags(const std::string& a_str, bool a_unsetFlag);
 
 	// members
-	CHANCE_TYPE chanceType{ CHANCE_TYPE::kRefHash };
+	Chance chance{};
 
 	std::optional<Point3Range> location{ std::nullopt };
 	std::optional<Point3Range> rotation{ std::nullopt };
diff --git a/src/PCH.h b/src/PCH.h
@@ -6,21 +6,23 @@
 #include <ranges>
 
 #include "RE/Skyrim.h"
+#include "REX/REX/Singleton.h"
 #include "SKSE/SKSE.h"
 
 #include <MergeMapperPluginAPI.h>
 
 #include <ankerl/unordered_dense.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <srell.hpp>
+#include <boost/container_hash/hash.hpp>
 
 #include <CLibUtil/distribution.hpp>
 #include <CLibUtil/hash.hpp>
 #include <CLibUtil/numeric.hpp>
 #include <CLibUtil/rng.hpp>
 #include <CLibUtil/string.hpp>
 #include <ClibUtil/simpleINI.hpp>
-#include <ClibUtil/singleton.hpp>
+
 #include <ClibUtil/editorID.hpp>
 
 #define DLLEXPORT __declspec(dllexport)
@@ -29,7 +31,6 @@ namespace logger = SKSE::log;
 using namespace std::literals;
 
 using namespace clib_util;
-using namespace clib_util::singleton;
 using SeedRNG = clib_util::RNG;
 
 // for visting variants
@@ -45,9 +46,12 @@ template <class K, class D>
 using Map = ankerl::unordered_dense::map<K, D>;
 template <class T>
 using Set = ankerl::unordered_dense::set<T>;
+template <class T>
+using OrderedSet = std::set<T>;
 
 using FormIDSet = Set<RE::FormID>;
 using FormIDOrSet = std::variant<RE::FormID, FormIDSet>;
+using FormIDOrderedSet = OrderedSet<RE::FormID>;
 
 template <class T>
 using FormIDMap = Map<RE::FormID, T>;
diff --git a/src/RNG.cpp b/src/RNG.cpp
@@ -1,37 +1,66 @@
 #include "RNG.h"
 
-BOS_RNG::BOS_RNG(CHANCE_TYPE a_type, const RE::TESObjectREFR* a_ref) :
-	type(a_type)
+std::uint64_t BOS_RNG::get_form_seed(const RE::TESForm* a_form)
+{
+	if (a_form->IsDynamicForm()) {
+		return a_form->GetFormID();
+	}
+
+	std::uint64_t result = 0;
+	boost::hash_combine(result, a_form->GetLocalFormID());
+
+	auto fileName = a_form->GetFile(0)->GetFilename();
+	if (a_form->AsReference() && (a_form->GetFormID() & 0xFF000000) == 0) {
+		fileName = "Skyrim.esm"sv;
+	}
+	boost::hash_combine(result, fileName);
+
+	return result;
+}
+
+BOS_RNG::BOS_RNG(const Chance& a_chance, const RE::TESObjectREFR* a_ref) :
+	type(a_chance.chanceType)
 {
 	switch (type) {
 	case CHANCE_TYPE::kRefHash:
-		seed = a_ref->GetFormID();
+		seed = get_form_seed(a_ref);
 		break;
 	case CHANCE_TYPE::kLocationHash:
 		{
-			auto baseID = a_ref->GetBaseObject()->GetFormID();
-			auto location = a_ref->GetCurrentLocation();
+			auto base = a_ref->GetBaseObject();
+			auto location = a_ref->GetEditorLocation();
 			auto cell = a_ref->GetSaveParentCell();
 
 			if (!location && !cell) {
-				seed = a_ref->GetFormID();
+				seed = get_form_seed(a_ref);
 			} else {
-				RE::FormID locID = 0;
+				RE::TESForm* cellOrLoc = nullptr;
 				if (location) {
-					locID = location->GetFormID();
+					cellOrLoc = location;
 				} else if (cell) {
-					locID = cell->GetFormID();
+					cellOrLoc = cell;
 				}
 				// generate hash based on location + baseID
-				seed = hash::szudzik_pair(locID, baseID);
+				std::uint64_t result = 0;
+				boost::hash_combine(result, get_form_seed(cellOrLoc));
+				boost::hash_combine(result, get_form_seed(base));
+				seed = result;
 			}
 		}
 		break;
+	case CHANCE_TYPE::kRandom:
+		seed = a_chance.seed;
+		break;
 	default:
 		break;
 	}
 }
 
+BOS_RNG::BOS_RNG(const Chance& a_chance) :
+	type(a_chance.chanceType),
+	seed(a_chance.seed)
+{}
+
 Chance::Chance(const std::string& a_str)
 {
 	if (distribution::is_valid_entry(a_str)) {
@@ -43,8 +72,11 @@ Chance::Chance(const std::string& a_str)
 			} else {
 				chanceType = CHANCE_TYPE::kRefHash;
 			}
+
 			if (srell::cmatch match; srell::regex_search(a_str.c_str(), match, regex::generic)) {
-				chanceValue = string::to_num<float>(match[1].str());
+				const auto chanceOptions = string::split(match[1].str(), ",");
+				chanceValue = string::to_num<float>(chanceOptions[0]);
+				seed = chanceOptions.size() > 1 ? string::to_num<std::uint64_t>(chanceOptions[1]) : 0;
 			}
 		}
 	}
@@ -53,7 +85,7 @@ Chance::Chance(const std::string& a_str)
 bool Chance::PassedChance(const RE::TESObjectREFR* a_ref) const
 {
 	if (chanceValue < 100.0f) {
-		BOS_RNG rng(chanceType, a_ref);
+		BOS_RNG rng(*this, a_ref);
 		if (const auto rngValue = rng.generate<float>(0.0f, 100.0f); rngValue > chanceValue) {
 			return false;
 		}
diff --git a/src/RNG.h b/src/RNG.h
diff --git a/src/SwapData.cpp b/src/SwapData.cpp
diff --git a/src/Util.cpp b/src/Util.cpp
diff --git a/src/Util.h b/src/Util.h
diff --git a/vcpkg.json b/vcpkg.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "clib-util",`
`3`		`- "version-string": "1.4.0",`
	`3`	`+ "version-string": "1.4.4",`
`4`	`4`	`"port-version": 1,`
`5`	`5`	`"description": "",`
`6`	`6`	`"homepage": "https://github.com/powerof3/CLibUtil"`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ bool ConditionalInput::IsValid(RE::FormID a_formID) const`
`48`	`48`	`}`
`49`	`49`	`case RE::FormType::Cell:`
`50`	`50`	`return currentCell == form;`
	`51`	`+ case RE::FormType::WorldSpace:`
	`52`	`+ {`
	`53`	`+ const auto worldspace = form->As<RE::TESWorldSpace>();`
	`54`	`+ return currentWorldspace && (currentWorldspace == worldspace \|\| currentWorldspace->parentWorld == worldspace);`
	`55`	`+ }`
`51`	`56`	`default:`
`52`	`57`	`break;`
`53`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,25 +217,27 @@ namespace FormSwap`
`217`	`217`	`return { nullptr, std::nullopt };`
`218`	`218`	`};`
`219`	`219`
	`220`	`+ // references -> conditional forms -> forms`
`220`	`221`	`if (!a_ref->IsDynamicForm()) {`
`221`	`222`	`swapData = get_swap_base(a_ref, swapRefs);`
`222`	`223`	`}`
`223`		`-`
`224`	`224`	`if (!swapData.first) {`
`225`	`225`	`swapData = GetSwapFormConditional(a_ref, a_base);`
`226`	`226`	`}`
`227`		`-`
`228`	`227`	`if (!swapData.first) {`
`229`	`228`	`swapData = get_swap_base(a_base, swapForms);`
`230`	`229`	`}`
`231`	`230`
	`231`	`+ // process leveled swaps. do not swap if leveled item has encounter zone`
`232`	`232`	`if (const auto swapLvlBase = swapData.first ? swapData.first->As<RE::TESLevItem>() : nullptr) {`
`233`	`233`	`if (a_ref->GetEncounterZone() == nullptr) {`
`234`	`234`	`RE::BSScrapArray<RE::CALCED_OBJECT> calcedObjects{};`
`235`	`235`	`swapLvlBase->CalculateCurrentFormList(a_ref->GetCalcLevel(false), 1, calcedObjects, 0, true);`
`236`	`236`	`if (!calcedObjects.empty()) {`
`237`	`237`	`swapData.first = static_cast<RE::TESBoundObject*>(calcedObjects.front().form);`
`238`	`238`	`}`
	`239`	`+ } else {`
	`240`	`+ swapData.first = nullptr;`
`239`	`241`	`}`
`240`	`242`	`}`
`241`	`243`
`@@ -255,14 +257,13 @@ namespace FormSwap`
`255`	`257`	`return a_result && a_result->IsValid();`
`256`	`258`	`};`
`257`	`259`
	`260`	`+ // references -> conditional forms -> forms`
`258`	`261`	`if (!has_properties(swapData.second) && !a_ref->IsDynamicForm()) {`
`259`	`262`	`swapData.second = get_properties(a_ref);`
`260`	`263`	`}`
`261`		`-`
`262`	`264`	`if (!has_properties(swapData.second)) {`
`263`	`265`	`swapData.second = GetObjectPropertiesConditional(a_ref, a_base);`
`264`	`266`	`}`
`265`		`-`
`266`	`267`	`if (!has_properties(swapData.second)) {`
`267`	`268`	`swapData.second = get_properties(a_base);`
`268`	`269`	`}`