X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a890871fb4c162dd12399ff1baa0190f5a6d7dc8;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=31724d5b22acd42f67b0222f8a954234c77981ad;hpb=0285546b22f9e8f496ca6b1abffdd232647b6b6a;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 31724d5..a890871 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,10 +2,12 @@
 #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"
@@ -15,7 +17,8 @@
 #include "common/Script.h"
 #include "common/Spell.h"
 #include "common/Stats.h"
-#include "geometry/Vector.h"
+#include "math/Vector.h"
+#include "graphics/CharSelect.h"
 #include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -55,11 +58,12 @@ using app::Input;
 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 math::Vector;
 using graphics::Texture;
 using loader::Caster;
 using loader::Interpreter;
@@ -99,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();
@@ -107,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();
@@ -190,6 +196,13 @@ 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");
@@ -220,7 +233,9 @@ int main(int argc, char **argv) {
 		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);
@@ -287,6 +302,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]);