X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fplanet.cpp;h=c374a99ff9cc7f726fd18392cad21aeb0890a5b2;hp=a5541cbebaee4b89dd68d5f79d9de96d6d94838a;hb=bd23b35be6c105946c9ecf87785f409f69a24714;hpb=ac13ca5453360c59eaa0b8ad4242ea0837825bc1

diff --git a/bs/planet.cpp b/bs/planet.cpp
index a5541cb..c374a99 100644
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -17,6 +17,7 @@
 
 #include "planet.h"
 
+#include <iostream>
 using namespace std;
 
 Planet::Planet()
@@ -64,6 +65,7 @@ int Planet::roids(std::string type, int tick = 0) const
 
 	if( ticks == 0)
 		return 0;
+	--ticks;
 	if (ticks < tick)
 		return roids->at(ticks);
 	return roids->at(tick);
@@ -71,18 +73,43 @@ int Planet::roids(std::string type, int tick = 0) const
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Planet::setRoids(std::string type, int number)
+void Planet::setRoids(std::string type, int number, int tick = 0)
 {
-	if (m_Roids[type].size() == 0)
-		m_Roids[type].push_back(number);
-	m_Roids[type][0] = number;
+	int ticks = m_Roids[type].size();
+	int roids = 0;
+	if (m_Roids[type].size() > 0)
+		roids = m_Roids[type][m_Roids[type].size() - 1];
+
+	for (int i = ticks; i <= tick; ++i )
+		m_Roids[type].push_back(roids);
+	m_Roids[type][tick] = number;
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void Planet::takeRoids(std::string type, int number, int tick = 0)
+{
+	int ticks = m_Roids[type].size();
+	int roids = 0;
+	if (m_Roids[type].size() > 0)
+		roids = m_Roids[type][m_Roids[type].size() - 1];
+
+	for (int i = ticks; i <= tick; ++i )
+		m_Roids[type].push_back(roids);
+	m_Roids[type][tick] -= number;
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////
 //
 void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile)
 {
-	for(int tick = 1; ; ++tick)
+	if (hostile.size() == 0)
+			return;
+
+	int skipped = 0;
+	for(int tick = 1; skipped < 20; ++tick)
 	{
 		//See who's in the battle at the current tick
 		vector<Fleet*> friends = calculateSide(friendly, 6, tick);
@@ -90,24 +117,125 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 
 		// No idea to calculate anything if noone is there.. ;)
 		if (hostiles.size() == 0)
-			break;
+		{
+			skipped++;
+			continue;
+		}
+		else
+			skipped = 0;
 
 		Planet allFriends;
-		allFriends.addToThis(friends);
+		allFriends.addToThis(friends, tick - 1);
+
+		/*for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
+			allFriends.setRoids(i->first, roids(i->first, tick));
+
+		allFriends.setPlanetScore(m_iScore);*/
 		
 		Fleet allHostiles;
-		allHostiles.addToThis(hostiles);
+		allHostiles.addToThis(hostiles, tick - 1);
+
+		map<string, map<string, int> > stealfriendly;
+		map<string, map<string, int> > stealhostile;
+		
+		calcOneTick(&allFriends, &allHostiles, stealfriendly, stealhostile, tick );
 
-		calcOneTick(&allFriends, &allHostiles);
+		//allFriends.printFleet();
 
 		allFriends.distributeLossesGains(friends, tick);
-		allHostiles.distributeLossesGains(friends, tick);
+		allHostiles.distributeLossesGains(hostiles, tick);
+		allHostiles.distributeCappedRoids(hostiles, tick);
+
+	/*	for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
+			setRoids(i->first, roids(i->first, 1), tick);*/
+	}
+
+	for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
+	{
+		for (vector<int>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+			cout << i->first << " roids : " << (*j) << endl;
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Planet::calcOneTick(Planet* friendly, Fleet* Hostile)
+void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string, std::map<std::string, int> >& stealfriendly, std::map<std::string, std::map<std::string, int> >&  stealhostile, int tick = 0)
 {
+	map<int, string> unitsinit; // order units after their ininitiative
+	for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i)
+		unitsinit[i->second.initiative()] = i->first;
+
+	for (map<int, string>::iterator i = unitsinit.begin(); i != unitsinit.end(); ++i)
+	{
+		Fleet* hostiletemp = new Fleet(*hostile);
+		Planet* friendlytemp = new Planet(*friendly);
+		
+		string unittype = i->second;
+
+		//cerr << "Initiative: " << s_Units[unittype].initiative() << " with unit: " << unittype << endl;
+
+		if (s_Units[unittype].type() == "EMP")	
+		{
+			hostiletemp->takeEMP(unittype, friendly->freeFleet(unittype, 1));
+			friendlytemp->takeEMP(unittype, hostile->freeFleet(unittype, 1));
+		}
+		else if (s_Units[unittype].type() == "Steal")
+		{
+			hostiletemp->takeShoot(unittype, friendly->freeFleet(unittype, 1), stealfriendly[unittype]);
+			friendlytemp->takeShoot(unittype, hostile->freeFleet(unittype, 1), stealhostile[unittype]);
+		}
+		else
+		{
+			map<string, int> temp;
+			hostiletemp->takeShoot(unittype, friendly->freeFleet(unittype, 1), temp);
+			friendlytemp->takeShoot(unittype, hostile->freeFleet(unittype, 1), temp);
+		}
+
+		if (s_Units[unittype].type() == "Pod")
+		{
+			if (m_iScore > 0)
+			{
+				float capping = float(m_iScore) / hostile->score() /  10;
+			
+				cerr << "Capping is: " << capping << endl;
+	
+				if (capping > 0.15)
+					capping = 0.15;
+				if (capping > 0)
+				{
+					for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid)
+					{
+						int caproids = capping * roids(roid->first, tick - 1);
+						int freepods = hostiletemp->freeFleet(unittype, 1);
+		
+						cerr << "Possible to steal " << caproids << " " << roid->first << " roids\n";
+						cerr << freepods << " free pods available\n";
+						
+						if (freepods <= 0)
+							break;
+						if (freepods < caproids)
+							caproids = freepods;
+		
+						cerr << caproids << " roids stolen\n";
+							
+						takeRoids(roid->first, caproids, tick);
+		
+						//FIXME: Going to move this to the distribute roids section instead..
+						hostiletemp->killFleet(unittype, caproids, 1);
+						//int totroids = caproids + hostiletemp->resource(roid->first, 0);
+						hostiletemp->addResource(roid->first, caproids, 1);
+						
+						cerr << caproids << " stolen " << roid->first << " roids\n";
+					}
+				}
+			}
+		}
+
+		//set the the objects so they point at the modified objects
+		*friendly = *friendlytemp;
+		delete friendlytemp;
+		*hostile = *hostiletemp;
+		delete hostiletemp;
+	}
 }