X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.h;h=b706bbd919bdb03b3a358ed1ee27a9c8a6b52e1c;hb=e5701c8f3f1199264015c5d6e0f2a32515d5f6f8;hp=c156545971078d921634f96fddecc7c41dd87795;hpb=5940cfda3be2c7b4ecbd64c814948b29139177c0;p=hbs.git

diff --git a/bs/fleet.h b/bs/fleet.h
index c156545..b706bbd 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -28,8 +28,10 @@
 typedef std::map<std::string, std::vector<int> > FleetList;
 typedef std::map<std::string, UnitType>	UnitList;
 typedef std::map<std::string, std::vector<int> > RaceList;
-//!This is the engine for the whole battlesystem.
-/**This is the engine for the whole battlesystem.
+typedef std::map<std::string, std::vector<int> > ResourceList;
+typedef std::map<std::string, int> ArmorList;
+//! An abstraction of a fleet and the engine for the battle simulation.
+/**This class and it's derivates is  the engine for the whole battlesystem.
   *	One of the few parts that I plan make fully portable.
   *\todo LOTS (I think ;)
   *@author Michael Andreen
@@ -85,19 +87,44 @@ public:
 	 * \param tick tells the function what tick you want the score from. 0 is 
 	 * initial score before the fleet has landed.
 	 */
-	virtual unsigned score(int tick = 0) const;
+	unsigned score(int tick = 0) const;
 
+	void setFleet(std::string unittype, int number, int tick = 0);
+	int	 fleet(std::string unittype, int tick = 0);
+
+	int freeFleet(std:: string unittype, int tick = 0);
+	
 	static void setRaces(RaceList& races);
 	static void setUnits(UnitList& units);
 
 	static const RaceList& Races();
 	static const UnitList& Units();
 
+	void addToThis(std::vector<Fleet*> fleets, int tick = 0);
+
+	void distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0);
+
+	std::vector<Fleet*> calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0);
+
+	void killFleet(std::string unittype, int number, int tick = 0);
+
+	void setResource(std::string type, int number, int tick = 0);
+	int resource(std::string type, int tick = 0)const;
+	
+	void takeShoot(std::string unittype, int number, std::map<std::string, int>& hitunits);
+	void takeEMP(std::string unittype, int number);
 protected:
+
+
 	std::string	m_sName;
 	std::string	m_sRace;
 	int         m_iETA;
 	FleetList	m_Fleet;
+	FleetList	m_BlockedFleet;
+	ResourceList m_Resources;
+	ArmorList	m_Armor;
+	
+
 
 	static UnitList s_Units;
 	static RaceList s_Races;