-/*
- * 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/Script.h"
#include "common/Spell.h"
#include "common/Stats.h"
-#include "geometry/Vector.h"
+#include "math/Fixed.h"
+#include "math/Vector.h"
+#include "graphics/CharSelect.h"
#include "graphics/ComplexAnimation.h"
#include "graphics/Font.h"
#include "graphics/Frame.h"
#include "graphics/Menu.h"
#include "graphics/SimpleAnimation.h"
#include "graphics/Sprite.h"
+#include "graphics/Texture.h"
#include "loader/Caster.h"
#include "loader/Interpreter.h"
#include "loader/ParsedSource.h"
#include "map/MapState.h"
#include "map/Tile.h"
#include "map/Trigger.h"
+#include "menu/Resources.h"
#include "sdl/InitImage.h"
#include "sdl/InitScreen.h"
#include "sdl/InitSDL.h"
using battle::BattleState;
using battle::Monster;
using battle::PartyLayout;
+using common::Capsule;
using common::GameConfig;
using common::GameState;
using common::Hero;
-using common::Ikari;
-using common::Inventory;
-using common::Item;
-using common::Script;
using common::Spell;
-using common::Stats;
-using geometry::Vector;
-using graphics::ComplexAnimation;
-using graphics::Font;
-using graphics::Frame;
-using graphics::Gauge;
-using graphics::Menu;
-using graphics::SimpleAnimation;
-using graphics::Sprite;
+using math::Fixed;
+using math::Vector;
+using graphics::Texture;
using loader::Caster;
using loader::Interpreter;
using loader::ParsedSource;
using loader::Parser;
using loader::TypeDescription;
-using map::Area;
using map::Entity;
-using map::Map;
using map::MapState;
-using map::Tile;
-using map::Trigger;
using sdl::InitImage;
using sdl::InitScreen;
using sdl::InitSDL;
using std::vector;
int main(int argc, char **argv) {
- const int width = 800;
- const int height = 480;
+ const int width = 512;
+ const int height = 448;
- const float walkSpeed = 128.0f;
+ const Fixed<8> walkSpeed = Fixed<8>(1, 8);
bool battle(false);
InitSDL sdl;
InitImage image(IMG_INIT_PNG);
- Area::CreateTypeDescription();
- battle::Resources::CreateTypeDescription();
- ComplexAnimation::CreateTypeDescription();
- Font::CreateTypeDescription();
- Frame::CreateTypeDescription();
- Gauge::CreateTypeDescription();
- Hero::CreateTypeDescription();
- Ikari::CreateTypeDescription();
Interpreter::CreateTypeDescriptions();
- Item::CreateTypeDescription();
- Map::CreateTypeDescription();
- graphics::MenuProperties::CreateTypeDescription();
- Monster::CreateTypeDescription();
- PartyLayout::CreateTypeDescription();
- SimpleAnimation::CreateTypeDescription();
- Spell::CreateTypeDescription();
- Sprite::CreateTypeDescription();
- Stats::CreateTypeDescription();
+
+ battle::Resources::CreateTypeDescription();
+ battle::Monster::CreateTypeDescription();
+ battle::PartyLayout::CreateTypeDescription();
+
+ common::Capsule::CreateTypeDescription();
+ common::Hero::CreateTypeDescription();
+ common::Ikari::CreateTypeDescription();
+ common::Item::CreateTypeDescription();
+ common::Stats::CreateTypeDescription();
+ common::Spell::CreateTypeDescription();
common::TargetingMode::CreateTypeDescription();
- Tile::CreateTypeDescription();
- Trigger::CreateTypeDescription();
- Entity::CreateTypeDescription();
+
+ graphics::Animation::CreateTypeDescription();
+ graphics::CharSelect::CreateTypeDescription();
+ graphics::ComplexAnimation::CreateTypeDescription();
+ graphics::Font::CreateTypeDescription();
+ graphics::Frame::CreateTypeDescription();
+ graphics::Gauge::CreateTypeDescription();
+ graphics::MenuProperties::CreateTypeDescription();
+ graphics::SimpleAnimation::CreateTypeDescription();
+ graphics::Sprite::CreateTypeDescription();
+ graphics::Texture::CreateTypeDescription();
+
+ map::Area::CreateTypeDescription();
+ map::Entity::CreateTypeDescription();
+ map::Map::CreateTypeDescription();
+ map::Tile::CreateTypeDescription();
+ map::Trigger::CreateTypeDescription();
+
+ menu::Resources::CreateTypeDescription();
Arguments args;
args.Read(argc, argv);
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[1] = &gameState.heroes[1];
gameState.party[2] = &gameState.heroes[2];
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"), 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.inventory.Add(caster.GetItem("sProRingItem"));
gameState.inventory.Add(caster.GetItem("hiPotionItem"), 4);
+ gameState.inventory.Add(caster.GetItem("powerRingItem"));
gameState.inventory.Add(caster.GetItem("powerPotionItem"), 4);
+ gameState.inventory.Add(caster.GetItem("zircoSwordItem"));
gameState.inventory.Add(caster.GetItem("escapeItem"), 2);
+ gameState.inventory.Add(caster.GetItem("zircoHelmetItem"));
gameState.inventory.Add(caster.GetItem("sleepBallItem"), 1);
-
- gameState.heroes[0].SetWeapon(caster.GetItem("zircoSwordItem"));
- gameState.heroes[0].SetArmor(caster.GetItem("zirconArmorItem"));
- gameState.heroes[0].SetShield(caster.GetItem("holyShieldItem"));
- gameState.heroes[0].SetHelmet(caster.GetItem("legendHelmItem"));
- gameState.heroes[0].SetRing(caster.GetItem("sProRingItem"));
- gameState.heroes[0].SetJewel(caster.GetItem("evilJewelItem"));
-
-// gameState.heroes[1].SetWeapon(cst.GetItem("zircoWhipItem"));
- gameState.heroes[1].SetArmor(caster.GetItem("zirconPlateItem"));
- gameState.heroes[1].SetShield(caster.GetItem("zircoGlovesItem"));
- gameState.heroes[1].SetHelmet(caster.GetItem("holyCapItem"));
- gameState.heroes[1].SetRing(caster.GetItem("ghostRingItem"));
- gameState.heroes[1].SetJewel(caster.GetItem("eagleRockItem"));
-
-// gameState.heroes[2].SetWeapon(cst.GetItem("zircoAxItem"));
- gameState.heroes[2].SetArmor(caster.GetItem("zirconArmorItem"));
- gameState.heroes[2].SetShield(caster.GetItem("megaShieldItem"));
- gameState.heroes[2].SetHelmet(caster.GetItem("zircoHelmetItem"));
- gameState.heroes[2].SetRing(caster.GetItem("powerRingItem"));
- gameState.heroes[2].SetJewel(caster.GetItem("evilJewelItem"));
+ gameState.inventory.Add(caster.GetItem("zirconPlateItem"));
+
+ gameState.heroes[0].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoSwordItem"));
+ gameState.heroes[0].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconArmorItem"));
+ gameState.heroes[0].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("holyShieldItem"));
+ gameState.heroes[0].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("legendHelmItem"));
+ gameState.heroes[0].SetEquipment(Hero::EQUIP_RING, caster.GetItem("sProRingItem"));
+ gameState.heroes[0].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("evilJewelItem"));
+
+// gameState.heroes[1].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoWhipItem"));
+ gameState.heroes[1].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconPlateItem"));
+ gameState.heroes[1].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("zircoGlovesItem"));
+ gameState.heroes[1].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("holyCapItem"));
+ gameState.heroes[1].SetEquipment(Hero::EQUIP_RING, caster.GetItem("ghostRingItem"));
+ gameState.heroes[1].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("eagleRockItem"));
+
+// gameState.heroes[2].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoAxItem"));
+ gameState.heroes[2].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconArmorItem"));
+ gameState.heroes[2].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("megaShieldItem"));
+ gameState.heroes[2].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("zircoHelmetItem"));
+ gameState.heroes[2].SetEquipment(Hero::EQUIP_RING, caster.GetItem("powerRingItem"));
+ gameState.heroes[2].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("evilJewelItem"));
// NOTE: this is actually Artea equipment
-// gameState.heroes[3].SetWeapon(cst.GetItem("lizardBlowItem"));
- gameState.heroes[3].SetArmor(caster.GetItem("holyRobeItem"));
- gameState.heroes[3].SetShield(caster.GetItem("zircoGlovesItem"));
- gameState.heroes[3].SetHelmet(caster.GetItem("holyCapItem"));
- gameState.heroes[3].SetRing(caster.GetItem("rocketRingItem"));
- gameState.heroes[3].SetJewel(caster.GetItem("krakenRockItem"));
+// gameState.heroes[3].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("lizardBlowItem"));
+ gameState.heroes[3].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("holyRobeItem"));
+ gameState.heroes[3].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("zircoGlovesItem"));
+ gameState.heroes[3].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("holyCapItem"));
+ 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());
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