X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fplanet.cpp;h=c819323d76bde827bde8414b7b8c3b620ef2355c;hb=e0be1e6e8f7a246acf49e1f315c8d5bc5a65bfa3;hp=3e1f39ae65eab751585cde681e1cddc6789c67bd;hpb=b355aa1be760bf03c9be4bfa581f320e2e045eac;p=hbs.git diff --git a/bs/planet.cpp b/bs/planet.cpp index 3e1f39a..c819323 100644 --- a/bs/planet.cpp +++ b/bs/planet.cpp @@ -23,6 +23,7 @@ using namespace std; Planet::Planet() { m_sRace = "Planet"; + m_iStays = -1; } Planet::~Planet(){ @@ -30,7 +31,7 @@ Planet::~Planet(){ ////////////////////////////////////////////////////////////////////////// // -unsigned Planet::planetScore(int tick = 0) const +unsigned Planet::planetScore(int tick) const { int ticks = m_Score.size(); if (ticks == 0) @@ -46,7 +47,7 @@ unsigned Planet::planetScore(int tick = 0) const ////////////////////////////////////////////////////////////////////////// // -void Planet::setPlanetScore(unsigned number, int tick = 0) +void Planet::setPlanetScore(unsigned number, int tick) { int earlier = 0; int ticks = m_Score.size(); @@ -63,7 +64,7 @@ void Planet::setPlanetScore(unsigned number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Planet::addPlanetScore(unsigned number, int tick = 0) +void Planet::addPlanetScore(unsigned number, int tick) { int earlier = 0; int ticks = m_Score.size(); @@ -79,7 +80,7 @@ void Planet::addPlanetScore(unsigned number, int tick = 0) } ////////////////////////////////////////////////////////////////////////// // -int Planet::roids(std::string type, int tick = 0) const +int Planet::roids(std::string type, int tick) const { // const... I would like [] as for const types: int ticks = m_Roids[type].size(); @@ -107,7 +108,7 @@ int Planet::roids(std::string type, int tick = 0) const ////////////////////////////////////////////////////////////////////////// // -void Planet::setRoids(std::string type, int number, int tick = 0) +void Planet::setRoids(std::string type, int number, int tick) { int ticks = m_Roids[type].size(); int roids = 0; @@ -121,7 +122,7 @@ void Planet::setRoids(std::string type, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Planet::takeRoids(std::string type, int number, int tick = 0) +void Planet::takeRoids(std::string type, int number, int tick) { int ticks = m_Roids[type].size(); int roids = 0; @@ -131,6 +132,9 @@ void Planet::takeRoids(std::string type, int number, int tick = 0) for (int i = ticks; i <= tick; ++i ) m_Roids[type].push_back(roids); m_Roids[type][tick] -= number; + + if (type != "uninit") + addPlanetScore(-1000*number, tick); } @@ -143,6 +147,13 @@ void Planet::runBattle(std::vector friendly, std::vector hostile return; int skipped = 0; + + for (vector::iterator i = friendly.begin(); i != friendly.end(); ++i) + (*i)->resetTicks(); + + for (vector::iterator i = hostile.begin(); i != hostile.end(); ++i) + (*i)->resetTicks(); + for(int tick = 1; skipped < 20; ++tick) { //See who's in the battle at the current tick @@ -174,7 +185,9 @@ void Planet::runBattle(std::vector friendly, std::vector hostile //Reset roids for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid) + { setRoids(roid->first, roids(roid->first, tick-1), tick); + } setPlanetScore(planetScore(tick - 1), tick); @@ -184,8 +197,11 @@ void Planet::runBattle(std::vector friendly, std::vector hostile //allFriends.printFleet(); allFriends.distributeLossesGains(friends, tick); + allFriends.distributeStolenShips(stealfriendly, friends, tick); + allHostiles.distributeLossesGains(hostiles, tick); allHostiles.distributeCappedRoids(hostiles, tick); + allHostiles.distributeStolenShips(stealhostile, hostiles, tick); calculateScoreLoss(friends, tick); @@ -193,6 +209,9 @@ void Planet::runBattle(std::vector friendly, std::vector hostile setRoids(i->first, roids(i->first, 1), tick);*/ } + for (vector::iterator i = friendly.begin(); i != friendly.end(); ++i) + (*i)->calculateSalvage(); + for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i) { for (vector::iterator j = i->second.begin(); j != i->second.end(); ++j) @@ -202,8 +221,18 @@ void Planet::runBattle(std::vector friendly, std::vector hostile ////////////////////////////////////////////////////////////////////////// // -void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map >& stealfriendly, std::map >& stealhostile, int tick = 0) +void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map >& stealfriendly, std::map >& stealhostile, int tick) { + if (planetScore(tick - 1) > 0) + setCapping(float(planetScore(tick - 1)) / hostile->score() / 10, tick); + else + setCapping(0, tick); + + //FIXME: remove this line later.. map pods; + + + //FIXME: Need to change this and allow multiple shiptypes with the same initiative. + //FIXME: Looks like I don't have to.. map unitsinit; // order units after their ininitiative for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i) unitsinit[i->second.initiative()] = i->first; @@ -226,6 +255,9 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::maptakeShoot(unittype, friendly->freeFleet(unittype, 1), stealfriendly[unittype]); friendlytemp->takeShoot(unittype, hostile->freeFleet(unittype, 1), stealhostile[unittype]); + + friendlytemp->calculateLostStealships(unittype, stealfriendly[unittype], 1); + hostiletemp->calculateLostStealships(unittype, stealhostile[unittype], 1); } else { @@ -236,40 +268,47 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map 0) - { - setCapping(float(planetScore(tick - 1)) / hostile->score() / 10, tick); - - cerr << "Capping is: " << capping(tick) << endl; + //FIXME: Prolly need to recode the whole capping section for r7, due to multiple pods thingy + cerr << "Capping is: " << capping(tick) << endl; - if (capping(tick) > 0) + if (capping(tick) > 0) + { + for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid) { - for (RoidList::iterator roid = m_Roids.begin(); roid != m_Roids.end(); ++roid) - { - int caproids = capping(tick) * roids(roid->first, tick - 1); - int freepods = hostiletemp->freeFleet(unittype, 1); + int caproids = capping(tick) * roids(roid->first, tick - 1); + //int freepods = hostiletemp->freeFleet(unittype, 1); - cerr << "Possible to steal " << caproids << " " << roid->first << " roids\n"; - cerr << freepods << " free pods available\n"; - - if (freepods <= 0) - break; - if (freepods < caproids) - caproids = freepods; + cerr << "Possible to steal " << caproids << " " << roid->first << " roids\n"; + cerr << hostiletemp->freePodGuns(1) << " free pod guns available\n"; + + if (hostiletemp->freePodGuns(1) <= 0) + break; + if (hostiletemp->freePodGuns(1) < caproids) + caproids = hostiletemp->freePodGuns(1); - cerr << caproids << " roids stolen\n"; + cerr << caproids << " roids stolen\n"; - takeRoids(roid->first, caproids, tick); + takeRoids(roid->first, caproids, tick); - //FIXME: Going to move this to the distribute roids section instead.. Not really move, I'll keep this, but "regenerate" the pods in the distribute ships function. - hostiletemp->killFleet(unittype, caproids, 1); - //int totroids = caproids + hostiletemp->resource(roid->first, 0); - hostiletemp->addResource(roid->first, caproids, 1); - - cerr << caproids << " stolen " << roid->first << " roids\n"; - } + /*FIXME: REMOVE THIS BLOCK LATER + //FIXME: Going to move this to the distribute roids section instead.. Not really move, I'll keep this, but "regenerate" the pods in the distribute ships function. + hostiletemp->killFleet(unittype, caproids, 1); + pods[unittype] += caproids; + //int totroids = caproids + hostiletemp->resource(roid->first, 0); + */ + hostiletemp->addResource(roid->first, caproids, 1); + hostiletemp->usePodGuns(1, caproids); + cerr << caproids << " stolen " << roid->first << " roids\n"; } } + + //FIXME: This is ugly and I want to change this, but as long as pods shoot last it works.. + *friendly = *friendlytemp; + delete friendlytemp; + *hostile = *hostiletemp; + delete hostiletemp; + + return; } //set the the objects so they point at the modified objects @@ -278,11 +317,13 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::mapaddFleet(pods, 1); + } ////////////////////////////////////////////////////////////////////////// // -void Planet::calculateScoreLoss(std::vector friendly, int tick = 1) +void Planet::calculateScoreLoss(std::vector friendly, int tick) { for (vector::iterator i = friendly.begin(); i != friendly.end(); ++i) { @@ -296,7 +337,7 @@ void Planet::calculateScoreLoss(std::vector friendly, int tick = 1) ////////////////////////////////////////////////////////////////////////// // -float Planet::capping(int tick = 0) +float Planet::capping(int tick) { int ticks = m_Capping.size(); @@ -310,7 +351,7 @@ float Planet::capping(int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Planet::setCapping(float capping, int tick = 0) +void Planet::setCapping(float capping, int tick) { int ticks = m_Capping.size(); @@ -321,6 +362,8 @@ void Planet::setCapping(float capping, int tick = 0) if (capping <= 0.15 && capping >= 0) m_Capping[tick] = capping; - else + else if (capping >= 0.15) m_Capping[tick] = 0.15; + else + m_Capping[tick] = 0; }