added simple damage calculation formula

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

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 11f1e332400eeed439b8fe021931af1dcd265d88..5676cf93047e8c1d268086d92908d776aa1bc5c8 100644 (file)
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,6 +8,8 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "Stats.h"
+
 #include <vector>
 #include <SDL.h>
 
@@ -15,7 +17,10 @@ namespace common {
        class Item;
        class Spell;
 }
-namespace graphics { class Sprite; }
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
 
 namespace battle {
 
@@ -35,6 +40,7 @@ public:
        Uint16 MaxHealth() const { return maxHealth; }
        Uint16 Health() const { return health; }
        int RelativeHealth(int max) const { return Health() * max / MaxHealth(); }
+       void SubtractHealth(int amount);
 
        Uint16 MaxMana() const { return maxMana; }
        Uint16 Mana() const { return mana; }
@@ -45,12 +51,15 @@ public:
        Uint8 IP() const { return ip; }
        int RelativeIP(int max) const { return IP() * max / MaxIP(); }
 
-       Uint16 Attack() const { return attack; }
-       Uint16 Defense() const { return defense; }
-       Uint16 Agility() const { return agility; }
-       Uint16 Intelligence() const { return intelligence; }
-       Uint16 Gut() const { return gut; }
-       Uint16 MagicResistance() const { return magicResistance; }
+       Stats &GetStats() { return stats; }
+       const Stats &GetStats() const { return stats; }
+
+       common::Item *Weapon() { return weapon; }
+       common::Item *Armor() { return armor; }
+       common::Item *Shield() { return shield; }
+       common::Item *Helmet() { return helmet; }
+       common::Item *Ring() { return ring; }
+       common::Item *Jewel() { return jewel; }
 
        const common::Item *Weapon() const { return weapon; }
        const common::Item *Armor() const { return armor; }
@@ -66,10 +75,12 @@ public:
        bool HasRing() const { return ring; }
        bool HasJewel() const { return jewel; }
 
-       int AttackFrames() const { return attackFrames; }
-       int AttackFrameTime() const { return attackFrameTime; }
-       int SpellFrames() const { return spellFrames; }
-       int SpellFrameTime() const { return spellFrameTime; }
+       graphics::Animation *MeleeAnimation() { return meleeAnimation; }
+       const graphics::Animation *MeleeAnimation() const { return meleeAnimation; }
+       graphics::Animation *AttackAnimation() { return attackAnimation; }
+       const graphics::Animation *AttackAnimation() const { return attackAnimation; }
+       graphics::Animation *SpellAnimation() { return spellAnimation; }
+       const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
 // temporary setters until loader is implemented
 public:
@@ -83,46 +94,43 @@ public:
        void SetMana(Uint16 m) { mana = m; }
        void SetIP(Uint8 i) { ip = i; }
 
-       void SetWeapon(const common::Item *i) { weapon = i; }
-       void SetArmor(const common::Item *i) { armor = i; }
-       void SetShield(const common::Item *i) { shield = i; }
-       void SetHelmet(const common::Item *i) { helmet = i; }
-       void SetRing(const common::Item *i) { ring = i; }
-       void SetJewel(const common::Item *i) { jewel = i; }
+       void SetStats(const Stats &s) { stats = s; }
+
+       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 AddSpell(const common::Spell *s) { spells.push_back(s); }
 
-       void SetAttackFrames(int num, int time) { attackFrames = num; attackFrameTime = time; }
-       void SetSpellFrames(int num, int time) { spellFrames = num; spellFrameTime = time; }
+       void SetMeleeAnimation(graphics::Animation *a) { meleeAnimation = a; }
+       void SetAttackAnimation(graphics::Animation *a) { attackAnimation = a; }
+       void SetSpellAnimation(graphics::Animation *a) { spellAnimation = a; }
 
 private:
        const char *name;
        graphics::Sprite *sprite;
 
-       const common::Item *weapon;
-       const common::Item *armor;
-       const common::Item *shield;
-       const common::Item *helmet;
-       const common::Item *ring;
-       const common::Item *jewel;
+       common::Item *weapon;
+       common::Item *armor;
+       common::Item *shield;
+       common::Item *helmet;
+       common::Item *ring;
+       common::Item *jewel;
+
+       graphics::Animation *meleeAnimation;
+       graphics::Animation *attackAnimation;
+       graphics::Animation *spellAnimation;
 
        // TODO: vector does not seem to be a good choice
        std::vector<const common::Spell *> spells;
 
-       int attackFrames;
-       int attackFrameTime;
-       int spellFrames;
-       int spellFrameTime;
-
        Uint16 maxHealth, health;
        Uint16 maxMana, mana;
 
-       Uint16 attack;
-       Uint16 defense;
-       Uint16 agility;
-       Uint16 intelligence;
-       Uint16 gut;
-       Uint16 magicResistance;
+       Stats stats;
 
        Uint8 level;
        Uint8 ip;