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

diff --git a/bs/fleet.h b/bs/fleet.h
index f1d96af..3bdab65 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -28,6 +28,7 @@
 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;
+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.
@@ -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);
@@ -102,7 +105,13 @@ public:
 
 	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:
 
 
@@ -110,6 +119,9 @@ protected:
 	std::string	m_sRace;
 	int         m_iETA;
 	FleetList	m_Fleet;
+	FleetList	m_BlockedFleet;
+	ResourceList m_Resources;
+
 
 	static UnitList s_Units;
 	static RaceList s_Races;