games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-01 00:45:26 +02:00
Code Issues Releases Activity

Several minor fixes/features

Browse Source 
- moved all traslatable strings into one json file, removed threats.txt file
- implemented "spellbook animation" option
- fixed missing central tower when attacking fort
This commit is contained in:
Ivan Savenko
2013-10-27 13:05:01 +00:00
parent 9237e6d97d
commit 6cb3cb006d
10 changed files with 112 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/CObjectHandler.cpp
View File

@ -3231,24 +3231,24 @@ const std::string & CGCreature::getHoverText() const
if(const CGHeroInstance *selHero = cb->getSelectedHero(cb->getCurrentPlayer()))
{
std::vector<std::string> * texts = &VLC->generaltexth->threat;
hoverName += "\n\n ";
hoverName += (*texts)[0];
const JsonNode & texts = VLC->generaltexth->localizedTexts["adventureMap"]["monsterThreat"];
hoverName += texts["title"].String();
int choice;
double ratio = ((double)getArmyStrength() / selHero->getTotalStrength());
if (ratio < 0.1) choice = 1;
else if (ratio < 0.25) choice = 2;
else if (ratio < 0.6) choice = 3;
else if (ratio < 0.9) choice = 4;
else if (ratio < 1.1) choice = 5;
else if (ratio < 1.3) choice = 6;
else if (ratio < 1.8) choice = 7;
else if (ratio < 2.5) choice = 8;
else if (ratio < 4) choice = 9;
else if (ratio < 8) choice = 10;
else if (ratio < 20) choice = 11;
else choice = 12;
hoverName += (*texts)[choice];
if (ratio < 0.1) choice = 0;
else if (ratio < 0.25) choice = 1;
else if (ratio < 0.6) choice = 2;
else if (ratio < 0.9) choice = 3;
else if (ratio < 1.1) choice = 4;
else if (ratio < 1.3) choice = 5;
else if (ratio < 1.8) choice = 6;
else if (ratio < 2.5) choice = 7;
else if (ratio < 4) choice = 8;
else if (ratio < 8) choice = 9;
else if (ratio < 20) choice = 10;
else choice = 11;
hoverName += texts["levels"].Vector()[choice].String();
}
return hoverName;
}