X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=8820004ea2d45e44a4088ff3fb55aa36bd668d57;hb=859750479ac0c8febfaf4eb603fc599aef4571ca;hp=e2304337f11b3147340eed50338c0d71a718f892;hpb=2e0bbc9fcc1cce3e1faeff85cc63de7f676e8077;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index e230433..8820004 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,9 +11,12 @@ #include "battle/Hero.h" #include "battle/Monster.h" #include "battle/PartyLayout.h" +#include "battle/Resources.h" #include "geometry/Point.h" +#include "graphics/Font.h" #include "graphics/Frame.h" #include "graphics/Gauge.h" +#include "graphics/Menu.h" #include "graphics/Sprite.h" #include "sdl/InitImage.h" #include "sdl/InitScreen.h" @@ -31,8 +34,10 @@ using battle::Hero; using battle::Monster; using battle::PartyLayout; using geometry::Point; +using graphics::Font; using graphics::Frame; using graphics::Gauge; +using graphics::Menu; using graphics::Sprite; using sdl::InitImage; using sdl::InitScreen; @@ -55,10 +60,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(50, 100)); - monstersLayout.AddPosition(Point(100, 108)); - monstersLayout.AddPosition(Point(150, 100)); - monstersLayout.AddPosition(Point(200, 108)); + monstersLayout.AddPosition(Point(88, 104)); + monstersLayout.AddPosition(Point(128, 104)); + monstersLayout.AddPosition(Point(168, 104)); + monstersLayout.AddPosition(Point(208, 104)); PartyLayout heroesLayout; heroesLayout.AddPosition(Point(27, 219)); heroesLayout.AddPosition(Point(104, 227)); @@ -66,44 +71,191 @@ int main(int argc, char **argv) { heroesLayout.AddPosition(Point(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 *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 *tagFrames(IMG_Load("test-data/tag-frames.png")); - Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33); - Frame activeHeroTagFrame(tagFrames, 16, 16); + 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); + + battle::Resources battleRes; + + SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png")); + Sprite attackIconsSprite(attackIconsImg, 32, 32); + battleRes.attackIcons = &attackIconsSprite; + SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png")); + Sprite moveIconsSprite(moveIconsImg, 32, 32); + battleRes.moveIcons = &moveIconsSprite; + SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png")); + Sprite heroTagSprite(heroTagImg, 32, 16); + battleRes.heroTagLabels = &heroTagSprite; + SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png")); + Sprite numbersSprite(numbersImg, 16, 16); + Font heroTagFont(&numbersSprite); + battleRes.heroTagFont = &heroTagFont; + SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png")); + Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33); + battleRes.heroTagFrame = &heroTagFrame; + Frame activeHeroTagFrame(tagFramesImg, 16, 16); + battleRes.activeHeroTagFrame = &activeHeroTagFrame; SDL_Surface *gauges(IMG_Load("test-data/gauges.png")); Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6); + battleRes.healthGauge = &healthGauge; Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6); + battleRes.manaGauge = &manaGauge; Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6); + battleRes.ikariGauge = &ikariGauge; + + SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png")); + Frame selectFrame(selectFrameImg, 16, 16); + battleRes.selectFrame = &selectFrame; + + SDL_Surface *normalFontImg(IMG_Load("test-data/normal-font.png")); + Sprite normalFontSprite(normalFontImg, 16, 16); + Font normalFont(&normalFontSprite); + normalFont.MapRange('A', 'M', 0, 1); + normalFont.MapRange('N', 'Z', 0, 2); + normalFont.MapRange('a', 'm', 0, 3); + normalFont.MapRange('n', 'z', 0, 4); + normalFont.MapChar(':', 10, 0); + normalFont.MapChar('!', 10, 0); + normalFont.MapChar('?', 10, 0); + // TODO: add '.' and '-' characters + battleRes.normalFont = &normalFont; + + SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png")); + Sprite disabledFontSprite(disabledFontImg, 16, 16); + Font disabledFont(&disabledFontSprite); + disabledFont.MapRange('A', 'M', 0, 1); + disabledFont.MapRange('N', 'Z', 0, 2); + disabledFont.MapRange('a', 'm', 0, 3); + disabledFont.MapRange('n', 'z', 0, 4); + disabledFont.MapChar(':', 10, 0); + disabledFont.MapChar('!', 10, 0); + disabledFont.MapChar('?', 10, 0); + // TODO: add '.' and '-' characters + battleRes.disabledFont = &disabledFont; + + SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png")); + Sprite handCursorSprite(handCursorImg, 32, 32); + battleRes.menuCursor = &handCursorSprite; + + battleRes.spellMenuHeadline = "Please choose a spell."; + battleRes.spellMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 0, 2, 32); + battleRes.spellMenuPrototype.Add("Reset : 0", 0, false); + battleRes.spellMenuPrototype.Add("Strong : 3", 0); + battleRes.spellMenuPrototype.Add("Stronger : 8", 0); + battleRes.spellMenuPrototype.Add("Champion :16", 0); + battleRes.spellMenuPrototype.Add("Rally :10", 0); + battleRes.spellMenuPrototype.Add("Escape : 8", 0, false); + battleRes.spellMenuPrototype.Add("Valor :30", 0); + battleRes.spellMenuPrototype.Add("Poison : 2", 0); + battleRes.spellMenuPrototype.Add("Warp : 8", 0, false); + battleRes.spellMenuPrototype.Add("Release : 2", 0); + battleRes.spellMenuPrototype.Add("Waken : 4", 0); + battleRes.spellMenuPrototype.Add("Light : 0", 0, false); + battleRes.spellMenuPrototype.Add("Fake : 4", 0); + battleRes.spellMenuPrototype.Add("Trick : 5", 0); + battleRes.spellMenuPrototype.Add("Flash : 5", 0); + battleRes.spellMenuPrototype.Add("Fireball : 6", 0); + battleRes.spellMenuPrototype.Add("Vortex : 7", 0); + battleRes.spellMenuPrototype.Add("Blizzard : 8", 0); + battleRes.spellMenuPrototype.Add("Spark : 3", 0); + + SDL_Surface *itemIcons(IMG_Load("test-data/item-icons.png")); + Sprite potionIcon(itemIcons, 16, 16); + Sprite ballIcon(itemIcons, 16, 16, 0, 16); + Sprite crankIcon(itemIcons, 16, 16, 0, 32); + Sprite spearIcon(itemIcons, 16, 16, 0, 48); + Sprite swordIcon(itemIcons, 16, 16, 0, 64); + Sprite axIcon(itemIcons, 16, 16, 0, 80); + Sprite rodIcon(itemIcons, 16, 16, 0, 96); + Sprite armorIcon(itemIcons, 16, 16, 0, 112); + Sprite shieldIcon(itemIcons, 16, 16, 0, 128); + Sprite helmetIcon(itemIcons, 16, 16, 0, 144); + Sprite ringIcon(itemIcons, 16, 16, 0, 160); + Sprite stoneIcon(itemIcons, 16, 16, 0, 176); + + battleRes.itemMenuHeadline = "Please choose an item."; + battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32); + battleRes.itemMenuPrototype.Add("Antidote : 9", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Magic jar : 4", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Miracle : 4", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Hi-Potion : 6", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Hi-Magic : 7", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Regain : 4", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Power potion: 4", 0, false, &potionIcon); + battleRes.itemMenuPrototype.Add("Life potion : 1", 0, false, &potionIcon); + battleRes.itemMenuPrototype.Add("Escape : 2", 0, false); + battleRes.itemMenuPrototype.Add("Power gourd : 3", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Mystery pin : 2", 0, true, &potionIcon); + battleRes.itemMenuPrototype.Add("Sleep ball : 1", 0, false, &ballIcon); + battleRes.itemMenuPrototype.Add("Figgoru : 1", 0, false, &crankIcon); + battleRes.itemMenuPrototype.Add("Spear : 1", 0, false, &spearIcon); + battleRes.itemMenuPrototype.Add("Silvo rapier: 1", 0, false, &swordIcon); + battleRes.itemMenuPrototype.Add("Rainy ax : 1", 0, false, &axIcon); + battleRes.itemMenuPrototype.Add("Pounder rod : 2", 0, false, &rodIcon); + battleRes.itemMenuPrototype.Add("Silver mail : 2", 0, false, &armorIcon); + battleRes.itemMenuPrototype.Add("Slash shield: 2", 0, false, &shieldIcon); + battleRes.itemMenuPrototype.Add("Golden helm : 1", 0, false, &helmetIcon); + battleRes.itemMenuPrototype.Add("Protect ring: 1", 0, false, &ringIcon); + battleRes.itemMenuPrototype.Add("Mysto jewel : 1", 0, false, &stoneIcon); - BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge)); + BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes)); 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);