X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=545ffa2e43d094fe09a3490d85d13dacebc29e49;hb=aa2185f376b26d850e07b492e86f1e5453a489de;hp=95ae6d35789a4ca360c794e71d2670a2947e7f3f;hpb=9f0513b48fbafa876159812f638019c6b47eae33;p=hbs.git diff --git a/bs/fleet.cpp b/bs/fleet.cpp index 95ae6d3..545ffa2 100644 --- a/bs/fleet.cpp +++ b/bs/fleet.cpp @@ -139,8 +139,7 @@ void Fleet::setUnits(UnitList& units) << s_Units[(*i).first].ETA() << "\t" << s_Units[(*i).first].type() << endl; } - - */ +*/ } ////////////////////////////////////////////////////////////////////////// @@ -172,8 +171,13 @@ unsigned Fleet::score(int tick = 0) const for (FleetList::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i) { - if (i->second.size() >= tick) - break; + int ticks = i->second.size(); + if (ticks == 0) + continue; + --ticks; + if ( ticks < tick) + tot_score += i->second[ticks] * s_Units[i->first].totRes() / 10; + else tot_score += i->second[tick] * s_Units[i->first].totRes() / 10; } @@ -224,7 +228,10 @@ void Fleet::addToThis(std::vector fleets, int tick = 0) for (vector::iterator j = fleets.begin(); j != fleets.end(); ++j) { - m_Fleet[i->first][0] += (*j)->fleet(i->first, tick); + int num = (*j)->fleet(i->first, tick); + m_Fleet[i->first][0] += num; + if (num > 0) + cerr << (*j)->name() << " adding " << num << " units of type " << i->first << endl; } } } @@ -248,11 +255,15 @@ void Fleet::distributeLossesGains(std::vector fleets, int tick = 0) cerr << "Distributing type: " << unittype << " with a total loss of " << totallost << " units" << endl; + + cerr << "Total number of units before: " << fleet(unittype, 0) << " and after : " << fleet(unittype, 1) << endl; for (vector::iterator j = fleets.begin(); j != fleets.end(); ++j) { - int lost = totallost * ( (*j)->fleet(unittype, tick - 1) / m_Fleet[unittype][0] ); - cerr << (*j)->name() << " gaining " << lost << " " << unittype << endl; + int fl1 = (*j)->fleet(unittype, tick - 1); + float part = float(fl1) / fleet(unittype, 0) ; + int lost = totallost * part; + cerr << (*j)->name() << " gaining " << lost << " " << unittype << " since it's " << part * 100 << "% of the whole fleet, and it had : " << fl1 << " units last tick.." << endl; (*j)->setFleet(unittype, (*j)->fleet(unittype, tick - 1) + lost, tick); } } @@ -300,13 +311,15 @@ int Fleet::freeFleet(std:: string unittype, int tick = 0) void Fleet::takeShoot(std::string unittype, int number, std::map& hitunits) { - int guns = s_Units[unittype].guns() * number; + float guns = s_Units[unittype].guns() * number; + + if (guns == 0) return; - cerr << unittype << ": with " << guns << " guns\n"; + cerr << number << " " << unittype << ": with " << guns << " guns\n"; - int gunsleft = guns; + float gunsleft = guns; for (int count = 0; count < 3; ++count)//vector::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i) { string ta = s_Units[unittype].target(count); @@ -345,15 +358,15 @@ void Fleet::takeShoot(std::string unittype, int number, std::map::iterator j = targets.begin(); j != targets.end(); ++j) { - int maxguns = (*j->second)/total * guns; - cerr << "Now shooting at target: " << j->first << endl; + float maxguns = float((*j->second))/total * guns; + //cerr << "Now shooting at target: " << j->first << endl; if (m_Armor[j->first] <= 0 || m_Armor[j->first] > s_Units[j->first].armor()) m_Armor[j->first] = s_Units[j->first].armor(); double k = maxguns; - cerr << "Targets agility: " << s_Units[j->first].agility() << endl; - cerr << "Weaponspeed: " << s_Units[unittype].weaponSpeed() << endl; + //cerr << "Targets agility: " << s_Units[j->first].agility() << endl; + //cerr << "Weaponspeed: " << s_Units[unittype].weaponSpeed() << endl; while (k > 0) { @@ -411,7 +424,7 @@ void Fleet::takeEMP(std::string unittype, int number) cerr << unittype << ": with " << guns << " guns\n"; - int gunsleft = guns; + float gunsleft = guns; for (int count = 0; count < 3; ++count)//vector::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i) { string ta = s_Units[unittype].target(count); @@ -486,10 +499,15 @@ void Fleet::takeEMP(std::string unittype, int number) // void Fleet::killFleet(std::string unittype, int number, int tick = 0) { - if (m_Fleet[unittype].size() <= tick) + int earlier = 0; + int ticks = m_Fleet[unittype].size(); + + if (ticks != 0) + earlier = m_Fleet[unittype][ticks - 1]; + + for (int i = ticks; i <= tick; ++i) { - m_Fleet[unittype].push_back(m_Fleet[unittype][m_Fleet[unittype].size()] - number); - return; + m_Fleet[unittype].push_back(earlier); } m_Fleet[unittype][tick] -= number; } @@ -499,11 +517,28 @@ void Fleet::killFleet(std::string unittype, int number, int tick = 0) void Fleet::setResource(std::string type, int number, int tick = 0) { - if (m_Resources[type].size() <= tick) + int ticks = m_Resources[type].size(); + for (int i = ticks; i <= tick; ++i) m_Resources[type].push_back(number); m_Resources[type][tick] = number; } +////////////////////////////////////////////////////////////////////////// +// +void Fleet::addResource(std::string type, int number, int tick = 0) +{ + + int ticks = m_Resources[type].size(); + int latest = 0; + + if (ticks > 0) + latest = m_Resources[type][ticks - 1]; + + for (int i = ticks; i <= tick; ++i) + m_Resources[type].push_back(latest); + m_Resources[type][tick] += number; +} + ////////////////////////////////////////////////////////////////////////// // int Fleet::resource(std::string type, int tick = 0) const @@ -567,3 +602,42 @@ void Fleet::blockFleet(std::string unittype, int number, int tick = 0) m_BlockedFleet[unittype].push_back(number); } } + +////////////////////////////////////////////////////////////////////////// +// +void Fleet::distributeCappedRoids(std::vector fleets, int tick = 0) +{ + for (ResourceList::iterator i = m_Resources.begin(); i != m_Resources.end(); ++i) + { + string res = i->first; + + cerr << "Distributing type: " << res << endl; + for (vector::iterator j = i->second.begin(); j != i->second.end(); ++j) + cout << (*j) << endl; + + if (m_Resources[res].size() < 2) + continue; + if (m_Resources[res][1] == 0) + continue; + + + int totcapped = resource(res,1) - resource(res, 0); + + + cerr << "Distributing type: " << res << " with a total gain of " << totcapped << " roids" << endl; + + cerr << "Total number of roids before: " << resource(res, 0) << " and after : " << resource(res, 1) << endl; + + for (vector::iterator j = fleets.begin(); j != fleets.end(); ++j) + { + unsigned fl1 = (*j)->score(tick - 1); + float part = float(fl1) / score(0) ; + int lost = totcapped * part; + + cerr << (*j)->name() << " gaining " << lost << " " << res << " since it's " << part * 100 << "% of the whole score, and it had : " << fl1 << " score last tick.. compared to fleet total of: " << score(0) << endl; + (*j)->addResource(res, lost, tick); + } + } +} + +