X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fplanet.cpp;h=4133277d62d7cc080abfee462df05db499a9756e;hp=d62bf579996a1f0d583a66302fce706531c9ac59;hb=b308a9445cfe1883ea8068d3f4d1a04bfcff9aa8;hpb=7311d423f454c500dbc60dd822007da3981b0d56

diff --git a/bs/planet.cpp b/bs/planet.cpp
index d62bf57..4133277 100644
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -149,10 +149,10 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 	int skipped = 0;
 
 	for (vector<Fleet*>::iterator i = friendly.begin(); i != friendly.end(); ++i)
-		(*i)->resetResources();
+		(*i)->resetTicks();
 
 	for (vector<Fleet*>::iterator i = hostile.begin(); i != hostile.end(); ++i)
-		(*i)->resetResources();
+		(*i)->resetTicks();
 
 	for(int tick = 1; skipped < 20; ++tick)
 	{
@@ -197,9 +197,11 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 		//allFriends.printFleet();
 
 		allFriends.distributeLossesGains(friends, tick);
+		allFriends.distributeStolenShips(stealfriendly, friends, tick);
 
 		allHostiles.distributeLossesGains(hostiles, tick);
 		allHostiles.distributeCappedRoids(hostiles, tick);
+		allHostiles.distributeStolenShips(stealhostile, hostiles, tick);
 
 		calculateScoreLoss(friends, tick);
 
@@ -207,6 +209,9 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 			setRoids(i->first, roids(i->first, 1), tick);*/
 	}
 
+	for (vector<Fleet*>::iterator i = friendly.begin(); i != friendly.end(); ++i)
+		(*i)->calculateSalvage();
+
 	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)
@@ -346,6 +351,8 @@ void Planet::setCapping(float capping, int tick = 0)
 
 	if (capping <= 0.15 && capping >= 0)
 		m_Capping[tick] = capping;
-	else
+	else if (capping >= 0.15)
 		m_Capping[tick] = 0.15;
+	else
+		m_Capping[tick] = 0;
 }