From df8fa0f1ce4a4fbfa81040eeaa8dff35ded732ef Mon Sep 17 00:00:00 2001 From: mathusummut Date: Tue, 11 Dec 2018 00:54:51 +0100 Subject: [PATCH] Fixed multiplier bugs --- source/glest_game/game/game.cpp | 12 ++++++++++++ source/glest_game/main/battle_end.cpp | 2 +- source/glest_game/world/unit_updater.cpp | 2 +- source/glest_game/world/world.cpp | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index 749980f07..caf60747c 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -7569,6 +7569,18 @@ namespace Game { case ctCpuZeta: factionInfo += " CPU Zeta" + multiplier; 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: break; } diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp index a0fa470c8..281486512 100644 --- a/source/glest_game/main/battle_end.cpp +++ b/source/glest_game/main/battle_end.cpp @@ -713,7 +713,7 @@ namespace Game { "\nx " + floatToStr(stats.getResourceMultiplier(i), 1); } else if (stats.getPlayerLeftBeforeEnd(i) == true) { controlString += - "\n" + lang.getString("CpuUltra") + "\nx " + + "\n" + lang.getString("CpuZeta") + "\nx " + floatToStr(stats.getResourceMultiplier(i), 1); } diff --git a/source/glest_game/world/unit_updater.cpp b/source/glest_game/world/unit_updater.cpp index 8ae261c99..d246fd5f0 100644 --- a/source/glest_game/world/unit_updater.cpp +++ b/source/glest_game/world/unit_updater.cpp @@ -1723,7 +1723,7 @@ namespace Game { int resourceAmount = unit->getLoadCount(); if (unit->getFaction()->getCpuControl()) { 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); world->getStats()->harvest(unit->getFactionIndex(), resourceAmount); diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp index ea85a21d7..cbaa66d35 100644 --- a/source/glest_game/world/world.cpp +++ b/source/glest_game/world/world.cpp @@ -2076,7 +2076,7 @@ namespace Game { stats.setFactionTypeName(i, formatString(gs->getFactionTypeName(i))); stats.setPersonalityType(i, getFaction(i)->getType()->getPersonalityType()); 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)); if (getFaction(i)->getTexture()) { stats.setPlayerColor(i, getFaction(i)->getTexture()->getPixmapConst()->getPixel4f(0, 0));