X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=3561609e91c105a34413a8b29d042d7d1a0c50ce;hb=5121f4215d725f492bea084fb94900d7e5972743;hp=93e1e2b032c82a666dcb5cd1bed79c997530d243;hpb=4170813213bafe6f4a01a79bf42308ddb7f3c545;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 93e1e2b..3561609 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,18 +8,20 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
-#include "AttackChoice.h"
 #include "AttackTypeMenu.h"
 #include "Hero.h"
 #include "HeroTag.h"
 #include "Monster.h"
 #include "MoveMenu.h"
 #include "Resources.h"
+#include "SmallHeroTag.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
+#include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
 
+#include <cassert>
 #include <vector>
 #include <SDL.h>
 
@@ -38,7 +40,9 @@ namespace graphics {
 
 namespace battle {
 
+class AttackChoice;
 class PartyLayout;
+class Stats;
 
 class BattleState
 : public app::State {
@@ -51,7 +55,12 @@ public:
 	, res(res)
 	, attackTypeMenu(res->attackIcons)
 	, moveMenu(res->moveIcons)
-	, activeHero(-1) { }
+	, numHeroes(0)
+	, activeHero(-1)
+	, attackCursor(-1)
+	, expReward(0)
+	, goldReward(0)
+	, ranAway(false) { assert(background && res); }
 
 public:
 	void AddMonster(const Monster &);
@@ -65,47 +74,76 @@ public:
 
 	virtual void Resize(int width, int height);
 
-	virtual void HandleInput(const app::Input &);
+	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
+	// TODO: turn this mess into a well stuctured interface
 public:
 	const Resources &Res() const { return *res; }
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
 	MoveMenu &GetMoveMenu() { return moveMenu; }
 
-	bool HasMoreHeroes() const { return activeHero < (int) heroes.size(); }
-	void NextHero() { ++activeHero; }
+	graphics::Menu<const common::Spell *> &GetSpellMenu() { return heroes[activeHero].SpellMenu(); }
+	const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return heroes[activeHero].SpellMenu(); }
+	graphics::Menu<const common::Item *> &GetIkariMenu() { return heroes[activeHero].IkariMenu(); }
+	const graphics::Menu<const common::Item *> &GetIkariMenu() const { return heroes[activeHero].IkariMenu(); }
+	graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
+	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
+
+	void NextHero();
 	bool BeforeFirstHero() const { return activeHero < 0; }
 	void PreviousHero() { --activeHero; }
+	void SwapHeroes(int lhs, int rhs);
 	Hero &ActiveHero() { return heroes[activeHero]; }
 	const Hero &ActiveHero() const { return heroes[activeHero]; }
-	Hero &HeroAt(std::vector<Hero>::size_type index) { return heroes[index]; }
-	const Hero &HeroAt(std::vector<Hero>::size_type index) const { return heroes[index]; }
-	const HeroTag &ActiveHeroTag() const { return heroTags[activeHero]; }
-	const HeroTag &HeroTagAt(std::vector<Hero>::size_type index) const { return heroTags[index]; }
-	const geometry::Point<int> &HeroTagPositionAt(std::vector<Hero>::size_type index) const { return heroTagPositions[index]; }
-	bool HasChosenAttackType() const { return attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
-	void SetAttackType(AttackChoice::Type t) { attackChoices[activeHero].SetType(t); }
-	AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
-	const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
-	TargetSelection &ActiveHeroTargets() { return attackChoices[activeHero].Selection(); }
-	const TargetSelection &ActiveHeroTargets() const { return attackChoices[activeHero].Selection(); }
-	bool AttackSelectionDone() const { return activeHero >= (int) heroes.size(); }
-
-	graphics::Menu<const common::Spell *> &GetSpellMenu() { return spellMenus[activeHero]; }
-	const graphics::Menu<const common::Spell *> &GetSpellMenu() const { return spellMenus[activeHero]; }
-	graphics::Menu<const common::Item *> &GetIkariMenu() { return ikariMenus[activeHero]; }
-	const graphics::Menu<const common::Item *> &GetIkariMenu() const { return ikariMenus[activeHero]; }
-	graphics::Menu<const common::Item *> &GetItemMenu() { return itemMenu; }
-	const graphics::Menu<const common::Item *> &GetItemMenu() const { return itemMenu; }
+
+	Hero &HeroAt(int index) { assert(index >= 0 && index < NumHeroes()); return heroes[index]; }
+	const Hero &HeroAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroes[index]; }
+	Monster &MonsterAt(int index) { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
+	const Monster &MonsterAt(int index) const { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
+
+	const HeroTag &HeroTagAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTags[index]; }
+	const geometry::Point<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+
+	bool HasChosenAttackType() const { return ActiveHeroAttackChoice().GetType() != AttackChoice::UNDECIDED; }
+	AttackChoice &ActiveHeroAttackChoice() { return AttackChoiceAt(activeHero); }
+	const AttackChoice &ActiveHeroAttackChoice() const { return AttackChoiceAt(activeHero); }
+	AttackChoice &AttackChoiceAt(int index) { assert(index >= 0 && index < NumHeroes()); return heroes[index].GetAttackChoice(); }
+	const AttackChoice &AttackChoiceAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroes[index].GetAttackChoice(); }
+	AttackChoice &MonsterAttackChoiceAt(int index) { assert(index >= 0 && index < MaxMonsters()); return monsterAttacks[index]; }
+	const AttackChoice &MonsterAttackChoiceAt(int index) const { assert(index >= 0 && index < MaxMonsters()); return monsterAttacks[index]; }
+	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
+
+	int NumHeroes() const { return numHeroes; }
+	int MaxHeroes() const { return 4; }
+	int MaxMonsters() const { return monsters.size(); }
 
 	const std::vector<geometry::Point<int> > &MonsterPositions() const { return monsterPositions; }
 	bool MonsterPositionOccupied(int index) { return index >= 0 && index < int(monsters.size()) && monsters[index].Health() > 0; }
 	const std::vector<geometry::Point<int> > &HeroesPositions() const { return heroesPositions; }
-	bool HeroPositionOccupied(int index) { return index >= 0 && index < int(heroes.size()); }
-	std::vector<Hero> &Heroes() { return heroes; }
-	const std::vector<Hero> &Heroes() const { return heroes; }
+	bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; }
+
+	void SetRunaway() { ranAway = true; }
+
+	struct Order {
+		Order(int index, bool isMonster)
+		: index(index), isMonster(isMonster) { }
+		int index;
+		bool isMonster;
+	};
+
+	void CalculateAttackOrder();
+	void NextAttack();
+	bool AttacksFinished() const;
+	void CalculateDamage();
+	void ApplyDamage();
+	const Order &CurrentAttack() const { assert(attackCursor >= 0 && attackCursor < int(attackOrder.size())); return attackOrder[attackCursor]; };
+	AttackChoice &CurrentAttackAttackChoice();
+	void ClearAllAttacks();
+
+	bool Victory() const;
+	bool Defeat() const;
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -113,19 +151,20 @@ public:
 				(screen->w - background->w) / 2,
 				(screen->h - background->h) / 2);
 	}
