X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=95ae6d35789a4ca360c794e71d2670a2947e7f3f;hb=9f0513b48fbafa876159812f638019c6b47eae33;hp=432f16595efadab7d1e8c479fa8cb03678ac7292;hpb=e5701c8f3f1199264015c5d6e0f2a32515d5f6f8;p=hbs.git diff --git a/bs/fleet.cpp b/bs/fleet.cpp index 432f165..95ae6d3 100644 --- a/bs/fleet.cpp +++ b/bs/fleet.cpp @@ -117,8 +117,8 @@ void Fleet::setUnits(UnitList& units) { s_Units = units; - /* - + +/* for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); i++) { cerr << s_Units[(*i).first].Name() << "\t\t" @@ -139,6 +139,7 @@ void Fleet::setUnits(UnitList& units) << s_Units[(*i).first].ETA() << "\t" << s_Units[(*i).first].type() << endl; } + */ } @@ -183,10 +184,15 @@ unsigned Fleet::score(int tick = 0) const // void Fleet::setFleet(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(number); - return; + m_Fleet[unittype].push_back(earlier); } m_Fleet[unittype][tick] = number; } @@ -202,7 +208,7 @@ int Fleet::fleet(string unittype, int tick = 0) --ticks; if (ticks < tick) - m_Fleet[unittype][ticks]; + return m_Fleet[unittype][ticks]; return m_Fleet[unittype][tick]; } @@ -218,7 +224,7 @@ void Fleet::addToThis(std::vector fleets, int tick = 0) for (vector::iterator j = fleets.begin(); j != fleets.end(); ++j) { - // FIXTHIS!! m_Fleet[i->first][0] += j->fleet(i->first, tick); + m_Fleet[i->first][0] += (*j)->fleet(i->first, tick); } } } @@ -227,6 +233,29 @@ void Fleet::addToThis(std::vector fleets, int tick = 0) // void Fleet::distributeLossesGains(std::vector fleets, int tick = 0) { + for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i) + { + string unittype = i->first; + + + if (m_Fleet[unittype].size() < 1) + continue; + if (m_Fleet[unittype][0] == 0) + continue; + + + int totallost = fleet(unittype,1) - fleet(unittype, 0); + + + cerr << "Distributing type: " << unittype << " with a total loss of " << totallost << " units" << 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; + (*j)->setFleet(unittype, (*j)->fleet(unittype, tick - 1) + lost, tick); + } + } } ////////////////////////////////////////////////////////////////////////// @@ -237,7 +266,10 @@ std::vector Fleet::calculateSide(std::vector fleets, int stays = for (vector::iterator i = fleets.begin(); i != fleets.end(); ++i) { if (( tick - (*i)->ETA()) >= 0 && (tick - (*i)->ETA()) < stays) + { fl.push_back((*i)); + cerr << "Using fleet " << (*i)->name() << " for tick " << tick << endl; + } else if ((*i)->name() == "Home Planet") fl.push_back((*i)); } @@ -248,12 +280,18 @@ std::vector Fleet::calculateSide(std::vector fleets, int stays = // int Fleet::freeFleet(std:: string unittype, int tick = 0) { - if (m_Fleet[unittype].size() == 0) - return 0; - if (m_BlockedFleet[unittype].size() < tick) - return m_Fleet[unittype][tick]; + int bticks = m_BlockedFleet[unittype].size(); + + --bticks; - return m_Fleet[unittype][tick] - m_BlockedFleet[unittype][tick]; + if (bticks < tick) + return fleet(unittype, tick); + + + int free = fleet(unittype,tick) - m_BlockedFleet[unittype][tick]; + if (free < 0) + return 0; + return free; } @@ -261,13 +299,18 @@ 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; - int power = s_Units[unittype].power() * number; + if (guns == 0) + return; + + cerr << unittype << ": with " << guns << " guns\n"; int gunsleft = guns; - for (vector::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i) + 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); + cerr << "Shooting at target class: " << ta << endl; while (gunsleft > 0) { @@ -275,16 +318,27 @@ void Fleet::takeShoot(std::string unittype, int number, std::mapfirst].size() == 0) - break; + continue; if (m_Fleet[j->first].size() == 1) m_Fleet[j->first].push_back(m_Fleet[j->first][0]); - if (m_Fleet[j->first][1] > 0 && (*i) == j->second.type()) + //cerr << "Target is class: " << j->second.type() << endl; + + if (m_Fleet[j->first][1] > 0 && ( ta == j->second.unitClass() || ta == "All")) + { + + // cerr << "Looking at target: " << j->first << endl; targets[j->first] = &m_Fleet[j->first][1]; + } + } + if (targets.size() == 0) + break; + int total = 0; for (map::iterator j = targets.begin(); j != targets.end(); ++j) total += (*j->second); @@ -292,22 +346,33 @@ 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; if (m_Armor[j->first] <= 0 || m_Armor[j->first] > s_Units[j->first].armor()) m_Armor[j->first] = s_Units[j->first].armor(); - int k = maxguns; + double k = maxguns; + + cerr << "Targets agility: " << s_Units[j->first].agility() << endl; + cerr << "Weaponspeed: " << s_Units[unittype].weaponSpeed() << endl; while (k > 0) { if (*(j->second) <= 0) break; - k -= 100/(25+s_Units[unittype].weaponSpeed() - s_Units[j->first].agility()); + + int wpsp = s_Units[unittype].weaponSpeed(); + int agil = s_Units[j->first].agility(); + + k -= float(100)/(25 + wpsp - agil); + //cout << "Used " << blaha << " guns to hit with one shot.\n"; + //cout << "WPSP: " << wpsp << "\nAgil: " << agil << endl; + m_Armor[j->first] -= s_Units[unittype].power(); if (m_Armor[j->first] <= 0) { m_Armor[j->first] = s_Units[j->first].armor(); (*j->second)--; + hitunits[j->first]++; //There is a chance that we're hitting a blocked ship. if (m_BlockedFleet[j->first].size() >= 1) @@ -323,7 +388,10 @@ void Fleet::takeShoot(std::string unittype, int number, std::mapfirst] << " units of type: " << j->first << "killed\n"; if (k <= 0) gunsleft -= maxguns; else @@ -337,7 +405,81 @@ void Fleet::takeShoot(std::string unittype, int number, std::map::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i) + { + string ta = s_Units[unittype].target(count); + cerr << "Shooting at target class: " << ta << endl; + while (gunsleft > 0) + { + + map targets; + + for (UnitList::iterator j = s_Units.begin(); j != s_Units.end(); ++j) + { + if (j->second.type() == "PDS") + continue; + + if (m_Fleet[j->first].size() == 0) + continue; + if (m_Fleet[j->first].size() == 1) + m_Fleet[j->first].push_back(m_Fleet[j->first][0]); + + //cerr << "Target is class: " << j->second.type() << endl; + + if (m_Fleet[j->first][1] > 0 && ( ta == j->second.unitClass() || ta == "All")) + { + + // cerr << "Looking at target: " << j->first << endl; + targets[j->first] = &m_Fleet[j->first][1]; + } + + } + + if (targets.size() == 0) + break; + + int total = 0; + for (map::iterator j = targets.begin(); j != targets.end(); ++j) + total += (*j->second); + + for (map::iterator j = targets.begin(); j != targets.end(); ++j) + { + int maxguns = (*j->second)/total * guns; + cerr << "Now shooting at target: " << j->first << endl; + + double k = maxguns; + + int hits = 0; + + while (k > 0) + { + + if (*(j->second) <= 0) + break; + + int eres = s_Units[j->first].EMP(); + + k -= float(100)/(100-eres); + hits++; + blockFleet(j->first, 1); + } + + cerr << hits << " units of type: " << j->first << " blocked\n"; + if (k <= 0) + gunsleft -= maxguns; + else + gunsleft -= maxguns - k; + } + } + } } ////////////////////////////////////////////////////////////////////////// @@ -390,3 +532,38 @@ int Fleet::resource(std::string type, int tick = 0) const return resource->at(tick); } +////////////////////////////////////////////////////////////////////////// +// +void Fleet::printFleet() +{ + for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i) + { + for (int tick = 0; tick < 5 ;++tick) + { + int num = fleet(i->first, tick); + + if (num <= 0) + break; + cerr << num << " " << i->first << " during tick: " << tick << endl; + } + } +} + +////////////////////////////////////////////////////////////////////////// +// +void Fleet::blockFleet(std::string unittype, int number, int tick = 0) +{ + if (m_BlockedFleet[unittype].size() >= 1) + { + m_BlockedFleet[unittype][0] += number; + if (m_BlockedFleet[unittype].size() > 1) + m_BlockedFleet[unittype][1] += number; + else + m_BlockedFleet[unittype].push_back(m_BlockedFleet[unittype][0]); + } + else + { + m_BlockedFleet[unittype].push_back(number); + m_BlockedFleet[unittype].push_back(number); + } +}