X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.h;h=3bdab65924c5f9db08ffd1f2decf47fbeac5da3a;hb=a2ce63f561d091d9c3af49987d74849f9450c16b;hp=9a0995a23127e7d2f359580309f1c791245285f7;hpb=595e711e719a6e6b675b1f40e3e141cd9b770fd9;p=hbs.git

diff --git a/bs/fleet.h b/bs/fleet.h
index 9a0995a..3bdab65 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -28,8 +28,9 @@
 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;
+//! 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
@@ -89,6 +90,8 @@ public:
 
 	void setFleet(std::string unittype, int number);
 	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 +99,29 @@ 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 takeShoot(std::string unittype, int number, std::map<std::string, int>& hitunits);
+	void takeEMP(std::string unittype, int number);
+	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);
+	
 protected:
+
+
 	std::string	m_sName;
 	std::string	m_sRace;
 	int         m_iETA;
 	FleetList	m_Fleet;
+	FleetList	m_BlockedFleet;
+	ResourceList m_Resources;
+
 
 	static UnitList s_Units;
 	static RaceList s_Races;