added spell selection battle state

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e2304337f11b3147340eed50338c0d71a718f892..97a93994a634c8bcd018fb75803fcbc656d175a4 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,7 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "geometry/Point.h"
+#include "graphics/Font.h"
 #include "graphics/Frame.h"
 #include "graphics/Gauge.h"
 #include "graphics/Sprite.h"
@@ -31,6 +32,7 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
 using graphics::Sprite;
@@ -55,10 +57,10 @@ int main(int argc, char **argv) {
                // temporary test data
                SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
                PartyLayout monstersLayout;
-               monstersLayout.AddPosition(Point<Uint8>(50, 100));
-               monstersLayout.AddPosition(Point<Uint8>(100, 108));
-               monstersLayout.AddPosition(Point<Uint8>(150, 100));
-               monstersLayout.AddPosition(Point<Uint8>(200, 108));
+               monstersLayout.AddPosition(Point<Uint8>(88, 104));
+               monstersLayout.AddPosition(Point<Uint8>(128, 104));
+               monstersLayout.AddPosition(Point<Uint8>(168, 104));
+               monstersLayout.AddPosition(Point<Uint8>(208, 104));
                PartyLayout heroesLayout;
                heroesLayout.AddPosition(Point<Uint8>(27, 219));
                heroesLayout.AddPosition(Point<Uint8>(104, 227));
@@ -66,26 +68,67 @@ int main(int argc, char **argv) {
                heroesLayout.AddPosition(Point<Uint8>(143, 246));
 
                SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-               Sprite dummySprite(monsterImg, 96, 96);
+               Sprite dummySprite(monsterImg, 64, 64);
                Monster monster;
                monster.SetSprite(&dummySprite);
 
-               SDL_Surface *heroImg(IMG_Load("test-data/hero.png"));
-               Sprite heroSprite(heroImg, 64, 64);
-               Hero hero;
-               hero.SetName("Name");
-               hero.SetLevel(34);
-               hero.SetSprite(&heroSprite);
-               hero.SetMaxHealth(100);
-               hero.SetHealth(50);
-               hero.SetMaxMana(100);
-               hero.SetMana(0);
-               hero.SetIP(255);
+               SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
+               Sprite maximSprite(maximImg, 64, 64);
+               Hero maxim;
+               maxim.SetName("Maxim");
+               maxim.SetLevel(1);
+               maxim.SetSprite(&maximSprite);
+               maxim.SetMaxHealth(33);
+               maxim.SetHealth(33);
+               maxim.SetMaxMana(20);
+               maxim.SetMana(20);
+               maxim.SetIP(0);
+
+               SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
+               Sprite selanSprite(selanImg, 64, 64);
+               Hero selan;
+               selan.SetName("Selan");
+               selan.SetLevel(1);
+               selan.SetSprite(&selanSprite);
+               selan.SetMaxHealth(28);
+               selan.SetHealth(28);
+               selan.SetMaxMana(23);
+               selan.SetMana(23);
+               selan.SetIP(0);
+
+               SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
+               Sprite guySprite(guyImg, 64, 64);
+               Hero guy;
+               guy.SetName("Guy");
+               guy.SetLevel(1);
+               guy.SetSprite(&guySprite);
+               guy.SetMaxHealth(38);
+               guy.SetHealth(38);
+               guy.SetMaxMana(0);
+               guy.SetMana(0);
+               guy.SetIP(0);
+
+               SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
+               Sprite dekarSprite(dekarImg, 64, 64);
+               Hero dekar;
+               dekar.SetName("Dekar");
+               dekar.SetLevel(1);
+               dekar.SetSprite(&dekarSprite);
+               dekar.SetMaxHealth(38);
+               dekar.SetHealth(38);
+               dekar.SetMaxMana(0);
+               dekar.SetMana(0);
+               dekar.SetIP(0);
 
                SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
                Sprite attackIconsSprite(attackIcons, 32, 32);
                SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
                Sprite moveIconsSprite(moveIcons, 32, 32);
+               SDL_Surface *heroTagSprites(IMG_Load("test-data/hero-tag-sprites.png"));
+               Sprite heroTagSprite(heroTagSprites, 32, 16);
+               SDL_Surface *numbers(IMG_Load("test-data/numbers.png"));
+               Sprite numbersSprite(numbers, 16, 16);
+               Font heroTagFont(&numbersSprite);
                SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
                Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
                Frame activeHeroTagFrame(tagFrames, 16, 16);
@@ -95,15 +138,19 @@ int main(int argc, char **argv) {
                Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
                Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
 
-               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge));
+               SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
+               Frame selectFrame(selectFrameImg, 16, 16);
+
+               // TODO: create a container for all the battle resources
+               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge, &heroTagSprite, &heroTagFont, &selectFrame));
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
                battleState->AddMonster(monster);
-               battleState->AddHero(hero);
-               battleState->AddHero(hero);
-               battleState->AddHero(hero);
-               battleState->AddHero(hero);
+               battleState->AddHero(maxim);
+               battleState->AddHero(selan);
+               battleState->AddHero(guy);
+               battleState->AddHero(dekar);
                Application app(&screen, battleState);
                app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
                app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);