add HasEnchantment keywords

GroundAura · Sep 16, 2024 · 4bfb419 · 4bfb419
1 parent c9d2499
commit 4bfb419
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/dist/Object Categorization Framework/Base/AAA_KW-OCF_Data_KID.ini b/dist/Object Categorization Framework/Base/AAA_KW-OCF_Data_KID.ini
@@ -63,8 +63,8 @@ Keyword = OCF_EquipSlot61|Armor|NONE|61
 Keyword = OCF_EquipTypeShield|Armor|0x141E8~Skyrim.esm
 ;Keyword = OCF_EquipTypeVoice|Armor|0x25BEE~Skyrim.esm
 
-;Keyword = OCF_HasEnchantmentT|Armor|NONE|E
-;Keyword = OCF_HasEnchantmentF|Armor|NONE|-E
+Keyword = OCF_HasEnchantmentT|Armor|NONE|E
+Keyword = OCF_HasEnchantmentF|Armor|NONE|-E
 
 ;Keyword = OCF_ProvidesArmorF|Armor|NONE|AR(0/0)
 ;Keyword = OCF_ProvidesArmorT|Armor|-OCF_ProvidesArmorF
@@ -2170,8 +2170,8 @@ Keyword = OCF_EquipTypeRightHand|Weapon|0x13F42~Skyrim.esm
 ;Keyword = OCF_EquipTypeShield|Weapon|0x141E8~Skyrim.esm
 ;Keyword = OCF_EquipTypeVoice|Weapon|0x25BEE~Skyrim.esm
 
-;Keyword = OCF_HasEnchantmentT|Weapon|NONE|E
-;Keyword = OCF_HasEnchantmentF|Weapon|NONE|-E
+Keyword = OCF_HasEnchantmentT|Weapon|NONE|E
+Keyword = OCF_HasEnchantmentF|Weapon|NONE|-E
 
 ;Keyword = OCF_HasTemplateFlagT|Weapon|NONE|T
 ;Keyword = OCF_HasTemplateFlagF|Weapon|NONE|-T

diff --git a/dist/Object Categorization Framework/Base/OCF.esp b/dist/Object Categorization Framework/Base/OCF.esp
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,15 +2,25 @@
 
 ## Version 6.0.0
 
