X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Fplanet.cpp;h=94fa4325c2bcea641bbe984942caba991ca13e77;hb=935b6de2d1428854d76acc20b1727eb4a30f9273;hp=4133277d62d7cc080abfee462df05db499a9756e;hpb=b308a9445cfe1883ea8068d3f4d1a04bfcff9aa8;p=hbs.git diff --git a/bs/planet.cpp b/bs/planet.cpp index 4133277..94fa432 100644 --- a/bs/planet.cpp +++ b/bs/planet.cpp @@ -31,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) @@ -47,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(); @@ -64,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(); @@ -80,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(); @@ -108,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; @@ -122,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; @@ -134,7 +134,7 @@ void Planet::takeRoids(std::string type, int number, int tick = 0) m_Roids[type][tick] -= number; if (type != "uninit") - addPlanetScore(-3000*number, tick); + addPlanetScore(-1000*number, tick); } @@ -154,11 +154,13 @@ void Planet::runBattle(std::vector friendly, std::vector hostile for (vector::iterator i = hostile.begin(); i != hostile.end(); ++i) (*i)->resetTicks(); + m_Report.clear(); + for(int tick = 1; skipped < 20; ++tick) { //See who's in the battle at the current tick - vector friends = calculateSide(friendly, 6, tick); - vector hostiles = calculateSide(hostile, 3, tick); + vector friends = calculateSide(friendly, tick); + vector hostiles = calculateSide(hostile, tick); // No idea to calculate anything if noone is there.. ;) if (hostiles.size() == 0) @@ -221,50 +223,66 @@ void Planet::runBattle(std::vector friendly, std::vector hostile ////////////////////////////////////////////////////////////////////////// // -void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map >& stealfriendly, std::map >& stealhostile, int tick = 1) +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); - map pods; + //FIXME: remove this line later.. map pods; - //FIXME: Need to change this and allow multiple shiptypes with the same initiative. + //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; + + for (map::iterator i = unitsinit.begin(); i != unitsinit.end(); ++i) { Fleet* hostiletemp = new Fleet(*hostile); Planet* friendlytemp = new Planet(*friendly); string unittype = i->second; + int init = i->first; + + int freefriendly = friendly->freeFleet(unittype, 1); + int freehostile = hostile->freeFleet(unittype, 1); + + if ( freefriendly <= 0 && freehostile <= 0) + continue; //cerr << "Initiative: " << s_Units[unittype].initiative() << " with unit: " << unittype << endl; + + map friendlyhits; + map hostilehits; if (s_Units[unittype].type() == "EMP") { - hostiletemp->takeEMP(unittype, friendly->freeFleet(unittype, 1)); - friendlytemp->takeEMP(unittype, hostile->freeFleet(unittype, 1)); + hostiletemp->takeEMP(unittype, freefriendly, friendlyhits); + friendlytemp->takeEMP(unittype, freehostile, hostilehits); } else if (s_Units[unittype].type() == "Steal") { - hostiletemp->takeShoot(unittype, friendly->freeFleet(unittype, 1), stealfriendly[unittype]); - friendlytemp->takeShoot(unittype, hostile->freeFleet(unittype, 1), stealhostile[unittype]); + hostiletemp->takeShoot(unittype, freefriendly, stealfriendly[unittype]); + friendlytemp->takeShoot(unittype, freehostile, stealhostile[unittype]); + + friendlyhits = stealfriendly[unittype]; + hostilehits = stealhostile[unittype]; friendlytemp->calculateLostStealships(unittype, stealfriendly[unittype], 1); hostiletemp->calculateLostStealships(unittype, stealhostile[unittype], 1); } else { - map temp; - hostiletemp->takeShoot(unittype, friendly->freeFleet(unittype, 1), temp); - friendlytemp->takeShoot(unittype, hostile->freeFleet(unittype, 1), temp); + hostiletemp->takeShoot(unittype, freefriendly, friendlyhits); + friendlytemp->takeShoot(unittype, freehostile, hostilehits); } + if (s_Units[unittype].type() == "Pod") { //FIXME: Prolly need to recode the whole capping section for r7, due to multiple pods thingy @@ -274,30 +292,50 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::mapfirst, tick - 1); - int freepods = hostiletemp->freeFleet(unittype, 1); + int caproids = int(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"; + cerr << hostiletemp->freePodGuns(1) << " free pod guns available\n"; - if (freepods <= 0) + if (hostiletemp->freePodGuns(1) <= 0) break; - if (freepods < caproids) - caproids = freepods; + if (hostiletemp->freePodGuns(1) < caproids) + caproids = hostiletemp->freePodGuns(1); cerr << caproids << " roids stolen\n"; takeRoids(roid->first, caproids, tick); + /*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; + } + if (freefriendly > 0) + { + m_Report[tick][init]["Friendly"][unittype] = friendlyhits; + m_Report[tick][init]["Friendly"][unittype]["000"] = freefriendly; + } + if (freehostile > 0) + { + m_Report[tick][init]["Hostile"][unittype] = hostilehits; + m_Report[tick][init]["Hostile"][unittype]["000"] = freehostile; } //set the the objects so they point at the modified objects @@ -306,13 +344,13 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::mapaddFleet(pods, 1); + //hostile->addFleet(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) { @@ -326,7 +364,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(); @@ -340,7 +378,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(); @@ -356,3 +394,10 @@ void Planet::setCapping(float capping, int tick = 0) else m_Capping[tick] = 0; } + +////////////////////////////////////////////////////////////////////////// +// +ReportList Planet::report() const +{ + return m_Report; +}