arts of monster behavior are now read from monsters.xml.

1 files changed, 29 insertions, 4 deletions

diff --git a/src/game-server/monster.hpp b/src/game-server/monster.hpp
index f5c7c18f..3b96c619 100644
--- a/src/game-server/monster.hpp
+++ b/src/game-server/monster.hpp
@@ -49,7 +49,14 @@ typedef std::vector< MonsterDrop > MonsterDrops;
 class MonsterClass
 {
     public:
-        MonsterClass(int id): mID(id), mAttributes(BASE_ATTR_NB, 0), mExp(-1) {}
+        MonsterClass(int id):
+            mID(id),
+            mAttributes(BASE_ATTR_NB, 0),
+            mExp(-1),
+            mAggressive(false),
+            mTrackRange(1),
+            mStrollRange(0)
+        {}
 
         /**
          * Gets monster type.
@@ -87,9 +94,26 @@ class MonsterClass
         int getExp() const
         { return mExp; }
 
+        void setAggressive(bool aggressive)
+        { mAggressive = aggressive; }
+
+        bool isAggressive() const
+        { return mAggressive; }
+
+        void setTrackRange(int range)
+        { mTrackRange = range; }
+
+        unsigned getTrackRange() const
+        { return mTrackRange; }
+
+        void setStrollRange(int range)
+        { mStrollRange = range; }
+
+        unsigned getStrollRange() const
+        { return mStrollRange; }
+
         /**
          * Randomly selects a monster drop (may return NULL).
-         * TODO: pass some luck modifier as an argument.
          */
         ItemClass *getRandomDrop() const;
 
@@ -98,6 +122,9 @@ class MonsterClass
         MonsterDrops mDrops; /**< Items the monster drops when dying. */
         std::vector<int> mAttributes; /**< Base attributes of the monster*/
         int mExp; /**< Exp reward for killing the monster */
+        bool mAggressive;        /**< Does the monster attack without being provoked? */
+        unsigned mTrackRange;   /**< Distance the monster tracks enemies in */
+        unsigned mStrollRange;  /**< Distance the monster strolls around in when not fighting */
 };
 
 /**
@@ -187,8 +214,6 @@ class Monster : public Being
         int mAttackAftDelay;        /**< time it takes to perform an attack */
         int mAttackRange;           /**< range of the monsters attacks in pixel */
         int mAttackAngle;           /**< angle of the monsters attacks in degree */
-        bool mAgressive;            /**< Does the monster attack without being provoked? */
-        unsigned mAgressionRange;   /**< Distance the monster tracks enemies in */
         std::list<AttackPosition> mAttackPositions; /**< set positions relative to target from which the monster can attack */
 
         friend struct MonsterTargetEventDispatch;