X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e25eb7eae9e2e7d9396abae7ba7fb95144f5518e;hb=8723daa89e877ac98e6012b0c37e3b4eb6131426;hp=97a93994a634c8bcd018fb75803fcbc656d175a4;hpb=185c6c79f8ba30981aad4e1d66f98143a344b95e;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 97a9399..e25eb7e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,10 +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" @@ -35,6 +37,7 @@ using geometry::Point; using graphics::Font; using graphics::Frame; using graphics::Gauge; +using graphics::Menu; using graphics::Sprite; using sdl::InitImage; using sdl::InitScreen; @@ -120,29 +123,143 @@ int main(int argc, char **argv) { 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); + battle::Resources battleRes; + + SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png")); + Sprite attackIconsSprite(attackIconsImg, 32, 32); + battleRes.attackIcons = &attackIconsSprite; + SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png")); + Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16); + battleRes.attackChoiceIcons = &attackChoiceIconsSprite; + 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); - SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png")); - Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33); - Frame activeHeroTagFrame(tagFrames, 16, 16); + 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); + + battleRes.ikariMenuHeadline = "Please choose equipment."; + battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32); + battleRes.ikariMenuPrototype.Add("Zirco whip Thundershriek", 0, false, &swordIcon); + battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon); + battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon); + battleRes.ikariMenuPrototype.Add("Holy cap Vulnerable", 0, false, &helmetIcon); + battleRes.ikariMenuPrototype.Add("Ghost ring Destroy", 0, true, &ringIcon); + battleRes.ikariMenuPrototype.Add("Eagle rock Dive", 0, true, &stoneIcon); - // 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 *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes)); battleState->AddMonster(monster); battleState->AddMonster(monster); battleState->AddMonster(monster);