X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=806b4af59154525475ce3765532dc9600e2c3c6b;hb=93cd8cb0f16c1809d76faa33ed6f281a3276140b;hp=8814663dae807fce9eb3226b065e60e889fdc7bb;hpb=d4609ba1798d82cce128b5985d60cb212b760246;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 8814663..806b4af 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,7 +8,6 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
-#include "AttackChoice.h"
 #include "AttackTypeMenu.h"
 #include "Hero.h"
 #include "HeroTag.h"
@@ -17,7 +16,6 @@
 #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"
@@ -41,6 +39,7 @@ namespace graphics {
 
 namespace battle {
 
+class AttackChoice;
 class PartyLayout;
 class Stats;
 
@@ -58,6 +57,8 @@ public:
 	, numHeroes(0)
 	, activeHero(-1)
 	, attackCursor(-1)
+	, expReward(0)
+	, goldReward(0)
 	, ranAway(false) { assert(background && res); }
 
 public:
@@ -81,19 +82,15 @@ public:
 	AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; }
 	MoveMenu &GetMoveMenu() { return moveMenu; }
 
-	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; }
+	graphics::Menu<const common::Item *> &ItemMenu() { return itemMenu; }
+	const graphics::Menu<const common::Item *> &ItemMenu() const { return itemMenu; }
 
 	void NextHero();
 	bool BeforeFirstHero() const { return activeHero < 0; }
-	void PreviousHero() { --activeHero; }
+	void PreviousHero();
 	void SwapHeroes(int lhs, int rhs);
-	Hero &ActiveHero() { return heroes[activeHero]; }
-	const Hero &ActiveHero() const { return heroes[activeHero]; }
+	Hero &ActiveHero() { assert(activeHero >= 0 && activeHero < NumHeroes()); return heroes[activeHero]; }
+	const Hero &ActiveHero() const { assert(activeHero >= 0 && activeHero < NumHeroes()); return heroes[activeHero]; }
 
 	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]; }
@@ -101,22 +98,16 @@ public:
 	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]; }
+	const geometry::Vector<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 attackChoices[index]; }
-	const AttackChoice &AttackChoiceAt(int index) const { assert(index >= 0 && index < NumHeroes()); return attackChoices[index]; }
+	bool HasChosenAttackType() const { return ActiveHero().GetAttackChoice().GetType() != AttackChoice::UNDECIDED; }
 	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) const { return index >= 0 && index < numHeroes; }
 
 	void SetRunaway() { ranAway = true; }
@@ -148,6 +139,7 @@ public:
 	}
 	int Width() const { return background->w; }
 	int Height() const { return background->h; }
+	geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
 
 	void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
 	void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
@@ -156,10 +148,10 @@ public:
 	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();
 
+	void DecideMonsterAttack(Monster &) const;
+	void CalculateDamage(const Stats &attackerStats, TargetSelection &targets) const;
 	Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
 
 private:
@@ -169,24 +161,19 @@ private:
 	const Resources *res;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
-	// TODO: combine all data about heros or monsters
-	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;
-	graphics::Menu<const common::Item *> ikariMenus[4];
 	HeroTag heroTags[4];
 	SmallHeroTag smallHeroTags[4];
-	geometry::Point<int> heroTagPositions[4];
-	geometry::Point<int> smallHeroTagPositions[4];
-	AttackChoice attackChoices[4];
+	geometry::Vector<int> heroTagPositions[4];
+	geometry::Vector<int> smallHeroTagPositions[4];
 	int numHeroes;
 	int activeHero;
 	int attackCursor;
+	int expReward;
+	int goldReward;
 	bool ranAway;
 
 };