]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
implemented capsule/class selection
[l2e.git] / src / main.cpp
index 580c5db14904e2450cb17f8695e41ad74489f533..96bfad7c7da9966d4d2a843728b6ba2bf3d89119 100644 (file)
@@ -1,18 +1,13 @@
-/*
- * main.cpp
- *
- *  Created on: Aug 1, 2012
- *      Author: holy
- */
-
 #include "app/Application.h"
 #include "app/Arguments.h"
 #include "app/Input.h"
 #include "battle/BattleState.h"
+#include "battle/Capsule.h"
 #include "battle/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
+#include "common/Capsule.h"
 #include "common/GameConfig.h"
 #include "common/GameState.h"
 #include "common/Hero.h"
@@ -23,6 +18,7 @@
 #include "common/Spell.h"
 #include "common/Stats.h"
 #include "geometry/Vector.h"
+#include "graphics/CharSelect.h"
 #include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -62,6 +58,7 @@ using app::Input;
 using battle::BattleState;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Capsule;
 using common::GameConfig;
 using common::GameState;
 using common::Hero;
@@ -106,6 +103,7 @@ int main(int argc, char **argv) {
                battle::Monster::CreateTypeDescription();
                battle::PartyLayout::CreateTypeDescription();
 
+               common::Capsule::CreateTypeDescription();
                common::Hero::CreateTypeDescription();
                common::Ikari::CreateTypeDescription();
                common::Item::CreateTypeDescription();
@@ -114,6 +112,7 @@ int main(int argc, char **argv) {
                common::TargetingMode::CreateTypeDescription();
 
                graphics::Animation::CreateTypeDescription();
+               graphics::CharSelect::CreateTypeDescription();
                graphics::ComplexAnimation::CreateTypeDescription();
                graphics::Font::CreateTypeDescription();
                graphics::Frame::CreateTypeDescription();
@@ -121,6 +120,7 @@ int main(int argc, char **argv) {
                graphics::MenuProperties::CreateTypeDescription();
                graphics::SimpleAnimation::CreateTypeDescription();
                graphics::Sprite::CreateTypeDescription();
+               graphics::Texture::CreateTypeDescription();
 
                map::Area::CreateTypeDescription();
                map::Entity::CreateTypeDescription();
@@ -128,6 +128,8 @@ int main(int argc, char **argv) {
                map::Tile::CreateTypeDescription();
                map::Trigger::CreateTypeDescription();
 
+               menu::Resources::CreateTypeDescription();
+
                Arguments args;
                args.Read(argc, argv);
 
@@ -194,10 +196,18 @@ int main(int argc, char **argv) {
                gameState.party[3] = &gameState.heroes[3];
                gameState.partySize = 4;
 
+               gameState.capsules[1] = *caster.GetCapsule("flash");
+               gameState.capsules[1].UpgradeClass();
+               gameState.capsules[1].UpgradeClass();
+               gameState.capsules[1].UpgradeClass();
+               gameState.capsules[1].UpgradeClass();
+               gameState.capsule = 1;
+
                GameConfig gameConfig;
                gameConfig.state = &gameState;
                gameConfig.heroesLayout = caster.GetPartyLayout("heroesLayout");
                gameConfig.battleResources = caster.GetBattleResources("battleResources");
+               gameConfig.menuResources = caster.GetMenuResources("menuResources");
 
                // temporary test data
                SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
@@ -280,190 +290,6 @@ int main(int argc, char **argv) {
                gameState.heroes[3].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
                gameState.heroes[2].MapEntity().AddFollower(&gameState.heroes[3].MapEntity());
 
-               menu::Resources menuResources;
-               gameConfig.menuResources = &menuResources;
-
-               Texture menubg;
-               menubg.SetSurface(IMG_Load("test-data/menubg.png"));
-               menubg.SetSize(Vector<int>(64, 64));
-               menuResources.menubg = &menubg;
-
-               menuResources.statusFont = gameConfig.battleResources->normalFont;
-
-               graphics::Sprite statusLabels(IMG_Load("test-data/status-labels.png"), 32, 16);
-               menuResources.statusLabels = &statusLabels;
-
-               graphics::Frame statusFrame(IMG_Load("test-data/status-frame.png"), 32, 32, 32, 32);
-               menuResources.statusFrame = &statusFrame;
-
-               graphics::Sprite menuFontSprite(IMG_Load("test-data/menu-font.png"), 16, 16);
-               graphics::Font menuFont(&menuFontSprite, 0, -2);
-               graphics::Sprite menuInactiveFontSprite(IMG_Load("test-data/menu-font-inactive.png"), 16, 16);
-               graphics::Font menuInactiveFont(&menuInactiveFontSprite, 0, -2);
-
-               menuResources.normalFont = &menuFont;
-               menuResources.inactiveFont = &menuInactiveFont;
-
-               graphics::Sprite menuCursor(IMG_Load("test-data/menu-cursor.png"), 32, 16);
-               menuResources.menuCursor = &menuCursor;
-               graphics::Sprite menuActiveCursor(IMG_Load("test-data/menu-cursor-active.png"), 32, 18);
-               menuResources.menuActiveCursor = &menuActiveCursor;
-
-               graphics::MenuProperties mainMenuProperties;
-               mainMenuProperties.cols = 2;
-               mainMenuProperties.rows = 4;
-               mainMenuProperties.charsPerEntry = 8;
-               mainMenuProperties.rowGap = 8;
-               mainMenuProperties.colGap = 32;
-               mainMenuProperties.cursor = &menuCursor;
-               mainMenuProperties.font = &menuFont;
-               mainMenuProperties.wrapX = true;
-               mainMenuProperties.wrapY = true;
-               menuResources.mainMenuProperties = &mainMenuProperties;
-
-               menuResources.mainMenuItemText = "ITEM";
-               menuResources.mainMenuSpellText = "SPELL";
-               menuResources.mainMenuCapsuleText = "CAPSULE";
-               menuResources.mainMenuEquipmentText = "EQUIP";
-               menuResources.mainMenuStatusText = "STATUS";
-               menuResources.mainMenuChangeText = "CHANGE";
-               menuResources.mainMenuConfigText = "CONFIG";
-               menuResources.mainMenuScenarioText = "SCENARIO";
-
-               menuResources.mainMenuTimeText = "TIME";
-               menuResources.mainMenuGoldText = "GOLD";
-
-               graphics::Sprite heroCursor(IMG_Load("test-data/hero-cursor.png"), 64, 16);
-               menuResources.heroCursor = &heroCursor;
-               menuResources.heroCursorBlinkTime = 532;
-
-               menuResources.noEquipmentText = "No equip";
-
-               graphics::Sprite shoulderNav(IMG_Load("test-data/shoulder-nav.png"), 160, 16);
-               menuResources.shoulderNav = &shoulderNav;
-
-               menuResources.atpLabel = "ATP";
-               menuResources.dfpLabel = "DFP";
-               menuResources.strLabel = "STR";
-               menuResources.aglLabel = "AGL";
-               menuResources.intLabel = "INT";
-               menuResources.gutLabel = "GUT";
-               menuResources.mgrLabel = "MGR";
-
-               menuResources.ipLabel = "IP";
-               menuResources.experienceLabel = "NOW EXP";
-               menuResources.nextLevelLabel = "NEXT LEVEL";
-
-               graphics::MenuProperties statusMenuProperties;
-               statusMenuProperties.cols = 2;
-               statusMenuProperties.rows = 1;
-               statusMenuProperties.charsPerEntry = 6;
-               statusMenuProperties.rowGap = 0;
-               statusMenuProperties.colGap = 16;
-               statusMenuProperties.cursor = &menuCursor;
-               statusMenuProperties.font = &menuFont;
-               statusMenuProperties.wrapX = true;
-               menuResources.statusMenuProperties = &statusMenuProperties;
-
-               menuResources.nextLabel = "NEXT";
-               menuResources.returnLabel = "RETURN";
-
-               graphics::MenuProperties itemMenuProperties;
-               itemMenuProperties.cols = 3;
-               itemMenuProperties.rows = 1;
-               itemMenuProperties.charsPerEntry = 5;
-               itemMenuProperties.rowGap = 8;
-               itemMenuProperties.colGap = 16;
-               itemMenuProperties.cursor = &menuCursor;
-               itemMenuProperties.selectedCursor = &menuActiveCursor;
-               itemMenuProperties.font = &menuFont;
-               itemMenuProperties.wrapX = true;
-               itemMenuProperties.wrapY = true;
-               menuResources.itemMenuProperties = &itemMenuProperties;
-               menuResources.itemMenuUseText = "USE";
-               menuResources.itemMenuSortText = "SORT";
-               menuResources.itemMenuDropText = "DROP";
-
-               graphics::MenuProperties inventoryMenuProperties;
-               inventoryMenuProperties.cols = 1;
-               inventoryMenuProperties.rows = 6;
-               inventoryMenuProperties.charsPerEntry = 13;
-               inventoryMenuProperties.rowGap = 8;
-               inventoryMenuProperties.cursor = &menuCursor;
-               inventoryMenuProperties.selectedCursor = &menuActiveCursor;
-               inventoryMenuProperties.font = &menuFont;
-               inventoryMenuProperties.disabledFont = &menuInactiveFont;
-               inventoryMenuProperties.iconSpace = 16;
-               inventoryMenuProperties.charsPerNumber = 2;
-               inventoryMenuProperties.delimiter = ':';
-               menuResources.inventoryMenuProperties = &inventoryMenuProperties;
-
-               graphics::MenuProperties spellMenuProperties;
-               spellMenuProperties.cols = 2;
-               spellMenuProperties.rows = 6;
-               spellMenuProperties.charsPerEntry = 8;
-               spellMenuProperties.rowGap = 8;
-               spellMenuProperties.colGap = 48;
-               spellMenuProperties.cursor = &menuCursor;
-               spellMenuProperties.selectedCursor = &menuActiveCursor;
-               spellMenuProperties.font = &menuFont;
-               spellMenuProperties.disabledFont = &menuInactiveFont;
-               spellMenuProperties.iconSpace = 0;
-               spellMenuProperties.charsPerNumber = 2;
-               spellMenuProperties.delimiter = ':';
-               menuResources.spellMenuProperties = &spellMenuProperties;
-
-               graphics::MenuProperties equipmentActionMenuProperties;
-               equipmentActionMenuProperties.cols = 1;
-               equipmentActionMenuProperties.rows = 5;
-               equipmentActionMenuProperties.charsPerEntry = 10;
-               equipmentActionMenuProperties.rowGap = 8;
-               equipmentActionMenuProperties.cursor = &menuCursor;
-               equipmentActionMenuProperties.selectedCursor = &menuActiveCursor;
-               equipmentActionMenuProperties.font = &menuFont;
-               equipmentActionMenuProperties.iconSpace = 0;
-               menuResources.equipmentActionMenuProperties = &equipmentActionMenuProperties;
-
-               graphics::MenuProperties equipmentMenuProperties;
-               equipmentMenuProperties.cols = 1;
-               equipmentMenuProperties.rows = 6;
-               equipmentMenuProperties.charsPerEntry = 12;
-               equipmentMenuProperties.rowGap = 16;
-               equipmentMenuProperties.cursor = &menuCursor;
-               equipmentMenuProperties.selectedCursor = &menuActiveCursor;
-               equipmentMenuProperties.font = menuResources.statusFont;
-               equipmentMenuProperties.iconSpace = 16;
-               equipmentMenuProperties.wrapY = true;
-               menuResources.equipmentMenuProperties = &equipmentMenuProperties;
-
-               menuResources.equipMenuEquipLabel = "EQUIP";
-               menuResources.equipMenuStrongestLabel = "STRONGEST";
-               menuResources.equipMenuRemoveLabel = "REMOVE";
-               menuResources.equipMenuRemoveAllLabel = "REMOVE ALL";
-               menuResources.equipMenuDropLabel = "DROP";
-
-               graphics::MenuProperties configMenuProperties;
-               configMenuProperties.cols = 1;
-               configMenuProperties.rows = 4;
-               configMenuProperties.charsPerEntry = 8;
-               configMenuProperties.rowGap = 32;
-               configMenuProperties.cursor = &menuCursor;
-               configMenuProperties.font = &menuFont;
-               configMenuProperties.wrapY = true;
-               menuResources.configMenuProperties = &configMenuProperties;
-
-               menuResources.configMessageSpeedLabel = "MESSAGE\n   SPEED";
-               menuResources.configMessageSpeedFast = "FAST";
-               menuResources.configMessageSpeedNormal = "NORMAL";
-               menuResources.configMessageSpeedSlow = "SLOW";
-               menuResources.configBattleCursorLabel = "BATTLE\n  CURSOR";
-               menuResources.configStatusCursorLabel = "STATUS\n  CURSOR";
-               menuResources.configCursorClear = "CLEAR";
-               menuResources.configCursorMemory = "MEMORY";
-               menuResources.configMusicLabel = "MUSIC";
-               menuResources.configMusicStereo = "STEREO";
-               menuResources.configMusicMono = "MONO";
-
                InitScreen screen(width, height);
 
                app::State *state(0);
@@ -474,6 +300,7 @@ int main(int argc, char **argv) {
                        battleState->AddMonster(monster);
                        battleState->AddMonster(monster);
                        battleState->AddMonster(monster);
+                       battleState->SetCapsule(caster.GetCapsule("flash"));
                        battleState->AddHero(gameState.heroes[0]);
                        battleState->AddHero(gameState.heroes[1]);
                        battleState->AddHero(gameState.heroes[2]);