games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fixed #1667, #1669

Browse Source
This commit is contained in:
DjWarmonger 2014-02-28 17:49:56 +00:00
parent 93856dbe98
commit b8b809bd50
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/GUIClasses.cpp
View File

@ -5961,7 +5961,9 @@ void MoraleLuckBox::set(const IBonusBearer *node)
text += CGI->generaltexth->arraytxt[noneTxtId]; text += CGI->generaltexth->arraytxt[noneTxtId];
else else
{ {
if (node->hasBonusOfType (Bonus::UNDEAD) || node->hasBonusOfType(Bonus::BLOCK_MORALE) || node->hasBonusOfType(Bonus::NON_LIVING)) //it's a creature window //it's a creature window
if (morale && node->hasBonusOfType (Bonus::UNDEAD) ||
node->hasBonusOfType(Bonus::BLOCK_MORALE) || node->hasBonusOfType(Bonus::NON_LIVING))
{ {
text += CGI->generaltexth->arraytxt[113]; //unaffected by morale text += CGI->generaltexth->arraytxt[113]; //unaffected by morale
} }

20
config/artifacts.json
View File

@ -1338,7 +1338,7 @@
{ {
"type" : "STACK_HEALTH", "type" : "STACK_HEALTH",
"val" : 1, "val" : 1,
"valueType" : "BASE_NUMBER" "valueType" : "ADDITIVE_VALUE"
} }
], ],
"index" : 94, "index" : 94,
@ -1350,7 +1350,7 @@
{ {
"type" : "STACK_HEALTH", "type" : "STACK_HEALTH",
"val" : 1, "val" : 1,
"valueType" : "BASE_NUMBER" "valueType" : "ADDITIVE_VALUE"
} }
], ],
"index" : 95, "index" : 95,
@ -1362,7 +1362,7 @@
{ {
"type" : "STACK_HEALTH", "type" : "STACK_HEALTH",
"val" : 2, "val" : 2,
"valueType" : "BASE_NUMBER" "valueType" : "ADDITIVE_VALUE"
} }
], ],
"index" : 96, "index" : 96,
@ -1893,12 +1893,24 @@
{ {
"type" : "STACK_HEALTH", "type" : "STACK_HEALTH",
"val" : 25, "val" : 25,
"valueType" : "PERCENT_TO_BASE" "valueType" : "PERCENT_TO_BASE",
},
{
"type" : "STACK_HEALTH",
"val" : -25,
"valueType" : "PERCENT_TO_BASE",
"limiters" : ["IS_UNDEAD"]
}, },
{ {
"type" : "HP_REGENERATION", "type" : "HP_REGENERATION",
"val" : 50, "val" : 50,
"valueType" : "BASE_NUMBER" "valueType" : "BASE_NUMBER"
},
{
"type" : "HP_REGENERATION",
"val" : -50,
"valueType" : "BASE_NUMBER",
"limiters" : ["IS_UNDEAD"]
} }
], ],
"index" : 131, "index" : 131,