X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e25eb7eae9e2e7d9396abae7ba7fb95144f5518e;hb=8723daa89e877ac98e6012b0c37e3b4eb6131426;hp=4335ecaee98b1315a50928a8eca565c2ea7ae9e8;hpb=57675025108b7ad3989737f18ebfeec8e5e44889;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 4335eca..e25eb7e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -128,6 +128,9 @@ int main(int argc, char **argv) {
 		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;
@@ -166,7 +169,7 @@ int main(int argc, char **argv) {
 		normalFont.MapChar(':', 10, 0);
 		normalFont.MapChar('!', 10, 0);
 		normalFont.MapChar('?', 10, 0);
-		// TODO: add '.' character
+		// TODO: add '.' and '-' characters
 		battleRes.normalFont = &normalFont;
 
 		SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
@@ -179,7 +182,7 @@ int main(int argc, char **argv) {
 		disabledFont.MapChar(':', 10, 0);
 		disabledFont.MapChar('!', 10, 0);
 		disabledFont.MapChar('?', 10, 0);
-		// TODO: add '.' character
+		// TODO: add '.' and '-' characters
 		battleRes.disabledFont = &disabledFont;
 
 		SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));
@@ -187,10 +190,74 @@ int main(int argc, char **argv) {
 		battleRes.menuCursor = &handCursorSprite;
 
 		battleRes.spellMenuHeadline = "Please choose a spell.";
-		battleRes.spellMenuPrototype = Menu</* Spell */ void *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 2, 32);
+		battleRes.spellMenuPrototype = Menu</* Spell */ void *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 0, 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);
+
+		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 stoneIcon(itemIcons, 16, 16, 0, 176);
 
 		battleRes.itemMenuHeadline = "Please choose an item.";
-		battleRes.itemMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 1, 32);
+		battleRes.itemMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32);
+		battleRes.itemMenuPrototype.Add("Antidote    : 9", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Magic jar   : 4", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Miracle     : 4", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Hi-Potion   : 6", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Hi-Magic    : 7", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Regain      : 4", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Power potion: 4", 0, false, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Life potion : 1", 0, false, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Escape      : 2", 0, false);
+		battleRes.itemMenuPrototype.Add("Power gourd : 3", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Mystery pin : 2", 0, true, &potionIcon);
+		battleRes.itemMenuPrototype.Add("Sleep ball  : 1", 0, false, &ballIcon);
+		battleRes.itemMenuPrototype.Add("Figgoru     : 1", 0, false, &crankIcon);
+		battleRes.itemMenuPrototype.Add("Spear       : 1", 0, false, &spearIcon);
+		battleRes.itemMenuPrototype.Add("Silvo rapier: 1", 0, false, &swordIcon);
+		battleRes.itemMenuPrototype.Add("Rainy ax    : 1", 0, false, &axIcon);
+		battleRes.itemMenuPrototype.Add("Pounder rod : 2", 0, false, &rodIcon);
+		battleRes.itemMenuPrototype.Add("Silver mail : 2", 0, false, &armorIcon);
+		battleRes.itemMenuPrototype.Add("Slash shield: 2", 0, false, &shieldIcon);
+		battleRes.itemMenuPrototype.Add("Golden helm : 1", 0, false, &helmetIcon);
+		battleRes.itemMenuPrototype.Add("Protect ring: 1", 0, false, &ringIcon);
+		battleRes.itemMenuPrototype.Add("Mysto jewel : 1", 0, false, &stoneIcon);
+
+		battleRes.ikariMenuHeadline = "Please choose equipment.";
+		battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&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, &stoneIcon);
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);