added simple damage calculation formula

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

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index c0bd41a024d8f6db16b6accfcf3a345cbbe6b089..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>
 
@@ -22,8 +24,6 @@ namespace graphics {
 
 namespace battle {
 
-class AttackAnimation;
-
 class Hero {
 
 public:
@@ -40,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; }
@@ -50,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; }
@@ -71,8 +75,8 @@ public:
        bool HasRing() const { return ring; }
        bool HasJewel() const { return jewel; }
 
-       class AttackAnimation *MeleeAnimation() { return meleeAnimation; }
-       const class AttackAnimation *MeleeAnimation() const { return meleeAnimation; }
+       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; }
@@ -90,16 +94,18 @@ 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 SetMeleeAnimation(class AttackAnimation *a) { meleeAnimation = a; }
+       void SetMeleeAnimation(graphics::Animation *a) { meleeAnimation = a; }
        void SetAttackAnimation(graphics::Animation *a) { attackAnimation = a; }
        void SetSpellAnimation(graphics::Animation *a) { spellAnimation = a; }
 
@@ -107,14 +113,14 @@ 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;
 
-       class AttackAnimation *meleeAnimation;
+       graphics::Animation *meleeAnimation;
        graphics::Animation *attackAnimation;
        graphics::Animation *spellAnimation;
 
@@ -124,12 +130,7 @@ private:
        Uint16 maxHealth, health;
        Uint16 maxMana, mana;
 
-       Uint16 attack;
-       Uint16 defense;
-       Uint16 agility;
-       Uint16 intelligence;
-       Uint16 gut;
-       Uint16 magicResistance;
+       Stats stats;
 
        Uint8 level;
        Uint8 ip;