Merge branch 'autoequip'

apps/openmw/mwclass/apparatus.cpp

@@ -70,6 +70,14 @@ namespace MWClass
         return ref->base->script;
     }
 
+    int Apparatus::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+            ptr.get<ESM::Apparatus>();
+
+        return ref->base->data.value;
+    }
+
     void Apparatus::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Apparatus);

apps/openmw/mwclass/apparatus.hpp

@@ -25,6 +25,9 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;

apps/openmw/mwclass/armor.cpp

@@ -160,6 +160,14 @@ namespace MWClass
         return ESM::Skill::HeavyArmor;
     }
 
+    int Armor::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+            ptr.get<ESM::Armor>();
+
+        return ref->base->data.value;
+    }
+
     void Armor::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Armor);

apps/openmw/mwclass/armor.hpp

@@ -40,6 +40,9 @@ namespace MWClass
             /// Return the index of the skill this item corresponds to when equiopped or -1, if there is
             /// no such skill.
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/book.cpp

@@ -72,6 +72,14 @@ namespace MWClass
         return ref->base->script;
     }
 
+    int Book::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+            ptr.get<ESM::Book>();
+
+        return ref->base->data.value;
+    }
+
     void Book::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Book);

apps/openmw/mwclass/book.hpp

@@ -25,6 +25,9 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/clothing.cpp

@@ -123,6 +123,14 @@ namespace MWClass
         return -1;
     }
 
+    int Clothing::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+            ptr.get<ESM::Clothing>();
+
+        return ref->base->data.value;
+    }
+
     void Clothing::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Clothing);

apps/openmw/mwclass/clothing.hpp

@@ -34,6 +34,9 @@ namespace MWClass
             /// Return the index of the skill this item corresponds to when equiopped or -1, if there is
             /// no such skill.
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/ingredient.cpp

@@ -68,6 +68,14 @@ namespace MWClass
         return ref->base->script;
     }
 
+    int Ingredient::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+            ptr.get<ESM::Ingredient>();
+
+        return ref->base->data.value;
+    }
+
     void Ingredient::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Ingredient);

apps/openmw/mwclass/ingredient.hpp

@@ -25,6 +25,9 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/light.cpp

@@ -110,6 +110,14 @@ namespace MWClass
         return std::make_pair (slots, false);
     }
 
+    int Light::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+            ptr.get<ESM::Light>();
+
+        return ref->base->data.value;
+    }
+
     void Light::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Light);

apps/openmw/mwclass/light.hpp

@@ -34,6 +34,9 @@ namespace MWClass
             ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
             /// stay stacked when equipped?
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/lockpick.cpp

@@ -81,6 +81,14 @@ namespace MWClass
         return std::make_pair (slots, false);
     }
 
+    int Lockpick::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+            ptr.get<ESM::Tool>();
+
+        return ref->base->data.value;
+    }
+
     void Lockpick::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Lockpick);

apps/openmw/mwclass/lockpick.hpp

@@ -29,6 +29,9 @@ namespace MWClass
             ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
             /// stay stacked when equipped?
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/misc.cpp

@@ -70,6 +70,14 @@ namespace MWClass
         return ref->base->script;
     }
 
+    int Miscellaneous::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+            ptr.get<ESM::Miscellaneous>();
+
+        return ref->base->data.value;
+    }
+
     void Miscellaneous::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Miscellaneous);

apps/openmw/mwclass/misc.hpp

@@ -25,6 +25,9 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/potion.cpp

@@ -70,6 +70,14 @@ namespace MWClass
         return ref->base->script;
     }
 
+    int Potion::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+            ptr.get<ESM::Potion>();
+
+        return ref->base->data.value;
+    }
+
     void Potion::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Potion);

apps/openmw/mwclass/potion.hpp

@@ -25,6 +25,9 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/probe.cpp

@@ -80,6 +80,14 @@ namespace MWClass
         return std::make_pair (slots, false);
     }
 
+    int Probe::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+            ptr.get<ESM::Probe>();
+
+        return ref->base->data.value;
+    }
+
     void Probe::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Probe);

apps/openmw/mwclass/probe.hpp

@@ -29,6 +29,9 @@ namespace MWClass
             ///< \return first: Return IDs of the slot this object can be equipped in; second: can object
             /// stay stacked when equipped?
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/repair.cpp

@@ -70,6 +70,14 @@ namespace MWClass
         return ref->base->script;
     }
 
+    int Repair::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+            ptr.get<ESM::Repair>();
+
+        return ref->base->data.value;
+    }
+
     void Repair::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Repair);

apps/openmw/mwclass/repair.hpp

@@ -25,6 +25,9 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwclass/weapon.cpp

@@ -139,6 +139,14 @@ namespace MWClass
         return -1;
     }
 
+    int Weapon::getValue (const MWWorld::Ptr& ptr) const
+    {
+        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+            ptr.get<ESM::Weapon>();
+
+        return ref->base->data.value;
+    }
+
     void Weapon::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Weapon);

apps/openmw/mwclass/weapon.hpp

