chore: Update so Shad0w can break it all for me <3

Author: FlenarnDev

Plugin/src/Events/BSAnimationGraphEvent.h

@@ -29,12 +29,43 @@ namespace RE
 
 					if (AmmoSwitch::ammoToSwitchTo)
 					{
-						instanceDataWEAP->ammo = AmmoSwitch::ammoToSwitchTo;
+						PlayerCharacter* playerCharacter = PlayerCharacter::GetSingleton();
+
+						BGSInventoryItem* inventoryItem = nullptr;
+						TESObjectWEAP* tesWEAP = (TESObjectWEAP*)AmmoSwitch::equippedInstance->object;
+						TESFormID weaponFormID = tesWEAP->GetFormID();
+						for (BGSInventoryItem& item : playerCharacter->inventoryList->data)
+						{
+							if (item.object->GetFormID() == weaponFormID)
+							{
+								inventoryItem = &item;
+								break;
+							}
+						}
+
+						if (inventoryItem)
+						{
+							DEBUG("Inventory item found.");
+							BGSMod::Attachment::Mod* modTest = TESDataHandler::GetSingleton()->LookupForm<BGSMod::Attachment::Mod>(0x0009C2, "CAS_Jimswapping.esp");
+							//BGSInventoryItem::Stack* stack = inventoryItem->GetStackByID(0);
+
+							bool test = false;
+							BGSInventoryItem::CheckStackIDFunctor compareFunction(0);
+							BGSInventoryItem::ModifyModDataFunctor writeDataFunction(modTest, 0, true, &test);
+							DEBUG("Managed to write new mod data: {}", test);
+							playerCharacter->FindAndWriteStackDataForInventoryItem(tesWEAP, compareFunction, writeDataFunction);
+							playerCharacter->currentProcess->SetCurrentAmmo(BGSEquipIndex{ 0 }, AmmoSwitch::ammoToSwitchTo);
+							playerCharacter->SetCurrentAmmoCount(BGSEquipIndex{ 0 }, 0);
+							(Actor*)playerCharacter->ReloadWeapon(weaponInstance, BGSEquipIndex{ 0 });
+						}
+						
+							
+						/**instanceDataWEAP->ammo = AmmoSwitch::ammoToSwitchTo;
 						PlayerCharacter* playerCharacter = PlayerCharacter::GetSingleton();
 						playerCharacter->currentProcess->SetCurrentAmmo(BGSEquipIndex{ 0 }, AmmoSwitch::ammoToSwitchTo);
 						playerCharacter->SetCurrentAmmoCount(BGSEquipIndex{ 0 }, 0);
 						(Actor*)playerCharacter->ReloadWeapon(weaponInstance, BGSEquipIndex{ 0 });
-						PipboyDataManager::GetSingleton()->inventoryData.RepopulateItemCardsOnSection(ENUM_FORM_ID::kWEAP);
+						PipboyDataManager::GetSingleton()->inventoryData.RepopulateItemCardsOnSection(ENUM_FORM_ID::kWEAP);*/
 					}
 
 					AmmoSwitch::switchingAmmo = false;

Plugin/src/Systems/AmmoSwitch.cpp

@@ -12,9 +12,15 @@ namespace RE
 
 			BSTArray<BGSKeyword*> keywordsAmmo;
 			std::unordered_map<BGSKeyword*, BGSListForm*> keywordFormlistMap;
+
+			BSTArray<BGSKeyword*> keywordsOMOD;
+			
 			BGSKeyword* noFormlistWEAP;
 			BGSKeyword* uniqueFormlistWEAP;
 			BGSKeyword* materialChange;
