added complex attack and spell animations

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index cb4ad91317aa4d311a6dba3fe133e7b62ee36ec1..aff39b5fee7c6145b17eb51809d7c841803a2c9d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,8 @@
 #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"
@@ -42,6 +44,8 @@ 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;
@@ -74,8 +78,8 @@ int main(int argc, char **argv) {
                monstersLayout.AddPosition(Point<Uint8>(208, 104));
                PartyLayout heroesLayout;
                heroesLayout.AddPosition(Point<Uint8>(48, 152));
-               heroesLayout.AddPosition(Point<Uint8>(80, 168));
                heroesLayout.AddPosition(Point<Uint8>(128, 152));
+               heroesLayout.AddPosition(Point<Uint8>(80, 168));
                heroesLayout.AddPosition(Point<Uint8>(160, 168));
 
                SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
@@ -97,6 +101,19 @@ int main(int argc, char **argv) {
                maxim.SetMaxMana(20);
                maxim.SetMana(20);
                maxim.SetIP(0);
+               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);
@@ -109,6 +126,24 @@ int main(int argc, char **argv) {
                selan.SetMaxMana(23);
                selan.SetMana(23);
                selan.SetIP(1);
+               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);
+               selanAttackAnimation.AddFrames(2, 0, Vector<int>(), 3);
+               selanAttackAnimation.AddFrames(2, 1, Vector<int>(), 2);
+               selanAttackAnimation.AddFrames(2, 2, Vector<int>(), 3);
+               selanAttackAnimation.AddFrames(2, 3, Vector<int>(), 2);
+               selan.SetSpellAnimation(&selanSpellAnimation);
 
                SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
                Sprite guySprite(guyImg, 64, 64);
@@ -121,6 +156,18 @@ int main(int argc, char **argv) {
                guy.SetMaxMana(0);
                guy.SetMana(0);
                guy.SetIP(254);
+               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);
@@ -133,6 +180,22 @@ int main(int argc, char **argv) {
                dekar.SetMaxMana(0);
                dekar.SetMana(0);
                dekar.SetIP(255);
+               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;
 
@@ -155,29 +218,38 @@ int main(int argc, char **argv) {
 
                SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png"));
                Sprite largeFontSprite(largeFontImg, 16, 32);
-               Font largeFont(&largeFontSprite);
-               largeFont.MapRange('A', 'M', 0, 1);
-               largeFont.MapRange('N', 'Z', 0, 2);
-               largeFont.MapRange('a', 'm', 0, 3);
-               largeFont.MapRange('n', 'z', 0, 4);
-               largeFont.MapChar(':', 10, 0);
-               largeFont.MapChar('!', 11, 0);
-               largeFont.MapChar('?', 12, 0);
-               // TODO: add '.' and '-' characters
+               Font largeFont(&largeFontSprite, 0, -2);
                battleRes.titleFont = &largeFont;
 
                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);
@@ -193,28 +265,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"));