X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=3c871cd862fc169fba7221ccc3515d80373ad7eb;hb=d872d756e64b8f1f57cba64ae19f479f8eab3927;hp=c8668dca1145f8c3da24bca4d50691be768b9c02;hpb=4e3c919944d011835702f5a63f65a7bb395d3eab;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index c8668dc..3c871cd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,10 +11,15 @@
 #include "battle/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
+#include "battle/Resources.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"
 #include "graphics/Gauge.h"
+#include "graphics/Menu.h"
 #include "graphics/Sprite.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
@@ -31,10 +36,14 @@ using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Inventory;
+using common::Item;
+using common::Spell;
 using geometry::Point;
 using graphics::Font;
 using graphics::Frame;
 using graphics::Gauge;
+using graphics::Menu;
 using graphics::Sprite;
 using sdl::InitImage;
 using sdl::InitScreen;
@@ -71,6 +80,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);
@@ -120,25 +131,206 @@ int main(int argc, char **argv) {
 		dekar.SetMana(0);
 		dekar.SetIP(0);
 
-		SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
-		Sprite attackIconsSprite(attackIcons, 32, 32);
-		SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
-		Sprite moveIconsSprite(moveIcons, 32, 32);
-		SDL_Surface *heroTagSprites(IMG_Load("test-data/hero-tag-sprites.png"));
-		Sprite heroTagSprite(heroTagSprites, 32, 16);
-		SDL_Surface *numbers(IMG_Load("test-data/numbers.png"));
-		Sprite numbersSprite(numbers, 16, 16);
+		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;
+		SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
+		Sprite heroTagSprite(heroTagImg, 32, 16);
+		battleRes.heroTagLabels = &heroTagSprite;
+		SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
+		Sprite numbersSprite(numbersImg, 16, 16);
 		Font heroTagFont(&numbersSprite);
-		SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
-		Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
-		Frame activeHeroTagFrame(tagFrames, 16, 16);
+		battleRes.heroTagFont = &heroTagFont;
+		SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png"));
+		Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33);
+		battleRes.heroTagFrame = &heroTagFrame;
+		Frame activeHeroTagFrame(tagFramesImg, 16, 16);
+		battleRes.activeHeroTagFrame = &activeHeroTagFrame;
 
 		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
 		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
+		battleRes.healthGauge = &healthGauge;
 		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
+		battleRes.manaGauge = &manaGauge;
 		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
+		battleRes.ikariGauge = &ikariGauge;
+
+		SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
+		Frame selectFrame(selectFrameImg, 16, 16);
+		battleRes.selectFrame = &selectFrame;
+
+		SDL_Surface *normalFontImg(IMG_Load("test-data/normal-font.png"));
+		Sprite normalFontSprite(normalFontImg, 16, 16);
+		Font normalFont(&normalFontSprite);
+		normalFont.MapRange('A', 'M', 0, 1);
+		normalFont.MapRange('N', 'Z', 0, 2);
+		normalFont.MapRange('a', 'm', 0, 3);
+		normalFont.MapRange('n', 'z', 0, 4);
+		normalFont.MapChar(':', 10, 0);
+		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"));
+		Sprite disabledFontSprite(disabledFontImg, 16, 16);
+		Font disabledFont(&disabledFontSprite);
+		disabledFont.MapRange('A', 'M', 0, 1);
+		disabledFont.MapRange('N', 'Z', 0, 2);
+		disabledFont.MapRange('a', 'm', 0, 3);
+		disabledFont.MapRange('n', 'z', 0, 4);
+		disabledFont.MapChar(':', 10, 0);
+		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 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;
+
+		Spell resetSpell;
+		resetSpell.SetName("Reset");
+		maxim.AddSpell(&resetSpell);
+		Spell strongSpell;
+		strongSpell.SetName("Strong");
+		strongSpell.SetCost(3);
+		strongSpell.SetUsableInBattle();
+		maxim.AddSpell(&strongSpell);
+		selan.AddSpell(&strongSpell);
+		Spell strongerSpell;
+		strongerSpell.SetName("Stronger");
+		strongerSpell.SetCost(8);
+		strongerSpell.SetUsableInBattle();
+		maxim.AddSpell(&strongerSpell);
+		selan.AddSpell(&strongerSpell);
+		Spell championSpell;
+		championSpell.SetName("Champion");
+		championSpell.SetCost(16);
+		championSpell.SetUsableInBattle();
+		maxim.AddSpell(&championSpell);
+		selan.AddSpell(&championSpell);
+		Spell rallySpell;
+		rallySpell.SetName("Rally");
+		rallySpell.SetCost(10);
+		rallySpell.SetUsableInBattle();
+		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();
+		maxim.AddSpell(&valorSpell);
+		selan.AddSpell(&valorSpell);
+
+		battleRes.spellMenuHeadline = "Please choose a spell.";
+		battleRes.spellMenuPrototype = Menu<const Spell *>(&normalFont, &disabledFont, &handCursorSprite, 9, 6, 8, 0, 2, 32, 2, ':');
+		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);
+
+		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();
+		antidote.GetTargetingMode().TargetSingleAlly();
+		inventory.Add(&magicJar, 4);
+		Item hiPotion;
+		hiPotion.SetName("Hi-Potion");
+		hiPotion.SetMenuIcon(&potionIcon);
+		hiPotion.SetUsableInBattle();
+		antidote.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();
+		antidote.GetTargetingMode().TargetSingleEnemy();
+		inventory.Add(&sleepBall, 1);
+		Item multiBall;
+		multiBall.SetName("Multi-ball!");
+		multiBall.SetMenuIcon(&ballIcon);
+		multiBall.SetUsableInBattle();
+		antidote.GetTargetingMode().TargetMultipleEnemies();
+		inventory.Add(&multiBall, 1);
+		Item figgoru;
+		figgoru.SetName("Figgoru");
+		figgoru.SetMenuIcon(&crankIcon);
+		antidote.GetTargetingMode().TargetAllEnemies();
+		inventory.Add(&figgoru, 1);
+		battleRes.inventory = &inventory;
+
+		battleRes.itemMenuHeadline = "Please choose an item.";
+		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);
+		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, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge, &heroTagSprite, &heroTagFont));
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);