-	int BackgroundWidth() const { return background->w; }
-	int BackgroundHeight() const { return background->h; }
+	int Width() const { return background->w; }
+	int Height() const { return background->h; }
 
 	void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
 private:
-	void LoadSpellMenu(std::vector<Hero>::size_type heroIndex);
-	void LoadIkariMenu(std::vector<Hero>::size_type heroIndex);
 	void LoadInventory();
 
+	Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
+
 private:
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
@@ -137,14 +176,20 @@ private:
 	std::vector<geometry::Point<int> > monsterPositions;
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
-	std::vector<Hero> heroes;
-	std::vector<graphics::Menu<const common::Spell *> > spellMenus;
+	std::vector<AttackChoice> monsterAttacks;
+	std::vector<Order> attackOrder;
+	Hero heroes[4];
 	graphics::Menu<const common::Item *> itemMenu;
-	std::vector<graphics::Menu<const common::Item *> > ikariMenus;
 	HeroTag heroTags[4];
+	SmallHeroTag smallHeroTags[4];
 	geometry::Point<int> heroTagPositions[4];
-	AttackChoice attackChoices[4];
+	geometry::Point<int> smallHeroTagPositions[4];
+	int numHeroes;
 	int activeHero;
+	int attackCursor;
+	int expReward;
+	int goldReward;
+	bool ranAway;
 
 };