mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 20:12:40 +02:00
Code Issues Projects Releases Wiki Activity

Fixed multiplier bugs

Browse Source
This commit is contained in:
mathusummut
2018-12-11 00:54:51 +01:00
parent e52127c343
commit df8fa0f1ce
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/game/game.cpp
View File

@@ -7569,6 +7569,18 @@ namespace Game {
case ctCpuZeta: case ctCpuZeta:
factionInfo += " CPU Zeta" + multiplier; factionInfo += " CPU Zeta" + multiplier;
break; break;
case ctNetworkCpuEasy:
factionInfo += " Network CPU Easy" + multiplier;
break;
case ctNetworkCpu:
factionInfo += " Network CPU Normal" + multiplier;
break;
case ctNetworkCpuUltra:
factionInfo += " Network CPU Ultra" + multiplier;
break;
case ctNetworkCpuZeta:
factionInfo += " Network CPU Zeta" + multiplier;
break;
default: default:
break; break;
} }

2
source/glest_game/main/battle_end.cpp
View File

@@ -713,7 +713,7 @@ namespace Game {
"\nx " + floatToStr(stats.getResourceMultiplier(i), 1); "\nx " + floatToStr(stats.getResourceMultiplier(i), 1);
} else if (stats.getPlayerLeftBeforeEnd(i) == true) { } else if (stats.getPlayerLeftBeforeEnd(i) == true) {
controlString += controlString +=
"\n" + lang.getString("CpuUltra") + "\nx " + "\n" + lang.getString("CpuZeta") + "\nx " +
floatToStr(stats.getResourceMultiplier(i), 1); floatToStr(stats.getResourceMultiplier(i), 1);
} }

2
source/glest_game/world/unit_updater.cpp
View File

@@ -1723,7 +1723,7 @@ namespace Game {
int resourceAmount = unit->getLoadCount(); int resourceAmount = unit->getLoadCount();
if (unit->getFaction()->getCpuControl()) { if (unit->getFaction()->getCpuControl()) {
int resourceMultiplierIndex = game->getGameSettings()->getResourceMultiplierIndex(unit->getFaction()->getIndex()); int resourceMultiplierIndex = game->getGameSettings()->getResourceMultiplierIndex(unit->getFaction()->getIndex());
resourceAmount = (resourceAmount* (resourceMultiplierIndex + 5)) / 10; resourceAmount = resourceAmount * (resourceMultiplierIndex + 1) * 0.5;
} }
unit->getFaction()->incResourceAmount(unit->getLoadType(), resourceAmount); unit->getFaction()->incResourceAmount(unit->getLoadType(), resourceAmount);
world->getStats()->harvest(unit->getFactionIndex(), resourceAmount); world->getStats()->harvest(unit->getFactionIndex(), resourceAmount);

2
source/glest_game/world/world.cpp
View File

@@ -2076,7 +2076,7 @@ namespace Game {
stats.setFactionTypeName(i, formatString(gs->getFactionTypeName(i))); stats.setFactionTypeName(i, formatString(gs->getFactionTypeName(i)));
stats.setPersonalityType(i, getFaction(i)->getType()->getPersonalityType()); stats.setPersonalityType(i, getFaction(i)->getType()->getPersonalityType());
stats.setControl(i, gs->getFactionControl(i)); stats.setControl(i, gs->getFactionControl(i));
stats.setResourceMultiplier(i, (gs->getResourceMultiplierIndex(i) + 5)*0.1f); stats.setResourceMultiplier(i, (gs->getResourceMultiplierIndex(i) + 1) * 0.5f);
stats.setPlayerName(i, gs->getNetworkPlayerName(i)); stats.setPlayerName(i, gs->getNetworkPlayerName(i));
if (getFaction(i)->getTexture()) { if (getFaction(i)->getTexture()) {
stats.setPlayerColor(i, getFaction(i)->getTexture()->getPixmapConst()->getPixel4f(0, 0)); stats.setPlayerColor(i, getFaction(i)->getTexture()->getPixmapConst()->getPixel4f(0, 0));