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

Merge pull request #1722 from rilian-la-te/fix-first-aid

Browse Source 
vcmi: fix first aid regression
This commit is contained in:
Ivan Savenko 2023-03-20 21:49:53 +02:00 committed by GitHub
commit 9289646dab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/creatures/special.json
View File

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

6
config/skills.json
View File

@ -805,17 +805,17 @@
},
"basic" : {
"effects" : {
"main" : { "val" : 40 }
"main" : { "val" : 50 }
}
},
"advanced" : {
"effects" : {
"main" : { "val" : 65 }
"main" : { "val" : 75 }
}
},
"expert" : {
"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) {
params.val = static_cast<si32>(ability["val"].Float());
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;
if(!ability["valueType"].isNull())