X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=8eb8f8d239ae3b5ac541aebbf862c13c13ec1c2c;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=654e147d8ed60a677be4107f314dbc41783413aa;hpb=9718062e6ed305d9f8f1674ff172079688e78088;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 654e147..8eb8f8d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -1,14 +1,20 @@
-/*
- * BattleState.h
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+namespace battle {
+	class PartyLayout;
+}
+namespace common {
+	class Item;
+	struct GameConfig;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+
 #include "AttackTypeMenu.h"
+#include "Capsule.h"
 #include "Hero.h"
 #include "HeroTag.h"
 #include "Monster.h"
@@ -16,8 +22,8 @@
 #include "Resources.h"
 #include "SmallHeroTag.h"
 #include "../app/State.h"
-#include "../geometry/Point.h"
-#include "../geometry/Vector.h"
+#include "../common/GameConfig.h"
+#include "../common/Stats.h"
 #include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
 
@@ -25,34 +31,18 @@
 #include <vector>
 #include <SDL.h>
 
-namespace app { class Input; }
-namespace common {
-	class Inventory;
-	class Item;
-	class Spell;
-}
-namespace graphics {
-	class Font;
-	class Frame;
-	class Gauge;
-	class Sprite;
-}
-
 namespace battle {
 
-class AttackChoice;
-class PartyLayout;
-class Stats;
-
 class BattleState
 : public app::State {
 
 public:
-	BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const Resources *res)
-	: background(background)
-	, monstersLayout(&monstersLayout)
-	, heroesLayout(&heroesLayout)
-	, res(res)
+	BattleState(common::GameConfig *game, SDL_Surface *background, const PartyLayout *monstersLayout)
+	: game(game)
+	, background(background)
+	, monstersLayout(monstersLayout)
+	, heroesLayout(game->heroesLayout)
+	, res(game->battleResources)
 	, attackTypeMenu(res->attackIcons)
 	, moveMenu(res->moveIcons)
 	, numHeroes(0)
@@ -60,25 +50,18 @@ public:
 	, attackCursor(-1)
 	, expReward(0)
 	, goldReward(0)
-	, ranAway(false) { assert(background && res); }
+	, ranAway(false) { assert(background && monstersLayout && game); }
 
 public:
 	void AddMonster(const Monster &);
 	void AddHero(const Hero &);
+	void SetCapsule(const Capsule &);
 
 public:
-	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-	virtual void Resize(int width, int height);
-
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 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; }
@@ -100,7 +83,9 @@ 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 math::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+
+	Capsule &GetCapsule() { return capsule; }
 
 	bool HasChosenAttackType() const { return ActiveHero().GetAttackChoice().GetType() != AttackChoice::UNDECIDED; }
 	bool AttackSelectionDone() const { return activeHero >= numHeroes; }
@@ -115,10 +100,20 @@ public:
 	void SetRunaway() { ranAway = true; }
 
 	struct Order {
-		Order(int index, bool isMonster)
-		: index(index), isMonster(isMonster) { }
+		enum Performer {
+			HERO,
+			CAPSULE,
+			MONSTER,
+		};
+		Order(Performer by, int index = 0)
+		: index(index), by(by) { }
+		AttackChoice &GetAttackChoice(BattleState &) const;
+		common::Stats &GetStats(BattleState &) const;
+		bool IsHero() const { return by == HERO; }
+		bool IsCapsule() const { return by == CAPSULE; }
+		bool IsMonster() const { return by == MONSTER; }
 		int index;
-		bool isMonster;
+		Performer by;
 	};
 
 	void CalculateAttackOrder();
@@ -134,41 +129,55 @@ public:
 	bool Defeat() const;
 
 public:
-	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
-		return geometry::Vector<int>(
+	math::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
+		return math::Vector<int>(
 				(screen->w - background->w) / 2,
 				(screen->h - background->h) / 2);
 	}
 	int Width() const { return background->w; }
 	int Height() const { return background->h; }
+	math::Vector<int> Size() const { return math::Vector<int>(Width(), Height()); }
+
+	void RenderBackground(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderMonsters(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderHeroes(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderCapsule(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderSmallHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
+
+private:
+	virtual void OnEnterState(SDL_Surface *screen);
+	virtual void OnExitState(SDL_Surface *screen);
+	virtual void OnResumeState(SDL_Surface *screen);
+	virtual void OnPauseState(SDL_Surface *screen);
 
-	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);
+	virtual void OnResize(int width, int height);
 
 private:
 	void LoadInventory();
 
-	Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
+	void DecideMonsterAttack(Monster &);
+	void DecideCapsuleAttack();
+	void CalculateDamage(const common::Stats &attackerStats, TargetSelection &targets) const;
+	Uint16 CalculateDamage(const common::Stats &attacker, const common::Stats &defender) const;
 
 private:
+	common::GameConfig *game;
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
 	const PartyLayout *heroesLayout;
 	const Resources *res;
 	AttackTypeMenu attackTypeMenu;
 	MoveMenu moveMenu;
-	// TODO: combine all data about heros or monsters
 	std::vector<Monster> monsters;
 	std::vector<Order> attackOrder;
 	Hero heroes[4];
 	graphics::Menu<const common::Item *> itemMenu;
 	HeroTag heroTags[4];
 	SmallHeroTag smallHeroTags[4];
-	geometry::Point<int> heroTagPositions[4];
-	geometry::Point<int> smallHeroTagPositions[4];
+	math::Vector<int> heroTagPositions[4];
+	math::Vector<int> smallHeroTagPositions[4];
+	Capsule capsule;
 	int numHeroes;
 	int activeHero;
 	int attackCursor;
@@ -180,4 +189,4 @@ private:
 
 }
 
-#endif /* BATTLE_BATTLESTATE_H_ */
+#endif