Prevent swapping if leveled item has encounter zone and was skipped

Author: powerof3

.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: 'b8ac6696e3af59f4f0666ab81a48ae589cde00a8'
+      VCPKG_COMMIT_ID: '41626fd77bf42f29e8f7e43dc1f2f05780588cde'

CMakeLists.txt

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

extern/CommonLibSSE

@@ -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);
 		}

extern/CommonLibVR

@@ -1,6 +1,6 @@
 {
   "name": "base-object-swapper",
-  "version-string": "3.3.0",
+  "version-string": "3.3.1",
   "description": "Base Object Swapper",
   "homepage": "",
   "license": "MIT",
@@ -13,5 +13,5 @@
     "unordered-dense",
     "xbyak"
   ],
-  "builtin-baseline": "b8ac6696e3af59f4f0666ab81a48ae589cde00a8"
+  "builtin-baseline": "41626fd77bf42f29e8f7e43dc1f2f05780588cde"
 }