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

Merge pull request #59 from titison/fix/AttackBoostDesc

Browse Source 
Fix AttackBoosts: Show Ep + Hp Regeneration in Desc
This commit is contained in:
titiger
2015-02-16 21:09:22 +01:00
parent 82bc650372 404db00701
commit 9b3d241c6c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/types/upgrade_type.cpp
View File

@@ -306,7 +306,7 @@ string UpgradeTypeBase::getDesc(bool translatedValue) const{
string indent="->"; string indent="->";
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
if(getMaxHp() != 0) { if(getMaxHp() != 0 || getMaxHpRegeneration() != 0) {
str += indent+lang.getString("Hp",(translatedValue == true ? "" : "english")) + " +" + intToStr(maxHp); str += indent+lang.getString("Hp",(translatedValue == true ? "" : "english")) + " +" + intToStr(maxHp);
if(maxHpIsMultiplier) { if(maxHpIsMultiplier) {
str += "%"; str += "%";
@@ -315,11 +315,11 @@ string UpgradeTypeBase::getDesc(bool translatedValue) const{
// str += " +" + intToStr(getMaxHpFromBoosts()); // str += " +" + intToStr(getMaxHpFromBoosts());
// } // }
if(getMaxHpRegeneration() != 0) { if(getMaxHpRegeneration() != 0) {
str += " [" + intToStr(maxHpRegeneration); str += " (" + lang.getString("Regeneration",(translatedValue == true ? "" : "english")) + ": +" + intToStr(maxHpRegeneration);
// if(getMaxHpRegenerationFromBoosts() != 0) { // if(getMaxHpRegenerationFromBoosts() != 0) {
// str += " +" + intToStr(getMaxHpRegenerationFromBoosts()); // str += " +" + intToStr(getMaxHpRegenerationFromBoosts());
// } // }
str += "]"; str += ")";
} }
} }
@@ -336,7 +336,7 @@ string UpgradeTypeBase::getDesc(bool translatedValue) const{
// } // }
} }
if(getMaxEp() != 0) { if(getMaxEp() != 0 || getMaxEpRegeneration() != 0) {
if(str != "") { if(str != "") {
str += "\n"; str += "\n";
} }
@@ -350,11 +350,11 @@ string UpgradeTypeBase::getDesc(bool translatedValue) const{
// } // }
if(getMaxEpRegeneration() != 0) { if(getMaxEpRegeneration() != 0) {
str += " [" + intToStr(maxEpRegeneration); str += " (" + lang.getString("Regeneration",(translatedValue == true ? "" : "english")) + ": +" + intToStr(maxEpRegeneration);
// if(getMaxEpRegenerationFromBoosts() != 0) { // if(getMaxEpRegenerationFromBoosts() != 0) {
// str += " +" + intToStr(getMaxEpRegenerationFromBoosts()); // str += " +" + intToStr(getMaxEpRegenerationFromBoosts());
// } // }
str += "]"; str += ")";
} }
} }