#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 "sdl/InitImage.h"
#include "sdl/InitScreen.h"
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 sdl::InitImage;
using sdl::InitScreen;
const int width = 800;
const int height = 480;
+ const int framerate = 33;
+
try {
InitSDL sdl;
InitImage image(IMG_INIT_PNG);
// temporary test data
SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
PartyLayout monstersLayout;
- monstersLayout.AddPosition(Point<Uint8>(88, 104));
- monstersLayout.AddPosition(Point<Uint8>(128, 104));
- monstersLayout.AddPosition(Point<Uint8>(168, 104));
- monstersLayout.AddPosition(Point<Uint8>(208, 104));
+ monstersLayout.AddPosition(Point<Uint8>(88, 88));
+ monstersLayout.AddPosition(Point<Uint8>(128, 88));
+ monstersLayout.AddPosition(Point<Uint8>(168, 88));
+ monstersLayout.AddPosition(Point<Uint8>(208, 88));
PartyLayout heroesLayout;
- heroesLayout.AddPosition(Point<Uint8>(27, 219));
- heroesLayout.AddPosition(Point<Uint8>(104, 227));
- heroesLayout.AddPosition(Point<Uint8>(66, 238));
- heroesLayout.AddPosition(Point<Uint8>(143, 246));
+ heroesLayout.AddPosition(Point<Uint8>(48, 136));
+ heroesLayout.AddPosition(Point<Uint8>(128, 136));
+ heroesLayout.AddPosition(Point<Uint8>(80, 152));
+ heroesLayout.AddPosition(Point<Uint8>(160, 152));
SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
- Sprite dummySprite(monsterImg, 64, 64);
+ Sprite monsterSprite(monsterImg, 64, 64);
Monster 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<int>(16, 0));
+ monsterAttackAnimation.AddFrame(0, 0, Vector<int>(16, 0));
+ monsterAttackAnimation.AddFrame(0, 1, Vector<int>(16, 0));
+ 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);
maxim.SetMaxMana(20);
maxim.SetMana(20);
maxim.SetIP(0);
+ 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<int>(0, 0), 7); // TODO: maybe this could also be a pause before the battle animation
+ maximAttackAnimation.AddFrames(1, 0, Vector<int>(4, -1), 2);
+ maximAttackAnimation.AddFrames(2, 0, Vector<int>(4, -2), 2);
+ maximAttackAnimation.AddFrames(2, 0, Vector<int>(6, -2), 2);
+ maximAttackAnimation.AddFrames(2, 1, Vector<int>(6, -1), 1);
+ maximAttackAnimation.AddFrames(2, 1, Vector<int>(3, -1), 2);
+ maximAttackAnimation.AddFrames(2, 1, Vector<int>(0, 0), 1);
+ maximAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 2);
+ maximAttackAnimation.AddFrames(2, 2, Vector<int>(2, 0), 1);
+ maximAttackAnimation.AddFrames(1, 0, Vector<int>(0, 0), 7); // TODO: maybe this could also be a pause between two animations
+ maxim.SetAttackAnimation(&maximAttackAnimation);
+ ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate);
+ maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 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, 2 * framerate, 4);
+ maxim.SetMeleeAnimation(&maximMeleeAnimation);
SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
Sprite selanSprite(selanImg, 64, 64);
selan.SetHealth(28);
selan.SetMaxMana(23);
selan.SetMana(23);
- selan.SetIP(1);
+ selan.SetIP(0);
+ selan.SetStats(Stats(23, 21, 23, 19, 22, 80, 13));
+ ComplexAnimation selanAttackAnimation(&selanSprite, framerate);
+ selanAttackAnimation.AddFrames(1, 0, Vector<int>(4, 0), 2);
+ selanAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
+ selanAttackAnimation.AddFrame(2, 0, Vector<int>(10, 4));
+ selanAttackAnimation.AddFrame(2, 0, Vector<int>(14, 4));
+ selanAttackAnimation.AddFrames(2, 0, Vector<int>(12, 2), 3);
+ selanAttackAnimation.AddFrames(2, 1, Vector<int>(14, 2), 2);
+ selanAttackAnimation.AddFrame(2, 1, Vector<int>(2, 0));
+ selanAttackAnimation.AddFrame(2, 2, Vector<int>(-2, -4));
+ selanAttackAnimation.AddFrame(2, 2, Vector<int>(-8, -8));
+ selanAttackAnimation.AddFrame(2, 2);
+ selan.SetAttackAnimation(&selanAttackAnimation);
+ ComplexAnimation selanSpellAnimation(&selanSprite, framerate);
+ selanSpellAnimation.AddFrames(2, 0, Vector<int>(), 3);
+ selanSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
+ selanSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
+ selanSpellAnimation.AddFrames(2, 3, Vector<int>(), 2);
+ selan.SetSpellAnimation(&selanSpellAnimation);
+ SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png"));
+ Sprite selanMeleeSprite(selanMeleeImg, 96, 96);
+ SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4);
+ selan.SetMeleeAnimation(&selanMeleeAnimation);
SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
Sprite guySprite(guyImg, 64, 64);
guy.SetHealth(38);
guy.SetMaxMana(0);
guy.SetMana(0);
- guy.SetIP(254);
+ guy.SetIP(0);
+ guy.SetStats(Stats(38, 25, 38, 13, 8, 90, 8));
+ ComplexAnimation guyAttackAnimation(&guySprite, framerate);
+ guyAttackAnimation.AddFrames(1, 0, Vector<int>(-4, 0), 2);
+ guyAttackAnimation.AddFrames(1, 0, Vector<int>(-8, 0), 2);
+ guyAttackAnimation.AddFrames(2, 0, Vector<int>(-8, 0), 2);
+ guyAttackAnimation.AddFrame(2, 0, Vector<int>(-4, 0));
+ guyAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
+ guyAttackAnimation.AddFrame(2, 1);
+ guyAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
+ guyAttackAnimation.AddFrame(2, 1, Vector<int>(10, 0));
+ guyAttackAnimation.AddFrame(2, 2, Vector<int>(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);
dekar.SetHealth(38);
dekar.SetMaxMana(0);
dekar.SetMana(0);
- dekar.SetIP(255);
+ dekar.SetIP(0);
+ dekar.SetStats(Stats(46, 29, 46, 13, 7, 100, 5));
+ ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate);
+ dekarAttackAnimation.AddFrame(1, 0, Vector<int>(4, 0));
+ dekarAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
+ dekarAttackAnimation.AddFrame(2, 0, Vector<int>(12, 4));
+ dekarAttackAnimation.AddFrame(2, 0, Vector<int>(16, 4));
+ dekarAttackAnimation.AddFrames(2, 0, Vector<int>(10, 2), 4);
+ dekarAttackAnimation.AddFrame(2, 1, Vector<int>(6, 2));
+ dekarAttackAnimation.AddFrame(2, 1, Vector<int>());
+ dekarAttackAnimation.AddFrame(2, 2, Vector<int>(-2, 0));
+ dekarAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 3);
+ dekar.SetAttackAnimation(&dekarAttackAnimation);
+ ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate);
+ dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
+ dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
+ dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 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;
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;
+
+ battleRes.numberAnimationPrototype = ComplexAnimation(0, framerate);
+ battleRes.numberAnimationPrototype.AddFrame(0, 0);
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0);
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0);
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
+ battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
+ battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
+
+ 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);
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"));
battleRes.itemMenuHeadline = "Please choose an item.";
battleRes.itemMenuPrototype = Menu<const common::Item *>(&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);
firestorm.GetTargetingMode().TargetAllEnemies();
firestorm.SetPhysical();
zircoSword.SetIkari(&firestorm);
+ zircoSword.SetAttackAnimation(&swordAttackAnimation);
maxim.SetWeapon(&zircoSword);
Item zirconArmor;
zirconArmor.SetName("Zircon armor");
thundershriek.GetTargetingMode().TargetAllEnemies();
thundershriek.SetPhysical();
zircoWhip.SetIkari(&thundershriek);
- selan.SetWeapon(&zircoWhip);
+// selan.SetWeapon(&zircoWhip);
Item zirconPlate;
zirconPlate.SetName("Zircon plate");
zirconPlate.SetMenuIcon(&armorIcon);
torrent.GetTargetingMode().TargetAllEnemies();
torrent.SetPhysical();
zircoAx.SetIkari(&torrent);
- guy.SetWeapon(&zircoAx);
+// guy.SetWeapon(&zircoAx);
guy.SetArmor(&zirconArmor);
Item megaShield;
megaShield.SetName("Mega shield");
dragonRush.GetTargetingMode().TargetSingleEnemy();
dragonRush.SetPhysical();
lizardBlow.SetIkari(&dragonRush);
- dekar.SetWeapon(&lizardBlow);
+// dekar.SetWeapon(&lizardBlow);
Item holyRobe;
holyRobe.SetName("Holy robe");
holyRobe.SetMenuIcon(&armorIcon);
battleRes.noEquipmentText = "No equip";
battleRes.ikariMenuPrototype = Menu<const Item *>(&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);
battleState->AddMonster(monster);
projects / l2e.git / blobdiff