moved upgrade process to battle class

[l2e.git] / src / battle / states / VictoryState.cpp

diff --git a/src/battle/states/VictoryState.cpp b/src/battle/states/VictoryState.cpp
index 3516bdeaf5150802642f5022864fe120e3712134..64318e0157d87b50afbdd75334ad22647c8a983f 100644 (file)
--- a/src/battle/states/VictoryState.cpp
+++ b/src/battle/states/VictoryState.cpp
@@ -5,7 +5,10 @@
 #include "../Hero.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../common/Hero.h"
+#include "../../common/Capsule.h"
+#include "../../common/GameConfig.h"
+#include "../../common/GameState.h"
+#include "../../common/Upgrade.h"
 #include "../../math/Vector.h"
 #include "../../graphics/Font.h"
 #include "../../graphics/Frame.h"
@@ -14,6 +17,8 @@
 
 using app::Application;
 using app::Input;
+using common::GameState;
+using common::Upgrade;
 using graphics::Font;
 using graphics::Frame;
 using math::Vector;
@@ -38,15 +43,65 @@ void VictoryState::LoadResults() {
        s << "Gets " << battle->GoldReward() << " gold";
        lines.push_back(s.str());
 
-       for (std::vector<Hero>::const_iterator
-                       i(battle->HeroesBegin()), end(battle->HeroesEnd());
+       lines.push_back("");
+
+       GameState &state = *parent->Game().state;
+       vector<Upgrade> upgrade;
+       battle->ApplyRewards(state, upgrade);
+       for (std::vector<Upgrade>::const_iterator
+                       i(upgrade.begin()), end(upgrade.end());
                        i != end; ++i) {
-               if (i->Health() <= 0) continue;
-               const common::Hero &hero = i->Master();
-               s.str("");
-               s << hero.Name() << " next level " << hero.NextLevel();
-               lines.push_back(s.str());
+               LoadResult(*i, lines);
        }
+
+       lines.push_back("");
+       s.str("");
+       s << state.money << " gold";
+       lines.push_back(s.str());
+}
+
+void VictoryState::LoadResult(
+               const Upgrade &u,
+               vector<string> &lines) {
+       std::stringstream s;
+       switch (u.GetType()) {
+               case Upgrade::LEVEL_UP:
+                       s << u.Name() << " levels up.";
+                       break;
+               case Upgrade::MAX_HEALTH:
+                       s << "Max. HP increases by " << u.Amount();
+                       break;
+               case Upgrade::MAX_MAGIC:
+                       s << "Max. MP increases by " << u.Amount();
+                       break;
+               case Upgrade::ATTACK:
+                       s << "ATK increases by " << u.Amount();
+                       break;
+               case Upgrade::DEFENSE:
+                       s << "DFP increases by " << u.Amount();
+                       break;
+               case Upgrade::STRENGTH:
+                       s << "STR increases by " << u.Amount();
+                       break;
+               case Upgrade::AGILITY:
+                       s << "AGL increases by " << u.Amount();
+                       break;
+               case Upgrade::INTELLIGENCE:
+                       s << "INT increases by " << u.Amount();
+                       break;
+               case Upgrade::GUT:
+                       s << "GUT increases by " << u.Amount();
+                       break;
+               case Upgrade::MAGIC_RSISTANCE:
+                       s << "MGR increases by " << u.Amount();
+                       break;
+               case Upgrade::LEVEL_NEXT:
+                       s << u.Name() << " next level " << u.Amount();
+                       break;
+               default:
+                       s << "unknown upgrade type " << u.GetType();
+       }
+       lines.push_back(s.str());
 }
 
 void VictoryState::OnExitState(SDL_Surface *screen) {
@@ -54,7 +109,7 @@ void VictoryState::OnExitState(SDL_Surface *screen) {
 }
 
 void VictoryState::OnResumeState(SDL_Surface *screen) {
-       timer = GraphicsTimers().StartCountdown(1500);
+
 }
 
 void VictoryState::OnPauseState(SDL_Surface *screen) {
@@ -77,7 +132,36 @@ void VictoryState::OnResize(int width, int height) {
 
 
 void VictoryState::HandleEvents(const Input &input) {
-       if (timer.Finished()) {
+       if (input.JustPressed(Input::ACTION_A)) {
+               ++cursor;
+               timer = GraphicsTimers().StartInterval(150);
+       } else if (input.IsDown(Input::ACTION_A)
+                       && timer.JustHit()) {
+               if (timer.Iteration() > 3) {
+                       ++cursor;
+                       stalling = false;
+               } else {
+                       stalling = true;
+               }
+       } else if (input.JustPressed(Input::SHOULDER_LEFT)) {
+               ++cursor;
+               timer = GraphicsTimers().StartInterval(150);
+       } else if (input.IsDown(Input::SHOULDER_LEFT)
+                       && timer.JustHit()) {
+               if (timer.Iteration() > 3) {
+                       ++cursor;
+                       stalling = false;
+               } else {
+                       stalling = true;
+               }
+       }
+       if (timer.JustHit()
+                       && !input.IsDown(Input::ACTION_A)
+                       && !input.IsDown(Input::SHOULDER_LEFT)) {
+               timer.Clear();
+               stalling = false;
+       }
+       if (cursor >= int(lines.size())) {
                Ctrl().PopState(); // pop self
        }
 }
@@ -89,6 +173,7 @@ void VictoryState::UpdateWorld(Uint32 deltaT) {
 
 void VictoryState::Render(SDL_Surface *screen) {
        parent->RenderBackground(screen);
+       parent->RenderHeroes(screen);
        RenderFrame(screen);
        RenderLines(screen);
 }
@@ -101,12 +186,30 @@ void VictoryState::RenderFrame(SDL_Surface *screen) {
 void VictoryState::RenderLines(SDL_Surface *screen) {
        // naive implementation
        const Font &font = *parent->Res().normalFont;
+       const Vector<int> lineBreak = Vector<int>(
+                       0, font.CharHeight() * 5 / 4);
+       const int start = cursor > 7 ? cursor - 8 : 0;
        Vector<int> position = textPosition;
-       for (vector<string>::const_iterator
-                       i(lines.begin()), end(lines.end());
-                       i != end; ++i) {
-               font.DrawString(i->c_str(), screen, position);
-               position.Y() += font.CharHeight();
+
+       int end = cursor + 1;
+
+       if (start > 0) {
+               if (timer.Running() && !stalling) {
+                       --end;
+                       position += lineBreak;
+                       const int correction = timer.IterationElapsed();
+                       if (correction > 0) {
+               //              ++start;
+                               position.Y() -= lineBreak.Y() * correction / timer.TargetTime();
+                       }
+               }
+       }
+
+       if (end > int(lines.size())) end = lines.size();
+
+       for (int i = start; i < end; ++i) {
+               font.DrawString(lines[i].c_str(), screen, position);
+               position += lineBreak;
        }
 }