@@ -40,6 +40,9 @@ namespace MWClass
             /// Return the index of the skill this item corresponds to when equiopped or -1, if there is
             /// no such skill.
 
+            virtual int getValue (const MWWorld::Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const;

apps/openmw/mwmechanics/actors.cpp

@@ -17,9 +17,9 @@ namespace MWMechanics
 
     void Actors::updateNpc (const MWWorld::Ptr& ptr, float duration, bool paused)
     {
-        if (!paused)
+        if (!paused && ptr.getRefData().getHandle()!="player")
             MWWorld::Class::get (ptr).getInventoryStore (ptr).autoEquip (
-                MWWorld::Class::get (ptr).getNpcStats (ptr));
+                MWWorld::Class::get (ptr).getNpcStats (ptr), mEnvironment);
     }
 
     Actors::Actors (MWWorld::Environment& environment) : mEnvironment (environment), mDuration (0) {}

apps/openmw/mwworld/class.cpp

@@ -137,6 +137,11 @@ namespace MWWorld
         return -1;
     }
 
+    int Class::getValue (const Ptr& ptr) const
+    {
+        throw std::logic_error ("value not supported by this class");
+    }
+
     const Class& Class::get (const std::string& key)
     {
         std::map<std::string, boost::shared_ptr<Class> >::const_iterator iter = sClasses.find (key);

apps/openmw/mwworld/class.hpp

@@ -155,6 +155,10 @@ namespace MWWorld
             /// no such skill.
             /// (default implementation: return -1)
 
+            virtual int getValue (const Ptr& ptr) const;
+            ///< Return trade value of the object. Throws an exception, if the object can't be traded.
+            /// (default implementation: throws an exception)
+
             static const Class& get (const std::string& key);
             ///< If there is no class for this \a key, an exception is thrown.
 

apps/openmw/mwworld/inventorystore.cpp

@@ -4,6 +4,8 @@
 #include <iterator>
 #include <algorithm>
 
+#include "../mwmechanics/npcstats.hpp"
+
 #include "class.hpp"
 
 #include <iostream> /// \todo remove after rendering is implemented
@@ -94,27 +96,64 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
     return mSlots[slot];
 }
 
-void MWWorld::InventoryStore::autoEquip (const MWMechanics::NpcStats& stats)
+void MWWorld::InventoryStore::autoEquip (const MWMechanics::NpcStats& stats,
+    const Environment& environment)
 {
     TSlots slots;
     initSlots (slots);
 
     for (ContainerStoreIterator iter (begin()); iter!=end(); ++iter)
     {
+        Ptr test = *iter;
+        int testSkill = MWWorld::Class::get (test).getEquipmentSkill (test, environment);
+
         std::pair<std::vector<int>, bool> itemsSlots =
             MWWorld::Class::get (*iter).getEquipmentSlots (*iter);
 
         for (std::vector<int>::const_iterator iter2 (itemsSlots.first.begin());
             iter2!=itemsSlots.first.end(); ++iter2)
         {
-            /// \todo comapre item with item in slot
+            bool use = false;
-            if (slots.at (*iter2)==end())
-            {
-                /// \todo unstack, if reqquired (itemsSlots.second)
 
-                slots[*iter2] = iter;
+            if (slots.at (*iter2)==end())
-                break;
+                use = true; // slot was empty before -> skill all further checks
+            else
+            {
+                Ptr old = *slots.at (*iter2);
+
+                if (!use)
+                {
+                    // check skill
+                    int oldSkill =
+                        MWWorld::Class::get (old).getEquipmentSkill (old, environment);
+
+                    if (testSkill!=-1 || oldSkill!=-1 || testSkill!=oldSkill)
+                    {
+                        if (stats.mSkill[oldSkill].getModified()>stats.mSkill[testSkill].getModified())
+                            continue; // rejected, because old item better matched the NPC's skills.
+
+                        if (stats.mSkill[oldSkill].getModified()<stats.mSkill[testSkill].getModified())
+                            use = true;
+                    }
+                }
+
+                if (!use)
+                {
+                    // check value
+                    if (MWWorld::Class::get (old).getValue (old)>=
+                        MWWorld::Class::get (test).getValue (test))
+                    {
+                        continue;
+                    }
+
+                    use = true;
+                }
             }
+
+            /// \todo unstack, if reqquired (itemsSlots.second)
+
+            slots[*iter2] = iter;
+            break;
         }
     }
 

apps/openmw/mwworld/inventorystore.hpp

@@ -10,6 +10,8 @@ namespace MWMechanics
 
 namespace MWWorld
 {
+    struct Environment;
+
     ///< \brief Variant of the ContainerStore for NPCs
     class InventoryStore : public ContainerStore
     {
@@ -62,7 +64,7 @@ namespace MWWorld
 
             ContainerStoreIterator getSlot (int slot);
 
-            void autoEquip (const MWMechanics::NpcStats& stats);
+            void autoEquip (const MWMechanics::NpcStats& stats, const Environment& environment);
             ///< Auto equip items according to stats and item value.
     };
 }