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

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 136ad22..3df0972 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -28,6 +28,7 @@ UnitList Fleet::s_Units;
 Fleet::Fleet()
 {
 	m_iETA = 0;
+	m_iStays = 3;
 	m_sRace = "Cathaar";
 }
 
@@ -332,12 +333,12 @@ std::vector<Fleet*> Fleet::calculateSide(std::vector<Fleet*> fleets, int stays =
 	vector<Fleet*> fl;
 	for (vector<Fleet*>::iterator i = fleets.begin(); i != fleets.end(); ++i)
 	{
-		if (( tick - (*i)->ETA()) >= 0 && (tick - (*i)->ETA()) < stays)
+		if (( tick - (*i)->ETA()) >= 0 && (tick - (*i)->ETA()) < (*i)->stays())
 		{
 			fl.push_back((*i));
 			cerr << "Using fleet " << (*i)->name() << " for tick " << tick << endl;
 		}
-		else if ((*i)->name() == "Home Planet")
+		else if ((*i)->stays() < 0)
 			fl.push_back((*i));
 	}
 	return fl;
@@ -712,9 +713,38 @@ void Fleet::distributeCappedRoids(std::vector<Fleet*> fleets, int tick = 0)
 
 //////////////////////////////////////////////////////////////////////////
 //
-
 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);
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+int Fleet::stays() const
+{
+	return m_iStays;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::setStays(int ticks)
+{
+	m_iStays = ticks;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::calculateLostStealships(string unittype, std::map<std::string, int> stolen, int tick = 1)
+{
+	int stealscore = 0;
+	for (map<string, int>::iterator i = stolen.begin(); i != stolen.end(); ++i)
+	{
+		stealscore += stolen[i->first] * (s_Units[i->first].totRes() / 10.0);	
+	}
+
+	int lost = stealscore / (s_Units[unittype].totRes() / 10.0);
+
+	cerr << "Lost " << lost << " " << unittype << " due to stealing ships worth: " << stealscore << endl; 
+	killFleet(unittype, lost, tick);
+}