X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=0d2ce0ede1d9e9f7ebccc56cadfce6f790350d3f;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=7abfb68fb35ae5f8a0cd16e243678546cf58074e;hpb=fbf5a98f8fd0da951e469003fe87d575a6bb30a4;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 7abfb68..0d2ce0e 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -1,144 +1,106 @@
-/*
- * Hero.h
- *
- *  Created on: Aug 6, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
-#include <vector>
-#include <SDL.h>
-
-namespace common {
-	class Item;
-	class Spell;
+namespace battle {
+	struct Resources;
 }
-namespace graphics {
-	class Animation;
-	class Sprite;
+namespace math {
+	template<class>
+	class Vector;
 }
 
+#include "AttackChoice.h"
+#include "../common/Hero.h"
+#include "../common/Stats.h"
+#include "../graphics/Animation.h"
+#include "../graphics/Menu.h"
+
+#include <vector>
+#include <SDL.h>
+
 namespace battle {
 
 class Hero {
 
 public:
 	Hero();
+	Hero(common::Hero &);
 	~Hero();
 
 public:
-	const char *Name() const { return name; }
-	Uint8 Level() const { return level; }
-	const graphics::Sprite *Sprite() const { return sprite; }
+	const char *Name() const { return master->Name(); }
+	Uint8 Level() const { return master->Level(); }
+	const graphics::Sprite *Sprite() const { return master->BattleSprite(); }
 
-	const std::vector<const common::Spell *> &Spells() const { return spells; }
+	const std::vector<const common::Spell *> &Spells() const { return master->Spells(); }
 
-	Uint16 MaxHealth() const { return maxHealth; }
-	Uint16 Health() const { return health; }
+	Uint16 MaxHealth() const { return master->MaxHealth(); }
+	Uint16 Health() const { return master->Health(); }
 	int RelativeHealth(int max) const { return Health() * max / MaxHealth(); }
-	void SubtractHealth(int amount);
+	void SubtractHealth(int amount) { master->SubtractHealth(amount); }
 
-	Uint16 MaxMana() const { return maxMana; }
-	Uint16 Mana() const { return mana; }
+	Uint16 MaxMana() const { return master->MaxMana(); }
+	Uint16 Mana() const { return master->Mana(); }
 	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; }
+	Uint8 MaxIP() const { return master->MaxIP(); }
+	Uint8 IP() const { return master->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; }
-
-	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; }
-	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; }
-
-	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:
-	void SetName(const char *n) { name = n; }
-	void SetLevel(Uint8 l) { level = l; }
-	void SetSprite(graphics::Sprite *s) { sprite = s; }
+	common::Stats &GetStats() { return stats; }
+	const common::Stats &GetStats() const { return stats; }
 
-	void SetMaxHealth(Uint16 h) { maxHealth = h; }
-	void SetHealth(Uint16 h) { health = h; }
-	void SetMaxMana(Uint16 m) { maxMana = m; }
-	void SetMana(Uint16 m) { mana = m; }
-	void SetIP(Uint8 i) { ip = i; }
+	const common::Item *Weapon() const { return master->Equipment(common::Hero::EQUIP_WEAPON); }
+	const common::Item *Armor() const { return master->Equipment(common::Hero::EQUIP_ARMOR); }
+	const common::Item *Shield() const { return master->Equipment(common::Hero::EQUIP_SHIELD); }
+	const common::Item *Helmet() const { return master->Equipment(common::Hero::EQUIP_HELMET); }
+	const common::Item *Ring() const { return master->Equipment(common::Hero::EQUIP_RING); }
+	const common::Item *Jewel() const { return master->Equipment(common::Hero::EQUIP_JEWEL); }
 
-	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; }
+	bool HasWeapon() const { return master->Equipped(common::Hero::EQUIP_WEAPON); }
+	bool HasArmor() const { return master->Equipped(common::Hero::EQUIP_ARMOR); }
+	bool HasShield() const { return master->Equipped(common::Hero::EQUIP_SHIELD); }
+	bool HasHelmet() const { return master->Equipped(common::Hero::EQUIP_HELMET); }
+	bool HasRing() const { return master->Equipped(common::Hero::EQUIP_RING); }
+	bool HasJewel() const { return master->Equipped(common::Hero::EQUIP_JEWEL); }
 
-	void AddSpell(const common::Spell *s) { spells.push_back(s); }
+	graphics::AnimationRunner &GetAnimation() { return animation; }
+	const graphics::AnimationRunner &GetAnimation() const { return animation; }
+	void SetAnimation(const graphics::AnimationRunner &a) { animation = a; }
 
-	void SetMeleeAnimation(graphics::Animation *a) { meleeAnimation = a; }
-	void SetAttackAnimation(graphics::Animation *a) { attackAnimation = a; }
-	void SetSpellAnimation(graphics::Animation *a) { spellAnimation = a; }
+	const graphics::Animation *MeleeAnimation() const { return master->MeleeAnimation(); }
+	const graphics::Animation *AttackAnimation() const { return master->AttackAnimation(); }
+	const graphics::Animation *SpellAnimation() const { return master->SpellAnimation(); }
+
+	math::Vector<int> &Position() { return position; }
+	const math::Vector<int> &Position() const { return position; }
+
+	graphics::Menu<const common::Spell *> &SpellMenu() { return spellMenu; }
+	const graphics::Menu<const common::Spell *> &SpellMenu() const { return spellMenu; }
+	graphics::Menu<const common::Item *> &IkariMenu() { return ikariMenu; }
+	const graphics::Menu<const common::Item *> &IkariMenu() const { return ikariMenu; }
+
+	AttackChoice &GetAttackChoice() { return attackChoice; }
+	const AttackChoice &GetAttackChoice() const { return attackChoice; }
+
+public:
+	void UpdateSpellMenu();
+	void UpdateIkariMenu(const Resources *);
 
 private:
-	const char *name;
-	graphics::Sprite *sprite;
-
-	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;
-
-	Uint16 maxHealth, health;
-	Uint16 maxMana, mana;
-
-	Uint16 attack;
-	Uint16 defense;
-	Uint16 agility;
-	Uint16 intelligence;
-	Uint16 gut;
-	Uint16 magicResistance;
-
-	Uint8 level;
-	Uint8 ip;
+	common::Hero *master;
+
+	graphics::AnimationRunner animation;
+
+	math::Vector<int> position;
+
+	graphics::Menu<const common::Spell *> spellMenu;
+	graphics::Menu<const common::Item *> ikariMenu;
+
+	AttackChoice attackChoice;
+
+	common::Stats stats;
 
 };