X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=bd039ff588c7e86bb278065dad1a49bd092a1c5d;hb=8639675fbf1d232ab8188dd283149ab650e10336;hp=e72fbf94fc6c17b2a441881ed38de540d7fa9539;hpb=9d5e525f2bd9035e9add815e287313d09c1bf0fd;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index e72fbf9..bd039ff 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -21,6 +21,7 @@
 #include "../graphics/Sprite.h"
 
 #include <algorithm>
+#include <cassert>
 #include <stdexcept>
 
 using app::Application;
@@ -103,6 +104,7 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 }
 
 void BattleState::LoadSpellMenu(vector<Hero>::size_type index) {
+	assert(index >= 0 && index < 4);
 	spellMenus[index].Clear();
 	spellMenus[index].Reserve(HeroAt(index).Spells().size());
 	for (vector<const Spell *>::const_iterator i(HeroAt(index).Spells().begin()), end(HeroAt(index).Spells().end()); i != end; ++i) {
@@ -112,6 +114,7 @@ void BattleState::LoadSpellMenu(vector<Hero>::size_type index) {
 }
 
 void BattleState::LoadIkariMenu(vector<Hero>::size_type index) {
+	assert(index >= 0 && index < 4);
 	ikariMenus[index].Clear();
 	ikariMenus[index].Reserve(6);
 
@@ -208,7 +211,6 @@ void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
 }
 
 void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	// TODO: check for victory or defeat
 	if (ranAway) {
 		ctrl.PopState(); // quit the battle scene
 		return;
@@ -264,7 +266,7 @@ class OrderCompare {
 
 void BattleState::CalculateAttackOrder() {
 	attackOrder.reserve(monsters.size() + NumHeroes());
-	for (int i(0); i < numHeroes; ++i) {
+	for (int i(0); i < NumHeroes(); ++i) {
 		attackOrder.push_back(Order(i, false));
 	}
 	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
@@ -287,24 +289,32 @@ void BattleState::NextAttack() {
 	}
 }
 
+bool BattleState::AttacksFinished() const {
+	return attackCursor >= int(attackOrder.size())
+			|| Victory() || Defeat();
+}
+
 void BattleState::CalculateDamage() {
+	AttackChoice &ac(CurrentAttack().isMonster ? monsterAttacks[CurrentAttack().index] : AttackChoiceAt(CurrentAttack().index));
+	if (ac.GetType() == AttackChoice::DEFEND) return;
+
 	if (CurrentAttack().isMonster) {
 		const Stats &attackerStats(MonsterAt(CurrentAttack().index).GetStats());
 		// TODO: run monster's attack script
-		monsterAttacks[CurrentAttack().index].SetType(AttackChoice::SWORD);
-		monsterAttacks[CurrentAttack().index].Selection().SelectSingle();
-		monsterAttacks[CurrentAttack().index].Selection().SelectHeroes();
+		ac.SetType(AttackChoice::SWORD);
+		ac.Selection().SelectSingle();
+		ac.Selection().SelectHeroes();
 		for (int i(0); i < NumHeroes(); ++i) {
 			if (HeroAt(i).Health() > 0) {
 				const Stats &defenderStats(HeroAt(i).GetStats());
 				Uint16 damage(CalculateDamage(attackerStats, defenderStats));
-				monsterAttacks[CurrentAttack().index].Selection().SetBad(0, damage);
+				ac.Selection().SetBad(0, damage);
 				break;
 			}
 		}
 	} else {
 		const Stats &attackerStats(HeroAt(CurrentAttack().index).GetStats());
-		TargetSelection &ts(AttackChoiceAt(CurrentAttack().index).Selection());
+		TargetSelection &ts(ac.Selection());
 		bool hitSome(false);
 		if (ts.TargetsEnemies()) {
 			for (int i(0); i < MaxMonsters(); ++i) {
@@ -365,19 +375,33 @@ void BattleState::ApplyDamage() {
 	TargetSelection &ts(ac.Selection());
 	if (ts.TargetsEnemies()) {
 		for (int i(0); i < MaxMonsters(); ++i) {
+			Monster &monster(MonsterAt(i));
 			if (ts.IsBad(i)) {
-				MonsterAt(i).SubtractHealth(ts.GetAmount(i));
+				monster.SubtractHealth(ts.GetAmount(i));
+				if (monster.Health() == 0) {
+					expReward += monster.ExpReward();
+					goldReward += monster.GoldReward();
+				}
 			}
 		}
 	} else {
 		for (int i(0); i < NumHeroes(); ++i) {
+			Hero &hero(HeroAt(i));
 			if (ts.IsBad(i)) {
-				HeroAt(i).SubtractHealth(ts.GetAmount(i));
+				hero.SubtractHealth(ts.GetAmount(i));
 			}
 		}
 	}
 }
 
+AttackChoice &BattleState::CurrentAttackAttackChoice() {
+	if (CurrentAttack().isMonster) {
+		return monsterAttacks[CurrentAttack().index];
+	} else {
+		return AttackChoiceAt(CurrentAttack().index);
+	}
+}
+
 void BattleState::ClearAllAttacks() {
 	attackCursor = -1;
 	activeHero = -1;
@@ -398,12 +422,14 @@ void BattleState::UpdateWorld(float deltaT) {
 }
 
 void BattleState::Render(SDL_Surface *screen) {
+	assert(screen);
 	Vector<int> offset(CalculateScreenOffset(screen));
 	RenderBackground(screen, offset);
 	RenderMonsters(screen, offset);
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
+	assert(screen);
 	// black for now
 	SDL_FillRect(screen, 0, SDL_MapRGB(screen->format, 0, 0, 0));
 	SDL_Rect destRect;
@@ -415,14 +441,23 @@ void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offse
 }
 
 void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset) {
+	assert(screen);
 	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
 		if (MonsterPositionOccupied(i)) {
-			monsters[i].Sprite()->DrawCenter(screen, monsterPositions[i] + offset);
+			// TODO: better solution for running animations
+			if (monsters[i].AttackAnimation() && monsters[i].AttackAnimation()->Running()) {
+				monsters[i].AttackAnimation()->DrawCenter(screen, monsterPositions[i] + offset);
+			} else if (monsters[i].SpellAnimation() && monsters[i].SpellAnimation()->Running()) {
+				monsters[i].SpellAnimation()->DrawCenter(screen, monsterPositions[i] + offset);
+			} else {
+				monsters[i].Sprite()->DrawCenter(screen, monsterPositions[i] + offset);
+			}
 		}
 	}
 }
 
 void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
+	assert(screen);
 	for (int i(0); i < numHeroes; ++i) {
 		if (heroes[i].AttackAnimation() && heroes[i].AttackAnimation()->Running()) {
 			heroes[i].AttackAnimation()->DrawCenter(screen, heroesPositions[i] + offset);
@@ -436,6 +471,7 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 }
 
 void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
+	assert(screen);
 	int tagHeight(attackTypeMenu.Height());
 	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2);
 
@@ -445,6 +481,7 @@ void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset)
 }
 
 void BattleState::RenderSmallHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
+	assert(screen);
 	int tagHeight(res->normalFont->CharHeight() * 4 + res->smallHeroTagFrame->BorderHeight() * 2);
 	int tagWidth(res->normalFont->CharWidth() * 6 + res->smallHeroTagFrame->BorderWidth() * 2);