X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=3274fe21b64d7a2cb373d9a12bce7c061a77abff;hb=3f2e68e7a2377db6d1738934150f34b80bdbd0e0;hp=69db286c74d32fb69fa64a8ffe575439e90c0d4b;hpb=185c6c79f8ba30981aad4e1d66f98143a344b95e;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 69db286..3274fe2 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,8 +8,13 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include <vector>
 #include <SDL.h>
 
+namespace common {
+	class Item;
+	class Spell;
+}
 namespace graphics { class Sprite; }
 
 namespace battle {
@@ -25,17 +30,20 @@ public:
 	Uint8 Level() const { return level; }
 	const graphics::Sprite *Sprite() const { return sprite; }
 
+	const std::vector<const common::Spell *> &Spells() const { return spells; }
+
 	Uint16 MaxHealth() const { return maxHealth; }
 	Uint16 Health() const { return health; }
-	int RelativeHealth(int max) const { return health * max / maxHealth; }
+	int RelativeHealth(int max) const { return Health() * max / MaxHealth(); }
 
 	Uint16 MaxMana() const { return maxMana; }
 	Uint16 Mana() const { return mana; }
-	int RelativeMana(int max) const { return maxMana == 0 ? 0 : mana * max / maxMana; }
-	bool CanUseMagic() const { return maxMana > 0; }
+	int RelativeMana(int max) const { return MaxMana() == 0 ? 0 : Mana() * max / MaxMana(); }
+	bool CanUseMagic() const { return MaxMana() > 0; }
 
+	Uint8 MaxIP() const { return 255; }
 	Uint8 IP() const { return ip; }
-	int RelativeIP(int max) const { return ip * max / 255; }
+	int RelativeIP(int max) const { return IP() * max / MaxIP(); }
 
 	Uint16 Attack() const { return attack; }
 	Uint16 Defense() const { return defense; }
@@ -44,6 +52,23 @@ public:
 	Uint16 Gut() const { return gut; }
 	Uint16 MagicResistance() const { return magicResistance; }
 
+	const common::Item *Weapon() const { return weapon; }
+	const common::Item *Armor() const { return armor; }
+	const common::Item *Shield() const { return shield; }
+	const common::Item *Helmet() const { return helmet; }
+	const common::Item *Ring() const { return ring; }
+	const common::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; }
+
+	int AttackFrames() const { return attackFrames; }
+	int SpellFrames() const { return spellFrames; }
+
 // temporary setters until loader is implemented
 public:
 	void SetName(const char *n) { name = n; }
@@ -56,10 +81,34 @@ 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 AddSpell(const common::Spell *s) { spells.push_back(s); }
+
+	void SetAttackFrames(int num) { attackFrames = num; }
+	void SetSpellFrames(int num) { spellFrames = num; }
+
 private:
 	const char *name;
 	graphics::Sprite *sprite;
-	// TODO: equipment and spells lists
+
+	const common::Item *weapon;
+	const common::Item *armor;
+	const common::Item *shield;
+	const common::Item *helmet;
+	const common::Item *ring;
+	const common::Item *jewel;
+
+	// TODO: vector does not seem to be a good choice
+	std::vector<const common::Spell *> spells;
+
+	int attackFrames;
+	int spellFrames;
 
 	Uint16 maxHealth, health;
 	Uint16 maxMana, mana;