X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=960f1c5d78a995239acc353d3ed9b8bad144b6fd;hb=24fe1e3e6064e42e70f07056ef3aebcbb451ddb0;hp=30074366d9c8dbb2fbda12479cd4390859b870b3;hpb=fa3de7178227b9cc7f11c92208b5904cee3ae4c4;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 3007436..960f1c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,6 +12,7 @@ #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" @@ -36,6 +37,7 @@ using battle::BattleState; using battle::Hero; using battle::Monster; using battle::PartyLayout; +using common::Ikari; using common::Inventory; using common::Item; using common::Spell; @@ -93,7 +95,7 @@ int main(int argc, char **argv) { maxim.SetHealth(33); maxim.SetMaxMana(20); maxim.SetMana(20); - maxim.SetIP(0); + maxim.SetIP(55); SDL_Surface *selanImg(IMG_Load("test-data/selan.png")); Sprite selanSprite(selanImg, 64, 64); @@ -105,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); @@ -117,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); @@ -129,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; @@ -267,6 +269,13 @@ int main(int argc, char **argv) { Sprite ringIcon(itemIcons, 16, 16, 0, 160); 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"); @@ -278,13 +287,13 @@ int main(int argc, char **argv) { magicJar.SetName("Magic jar"); magicJar.SetMenuIcon(&potionIcon); magicJar.SetUsableInBattle(); - antidote.GetTargetingMode().TargetSingleAlly(); + magicJar.GetTargetingMode().TargetSingleAlly(); inventory.Add(&magicJar, 4); Item hiPotion; hiPotion.SetName("Hi-Potion"); hiPotion.SetMenuIcon(&potionIcon); hiPotion.SetUsableInBattle(); - antidote.GetTargetingMode().TargetSingleAlly(); + hiPotion.GetTargetingMode().TargetSingleAlly(); inventory.Add(&hiPotion, 4); Item powerPotion; powerPotion.SetName("Power potion"); @@ -297,18 +306,18 @@ int main(int argc, char **argv) { sleepBall.SetName("Sleep ball"); sleepBall.SetMenuIcon(&ballIcon); sleepBall.SetUsableInBattle(); - antidote.GetTargetingMode().TargetSingleEnemy(); + sleepBall.GetTargetingMode().TargetSingleEnemy(); inventory.Add(&sleepBall, 1); Item multiBall; multiBall.SetName("Multi-ball!"); multiBall.SetMenuIcon(&ballIcon); multiBall.SetUsableInBattle(); - antidote.GetTargetingMode().TargetMultipleEnemies(); + multiBall.GetTargetingMode().TargetMultipleEnemies(); inventory.Add(&multiBall, 1); Item figgoru; figgoru.SetName("Figgoru"); figgoru.SetMenuIcon(&crankIcon); - antidote.GetTargetingMode().TargetAllEnemies(); + figgoru.GetTargetingMode().TargetAllEnemies(); inventory.Add(&figgoru, 1); battleRes.inventory = &inventory; @@ -318,69 +327,149 @@ int main(int argc, char **argv) { 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); + Ikari thundershriek; + thundershriek.SetName("Thundershriek"); + thundershriek.SetCost(88); + thundershriek.GetTargetingMode().TargetAllEnemies(); + zircoWhip.SetIkari(&thundershriek); selan.SetWeapon(&zircoWhip); Item zirconPlate; zirconPlate.SetName("Zircon plate"); zirconPlate.SetMenuIcon(&armorIcon); + Ikari suddenCure; + suddenCure.SetName("Sudden cure"); + suddenCure.SetCost(38); + suddenCure.GetTargetingMode().TargetAllAllies(); + zirconPlate.SetIkari(&suddenCure); selan.SetArmor(&zirconPlate); Item zircoGloves; zircoGloves.SetName("Zirco gloves"); zircoGloves.SetMenuIcon(&shieldIcon); + Ikari forcefield; + forcefield.SetName("Forcefield"); + forcefield.SetCost(26); + forcefield.GetTargetingMode().TargetAllAllies(); + zircoGloves.SetIkari(&forcefield); selan.SetShield(&zircoGloves); Item holyCap; holyCap.SetName("Holy cap"); holyCap.SetMenuIcon(&helmetIcon); + Ikari vulnerable; + vulnerable.SetName("Vulnerable"); + vulnerable.SetCost(77); + vulnerable.GetTargetingMode().TargetAllEnemies(); + holyCap.SetIkari(&vulnerable); selan.SetHelmet(&holyCap); Item ghostRing; ghostRing.SetName("Ghost ring"); ghostRing.SetMenuIcon(&ringIcon); + Ikari destroy; + destroy.SetName("Destroy"); + destroy.SetCost(77); + destroy.GetTargetingMode().TargetMultipleEnemies(); + ghostRing.SetIkari(&destroy); selan.SetRing(&ghostRing); Item eagleRock; eagleRock.SetName("Eagle rock"); eagleRock.SetMenuIcon(&jewelIcon); + Ikari dive; + dive.SetName("Dive"); + dive.SetCost(50); + dive.GetTargetingMode().TargetSingleEnemy(); + eagleRock.SetIkari(&dive); selan.SetJewel(&eagleRock); Item zircoAx; zircoAx.SetName("Zirco ax"); zircoAx.SetMenuIcon(&axIcon); + Ikari torrent; + torrent.SetName("Torrent"); + torrent.SetCost(88); + torrent.GetTargetingMode().TargetAllEnemies(); + 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(100); + ironBarrier.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self + megaShield.SetIkari(&ironBarrier); guy.SetShield(&megaShield); Item zircoHelmet; zircoHelmet.SetName("Zirco helmet"); zircoHelmet.SetMenuIcon(&helmetIcon); + Ikari slow; + slow.SetName("Slow"); + slow.SetCost(77); + slow.GetTargetingMode().TargetAllEnemies(); + zircoHelmet.SetIkari(&slow); guy.SetHelmet(&zircoHelmet); Item powerRing; powerRing.SetName("Power ring"); powerRing.SetMenuIcon(&ringIcon); + Ikari trick; + trick.SetName("Trick"); + trick.SetCost(13); + trick.GetTargetingMode().TargetAllEnemies(); + zircoHelmet.SetIkari(&trick); guy.SetRing(&powerRing); guy.SetJewel(&evilJewel); @@ -388,30 +477,45 @@ int main(int argc, char **argv) { Item lizardBlow; lizardBlow.SetName("Lizard blow"); lizardBlow.SetMenuIcon(&swordIcon); + Ikari dragonRush; + dragonRush.SetName("Dragon rush"); + dragonRush.SetCost(65); + dragonRush.GetTargetingMode().TargetSingleEnemy(); + lizardBlow.SetIkari(&dragonRush); dekar.SetWeapon(&lizardBlow); Item holyRobe; holyRobe.SetName("Holy robe"); holyRobe.SetMenuIcon(&armorIcon); + Ikari crisisCure; + crisisCure.SetName("Crisis cure"); + crisisCure.SetCost(65); + crisisCure.GetTargetingMode().TargetAllAllies(); + 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(13); + fake.GetTargetingMode().TargetSingleAlly(); + rocketRing.SetIkari(&fake); dekar.SetRing(&rocketRing); Item krakenRock; krakenRock.SetName("Kraken rock"); krakenRock.SetMenuIcon(&jewelIcon); + Ikari tenLegger; + tenLegger.SetName("Ten-legger"); + tenLegger.SetCost(65); + tenLegger.GetTargetingMode().TargetAllEnemies(); + rocketRing.SetIkari(&tenLegger); dekar.SetJewel(&krakenRock); battleRes.ikariMenuHeadline = "Please choose equipment."; - 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, &jewelIcon); + 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()); BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes)); battleState->AddMonster(monster);