added physical/magical status of ikari attacks

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 960f1c5d78a995239acc353d3ed9b8bad144b6fd..a2672503090bbc3d5cb8d889745bbdec29236bf2 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(55);
+               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(80);
+               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(85);
+               guy.SetIP(254);
 
                SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
                Sprite dekarSprite(dekarImg, 64, 64);
@@ -131,7 +131,7 @@ int main(int argc, char **argv) {
                dekar.SetHealth(38);
                dekar.SetMaxMana(0);
                dekar.SetMana(0);
-               dekar.SetIP(50);
+               dekar.SetIP(255);
 
                battle::Resources battleRes;
 
@@ -329,8 +329,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 +339,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 +349,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 +359,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 +369,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,8 +379,9 @@ 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);
 
@@ -384,8 +390,9 @@ int main(int argc, char **argv) {
                zircoWhip.SetMenuIcon(&rodIcon);
                Ikari thundershriek;
                thundershriek.SetName("Thundershriek");
-               thundershriek.SetCost(88);
+               thundershriek.SetCost(224);
                thundershriek.GetTargetingMode().TargetAllEnemies();
+               thundershriek.SetPhysical();
                zircoWhip.SetIkari(&thundershriek);
                selan.SetWeapon(&zircoWhip);
                Item zirconPlate;
@@ -393,8 +400,9 @@ int main(int argc, char **argv) {
                zirconPlate.SetMenuIcon(&armorIcon);
                Ikari suddenCure;
                suddenCure.SetName("Sudden cure");
-               suddenCure.SetCost(38);
+               suddenCure.SetCost(96);
                suddenCure.GetTargetingMode().TargetAllAllies();
+               suddenCure.SetMagical();
                zirconPlate.SetIkari(&suddenCure);
                selan.SetArmor(&zirconPlate);
                Item zircoGloves;
@@ -402,8 +410,9 @@ int main(int argc, char **argv) {
                zircoGloves.SetMenuIcon(&shieldIcon);
                Ikari forcefield;
                forcefield.SetName("Forcefield");
-               forcefield.SetCost(26);
+               forcefield.SetCost(64);
                forcefield.GetTargetingMode().TargetAllAllies();
+               forcefield.SetMagical();
                zircoGloves.SetIkari(&forcefield);
                selan.SetShield(&zircoGloves);
                Item holyCap;
@@ -411,8 +420,9 @@ int main(int argc, char **argv) {
                holyCap.SetMenuIcon(&helmetIcon);
                Ikari vulnerable;
                vulnerable.SetName("Vulnerable");
-               vulnerable.SetCost(77);
+               vulnerable.SetCost(196);
                vulnerable.GetTargetingMode().TargetAllEnemies();
+               vulnerable.SetPhysical();
                holyCap.SetIkari(&vulnerable);
                selan.SetHelmet(&holyCap);
                Item ghostRing;
@@ -420,8 +430,9 @@ int main(int argc, char **argv) {
                ghostRing.SetMenuIcon(&ringIcon);
                Ikari destroy;
                destroy.SetName("Destroy");
-               destroy.SetCost(77);
+               destroy.SetCost(128);
                destroy.GetTargetingMode().TargetMultipleEnemies();
+               destroy.SetMagical();
                ghostRing.SetIkari(&destroy);
                selan.SetRing(&ghostRing);
                Item eagleRock;
@@ -429,8 +440,9 @@ int main(int argc, char **argv) {
                eagleRock.SetMenuIcon(&jewelIcon);
                Ikari dive;
                dive.SetName("Dive");
-               dive.SetCost(50);
+               dive.SetCost(128);
                dive.GetTargetingMode().TargetSingleEnemy();
+               dive.SetPhysical();
                eagleRock.SetIkari(&dive);
                selan.SetJewel(&eagleRock);
 
@@ -439,8 +451,9 @@ int main(int argc, char **argv) {
                zircoAx.SetMenuIcon(&axIcon);
                Ikari torrent;
                torrent.SetName("Torrent");
-               torrent.SetCost(88);
+               torrent.SetCost(224);
                torrent.GetTargetingMode().TargetAllEnemies();
+               torrent.SetPhysical();
                zircoAx.SetIkari(&torrent);
                guy.SetWeapon(&zircoAx);
                guy.SetArmor(&zirconArmor);
@@ -449,8 +462,9 @@ int main(int argc, char **argv) {
                megaShield.SetMenuIcon(&shieldIcon);
                Ikari ironBarrier;
                ironBarrier.SetName("Iron barrier");
-               ironBarrier.SetCost(100);
+               ironBarrier.SetCost(255);
                ironBarrier.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+               ironBarrier.SetMagical();
                megaShield.SetIkari(&ironBarrier);
                guy.SetShield(&megaShield);
                Item zircoHelmet;
@@ -458,8 +472,9 @@ int main(int argc, char **argv) {
                zircoHelmet.SetMenuIcon(&helmetIcon);
                Ikari slow;
                slow.SetName("Slow");
-               slow.SetCost(77);
+               slow.SetCost(196);
                slow.GetTargetingMode().TargetAllEnemies();
+               slow.SetPhysical();
                zircoHelmet.SetIkari(&slow);
                guy.SetHelmet(&zircoHelmet);
                Item powerRing;
@@ -467,8 +482,9 @@ int main(int argc, char **argv) {
                powerRing.SetMenuIcon(&ringIcon);
                Ikari trick;
                trick.SetName("Trick");
-               trick.SetCost(13);
+               trick.SetCost(32);
                trick.GetTargetingMode().TargetAllEnemies();
+               trick.SetMagical();
                zircoHelmet.SetIkari(&trick);
                guy.SetRing(&powerRing);
                guy.SetJewel(&evilJewel);
@@ -479,8 +495,9 @@ int main(int argc, char **argv) {
                lizardBlow.SetMenuIcon(&swordIcon);
                Ikari dragonRush;
                dragonRush.SetName("Dragon rush");
-               dragonRush.SetCost(65);
+               dragonRush.SetCost(164);
                dragonRush.GetTargetingMode().TargetSingleEnemy();
+               dragonRush.SetPhysical();
                lizardBlow.SetIkari(&dragonRush);
                dekar.SetWeapon(&lizardBlow);
                Item holyRobe;
@@ -488,8 +505,9 @@ int main(int argc, char **argv) {
                holyRobe.SetMenuIcon(&armorIcon);
                Ikari crisisCure;
                crisisCure.SetName("Crisis cure");
-               crisisCure.SetCost(65);
+               crisisCure.SetCost(164);
                crisisCure.GetTargetingMode().TargetAllAllies();
+               crisisCure.SetMagical();
                holyRobe.SetIkari(&crisisCure);
                dekar.SetArmor(&holyRobe);
                dekar.SetShield(&zircoGloves);
@@ -499,8 +517,9 @@ int main(int argc, char **argv) {
                rocketRing.SetMenuIcon(&ringIcon);
                Ikari fake;
                fake.SetName("Fake");
-               fake.SetCost(13);
+               fake.SetCost(32);
                fake.GetTargetingMode().TargetSingleAlly();
+               fake.SetMagical();
                rocketRing.SetIkari(&fake);
                dekar.SetRing(&rocketRing);
                Item krakenRock;
@@ -508,8 +527,9 @@ int main(int argc, char **argv) {
                krakenRock.SetMenuIcon(&jewelIcon);
                Ikari tenLegger;
                tenLegger.SetName("Ten-legger");
-               tenLegger.SetCost(65);
+               tenLegger.SetCost(164);
                tenLegger.GetTargetingMode().TargetAllEnemies();
+               tenLegger.SetPhysical();
                rocketRing.SetIkari(&tenLegger);
                dekar.SetJewel(&krakenRock);