put stat increments in level ladder

[l2e.git] / src / common / Hero.h

diff --git a/src/common/Hero.h b/src/common/Hero.h
index 1905c815e9cac9cbb7549c0f276b8054a6c9a035..a0f1da47fc0af02833cc10f6bb00033d9de89afa 100644 (file)
--- a/src/common/Hero.h
+++ b/src/common/Hero.h
@@ -1,16 +1,18 @@
-/*
- * Hero.h
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #ifndef COMMON_HERO_H_
 #define COMMON_HERO_H_
 
-#include "fwd.h"
+namespace common {
+       class Item;
+       class LevelUp;
+       class Spell;
+       class Upgrade;
+}
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
+
 #include "Stats.h"
-#include "../graphics/fwd.h"
 #include "../map/Entity.h"
 
 #include <vector>
@@ -27,6 +29,29 @@ public:
        ~Hero() { }
 
 public:
+       enum EquipSlot {
+               EQUIP_WEAPON,
+               EQUIP_ARMOR,
+               EQUIP_SHIELD,
+               EQUIP_HELMET,
+               EQUIP_RING,
+               EQUIP_JEWEL,
+               EQUIP_COUNT,
+       };
+
+       enum UpgradeType {
+               UPGRADE_LVL,
+               UPGRADE_MHP,
+               UPGRADE_MMP,
+               UPGRADE_ATK,
+               UPGRADE_DFP,
+               UPGRADE_STR,
+               UPGRADE_AGL,
+               UPGRADE_INT,
+               UPGRADE_GUT,
+               UPGRADE_MGR,
+       };
+
        const char *Name() const { return name; }
 
        Uint16 MaxHealth() const { return maxHealth; }
@@ -50,26 +75,15 @@ public:
        int Experience() const { return experience; }
        int NextLevel() const;
 
-       Item *Weapon() { return weapon; }
-       Item *Armor() { return armor; }
-       Item *Shield() { return shield; }
-       Item *Helmet() { return helmet; }
-       Item *Ring() { return ring; }
-       Item *Jewel() { return jewel; }
-
-       const Item *Weapon() const { return weapon; }
-       const Item *Armor() const { return armor; }
-       const Item *Shield() const { return shield; }
-       const Item *Helmet() const { return helmet; }
-       const Item *Ring() const { return ring; }
-       const Item *Jewel() const { return jewel; }
-
-       bool HasWeapon() const { return weapon; }
-       bool HasArmor() const { return armor; }
-       bool HasShield() const { return shield; }
-       bool HasHelmet() const { return helmet; }
-       bool HasRing() const { return ring; }
-       bool HasJewel() const { return jewel; }
+       void AddExperience(int, std::vector<Upgrade> &);
+
+       bool CanEquip(const Item &) const;
+       bool CanInvoke(const Spell &) const;
+
+       const Item *Equipment(EquipSlot i) const { return equipment[i]; }
+       bool Equipped(EquipSlot i) const { return equipment[i]; }
+       void RemoveEquipment(EquipSlot i) { equipment[i] = 0; }
+       void SetEquipment(EquipSlot i, const Item *item) { equipment[i] = item; }
 
        std::vector<const Spell *> &Spells() { return spells; }
        const std::vector<const Spell *> &Spells() const { return spells; }
@@ -86,15 +100,9 @@ public:
        static void CreateTypeDescription();
        static void Construct(void *);
 
-// temporary setters
 public:
-       void SetWeapon(common::Item *i) { weapon = i; }
-       void SetArmor(common::Item *i) { armor = i; }
-       void SetShield(common::Item *i) { shield = i; }
-       void SetHelmet(common::Item *i) { helmet = i; }
-       void SetRing(common::Item *i) { ring = i; }
-       void SetJewel(common::Item *i) { jewel = i; }
-
+       void SetMaxHealth(int h) { maxHealth = h; }
+       void SetHealth(int h) { health = h; }
        void AddSpell(Spell *s) { spells.push_back(s); }
 
 private:
@@ -109,15 +117,12 @@ private:
        int level;
        int experience;
 
-       int *levelLadder;
+       LevelUp *levelLadder;
        int numLevels;
 
-       Item *weapon;
-       Item *armor;
-       Item *shield;
-       Item *helmet;
-       Item *ring;
-       Item *jewel;
+       int useMask;
+
+       const Item *equipment[EQUIP_COUNT];
 
        // TODO: vector does not seem to be a good choice
        std::vector<const Spell *> spells;
@@ -133,4 +138,4 @@ private:
 
 }
 
-#endif /* COMMON_HERO_H_ */
+#endif