added timer facility

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 3e3da000c468c891b330bd98cb88308ae8f6d992..a59818a235e93e9ad1c40b4e991a69947b2f1758 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
                maxim.SetHealth(33);
                maxim.SetMaxMana(20);
                maxim.SetMana(20);
-               maxim.SetIP(140);
+               maxim.SetIP(0);
 
                SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
                Sprite selanSprite(selanImg, 64, 64);
@@ -107,7 +107,7 @@ int main(int argc, char **argv) {
                selan.SetHealth(28);
                selan.SetMaxMana(23);
                selan.SetMana(23);
-               selan.SetIP(204);
+               selan.SetIP(1);
 
                SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
                Sprite guySprite(guyImg, 64, 64);
@@ -119,7 +119,7 @@ int main(int argc, char **argv) {
                guy.SetHealth(38);
                guy.SetMaxMana(0);
                guy.SetMana(0);
-               guy.SetIP(216);
+               guy.SetIP(254);
 
                SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
                Sprite dekarSprite(dekarImg, 64, 64);
@@ -131,10 +131,13 @@ int main(int argc, char **argv) {
                dekar.SetHealth(38);
                dekar.SetMaxMana(0);
                dekar.SetMana(0);
-               dekar.SetIP(127);
+               dekar.SetIP(255);
 
                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;
@@ -331,6 +334,7 @@ int main(int argc, char **argv) {
                firestorm.SetName("Firestorm");
                firestorm.SetCost(224);
                firestorm.GetTargetingMode().TargetAllEnemies();
+               firestorm.SetPhysical();
                zircoSword.SetIkari(&firestorm);
                maxim.SetWeapon(&zircoSword);
                Item zirconArmor;
@@ -340,6 +344,7 @@ int main(int argc, char **argv) {
                magicCure.SetName("Magic cure");
                magicCure.SetCost(128);
                magicCure.GetTargetingMode().TargetSingleAlly();
+               magicCure.SetMagical();
                zirconArmor.SetIkari(&magicCure);
                maxim.SetArmor(&zirconArmor);
                Item holyShield;
@@ -349,6 +354,7 @@ int main(int argc, char **argv) {
                lightGuard.SetName("Light guard");
                lightGuard.SetCost(128);
                lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+               lightGuard.SetMagical();
                holyShield.SetIkari(&lightGuard);
                maxim.SetShield(&holyShield);
                Item legendHelm;
@@ -358,6 +364,7 @@ int main(int argc, char **argv) {
                boomerang.SetName("Boomerang");
                boomerang.SetCost(164);
                boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+               boomerang.SetMagical();
                legendHelm.SetIkari(&boomerang);
                maxim.SetHelmet(&legendHelm);
                Item sProRing;
@@ -367,6 +374,7 @@ int main(int argc, char **argv) {
                courage.SetName("Courage");
                courage.SetCost(64);
                courage.GetTargetingMode().TargetMultipleAllies();
+               courage.SetMagical();
                sProRing.SetIkari(&courage);
                maxim.SetRing(&sProRing);
                Item evilJewel;
@@ -376,6 +384,7 @@ int main(int argc, char **argv) {
                gloomy.SetName("Gloomy");
                gloomy.SetCost(164);
                gloomy.GetTargetingMode().TargetAllEnemies();
+               gloomy.SetMagical();
                evilJewel.SetIkari(&gloomy);
                maxim.SetJewel(&evilJewel);
 
@@ -386,6 +395,7 @@ int main(int argc, char **argv) {
                thundershriek.SetName("Thundershriek");
                thundershriek.SetCost(224);
                thundershriek.GetTargetingMode().TargetAllEnemies();
+               thundershriek.SetPhysical();
                zircoWhip.SetIkari(&thundershriek);
                selan.SetWeapon(&zircoWhip);
                Item zirconPlate;
@@ -395,6 +405,7 @@ int main(int argc, char **argv) {
                suddenCure.SetName("Sudden cure");
                suddenCure.SetCost(96);
                suddenCure.GetTargetingMode().TargetAllAllies();
+               suddenCure.SetMagical();
                zirconPlate.SetIkari(&suddenCure);
                selan.SetArmor(&zirconPlate);
                Item zircoGloves;
@@ -404,6 +415,7 @@ int main(int argc, char **argv) {
                forcefield.SetName("Forcefield");
                forcefield.SetCost(64);
                forcefield.GetTargetingMode().TargetAllAllies();
+               forcefield.SetMagical();
                zircoGloves.SetIkari(&forcefield);
                selan.SetShield(&zircoGloves);
                Item holyCap;
@@ -413,6 +425,7 @@ int main(int argc, char **argv) {
                vulnerable.SetName("Vulnerable");
                vulnerable.SetCost(196);
                vulnerable.GetTargetingMode().TargetAllEnemies();
+               vulnerable.SetPhysical();
                holyCap.SetIkari(&vulnerable);
                selan.SetHelmet(&holyCap);
                Item ghostRing;
@@ -422,6 +435,7 @@ int main(int argc, char **argv) {
                destroy.SetName("Destroy");
                destroy.SetCost(128);
                destroy.GetTargetingMode().TargetMultipleEnemies();
+               destroy.SetMagical();
                ghostRing.SetIkari(&destroy);
                selan.SetRing(&ghostRing);
                Item eagleRock;
@@ -431,6 +445,7 @@ int main(int argc, char **argv) {
                dive.SetName("Dive");
                dive.SetCost(128);
                dive.GetTargetingMode().TargetSingleEnemy();
+               dive.SetPhysical();
                eagleRock.SetIkari(&dive);
                selan.SetJewel(&eagleRock);
 
@@ -441,6 +456,7 @@ int main(int argc, char **argv) {
                torrent.SetName("Torrent");
                torrent.SetCost(224);
                torrent.GetTargetingMode().TargetAllEnemies();
+               torrent.SetPhysical();
                zircoAx.SetIkari(&torrent);
                guy.SetWeapon(&zircoAx);
                guy.SetArmor(&zirconArmor);
@@ -451,6 +467,7 @@ int main(int argc, char **argv) {
                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;
@@ -460,6 +477,7 @@ int main(int argc, char **argv) {
                slow.SetName("Slow");
                slow.SetCost(196);
                slow.GetTargetingMode().TargetAllEnemies();
+               slow.SetPhysical();
                zircoHelmet.SetIkari(&slow);
                guy.SetHelmet(&zircoHelmet);
                Item powerRing;
@@ -469,6 +487,7 @@ int main(int argc, char **argv) {
                trick.SetName("Trick");
                trick.SetCost(32);
                trick.GetTargetingMode().TargetAllEnemies();
+               trick.SetMagical();
                zircoHelmet.SetIkari(&trick);
                guy.SetRing(&powerRing);
                guy.SetJewel(&evilJewel);
@@ -481,6 +500,7 @@ int main(int argc, char **argv) {
                dragonRush.SetName("Dragon rush");
                dragonRush.SetCost(164);
                dragonRush.GetTargetingMode().TargetSingleEnemy();
+               dragonRush.SetPhysical();
                lizardBlow.SetIkari(&dragonRush);
                dekar.SetWeapon(&lizardBlow);
                Item holyRobe;
@@ -490,6 +510,7 @@ int main(int argc, char **argv) {
                crisisCure.SetName("Crisis cure");
                crisisCure.SetCost(164);
                crisisCure.GetTargetingMode().TargetAllAllies();
+               crisisCure.SetMagical();
                holyRobe.SetIkari(&crisisCure);
                dekar.SetArmor(&holyRobe);
                dekar.SetShield(&zircoGloves);
@@ -501,6 +522,7 @@ int main(int argc, char **argv) {
                fake.SetName("Fake");
                fake.SetCost(32);
                fake.GetTargetingMode().TargetSingleAlly();
+               fake.SetMagical();
                rocketRing.SetIkari(&fake);
                dekar.SetRing(&rocketRing);
                Item krakenRock;
@@ -510,6 +532,7 @@ int main(int argc, char **argv) {
                tenLegger.SetName("Ten-legger");
                tenLegger.SetCost(164);
                tenLegger.GetTargetingMode().TargetAllEnemies();
+               tenLegger.SetPhysical();
                rocketRing.SetIkari(&tenLegger);
                dekar.SetJewel(&krakenRock);