X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=71a29e58292b0f889661cd691db808d250226d19;hb=0f5f8a6eaa938f88fd3d1e92dec2462b30840e21;hp=ab15296374eb5172b93574599364166173e85030;hpb=64895425dd61660cfb7c4b2a91aecab798d84c47;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index ab15296..71a29e5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,6 +12,7 @@ #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" @@ -29,6 +30,8 @@ #include "sdl/InitScreen.h" #include "sdl/InitSDL.h" +#include +#include #include #include #include @@ -40,6 +43,7 @@ using battle::BattleState; using battle::Hero; using battle::Monster; using battle::PartyLayout; +using battle::Stats; using common::Ikari; using common::Inventory; using common::Item; @@ -66,6 +70,10 @@ 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); @@ -85,12 +93,24 @@ int main(int argc, char **argv) { heroesLayout.AddPosition(Point(160, 152)); SDL_Surface *monsterImg(IMG_Load("test-data/monster.png")); - Sprite dummySprite(monsterImg, 64, 64); + Sprite monsterSprite(monsterImg, 64, 64); Monster monster; - monster.SetName("Monster"); - monster.SetSprite(&dummySprite); - monster.SetMaxHealth(10); - monster.SetHealth(10); + monster.SetName("Lizard"); + monster.SetSprite(&monsterSprite); + monster.SetLevel(1); + monster.SetMaxHealth(8); + monster.SetHealth(8); + monster.SetStats(Stats(14, 6, 6, 6, 6, 6, 6)); + monster.SetReward(3, 5); + ComplexAnimation monsterAttackAnimation(&monsterSprite, 4 * framerate); + monsterAttackAnimation.AddFrame(0, 1, Vector(0, 16)); + monsterAttackAnimation.AddFrame(0, 0, Vector(0, 16)); + monsterAttackAnimation.AddFrame(0, 1, Vector(0, 16)); + monster.SetAttackAnimation(&monsterAttackAnimation); + SDL_Surface *monsterMeleeImg(IMG_Load("test-data/attack-monster.png")); + Sprite monsterMeleeSprite(monsterMeleeImg, 96, 64); + SimpleAnimation monsterMeleeAnimation(&monsterMeleeSprite, framerate, 14); + monster.SetMeleeAnimation(&monsterMeleeAnimation); SDL_Surface *maximImg(IMG_Load("test-data/maxim.png")); Sprite maximSprite(maximImg, 64, 64); @@ -103,23 +123,27 @@ int main(int argc, char **argv) { maxim.SetMaxMana(20); maxim.SetMana(20); maxim.SetIP(0); - ComplexAnimation maximAttackAnimation(&maximSprite, 30); - maximAttackAnimation.AddFrame(1, 0, Vector(2, 0)); - maximAttackAnimation.AddFrame(1, 0, Vector(2, -1)); - maximAttackAnimation.AddFrames(2, 0, Vector(2, -2), 2); - maximAttackAnimation.AddFrame(2, 0, Vector(4, -2)); - maximAttackAnimation.AddFrame(2, 0, Vector(3, -1)); + maxim.SetStats(Stats(28, 22, 28, 17, 14, 100, 10)); + ComplexAnimation maximAttackAnimation(&maximSprite, framerate); + // TODO: cross check double frames; could be related to differences in framerates + maximAttackAnimation.AddFrames(1, 0, Vector(0, 0), 7); // TODO: maybe this could also be a pause before the battle animation + maximAttackAnimation.AddFrames(1, 0, Vector(4, -1), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(4, -2), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(6, -2), 2); + maximAttackAnimation.AddFrames(2, 1, Vector(6, -1), 1); maximAttackAnimation.AddFrames(2, 1, Vector(3, -1), 2); - maximAttackAnimation.AddFrame(2, 1); - maximAttackAnimation.AddFrames(2, 2, Vector(), 2); + maximAttackAnimation.AddFrames(2, 1, Vector(0, 0), 1); + maximAttackAnimation.AddFrames(2, 2, Vector(0, 0), 2); + maximAttackAnimation.AddFrames(2, 2, Vector(2, 0), 1); + maximAttackAnimation.AddFrames(1, 0, Vector(0, 0), 7); // TODO: maybe this could also be a pause between two animations maxim.SetAttackAnimation(&maximAttackAnimation); - ComplexAnimation maximSpellAnimation(&maximSprite, 150); + ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate); maximSpellAnimation.AddFrames(3, 0, Vector(), 2); maximSpellAnimation.AddFrame(3, 1); maxim.SetSpellAnimation(&maximSpellAnimation); SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png")); Sprite maximMeleeSprite(maximMeleeImg, 96, 96); - SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 30, 4); + SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 2 * framerate, 4); maxim.SetMeleeAnimation(&maximMeleeAnimation); SDL_Surface *selanImg(IMG_Load("test-data/selan.png")); @@ -132,8 +156,9 @@ int main(int argc, char **argv) { selan.SetHealth(28); selan.SetMaxMana(23); selan.SetMana(23); - selan.SetIP(1); - ComplexAnimation selanAttackAnimation(&selanSprite, 30); + selan.SetIP(0); + selan.SetStats(Stats(23, 21, 23, 19, 22, 80, 13)); + ComplexAnimation selanAttackAnimation(&selanSprite, framerate); selanAttackAnimation.AddFrames(1, 0, Vector(4, 0), 2); selanAttackAnimation.AddFrame(1, 0, Vector(8, 2)); selanAttackAnimation.AddFrame(2, 0, Vector(10, 4)); @@ -145,7 +170,7 @@ int main(int argc, char **argv) { selanAttackAnimation.AddFrame(2, 2, Vector(-8, -8)); selanAttackAnimation.AddFrame(2, 2); selan.SetAttackAnimation(&selanAttackAnimation); - ComplexAnimation selanSpellAnimation(&selanSprite, 30); + ComplexAnimation selanSpellAnimation(&selanSprite, framerate); selanSpellAnimation.AddFrames(2, 0, Vector(), 3); selanSpellAnimation.AddFrames(2, 1, Vector(), 2); selanSpellAnimation.AddFrames(2, 2, Vector(), 3); @@ -153,7 +178,7 @@ int main(int argc, char **argv) { selan.SetSpellAnimation(&selanSpellAnimation); SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png")); Sprite selanMeleeSprite(selanMeleeImg, 96, 96); - SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 30, 4); + SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4); selan.SetMeleeAnimation(&selanMeleeAnimation); SDL_Surface *guyImg(IMG_Load("test-data/guy.png")); @@ -166,8 +191,9 @@ int main(int argc, char **argv) { guy.SetHealth(38); guy.SetMaxMana(0); guy.SetMana(0); - guy.SetIP(254); - ComplexAnimation guyAttackAnimation(&guySprite, 30); + 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); @@ -179,6 +205,10 @@ int main(int argc, char **argv) { 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); @@ -190,8 +220,9 @@ int main(int argc, char **argv) { dekar.SetHealth(38); dekar.SetMaxMana(0); dekar.SetMana(0); - dekar.SetIP(255); - ComplexAnimation dekarAttackAnimation(&dekarSprite, 30); + 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)); @@ -202,11 +233,15 @@ int main(int argc, char **argv) { dekarAttackAnimation.AddFrame(2, 2, Vector(-2, 0)); dekarAttackAnimation.AddFrames(2, 2, Vector(0, 0), 3); dekar.SetAttackAnimation(&dekarAttackAnimation); - ComplexAnimation dekarSpellAnimation(&dekarSprite, 30); + 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; @@ -232,29 +267,30 @@ int main(int argc, char **argv) { Font largeFont(&largeFontSprite, 0, -2); battleRes.titleFont = &largeFont; - battleRes.numberAnimationPrototype = ComplexAnimation(0, 30); - battleRes.numberAnimationPrototype.AddFrame(0, 0); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -48)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); - battleRes.numberAnimationPrototype.AddFrame(0, 0); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -24)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - battleRes.numberAnimationPrototype.AddFrame(0, 0); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); - battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector(), 14); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -36)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -32)); - battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -18)); + 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); @@ -324,9 +360,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; @@ -444,6 +478,10 @@ 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); @@ -453,7 +491,8 @@ int main(int argc, char **argv) { firestorm.GetTargetingMode().TargetAllEnemies(); firestorm.SetPhysical(); zircoSword.SetIkari(&firestorm); -// maxim.SetWeapon(&zircoSword); + zircoSword.SetAttackAnimation(&swordAttackAnimation); + maxim.SetWeapon(&zircoSword); Item zirconArmor; zirconArmor.SetName("Zircon armor"); zirconArmor.SetMenuIcon(&armorIcon); @@ -514,7 +553,7 @@ int main(int argc, char **argv) { thundershriek.GetTargetingMode().TargetAllEnemies(); thundershriek.SetPhysical(); zircoWhip.SetIkari(&thundershriek); - selan.SetWeapon(&zircoWhip); +// selan.SetWeapon(&zircoWhip); Item zirconPlate; zirconPlate.SetName("Zircon plate"); zirconPlate.SetMenuIcon(&armorIcon); @@ -575,7 +614,7 @@ int main(int argc, char **argv) { torrent.GetTargetingMode().TargetAllEnemies(); torrent.SetPhysical(); zircoAx.SetIkari(&torrent); - guy.SetWeapon(&zircoAx); +// guy.SetWeapon(&zircoAx); guy.SetArmor(&zirconArmor); Item megaShield; megaShield.SetName("Mega shield"); @@ -619,7 +658,7 @@ int main(int argc, char **argv) { dragonRush.GetTargetingMode().TargetSingleEnemy(); dragonRush.SetPhysical(); lizardBlow.SetIkari(&dragonRush); - dekar.SetWeapon(&lizardBlow); +// dekar.SetWeapon(&lizardBlow); Item holyRobe; holyRobe.SetName("Holy robe"); holyRobe.SetMenuIcon(&armorIcon);