feat(skymp5-server): recognize more item types in OnEquip handler (#1731

)
skyrim-multiplayer · Nov 10, 2023 · ea3186c · ea3186c
1 parent f80e8b5
commit ea3186c
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/skymp5-server/cpp/server_guest_lib/MpActor.cpp b/skymp5-server/cpp/server_guest_lib/MpActor.cpp
@@ -276,7 +276,21 @@ bool MpActor::OnEquip(uint32_t baseId)
   const bool isIngredient = recordType == "INGR";
   const bool isPotion = recordType == "ALCH";
 
-  if (!(isSpell || isIngredient || isPotion || isBook)) {
+  bool isTorch = false;
+  if (espm::utils::Is<espm::LIGH>(recordType)) {
+    auto& compressedFieldsCache = GetParent()->GetEspmCache();
+    auto light = espm::Convert<espm::LIGH>(lookupRes.rec);
+    auto res = light->GetData(compressedFieldsCache);
+    isTorch = res.data.flags & espm::LIGH::Flags::CanBeCarried;
+  }
+
+  const bool isScroll = recordType == "SCRL";
+  const bool isWeapon = recordType == "WEAP";
+  const bool isArmor = recordType == "ARMO";
+  const bool isAmmo = recordType == "AMMO";
+
+  if (!(isSpell || isIngredient || isPotion || isBook || isTorch || isScroll ||
+        isWeapon || isArmor || isAmmo)) {
     return false;
   }
 
@@ -288,14 +302,14 @@ bool MpActor::OnEquip(uint32_t baseId)
     return false;
   }
 
-  bool spellLearned = true;
+  bool spellLearned = false;
   if (isIngredient || isPotion) {
     EatItem(baseId, recordType);
   } else if (isBook) {
     spellLearned = ReadBook(baseId);
   }
 
-  if (!isSpell && spellLearned) {
+  if (isIngredient || isPotion || spellLearned) {
     RemoveItem(baseId, 1, nullptr);
   }