Make fixed chance ignore plugin load order

Author: powerof3

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 set(NAME "po3_BaseObjectSwapper" CACHE STRING "")
-set(VERSION 3.3.1 CACHE STRING "")
+set(VERSION 3.4.0 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(

extern/CommonLibSSE

@@ -14,6 +14,7 @@
 #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>

src/PCH.h

@@ -1,29 +1,44 @@
 #include "RNG.h"
 
+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());
+	boost::hash_combine(result, a_form->GetFile(0)->GetFilename());
+	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;

src/RNG.cpp

@@ -40,4 +40,7 @@ struct BOS_RNG
 	// members
 	CHANCE_TYPE   type;
 	std::uint64_t seed{ 0 };
+
+private:
+	std::uint64_t get_form_seed(const RE::TESForm* a_form);
 };

src/RNG.h

@@ -1,10 +1,11 @@
 {
   "name": "base-object-swapper",
-  "version-string": "3.3.1",
+  "version-string": "3.4.0",
   "description": "Base Object Swapper",
   "homepage": "",
   "license": "MIT",
   "dependencies": [
+    "boost-container-hash",
     "clib-util",
     "mergemapper",
     "rsm-binary-io",