X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Ffleet.h;h=74e4e8653404d7e6264aee6d3e646290e8be5e38;hp=b90b15ef0549b96d6b7f6bd6f7e51eec797d956b;hb=d1b57a078d3edb148f8b6ec61944a0b852a4bf94;hpb=07acf9a898e295587b9034bee6b8682e11a97086

diff --git a/bs/fleet.h b/bs/fleet.h
index b90b15e..74e4e86 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,10 +87,12 @@ 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);
+	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);
@@ -96,11 +100,33 @@ public:
 	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);
+
+	void printFleet();
 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;