X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=935d4519f46ed1dd52882f217f062cb66e315045;hb=1ad6b01c2cac5f771fcef0911c6d81230e50d0ed;hp=7b47f858494ee04365987522d7d4409b1f56dc87;hpb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 7b47f85..935d451 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,20 +12,28 @@ #include "battle/Monster.h" #include "battle/PartyLayout.h" #include "battle/Resources.h" +#include "battle/Stats.h" #include "common/Ikari.h" #include "common/Inventory.h" #include "common/Item.h" #include "common/Spell.h" -#include "geometry/Point.h" +#include "geometry/Vector.h" +#include "graphics/ComplexAnimation.h" #include "graphics/Font.h" #include "graphics/Frame.h" #include "graphics/Gauge.h" #include "graphics/Menu.h" +#include "graphics/SimpleAnimation.h" #include "graphics/Sprite.h" +#include "loader/Interpreter.h" +#include "loader/ParsedSource.h" +#include "loader/Parser.h" #include "sdl/InitImage.h" #include "sdl/InitScreen.h" #include "sdl/InitSDL.h" +#include +#include #include #include #include @@ -37,16 +45,22 @@ using battle::BattleState; using battle::Hero; using battle::Monster; using battle::PartyLayout; +using battle::Stats; using common::Ikari; using common::Inventory; using common::Item; using common::Spell; -using geometry::Point; +using geometry::Vector; +using graphics::ComplexAnimation; using graphics::Font; using graphics::Frame; using graphics::Gauge; using graphics::Menu; +using graphics::SimpleAnimation; using graphics::Sprite; +using loader::Interpreter; +using loader::ParsedSource; +using loader::Parser; using sdl::InitImage; using sdl::InitScreen; using sdl::InitSDL; @@ -60,54 +74,39 @@ int main(int argc, char **argv) { const int width = 800; const int height = 480; + const int framerate = 33; + +// std::srand(std::time(0)); + try { InitSDL sdl; InitImage image(IMG_INIT_PNG); + + ParsedSource source; + Parser parser("test-data/test.l2s", source); + parser.Parse(); + cout << source; + Interpreter intp(source); + intp.ReadSource(); + InitScreen screen(width, height); // temporary test data SDL_Surface *bg(IMG_Load("test-data/battle-bg.png")); PartyLayout monstersLayout; - monstersLayout.AddPosition(Point(88, 104)); - monstersLayout.AddPosition(Point(128, 104)); - monstersLayout.AddPosition(Point(168, 104)); - monstersLayout.AddPosition(Point(208, 104)); + monstersLayout.AddPosition(Vector(88, 88)); + monstersLayout.AddPosition(Vector(128, 88)); + monstersLayout.AddPosition(Vector(168, 88)); + monstersLayout.AddPosition(Vector(208, 88)); PartyLayout heroesLayout; - heroesLayout.AddPosition(Point(27, 219)); - heroesLayout.AddPosition(Point(104, 227)); - heroesLayout.AddPosition(Point(66, 238)); - heroesLayout.AddPosition(Point(143, 246)); - - SDL_Surface *monsterImg(IMG_Load("test-data/monster.png")); - 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); - 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(100); - - 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(80); + heroesLayout.AddPosition(Vector(48, 136)); + heroesLayout.AddPosition(Vector(128, 136)); + heroesLayout.AddPosition(Vector(80, 152)); + heroesLayout.AddPosition(Vector(160, 152)); + + Monster monster(*intp.GetMonster("lizard")); + Hero maxim(*intp.GetHero("maxim")); + Hero selan(*intp.GetHero("selan")); SDL_Surface *guyImg(IMG_Load("test-data/guy.png")); Sprite guySprite(guyImg, 64, 64); @@ -119,7 +118,24 @@ int main(int argc, char **argv) { guy.SetHealth(38); guy.SetMaxMana(0); guy.SetMana(0); - guy.SetIP(85); + guy.SetIP(0); + guy.SetStats(Stats(38, 25, 38, 13, 8, 90, 8)); + ComplexAnimation guyAttackAnimation(&guySprite, framerate); + guyAttackAnimation.AddFrames(1, 0, Vector(-4, 0), 2); + guyAttackAnimation.AddFrames(1, 0, Vector(-8, 0), 2); + guyAttackAnimation.AddFrames(2, 0, Vector(-8, 0), 2); + guyAttackAnimation.AddFrame(2, 0, Vector(-4, 0)); + guyAttackAnimation.AddFrames(2, 0, Vector(), 2); + guyAttackAnimation.AddFrame(2, 1); + guyAttackAnimation.AddFrame(2, 1, Vector(4, 0)); + guyAttackAnimation.AddFrame(2, 1, Vector(10, 0)); + guyAttackAnimation.AddFrame(2, 2, Vector(10, 0)); + guyAttackAnimation.AddFrame(2, 2); + guy.SetAttackAnimation(&guyAttackAnimation); + SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png")); + Sprite guyMeleeSprite(guyMeleeImg, 96, 96); + SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 2 * framerate, 4); + guy.SetMeleeAnimation(&guyMeleeAnimation); SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png")); Sprite dekarSprite(dekarImg, 64, 64); @@ -131,10 +147,34 @@ int main(int argc, char **argv) { dekar.SetHealth(38); dekar.SetMaxMana(0); dekar.SetMana(0); - dekar.SetIP(50); + dekar.SetIP(0); + dekar.SetStats(Stats(46, 29, 46, 13, 7, 100, 5)); + ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate); + dekarAttackAnimation.AddFrame(1, 0, Vector(4, 0)); + dekarAttackAnimation.AddFrame(1, 0, Vector(8, 2)); + dekarAttackAnimation.AddFrame(2, 0, Vector(12, 4)); + dekarAttackAnimation.AddFrame(2, 0, Vector(16, 4)); + dekarAttackAnimation.AddFrames(2, 0, Vector(10, 2), 4); + dekarAttackAnimation.AddFrame(2, 1, Vector(6, 2)); + dekarAttackAnimation.AddFrame(2, 1, Vector()); + dekarAttackAnimation.AddFrame(2, 2, Vector(-2, 0)); + dekarAttackAnimation.AddFrames(2, 2, Vector(0, 0), 3); + dekar.SetAttackAnimation(&dekarAttackAnimation); + ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate); + dekarSpellAnimation.AddFrames(2, 0, Vector(), 6); + dekarSpellAnimation.AddFrames(2, 1, Vector(), 2); + dekarSpellAnimation.AddFrames(2, 2, Vector(), 3); + dekar.SetSpellAnimation(&dekarSpellAnimation); + SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png")); + Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96); + SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 2 * framerate, 4); + dekar.SetMeleeAnimation(&dekarMeleeAnimation); battle::Resources battleRes; + SDL_Surface *swapCursorImg(IMG_Load("test-data/swap-cursor.png")); + Sprite swapCursorSprite(swapCursorImg, 32, 32); + battleRes.swapCursor = &swapCursorSprite; SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png")); Sprite attackIconsSprite(attackIconsImg, 32, 32); battleRes.attackIcons = &attackIconsSprite; @@ -144,18 +184,77 @@ int main(int argc, char **argv) { SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png")); Sprite moveIconsSprite(moveIconsImg, 32, 32); battleRes.moveIcons = &moveIconsSprite; + + SDL_Surface *titleFrameImg(IMG_Load("test-data/title-frame.png")); + Frame titleFrame(titleFrameImg, 16, 16); + battleRes.titleFrame = &titleFrame; + + SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png")); + Sprite largeFontSprite(largeFontImg, 16, 32); + Font largeFont(&largeFontSprite, 0, -2); + battleRes.titleFont = &largeFont; + + ComplexAnimation numberAnimationPrototype(0, framerate); + numberAnimationPrototype.AddFrame(0, 0); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -48)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); + numberAnimationPrototype.AddFrame(0, 0); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -24)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + numberAnimationPrototype.AddFrame(0, 0); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); + numberAnimationPrototype.AddFrames(0, 0, Vector(), 14); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -36)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -32)); + numberAnimationPrototype.AddFrame(0, 0, Vector(0, -18)); + battleRes.numberAnimationPrototype = &numberAnimationPrototype; + + SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png")); + Sprite bigNumbersSprite(bigNumbersImg, 16, 32); + battleRes.bigNumberSprite = &bigNumbersSprite; + SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png")); + Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32); + battleRes.greenNumberSprite = &bigGreenNumbersSprite; + SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png")); Sprite heroTagSprite(heroTagImg, 32, 16); battleRes.heroTagLabels = &heroTagSprite; + battleRes.levelLabelCol = 0; + battleRes.levelLabelRow = 0; + battleRes.healthLabelCol = 0; + battleRes.healthLabelRow = 1; + battleRes.manaLabelCol = 0; + battleRes.manaLabelRow = 2; + battleRes.moveLabelCol = 0; + battleRes.moveLabelRow = 3; + battleRes.ikariLabelCol = 0; + battleRes.ikariLabelRow = 4; + SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png")); Sprite numbersSprite(numbersImg, 16, 16); - Font heroTagFont(&numbersSprite); + Font heroTagFont(&numbersSprite, 0, -3); 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 *smallTagFrameImg(IMG_Load("test-data/small-tag-frame.png")); + Frame smallTagFrame(smallTagFrameImg, 8, 16); + battleRes.smallHeroTagFrame = &smallTagFrame; + Frame lastSmallTagFrame(smallTagFrameImg, 8, 16, 1, 1, 0, 33); + battleRes.lastSmallHeroTagFrame = &lastSmallTagFrame; + battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31); SDL_Surface *gauges(IMG_Load("test-data/gauges.png")); Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6); @@ -171,28 +270,12 @@ int main(int argc, char **argv) { 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('!', 11, 0); - normalFont.MapChar('?', 12, 0); - // TODO: add '.' and '-' characters + Font normalFont(&normalFontSprite, 0, -2); 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('!', 11, 0); - disabledFont.MapChar('?', 12, 0); - // TODO: add '.' and '-' characters + Font disabledFont(&disabledFontSprite, 0, -2); battleRes.disabledFont = &disabledFont; SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png")); @@ -204,9 +287,7 @@ int main(int argc, char **argv) { Sprite magicTargetCursor(targetingIconsImg, 32, 32, 0, 32); Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64); battleRes.weaponTargetCursor = &weaponTargetCursor; - // TODO: add image for magic targeting cursor battleRes.magicTargetCursor = &magicTargetCursor; - // TODO: add image for item targeting cursor battleRes.itemTargetCursor = &itemTargetCursor; Spell resetSpell; @@ -324,22 +405,30 @@ int main(int argc, char **argv) { battleRes.itemMenuHeadline = "Please choose an item."; battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':'); + SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png")); + Sprite swordAttackSprite(swordAttackImg, 96, 96); + SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4); + Item zircoSword; zircoSword.SetName("Zirco sword"); zircoSword.SetMenuIcon(&swordIcon); + zircoSword.GetTargetingMode().TargetSingleEnemy(); Ikari firestorm; firestorm.SetName("Firestorm"); - firestorm.SetCost(88); + firestorm.SetCost(224); firestorm.GetTargetingMode().TargetAllEnemies(); + firestorm.SetPhysical(); zircoSword.SetIkari(&firestorm); + zircoSword.SetAttackAnimation(&swordAttackAnimation); maxim.SetWeapon(&zircoSword); Item zirconArmor; zirconArmor.SetName("Zircon armor"); zirconArmor.SetMenuIcon(&armorIcon); Ikari magicCure; magicCure.SetName("Magic cure"); - magicCure.SetCost(51); + magicCure.SetCost(128); magicCure.GetTargetingMode().TargetSingleAlly(); + magicCure.SetMagical(); zirconArmor.SetIkari(&magicCure); maxim.SetArmor(&zirconArmor); Item holyShield; @@ -347,8 +436,9 @@ int main(int argc, char **argv) { holyShield.SetMenuIcon(&shieldIcon); Ikari lightGuard; lightGuard.SetName("Light guard"); - lightGuard.SetCost(51); - lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + lightGuard.SetCost(128); + lightGuard.GetTargetingMode().TargetAllAllies(); // actually only targets self + lightGuard.SetMagical(); holyShield.SetIkari(&lightGuard); maxim.SetShield(&holyShield); Item legendHelm; @@ -356,8 +446,9 @@ int main(int argc, char **argv) { legendHelm.SetMenuIcon(&helmetIcon); Ikari boomerang; boomerang.SetName("Boomerang"); - boomerang.SetCost(65); - boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + boomerang.SetCost(164); + boomerang.GetTargetingMode().TargetAllAllies(); // actually only targets self + boomerang.SetMagical(); legendHelm.SetIkari(&boomerang); maxim.SetHelmet(&legendHelm); Item sProRing; @@ -365,8 +456,9 @@ int main(int argc, char **argv) { sProRing.SetMenuIcon(&ringIcon); Ikari courage; courage.SetName("Courage"); - courage.SetCost(26); + courage.SetCost(64); courage.GetTargetingMode().TargetMultipleAllies(); + courage.SetMagical(); sProRing.SetIkari(&courage); maxim.SetRing(&sProRing); Item evilJewel; @@ -374,52 +466,115 @@ int main(int argc, char **argv) { evilJewel.SetMenuIcon(&jewelIcon); Ikari gloomy; gloomy.SetName("Gloomy"); - gloomy.SetCost(65); + gloomy.SetCost(164); gloomy.GetTargetingMode().TargetAllEnemies(); + gloomy.SetMagical(); evilJewel.SetIkari(&gloomy); maxim.SetJewel(&evilJewel); Item zircoWhip; zircoWhip.SetName("Zirco whip"); zircoWhip.SetMenuIcon(&rodIcon); - selan.SetWeapon(&zircoWhip); + zircoWhip.GetTargetingMode().TargetSingleEnemy(); + Ikari thundershriek; + thundershriek.SetName("Thundershriek"); + thundershriek.SetCost(224); + thundershriek.GetTargetingMode().TargetAllEnemies(); + thundershriek.SetPhysical(); + zircoWhip.SetIkari(&thundershriek); +// selan.SetWeapon(&zircoWhip); Item zirconPlate; zirconPlate.SetName("Zircon plate"); zirconPlate.SetMenuIcon(&armorIcon); + Ikari suddenCure; + suddenCure.SetName("Sudden cure"); + suddenCure.SetCost(96); + suddenCure.GetTargetingMode().TargetAllAllies(); + suddenCure.SetMagical(); + zirconPlate.SetIkari(&suddenCure); selan.SetArmor(&zirconPlate); Item zircoGloves; zircoGloves.SetName("Zirco gloves"); zircoGloves.SetMenuIcon(&shieldIcon); + Ikari forcefield; + forcefield.SetName("Forcefield"); + forcefield.SetCost(64); + forcefield.GetTargetingMode().TargetAllAllies(); + forcefield.SetMagical(); + zircoGloves.SetIkari(&forcefield); selan.SetShield(&zircoGloves); Item holyCap; holyCap.SetName("Holy cap"); holyCap.SetMenuIcon(&helmetIcon); + Ikari vulnerable; + vulnerable.SetName("Vulnerable"); + vulnerable.SetCost(196); + vulnerable.GetTargetingMode().TargetAllEnemies(); + vulnerable.SetPhysical(); + holyCap.SetIkari(&vulnerable); selan.SetHelmet(&holyCap); Item ghostRing; ghostRing.SetName("Ghost ring"); ghostRing.SetMenuIcon(&ringIcon); + Ikari destroy; + destroy.SetName("Destroy"); + destroy.SetCost(128); + destroy.GetTargetingMode().TargetMultipleEnemies(); + destroy.SetMagical(); + ghostRing.SetIkari(&destroy); selan.SetRing(&ghostRing); Item eagleRock; eagleRock.SetName("Eagle rock"); eagleRock.SetMenuIcon(&jewelIcon); + Ikari dive; + dive.SetName("Dive"); + dive.SetCost(128); + dive.GetTargetingMode().TargetSingleEnemy(); + dive.SetPhysical(); + eagleRock.SetIkari(&dive); selan.SetJewel(&eagleRock); Item zircoAx; zircoAx.SetName("Zirco ax"); zircoAx.SetMenuIcon(&axIcon); - guy.SetWeapon(&zircoAx); + zircoAx.GetTargetingMode().TargetSingleEnemy(); + Ikari torrent; + torrent.SetName("Torrent"); + torrent.SetCost(224); + torrent.GetTargetingMode().TargetAllEnemies(); + torrent.SetPhysical(); + zircoAx.SetIkari(&torrent); +// guy.SetWeapon(&zircoAx); guy.SetArmor(&zirconArmor); Item megaShield; megaShield.SetName("Mega shield"); megaShield.SetMenuIcon(&shieldIcon); + Ikari ironBarrier; + ironBarrier.SetName("Iron barrier"); + ironBarrier.SetCost(255); + ironBarrier.GetTargetingMode().TargetAllAllies(); // actually only targets self + ironBarrier.SetMagical(); + megaShield.SetIkari(&ironBarrier); guy.SetShield(&megaShield); Item zircoHelmet; zircoHelmet.SetName("Zirco helmet"); zircoHelmet.SetMenuIcon(&helmetIcon); + Ikari slow; + slow.SetName("Slow"); + slow.SetCost(196); + slow.GetTargetingMode().TargetAllEnemies(); + slow.SetPhysical(); + zircoHelmet.SetIkari(&slow); guy.SetHelmet(&zircoHelmet); Item powerRing; powerRing.SetName("Power ring"); powerRing.SetMenuIcon(&ringIcon); + Ikari trick; + trick.SetName("Trick"); + trick.SetCost(32); + trick.GetTargetingMode().TargetAllEnemies(); + trick.SetMagical(); + zircoHelmet.SetIkari(&trick); guy.SetRing(&powerRing); guy.SetJewel(&evilJewel); @@ -427,30 +582,52 @@ int main(int argc, char **argv) { Item lizardBlow; lizardBlow.SetName("Lizard blow"); lizardBlow.SetMenuIcon(&swordIcon); - dekar.SetWeapon(&lizardBlow); + lizardBlow.GetTargetingMode().TargetSingleEnemy(); + Ikari dragonRush; + dragonRush.SetName("Dragon rush"); + dragonRush.SetCost(164); + dragonRush.GetTargetingMode().TargetSingleEnemy(); + dragonRush.SetPhysical(); + lizardBlow.SetIkari(&dragonRush); +// dekar.SetWeapon(&lizardBlow); Item holyRobe; holyRobe.SetName("Holy robe"); holyRobe.SetMenuIcon(&armorIcon); + Ikari crisisCure; + crisisCure.SetName("Crisis cure"); + crisisCure.SetCost(164); + crisisCure.GetTargetingMode().TargetAllAllies(); + crisisCure.SetMagical(); + holyRobe.SetIkari(&crisisCure); dekar.SetArmor(&holyRobe); dekar.SetShield(&zircoGloves); dekar.SetHelmet(&holyCap); Item rocketRing; rocketRing.SetName("Rocket ring"); rocketRing.SetMenuIcon(&ringIcon); + Ikari fake; + fake.SetName("Fake"); + fake.SetCost(32); + fake.GetTargetingMode().TargetSingleAlly(); + fake.SetMagical(); + rocketRing.SetIkari(&fake); dekar.SetRing(&rocketRing); Item krakenRock; krakenRock.SetName("Kraken rock"); krakenRock.SetMenuIcon(&jewelIcon); + Ikari tenLegger; + tenLegger.SetName("Ten-legger"); + tenLegger.SetCost(164); + tenLegger.GetTargetingMode().TargetAllEnemies(); + tenLegger.SetPhysical(); + rocketRing.SetIkari(&tenLegger); dekar.SetJewel(&krakenRock); 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, &jewelIcon); + battleRes.noEquipmentText = "No equip"; + battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth()); + + battleRes.escapeText = "Escapes."; BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes)); battleState->AddMonster(monster); @@ -477,6 +654,9 @@ int main(int argc, char **argv) { app.Run(); return 0; + } catch (Parser::Error &e) { + cerr << "parsing exception in file " << e.File() << " on line " << e.Line() << ": " << e.what() << endl; + return 1; } catch (exception &e) { cerr << "exception in main(): " << e.what() << endl; return 1;