X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=7b47f858494ee04365987522d7d4409b1f56dc87;hb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;hp=20579d817c0f8e1c871d7bf48765374225110ad3;hpb=d955815b31c8c1b0beba87c2d9eb3b6ae1bebe93;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 20579d8..7b47f85 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,8 +12,10 @@ #include "battle/Monster.h" #include "battle/PartyLayout.h" #include "battle/Resources.h" +#include "common/Ikari.h" #include "common/Inventory.h" #include "common/Item.h" +#include "common/Spell.h" #include "geometry/Point.h" #include "graphics/Font.h" #include "graphics/Frame.h" @@ -35,8 +37,10 @@ using battle::BattleState; using battle::Hero; using battle::Monster; using battle::PartyLayout; +using common::Ikari; using common::Inventory; using common::Item; +using common::Spell; using geometry::Point; using graphics::Font; using graphics::Frame; @@ -91,7 +95,7 @@ int main(int argc, char **argv) { maxim.SetHealth(33); maxim.SetMaxMana(20); maxim.SetMana(20); - maxim.SetIP(0); + maxim.SetIP(100); SDL_Surface *selanImg(IMG_Load("test-data/selan.png")); Sprite selanSprite(selanImg, 64, 64); @@ -103,7 +107,7 @@ int main(int argc, char **argv) { selan.SetHealth(28); selan.SetMaxMana(23); selan.SetMana(23); - selan.SetIP(0); + selan.SetIP(80); SDL_Surface *guyImg(IMG_Load("test-data/guy.png")); Sprite guySprite(guyImg, 64, 64); @@ -115,7 +119,7 @@ int main(int argc, char **argv) { guy.SetHealth(38); guy.SetMaxMana(0); guy.SetMana(0); - guy.SetIP(0); + guy.SetIP(85); SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png")); Sprite dekarSprite(dekarImg, 64, 64); @@ -127,7 +131,7 @@ int main(int argc, char **argv) { dekar.SetHealth(38); dekar.SetMaxMana(0); dekar.SetMana(0); - dekar.SetIP(0); + dekar.SetIP(50); battle::Resources battleRes; @@ -197,34 +201,59 @@ int main(int argc, char **argv) { SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png")); Sprite weaponTargetCursor(targetingIconsImg, 32, 32); + 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 = &weaponTargetCursor; + battleRes.magicTargetCursor = &magicTargetCursor; // TODO: add image for item targeting cursor battleRes.itemTargetCursor = &itemTargetCursor; + Spell resetSpell; + resetSpell.SetName("Reset"); + maxim.AddSpell(&resetSpell); + Spell strongSpell; + strongSpell.SetName("Strong"); + strongSpell.SetCost(3); + strongSpell.SetUsableInBattle(); + strongSpell.GetTargetingMode().TargetMultipleAllies(); + maxim.AddSpell(&strongSpell); + selan.AddSpell(&strongSpell); + Spell strongerSpell; + strongerSpell.SetName("Stronger"); + strongerSpell.SetCost(8); + strongerSpell.SetUsableInBattle(); + strongerSpell.GetTargetingMode().TargetMultipleAllies(); + maxim.AddSpell(&strongerSpell); + selan.AddSpell(&strongerSpell); + Spell championSpell; + championSpell.SetName("Champion"); + championSpell.SetCost(16); + championSpell.SetUsableInBattle(); + championSpell.GetTargetingMode().TargetMultipleAllies(); + maxim.AddSpell(&championSpell); + selan.AddSpell(&championSpell); + Spell rallySpell; + rallySpell.SetName("Rally"); + rallySpell.SetCost(10); + rallySpell.SetUsableInBattle(); + rallySpell.GetTargetingMode().TargetMultipleAllies(); + maxim.AddSpell(&rallySpell); + selan.AddSpell(&rallySpell); + Spell escapeSpell; + escapeSpell.SetName("Escape"); + escapeSpell.SetCost(8); + selan.AddSpell(&escapeSpell); + Spell valorSpell; + valorSpell.SetName("Valor"); + valorSpell.SetCost(30); + valorSpell.SetUsableInBattle(); + valorSpell.GetTargetingMode().TargetMultipleAllies(); + maxim.AddSpell(&valorSpell); + selan.AddSpell(&valorSpell); + battleRes.spellMenuHeadline = "Please choose a spell."; - battleRes.spellMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 0, 2, 32); - battleRes.spellMenuPrototype.Add("Reset : 0", 0, false); - battleRes.spellMenuPrototype.Add("Strong : 3", 0); - battleRes.spellMenuPrototype.Add("Stronger : 8", 0); - battleRes.spellMenuPrototype.Add("Champion :16", 0); - battleRes.spellMenuPrototype.Add("Rally :10", 0); - battleRes.spellMenuPrototype.Add("Escape : 8", 0, false); - battleRes.spellMenuPrototype.Add("Valor :30", 0); - battleRes.spellMenuPrototype.Add("Poison : 2", 0); - battleRes.spellMenuPrototype.Add("Warp : 8", 0, false); - battleRes.spellMenuPrototype.Add("Release : 2", 0); - battleRes.spellMenuPrototype.Add("Waken : 4", 0); - battleRes.spellMenuPrototype.Add("Light : 0", 0, false); - battleRes.spellMenuPrototype.Add("Fake : 4", 0); - battleRes.spellMenuPrototype.Add("Trick : 5", 0); - battleRes.spellMenuPrototype.Add("Flash : 5", 0); - battleRes.spellMenuPrototype.Add("Fireball : 6", 0); - battleRes.spellMenuPrototype.Add("Vortex : 7", 0); - battleRes.spellMenuPrototype.Add("Blizzard : 8", 0); - battleRes.spellMenuPrototype.Add("Spark : 3", 0); + battleRes.spellMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 9, 6, 8, 0, 2, 32, 2, ':'); SDL_Surface *itemIcons(IMG_Load("test-data/item-icons.png")); Sprite potionIcon(itemIcons, 16, 16); @@ -238,26 +267,33 @@ int main(int argc, char **argv) { Sprite shieldIcon(itemIcons, 16, 16, 0, 128); Sprite helmetIcon(itemIcons, 16, 16, 0, 144); Sprite ringIcon(itemIcons, 16, 16, 0, 160); - Sprite stoneIcon(itemIcons, 16, 16, 0, 176); + Sprite jewelIcon(itemIcons, 16, 16, 0, 176); + + battleRes.weaponMenuIcon = &swordIcon; + battleRes.armorMenuIcon = &armorIcon; + battleRes.shieldMenuIcon = &shieldIcon; + battleRes.helmetMenuIcon = &helmetIcon; + battleRes.ringMenuIcon = &ringIcon; + battleRes.jewelMenuIcon = &jewelIcon; Inventory inventory; Item antidote; antidote.SetName("Antidote"); antidote.SetMenuIcon(&potionIcon); antidote.SetUsableInBattle(); - antidote.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE); + antidote.GetTargetingMode().TargetSingleAlly(); inventory.Add(&antidote, 9); Item magicJar; magicJar.SetName("Magic jar"); magicJar.SetMenuIcon(&potionIcon); magicJar.SetUsableInBattle(); - magicJar.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE); + magicJar.GetTargetingMode().TargetSingleAlly(); inventory.Add(&magicJar, 4); Item hiPotion; hiPotion.SetName("Hi-Potion"); hiPotion.SetMenuIcon(&potionIcon); hiPotion.SetUsableInBattle(); - hiPotion.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE); + hiPotion.GetTargetingMode().TargetSingleAlly(); inventory.Add(&hiPotion, 4); Item powerPotion; powerPotion.SetName("Power potion"); @@ -270,32 +306,151 @@ int main(int argc, char **argv) { sleepBall.SetName("Sleep ball"); sleepBall.SetMenuIcon(&ballIcon); sleepBall.SetUsableInBattle(); - sleepBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ONE); + sleepBall.GetTargetingMode().TargetSingleEnemy(); inventory.Add(&sleepBall, 1); Item multiBall; multiBall.SetName("Multi-ball!"); multiBall.SetMenuIcon(&ballIcon); multiBall.SetUsableInBattle(); - multiBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_MULTIPLE); + multiBall.GetTargetingMode().TargetMultipleEnemies(); inventory.Add(&multiBall, 1); Item figgoru; figgoru.SetName("Figgoru"); figgoru.SetMenuIcon(&crankIcon); - figgoru.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ALL); + figgoru.GetTargetingMode().TargetAllEnemies(); inventory.Add(&figgoru, 1); battleRes.inventory = &inventory; battleRes.itemMenuHeadline = "Please choose an item."; battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':'); + Item zircoSword; + zircoSword.SetName("Zirco sword"); + zircoSword.SetMenuIcon(&swordIcon); + Ikari firestorm; + firestorm.SetName("Firestorm"); + firestorm.SetCost(88); + firestorm.GetTargetingMode().TargetAllEnemies(); + zircoSword.SetIkari(&firestorm); + maxim.SetWeapon(&zircoSword); + Item zirconArmor; + zirconArmor.SetName("Zircon armor"); + zirconArmor.SetMenuIcon(&armorIcon); + Ikari magicCure; + magicCure.SetName("Magic cure"); + magicCure.SetCost(51); + magicCure.GetTargetingMode().TargetSingleAlly(); + zirconArmor.SetIkari(&magicCure); + maxim.SetArmor(&zirconArmor); + Item holyShield; + holyShield.SetName("Holy shield"); + holyShield.SetMenuIcon(&shieldIcon); + Ikari lightGuard; + lightGuard.SetName("Light guard"); + lightGuard.SetCost(51); + lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + holyShield.SetIkari(&lightGuard); + maxim.SetShield(&holyShield); + Item legendHelm; + legendHelm.SetName("Legend helm"); + legendHelm.SetMenuIcon(&helmetIcon); + Ikari boomerang; + boomerang.SetName("Boomerang"); + boomerang.SetCost(65); + boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + legendHelm.SetIkari(&boomerang); + maxim.SetHelmet(&legendHelm); + Item sProRing; + sProRing.SetName("S-pro ring"); + sProRing.SetMenuIcon(&ringIcon); + Ikari courage; + courage.SetName("Courage"); + courage.SetCost(26); + courage.GetTargetingMode().TargetMultipleAllies(); + sProRing.SetIkari(&courage); + maxim.SetRing(&sProRing); + Item evilJewel; + evilJewel.SetName("Evil jewel"); + evilJewel.SetMenuIcon(&jewelIcon); + Ikari gloomy; + gloomy.SetName("Gloomy"); + gloomy.SetCost(65); + gloomy.GetTargetingMode().TargetAllEnemies(); + evilJewel.SetIkari(&gloomy); + maxim.SetJewel(&evilJewel); + + Item zircoWhip; + zircoWhip.SetName("Zirco whip"); + zircoWhip.SetMenuIcon(&rodIcon); + selan.SetWeapon(&zircoWhip); + Item zirconPlate; + zirconPlate.SetName("Zircon plate"); + zirconPlate.SetMenuIcon(&armorIcon); + selan.SetArmor(&zirconPlate); + Item zircoGloves; + zircoGloves.SetName("Zirco gloves"); + zircoGloves.SetMenuIcon(&shieldIcon); + selan.SetShield(&zircoGloves); + Item holyCap; + holyCap.SetName("Holy cap"); + holyCap.SetMenuIcon(&helmetIcon); + selan.SetHelmet(&holyCap); + Item ghostRing; + ghostRing.SetName("Ghost ring"); + ghostRing.SetMenuIcon(&ringIcon); + selan.SetRing(&ghostRing); + Item eagleRock; + eagleRock.SetName("Eagle rock"); + eagleRock.SetMenuIcon(&jewelIcon); + selan.SetJewel(&eagleRock); + + Item zircoAx; + zircoAx.SetName("Zirco ax"); + zircoAx.SetMenuIcon(&axIcon); + guy.SetWeapon(&zircoAx); + guy.SetArmor(&zirconArmor); + Item megaShield; + megaShield.SetName("Mega shield"); + megaShield.SetMenuIcon(&shieldIcon); + guy.SetShield(&megaShield); + Item zircoHelmet; + zircoHelmet.SetName("Zirco helmet"); + zircoHelmet.SetMenuIcon(&helmetIcon); + guy.SetHelmet(&zircoHelmet); + Item powerRing; + powerRing.SetName("Power ring"); + powerRing.SetMenuIcon(&ringIcon); + guy.SetRing(&powerRing); + guy.SetJewel(&evilJewel); + + // NOTE: this is actually Artea equipment + Item lizardBlow; + lizardBlow.SetName("Lizard blow"); + lizardBlow.SetMenuIcon(&swordIcon); + dekar.SetWeapon(&lizardBlow); + Item holyRobe; + holyRobe.SetName("Holy robe"); + holyRobe.SetMenuIcon(&armorIcon); + dekar.SetArmor(&holyRobe); + dekar.SetShield(&zircoGloves); + dekar.SetHelmet(&holyCap); + Item rocketRing; + rocketRing.SetName("Rocket ring"); + rocketRing.SetMenuIcon(&ringIcon); + dekar.SetRing(&rocketRing); + Item krakenRock; + krakenRock.SetName("Kraken rock"); + krakenRock.SetMenuIcon(&jewelIcon); + dekar.SetJewel(&krakenRock); + battleRes.ikariMenuHeadline = "Please choose equipment."; - battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32); + battleRes.ikariMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32); battleRes.ikariMenuPrototype.Add("Zirco whip Thundershriek", 0, false, &swordIcon); battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon); battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon); battleRes.ikariMenuPrototype.Add("Holy cap Vulnerable", 0, false, &helmetIcon); battleRes.ikariMenuPrototype.Add("Ghost ring Destroy", 0, true, &ringIcon); - battleRes.ikariMenuPrototype.Add("Eagle rock Dive", 0, true, &stoneIcon); + battleRes.ikariMenuPrototype.Add("Eagle rock Dive", 0, true, &jewelIcon); BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes)); battleState->AddMonster(monster);