X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=136ad22ac8a77860265672eae5db422a012eb978;hb=217cda78005f993fd6b2e575d4abd97c93cec655;hp=1cdc04fb9d1a3e49e022d2a8ca4fc68175f81090;hpb=1c8c7800411f2491d9be16c0f1515a91525f2e56;p=hbs.git

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 1cdc04f..136ad22 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -201,6 +201,23 @@ void Fleet::setFleet(string unittype, int number, int tick = 0)
 	m_Fleet[unittype][tick] = number;
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::addFleet(std::string unittype, int number, int tick = 0)
+{
+	int earlier = 0;
+	int ticks = m_Fleet[unittype].size();
+
+	if (ticks != 0)
+		earlier = m_Fleet[unittype][ticks - 1];
+
+	for (int i = ticks; i <= tick; ++i)
+	{
+		m_Fleet[unittype].push_back(earlier);
+	}
+	m_Fleet[unittype][tick] += number;
+}
+
 //////////////////////////////////////////////////////////////////////////
 //
 int	 Fleet::fleet(string unittype, int tick = 0)
@@ -374,7 +391,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;
@@ -478,6 +496,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;
 
@@ -514,7 +535,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();
@@ -568,10 +589,7 @@ void Fleet::addResource(std::string type, int number, int tick = 0)
 {
 
 	int ticks = m_Resources[type].size();
-	int latest = 0;
-
-	if (ticks > 0)
-		latest = m_Resources[type][ticks - 1];
+	int latest = resource(type, tick - 1);
 
 	for (int i = ticks; i <= tick; ++i)
 		m_Resources[type].push_back(latest);
@@ -582,6 +600,9 @@ void Fleet::addResource(std::string type, int number, int tick = 0)
 //
 int Fleet::resource(std::string type, int tick = 0) const
 {
+	if (tick < 0)
+		return 0;
+
 	vector<int>const* resource = 0;
 	for (ResourceList::const_iterator i = m_Resources.begin(); i != m_Resources.end(); ++i)
 	{
@@ -606,6 +627,13 @@ int Fleet::resource(std::string type, int tick = 0) const
 	return resource->at(tick);
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::resetResources()
+{
+	m_Resources.clear() ;	
+}
+
 //////////////////////////////////////////////////////////////////////////
 //
 void Fleet::printFleet()
@@ -650,6 +678,7 @@ void Fleet::distributeCappedRoids(std::vector<Fleet*> fleets, int tick = 0)
 	{
 		string res = i->first;
 
+
 		cerr << "Distributing type: " << res << endl;
 		for (vector<int>::iterator j = i->second.begin(); j != i->second.end(); ++j)
 			cout << (*j) << endl;
@@ -674,9 +703,18 @@ 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)->setResource(res, (*j)->resource(res,tick-1) + lost, tick);
+
+			//(*j)->setResource(res, (*j)->resource(res,tick-1) + lost, tick);
+			(*j)->addResource(res,lost, tick);
 		}
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
 
+void Fleet::addFleet(std::map<string, int> units, int tick = 0)
+{
+	for (map<string, int>::iterator i = units.begin(); i != units.end(); ++i)
+		addFleet(i->first, i->second, tick);
+}