X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=aff39b5fee7c6145b17eb51809d7c841803a2c9d;hb=854e5229c3f30bf88aa08d7f0aff56a1411c3367;hp=3e223491aeb4a280f1f4874851a64573fd445188;hpb=4170813213bafe6f4a01a79bf42308ddb7f3c545;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 3e22349..aff39b5 100644 --- 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; @@ -73,14 +77,15 @@ int main(int argc, char **argv) { monstersLayout.AddPosition(Point(168, 104)); monstersLayout.AddPosition(Point(208, 104)); PartyLayout heroesLayout; - heroesLayout.AddPosition(Point(27, 219)); - heroesLayout.AddPosition(Point(104, 227)); - heroesLayout.AddPosition(Point(66, 238)); - heroesLayout.AddPosition(Point(143, 246)); + heroesLayout.AddPosition(Point(48, 152)); + heroesLayout.AddPosition(Point(128, 152)); + heroesLayout.AddPosition(Point(80, 168)); + heroesLayout.AddPosition(Point(160, 168)); SDL_Surface *monsterImg(IMG_Load("test-data/monster.png")); Sprite dummySprite(monsterImg, 64, 64); Monster monster; + monster.SetName("Monster"); monster.SetSprite(&dummySprite); monster.SetMaxHealth(10); monster.SetHealth(10); @@ -95,7 +100,20 @@ int main(int argc, char **argv) { maxim.SetHealth(33); maxim.SetMaxMana(20); maxim.SetMana(20); - maxim.SetIP(55); + maxim.SetIP(0); + ComplexAnimation maximAttackAnimation(&maximSprite, 30); + maximAttackAnimation.AddFrames(2, 0, Vector(), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(4, 0), 2); + maximAttackAnimation.AddFrame(2, 1, Vector(4, 0)); + maximAttackAnimation.AddFrames(2, 1, Vector(-2, 0), 2); + maximAttackAnimation.AddFrame(2, 1, Vector(-8, 0)); + maximAttackAnimation.AddFrames(2, 2, Vector(-8, 0), 2); + maximAttackAnimation.AddFrame(2, 2, Vector(-4, 0)); + maxim.SetAttackAnimation(&maximAttackAnimation); + ComplexAnimation maximSpellAnimation(&maximSprite, 150); + maximSpellAnimation.AddFrames(3, 0, Vector(), 2); + maximSpellAnimation.AddFrame(3, 1); + maxim.SetSpellAnimation(&maximSpellAnimation); SDL_Surface *selanImg(IMG_Load("test-data/selan.png")); Sprite selanSprite(selanImg, 64, 64); @@ -107,7 +125,25 @@ int main(int argc, char **argv) { selan.SetHealth(28); selan.SetMaxMana(23); selan.SetMana(23); - selan.SetIP(80); + selan.SetIP(1); + ComplexAnimation selanAttackAnimation(&selanSprite, 30); + selanAttackAnimation.AddFrames(1, 0, Vector(4, 0), 2); + selanAttackAnimation.AddFrame(1, 0, Vector(8, 2)); + selanAttackAnimation.AddFrame(2, 0, Vector(10, 4)); + selanAttackAnimation.AddFrame(2, 0, Vector(14, 4)); + selanAttackAnimation.AddFrames(2, 0, Vector(12, 2), 3); + selanAttackAnimation.AddFrames(2, 1, Vector(14, 2), 2); + selanAttackAnimation.AddFrame(2, 1, Vector(2, 0)); + selanAttackAnimation.AddFrame(2, 2, Vector(-2, -4)); + selanAttackAnimation.AddFrame(2, 2, Vector(-8, -8)); + selanAttackAnimation.AddFrame(2, 2); + selan.SetAttackAnimation(&selanAttackAnimation); + ComplexAnimation selanSpellAnimation(&selanSprite, 30); + selanAttackAnimation.AddFrames(2, 0, Vector(), 3); + selanAttackAnimation.AddFrames(2, 1, Vector(), 2); + selanAttackAnimation.AddFrames(2, 2, Vector(), 3); + selanAttackAnimation.AddFrames(2, 3, Vector(), 2); + selan.SetSpellAnimation(&selanSpellAnimation); SDL_Surface *guyImg(IMG_Load("test-data/guy.png")); Sprite guySprite(guyImg, 64, 64); @@ -119,7 +155,19 @@ int main(int argc, char **argv) { guy.SetHealth(38); guy.SetMaxMana(0); guy.SetMana(0); - guy.SetIP(85); + guy.SetIP(254); + ComplexAnimation guyAttackAnimation(&guySprite, 30); + 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 *dekarImg(IMG_Load("test-data/dekar.png")); Sprite dekarSprite(dekarImg, 64, 64); @@ -131,10 +179,29 @@ int main(int argc, char **argv) { dekar.SetHealth(38); dekar.SetMaxMana(0); dekar.SetMana(0); - dekar.SetIP(50); + dekar.SetIP(255); + ComplexAnimation dekarAttackAnimation(&dekarSprite, 30); + 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, 30); + dekarSpellAnimation.AddFrames(2, 0, Vector(), 6); + dekarSpellAnimation.AddFrames(2, 1, Vector(), 2); + dekarSpellAnimation.AddFrames(2, 2, Vector(), 3); + dekar.SetSpellAnimation(&dekarSpellAnimation); 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 +211,45 @@ 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; + 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 +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")); @@ -329,8 +407,9 @@ int main(int argc, char **argv) { zircoSword.SetMenuIcon(&swordIcon); Ikari firestorm; firestorm.SetName("Firestorm"); - firestorm.SetCost(88); + firestorm.SetCost(224); firestorm.GetTargetingMode().TargetAllEnemies(); + firestorm.SetPhysical(); zircoSword.SetIkari(&firestorm); maxim.SetWeapon(&zircoSword); Item zirconArmor; @@ -338,8 +417,9 @@ int main(int argc, char **argv) { 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 +427,9 @@ int main(int argc, char **argv) { holyShield.SetMenuIcon(&shieldIcon); Ikari lightGuard; lightGuard.SetName("Light guard"); - lightGuard.SetCost(51); + lightGuard.SetCost(128); lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + lightGuard.SetMagical(); holyShield.SetIkari(&lightGuard); maxim.SetShield(&holyShield); Item legendHelm; @@ -356,8 +437,9 @@ int main(int argc, char **argv) { legendHelm.SetMenuIcon(&helmetIcon); Ikari boomerang; boomerang.SetName("Boomerang"); - boomerang.SetCost(65); + boomerang.SetCost(164); boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + boomerang.SetMagical(); legendHelm.SetIkari(&boomerang); maxim.SetHelmet(&legendHelm); Item sProRing; @@ -365,8 +447,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 +457,113 @@ 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); + 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); + 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(); // FIXME: 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,26 +571,52 @@ int main(int argc, char **argv) { Item lizardBlow; lizardBlow.SetName("Lizard blow"); lizardBlow.SetMenuIcon(&swordIcon); + 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.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); battleState->AddMonster(monster);