+			BGSKeyword* omodAP;
+
+			std::vector<std::pair<BGSKeyword*, BGSMod::Attachment::Mod*>> omodFormListMap;
 
 			bool InitializeAmmoSwitch() {
 				// Return true to make sure proper menu audio is played if ammo switch is successfully initiated, otherwise false return.
@@ -168,6 +174,8 @@ namespace RE
 
 					if (inventoryItem)
 					{
+
+
 						ExtraDataList* extraDataList = inventoryItem->stackData->extra.get();
 						BGSObjectInstanceExtra* objectModData = (BGSObjectInstanceExtra*)extraDataList->GetByType(EXTRA_DATA_TYPE::kObjectInstance);
 						if (objectModData)
@@ -190,12 +198,15 @@ namespace RE
 				TESDataHandler* dataHandler = TESDataHandler::GetSingleton();
 				BSTArray<TESForm*> ammoEntries = dataHandler->formArrays[std::to_underlying(ENUM_FORM_ID::kAMMO)];
 				BSTArray<TESForm*> keywordEntries = dataHandler->formArrays[std::to_underlying(ENUM_FORM_ID::kKYWD)];
+				BSTArray<TESForm*> omodEntries = dataHandler->formArrays[std::to_underlying(ENUM_FORM_ID::kOMOD)];
 				noFormlistWEAP = dataHandler->LookupForm<BGSKeyword>(0x2D9AB8, "FalloutCascadia.esm");
 				uniqueFormlistWEAP = dataHandler->LookupForm<BGSKeyword>(0x2D9AB9, "FalloutCascadia.esm");
+				omodAP = dataHandler->LookupForm<BGSKeyword>(0x0008FC, "CAS_AmmoSwitch_OMOD.esp");
 				materialChange = dataHandler->LookupForm<BGSKeyword>(0x000001, "CAS_AmmoSwitch_Extension.esp");
 
 				const char* standardListPrefix = "CAS_AmmoSwitch_Standard_";
 				const char* uniqueListPrefix = "CAS_AmmoSwitch_Unique_";
+				const char* omodPrefix = "CAS_AmmoSwitch_OMOD_";
 
 				for (TESForm* tesForm : keywordEntries)
 				{
@@ -207,7 +218,14 @@ namespace RE
 						keywordsAmmo.push_back((BGSKeyword*)tesForm);
 						keywordFormlistMap[(BGSKeyword*)tesForm] = new BGSListForm;
 					}
-				}				
+
+					if (strncmp(formEditorID, omodPrefix, strlen(omodPrefix)) == 0)
+					{
+						DEBUG("'AmmoSwitch::DefineAmmoLists' - matching keyword: {}, added to 'keywordsOMOD'.", formEditorID);
+						keywordsOMOD.push_back((BGSKeyword*)tesForm);
+					}
+				}
+
 				for (TESForm* tesForm : ammoEntries)
 				{
 					TESAmmo* tesAMMO = static_cast<TESAmmo*>(tesForm);
@@ -240,6 +258,17 @@ namespace RE
 						}
 					}
 				}
+
+				for (TESForm* tesForm : omodEntries)
+				{
+					BGSMod::Attachment::Mod* omod = static_cast<BGSMod::Attachment::Mod*>(tesForm);
+					BGSKeyword* currentKeyword = BGSKeyword::GetTypedKeywordByIndex(KeywordType::kAttachPoint, omod->attachPoint.keywordIndex);
+					if ()
+					if (currentKeyword == omodAP)
+					{
+
+					}
+				}
 				DEBUG("'AmmoSwitch::DefineAmmoLists' - 'keywordFormlistMap' size: {}", keywordFormlistMap.size());
 			}
 

Plugin/src/Systems/AmmoSwitch.h

@@ -12,8 +12,11 @@ namespace RE
 
 			extern BSTArray<BGSKeyword*> keywordsAmmo;
 			extern std::unordered_map<BGSKeyword*, BGSListForm*> keywordFormlistMap;
+			extern BSTArray<BGSKeyword*> keywordsOMOD;
 			extern BGSKeyword* noFormlistWEAP;
 			extern BGSKeyword* uniqueFormlistWEAP;
+			extern BGSKeyword* omodAP;
+			extern std::vector<std::pair<BGSKeyword*, BGSMod::Attachment::Mod*>>;
 
 			bool InitializeAmmoSwitch();
 			bool FindAmmoInFormlist(BGSKeyword* keyword, TESAmmo* currentAmmo, PlayerCharacter* playerCharacter);