X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=7b47f858494ee04365987522d7d4409b1f56dc87;hb=cec6ebf5e666a15ffe27b0f09f9b268e2cfcdf9b;hp=a09f014c6a509ca588cd951efb7ce10ca8675907;hpb=428ae9a4a106e54f300e95544f78044b24b7e31a;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index a09f014..7b47f85 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +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"
@@ -33,6 +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;
@@ -74,6 +82,8 @@ int main(int argc, char **argv) {
 		Sprite dummySprite(monsterImg, 64, 64);
 		Monster monster;
 		monster.SetSprite(&dummySprite);
+		monster.SetMaxHealth(10);
+		monster.SetHealth(10);
 
 		SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
 		Sprite maximSprite(maximImg, 64, 64);
@@ -85,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);
@@ -97,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);
@@ -109,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);
@@ -121,13 +131,16 @@ int main(int argc, char **argv) {
 		dekar.SetHealth(38);
 		dekar.SetMaxMana(0);
 		dekar.SetMana(0);
-		dekar.SetIP(0);
+		dekar.SetIP(50);
 
 		battle::Resources battleRes;
 
 		SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
 		Sprite attackIconsSprite(attackIconsImg, 32, 32);
 		battleRes.attackIcons = &attackIconsSprite;
+		SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png"));
+		Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16);
+		battleRes.attackChoiceIcons = &attackChoiceIconsSprite;
 		SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
 		Sprite moveIconsSprite(moveIconsImg, 32, 32);
 		battleRes.moveIcons = &moveIconsSprite;
@@ -164,9 +177,9 @@ int main(int argc, char **argv) {
 		normalFont.MapRange('a', 'm', 0, 3);
 		normalFont.MapRange('n', 'z', 0, 4);
 		normalFont.MapChar(':', 10, 0);
-		normalFont.MapChar('!', 10, 0);
-		normalFont.MapChar('?', 10, 0);
-		// TODO: add '.' character
+		normalFont.MapChar('!', 11, 0);
+		normalFont.MapChar('?', 12, 0);
+		// TODO: add '.' and '-' characters
 		battleRes.normalFont = &normalFont;
 
 		SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
@@ -177,50 +190,267 @@ int main(int argc, char **argv) {
 		disabledFont.MapRange('a', 'm', 0, 3);
 		disabledFont.MapRange('n', 'z', 0, 4);
 		disabledFont.MapChar(':', 10, 0);
-		disabledFont.MapChar('!', 10, 0);
-		disabledFont.MapChar('?', 10, 0);
-		// TODO: add '.' character
+		disabledFont.MapChar('!', 11, 0);
+		disabledFont.MapChar('?', 12, 0);
+		// TODO: add '.' and '-' characters
 		battleRes.disabledFont = &disabledFont;
 
 		SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));
 		Sprite handCursorSprite(handCursorImg, 32, 32);
 		battleRes.menuCursor = &handCursorSprite;
 
+		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 = &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</* Spell */ void *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 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<const Spell *>(&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);
+		Sprite ballIcon(itemIcons, 16, 16, 0, 16);
+		Sprite crankIcon(itemIcons, 16, 16, 0, 32);
+		Sprite spearIcon(itemIcons, 16, 16, 0, 48);
+		Sprite swordIcon(itemIcons, 16, 16, 0, 64);
+		Sprite axIcon(itemIcons, 16, 16, 0, 80);
+		Sprite rodIcon(itemIcons, 16, 16, 0, 96);
+		Sprite armorIcon(itemIcons, 16, 16, 0, 112);
+		Sprite shieldIcon(itemIcons, 16, 16, 0, 128);
+		Sprite helmetIcon(itemIcons, 16, 16, 0, 144);
+		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");
+		antidote.SetMenuIcon(&potionIcon);
+		antidote.SetUsableInBattle();
+		antidote.GetTargetingMode().TargetSingleAlly();
+		inventory.Add(&antidote, 9);
+		Item magicJar;
+		magicJar.SetName("Magic jar");
+		magicJar.SetMenuIcon(&potionIcon);
+		magicJar.SetUsableInBattle();
+		magicJar.GetTargetingMode().TargetSingleAlly();
+		inventory.Add(&magicJar, 4);
+		Item hiPotion;
+		hiPotion.SetName("Hi-Potion");
+		hiPotion.SetMenuIcon(&potionIcon);
+		hiPotion.SetUsableInBattle();
+		hiPotion.GetTargetingMode().TargetSingleAlly();
+		inventory.Add(&hiPotion, 4);
+		Item powerPotion;
+		powerPotion.SetName("Power potion");
+		powerPotion.SetMenuIcon(&potionIcon);
+		inventory.Add(&powerPotion, 4);
+		Item escape;
+		escape.SetName("Escape");
+		inventory.Add(&escape, 2);
+		Item sleepBall;
+		sleepBall.SetName("Sleep ball");
+		sleepBall.SetMenuIcon(&ballIcon);
+		sleepBall.SetUsableInBattle();
+		sleepBall.GetTargetingMode().TargetSingleEnemy();
+		inventory.Add(&sleepBall, 1);
+		Item multiBall;
+		multiBall.SetName("Multi-ball!");
+		multiBall.SetMenuIcon(&ballIcon);
+		multiBall.SetUsableInBattle();
+		multiBall.GetTargetingMode().TargetMultipleEnemies();
+		inventory.Add(&multiBall, 1);
+		Item figgoru;
+		figgoru.SetName("Figgoru");
+		figgoru.SetMenuIcon(&crankIcon);
+		figgoru.GetTargetingMode().TargetAllEnemies();
+		inventory.Add(&figgoru, 1);
+		battleRes.inventory = &inventory;
 
 		battleRes.itemMenuHeadline = "Please choose an item.";
-		battleRes.itemMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 1, 32);
-		battleRes.itemMenuPrototype.Add("Antidote    : 9", 0);
-		battleRes.itemMenuPrototype.Add("Magic jar   : 4", 0);
-		battleRes.itemMenuPrototype.Add("Miracle     : 4", 0);
-		battleRes.itemMenuPrototype.Add("Hi-Potion   : 6", 0);
-		battleRes.itemMenuPrototype.Add("Hi-Magic    : 7", 0);
-		battleRes.itemMenuPrototype.Add("Regain      : 4", 0);
-		battleRes.itemMenuPrototype.Add("Power potion: 4", 0, false);
-		battleRes.itemMenuPrototype.Add("Life potion : 1", 0, false);
-		battleRes.itemMenuPrototype.Add("Escape      : 2", 0, false);
-		battleRes.itemMenuPrototype.Add("Power gourd : 3", 0);
-		battleRes.itemMenuPrototype.Add("Mystery pin : 2", 0);
+		battleRes.itemMenuPrototype = Menu<const common::Item *>(&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<const Item *>(&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);
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);