//////////////////////////////////////////////////////////////////////////
//
-void Fleet::setFleet(string unittype, int number)
+void Fleet::setFleet(string unittype, int number, int tick = 0)
{
- if (m_Fleet[unittype].size() == 0)
+ if (m_Fleet[unittype].size() <= tick)
{
m_Fleet[unittype].push_back(number);
return;
}
- m_Fleet[unittype][0] = number;
+ m_Fleet[unittype][tick] = number;
}
//////////////////////////////////////////////////////////////////////////
//
int Fleet::fleet(string unittype, int tick = 0)
{
- if (m_Fleet[unittype].size() == 0)
+ int ticks = m_Fleet[unittype].size();
+ if (ticks == 0)
return 0;
+ --ticks;
+
+ if (ticks < tick)
+ m_Fleet[unittype][ticks];
+
return m_Fleet[unittype][tick];
}
//////////////////////////////////////////////////////////////////////////
-//
+//FIXME
void Fleet::addToThis(std::vector<Fleet*> fleets, int tick = 0)
{
for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i)
//
std::vector<Fleet*> Fleet::calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0)
{
+ vector<Fleet*> fl;
+ for (vector<Fleet*>::iterator i = fleets.begin(); i != fleets.end(); ++i)
+ {
+ if (( tick - (*i)->ETA()) >= 0 && (tick - (*i)->ETA()) < stays)
+ fl.push_back((*i));
+ else if ((*i)->name() == "Home Planet")
+ fl.push_back((*i));
+ }
+ return fl;
}
//////////////////////////////////////////////////////////////////////////
//
void Fleet::killFleet(std::string unittype, int number, int tick = 0)
{
+ if (m_Fleet[unittype].size() <= tick)
+ {
+ m_Fleet[unittype].push_back(m_Fleet[unittype][m_Fleet[unittype].size()] - number);
+ return;
+ }
+ m_Fleet[unittype][tick] -= number;
}
//////////////////////////////////////////////////////////////////////////
//
-void setResource(std::string type, int number, int tick = 0)
+void Fleet::setResource(std::string type, int number, int tick = 0)
{
+
+ if (m_Resources[type].size() <= tick)
+ m_Resources[type].push_back(number);
+ m_Resources[type][tick] = number;
}
//////////////////////////////////////////////////////////////////////////
//
-int resource(std::string type, int tick = 0)
+int Fleet::resource(std::string type, int tick = 0) const
{
+ vector<int>const* resource = 0;
+ for (ResourceList::const_iterator i = m_Resources.begin(); i != m_Resources.end(); ++i)
+ {
+ if (i->first == type)
+ {
+ resource = &i->second;
+ break;
+ }
+ }
+ if (resource == 0)
+ return 0;
+
+ int ticks = resource->size();
+
+ if( ticks == 0)
+ return 0;
+
+ --ticks;
+
+ if (ticks < tick)
+ return resource->at(ticks);
+ return resource->at(tick);
}
*/
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);
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;
protected: