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

vcmi: fix first aid regression

Browse Source
This commit is contained in:
Konstantin
2023-03-19 16:40:25 +03:00
parent f24ca6fbcf
commit 895572df02
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/creatures/special.json
View File

@@ -86,12 +86,6 @@
"heals" : { "heals" : {
"type" : "HEALER" , "type" : "HEALER" ,
"subtype" : "spell.firstAid" "subtype" : "spell.firstAid"
},
"power" : {
"type" : "SPECIFIC_SPELL_POWER",
"subtype" : "spell.firstAid",
"val" : 10,
"valueType" : "BASE_NUMBER"
} }
}, },
"graphics" : "graphics" :

6
config/skills.json
View File

@@ -805,17 +805,17 @@
}, },
"basic" : { "basic" : {
"effects" : { "effects" : {
"main" : { "val" : 40 } "main" : { "val" : 50 }
} }
}, },
"advanced" : { "advanced" : {
"effects" : { "effects" : {
"main" : { "val" : 65 } "main" : { "val" : 75 }
} }
}, },
"expert" : { "expert" : {
"effects" : { "effects" : {
"main" : { "val" : 90 } "main" : { "val" : 100 }
} }
} }
} }

2
lib/JsonNode.cpp
View File

@@ -818,8 +818,6 @@ static BonusParams convertDeprecatedBonus(const JsonNode &ability)
if(!params.valRelevant) { if(!params.valRelevant) {
params.val = static_cast<si32>(ability["val"].Float()); params.val = static_cast<si32>(ability["val"].Float());
params.valRelevant = true; params.valRelevant = true;
if(params.type == Bonus::SPECIFIC_SPELL_POWER) //First Aid value should be substracted by 10
params.val -= 10; //Base First Aid value
} }
Bonus::ValueType valueType = Bonus::ADDITIVE_VALUE; Bonus::ValueType valueType = Bonus::ADDITIVE_VALUE;
if(!ability["valueType"].isNull()) if(!ability["valueType"].isNull())