X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=11334172decbda3f477e0c93f2db55320876fb7e;hb=07acf9a898e295587b9034bee6b8682e11a97086;hp=117ce39cb74e61b5b7e233cdc8db991f5b85b622;hpb=15d92b3097a80faf26b8ce4cb4a6b957d17bc092;p=hbs.git

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 117ce39..1133417 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -22,12 +22,12 @@ using namespace std;
 
 //Static variables
 map<string, vector<int> > Fleet::s_Races;
-map<string, UnitType > Fleet::s_Units;
+UnitList Fleet::s_Units;
 
 Fleet::Fleet()
 {
 	m_iETA = 0;
-	m_sRace = "Generic";
+	m_sRace = "Cathaar";
 }
 Fleet::~Fleet(){
 }
@@ -41,7 +41,7 @@ void Fleet::setName(string sName)
 
 //////////////////////////////////////////////////////////////////////////
 //
-string Fleet::Name() const
+string Fleet::name() const
 {
 	return m_sName;
 }
@@ -65,7 +65,7 @@ bool Fleet::setRace(string sRace)
 
 //////////////////////////////////////////////////////////////////////////
 //
-string Fleet::Race() const
+string Fleet::race() const
 {
 	return m_sRace;
 }
@@ -75,7 +75,7 @@ string Fleet::Race() const
 /** This function iterates through m_Fleet and adds all numbers together to
  * produce a total.
  */
-int Fleet::NumberOfShips() const
+int Fleet::numberOfShips() const
 {
 	int total = 0;
 
@@ -110,30 +110,33 @@ void Fleet::setRaces(map<string, vector<int> >& races)
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Fleet::setUnits(map<string, UnitType>& units)
+void Fleet::setUnits(UnitList& units)
 {
 	s_Units = units;
 
-	for (map<string, UnitType >::iterator i = s_Units.begin(); i != s_Units.end(); i++)
+	/*
+
+	for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); i++)
 	{
 		cerr << s_Units[(*i).first].Name() << "\t\t"
-			<< s_Units[(*i).first].Race() <<"\t"
-			<< s_Units[(*i).first].Class() << "\t"
-			<< s_Units[(*i).first].Target(0) << "\t"
-			<< s_Units[(*i).first].Target(1) << "\t"
-			<< s_Units[(*i).first].Target(2) << "\t"
-			<< s_Units[(*i).first].Initiative() << "\t"
-			<< s_Units[(*i).first].Agility() << "\t"
-			<< s_Units[(*i).first].WeaponSpeed() << "\t"
-			<< s_Units[(*i).first].Guns() << "\t"
-			<< s_Units[(*i).first].Power() << "\t"
-			<< s_Units[(*i).first].Armor() << "\t"
+			<< s_Units[(*i).first].race() <<"\t"
+			<< s_Units[(*i).first].unitClass() << "\t"
+			<< s_Units[(*i).first].target(0) << "\t"
+			<< s_Units[(*i).first].target(1) << "\t"
+			<< s_Units[(*i).first].target(2) << "\t"
+			<< s_Units[(*i).first].initiative() << "\t"
+			<< s_Units[(*i).first].agility() << "\t"
+			<< s_Units[(*i).first].weaponSpeed() << "\t"
+			<< s_Units[(*i).first].guns() << "\t"
+			<< s_Units[(*i).first].power() << "\t"
+			<< s_Units[(*i).first].armor() << "\t"
 			<< s_Units[(*i).first].EMP() << "\t"
-			<< s_Units[(*i).first].TotRes() << "\t"
-			<< s_Units[(*i).first].Fuel() << "\t"
+			<< s_Units[(*i).first].totRes() << "\t"
+			<< s_Units[(*i).first].fuel() << "\t"
 			<< s_Units[(*i).first].ETA() << "\t"
-			<< s_Units[(*i).first].Type() << endl;
+			<< s_Units[(*i).first].type() << endl;
 	}
+	*/
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -145,7 +148,7 @@ const map<string, vector<int> >& Fleet::Races()
 
 //////////////////////////////////////////////////////////////////////////
 //
-const map<string, UnitType>& Fleet::Units()
+const UnitList& Fleet::Units()
 {
 	return s_Units;
 }
@@ -157,3 +160,40 @@ vector<int> Fleet::RacesAllowed() const
 	return s_Races[m_sRace];
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+unsigned Fleet::score(int tick = 0) const
+{
+	unsigned tot_score = 0;
+
+	for (FleetList::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i)
+	{
+		tot_score += i->second[tick] * s_Units[i->first].totRes() / 10;
+	}
+
+	return tot_score;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::setFleet(string unittype, int number)
+{
+	if (m_Fleet[unittype].size() == 0)
+	{
+		m_Fleet[unittype].push_back(number);
+		return;
+	}
+	m_Fleet[unittype][0] = number;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+int	 Fleet::fleet(string unittype, int tick = 0)
+{
+	if (m_Fleet[unittype].size() == 0)
+		return 0;
+
+	return m_Fleet[unittype][tick];
+}
+
+