+- **Author's Note:** I've added numerous race keywords to `NPC_` records to cover the majority of vanilla and modded races. This is just the first step however. The keywords are set up but very few mods are patched so far. If you know of any mods that add new creature types, let me know so I can put them on my radar and work my way through them (I'm already aware of Mihail's and gg77's mods). Identifying ghosts is also still a work in progress so they may be incorrectly given living race keywords.
+
+- **Author's Note:** Thanks to Komegaki and Mieekaserra for additions including in this update.
+
+- **Now requires** [Spell Perk Item Distributor](https://www.nexusmods.com/skyrimspecialedition/mods/36869) (v7.0.0+) for Exclusive Groups feature.
+
+- **ESP (`OCF.esp`):** Added new Keywords (`OCF.esp|xxx`).
+
 - **FLM filters added:** Diverse Dragons Collection.
 
 - **FormList Categorization added:** Diverse Dragons Collection (`PROJ`).
 
 - **Keywords (`ARMO`) added:** `OCF_AccessoryAshOfWar`.
 
+- **Keywords (`ARMO`, `WEAP`) added:** `OCF_HasEnchantmentT` \[`0x88C~OCF.esp`\], `OCF_HasEnchantmentF` \[`0x88D~OCF.esp`\].
+
 - **Keywords (`MGEF`, `SPEL`) added:** `OCF_MgefPowerAction_AshOfWar`.
 
-- **Keywords (`NPC_`) added:** Added ~500+ keywords. (See Keyword Reference for full list.)
+- **Keywords (`NPC_`) added:** Added ~500+ keywords. (See [Keyword Reference](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference) for full list.)
 
 - **Keyword Categorization added:** Vanilla (`NPC_`), CC Bone Wolf (`NPC_`), CC Dwarven Armored Mudcrab (`NPC_`), CC Fishing (`NPC_`), CC Goblins (`NPC_`), CC Nchuanthumz Dwarven Home (`NPC_`), CC Necromantic Grimoire (`NPC_`), CC Nix Hound (`NPC_`), CC Pets of Skyrim (`NPC_`), CC Plague of the Dead (`NPC_`), CC Saints & Seducers (`NPC_`), CC Shadowrend (`NPC_`), CC The Cause (`NPC_`), CC The Contest (`NPC_`), [Actual Sweet Roll Variants - Requiem Patch](https://www.nexusmods.com/skyrimspecialedition/mods/113324) (`ALCH`), [Apachii Helmet Wigs](https://www.nexusmods.com/skyrimspecialedition/mods/2014) (`ARMO`), [Ashes of War Weapon Art](https://www.nexusmods.com/skyrimspecialedition/mods/100174) (`ARMO`), Beyond Skyrim Assets (`NPC_`), Beyond Skyrim Bruma (`NPC_`), Darenii's Arclight (`NPC_`), Darenii's Flames of Coldharbour (`NPC_`), Darenii's Natura (`NPC_`), Darenii's Vulcano (`NPC_`), Diverse Dragons Collection (`MGEF`, `SPEL`), [Diverse Foods - Requiem Patch](https://www.nexusmods.com/skyrimspecialedition/mods/113485) (`ALCH`), Hydra's Reversed Daggers (`WEAP`), Immersive Magic Brooms (`NPC_`), LRS Hunter Extension (`NPC_`), Kittytail's Ancient Blood Magic (`NPC_`), Mihail's Bantam Guars (`NPC_`), Mihail's Ring-necked Pheasants (`NPC_`), Missile's CC Goblins Addon (`NPC_`), Natures Bounty - Pheasant Encounters (`NPC_`), Nether's Follower Framework (`NPC_`), Pheasants of Skyrim (`NPC_`), SimonMagus' Mysticism (`NPC_`), Unofficial Skyrim Special Edition Patch (`NPC_`), [Vicn's Vigilant](https://www.nexusmods.com/skyrimspecialedition/mods/11849) (`MGEF`, `SPEL`), Weapons Armor Clothing & Clutter Fixes (`NPC_`), general (`NPC_`).
 

diff --git a/docs/wiki/Keyword-Reference.md b/docs/wiki/Keyword-Reference.md
@@ -586,6 +586,12 @@
 
 - `WearWhenStripped` \[`0xAF0509~Update.esm`\]
 
+### Enchanted
+
+- `OCF_HasEnchantmentT` \[`0x88C~OCF.esp`\] - An enchanted item (only considers if the base form has an enchantment, not player added enchantments).
+
+- `OCF_HasEnchantmentF` \[`0x88D~OCF.esp`\] - A non-enchanted item.
+
 ### Equip Slot
 
 - `OCF_EquipSlot30` - Called 'Head' by the CK. Per vanilla standard, used as a tertiary head slot.
@@ -5484,6 +5490,12 @@
 
 - `OCF_MatContainsSilver`
 
+### Enchanted
+
+- `OCF_HasEnchantmentT` \[`0x88C~OCF.esp`\] - An enchanted item (only considers if the base form has an enchantment, not player added enchantments).
+
+- `OCF_HasEnchantmentF` \[`0x88D~OCF.esp`\] - A non-enchanted item.
+
 ### Equip Type
 
 - `OCF_EquipTypeBothHands` - Uses both the left and right hand slots.

diff --git a/docs/wiki/_Sidebar.md b/docs/wiki/_Sidebar.md
@@ -89,6 +89,7 @@
 - [Contains Gems](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#contains-gems)
 - [Contains Metals](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#contains-metals)
 - [Don't Undress](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#dont-undress)
+- [Enchanted](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#enchanted)
 - [Equip Slot](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#equip-slot)
 - [Equip Type](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#equip-type)
 - [Inventory Color](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#inventory-color-1)
@@ -203,6 +204,7 @@
 - [Artifacts](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#artifacts-7)
 - [Contains Gems](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#contains-gems-1)
 - [Contains Metals](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#contains-metals-1)
+- [Enchanted](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#enchanted-1)
 - [Equip Type](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#equip-type-3)
 - [Gathering](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#gathering-1)
 - [Grip](https://github.com/GroundAura/Object-Categorization-Framework/wiki/Keyword-Reference#grip)