X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=44831791d2c749695cc83716d099178c6f552f67;hb=9718062e6ed305d9f8f1674ff172079688e78088;hp=6baa1dae0fe700d64d70bab13141d7d857179a0c;hpb=a01c2f05b5a6493d7fe097eb15e5337a095992ae;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 6baa1da..4483179 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -27,6 +27,7 @@ using app::Application;
 using app::Input;
 using geometry::Point;
 using geometry::Vector;
+using graphics::AnimationRunner;
 using std::vector;
 
 namespace battle {
@@ -39,6 +40,7 @@ void PerformAttacks::EnterState(Application &c, SDL_Surface *screen) {
 }
 
 void PerformAttacks::ExitState(Application &c, SDL_Surface *screen) {
+	battle->ClearAllAttacks();
 	ctrl = 0;
 }
 
@@ -60,9 +62,9 @@ void PerformAttacks::HandleEvents(const Input &input) {
 	CheckAnimations();
 	if (HasAnimationsRunning()) return;
 	ResetAnimation();
+	battle->ApplyDamage();
 	battle->NextAttack();
 	if (battle->AttacksFinished()) {
-		battle->ClearAllAttacks();
 		ctrl->PopState();
 		return;
 	}
@@ -70,89 +72,110 @@ void PerformAttacks::HandleEvents(const Input &input) {
 	battle->CalculateDamage();
 
 	if (battle->CurrentAttack().isMonster) {
-		const Monster &monster(battle->MonsterAt(battle->CurrentAttack().index));
+		Monster &monster(battle->MonsterAt(battle->CurrentAttack().index));
 		titleBarText = monster.Name();
-		moveAnimation = 0;
+		targetAnimation = AnimationRunner(monster.MeleeAnimation());
+		moveAnimation = AnimationRunner(monster.AttackAnimation());
+		monster.SetAnimation(moveAnimation);
+		AddNumberAnimations(battle->MonsterAt(battle->CurrentAttack().index).GetAttackChoice().Selection());
 	} else {
 		Hero &hero(battle->HeroAt(battle->CurrentAttack().index));
-		const AttackChoice &ac(battle->AttackChoiceAt(battle->CurrentAttack().index));
+		const AttackChoice &ac(battle->HeroAt(battle->CurrentAttack().index).GetAttackChoice());
 
 		switch (ac.GetType()) {
 			case AttackChoice::SWORD:
 				if (hero.HasWeapon()) {
 					titleBarText = hero.Weapon()->Name();
-					targetAnimation = hero.Weapon()->AttackAnimation();
+					targetAnimation = AnimationRunner(hero.Weapon()->AttackAnimation());
 				} else {
 					titleBarText = "Melee attack!";
-					targetAnimation = hero.MeleeAnimation();
-				}
-				moveAnimation = hero.AttackAnimation();
-
-				if (ac.Selection().TargetsEnemies()) {
-					for (int i(0); i < battle->MaxMonsters(); ++i) {
-						if (ac.Selection().IsSelected(i)) {
-							numberAnimation.push_back(NumberAnimation(ac.Selection().GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
-							numberPosition.push_back(
-									battle->MonsterPositions()[i]);
-						}
-					}
-				} else {
-					for (int i(0); i < battle->NumHeroes(); ++i) {
-						if (ac.Selection().IsSelected(i)) {
-							numberAnimation.push_back(NumberAnimation(ac.Selection().GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
-							numberPosition.push_back(
-									battle->HeroesPositions()[i]);
-						}
-					}
+					targetAnimation = AnimationRunner(hero.MeleeAnimation());
 				}
+				moveAnimation = AnimationRunner(hero.AttackAnimation());
+				AddNumberAnimations(ac.Selection());
 				break;
 			case AttackChoice::MAGIC:
 				titleBarText = ac.GetSpell()->Name();
-				moveAnimation = hero.SpellAnimation();
+				moveAnimation = AnimationRunner(hero.SpellAnimation());
 				break;
 			case AttackChoice::DEFEND:
 				titleBarText = "Defends.";
-				moveAnimation = 0;
+				moveAnimation.Clear();
 				break;
 			case AttackChoice::IKARI:
 				if (ac.GetItem()->HasIkari()) {
 					titleBarText = ac.GetItem()->GetIkari()->Name();
 					if (ac.GetItem()->GetIkari()->IsMagical()) {
-						moveAnimation = hero.SpellAnimation();
+						moveAnimation = AnimationRunner(hero.SpellAnimation());
 					} else {
-						moveAnimation = hero.AttackAnimation();
+						moveAnimation = AnimationRunner(hero.AttackAnimation());
 					}
 				}
 				break;
 			case AttackChoice::ITEM:
 				titleBarText = ac.GetItem()->Name();
-				moveAnimation = 0;
+				moveAnimation.Clear();
 				break;
 			case AttackChoice::UNDECIDED:
 				titleBarText = "UNDECIDED";
-				moveAnimation = 0;
+				moveAnimation.Clear();
 				break;
 		}
 	}
 
-	if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(1500);
-	if (moveAnimation) moveAnimation->Start(*this);
-	if (targetAnimation) {
+	if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(850);
+	if (moveAnimation.Valid()) {
+		moveAnimation.Start(*this);
+		if (battle->CurrentAttack().isMonster) {
+			battle->MonsterAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+		} else {
+			battle->HeroAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+		}
+	}
+	if (targetAnimation.Valid()) {
 		targetAnimationTimer = GraphicsTimers().StartCountdown(150);
 	} else {
 		targetAnimationTimer.Clear();
 	}
 }
 
+void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
+	if (ts.TargetsEnemies()) {
+		for (int i(0); i < battle->MaxMonsters(); ++i) {
+			if (ts.IsBad(i)) {
+				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
+				numberPosition.push_back(
+						battle->MonsterAt(i).Position());
+			} else if (ts.IsGood(i)) {
+				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
+				numberPosition.push_back(
+						battle->MonsterAt(i).Position());
+			}
+		}
+	} else {
+		for (int i(0); i < battle->NumHeroes(); ++i) {
+			if (ts.IsBad(i)) {
+				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
+				numberPosition.push_back(
+						battle->HeroAt(i).Position());
+			} else if (ts.IsGood(i)) {
+				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
+				numberPosition.push_back(
+						battle->HeroAt(i).Position());
+			}
+		}
+	}
+}
+
 void PerformAttacks::CheckAnimations() {
-	if (targetAnimation && targetAnimationTimer.JustHit()) {
-		targetAnimation->Start(*this);
+	if (targetAnimation.Valid() && targetAnimationTimer.JustHit()) {
+		targetAnimation.Start(*this);
 	}
-	if (moveAnimation && !moveAnimation->Finished()) return;
-	if (targetAnimation && !targetAnimation->Finished()) return;
-	if (moveAnimation || targetAnimation) {
-		moveAnimation = 0;
-		targetAnimation = 0;
+	if (moveAnimation.Valid() && !moveAnimation.Finished()) return;
+	if (targetAnimation.Valid() && !targetAnimation.Finished()) return;
+	if (moveAnimation.Valid() || targetAnimation.Valid()) {
+		moveAnimation.Clear();
+		targetAnimation.Clear();
 		for (vector<NumberAnimation>::iterator i(numberAnimation.begin()), end(numberAnimation.end()); i != end; ++i) {
 			i->Start(*this);
 		}
@@ -165,8 +188,8 @@ void PerformAttacks::CheckAnimations() {
 
 bool PerformAttacks::HasAnimationsRunning() const {
 	if (titleBarTimer.Running()) return true;
-	if (moveAnimation && moveAnimation->Running()) return true;
-	if (targetAnimation && targetAnimation->Running()) return true;
+	if (moveAnimation.Valid() && moveAnimation.Running()) return true;
+	if (targetAnimation.Valid() && targetAnimation.Running()) return true;
 	for (vector<NumberAnimation>::const_iterator i(numberAnimation.begin()), end(numberAnimation.end()); i != end; ++i) {
 		if (i->Running()) return true;
 	}
@@ -174,13 +197,14 @@ bool PerformAttacks::HasAnimationsRunning() const {
 }
 
 void PerformAttacks::ResetAnimation() {
-	if (moveAnimation) {
-		moveAnimation->Stop();
-		moveAnimation = 0;
+	if (moveAnimation.Valid()) {
+		moveAnimation.Clear();
+		if (!battle->CurrentAttack().isMonster) {
+			battle->HeroAt(battle->CurrentAttack().index).GetAnimation().Clear();
+		}
 	}
-	if (targetAnimation) {
-		targetAnimation->Stop();
-		targetAnimation = 0;
+	if (targetAnimation.Valid()) {
+		targetAnimation.Clear();
 	}
 	titleBarTimer.Clear();
 	numberAnimation.clear();
@@ -225,13 +249,19 @@ void PerformAttacks::RenderNumbers(SDL_Surface *screen, const Vector<int> &offse
 }
 
 void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
-	if (!targetAnimation || !targetAnimation->Running()) return;
-	if (battle->CurrentAttack().isMonster) return; // no monsters for now
-	const TargetSelection &ts(battle->AttackChoiceAt(battle->CurrentAttack().index).Selection());
-	const vector<Point<int> > &positions(ts.TargetsHeroes() ? battle->HeroesPositions() : battle->MonsterPositions());
-	for (vector<Point<int> >::size_type i(0), end(positions.size()); i < end; ++i) {
-		if (ts.IsSelected(i)) {
-			targetAnimation->DrawCenter(screen, positions[i] + offset);
+	if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
+	const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
+	if (ts.TargetsHeroes()) {
+		for (vector<Point<int> >::size_type i(0), end(battle->NumHeroes()); i < end; ++i) {
+			if (ts.IsSelected(i)) {
+				targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + offset);
+			}
+		}
+	} else {
+		for (vector<Point<int> >::size_type i(0), end(battle->MaxMonsters()); i < end; ++i) {
+			if (ts.IsSelected(i)) {
+				targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + offset);
+			}
 		}
 	}
 }