From: Daniel Karbach Date: Fri, 10 Aug 2012 15:48:23 +0000 (+0200) Subject: damn, I was right about max IP in the first place X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;ds=sidebyside;h=46d0e57f7823eaf07208fd5e0bdbd1e88b035382;p=l2e.git damn, I was right about max IP in the first place --- diff --git a/src/battle/Hero.h b/src/battle/Hero.h index 60bca6d..499239d 100644 --- a/src/battle/Hero.h +++ b/src/battle/Hero.h @@ -41,7 +41,7 @@ public: int RelativeMana(int max) const { return MaxMana() == 0 ? 0 : Mana() * max / MaxMana(); } bool CanUseMagic() const { return MaxMana() > 0; } - Uint8 MaxIP() const { return 100; } + Uint8 MaxIP() const { return 255; } Uint8 IP() const { return ip; } int RelativeIP(int max) const { return IP() * max / MaxIP(); } diff --git a/src/main.cpp b/src/main.cpp index 960f1c5..3e3da00 100644 --- 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(140); 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(204); 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(216); 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(127); battle::Resources battleRes; @@ -329,7 +329,7 @@ int main(int argc, char **argv) { zircoSword.SetMenuIcon(&swordIcon); Ikari firestorm; firestorm.SetName("Firestorm"); - firestorm.SetCost(88); + firestorm.SetCost(224); firestorm.GetTargetingMode().TargetAllEnemies(); zircoSword.SetIkari(&firestorm); maxim.SetWeapon(&zircoSword); @@ -338,7 +338,7 @@ int main(int argc, char **argv) { zirconArmor.SetMenuIcon(&armorIcon); Ikari magicCure; magicCure.SetName("Magic cure"); - magicCure.SetCost(51); + magicCure.SetCost(128); magicCure.GetTargetingMode().TargetSingleAlly(); zirconArmor.SetIkari(&magicCure); maxim.SetArmor(&zirconArmor); @@ -347,7 +347,7 @@ 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 holyShield.SetIkari(&lightGuard); maxim.SetShield(&holyShield); @@ -356,7 +356,7 @@ 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 legendHelm.SetIkari(&boomerang); maxim.SetHelmet(&legendHelm); @@ -365,7 +365,7 @@ int main(int argc, char **argv) { sProRing.SetMenuIcon(&ringIcon); Ikari courage; courage.SetName("Courage"); - courage.SetCost(26); + courage.SetCost(64); courage.GetTargetingMode().TargetMultipleAllies(); sProRing.SetIkari(&courage); maxim.SetRing(&sProRing); @@ -374,7 +374,7 @@ int main(int argc, char **argv) { evilJewel.SetMenuIcon(&jewelIcon); Ikari gloomy; gloomy.SetName("Gloomy"); - gloomy.SetCost(65); + gloomy.SetCost(164); gloomy.GetTargetingMode().TargetAllEnemies(); evilJewel.SetIkari(&gloomy); maxim.SetJewel(&evilJewel); @@ -384,7 +384,7 @@ int main(int argc, char **argv) { zircoWhip.SetMenuIcon(&rodIcon); Ikari thundershriek; thundershriek.SetName("Thundershriek"); - thundershriek.SetCost(88); + thundershriek.SetCost(224); thundershriek.GetTargetingMode().TargetAllEnemies(); zircoWhip.SetIkari(&thundershriek); selan.SetWeapon(&zircoWhip); @@ -393,7 +393,7 @@ int main(int argc, char **argv) { zirconPlate.SetMenuIcon(&armorIcon); Ikari suddenCure; suddenCure.SetName("Sudden cure"); - suddenCure.SetCost(38); + suddenCure.SetCost(96); suddenCure.GetTargetingMode().TargetAllAllies(); zirconPlate.SetIkari(&suddenCure); selan.SetArmor(&zirconPlate); @@ -402,7 +402,7 @@ int main(int argc, char **argv) { zircoGloves.SetMenuIcon(&shieldIcon); Ikari forcefield; forcefield.SetName("Forcefield"); - forcefield.SetCost(26); + forcefield.SetCost(64); forcefield.GetTargetingMode().TargetAllAllies(); zircoGloves.SetIkari(&forcefield); selan.SetShield(&zircoGloves); @@ -411,7 +411,7 @@ int main(int argc, char **argv) { holyCap.SetMenuIcon(&helmetIcon); Ikari vulnerable; vulnerable.SetName("Vulnerable"); - vulnerable.SetCost(77); + vulnerable.SetCost(196); vulnerable.GetTargetingMode().TargetAllEnemies(); holyCap.SetIkari(&vulnerable); selan.SetHelmet(&holyCap); @@ -420,7 +420,7 @@ int main(int argc, char **argv) { ghostRing.SetMenuIcon(&ringIcon); Ikari destroy; destroy.SetName("Destroy"); - destroy.SetCost(77); + destroy.SetCost(128); destroy.GetTargetingMode().TargetMultipleEnemies(); ghostRing.SetIkari(&destroy); selan.SetRing(&ghostRing); @@ -429,7 +429,7 @@ int main(int argc, char **argv) { eagleRock.SetMenuIcon(&jewelIcon); Ikari dive; dive.SetName("Dive"); - dive.SetCost(50); + dive.SetCost(128); dive.GetTargetingMode().TargetSingleEnemy(); eagleRock.SetIkari(&dive); selan.SetJewel(&eagleRock); @@ -439,7 +439,7 @@ int main(int argc, char **argv) { zircoAx.SetMenuIcon(&axIcon); Ikari torrent; torrent.SetName("Torrent"); - torrent.SetCost(88); + torrent.SetCost(224); torrent.GetTargetingMode().TargetAllEnemies(); zircoAx.SetIkari(&torrent); guy.SetWeapon(&zircoAx); @@ -449,7 +449,7 @@ 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 megaShield.SetIkari(&ironBarrier); guy.SetShield(&megaShield); @@ -458,7 +458,7 @@ int main(int argc, char **argv) { zircoHelmet.SetMenuIcon(&helmetIcon); Ikari slow; slow.SetName("Slow"); - slow.SetCost(77); + slow.SetCost(196); slow.GetTargetingMode().TargetAllEnemies(); zircoHelmet.SetIkari(&slow); guy.SetHelmet(&zircoHelmet); @@ -467,7 +467,7 @@ int main(int argc, char **argv) { powerRing.SetMenuIcon(&ringIcon); Ikari trick; trick.SetName("Trick"); - trick.SetCost(13); + trick.SetCost(32); trick.GetTargetingMode().TargetAllEnemies(); zircoHelmet.SetIkari(&trick); guy.SetRing(&powerRing); @@ -479,7 +479,7 @@ int main(int argc, char **argv) { lizardBlow.SetMenuIcon(&swordIcon); Ikari dragonRush; dragonRush.SetName("Dragon rush"); - dragonRush.SetCost(65); + dragonRush.SetCost(164); dragonRush.GetTargetingMode().TargetSingleEnemy(); lizardBlow.SetIkari(&dragonRush); dekar.SetWeapon(&lizardBlow); @@ -488,7 +488,7 @@ int main(int argc, char **argv) { holyRobe.SetMenuIcon(&armorIcon); Ikari crisisCure; crisisCure.SetName("Crisis cure"); - crisisCure.SetCost(65); + crisisCure.SetCost(164); crisisCure.GetTargetingMode().TargetAllAllies(); holyRobe.SetIkari(&crisisCure); dekar.SetArmor(&holyRobe); @@ -499,7 +499,7 @@ int main(int argc, char **argv) { rocketRing.SetMenuIcon(&ringIcon); Ikari fake; fake.SetName("Fake"); - fake.SetCost(13); + fake.SetCost(32); fake.GetTargetingMode().TargetSingleAlly(); rocketRing.SetIkari(&fake); dekar.SetRing(&rocketRing); @@ -508,7 +508,7 @@ int main(int argc, char **argv) { krakenRock.SetMenuIcon(&jewelIcon); Ikari tenLegger; tenLegger.SetName("Ten-legger"); - tenLegger.SetCost(65); + tenLegger.SetCost(164); tenLegger.GetTargetingMode().TargetAllEnemies(); rocketRing.SetIkari(&tenLegger); dekar.SetJewel(&krakenRock);