#include "battle/Monster.h"
#include "battle/PartyLayout.h"
#include "battle/Resources.h"
-#include "battle/Stats.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/Script.h"
#include "common/Spell.h"
+#include "common/Stats.h"
#include "geometry/Vector.h"
#include "graphics/ComplexAnimation.h"
#include "graphics/Font.h"
using app::Arguments;
using app::Input;
using battle::BattleState;
-using battle::Hero;
using battle::Monster;
using battle::PartyLayout;
-using battle::Stats;
+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;
const int tileSize = 32;
const float walkSpeed = 128.0f;
- const bool battle(false);
+ bool battle(false);
// std::srand(std::time(0));
Sprite::CreateTypeDescription();
Stats::CreateTypeDescription();
common::TargetingMode::CreateTypeDescription();
+ Entity::CreateTypeDescription();
Arguments args;
args.Read(argc, argv);
Parser(*i, source).Parse();
}
- switch (args.DetectRunLevel()) {
+ switch (args.GetRunLevel()) {
case Arguments::WRITE:
{
int length(std::strlen(args.OutfilePath()));
std::cout << source << std::endl;
return 0;
}
+ case Arguments::SOURCE_WIKI: {
+ TypeDescription::WriteSourceWiki(std::cout);
+ return 0;
+ }
+ case Arguments::BATTLE:
+ battle = true;
+ break;
case Arguments::PLAY:
+ case Arguments::MAP:
break;
}
Caster caster(intp);
+ GameState gameState;
+
+ gameState.heroes[0] = *caster.GetHero("maxim");
+ gameState.heroes[1] = *caster.GetHero("selan");
+ gameState.heroes[2] = *caster.GetHero("guy");
+ gameState.heroes[3] = *caster.GetHero("dekar");
+
+ gameState.party[0] = &gameState.heroes[0];
+ gameState.party[1] = &gameState.heroes[1];
+ gameState.party[2] = &gameState.heroes[2];
+ gameState.party[3] = &gameState.heroes[3];
+
+ GameConfig gameConfig;
+ gameConfig.state = &gameState;
+ gameConfig.heroesLayout = caster.GetPartyLayout("heroesLayout");
+ gameConfig.battleResources = caster.GetBattleResources("battleResources");
+
// temporary test data
SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
PartyLayout monstersLayout(*caster.GetPartyLayout("monstersLayout"));
- PartyLayout heroesLayout(*caster.GetPartyLayout("heroesLayout"));
Monster monster(*caster.GetMonster("lizard"));
- Hero maxim(*caster.GetHero("maxim"));
- Hero selan(*caster.GetHero("selan"));
- Hero guy(*caster.GetHero("guy"));
- Hero dekar(*caster.GetHero("dekar"));
-
- battle::Resources *battleRes(caster.GetBattleResources("battleResources"));
- maxim.AddSpell(caster.GetSpell("resetSpell"));
+ gameState.heroes[0].AddSpell(caster.GetSpell("resetSpell"));
Spell *strongSpell(caster.GetSpell("strongSpell"));
- maxim.AddSpell(strongSpell);
- selan.AddSpell(strongSpell);
+ gameState.heroes[0].AddSpell(strongSpell);
+ gameState.heroes[1].AddSpell(strongSpell);
Spell *strongerSpell(caster.GetSpell("strongerSpell"));
- maxim.AddSpell(strongerSpell);
- selan.AddSpell(strongerSpell);
+ gameState.heroes[0].AddSpell(strongerSpell);
+ gameState.heroes[1].AddSpell(strongerSpell);
Spell *championSpell(caster.GetSpell("championSpell"));
- maxim.AddSpell(championSpell);
- selan.AddSpell(championSpell);
+ gameState.heroes[0].AddSpell(championSpell);
+ gameState.heroes[1].AddSpell(championSpell);
Spell *rallySpell(caster.GetSpell("rallySpell"));
- maxim.AddSpell(rallySpell);
- selan.AddSpell(rallySpell);
- selan.AddSpell(caster.GetSpell("escapeSpell"));
+ gameState.heroes[0].AddSpell(rallySpell);
+ gameState.heroes[1].AddSpell(rallySpell);
+ gameState.heroes[1].AddSpell(caster.GetSpell("escapeSpell"));
Spell *valorSpell(caster.GetSpell("valorSpell"));
- maxim.AddSpell(valorSpell);
- selan.AddSpell(valorSpell);
-
- Inventory inventory;
- inventory.Add(caster.GetItem("antidoteItem"), 9);
- inventory.Add(caster.GetItem("magicJarItem"), 4);
- inventory.Add(caster.GetItem("hiPotionItem"), 4);
- inventory.Add(caster.GetItem("powerPotionItem"), 4);
- inventory.Add(caster.GetItem("escapeItem"), 2);
- inventory.Add(caster.GetItem("sleepBallItem"), 1);
- battleRes->inventory = &inventory;
-
- maxim.SetWeapon(caster.GetItem("zircoSwordItem"));
- maxim.SetArmor(caster.GetItem("zirconArmorItem"));
- maxim.SetShield(caster.GetItem("holyShieldItem"));
- maxim.SetHelmet(caster.GetItem("legendHelmItem"));
- maxim.SetRing(caster.GetItem("sProRingItem"));
- maxim.SetJewel(caster.GetItem("evilJewelItem"));
-
-// selan.SetWeapon(cst.GetItem("zircoWhipItem"));
- selan.SetArmor(caster.GetItem("zirconPlateItem"));
- selan.SetShield(caster.GetItem("zircoGlovesItem"));
- selan.SetHelmet(caster.GetItem("holyCapItem"));
- selan.SetRing(caster.GetItem("ghostRingItem"));
- selan.SetJewel(caster.GetItem("eagleRockItem"));
-
-// guy.SetWeapon(cst.GetItem("zircoAxItem"));
- guy.SetArmor(caster.GetItem("zirconArmorItem"));
- guy.SetShield(caster.GetItem("megaShieldItem"));
- guy.SetHelmet(caster.GetItem("zircoHelmetItem"));
- guy.SetRing(caster.GetItem("powerRingItem"));
- guy.SetJewel(caster.GetItem("evilJewelItem"));
+ gameState.heroes[0].AddSpell(valorSpell);
+ gameState.heroes[1].AddSpell(valorSpell);
+
+ gameState.inventory.Add(caster.GetItem("antidoteItem"), 9);
+ gameState.inventory.Add(caster.GetItem("magicJarItem"), 4);
+ gameState.inventory.Add(caster.GetItem("hiPotionItem"), 4);
+ gameState.inventory.Add(caster.GetItem("powerPotionItem"), 4);
+ gameState.inventory.Add(caster.GetItem("escapeItem"), 2);
+ 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"));
// NOTE: this is actually Artea equipment
-// dekar.SetWeapon(cst.GetItem("lizardBlowItem"));
- dekar.SetArmor(caster.GetItem("holyRobeItem"));
- dekar.SetShield(caster.GetItem("zircoGlovesItem"));
- dekar.SetHelmet(caster.GetItem("holyCapItem"));
- dekar.SetRing(caster.GetItem("rocketRingItem"));
- dekar.SetJewel(caster.GetItem("krakenRockItem"));
+// 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"));
Tile tiles1[64];
Trigger triggers1[1];
triggers1[0].SetTilePosition(Vector<int>(8, 3));
+ triggers1[0].SetType(Trigger::TYPE_NORTH);
SDL_Surface *tilesetImg(IMG_Load("test-data/tileset.png"));
Sprite tileset(tilesetImg, tileSize, tileSize);
map1.SetTileset(&tileset);
map1.SetTriggers(triggers1, 1);
map1.SetWidth(2);
+ map1.SetBattleBackground(bg);
Tile tiles3[64];
Trigger triggers2[1];
triggers2[0].SetTilePosition(Vector<int>(6, 2));
+ triggers2[0].SetType(Trigger::TYPE_SOUTH);
Map map2;
map2.SetAreas(areas2, 1);
map2.SetTileset(&tileset);
map2.SetTriggers(triggers2, 1);
map2.SetWidth(1);
-
- SDL_Surface *mapMaximImg(IMG_Load("test-data/maxim-map.png"));
- Sprite mapMaximSprite(mapMaximImg, 32, 64);
- SimpleAnimation mapMaximAnimation(&mapMaximSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
- Entity mapMaxim;
- mapMaxim.SetAnimation(&mapMaximAnimation);
- mapMaxim.Position() = Vector<float>(64, 128);
- mapMaxim.SpriteOffset() = Vector<float>(0, -32);
-
- SDL_Surface *mapSelanImg(IMG_Load("test-data/selan-map.png"));
- Sprite mapSelanSprite(mapSelanImg, 32, 64);
- SimpleAnimation mapSelanAnimation(&mapSelanSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
- Entity mapSelan;
- mapSelan.SetAnimation(&mapSelanAnimation);
- mapSelan.Position() = Vector<float>(64, 128);
- mapSelan.SpriteOffset() = Vector<float>(0, -32);
- mapSelan.SetFlags(Entity::FLAG_NONBLOCKING);
- mapMaxim.AddFollower(&mapSelan);
-
- SDL_Surface *mapGuyImg(IMG_Load("test-data/guy-map.png"));
- Sprite mapGuySprite(mapGuyImg, 32, 64);
- SimpleAnimation mapGuyAnimation(&mapGuySprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
- Entity mapGuy;
- mapGuy.SetAnimation(&mapGuyAnimation);
- mapGuy.Position() = Vector<float>(64, 128);
- mapGuy.SpriteOffset() = Vector<float>(0, -32);
- mapGuy.SetFlags(Entity::FLAG_NONBLOCKING);
- mapSelan.AddFollower(&mapGuy);
-
- SDL_Surface *mapDekarImg(IMG_Load("test-data/dekar-map.png"));
- Sprite mapDekarSprite(mapDekarImg, 32, 64);
- SimpleAnimation mapDekarAnimation(&mapDekarSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true);
- Entity mapDekar;
- mapDekar.SetAnimation(&mapDekarAnimation);
- mapDekar.Position() = Vector<float>(64, 128);
- mapDekar.SpriteOffset() = Vector<float>(0, -32);
- mapDekar.SetFlags(Entity::FLAG_NONBLOCKING);
- mapGuy.AddFollower(&mapDekar);
+ map2.SetBattleBackground(bg);
+
+ unsigned char transition1text[4 + sizeof(int) + sizeof(Map *) + sizeof(Vector<int>)];
+ int i(0);
+ transition1text[i++] = Script::CODE_MOVE_I0;
+ *reinterpret_cast<int *>(transition1text + i) = 1;
+ i += sizeof(int);
+ transition1text[i++] = Script::CODE_MOVE_A0;
+ *reinterpret_cast<Map **>(transition1text + i) = &map2;
+ i += sizeof(Map *);
+ transition1text[i++] = Script::CODE_MOVE_V0;
+ *reinterpret_cast<Vector<int> *>(transition1text + i) = Vector<int>(6, 2);
+ i += sizeof(Vector<int>);
+ transition1text[i++] = Script::CODE_SYSCALL;
+
+ Script transition1;
+ transition1.text = transition1text;
+ transition1.textlen = sizeof(transition1text);
+
+ triggers1[0].SetScript(&transition1);
+
+ unsigned char transition2text[4 + sizeof(int) + sizeof(Map *) + sizeof(Vector<int>)];
+ i = 0;
+ transition2text[i++] = Script::CODE_MOVE_I0;
+ *reinterpret_cast<int *>(transition2text + i) = 1;
+ i += sizeof(int);
+ transition2text[i++] = Script::CODE_MOVE_A0;
+ *reinterpret_cast<Map **>(transition2text + i) = &map1;
+ i += sizeof(Map *);
+ transition2text[i++] = Script::CODE_MOVE_V0;
+ *reinterpret_cast<Vector<int> *>(transition2text + i) = Vector<int>(8, 3);
+ i += sizeof(Vector<int>);
+ transition2text[i++] = Script::CODE_SYSCALL;
+
+ Script transition2;
+ transition2.text = transition2text;
+ transition2.textlen = sizeof(transition2text);
+
+ triggers2[0].SetScript(&transition2);
+
+ gameState.heroes[0].MapEntity().Position() = Vector<float>(64, 128);
+
+ gameState.heroes[1].MapEntity().Position() = Vector<float>(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().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().SetFlags(Entity::FLAG_NONBLOCKING);
+ gameState.heroes[2].MapEntity().AddFollower(&gameState.heroes[3].MapEntity());
+
+ Entity mapPopulation[2];
+ map1.SetEntities(mapPopulation, 2);
SDL_Surface *mapMonsterImg(IMG_Load("test-data/monster-map.png"));
Sprite mapMonsterSprite(mapMonsterImg, 32, 32);
SimpleAnimation mapMonsterAnimation(&mapMonsterSprite, 500, 2, 0, 0, true);
- Entity mapMonster;
- mapMonster.SetAnimation(&mapMonsterAnimation);
- mapMonster.Position() = Vector<float>(64, 32);
- mapMonster.SetOrientation(Entity::ORIENTATION_SOUTH);
+ mapPopulation[0].SetAnimation(&mapMonsterAnimation);
+ mapPopulation[0].Position() = Vector<float>(64, 32);
+ mapPopulation[0].SetOrientation(Entity::ORIENTATION_SOUTH);
+ mapPopulation[0].SetPartyLayout(&monstersLayout);
+ mapPopulation[0].SetMonsters(&monster, 1);
+
+ Sprite blockSprite(tilesetImg, tileSize, tileSize, 3 * tileSize, 1 * tileSize);
+ mapPopulation[1].SetSprite(&blockSprite);
+ mapPopulation[1].Position() = Vector<float>(64, 160);
+ mapPopulation[1].SetFlags(Entity::FLAG_PUSHABLE | Entity::FLAG_FIXED_ORIENTATION);
InitScreen screen(width, height);
app::State *state(0);
if (battle) {
- BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
+ BattleState *battleState(new BattleState(&gameConfig, bg, &monstersLayout));
battleState->AddMonster(monster);
battleState->AddMonster(monster);
battleState->AddMonster(monster);
battleState->AddMonster(monster);
- battleState->AddHero(maxim);
- battleState->AddHero(selan);
- battleState->AddHero(guy);
- battleState->AddHero(dekar);
+ battleState->AddHero(gameState.heroes[0]);
+ battleState->AddHero(gameState.heroes[1]);
+ battleState->AddHero(gameState.heroes[2]);
+ battleState->AddHero(gameState.heroes[3]);
state = battleState;
} else {
- MapState *mapState(new MapState(&map1));
-
- mapState->AddEntity(&mapMaxim);
- mapState->AddEntity(&mapSelan);
- mapState->AddEntity(&mapGuy);
- mapState->AddEntity(&mapDekar);
+ MapState *mapState(new MapState(&gameConfig, &map1));
- mapState->ControlEntity(&mapMaxim);
+ mapState->ControlEntity(&gameState.heroes[0].MapEntity());
mapState->SetWalkingSpeed(walkSpeed);
-
- mapState->AddEntity(&mapMonster);
- mapMonster.StartAnimation(*mapState);
+ mapPopulation[0].StartAnimation(*mapState);
state = mapState;
}
projects / l2e.git / blobdiff