added item target selection

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 7dbeba0548ba481c81640b550fc9d4baaed94eea..503c426512ee5aa565378177e2ac4a6a305e46ba 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,8 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
+#include "common/Inventory.h"
+#include "common/Item.h"
 #include "geometry/Point.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -33,6 +35,8 @@ using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Inventory;
+using common::Item;
 using geometry::Point;
 using graphics::Font;
 using graphics::Frame;
@@ -74,6 +78,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);
@@ -128,6 +134,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;
@@ -186,6 +195,15 @@ int main(int argc, char **argv) {
                Sprite handCursorSprite(handCursorImg, 32, 32);
                battleRes.menuCursor = &handCursorSprite;
 
+               SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png"));
+               Sprite weaponTargetCursor(targetingIconsImg, 32, 32);
+               Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
+               battleRes.weaponTargetCursor = &weaponTargetCursor;
+               // TODO: add image for magic targeting cursor
+               battleRes.magicTargetCursor = &weaponTargetCursor;
+               // TODO: add image for item targeting cursor
+               battleRes.itemTargetCursor = &itemTargetCursor;
+
                battleRes.spellMenuHeadline = "Please choose a spell.";
                battleRes.spellMenuPrototype = Menu</* Spell */ void *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 0, 2, 32);
                battleRes.spellMenuPrototype.Add("Reset    : 0", 0, false);
@@ -222,30 +240,53 @@ int main(int argc, char **argv) {
                Sprite ringIcon(itemIcons, 16, 16, 0, 160);
                Sprite stoneIcon(itemIcons, 16, 16, 0, 176);
 
+               Inventory inventory;
+               Item antidote;
+               antidote.SetName("Antidote");
+               antidote.SetMenuIcon(&potionIcon);
+               antidote.SetUsableInBattle();
+               antidote.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE);
+               inventory.Add(&antidote, 9);
+               Item magicJar;
+               magicJar.SetName("Magic jar");
+               magicJar.SetMenuIcon(&potionIcon);
+               magicJar.SetUsableInBattle();
+               magicJar.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE);
+               inventory.Add(&magicJar, 4);
+               Item hiPotion;
+               hiPotion.SetName("Hi-Potion");
+               hiPotion.SetMenuIcon(&potionIcon);
+               hiPotion.SetUsableInBattle();
+               hiPotion.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE);
+               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.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ONE);
+               inventory.Add(&sleepBall, 1);
+               Item multiBall;
+               multiBall.SetName("Multi-ball!");
+               multiBall.SetMenuIcon(&ballIcon);
+               multiBall.SetUsableInBattle();
+               multiBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_MULTIPLE);
+               inventory.Add(&multiBall, 1);
+               Item figgoru;
+               figgoru.SetName("Figgoru");
+               figgoru.SetMenuIcon(&crankIcon);
+               figgoru.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ALL);
+               inventory.Add(&figgoru, 1);
+               battleRes.inventory = &inventory;
+
                battleRes.itemMenuHeadline = "Please choose an item.";
-               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.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
 
                battleRes.ikariMenuHeadline = "Please choose equipment.";
                battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);