Remove ATTRIBUTE, SKILL, and SCHOOL enums

apps/openmw/mwlua/luabindings.cpp

@@ -184,32 +184,6 @@ namespace MWLua
             return sol::nil;
         };
 
-        // deprecated, use core.stats.Skill
-        sol::table skills(context.mLua->sol(), sol::create);
-        api["SKILL"] = LuaUtil::makeStrictReadOnly(skills);
-        for (int i = 0; i < ESM::Skill::Length; ++i)
-        {
-            ESM::RefId skill = ESM::Skill::indexToRefId(i);
-            std::string id = skill.serializeText();
-            std::string key = Misc::StringUtils::lowerCase(skill.getRefIdString());
-            // force first character to uppercase for backwards compatability
-            key[0] += 'A' - 'a';
-            skills[key] = id;
-        }
-
-        // deprecated, use core.stats.Attribute
-        sol::table attributes(context.mLua->sol(), sol::create);
-        api["ATTRIBUTE"] = LuaUtil::makeStrictReadOnly(attributes);
-        for (int i = 0; i < ESM::Attribute::Length; ++i)
-        {
-            ESM::RefId attribute = ESM::Attribute::indexToRefId(i);
-            std::string id = attribute.serializeText();
-            std::string key = Misc::StringUtils::lowerCase(attribute.getRefIdString());
-            // force first character to uppercase for backwards compatability
-            key[0] += 'A' - 'a';
-            attributes[key] = id;
-        }
-
         return LuaUtil::makeReadOnly(api);
     }
 

apps/openmw/mwlua/magicbindings.cpp

@@ -203,15 +203,6 @@ namespace MWLua
             { "Touch", ESM::RT_Touch },
             { "Target", ESM::RT_Target },
         }));
-        // deprecated, use core.stats.Skill
-        magicApi["SCHOOL"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string>({
-            { "Alteration", ESM::RefId(ESM::Skill::Alteration).serializeText() },
-            { "Conjuration", ESM::RefId(ESM::Skill::Conjuration).serializeText() },
-            { "Destruction", ESM::RefId(ESM::Skill::Destruction).serializeText() },
-            { "Illusion", ESM::RefId(ESM::Skill::Illusion).serializeText() },
-            { "Mysticism", ESM::RefId(ESM::Skill::Mysticism).serializeText() },
-            { "Restoration", ESM::RefId(ESM::Skill::Restoration).serializeText() },
-        }));
         magicApi["SPELL_TYPE"]
             = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, ESM::Spell::SpellType>({
                 { "Spell", ESM::Spell::ST_Spell },

files/lua_api/openmw/core.lua

@@ -433,57 +433,6 @@
 -- @usage for _, item in ipairs(inventory:findAll('common_shirt_01')) do ... end
 
 
---- Possible @{#ATTRIBUTE} values (DEPRECATED use @{#Attribute})
--- @field [parent=#core] #ATTRIBUTE ATTRIBUTE
-
---- DEPRECATED, use @{#Attribute}
---- `core.ATTRIBUTE`
--- @type ATTRIBUTE
--- @field #string Strength "strength"
--- @field #string Intelligence "intelligence"
--- @field #string Willpower "willpower"
--- @field #string Agility "agility"
--- @field #string Speed "speed"
--- @field #string Endurance "endurance"
--- @field #string Personality "personality"
--- @field #string Luck "luck"
-
-
---- Possible @{#SKILL} values (DEPRECATED use @{#Skill})
--- @field [parent=#core] #SKILL SKILL
-
---- DEPRECATED, use @{#Skill}
---- `core.SKILL`
--- @type SKILL
--- @field #string Acrobatics "acrobatics"
--- @field #string Alchemy "alchemy"
--- @field #string Alteration "alteration"
--- @field #string Armorer "armorer"
--- @field #string Athletics "athletics"
--- @field #string Axe "axe"
--- @field #string Block "block"
--- @field #string BluntWeapon "bluntweapon"
--- @field #string Conjuration "conjuration"
--- @field #string Destruction "destruction"
--- @field #string Enchant "enchant"
--- @field #string HandToHand "handtohand"
--- @field #string HeavyArmor "heavyarmor"
--- @field #string Illusion "illusion"
--- @field #string LightArmor "lightarmor"
--- @field #string LongBlade "longblade"
--- @field #string Marksman "marksman"
--- @field #string MediumArmor "mediumarmor"
--- @field #string Mercantile "mercantile"
--- @field #string Mysticism "mysticism"
--- @field #string Restoration "restoration"
--- @field #string Security "security"
--- @field #string ShortBlade "shortblade"
--- @field #string Sneak "sneak"
--- @field #string Spear "spear"
--- @field #string Speechcraft "speechcraft"
--- @field #string Unarmored "unarmored"
-
-
 --- @{#Magic}: spells and spell effects
 -- @field [parent=#core] #Magic magic
 
@@ -498,19 +447,6 @@
 -- @field #number Target Ranged spell
 
 
---- Possible @{#MagicSchool} values (DEPRECATED use @{#Skill})
--- @field [parent=#Magic] #MagicSchool SCHOOL
-
---- `core.magic.SCHOOL`
--- @type MagicSchool
--- @field #string Alteration alteration
--- @field #string Conjuration conjuration
--- @field #string Destruction destruction
--- @field #string Illusion illusion
--- @field #string Mysticism mysticism
--- @field #string Restoration restoration
-
-
 --- Possible @{#MagicEffectId} values
 -- @field [parent=#Magic] #MagicEffectId EFFECT_TYPE