#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"
using common::Item;
using common::Spell;
using geometry::Point;
+using geometry::Vector;
+using graphics::ComplexAnimation;
using graphics::Font;
using graphics::Frame;
using graphics::Gauge;
maxim.SetMaxMana(20);
maxim.SetMana(20);
maxim.SetIP(0);
- maxim.SetAttackFrames(3);
- maxim.SetSpellFrames(2);
+ ComplexAnimation maximAttackAnimation(&maximSprite, 30);
+ maximAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
+ maximAttackAnimation.AddFrames(2, 0, Vector<int>(4, 0), 2);
+ maximAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
+ maximAttackAnimation.AddFrames(2, 1, Vector<int>(-2, 0), 2);
+ maximAttackAnimation.AddFrame(2, 1, Vector<int>(-8, 0));
+ maximAttackAnimation.AddFrames(2, 2, Vector<int>(-8, 0), 2);
+ maximAttackAnimation.AddFrame(2, 2, Vector<int>(-4, 0));
+ maxim.SetAttackAnimation(&maximAttackAnimation);
+ ComplexAnimation maximSpellAnimation(&maximSprite, 150);
+ maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 2);
+ maximSpellAnimation.AddFrame(3, 1);
+ maxim.SetSpellAnimation(&maximSpellAnimation);
SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
Sprite selanSprite(selanImg, 64, 64);
selan.SetMaxMana(23);
selan.SetMana(23);
selan.SetIP(1);
- selan.SetAttackFrames(3);
- selan.SetSpellFrames(4);
+ ComplexAnimation selanAttackAnimation(&selanSprite, 30);
+ 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, 30);
+ 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 *guyImg(IMG_Load("test-data/guy.png"));
Sprite guySprite(guyImg, 64, 64);
guy.SetMaxMana(0);
guy.SetMana(0);
guy.SetIP(254);
- guy.SetAttackFrames(3);
- guy.SetSpellFrames(0);
+ ComplexAnimation guyAttackAnimation(&guySprite, 30);
+ 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 *dekarImg(IMG_Load("test-data/dekar.png"));
Sprite dekarSprite(dekarImg, 64, 64);
dekar.SetMaxMana(0);
dekar.SetMana(0);
dekar.SetIP(255);
- dekar.SetAttackFrames(3);
- dekar.SetSpellFrames(3);
+ ComplexAnimation dekarAttackAnimation(&dekarSprite, 30);
+ 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, 30);
+ dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
+ dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
+ dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
+ dekar.SetSpellAnimation(&dekarSpellAnimation);
battle::Resources battleRes;