X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=73923b5c22449e43c8702fdf9b376be5a39c201a;hb=147b9d8a408c0ac8b4f284c98fcb5af41873ce9a;hp=4fc5be57a4fe8376e0552550832f856274fb3905;hpb=c3547560c3885eb7f7b436dd10acc17df71de101;p=hbs.git diff --git a/bs/fleet.cpp b/bs/fleet.cpp index 4fc5be5..73923b5 100644 --- a/bs/fleet.cpp +++ b/bs/fleet.cpp @@ -119,28 +119,28 @@ 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" - << s_Units[(*i).first].race() <<"\t" - << s_Units[(*i).first].unitClass() << "\t" - << s_Units[(*i).first].target(0) << "\t" - << s_Units[(*i).first].target(1) << "\t" - << s_Units[(*i).first].target(2) << "\t" - << s_Units[(*i).first].initiative() << "\t" - << s_Units[(*i).first].agility() << "\t" - << s_Units[(*i).first].weaponSpeed() << "\t" - << s_Units[(*i).first].guns() << "\t" - << s_Units[(*i).first].power() << "\t" - << s_Units[(*i).first].armor() << "\t" - << s_Units[(*i).first].EMP() << "\t" - << s_Units[(*i).first].totRes() << "\t" - << s_Units[(*i).first].fuel() << "\t" - << s_Units[(*i).first].ETA() << "\t" - << s_Units[(*i).first].type() << endl; + cerr << s_Units[(*i).first].Name() << "\t\t" + << s_Units[(*i).first].race() <<"\t" + << s_Units[(*i).first].unitClass() << "\t" + << s_Units[(*i).first].target(0) << "\t" + << s_Units[(*i).first].target(1) << "\t" + << s_Units[(*i).first].target(2) << "\t" + << s_Units[(*i).first].initiative() << "\t" + << s_Units[(*i).first].agility() << "\t" + << s_Units[(*i).first].weaponSpeed() << "\t" + << s_Units[(*i).first].guns() << "\t" + << s_Units[(*i).first].power() << "\t" + << s_Units[(*i).first].armor() << "\t" + << s_Units[(*i).first].EMP() << "\t" + << s_Units[(*i).first].totRes() << "\t" + << s_Units[(*i).first].fuel() << "\t" + << s_Units[(*i).first].ETA() << "\t" + << s_Units[(*i).first].type() << endl; } - */ + */ } ////////////////////////////////////////////////////////////////////////// @@ -166,7 +166,7 @@ vector Fleet::RacesAllowed() const ////////////////////////////////////////////////////////////////////////// // -unsigned Fleet::score(int tick = 0) const +unsigned Fleet::score(int tick) const { unsigned tot_score = 0; @@ -187,7 +187,7 @@ unsigned Fleet::score(int tick = 0) const ////////////////////////////////////////////////////////////////////////// // -void Fleet::setFleet(string unittype, int number, int tick = 0) +void Fleet::setFleet(string unittype, int number, int tick) { int earlier = 0; int ticks = m_Fleet[unittype].size(); @@ -204,7 +204,7 @@ void Fleet::setFleet(string unittype, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::addFleet(std::string unittype, int number, int tick = 0) +void Fleet::addFleet(std::string unittype, int number, int tick) { int earlier = 0; int ticks = m_Fleet[unittype].size(); @@ -221,7 +221,7 @@ void Fleet::addFleet(std::string unittype, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -int Fleet::fleet(string unittype, int tick = 0) +int Fleet::fleet(string unittype, int tick) { int ticks = m_Fleet[unittype].size(); @@ -241,7 +241,7 @@ int Fleet::fleet(string unittype, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -int Fleet::blockedFleet(std::string unittype, int tick = 0) +int Fleet::blockedFleet(std::string unittype, int tick) { int ticks = m_BlockedFleet[unittype].size(); if (ticks == 0) @@ -257,7 +257,7 @@ int Fleet::blockedFleet(std::string unittype, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::setBlockedFleet(std::string unittype, int number, int tick = 0) +void Fleet::setBlockedFleet(std::string unittype, int number, int tick) { int ticks = m_BlockedFleet[unittype].size(); @@ -273,7 +273,7 @@ void Fleet::setBlockedFleet(std::string unittype, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::addToThis(std::vector fleets, int tick = 0) +void Fleet::addToThis(std::vector fleets, int tick) { for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i) { @@ -292,7 +292,7 @@ void Fleet::addToThis(std::vector fleets, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::distributeLossesGains(std::vector fleets, int tick = 0) +void Fleet::distributeLossesGains(std::vector fleets, int tick) { for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i) { @@ -316,12 +316,12 @@ void Fleet::distributeLossesGains(std::vector fleets, int tick = 0) { int fl1 = (*j)->fleet(unittype, tick - 1); float part = float(fl1) / fleet(unittype, 0) ; - int lost = totallost * part; + int lost = int(totallost * part); (*j)->setFleet(unittype, (*j)->fleet(unittype, tick - 1) + lost, tick); cerr << (*j)->name() << " gaining " << lost << " " << unittype << " since it's " << part * 100 << "% of the whole fleet, and it had : " << fl1 << " units last tick.." << endl; - lost = part * blockedFleet(unittype, 0); + lost = int(part * blockedFleet(unittype, 0)); cerr << (*j)->name() << " got " << lost << " blocked " << unittype << ", the total number of blocked ships was: " << blockedFleet(unittype, 0) << endl; @@ -332,7 +332,7 @@ void Fleet::distributeLossesGains(std::vector fleets, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -std::vector Fleet::calculateSide(std::vector fleets, int stays = 0, int tick = 0) +std::vector Fleet::calculateSide(std::vector fleets, int tick) { vector fl; for (vector::iterator i = fleets.begin(); i != fleets.end(); ++i) @@ -352,7 +352,7 @@ std::vector Fleet::calculateSide(std::vector fleets, int stays = ////////////////////////////////////////////////////////////////////////// // -int Fleet::freeFleet(std:: string unittype, int tick = 0) +int Fleet::freeFleet(std:: string unittype, int tick) { int bticks = m_BlockedFleet[unittype].size(); @@ -380,55 +380,27 @@ void Fleet::takeShoot(std::string unittype, int number, std::map::iterator i = s_Units[unittype].target().begin(); i != s_Units[unittype].target().end(); ++i) + for (int count = 0; count < 3; ++count) { 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 (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]; - } - } + int total = 0; + map targets = findTargets(ta,total, 0); 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) { 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; while (k > 0) { @@ -439,8 +411,6 @@ void Fleet::takeShoot(std::string unittype, int number, std::mapfirst].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) @@ -448,25 +418,9 @@ void Fleet::takeShoot(std::string unittype, int number, std::mapfirst] = 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) - { - int test = rand() % m_BlockedFleet[j->first][0]; - if (test == 1 - && m_BlockedFleet[j->first][0] > 0) - { - if (m_BlockedFleet[j->first].size() == 1) - m_BlockedFleet[j->first].push_back(m_BlockedFleet[j->first][0] - 1); - else if (m_BlockedFleet[j->first][1] > 0) - m_BlockedFleet[j->first][1]--; - } - } } } - - cerr << hitunits[j->first] << " units of type: " << j->first << "killed\n"; if (k <= 0) gunsleft -= maxguns; else @@ -478,63 +432,29 @@ void Fleet::takeShoot(std::string unittype, int number, std::map& hitunits) { int guns = s_Units[unittype].guns() * number; if (guns == 0) return; - cerr << unittype << ": with " << guns << " guns\n"; - 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) + for (int count = 0; count < 3; ++count) { 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 (freeFleet(j->first, 1) <= 0) - 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]; - } - - } + int total = 0; + map targets = findTargets(ta, total, 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) { - float maxguns = float((*j->second))/total * guns; - cerr << "Now shooting at target: " << j->first << endl; - + float maxguns = float((*j->second))/total * gunsleft; double k = maxguns; - int hits = 0; while (k > 0) @@ -547,10 +467,9 @@ void Fleet::takeEMP(std::string unittype, int number) k -= float(100)/(100-eres); hits++; + hitunits[j->first]++; blockFleet(j->first, 1); } - - cerr << hits << " units of type: " << j->first << " blocked\n"; if (k <= 0) gunsleft -= maxguns; else @@ -562,7 +481,7 @@ void Fleet::takeEMP(std::string unittype, int number) ////////////////////////////////////////////////////////////////////////// // -void Fleet::killFleet(std::string unittype, int number, int tick = 0) +void Fleet::killFleet(std::string unittype, int number, int tick) { int earlier = 0; int ticks = m_Fleet[unittype].size(); @@ -579,7 +498,7 @@ void Fleet::killFleet(std::string unittype, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::setResource(std::string type, int number, int tick = 0) +void Fleet::setResource(std::string type, int number, int tick) { int ticks = m_Resources[type].size(); @@ -590,7 +509,7 @@ void Fleet::setResource(std::string type, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::addResource(std::string type, int number, int tick = 0) +void Fleet::addResource(std::string type, int number, int tick) { int ticks = m_Resources[type].size(); @@ -603,7 +522,7 @@ void Fleet::addResource(std::string type, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -int Fleet::resource(std::string type, int tick = 0) const +int Fleet::resource(std::string type, int tick) const { if (tick < 0) return 0; @@ -658,7 +577,7 @@ void Fleet::printFleet() ////////////////////////////////////////////////////////////////////////// // -void Fleet::blockFleet(std::string unittype, int number, int tick = 0) +void Fleet::blockFleet(std::string unittype, int number, int tick) { if (m_BlockedFleet[unittype].size() >= 1) { @@ -677,7 +596,7 @@ void Fleet::blockFleet(std::string unittype, int number, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::distributeCappedRoids(std::vector fleets, int tick = 0) +void Fleet::distributeCappedRoids(std::vector fleets, int tick) { for (ResourceList::iterator i = m_Resources.begin(); i != m_Resources.end(); ++i) { @@ -705,7 +624,7 @@ void Fleet::distributeCappedRoids(std::vector fleets, int tick = 0) { unsigned fl1 = (*j)->score(tick - 1); float part = float(fl1) / score(0) ; - int lost = totcapped * part; + int lost = int(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; @@ -717,7 +636,7 @@ void Fleet::distributeCappedRoids(std::vector fleets, int tick = 0) ////////////////////////////////////////////////////////////////////////// // -void Fleet::addFleet(std::map units, int tick = 0) +void Fleet::addFleet(std::map units, int tick) { for (map::iterator i = units.begin(); i != units.end(); ++i) addFleet(i->first, i->second, tick); @@ -739,15 +658,15 @@ void Fleet::setStays(int ticks) ////////////////////////////////////////////////////////////////////////// // -void Fleet::calculateLostStealships(string unittype, std::map stolen, int tick = 1) +void Fleet::calculateLostStealships(string unittype, std::map stolen, int tick) { int stealscore = 0; for (map::iterator i = stolen.begin(); i != stolen.end(); ++i) { - stealscore += stolen[i->first] * (s_Units[i->first].totRes() / 10.0); + stealscore += int(stolen[i->first] * (s_Units[i->first].totRes() / 10.0)); } - int lost = stealscore / (s_Units[unittype].totRes() / 10.0); + int lost = int(stealscore / (s_Units[unittype].totRes() / 10.0)); cerr << "Lost " << lost << " " << unittype << " due to stealing ships worth: " << stealscore << endl; killFleet(unittype, lost, tick); @@ -755,7 +674,7 @@ void Fleet::calculateLostStealships(string unittype, std::map ////////////////////////////////////////////////////////////////////////// // -void Fleet::distributeStolenShips(std::map > stolen, std::vector fleets, int tick = 0) +void Fleet::distributeStolenShips(std::map > stolen, std::vector fleets, int tick) { for(map >::iterator i = stolen.begin(); i != stolen.end(); ++i) { @@ -767,7 +686,7 @@ void Fleet::distributeStolenShips(std::map::iterator k = fleets.begin(); k != fleets.end(); ++k) { - int stolen = float ((*k)->fleet(i->first, tick - 1)) / totalstealers * j->second; + int stolen = int(float ((*k)->fleet(i->first, tick - 1)) / totalstealers * j->second); (*k)->addFleet(j->first, stolen, tick); } } @@ -795,7 +714,7 @@ void Fleet::calculateSalvage() continue; cerr << "(" << tick << ":" << fleet(i->first, tick) << ") "; for (map::iterator k = res.begin(); k != res.end(); ++k) - addResource(k->first, lostunits * k->second * 0.25, tick); + addResource(k->first, int(lostunits * k->second * 0.25), tick); } } } @@ -817,3 +736,78 @@ void Fleet::resetTicks() } resetResources(); } + +////////////////////////////////////////////////////////////////////////// +// +int Fleet::freePodGuns(int tick) +{ + int guns = 0; + for (FleetList::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i) + { + if (s_Units[i->first].type() == "Pod") + { + guns += freeFleet(i->first, tick) * s_Units[i->first].guns(); + } + } + guns -= usedPodGuns(tick); + return guns; +} + +////////////////////////////////////////////////////////////////////////// +// +int Fleet::usedPodGuns(int tick) const +{ + int ticks = m_UsedPodGuns.size(); + + if (ticks == 0) + return 0; + + if (tick < 0) + return m_UsedPodGuns[0]; + + --ticks; + + if (ticks < tick) + return m_UsedPodGuns[ticks]; + + return m_UsedPodGuns[tick]; + +} + +////////////////////////////////////////////////////////////////////////// +// +void Fleet::usePodGuns(int tick, int guns) +{ + int ticks = m_UsedPodGuns.size(); + + for (int i = ticks; i <= tick; ++i) + { + m_UsedPodGuns.push_back(0); + } + m_UsedPodGuns[tick] += guns; +} + +////////////////////////////////////////////////////////////////////////// +// +std::map Fleet::findTargets(std::string targetClass,int& total, int attackerType) +{ + map targets; + + for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); ++i) + { + if (m_Fleet[i->first].size() == 0) + continue; + + if (m_Fleet[i->first].size() == 1 ) + m_Fleet[i->first].push_back(m_Fleet[i->first][0]); + + if (m_Fleet[i->first][1] > 0 && ( targetClass == i->second.unitClass() || targetClass == "All")) + { + if (i->second.unitClass() == "PDS" && attackerType == 1) + continue; + targets[i->first] = &m_Fleet[i->first][1]; + total += m_Fleet[i->first][1]; + } + } + return targets; +}