diff --git a/.vscode/scripts/md2nexus.bat b/.vscode/scripts/md2nexus.bat index f94aed0..5f9a49e 100644 --- a/.vscode/scripts/md2nexus.bat +++ b/.vscode/scripts/md2nexus.bat @@ -1,2 +1,2 @@ -"E:\Skyrim\Tools\md2nexus\md2nexus" -i "docs\description-md" -o "docs\description-nexus" +"%CLI_PATH_MD2NEXUS%" -i "docs\description-md" -o "docs\description-nexus" robocopy "docs\description-md" "docs\description-nexus" *.txt /it diff --git a/.vscode/scripts/mo2-downloads.bat b/.vscode/scripts/mo2-downloads.bat index f807937..5433427 100644 --- a/.vscode/scripts/mo2-downloads.bat +++ b/.vscode/scripts/mo2-downloads.bat @@ -1,2 +1,2 @@ -copy "build\Object Categorization Framework.zip" "D:\Games\Skyrim\MO2\downloads" -copy "build\MO2\Object Categorization Framework.zip.meta" "D:\Games\Skyrim\MO2\downloads" +copy "build\Object Categorization Framework.zip" "%SKYRIM_DOWNLOADS_FOLDER%" +copy "build\MO2\Object Categorization Framework.zip.meta" "%SKYRIM_DOWNLOADS_FOLDER%" diff --git a/.vscode/scripts/mo2-mod.bat b/.vscode/scripts/mo2-mod.bat index 4bad4f6..2f10423 100644 --- a/.vscode/scripts/mo2-mod.bat +++ b/.vscode/scripts/mo2-mod.bat @@ -1 +1 @@ -robocopy "dist\Object Categorization Framework\Base" "E:\Skyrim\MO2\mods\Object Categorization Framework (pre-release) []" /e /xf meta.ini +robocopy "dist\Object Categorization Framework\Base" "%SKYRIM_MODS_FOLDER%\Object Categorization Framework (pre-release) []" /e /xf meta.ini diff --git a/.vscode/scripts/zip.bat b/.vscode/scripts/zip.bat index 5a102a4..ad3134f 100644 --- a/.vscode/scripts/zip.bat +++ b/.vscode/scripts/zip.bat @@ -1,3 +1,3 @@ del "build\Object Categorization Framework.zip" cd "dist\Object Categorization Framework" -"C:\Program Files\7-Zip\7z" a -tzip "..\..\build\Object Categorization Framework.zip" +"%CLI_PATH_7ZIP%" a -tzip "..\..\build\Object Categorization Framework.zip" diff --git a/dist/Object Categorization Framework/Base/ABA_KW-OCF_ALCH_KID.ini b/dist/Object Categorization Framework/Base/ABA_KW-OCF_ALCH_KID.ini index 96e70bc..cae1510 100644 --- a/dist/Object Categorization Framework/Base/ABA_KW-OCF_ALCH_KID.ini +++ b/dist/Object Categorization Framework/Base/ABA_KW-OCF_ALCH_KID.ini @@ -871,7 +871,7 @@ Keyword = OCF_AlchFood_Fish|Potion|AlaxFoodCookedFish Keyword = OCF_AlchFood_Fruit|Potion|AlaxFoodApple,AlaxFoodAppleBitten,AlaxFoodApricot,AlaxFoodBlackberry,AlaxFoodBlueberry,AlaxFoodCherry,AlaxFoodGrapes,AlaxFoodPeach,AlaxFoodPear,AlaxFoodStrawberry Keyword = OCF_AlchFood_Meat|Potion|AlaxFoodCookedLeg,AlaxFoodCookedMeat,AlaxFoodRawMeat,AlaxFoodSausage Keyword = OCF_AlchFood_Vegetable|Potion|AlaxFoodArtichoke,AlaxFoodBeetroot,AlaxFoodButternut,AlaxFoodCarrot,AlaxFoodCookedTurnip,AlaxFoodCucumber,AlaxFoodGinger,AlaxFoodGingerSlice,AlaxFoodGourd,AlaxFoodGourdSlice,AlaxFoodGreenBellPepper,AlaxFoodGreenCabbage,AlaxFoodPickle,AlaxFoodPotato,AlaxFoodPumpkin,AlaxFoodPurpleCarrot,AlaxFoodRadish,AlaxFoodRedBellPepper,AlaxFoodRedCabbage,AlaxFoodSweetPotato,AlaxFoodTomato,AlaxFoodTurmeric,AlaxFoodTurnip,-OCF_AlchFood_Fruit -Keyword = VendorItemFoodCooked|Potion|AlaxFoodCookedFish,AlaxFoodCookedLeg,AlaxFoodCookedMeat +Keyword = VendorItemFoodCooked|Potion|AlaxFoodCookedFish,AlaxFoodCookedLeg,AlaxFoodCookedMeat,AlaxFoodCookedTurnip Keyword = VendorItemFoodRaw|Potion|AlaxFoodRawMeat ; Skyrim on Skooma [Skyrim On Skooma.esp] @@ -913,9 +913,13 @@ Keyword = OCF_AlchSpoiled|Potion|FoodAppleBad,FoodBeefBad,FoodBreadBad01A,FoodBr Keyword = OCF_AlchFood_Baked|Potion|KvSweetsCupcakeBerry,KvSweetsCakeSquare,KvSweetsCakeChocolate,KvSweetsCookieChocolate,KvSweetsCookieStar,KvSweetsCakeSuper,KvSweetsCakeSquareCherry,KvSweetsCupcakeTallswirl,KvSweetsCookieHeart,KvSweetsCupcakeStacked,KvSweetsTurnover,KvSweetsCupcakeIcing,KvSweetsCookieThumbprint,KvSweetsCupcakeSwirl,KvSweetsIcedRoll Keyword = OCF_AlchFood_Baked|Potion|KvSweetsIceCreamSwirl Keyword = OCF_AlchFood_Bread|Potion|KvSweetsCroissant -Keyword = OCF_AlchFood_Treat|Potion|KvSweetsCandyHardApple,KvSweetsCandyLollipopSmallRound,KvSweetsCandyMintBlue,KvSweetsCandyCane,Chocolate Cordial,KvSweetsCandyChocolate2,KvSweetsCandyChocolateTruffle,KvSweetsCandyChocolate1,KvSweetsCandyLollipopSphere,KvSweetsCandyLollipopShort,KvSweetsCandyHardLong,KvSweetsCandyLollipopHeart,KvSweetsCandyLollipopSpiral,KvSweetsCandyLollipopTwirled,KvSweetsCandyLollipopTall,KvSweetsCandyWrapped +Keyword = OCF_AlchFood_Treat|Potion|KvSweetsCandyHardApple,KvSweetsCandyLollipopSmallRound,KvSweetsCandyMintBlue,KvSweetsCandyCane,KvSweetsCandyChocolate3,KvSweetsCandyChocolate2,KvSweetsCandyChocolateTruffle,KvSweetsCandyChocolate1,KvSweetsCandyLollipopSphere,KvSweetsCandyLollipopShort,KvSweetsCandyHardLong,KvSweetsCandyLollipopHeart,KvSweetsCandyLollipopSpiral,KvSweetsCandyLollipopTwirled,KvSweetsCandyLollipopTall,KvSweetsCandyWrapped Keyword = OCF_AlchFood_Treat|Potion|KvSweetsIceCreamBowl,KvSweetsIceCreamGoblet +; Sweets & Such - Eating Animations & Sounds Patch [Taberu Animation - Sweets and Such.esp] +Keyword = OCF_AlchFood_Treat|Potion|KvSweetsIceCreamCup,KvSweetsIceCreamMid +;Keyword = OCF_Placeholder_Dummy|Potion|TaberuCupcakeTallswirlRing,TaberuIceCreamBowlRing,TaberuIceCreamCupRing,TaberuIceCreamGobletRing,TaberuIceCreamMidRing,TaberuSweetsAppleHardRing,TaberuSweetsCakeChocoRing,TaberuSweetsCakeSquareCherryRing,TaberuSweetsCakeSquareRing,TaberuSweetsCakeSuperRing,TaberuSweetsCandyCaneRing,TaberuSweetsCandyMintRing,TaberuSweetsChocolateCordialRing,TaberuSweetsChocolatePieceRing,TaberuSweetsChocolateTruffleRing,TaberuSweetsClassyChocolateRing,TaberuSweetsColorfulLollipopRing,TaberuSweetsCookieChocolateRing,TaberuSweetsCookieHeartRing,TaberuSweetsCookieStarRing,TaberuSweetsCookieSunRing,TaberuSweetsCroissantRing,TaberuSweetsCupcakeBerryRing,TaberuSweetsCupcakeSnowFlakeRing,TaberuSweetsCupcakeStackedRing,TaberuSweetsCupcakeSwirlRing,TaberuSweetsFruityLollipopRing,TaberuSweetsGreenLollipopRing,TaberuSweetsHoneyHardRing,TaberuSweetsIceCreamSwirlRing,TaberuSweetsIcedRollRing,TaberuSweetsLovelyLollipopRing,TaberuSweetsSpiralLollipopRing,TaberuSweetsSwirlLollipopRing,TaberuSweetsTreeLollipopRing,TaberuSweetsTurnoverRing,TaberuSweetsWrappedMintRing + ; SunHelm [SunHelmSurvival.esp] Keyword = OCF_AlchDrink_Water|Potion|_SHWaterBottleWine,_SHWaterBottleMead,_SHSujammaWaterBottle,_SHWaterskin_1,_SHWaterskin_2,_SHWaterskin_3 Keyword = _SHSaltWaterKeyword|Potion|_SHSaltBottleWine,_SHSaltBottleMead,_SHSaltBottleSujamma,_SHWaterskinSalt diff --git a/dist/Object Categorization Framework/Base/ABA_KW-OCF_ARMO_KID.ini b/dist/Object Categorization Framework/Base/ABA_KW-OCF_ARMO_KID.ini index 1773828..d5e487b 100644 --- a/dist/Object Categorization Framework/Base/ABA_KW-OCF_ARMO_KID.ini +++ b/dist/Object Categorization Framework/Base/ABA_KW-OCF_ARMO_KID.ini @@ -672,8 +672,8 @@ Keyword = OCF_HeadTypeBandage|Armor|FOTFEaccessoriesHandsWraps01,FOTFEaccessorie Keyword = OCF_HeadTypeMask_MouthCloth|Armor|FOTFEaccessoriesMiscFacewrap01,FOTFEaccessoriesMiscFacewrap02 Keyword = OCF_HandTypeBandage|Armor|FOTFEaccessoriesHandsBandage -; Feral [Feral - Claws.esp] -Keyword = OCF_HandTypeClaws|Misc Item|zzFeralClaws01,zzFeralClaws01Perk +; Feral [Feral.esp] +Keyword = OCF_HandTypeClaws|Armor|zzFeral_Claws_FX_KW ; Flower Girls [FlowerGirls SE.esm] Keyword = OCF_BodyTypeStrapOn|Armor|dxStraponCBBE,dxStraponUNP @@ -1492,6 +1492,8 @@ Keyword = OCF_varNotAccessoryFlower|Armor|*FlowerGirl,*GirlFlower,*GirlsFlower,* Keyword = OCF_varNotBagBackpack|Armor|*with Backpack,*withBackpack,*with Knapsack,*withKnapsack,*with Satchel,*withSatchel,*with Shoulderpack,*withShoulderpack,-OCF_EquipSlot30,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot33,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_EquipSlot41,-OCF_EquipSlot42,-OCF_varIsBagBackpack ;Keyword = OCF_varNotBracer|Armor|WAF_FingerlessGauntletsBracers,-OCF_HandTypeArmlet,-OCF_HandTypeBandage,-OCF_HandTypeBracelet,-OCF_HandTypeBracer,-OCF_HandTypeCestus,-OCF_HandTypeClaws,-OCF_HandTypeCuffs,-OCF_HandTypeNails,-OCF_HandTypeSleeves,-OCF_varIsBracer|33 Keyword = OCF_varNotCirclet|Armor|*with Circlet,*withCirclet,-OCF_EquipSlot30,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot33,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_EquipSlot41,-OCF_EquipSlot43,-OCF_varIsCirclet|42 +Keyword = OCF_varNotClaws|Armor|*DisplayClaws,*with Claws,*withClaws,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varIsClaws|33 +Keyword = OCF_varNotClaws|Armor|*DisplayClaws,*with Claws,*withClaws,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varIsClaws|61 Keyword = OCF_varNotCloak|Armor|*Cloaked,*Escape,*Stormcloak,*with Cape,*withCape,*with Cloak,*withCloak,-OCF_EquipSlot30,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot33,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_EquipSlot41,-OCF_EquipSlot42,-OCF_varIsCloak Keyword = OCF_varNotCrown|Armor|*Battlecrown,-OCF_EquipSlot32,-OCF_EquipSlot33,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varIsCrown Keyword = OCF_varNotEars|Armor|*Bear,*with Ears,*withEars,-OCF_EquipSlot32,-OCF_EquipSlot33,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_HeadTypeEarCuffs,-OCF_HeadTypeEarrings,-OCF_varIsEars @@ -1634,6 +1636,7 @@ Keyword = OCF_HandTypeBracelet|Armor|*Bracelet,-OCF_EquipSlot30,-OCF_EquipSlot31 Keyword = OCF_HandTypeCestus|Armor|*BrassKnuckle,*Caestus,*Cestus,*Dusters,*DusterKnuckle,*DustKnuckle,*KnuckleBrass,*KnuckleDust,*KnuckleSteel,*KnucklesBrass,*KnucklesDust,*KnucklesSteel,*SteelKnuckle,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varNotCestus|33 ;Keyword = OCF_HandTypeBrawling|Armor|*BrawlerGlove,*SpikedGauntlet,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_HandTypeCestus,-OCF_varNotHandsBrawling|33 Keyword = OCF_HandTypeClaws|Armor|*Claws,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varNotClaws|33 +Keyword = OCF_HandTypeClaws|Armor|*Claws,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varNotClaws|61 Keyword = OCF_HandTypeCuffs|Armor|*PrisonerCuff,*Shackle,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot37,-OCF_EquipSlot39,-OCF_varNotCuffs|33 Keyword = OCF_HandTypeNails|Armor|*Nails,-OCF_EquipSlot30,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot35,-OCF_EquipSlot37,-OCF_EquipSlot38,-OCF_EquipSlot39,-OCF_EquipSlot40,-OCF_EquipSlot41,-OCF_EquipSlot42,-OCF_EquipSlot43,-OCF_varNotNails|33 Keyword = OCF_HandTypeSleeves|Armor|*Sleeves,-OCF_EquipSlot30,-OCF_EquipSlot31,-OCF_EquipSlot32,-OCF_EquipSlot35,-OCF_EquipSlot37,-OCF_EquipSlot38,-OCF_EquipSlot39,-OCF_EquipSlot40,-OCF_EquipSlot41,-OCF_EquipSlot42,-OCF_EquipSlot43,-OCF_varNotSleeves|33 diff --git a/dist/Object Categorization Framework/Base/ABA_KW-OCF_BOOK_KID.ini b/dist/Object Categorization Framework/Base/ABA_KW-OCF_BOOK_KID.ini index 34ee8e9..5bd43b6 100644 --- a/dist/Object Categorization Framework/Base/ABA_KW-OCF_BOOK_KID.ini +++ b/dist/Object Categorization Framework/Base/ABA_KW-OCF_BOOK_KID.ini @@ -210,6 +210,9 @@ Keyword = OCF_BookTextManual|Book|_Frost_SurvivorsGuide ; Gambler's Paradise [Gambler's Paradise.esp] Keyword = OCF_BookTextManual|Book|GPGameGuide +; Gourmet EAS Sweets & Such Patch [Gourmet_EAS_KvSweet_patch.esp] +Keyword = OCF_BookTextRecipe_Cooking|Book|MAG_SweetsRecipeSweetsCakeChocolate,MAG_SweetsRecipeSweetsCakeSquare,MAG_SweetsRecipeSweetsCakeSquareCherry,MAG_SweetsRecipeSweetsCakeSuper,MAG_SweetsRecipeSweetsCandyCane,MAG_SweetsRecipeSweetsCandyChocolate1,MAG_SweetsRecipeSweetsCandyChocolate2,MAG_SweetsRecipeSweetsCandyChocolate3,MAG_SweetsRecipeSweetsCandyChocolateTruffle,MAG_SweetsRecipeSweetsCandyHardApple,MAG_SweetsRecipeSweetsCandyHardLong,MAG_SweetsRecipeSweetsCandyLollipopHeart,MAG_SweetsRecipeSweetsCandyLollipopShort,MAG_SweetsRecipeSweetsCandyLollipopSmallRound,MAG_SweetsRecipeSweetsCandyLollipopSphere,MAG_SweetsRecipeSweetsCandyLollipopSpiral,MAG_SweetsRecipeSweetsCandyLollipopTall,MAG_SweetsRecipeSweetsCandyLollipopTwirled,MAG_SweetsRecipeSweetsCandyMintBlue,MAG_SweetsRecipeSweetsCandyWrapped,MAG_SweetsRecipeSweetsCookieChocolate,MAG_SweetsRecipeSweetsCookieHeart,MAG_SweetsRecipeSweetsCookieStar,MAG_SweetsRecipeSweetsCookieThumbprint,MAG_SweetsRecipeSweetsCroissant,MAG_SweetsRecipeSweetsCupcakeBerry,MAG_SweetsRecipeSweetsCupcakeIcing,MAG_SweetsRecipeSweetsCupcakeStacked,MAG_SweetsRecipeSweetsCupcakeSwirl,MAG_SweetsRecipeSweetsCupcakeTallswirl,MAG_SweetsRecipeSweetsIceCreamBowl,MAG_SweetsRecipeSweetsIceCreamGoblet,MAG_SweetsRecipeSweetsIceCreamSwirl,MAG_SweetsRecipeSweetsIcedRoll,MAG_SweetsRecipeSweetsTurnover + ; Helgen Reborn [Helgen Reborn.esp] ; Hunterborn [Hunterborn.esp] @@ -303,6 +306,8 @@ Keyword = OCF_BookSpellTome_Shehai|Book|*SpellTomeSingSword ; SimonMagus' Gourmet [Gourmet.esp] Keyword = OCF_BookTextRecipe_Cooking|Book|MAG_CookingRecipeAppleDumpling,MAG_CookingRecipeApplePie,MAG_CookingRecipeAshHopperStew,MAG_CookingRecipeAshYamSoup,MAG_CookingRecipeBakedPotato,MAG_CookingRecipeBeefStew,MAG_CookingRecipeBoarStew,MAG_CookingRecipeBoiledCremeTreat,MAG_CookingRecipeBraidedBread,MAG_CookingRecipeBreadLoaf,MAG_CookingRecipeCabbagePotatoSoup,MAG_CookingRecipeCabbageSoup,MAG_CookingRecipeCabbageTomatoSoup,MAG_CookingRecipeCarrotCooked,MAG_CookingRecipeCarrotSoup,MAG_CookingRecipeCheeseFondueEidar,MAG_CookingRecipeCheeseFondueGoat,MAG_CookingRecipeCheeseFondueMammoth,MAG_CookingRecipeClamChowder,MAG_CookingRecipeGarlicBread,MAG_CookingRecipeGoatStew,MAG_CookingRecipeGourdSoup,MAG_CookingRecipeGrilledLeeks,MAG_CookingRecipeHoneyNutTreat,MAG_CookingRecipeHorkerStew,MAG_CookingRecipeJazbayCrostata,MAG_CookingRecipeJazbayDumpling,MAG_CookingRecipeJellyDumpling,MAG_CookingRecipeJuniperBerryCrostata,MAG_CookingRecipeJuniperDumpling,MAG_CookingRecipeMammothStew,MAG_CookingRecipeMushroomCooked01,MAG_CookingRecipeMushroomCooked02,MAG_CookingRecipeMushroomCooked03,MAG_CookingRecipeMushroomStew01,MAG_CookingRecipeMushroomStew02,MAG_CookingRecipeMushroomStew03,MAG_CookingRecipePheasantStew,MAG_CookingRecipePotatoBread,MAG_CookingRecipePotatoSoup,MAG_CookingRecipeRabbitStew,MAG_CookingRecipeRoastedAshYams,MAG_CookingRecipeSnowberryCrostata,MAG_CookingRecipeSnowberryDumpling,MAG_CookingRecipeSweetRoll,MAG_CookingRecipeTomatoSoup,MAG_CookingRecipeVegetableSoup,MAG_CookingRecipeVenisonStew,MAG_FoodUpgradeCookbook01,MAG_FoodUpgradeCookbook02,MAG_FoodUpgradeCookbook03,MAG_FoodUpgradeCookbook04 ;Keyword = OCF_BookTextRecipe_Cooking|Book|MAG_SpellTomeTransmuteBread +Keyword = OCF_BookTextRecipe_Cooking|Book|VendorItemCookbook +Keyword = OCF_BookTextRecipe_Cooking|Book|*MAG_CookingRecipe,*MAG_FoodUpgradeCookbook ; Simple Actions [bm_SimpleAction.esp] ;Keyword = OCF_BookTextManual|Book|bm_SimpleActionBook diff --git a/dist/Object Categorization Framework/Base/ABA_KW-OCF_WEAP_KID.ini b/dist/Object Categorization Framework/Base/ABA_KW-OCF_WEAP_KID.ini index 2621570..4f1c30f 100644 --- a/dist/Object Categorization Framework/Base/ABA_KW-OCF_WEAP_KID.ini +++ b/dist/Object Categorization Framework/Base/ABA_KW-OCF_WEAP_KID.ini @@ -391,6 +391,9 @@ Keyword = OCF_WeapTypeClub1H|Weapon|CoT_StrahgWeap Keyword = OCF_WeapBroken|Weapon|E_Weapon Keyword = OCF_WeapBroken|Weapon|E_Weapon2 +; Feral [Feral.esp] +Keyword = OCF_WeapUnarmed_Claws|Weapon|zzFeral_WeaponType_Claws_KW + ; Fire Emblem Killer Weapons [] ; Fizz's Trident [Fizz's trident.esp] @@ -1169,7 +1172,9 @@ Keyword = OCF_WeapTypeTwinblade2H|Weapon|*Twinblade,-OCF_varWeapNotTwinblade|Two Keyword = OCF_WeapTypeGreatsword2H|Weapon|-OCF_varWeapNotGreatsword2H,-OCF_WeapTypeGladius2H,-OCF_WeapTypeKatana2H,-OCF_WeapTypeLightsaber2H,-OCF_WeapTypeLongsword2H,-OCF_WeapTypeMassiveSword2H,-OCF_WeapTypeRapier2H,-OCF_WeapTypeSaber2H,-OCF_WeapTypeScimitar2H,-OCF_WeapTypeScythe2H,-OCF_WeapTypeShortsword2H,-OCF_WeapTypeTwinblade2H,-OCF_WeapTypeTwinSword2H,-OCF_WeapTypePole2H|TwoHandSword Keyword = OCF_WeapBladed2H|Weapon|OCF_WeapTypeGladius2H,OCF_WeapTypeGreatsword2H,OCF_WeapTypeKatana2H,OCF_WeapTypeLightsaber2H,OCF_WeapTypeLongsword2H,OCF_WeapTypeMassiveSword2H,OCF_WeapTypeRapier2H,OCF_WeapTypeSaber2H,OCF_WeapTypeScimitar2H,OCF_WeapTypeShortsword2H,OCF_WeapTypeTwinblade2H,OCF_WeapTypeTwinSword2H -Keyword = OCF_WeapUnarmed|Weapon|-OCF_varWeapNotUnarmed|HandToHandMelee +Keyword = OCF_WeapUnarmed_Claws|Weapon|*Claws,-OCF_varWeapNotUnarmed,OCF_varWeapNotUnarmedClaws|HandToHandMelee +Keyword = OCF_WeapUnarmed_Basic|Weapon|-OCF_WeapUnarmed_Claws,-OCF_varWeapNotUnarmed,-OCF_varWeapNotUnarmedBasic|HandToHandMelee +Keyword = OCF_WeapUnarmed|Weapon|OCF_WeapUnarmed_Basic,OCF_WeapUnarmed_Claws Keyword = OCF_WeapMelee|Weapon|OCF_WeapBladed2H,OCF_WeapBlunt2H,OCF_WeapEdged2H,OCF_WeapPole2H,OCF_WeapUnarmed diff --git a/dist/Object Categorization Framework/Base/OCF.esp b/dist/Object Categorization Framework/Base/OCF.esp index dba28e4..6f93a8e 100644 Binary files a/dist/Object Categorization Framework/Base/OCF.esp and b/dist/Object Categorization Framework/Base/OCF.esp differ diff --git a/dist/Object Categorization Framework/Old SPID/ABB_KW-OCF_NPC_DISTR.ini b/dist/Object Categorization Framework/Old SPID/ABB_KW-OCF_NPC_DISTR.ini new file mode 100644 index 0000000..cb8f15a --- /dev/null +++ b/dist/Object Categorization Framework/Old SPID/ABB_KW-OCF_NPC_DISTR.ini @@ -0,0 +1,74 @@ +; Object Categorization Framework - Keywords - NPCs + +; ==================================================================================================== +; NON-PLAYER CHARACTER (ACTOR) [NPC_] +; ==================================================================================================== + +; ========================= VANILLA & CC ========================= +; Vanilla & DLC +Keyword = OCF_ActiHeatSource_FireMedium|SummonAtronachFlame,SummonAtronachFlamePotent,SummonAtronachFlameThrall,SummonAtronachFlameThrallPotent,EncAtronachFlame,EncAtronachFlameHoldPosLinked256,dunBluePalaceAtronachFlame,dunBluePalacePelagiusAtronachFlame,WE15AtronachFlame,EncAtronachFlameAmbush,dunFellglow_EncAtronachFlameSentry +Keyword = OCF_ActiHeatSource_FireMedium|NONE|AtronachFlameRace +;Keyword = OCF_ActiHeatSource_FireSmall|NONE|DLC2SprigganBurntRace +;Keyword = OCF_NPC_PetLarge|NONE| +;Keyword = OCF_NPC_PetMount|NONE| +;Keyword = OCF_NPC_PetSmall|NONE| + + + +; ========================= MODS ========================= +; A Cat's Life [] +;Keyword = OCF_NPC_PetSmall|NONE| + +; Coldharbour Resummoned [ColdharbourDaedra.esp] + +; Daedric Entity Restoration Project [Daedric Entity Restoration Project.esp] + +; Darenii's Arclight [Arclight.esp] +;Keyword = OCF_ActiHeatSource_OtherSmall|NONE|DAR_AtronachArclightRace + +; Darenii's Desecration [Desecration.esp] +;Keyword = OCF_ActiHeatSource_FireMedium|NONE|DAR_AtronachNecroticFlameRace +;Keyword = OCF_NPC_Ethereal|DAR_EncNecroticDraugr + +; Darenii's Natura [Natura.esp] +;Keyword = OCF_ActiHeatSource_OtherSmall|NONE|NAT_SprigganShockRace + +; Darenii's Vulcano [Vulcano.esp] +Keyword = OCF_ActiHeatSource_FireMedium|NONE|DAR_AtronachMoltenRace,DAR_MoltenWyrmRace + +; Dragon Cultists [Dragon Cultists.esp] + +; Everlight [Undriel_Everlight.esp] + +; gg77's Beavers & Raccoons of Skyrim [] +;Keyword = OCF_NPC_PetSmall|NONE| + +; gg77's Cats Kingdom [] +;Keyword = OCF_NPC_PetSmall|NONE| + +; gg77's Dogs Kingdom [] +;Keyword = OCF_NPC_PetLarge|NONE| + +; gg77's Rabbits Kingdom [] +;Keyword = OCF_NPC_PetSmall|NONE| + +; gg77's Rats Kingdom [] +;Keyword = OCF_NPC_PetSmall|NONE| + +; Legacy of the Dragonborn [LegacyoftheDragonborn.esm] + + + +; ========================= GENERAL ========================= +Keyword = OCF_ActiHeatSource_Fire|OCF_ActiHeatSource_FireHuge,OCF_ActiHeatSource_FireLarge,OCF_ActiHeatSource_FireMedium,OCF_ActiHeatSource_FireSmall +Keyword = OCF_ActiHeatSource_Other|OCF_ActiHeatSource_OtherHuge,OCF_ActiHeatSource_OtherLarge,OCF_ActiHeatSource_OtherMedium,OCF_ActiHeatSource_OtherSmall +Keyword = OCF_ActiHeatSource|OCF_ActiHeatSource_Fire,OCF_ActiHeatSource_Other +;Keyword = OCF_NPC_PetLarge| +;Keyword = OCF_NPC_PetMount| +;Keyword = OCF_NPC_PetSmall| + + + +;Keyword = RecordID|StringFilters|FormFilters|LevelFilters|Traits|NONE|Chance + + diff --git a/dist/Object Categorization Framework/fomod/ModuleConfig.xml b/dist/Object Categorization Framework/fomod/ModuleConfig.xml index 5ec995d..25b677c 100644 Binary files a/dist/Object Categorization Framework/fomod/ModuleConfig.xml and b/dist/Object Categorization Framework/fomod/ModuleConfig.xml differ diff --git a/dist/Object Categorization Framework/fomod/info.xml b/dist/Object Categorization Framework/fomod/info.xml index 390695b..603fb22 100644 Binary files a/dist/Object Categorization Framework/fomod/info.xml and b/dist/Object Categorization Framework/fomod/info.xml differ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 2dea157..b5db8ef 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,33 @@ # Object Categorization Framework - Changelog +## Version 6.1.0 + +- **Author's Note:** Added static FormIDs for some activators and flora so they can hopefully be used for more things like Better Third Person Selection filters. + +- **Now requires** [Spell Perk Item Distributor](https://www.nexusmods.com/skyrimspecialedition/mods/36869) (v7.2.0.RC6+) to fix performance issue with Exclusive Groups feature. + +- **FOMOD:** Fix line-ending encoding issue that caused installation issues for some people using Nexus Mod Manager. Had troubles uploading the proper file to Nexus, but this includes the fix for sure. + +- **FOMOD:** Added install option for old SPID file as a backup option for users who have issues with load time to main menu, but are unable to use SPID v7.2+. + +- **ESP (`OCF.esp`):** Added new Keywords (`OCF.esp|xxx`). + +- **Keywords (`WEAP`) added:** `OCF_WeapUnarmed_Basic` \[`0x88E~OCF.esp`\], `OCF_WeapUnarmed_Claws` \[`0x88F~OCF.esp`\]. + +- **Keywords (`ACTI`) changed:** `OCF_ActiAllMakerStone` to `OCF_ActiAllMakerStone` \[`0x890~OCF.esp`\], `OCF_ActiAshPile` to `OCF_ActiAshPile` \[`0x891~OCF.esp`\], `OCF_ActiBird` to `OCF_ActiBird` \[`0x892~OCF.esp`\], `OCF_ActiBlackBook` to `OCF_ActiBlackBook` \[`0x893~OCF.esp`\], `OCF_ActiCritter` to `OCF_ActiCritter` \[`0x894~OCF.esp`\], `OCF_ActiDisplay` to `OCF_ActiDisplay` \[`0x895~OCF.esp`\], `OCF_ActiDoomstone` to `OCF_ActiDoomstone` \[`0x896~OCF.esp`\], `OCF_ActiMapMarker` to `OCF_ActiMapMarker` \[`0x897~OCF.esp`\], `OCF_ActiShrine` to `OCF_ActiShrine` \[`0x898~OCF.esp`\], `OCF_ActiSoil` to `OCF_ActiSoil` \[`0x899~OCF.esp`\], `OCF_ActiTorchSconce` to `OCF_ActiTorchSconce` \[`0x89A~OCF.esp`\], `OCF_ActiThrallCattle` to `OCF_ActiThrallCattle` \[`0x89B~OCF.esp`\], `OCF_ActiTrigger` to `OCF_ActiTrigger` \[`0x89C~OCF.esp`\], `OCF_ActiVein` to `OCF_ActiVein` \[`0x89D~OCF.esp`\], `OCF_FlorCoinpile` to `OCF_FlorCoinpile` \[`0x89E~OCF.esp`\], `OCF_FlorOther` to `OCF_FlorOther` \[`0x89F~OCF.esp`\], `OCF_FlorPlant` to `OCF_FlorPlant` \[`0x8A0~OCF.esp`\]. + +- **Keywords (`FLOR`) changed:** `OCF_FlorBirdNest` to `OCF_FlorBirdNest` \[`0x8A1~OCF.esp`\], `OCF_FlorCarcass` to `OCF_FlorCarcass` \[`0x8A2~OCF.esp`\], `OCF_FlorEggSac` to `OCF_FlorEggSac` \[`0x8A5~OCF.esp`\], `OCF_FlorOther` to `OCF_FlorOther` \[`0x89F~OCF.esp`\], `OCF_FlorOyster` to `OCF_FlorOyster` \[`0x8A6~OCF.esp`\], `OCF_FlorPlant` to `OCF_FlorPlant` \[`0x8A0~OCF.esp`\], `OCF_FlorWater` to `OCF_FlorWater` \[`0x8A7~OCF.esp`\]. + +- **Keyword Categorization added:** [Feral](https://www.nexusmods.com/skyrimspecialedition/mods/34552) (`WEAP`), [Gourmet EAS - Sweets & Such Patch](https://www.nexusmods.com/skyrimspecialedition/mods/108469) (`BOOK`), [Sweets & Such - Eating Animations & Sounds Patch](https://www.nexusmods.com/skyrimspecialedition/mods/95746) (`ALCH`). + +- **Keyword Categorization fixed:** [Feral]((https://www.nexusmods.com/skyrimspecialedition/mods/34552)) (`ARMO`), [Skyrim Food Expansion](https://www.nexusmods.com/skyrimspecialedition/mods/110935) (`ALCH`), [Sweets & Such](https://www.nexusmods.com/skyrimspecialedition/mods/80781) (`ALCH`), general (`ARMO`). + +- **Keyword Categorization tweaked:** [Gourmet](https://www.nexusmods.com/skyrimspecialedition/mods/96876) (`BOOK`), general (`ARMO`, `WEAP`). + +## Version 6.0.2 + +- **Author's Note:** Another attempt to get Nexus to upload the proper file with the FOMOD fix for Nexus Mod Manager users (failed). + ## Version 6.0.1 - **FOMOD:** Fix line-ending encoding issue that caused installation issues for some people. diff --git a/docs/description-md/description_detailed.md b/docs/description-md/description_detailed.md index 6bbe31c..9bf9094 100644 --- a/docs/description-md/description_detailed.md +++ b/docs/description-md/description_detailed.md @@ -26,7 +26,7 @@ Install this mod normally, with MO2, Vortex, or another mod manager that support - [Keyword Item Distributor (KID)](https://www.nexusmods.com/skyrimspecialedition/mods/55728) (v3.4.0+). - [FormList Manipulator (FLM)](https://www.nexusmods.com/skyrimspecialedition/mods/74037) (v1.7.0+). -- [Spell Perk Item Distributor (SPID)](https://www.nexusmods.com/skyrimspecialedition/mods/36869) (v7.0.0+). +- [Spell Perk Item Distributor (SPID)](https://www.nexusmods.com/skyrimspecialedition/mods/36869) (v7.2.0.RC6+). ## \[font=Verdana\]**Optional Requirements:**\[/font\] diff --git a/docs/description-nexus/description_detailed.bbcode b/docs/description-nexus/description_detailed.bbcode index e6a8b42..456a9c5 100644 --- a/docs/description-nexus/description_detailed.bbcode +++ b/docs/description-nexus/description_detailed.bbcode @@ -27,7 +27,7 @@ Install this mod normally, with MO2, Vortex, or another mod manager that support [list] [*][url=https://www.nexusmods.com/skyrimspecialedition/mods/55728]Keyword Item Distributor (KID)[/url] (v3.4.0+). [*][url=https://www.nexusmods.com/skyrimspecialedition/mods/74037]FormList Manipulator (FLM)[/url] (v1.7.0+). -[*][url=https://www.nexusmods.com/skyrimspecialedition/mods/36869]Spell Perk Item Distributor (SPID)[/url] (v7.0.0+). +[*][url=https://www.nexusmods.com/skyrimspecialedition/mods/36869]Spell Perk Item Distributor (SPID)[/url] (v7.2.0.RC6+). [/list] [size=5][font=Verdana][b]Optional Requirements:[/b][/font][/size] diff --git a/docs/wiki/Keyword-Reference.md b/docs/wiki/Keyword-Reference.md index dd99946..f9f6d88 100644 --- a/docs/wiki/Keyword-Reference.md +++ b/docs/wiki/Keyword-Reference.md @@ -38,15 +38,15 @@ ### Type -- `OCF_ActiAllMakerStone` – An All-Maker stone. +- `OCF_ActiAllMakerStone` \[`0x890~OCF.esp`\] – An All-Maker stone. -- `OCF_ActiAshPile` – A pile of remains like ash or goo. +- `OCF_ActiAshPile` \[`0x891~OCF.esp`\] – A pile of remains like ash or goo. -- `OCF_ActiBird` – A bird like a Hawk or Felstaad Tern. +- `OCF_ActiBird` \[`0x892~OCF.esp`\] – A bird like a Hawk or Felstaad Tern. -- `OCF_ActiBlackBook` – A Black Book. Specifically only the ones that send you from Apocrypha back to Nirn. +- `OCF_ActiBlackBook` \[`0x893~OCF.esp`\] – A Black Book. Specifically only the ones that send you from Apocrypha back to Nirn. -- `OCF_ActiCritter` – A critter like a bug or fish. +- `OCF_ActiCritter` \[`0x894~OCF.esp`\] – A critter like a bug or fish. - `OCF_ActiCritter_Bug` – A bug like a bee or butterfly. @@ -66,7 +66,7 @@ - `OCF_ActiCritter_FishIngr` – A fish that gives you an ingredient, like a River Betty. -- `OCF_ActiDisplay` – A decorative activator used to display items. +- `OCF_ActiDisplay` \[`0x895~OCF.esp`\] – A decorative activator used to display items. - `OCF_ActiDisplay_Bookshelf` – A bookshelf. @@ -78,29 +78,29 @@ - `OCF_ActiDisplay_Rack` – A weapon or shield rack. -- `OCF_ActiDoomstone` – A standing stone. +- `OCF_ActiDoomstone` \[`0x896~OCF.esp`\] – A standing stone. - ~~`OCF_ActiItem` – An activator that gives you an item upon activating.~~ **UNUSED** - `OCF_ActiLava` – Lava. -- `OCF_ActiMapMarker` – An activator that adds a map marker to your map upon activating. +- `OCF_ActiMapMarker` \[`0x897~OCF.esp`\] – An activator that adds a map marker to your map upon activating. - ~~`OCF_ActiShelter`~~ **UNUSED** - ~~`OCF_ActiShelter_Tent`~~ **UNUSED** -- `OCF_ActiShrine` – A shrine to a deity or other figure. +- `OCF_ActiShrine` \[`0x898~OCF.esp`\] – A shrine to a deity or other figure. - ~~`OCF_ActiSpider`~~ **UNUSED** -- `OCF_ActiSoil` – Soil used for planting. +- `OCF_ActiSoil` \[`0x899~OCF.esp`\] – Soil used for planting. -- `OCF_ActiTorchSconce` – A sconce for holding a torch. +- `OCF_ActiTorchSconce` \[`0x89A~OCF.esp`\] – A sconce for holding a torch. -- `OCF_ActiThrallCattle` – A vampire's thrall used as cattle. +- `OCF_ActiThrallCattle` \[`0x89B~OCF.esp`\] – A vampire's thrall used as cattle. -- `OCF_ActiTrigger` – An activator that triggers something upon activating. +- `OCF_ActiTrigger` \[`0x89C~OCF.esp`\] – An activator that triggers something upon activating. - `OCF_ActiTrigger_Button` – A pressable button. @@ -126,7 +126,7 @@ - `OCF_ActiTrigger_Valve` – A turnable Dwemer valve. -- `OCF_ActiVein` – A minable deposit of resources. +- `OCF_ActiVein` \[`0x89D~OCF.esp`\] – A minable deposit of resources. - `OCF_ActiVein_Chitin` – A minable deposit of chitin, such as a Shellbug. @@ -136,9 +136,9 @@ - ~~`OCF_ActiWater` – Water.~~ **UNUSED** -- `OCF_FlorCoinpile` – A harvestable pile of coins. +- `OCF_FlorCoinpile` \[`0x89E~OCF.esp`\] – A harvestable pile of coins. -- `OCF_FlorOther` – A miscellaneous harvestable. +- `OCF_FlorOther` \[`0x89F~OCF.esp`\] – A miscellaneous harvestable. - ~~`OCF_FlorOther_Food` – A miscellaneous harvestable that gives you food.~~ **UNUSED** @@ -146,7 +146,7 @@ - `OCF_FlorOther_Other` – A miscellaneous harvestable that gives you some other item. -- `OCF_FlorPlant` – A harvestable plant. +- `OCF_FlorPlant` \[`0x8A0~OCF.esp`\] – A harvestable plant. - ~~`OCF_FlorPlant_Food` – A harvestable plant that gives you food.~~ **UNUSED** @@ -1302,9 +1302,9 @@ ### Type -- `OCF_FlorBirdNest` +- `OCF_FlorBirdNest` \[`0x8A1~OCF.esp`\] -- `OCF_FlorCarcass` +- `OCF_FlorCarcass` \[`0x8A2~OCF.esp`\] - `OCF_FlorCarcass_Animal` @@ -1314,9 +1314,9 @@ - `OCF_FlorCarcass_Hominid` -- `OCF_FlorCoinpurse` +- `OCF_FlorCoinpurse` \[`0x8A3~OCF.esp`\] -- `OCF_FlorContainer` +- `OCF_FlorContainer` \[`0x8A4~OCF.esp`\] - `OCF_FlorContainer_Food` @@ -1324,9 +1324,9 @@ - `OCF_FlorContainer_Other` -- `OCF_FlorEggSac` +- `OCF_FlorEggSac` \[`0x8A5~OCF.esp`\] -- `OCF_FlorOther` +- `OCF_FlorOther` \[`0x89F~OCF.esp`\] - `OCF_FlorOther_Food` @@ -1334,9 +1334,9 @@ - `OCF_FlorOther_Other` -- `OCF_FlorOyster` +- `OCF_FlorOyster` \[`0x8A6~OCF.esp`\] -- `OCF_FlorPlant` +- `OCF_FlorPlant` \[`0x8A0~OCF.esp`\] - `OCF_FlorPlant_Food` @@ -1348,7 +1348,7 @@ - `OCF_FlorPlant_SoulHusk` -- `OCF_FlorWater` +- `OCF_FlorWater` \[`0x8A7~OCF.esp`\] --- @@ -5764,6 +5764,10 @@ - `OCF_WeapUnarmed` \[`0x82D~OCF.esp`\] + - `OCF_WeapUnarmed_Basic` + + - `OCF_WeapUnarmed_Claws` + - `OCF_WeapBladed2H` \[`0x881~OCF.esp`\] - `OCF_WeapTypeGreatsword2H` \[`0x867~OCF.esp`\]