From 895572df0262f1d8e874abd3d97b6f270301a8eb Mon Sep 17 00:00:00 2001 From: Konstantin Date: Sun, 19 Mar 2023 16:40:25 +0300 Subject: [PATCH] vcmi: fix first aid regression --- config/creatures/special.json | 6 ------ config/skills.json | 6 +++--- lib/JsonNode.cpp | 2 -- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/config/creatures/special.json b/config/creatures/special.json index 9e525a58c..b99c7867d 100644 --- a/config/creatures/special.json +++ b/config/creatures/special.json @@ -86,12 +86,6 @@ "heals" : { "type" : "HEALER" , "subtype" : "spell.firstAid" - }, - "power" : { - "type" : "SPECIFIC_SPELL_POWER", - "subtype" : "spell.firstAid", - "val" : 10, - "valueType" : "BASE_NUMBER" } }, "graphics" : diff --git a/config/skills.json b/config/skills.json index 699d401ee..c98d948ff 100644 --- a/config/skills.json +++ b/config/skills.json @@ -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 } } } } diff --git a/lib/JsonNode.cpp b/lib/JsonNode.cpp index c4b124923..b2e8972e6 100644 --- a/lib/JsonNode.cpp +++ b/lib/JsonNode.cpp @@ -818,8 +818,6 @@ static BonusParams convertDeprecatedBonus(const JsonNode &ability) if(!params.valRelevant) { params.val = static_cast(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())