moved attack order to battle state

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 1a4f726de656c7a5c561ac01315d7472c898ace9..dcad8b2322d3c12197e3a308438da6556bddc294 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -225,14 +225,6 @@ void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void BattleState::ClearAllAttacks() {
-       activeHero = -1;
-       for (int i(0); i < numHeroes; ++i) {
-               attackChoices[i] = AttackChoice(this);
-       }
-}
-
-
 class OrderCompare {
        public:
                OrderCompare(BattleState *battle) : battle(battle) { }
@@ -245,15 +237,64 @@ class OrderCompare {
                BattleState *battle;
 };
 
-void BattleState::WriteOrder(std::vector<Order> &order) {
-       order.reserve(monsters.size() + NumHeroes());
+void BattleState::CalculateAttackOrder() {
+       attackOrder.reserve(monsters.size() + NumHeroes());
        for (int i(0); i < numHeroes; ++i) {
-               order.push_back(Order(i, false));
+               attackOrder.push_back(Order(i, false));
        }
        for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
-               order.push_back(Order(i, true));
+               attackOrder.push_back(Order(i, true));
+       }
+       std::sort(attackOrder.begin(), attackOrder.end(), OrderCompare(this));
+
+       monsterAttacks.resize(monsters.size(), AttackChoice(this));
+}
+
+void BattleState::NextAttack() {
+       ++attackCursor;
+       while (attackCursor < int(attackOrder.size())) {
+               if (attackOrder[attackCursor].isMonster) {
+                       if (MonsterAt(attackOrder[attackCursor].index).Health() > 0) break;
+               } else {
+                       if (HeroAt(attackOrder[attackCursor].index).Health() > 0) break;
+               }
+               ++attackCursor;
+       }
+}
+
+void BattleState::CalculateDamage() {
+       if (CurrentAttack().isMonster) {
+               // TODO: run monster's attack script
+               monsterAttacks[CurrentAttack().index].SetType(AttackChoice::SWORD);
+               monsterAttacks[CurrentAttack().index].Selection().SelectSingle();
+               monsterAttacks[CurrentAttack().index].Selection().SelectHeroes();
+               monsterAttacks[CurrentAttack().index].Selection().SetBad(0, 15);
+       } else {
+               TargetSelection &ts(AttackChoiceAt(CurrentAttack().index).Selection());
+               if (ts.TargetsEnemies()) {
+                       for (int i(0); i < NumHeroes(); ++i) {
+                               if (ts.IsSelected(i)) {
+                                       ts.SetBad(i, 15);
+                               }
+                       }
+               } else {
+                       for (int i(0); i < MaxMonsters(); ++i) {
+                               if (ts.IsSelected(i) && MonsterAt(i).Health() > 0) {
+                                       ts.SetBad(i, 15);
+                               }
+                       }
+               }
+       }
+}
+
+void BattleState::ClearAllAttacks() {
+       attackCursor = -1;
+       activeHero = -1;
+       for (int i(0); i < numHeroes; ++i) {
+               attackChoices[i] = AttackChoice(this);
        }
-       std::sort(order.begin(), order.end(), OrderCompare(this));
+       attackOrder.clear();
+       monsterAttacks.clear();
 }