X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fplanet.cpp;h=3e1f39ae65eab751585cde681e1cddc6789c67bd;hb=b355aa1be760bf03c9be4bfa581f320e2e045eac;hp=443b3b13695a31c2ba7d71854750acfcc2bd3241;hpb=8589e08e508806885b737682ed25b6f711d0fdee;p=hbs.git

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 443b3b1..3e1f39a 100644
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -23,7 +23,6 @@ using namespace std;
 Planet::Planet()
 {
 	m_sRace = "Planet";
-	m_iScore = 0;
 }
 
 Planet::~Planet(){
@@ -31,18 +30,53 @@ Planet::~Planet(){
 
 //////////////////////////////////////////////////////////////////////////
 //
-unsigned Planet::planetScore() const
+unsigned Planet::planetScore(int tick = 0) const
 {
-	return m_iScore;
+	int ticks = m_Score.size();
+	if (ticks == 0)
+		return 0;
+
+	--ticks;
+
+	if (ticks < tick)
+		return m_Score[ticks];
+
+	return m_Score[tick];
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Planet::setPlanetScore(unsigned i)
+void Planet::setPlanetScore(unsigned number, int tick = 0)
 {
-	m_iScore = i;
+	int earlier = 0;
+	int ticks = m_Score.size();
+
+	if (ticks != 0)
+		earlier = m_Score[ticks - 1];
+
+	for (int i = ticks; i <= tick; ++i)
+	{
+		m_Score.push_back(earlier);
+	}
+	m_Score[tick] = number;
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void Planet::addPlanetScore(unsigned number, int tick = 0)
+{
+	int earlier = 0;
+	int ticks = m_Score.size();
+
+	if (ticks != 0)
+		earlier = m_Score[ticks - 1];
+
+	for (int i = ticks; i <= tick; ++i)
+	{
+		m_Score.push_back(earlier);
+	}
+	m_Score[tick] += number;
+}
 //////////////////////////////////////////////////////////////////////////
 //
 int Planet::roids(std::string type, int tick = 0) const
@@ -137,6 +171,13 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 
 		map<string, map<string, int> > stealfriendly;
 		map<string, map<string, int> > stealhostile;
+
+		//Reset roids
+		for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid)
+			setRoids(roid->first, roids(roid->first, tick-1), tick);
+
+		setPlanetScore(planetScore(tick - 1), tick);
+		
 		
 		calcOneTick(&allFriends, &allHostiles, stealfriendly, stealhostile, tick );
 
@@ -144,6 +185,9 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 
 		allFriends.distributeLossesGains(friends, tick);
 		allHostiles.distributeLossesGains(hostiles, tick);
+		allHostiles.distributeCappedRoids(hostiles, tick);
+
+		calculateScoreLoss(friends, tick);
 
 	/*	for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
 			setRoids(i->first, roids(i->first, 1), tick);*/
@@ -192,38 +236,39 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string,
 
 		if (s_Units[unittype].type() == "Pod")
 		{
-			if (m_iScore <= 0) break;
-			float capping = float(m_iScore) / hostile->score() /  10;
+			if (planetScore(tick - 1) > 0)
+			{
+				setCapping(float(planetScore(tick - 1)) / hostile->score() /  10, tick);
 			
-			cerr << "Capping is: " << capping << endl;
-
-			if (capping > 0.15)
-				capping = 0.15;
-			if (capping <= 0)
-				break;
+				cerr << "Capping is: " << capping(tick) << endl;
+	
+				if (capping(tick) > 0)
+				{
+					for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid)
+					{
+						int caproids = capping(tick) * 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";
 
-			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);
-
-				hostiletemp->killFleet(unittype, caproids, 1);
-				int totroids = caproids + hostiletemp->resource(roid->first, 0);
-				hostiletemp->setResource(roid->first, totroids, 1);
-				
-				cerr << totroids << " stolen " << roid->first << " roids\n";
+						takeRoids(roid->first, caproids, tick);
+		
+						//FIXME: Going to move this to the distribute roids section instead.. Not really move, I'll keep this, but "regenerate" the pods in the distribute ships function.
+						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";
+					}
+				}
 			}
 		}
 
@@ -235,3 +280,47 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string,
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void Planet::calculateScoreLoss(std::vector<Fleet*> friendly, int tick = 1)
+{
+	for (vector<Fleet*>::iterator i = friendly.begin(); i != friendly.end(); ++i)
+	{
+		if ((*i)->name().find("Home") != string::npos)
+		{
+			int scorechange = (*i)->score(tick) - (*i)->score(tick - 1);
+			addPlanetScore(scorechange, tick);
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+float Planet::capping(int tick = 0)
+{
+	int ticks = m_Capping.size();
+
+	--ticks;
+
+	if (ticks < tick)
+		return 0;
+
+	return m_Capping[tick];
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Planet::setCapping(float capping, int tick = 0)
+{
+	int ticks = m_Capping.size();
+
+	for (int i = ticks; i <= tick; ++i)
+	{
+		m_Capping.push_back(0);
+	}
+
+	if (capping <= 0.15 && capping >= 0)
+		m_Capping[tick] = capping;
+	else
+		m_Capping[tick] = 0.15;
+}