X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=daeb3c4e1441f219e4fa78a6907e95cf8a64681f;hb=795bcbebfc3a63f374f8da0790af5b7105adb68a;hp=84fb710ee07e2e350e2f7ea3f71b6e3cbfe73d0c;hpb=32be49517984befd2f8bc4b8f7edc2fec963a1da;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 84fb710..daeb3c4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,8 +74,6 @@ int main(int argc, char **argv) {
 	const int width = 800;
 	const int height = 480;
 
-	const int framerate = 33;
-
 //	std::srand(std::time(0));
 
 	try {
@@ -130,7 +128,7 @@ int main(int argc, char **argv) {
 		battleRes.activeHeroTagFrame = intp.GetFrame("activeHeroTagFrame");
 		battleRes.smallHeroTagFrame = intp.GetFrame("smallHeroTagFrame");
 		battleRes.lastSmallHeroTagFrame = intp.GetFrame("lastSmallHeroTagFrame");
-		battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31);
+		battleRes.heroesBgColor = intp.GetColor("heroesBgColor").MapRGB(screen.Screen()->format);
 
 		battleRes.healthGauge = intp.GetGauge("healthGauge");
 		battleRes.manaGauge = intp.GetGauge("manaGauge");
@@ -185,10 +183,6 @@ int main(int argc, char **argv) {
 		battleRes.itemMenuHeadline = intp.GetString("itemMenuHeadline");
 		battleRes.itemMenuPrototype = Menu<const common::Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 15, 6, 8, 16, 1, 32, 2, ':');
 
-		SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png"));
-		Sprite swordAttackSprite(swordAttackImg, 96, 96);
-		SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4);
-
 		maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
 		maxim.SetArmor(intp.GetItem("zirconArmorItem"));
 		maxim.SetShield(intp.GetItem("holyShieldItem"));
@@ -203,100 +197,25 @@ int main(int argc, char **argv) {
 		selan.SetRing(intp.GetItem("ghostRingItem"));
 		selan.SetJewel(intp.GetItem("eagleRockItem"));
 
-		Item zircoAx;
-		zircoAx.SetName("Zirco ax");
-		zircoAx.SetMenuIcon(intp.GetSprite("axIcon"));
-		zircoAx.GetTargetingMode().TargetSingleEnemy();
-		Ikari torrent;
-		torrent.SetName("Torrent");
-		torrent.SetCost(224);
-		torrent.GetTargetingMode().TargetAllEnemies();
-		torrent.SetPhysical();
-		zircoAx.SetIkari(&torrent);
-//		guy.SetWeapon(&zircoAx);
+//		guy.SetWeapon(intp.GetItem("zircoAxItem"));
 		guy.SetArmor(intp.GetItem("zirconArmorItem"));
-		Item megaShield;
-		megaShield.SetName("Mega shield");
-		megaShield.SetMenuIcon(intp.GetSprite("shieldIcon"));
-		Ikari ironBarrier;
-		ironBarrier.SetName("Iron barrier");
-		ironBarrier.SetCost(255);
-		ironBarrier.GetTargetingMode().TargetAllAllies(); // actually only targets self
-		ironBarrier.SetMagical();
-		megaShield.SetIkari(&ironBarrier);
-		guy.SetShield(&megaShield);
-		Item zircoHelmet;
-		zircoHelmet.SetName("Zirco helmet");
-		zircoHelmet.SetMenuIcon(intp.GetSprite("helmetIcon"));
-		Ikari slow;
-		slow.SetName("Slow");
-		slow.SetCost(196);
-		slow.GetTargetingMode().TargetAllEnemies();
-		slow.SetPhysical();
-		zircoHelmet.SetIkari(&slow);
-		guy.SetHelmet(&zircoHelmet);
-		Item powerRing;
-		powerRing.SetName("Power ring");
-		powerRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-		Ikari trick;
-		trick.SetName("Trick");
-		trick.SetCost(32);
-		trick.GetTargetingMode().TargetAllEnemies();
-		trick.SetMagical();
-		zircoHelmet.SetIkari(&trick);
-		guy.SetRing(&powerRing);
+		guy.SetShield(intp.GetItem("megaShieldItem"));
+		guy.SetHelmet(intp.GetItem("zircoHelmetItem"));
+		guy.SetRing(intp.GetItem("powerRingItem"));
 		guy.SetJewel(intp.GetItem("evilJewelItem"));
 
 		// NOTE: this is actually Artea equipment
-		Item lizardBlow;
-		lizardBlow.SetName("Lizard blow");
-		lizardBlow.SetMenuIcon(intp.GetSprite("swordIcon"));
-		lizardBlow.GetTargetingMode().TargetSingleEnemy();
-		Ikari dragonRush;
-		dragonRush.SetName("Dragon rush");
-		dragonRush.SetCost(164);
-		dragonRush.GetTargetingMode().TargetSingleEnemy();
-		dragonRush.SetPhysical();
-		lizardBlow.SetIkari(&dragonRush);
-//		dekar.SetWeapon(&lizardBlow);
-		Item holyRobe;
-		holyRobe.SetName("Holy robe");
-		holyRobe.SetMenuIcon(intp.GetSprite("armorIcon"));
-		Ikari crisisCure;
-		crisisCure.SetName("Crisis cure");
-		crisisCure.SetCost(164);
-		crisisCure.GetTargetingMode().TargetAllAllies();
-		crisisCure.SetMagical();
-		holyRobe.SetIkari(&crisisCure);
-		dekar.SetArmor(&holyRobe);
+//		dekar.SetWeapon(intp.GetItem("lizardBlowItem"));
+		dekar.SetArmor(intp.GetItem("holyRobeItem"));
 		dekar.SetShield(intp.GetItem("zircoGlovesItem"));
 		dekar.SetHelmet(intp.GetItem("holyCapItem"));
-		Item rocketRing;
-		rocketRing.SetName("Rocket ring");
-		rocketRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-		Ikari fake;
-		fake.SetName("Fake");
-		fake.SetCost(32);
-		fake.GetTargetingMode().TargetSingleAlly();
-		fake.SetMagical();
-		rocketRing.SetIkari(&fake);
-		dekar.SetRing(&rocketRing);
-		Item krakenRock;
-		krakenRock.SetName("Kraken rock");
-		krakenRock.SetMenuIcon(intp.GetSprite("jewelIcon"));
-		Ikari tenLegger;
-		tenLegger.SetName("Ten-legger");
-		tenLegger.SetCost(164);
-		tenLegger.GetTargetingMode().TargetAllEnemies();
-		tenLegger.SetPhysical();
-		rocketRing.SetIkari(&tenLegger);
-		dekar.SetJewel(&krakenRock);
+		dekar.SetRing(intp.GetItem("rocketRingItem"));
+		dekar.SetJewel(intp.GetItem("krakenRockItem"));
 
-		battleRes.ikariMenuHeadline = "Please choose equipment.";
-		battleRes.noEquipmentText = "No equip";
+		battleRes.ikariMenuHeadline = intp.GetString("ikariMenuHeadline");
+		battleRes.noEquipmentText = intp.GetString("noEquipmentText");
 		battleRes.ikariMenuPrototype = Menu<const Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 12, 6, intp.GetFont("normalFont")->CharHeight() / 2, intp.GetFont("normalFont")->CharWidth(), 1, intp.GetFont("normalFont")->CharWidth() * 2, 0, ':', 12, intp.GetFont("normalFont")->CharWidth());
-
-		battleRes.escapeText = "Escapes.";
+		battleRes.escapeText = intp.GetString("escapeText");
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);