Merge branch 'reputation_stat' into 'master'

Reputation stat

Closes #123 and #9013

See merge request OpenMW/openmw!5197

Author: Capostrophic

CMakeLists.txt

@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 51)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 117)
+set(OPENMW_LUA_API_REVISION 118)
 set(OPENMW_POSTPROCESSING_API_REVISION 5)
 
 set(OPENMW_VERSION_COMMITHASH "")

apps/openmw/mwlua/stats.cpp

@@ -469,6 +469,45 @@ namespace MWLua
                 stats.setAiSetting(index, stat);
             }
         };
+
+        class ReputationStat
+        {
+            ObjectVariant mObject;
+
+            ReputationStat(ObjectVariant object)
+                : mObject(std::move(object))
+            {
+            }
+
+        public:
+            sol::object get(const Context& context, const std::string_view prop) const
+            {
+                return getValue(context, mObject, &ReputationStat::setValue, std::monostate{}, prop,
+                    [](const MWWorld::Ptr& ptr) { return ptr.getClass().getNpcStats(ptr).getReputation(); });
+            }
+
+            static std::optional<ReputationStat> create(ObjectVariant object)
+            {
+                if (!object.ptr().getClass().isNpc())
+                    return {};
+
+                return ReputationStat{ std::move(object) };
+            }
+
+            void cache(const Context& context, const std::string_view prop, const sol::object& value) const
+            {
+                SelfObject* obj = mObject.asSelfObject();
+                obj->cacheStat(*context.mLuaManager,
+                    SelfObject::CachedStat{ &ReputationStat::setValue, std::monostate{}, prop }, value);
+            }
+
+            static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
+            {
+                MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats(ptr);
+                int intValue = LuaUtil::cast<int>(value);
+                stats.setReputation(intValue);
+            }
+        };
     }
 }
 
@@ -612,6 +651,13 @@ namespace MWLua
         npcStats["skills"] = LuaUtil::makeReadOnly(skills);
         for (const ESM::Skill& skill : MWBase::Environment::get().getESMStore()->get<ESM::Skill>())
             skills[ESM::RefId(skill.mId).serializeText()] = addIndexedAccessor<SkillStat>(skill.mId);
+
+        auto reputationStatT = lua.new_usertype<ReputationStat>("ReputationStat");
+        reputationStatT["current"]
+            = sol::property([=](const ReputationStat& stat) { return stat.get(context, "current"); },
+                [=](const ReputationStat& stat, const sol::object& value) { stat.cache(context, "current", value); });
+
+        npcStats["reputation"] = [](const sol::object& o) { return ReputationStat::create(ObjectVariant(o)); };
     }
 
     sol::table initCoreStatsBindings(const Context& context)

files/lua_api/openmw/types.lua

@@ -439,40 +439,44 @@
 -- @field #number magic Number of contributions to magic specialization for the next level up.
 -- @field #number stealth Number of contributions to stealth specialization for the next level up.
 
----
+--- Value modification is delayed
 -- @type LevelStat
 -- @field #number current The actor's current level.
 -- @field #number progress The NPC's level progress.
 -- @field #SkillIncreasesForAttributeStats skillIncreasesForAttribute The NPC's attribute contributions towards the next level up. Values affect how much each attribute can be increased at level up.
 -- @field #SkillIncreasesForSpecializationStats skillIncreasesForSpecialization The NPC's attribute contributions towards the next level up. Values affect the graphic used on the level up screen.
 
----
+--- Value modification is delayed
 -- @type DynamicStat
 -- @field #number base
 -- @field #number current
 -- @field #number modifier
 
----
+--- Value modification is delayed
 -- @type AttributeStat
 -- @field #number base The actor's base attribute value.
 -- @field #number damage The amount the attribute has been damaged.
 -- @field #number modified The actor's current attribute value (read-only.)
 -- @field #number modifier The attribute's modifier.
 
----
+--- Value modification is delayed
 -- @type SkillStat
 -- @field #number base The NPC's base skill value.
 -- @field #number damage The amount the skill has been damaged.
 -- @field #number modified The NPC's current skill value (read-only.)
 -- @field #number modifier The skill's modifier.
 -- @field #number progress [0-1] The NPC's skill progress.
 
----
+--- Value modification is delayed
 -- @type AIStat
 -- @field #number base The stat's base value.
 -- @field #number modifier The stat's modifier.
 -- @field #number modified The actor's current ai value (read-only.)
 
+--- Value modification is delayed
+-- @type ReputationStat
+-- @field #number current Current reputation value.
+
 ---
 -- @type DynamicStats
 
@@ -756,6 +760,7 @@
 -- @type NpcStats
 -- @extends #ActorStats
 -- @field #SkillStats skills
+-- @field #ReputationStat reputation
 
 
 --------------------------------------------------------------------------------