X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=a15fba36788628798d041ce50c4745585d590737;hb=refs%2Ftags%2FHBS_0_3_2;hp=7070dae6d2a719c3162c5d2113237fa4a84b4383;hpb=bd23b35be6c105946c9ecf87785f409f69a24714;p=hbs.git

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 7070dae..a15fba3 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -217,6 +217,38 @@ int	 Fleet::fleet(string unittype, int tick = 0)
 	return m_Fleet[unittype][tick];
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+int Fleet::blockedFleet(std::string unittype, int tick = 0)
+{
+	int ticks = m_BlockedFleet[unittype].size();
+	if (ticks == 0)
+		return 0;
+
+	--ticks;
+
+	if (ticks < tick)
+		return 0;
+
+	return m_BlockedFleet[unittype][tick];
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::setBlockedFleet(std::string unittype, int number, int tick = 0)
+{
+	int ticks = m_BlockedFleet[unittype].size();
+
+	for (int i = ticks; i <= tick; ++i)
+	{
+		m_BlockedFleet[unittype].push_back(0);
+	}
+	m_BlockedFleet[unittype][tick] = number;
+
+	cerr << "This fleet got " << m_BlockedFleet[unittype][tick] << " blocked units tick: " << tick << endl;
+
+}
+
 //////////////////////////////////////////////////////////////////////////
 //FIXME
 void Fleet::addToThis(std::vector<Fleet*> fleets, int tick = 0)
@@ -263,8 +295,15 @@ void Fleet::distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
 			int fl1 = (*j)->fleet(unittype, tick - 1);
 			float part = float(fl1) / fleet(unittype, 0) ;
 			int lost =  totallost * part;
-			cerr << (*j)->name() << " gaining " << lost << " " << unittype  << " since it's " << part * 100 << "% of the whole fleet, and it had : " << fl1 << " units last tick.." <<  endl;
 			(*j)->setFleet(unittype, (*j)->fleet(unittype, tick - 1) + lost, tick);
+
+			cerr << (*j)->name() << " gaining " << lost << " " << unittype  << " since it's " << part * 100 << "% of the whole fleet, and it had : " << fl1 << " units last tick.." <<  endl;
+
+			lost = part * blockedFleet(unittype, 0);
+
+			cerr << (*j)->name() << " got " << lost << " blocked " << unittype  << ", the total number of blocked ships was: " << blockedFleet(unittype, 0) << endl; 
+
+			(*j)->setBlockedFleet(unittype, lost, tick);
 		}
 	}
 }
@@ -335,7 +374,8 @@ void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, in
 				if (m_Fleet[j->first].size() == 0)
 					continue;
 
-				if (m_Fleet[j->first].size() == 1)
+
+				if (m_Fleet[j->first].size() == 1 )
 					m_Fleet[j->first].push_back(m_Fleet[j->first][0]);
 
 				//cerr << "Target is class: " << j->second.type() << endl;
@@ -439,6 +479,9 @@ void Fleet::takeEMP(std::string unittype, int number)
 				if (j->second.type() == "PDS")
 					continue;
 
+				if (freeFleet(j->first, 1) <= 0)
+					continue;
+
 				if (m_Fleet[j->first].size() == 0)
 					continue;
 
@@ -475,7 +518,7 @@ void Fleet::takeEMP(std::string unittype, int number)
 				while (k > 0)	
 				{
 
-					if (*(j->second) <= 0)
+					if (*(j->second) <= blockedFleet(j->first, 1))
 						break;
 
 					int eres = s_Units[j->first].EMP();
@@ -635,7 +678,7 @@ void Fleet::distributeCappedRoids(std::vector<Fleet*> fleets, int tick = 0)
 			int lost =  totcapped * part;
 
 			cerr << (*j)->name() << " gaining " << lost << " " << res  << " since it's " << part * 100 << "% of the whole score, and it had : " << fl1 << " score last tick.. compared to fleet total of: " << score(0) <<  endl;
-			(*j)->addResource(res, lost, tick);
+			(*j)->setResource(res, (*j)->resource(res,tick-1) + lost, tick);
 		}
 	}
 }