Xaroth Brook

You are very much correct

Actually, my statement about your version is flawed, i should stop typing when I just wake up...

Take this case:

planet x has a cap of 50/50/30/20/20
if there are 20 towns at rank 5, none are able to progres from 3 to 4, in your test, this fails, as there are 0 rank 4 towns, and that code would allow progression.
If there are 20 towns at rank 5 still, and 10 at rank 3, none should be allowed to upgrade from 2 to 3, again, your code would not catch this.

I hope this clears it up even more.

Right, re-did this with the information I could grab from the scrapbook

due to not being able to upload files, the patch, pasted last

As per the scrapbook:

The number of player cities that can be placed is capped. The 3 main worlds of Corellia, Naboo, and Tatooine are able to hold 20 and the moons and adventure worlds of Talus, Rori, Dantooine, and Lok can hold up to 50 cities. It is important to note that there is also a cap on the number of cities that can achieve a certain rank. While the core worlds of Corellia, Naboo, and Tatooine can have a total of 20 cities, only 15 can be rank 3 or above and only 10 can be rank 4 or above. The moons/adventure planets of Talus, Rori, Dantooine, and Lok can have 30 cities above rank 3 and 20 above rank 4.

To accomplish this:

• Scrap the check for max cities, at all point we're checking for the rank at hand, which is equal or lower than the planet limit anyhow.
• Check for cities of equal or greater rank than being checked, as per the scrapbook.
• Double-check at the end.

The patch: (note, NEEDS TESTING, I don't have a full dev env running atm, so cannot do full testing.......)
Downloadable: http://rawr.xaroth.nl/xar/CityManagerImplementation.cpp.patch


Index: MMOCoreORB/src/server/zone/managers/city/CityManagerImplementation.cpp
===================================================================
— MMOCoreORB/src/server/zone/managers/city/CityManagerImplementation.cpp (revision 5901)
+++ MMOCoreORB/src/server/zone/managers/city/CityManagerImplementation.cpp (working copy)
@@ -186,9 +186,9 @@

bool CityManagerImplementation::isCityRankCapped(const String& planetName, byte rank) {
Vector<byte>* citiesAllowed = &citiesAllowedPerRank.get(planetName);

• byte maxCities = citiesAllowed->get(0);
  byte maxAtRank = citiesAllowed->get(rank - 1);
• byte totalCities = 0;
  + // http://www.swgemu.com/archive/scrapbookv51/data/20070127193144/index.html for information
  + byte totalAtRank = 0;

Locker _lock(_this.get());

@@ 200,12 +200,14 @@
if (cityZone == NULL || cityZone>getZoneName() != planetName)
continue;

• if (++totalCities > maxCities || totalCities > maxAtRank) {
• return true;
  + if (city->getCityRank() >= rank)
  Unknown macro: {+ if (++totalAtRank >= maxAtRank)

  Unknown macro: { + return true; + }

  }

  }
  -

• return false;
  +
  + return (totalAtRank >= maxAtRank);
  }

bool CityManagerImplementation::validateCityInRange(CreatureObject* creature, Zone* zone, float x, float y) {