X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=ab9f731a9c838e0d9e5430bb491007c0353b35a3;hb=7263bddbde91d555decd58f043f6b43f54ba2b00;hp=3acc0b7699c79dd9ffeaef66c686d263c2a4d29e;hpb=8f6a2452408f4ae35396cd7008a6fab0ecb03a46;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 3acc0b7..ab9f731 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -22,6 +22,7 @@
 #include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
 
+#include <cassert>
 #include <vector>
 #include <SDL.h>
 
@@ -41,6 +42,7 @@ namespace graphics {
 namespace battle {
 
 class PartyLayout;
+class Stats;
 
 class BattleState
 : public app::State {
@@ -55,7 +57,8 @@ public:
 	, moveMenu(res->moveIcons)
 	, numHeroes(0)
 	, activeHero(-1)
-	, ranAway(false) { }
+	, attackCursor(-1)
+	, ranAway(false) { assert(background && res); }
 
 public:
 	void AddMonster(const Monster &);
@@ -92,18 +95,19 @@ public:
 	Hero &ActiveHero() { return heroes[activeHero]; }
 	const Hero &ActiveHero() const { return heroes[activeHero]; }
 
-	Hero &HeroAt(int index) { return heroes[index]; }
-	const Hero &HeroAt(int index) const { return heroes[index]; }
-	Monster &MonsterAt(int index) { return monsters[index]; }
-	const Monster &MonsterAt(int index) const { return monsters[index]; }
+	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 { return heroTags[index]; }
-	const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[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 attackChoices[activeHero].GetType() != AttackChoice::UNDECIDED; }
-	AttackChoice &ActiveHeroAttackChoice() { return attackChoices[activeHero]; }
-	const AttackChoice &ActiveHeroAttackChoice() const { return attackChoices[activeHero]; }
-	const AttackChoice &AttackChoiceAt(int index) const { return attackChoices[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 attackChoices[index]; }
+	const AttackChoice &AttackChoiceAt(int index) const { assert(index >= 0 && index < NumHeroes()); return attackChoices[index]; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
 
 	int NumHeroes() const { return numHeroes; }
@@ -116,7 +120,6 @@ public:
 	bool HeroPositionOccupied(int index) const { return index >= 0 && index < numHeroes; }
 
 	void SetRunaway() { ranAway = true; }
-	void ClearAllAttacks();
 
 	struct Order {
 		Order(int index, bool isMonster)
@@ -125,7 +128,16 @@ public:
 		bool isMonster;
 	};
 
-	void WriteOrder(std::vector<Order> &);
+	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]; };
+	void ClearAllAttacks();
+
+	bool Victory() const;
+	bool Defeat() const;
 
 public:
 	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
@@ -147,6 +159,8 @@ private:
 	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;
@@ -158,6 +172,8 @@ private:
 	std::vector<geometry::Point<int> > monsterPositions;
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
+	std::vector<AttackChoice> monsterAttacks;
+	std::vector<Order> attackOrder;
 	Hero heroes[4];
 	graphics::Menu<const common::Spell *> spellMenus[4];
 	graphics::Menu<const common::Item *> itemMenu;
@@ -169,6 +185,7 @@ private:
 	AttackChoice attackChoices[4];
 	int numHeroes;
 	int activeHero;
+	int attackCursor;
 	bool ranAway;
 
 };