more dry + restrict mutation of disposition to global and on self

apps/openmw/mwlua/types/npc.cpp

@@ -50,6 +50,18 @@ namespace
             throw std::runtime_error("Faction '" + std::string(faction) + "' does not exist");
         return id;
     }
+
+    void verifyPlayer(const MWLua::Object& o)
+    {
+        if (o.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
+            throw std::runtime_error("The argument must be a player!");
+    }
+
+    void verifyNpc(const MWWorld::Class& cls)
+    {
+        if (!cls.isNpc())
+            throw std::runtime_error("The argument must be a NPC!");
+    }
 }
 
 namespace MWLua
@@ -99,38 +111,36 @@ namespace MWLua
         };
 
         npc["getDisposition"] = [](const Object& o, const Object& player) -> int {
-            if (player.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
-                throw std::runtime_error("The argument must be a player!");
             const MWWorld::Class& cls = o.ptr().getClass();
-            if (!cls.isNpc())
+            verifyPlayer(player);
-                throw std::runtime_error("NPC expected");
+            verifyNpc(cls);
             return MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(o.ptr());
         };
 
         npc["getBaseDisposition"] = [](const Object& o, const Object& player) -> int {
-            if (player.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
-                throw std::runtime_error("The argument must be a player!");
             const MWWorld::Class& cls = o.ptr().getClass();
-            if (!cls.isNpc())
+            verifyPlayer(player);
-                throw std::runtime_error("NPC expected");
+            verifyNpc(cls);
             return cls.getNpcStats(o.ptr()).getBaseDisposition();
         };
 
-        npc["setBaseDisposition"] = [](const Object& o, const Object& player, int value) {
+        npc["setBaseDisposition"] = [](Object& o, const Object& player, int value) {
-            if (player.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
+            if (dynamic_cast<LObject*>(&o) && !dynamic_cast<SelfObject*>(&o))
-                throw std::runtime_error("The argument must be a player!");
+                throw std::runtime_error("Local scripts can modify only self");
+
             const MWWorld::Class& cls = o.ptr().getClass();
-            if (!cls.isNpc())
+            verifyPlayer(player);
-                throw std::runtime_error("NPC expected");
+            verifyNpc(cls);
             cls.getNpcStats(o.ptr()).setBaseDisposition(value);
         };
 
-        npc["modifyBaseDisposition"] = [](const Object& o, const Object& player, int value) {
+        npc["modifyBaseDisposition"] = [](Object& o, const Object& player, int value) {
-            if (player.ptr() != MWBase::Environment::get().getWorld()->getPlayerPtr())
+            if (dynamic_cast<LObject*>(&o) && !dynamic_cast<SelfObject*>(&o))
-                throw std::runtime_error("The argument must be a player!");
+                throw std::runtime_error("Local scripts can modify only self");
+
             const MWWorld::Class& cls = o.ptr().getClass();
-            if (!cls.isNpc())
+            verifyPlayer(player);
-                throw std::runtime_error("NPC expected");
+            verifyNpc(cls);
             auto& stats = cls.getNpcStats(o.ptr());
             stats.setBaseDisposition(stats.getBaseDisposition() + value);
         };

files/lua_api/openmw/types.lua

@@ -1011,14 +1011,14 @@
 -- @return #number
 
 ---
--- Set the base disposition of the provided NPC.
+-- Set the base disposition of the provided NPC (only in global scripts or on self).
 -- @function [parent=#NPC] setBaseDisposition
 -- @param openmw.core#GameObject object
 -- @param openmw.core#GameObject player The player that you want to set the disposition for.
 -- @param #number value Base disposition is set to this value
 
 ---
--- Modify the base disposition of the provided NPC by a certain amount.
+-- Modify the base disposition of the provided NPC by a certain amount (only in global scripts or on self).
 -- @function [parent=#NPC] modifyBaseDisposition
 -- @param openmw.core#GameObject object
 -- @param openmw.core#GameObject player The player that you want to modify the disposition for.