X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=432f16595efadab7d1e8c479fa8cb03678ac7292;hb=e5701c8f3f1199264015c5d6e0f2a32515d5f6f8;hp=5f6b0155f01444431167c66f60abe72edbcb4c45;hpb=a2ce63f561d091d9c3af49987d74849f9450c16b;p=hbs.git

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 5f6b015..432f165 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -18,6 +18,7 @@
 #include "fleet.h"
 
 #include <iostream>
+#include <cstdlib>
 using namespace std;
 
 //Static variables
@@ -180,28 +181,34 @@ unsigned Fleet::score(int tick = 0) const
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Fleet::setFleet(string unittype, int number)
+void Fleet::setFleet(string unittype, int number, int tick = 0)
 {
-	if (m_Fleet[unittype].size() == 0)
+	if (m_Fleet[unittype].size() <= tick)
 	{
 		m_Fleet[unittype].push_back(number);
 		return;
 	}
-	m_Fleet[unittype][0] = number;
+	m_Fleet[unittype][tick] = number;
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
 int	 Fleet::fleet(string unittype, int tick = 0)
 {
-	if (m_Fleet[unittype].size() == 0)
+	int ticks = m_Fleet[unittype].size();
+	if (ticks == 0)
 		return 0;
 
+	--ticks;
+
+	if (ticks < tick)
+		m_Fleet[unittype][ticks];
+
 	return m_Fleet[unittype][tick];
 }
 
 //////////////////////////////////////////////////////////////////////////
-//
+//FIXME
 void Fleet::addToThis(std::vector<Fleet*> fleets, int tick = 0)
 {
 	for (UnitList::iterator i = s_Units.begin();  i != s_Units.end(); ++i)
@@ -226,6 +233,15 @@ void Fleet::distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
 //
 std::vector<Fleet*> Fleet::calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0)
 {
+	vector<Fleet*> fl;
+	for (vector<Fleet*>::iterator i = fleets.begin(); i != fleets.end(); ++i)
+	{
+		if (( tick - (*i)->ETA()) >= 0 && (tick - (*i)->ETA()) < stays)
+			fl.push_back((*i));
+		else if ((*i)->name() == "Home Planet")
+			fl.push_back((*i));
+	}
+	return fl;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -245,29 +261,132 @@ int Fleet::freeFleet(std:: string unittype, int tick = 0)
 //
 void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, int>& hitunits)
 {
+	int guns = s_Units[unittype].guns() * number;
+	int power = s_Units[unittype].power() * number;
+
+	int gunsleft = guns;
+	for (vector<string>::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i)
+	{
+
+		while (gunsleft > 0)
+		{
+	
+			map<string, int*> targets;
+
+			for (UnitList::iterator j = s_Units.begin(); j != s_Units.end(); ++j)
+			{
+				if (m_Fleet[j->first].size() == 0)
+					break;
+
+				if (m_Fleet[j->first].size() == 1)
+					m_Fleet[j->first].push_back(m_Fleet[j->first][0]);
+
+				if (m_Fleet[j->first][1] > 0 && (*i) == j->second.type())
+					targets[j->first] = &m_Fleet[j->first][1];
+			}
+
+			int total = 0;
+			for (map<string, int*>::iterator j = targets.begin(); j != targets.end(); ++j)
+				total += (*j->second);
+
+			for (map<string, int*>::iterator j = targets.begin(); j != targets.end(); ++j)
+			{
+				int maxguns = (*j->second)/total * guns;
+				
+
+				if (m_Armor[j->first] <= 0 || m_Armor[j->first] > s_Units[j->first].armor())
+					m_Armor[j->first] = s_Units[j->first].armor();
+				int k = maxguns;
+				while (k > 0)	
+				{
+
+					if (*(j->second) <= 0)
+						break;
+					k -= 100/(25+s_Units[unittype].weaponSpeed() - s_Units[j->first].agility());
+					m_Armor[j->first] -= s_Units[unittype].power();
+					if (m_Armor[j->first] <= 0)
+					{
+						m_Armor[j->first] = s_Units[j->first].armor();
+						(*j->second)--;
+						
+						//There is a chance that we're hitting a blocked ship.
+						if (m_BlockedFleet[j->first].size() >= 1)
+						{
+							int test = rand() % m_BlockedFleet[j->first][0];
+							if (test == 1
+								&& m_BlockedFleet[j->first][0] > 0)
+							{
+								if (m_BlockedFleet[j->first].size() == 1)
+									m_BlockedFleet[j->first].push_back(m_BlockedFleet[j->first][0] - 1);
+								else if (m_BlockedFleet[j->first][1] > 0)
+									m_BlockedFleet[j->first][1]--;
+							}
+						}
+					}
+				}
+				if (k <= 0)
+					gunsleft -= maxguns;
+				else
+					gunsleft -= maxguns - k;
+			}
+		}
+	}
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
 void Fleet::takeEMP(std::string unittype, int number)
 {
+
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
 void Fleet::killFleet(std::string unittype, int number, int tick = 0)
 {
+	if (m_Fleet[unittype].size() <= tick)
+	{
+		m_Fleet[unittype].push_back(m_Fleet[unittype][m_Fleet[unittype].size()] - number);
+		return;
+	}
+	m_Fleet[unittype][tick] -= number;
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-void setResource(std::string type, int number, int tick = 0)
+void Fleet::setResource(std::string type, int number, int tick = 0)
 {
+
+	if (m_Resources[type].size() <= tick)
+		m_Resources[type].push_back(number);
+	m_Resources[type][tick] = number;
 }
 
 //////////////////////////////////////////////////////////////////////////
 //
-int resource(std::string type, int tick = 0)
+int Fleet::resource(std::string type, int tick = 0) const
 {
+	vector<int>const* resource = 0;
+	for (ResourceList::const_iterator i = m_Resources.begin(); i != m_Resources.end(); ++i)
+	{
+		if (i->first == type)
+		{
+			resource = &i->second;
+			break;
+		}
+	}
+	if (resource == 0)
+		return 0;
+
+	int ticks = resource->size();
+
+	if( ticks == 0)
+		return 0;
+
+	--ticks;
+
+	if (ticks < tick)
+		return resource->at(ticks);
+	return resource->at(tick);
 }