X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=503c426512ee5aa565378177e2ac4a6a305e46ba;hb=b7a90738b9ae701cfc86bf74a11ba59d7fcb17ba;hp=676f2d7da7541c8dcccffadf2ef3aff90f0d4cf7;hpb=8c055cbdddac2114c130e6a6524ff887d89ccf53;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 676f2d7..503c426 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,10 +12,13 @@ #include "battle/Monster.h" #include "battle/PartyLayout.h" #include "battle/Resources.h" +#include "common/Inventory.h" +#include "common/Item.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" @@ -32,10 +35,13 @@ using battle::BattleState; using battle::Hero; using battle::Monster; using battle::PartyLayout; +using common::Inventory; +using common::Item; using geometry::Point; using graphics::Font; using graphics::Frame; using graphics::Gauge; +using graphics::Menu; using graphics::Sprite; using sdl::InitImage; using sdl::InitScreen; @@ -72,6 +78,8 @@ int main(int argc, char **argv) { Sprite dummySprite(monsterImg, 64, 64); Monster monster; monster.SetSprite(&dummySprite); + monster.SetMaxHealth(10); + monster.SetHealth(10); SDL_Surface *maximImg(IMG_Load("test-data/maxim.png")); Sprite maximSprite(maximImg, 64, 64); @@ -126,6 +134,9 @@ int main(int argc, char **argv) { 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; @@ -164,8 +175,128 @@ int main(int argc, char **argv) { 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; + + SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png")); + Sprite weaponTargetCursor(targetingIconsImg, 32, 32); + Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64); + battleRes.weaponTargetCursor = &weaponTargetCursor; + // TODO: add image for magic targeting cursor + battleRes.magicTargetCursor = &weaponTargetCursor; + // TODO: add image for item targeting cursor + battleRes.itemTargetCursor = &itemTargetCursor; + + 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); + + Inventory inventory; + Item antidote; + antidote.SetName("Antidote"); + antidote.SetMenuIcon(&potionIcon); + antidote.SetUsableInBattle(); + antidote.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE); + inventory.Add(&antidote, 9); + Item magicJar; + magicJar.SetName("Magic jar"); + magicJar.SetMenuIcon(&potionIcon); + magicJar.SetUsableInBattle(); + magicJar.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE); + inventory.Add(&magicJar, 4); + Item hiPotion; + hiPotion.SetName("Hi-Potion"); + hiPotion.SetMenuIcon(&potionIcon); + hiPotion.SetUsableInBattle(); + hiPotion.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE); + inventory.Add(&hiPotion, 4); + Item powerPotion; + powerPotion.SetName("Power potion"); + powerPotion.SetMenuIcon(&potionIcon); + inventory.Add(&powerPotion, 4); + Item escape; + escape.SetName("Escape"); + inventory.Add(&escape, 2); + Item sleepBall; + sleepBall.SetName("Sleep ball"); + sleepBall.SetMenuIcon(&ballIcon); + sleepBall.SetUsableInBattle(); + sleepBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ONE); + inventory.Add(&sleepBall, 1); + Item multiBall; + multiBall.SetName("Multi-ball!"); + multiBall.SetMenuIcon(&ballIcon); + multiBall.SetUsableInBattle(); + multiBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_MULTIPLE); + inventory.Add(&multiBall, 1); + Item figgoru; + figgoru.SetName("Figgoru"); + figgoru.SetMenuIcon(&crankIcon); + figgoru.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ALL); + inventory.Add(&figgoru, 1); + battleRes.inventory = &inventory; + + battleRes.itemMenuHeadline = "Please choose an item."; + battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':'); + + 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); + BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes)); battleState->AddMonster(monster); battleState->AddMonster(monster);