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

diff --git a/bs/fleet.h b/bs/fleet.h
index 3bdab65..b706bbd 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -29,6 +29,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;
+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.
@@ -88,7 +89,7 @@ public:
 	 */
 	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);
@@ -105,13 +106,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);
+	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:
 
 
@@ -121,6 +122,8 @@ protected:
 	FleetList	m_Fleet;
 	FleetList	m_BlockedFleet;
 	ResourceList m_Resources;
+	ArmorList	m_Armor;
+	
 
 
 	static UnitList s_Units;