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

Merge branch 'develop' into SpellsRefactoring4

Browse Source
This commit is contained in:
AlexVinS 2014-11-24 12:45:34 +03:00
commit a71c452fc6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/windows/CCreatureWindow.cpp
View File

@ -651,7 +651,7 @@ void CStackWindow::CWindowSection::createBonusItem(size_t index, Point position)
BonusInfo & bi = parent->activeBonuses[index]; BonusInfo & bi = parent->activeBonuses[index];
new CPicture(bi.imagePath, position.x, position.y); new CPicture(bi.imagePath, position.x, position.y);
new CLabel(position.x + 60, position.y + 2, FONT_SMALL, TOPLEFT, Colors::WHITE, bi.name); new CLabel(position.x + 60, position.y + 2, FONT_SMALL, TOPLEFT, Colors::WHITE, bi.name);
new CLabel(position.x + 60, position.y + 25, FONT_SMALL, TOPLEFT, Colors::WHITE, bi.description); new CMultiLineLabel(Rect(position.x + 60, position.y + 17, 137,30), FONT_SMALL, TOPLEFT, Colors::WHITE, bi.description);
} }
} }

18
config/bonuses_texts.json
View File

@ -75,7 +75,7 @@
"DEATH_STARE": "DEATH_STARE":
{ {
"name": "Death Stare (${val}%)", "name": "Death Stare (${val}%)",
"description": "Chance to kill single creature" "description": "${val}% chance to kill single creature"
}, },
"DEFENSIVE_STANCE": "DEFENSIVE_STANCE":
@ -110,14 +110,14 @@
"ENCHANTER": "ENCHANTER":
{ {
"name": "Enchanter (${subtype.spell})", "name": "Enchanter",
"description": "Casts mass spell every turn" "description": "Can cast mass ${subtype.spell} every turn"
}, },
"ENCHANTED": "ENCHANTED":
{ {
"name": "Enchanted (${subtype.spell})", "name": "Enchanted",
"description": "Affected by permanent spell" "description": "Affected by permanent ${subtype.spell}"
}, },
"ENEMY_DEFENCE_REDUCTION": "ENEMY_DEFENCE_REDUCTION":
@ -198,14 +198,17 @@
"KING1": "KING1":
{ {
"name": "King1"
}, },
"KING2": "KING2":
{ {
"name": "King2"
}, },
"KING3": "KING3":
{ {
"name": "King3"
}, },
"LEVEL_SPELL_IMMUNITY": "LEVEL_SPELL_IMMUNITY":
@ -263,6 +266,7 @@
"NO_MORALE": "NO_MORALE":
{ {
}, },
@ -320,8 +324,8 @@
}, },
"SPELLCASTER": "SPELLCASTER":
{ {
"name": "Spellcaster (${subtype.spell})", "name": "Spellcaster",
"description": "Can cast spells" "description": "Can cast ${subtype.spell}"
}, },
"SPELL_AFTER_ATTACK": "SPELL_AFTER_ATTACK":