-/*
- * main.cpp
- *
- * Created on: Aug 1, 2012
- * Author: holy
- */
-
+#include "keys.h"
#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"
#include "common/Ikari.h"
#include "common/Inventory.h"
#include "common/Item.h"
+#include "common/LevelUp.h"
#include "common/Script.h"
#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"
#include "graphics/Sprite.h"
#include "graphics/Texture.h"
#include "loader/Caster.h"
+#include "loader/Compiler.h"
#include "loader/Interpreter.h"
+#include "loader/Loader.h"
#include "loader/ParsedSource.h"
#include "loader/Parser.h"
#include "loader/TypeDescription.h"
#include "map/MapState.h"
#include "map/Tile.h"
#include "map/Trigger.h"
+#include "math/Fixed.h"
+#include "math/Vector.h"
#include "menu/Resources.h"
#include "sdl/InitImage.h"
#include "sdl/InitScreen.h"
using battle::BattleState;
using battle::Monster;
using battle::PartyLayout;
+using common::Capsule;
using common::GameConfig;
using common::GameState;
using common::Hero;
using common::Spell;
-using geometry::Vector;
using graphics::Texture;
using loader::Caster;
+using loader::Compiler;
using loader::Interpreter;
+using loader::Loader;
using loader::ParsedSource;
using loader::Parser;
using loader::TypeDescription;
using map::Entity;
using map::MapState;
+using math::Fixed;
+using math::Vector;
using sdl::InitImage;
using sdl::InitScreen;
using sdl::InitSDL;
const int width = 512;
const int height = 448;
- const float walkSpeed = 128.0f;
+ const Fixed<8> walkSpeed = Fixed<8>(1, 8);
bool battle(false);
battle::Monster::CreateTypeDescription();
battle::PartyLayout::CreateTypeDescription();
+ common::Capsule::CreateTypeDescription();
common::Hero::CreateTypeDescription();
common::Ikari::CreateTypeDescription();
common::Item::CreateTypeDescription();
+ common::LevelUp::CreateTypeDescription();
common::Stats::CreateTypeDescription();
common::Spell::CreateTypeDescription();
common::TargetingMode::CreateTypeDescription();
graphics::Animation::CreateTypeDescription();
+ graphics::CharSelect::CreateTypeDescription();
graphics::ComplexAnimation::CreateTypeDescription();
graphics::Font::CreateTypeDescription();
graphics::Frame::CreateTypeDescription();
graphics::MenuProperties::CreateTypeDescription();
graphics::SimpleAnimation::CreateTypeDescription();
graphics::Sprite::CreateTypeDescription();
+ graphics::Texture::CreateTypeDescription();
map::Area::CreateTypeDescription();
map::Entity::CreateTypeDescription();
map::Tile::CreateTypeDescription();
map::Trigger::CreateTypeDescription();
+ menu::Resources::CreateTypeDescription();
+
Arguments args;
args.Read(argc, argv);
ParsedSource source;
+ Loader ld;
+
for (vector<char *>::const_iterator i(args.Infiles().begin()), end(args.Infiles().end()); i != end; ++i) {
- Parser(*i, source).Parse();
+ string filePath(*i);
+ switch (filePath[filePath.size() - 1]) {
+ case 'o':
+ ld.Load(filePath);
+ break;
+ case 's':
+ Parser(filePath, source).Parse();
+ break;
+ default:
+ throw std::runtime_error("don't know what to do with " + filePath);
+ }
}
+ Interpreter intp(source);
+ intp.ReadSource();
+
switch (args.GetRunLevel()) {
case Arguments::WRITE:
{
source.WriteHeader(outstream);
break;
}
+ case 'o': {
+ std::fstream outstream(args.OutfilePath(), std::ios_base::out|std::ios_base::trunc);
+ outstream.flush();
+ outstream.close();
+ outstream.open(args.OutfilePath());
+ outstream.exceptions(std::ios_base::badbit|std::ios_base::failbit);
+ Compiler(intp).Write(outstream);
+ break;
+ }
default: {
throw std::runtime_error(string("don't know how to write file ") + args.OutfilePath());
}
break;
}
- Interpreter intp(source);
- intp.ReadSource();
-
if (intp.PostponedDefinitions().size() > 0) {
for (vector<Interpreter::PostponedDefinition>::const_iterator i(intp.PostponedDefinitions().begin()), end(intp.PostponedDefinitions().end()); i != end; ++i) {
- std::cerr << "missing definition of " << TypeDescription::Get(i->linkedType).TypeName() << " " << i->identifier << std::endl;
+ std::cerr << "missing definition of " << TypeDescription::Get(i->type).TypeName() << " " << i->identifier << std::endl;
}
return 3;
}
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"));
gameState.heroes[0].AddSpell(valorSpell);
gameState.heroes[1].AddSpell(valorSpell);
- gameState.inventory.Add(caster.GetItem("zirconPlateItem"));
+ gameState.inventory.Add(caster.GetItem("zirconPlateItem"), 32);
+ gameState.inventory.Add(caster.GetItem("holyFruitItem"));
+ gameState.inventory.Add(caster.GetItem("darkFruitItem"));
gameState.inventory.Add(caster.GetItem("antidoteItem"), 9);
gameState.inventory.Add(caster.GetItem("powerRingItem"));
gameState.inventory.Add(caster.GetItem("magicJarItem"), 4);
gameState.heroes[3].SetEquipment(Hero::EQUIP_RING, caster.GetItem("rocketRingItem"));
gameState.heroes[3].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("krakenRockItem"));
- gameState.heroes[0].MapEntity().Position() = Vector<float>(64, 128);
+ gameState.heroes[0].MapEntity().Position() = Vector<Fixed<8> >(64, 128);
- gameState.heroes[1].MapEntity().Position() = Vector<float>(64, 128);
+ gameState.heroes[1].MapEntity().Position() = Vector<Fixed<8> >(64, 128);
gameState.heroes[1].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
gameState.heroes[0].MapEntity().AddFollower(&gameState.heroes[1].MapEntity());
- gameState.heroes[2].MapEntity().Position() = Vector<float>(64, 128);
+ gameState.heroes[2].MapEntity().Position() = Vector<Fixed<8> >(64, 128);
gameState.heroes[2].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
gameState.heroes[1].MapEntity().AddFollower(&gameState.heroes[2].MapEntity());
- gameState.heroes[3].MapEntity().Position() = Vector<float>(64, 128);
+ gameState.heroes[3].MapEntity().Position() = Vector<Fixed<8> >(64, 128);
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;
-
- 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";
-
InitScreen screen(width, height);
app::State *state(0);
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]);
}
Application app(screen, state);
- app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
- app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
- app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN);
- app.Buttons().MapKey(SDLK_a, Input::PAD_LEFT);
- app.Buttons().MapKey(SDLK_RIGHT, Input::ACTION_A);
- app.Buttons().MapKey(SDLK_DOWN, Input::ACTION_B);
- app.Buttons().MapKey(SDLK_UP, Input::ACTION_X);
- app.Buttons().MapKey(SDLK_LEFT, Input::ACTION_Y);
- app.Buttons().MapKey(SDLK_RETURN, Input::START);
- app.Buttons().MapKey(SDLK_SPACE, Input::SELECT);
- app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT);
- app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT);
- app.Buttons().MapKey(SDLK_1, Input::DEBUG_1);
- app.Buttons().MapKey(SDLK_2, Input::DEBUG_2);
- app.Buttons().MapKey(SDLK_3, Input::DEBUG_3);
- app.Buttons().MapKey(SDLK_4, Input::DEBUG_4);
+ MapKeys(app.Buttons());
app.Run();
return 0;
projects / l2e.git / blobdiff