0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove checking for the presence of add, sub etc. attributes when check value.

Browse source 
For me (and this is not the opinion of https://github.com/soliton-) when we check the value of the value attribute,
 we seek to verify that the value encoded in ability (or possibly the default) corresponds,
 the value by default means that the value attribute is encoded with this default value, that's it.
 Apparently https://github.com/soliton- understood that it was the returned value that was checked and
 I let myself get into this error which I am now correcting.

currently absence of default value is only detected when other numeric attributes are used, this commit is here to repair this rather unfortunate oversight.
This commit is contained in:
newfrenchy83 2023-11-15 19:39:06 +01:00 • committed by Steve Cotton
parent 39cdedd198
commit 3f0d653718
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/units/unit.cpp
View file

@ -1472,20 +1472,17 @@ static bool matches_ability_filter(const config & cfg, const std::string& tag_na
return false;
if(!filter["value"].empty()){
bool has_other_key = (!cfg["add"].empty() || !cfg["sub"].empty() || !cfg["multiply"].empty() || !cfg["divide"].empty());
if(!has_other_key){
if(tag_name == "drains"){
if(!int_matches_if_present(filter, cfg, "value", 50)){
return false;
}
} else if(tag_name == "berserk"){
if(!int_matches_if_present(filter, cfg, "value", 1)){
return false;
}
} else if(tag_name == "heal_on_hit" || tag_name == "heals" || tag_name == "regenerate" || tag_name == "leadership"){
if(!int_matches_if_present(filter, cfg, "value" , 0)){
return false;
}
if(tag_name == "drains"){
if(!int_matches_if_present(filter, cfg, "value", 50)){
return false;
}
} else if(tag_name == "berserk"){
if(!int_matches_if_present(filter, cfg, "value", 1)){
return false;
}
} else if(tag_name == "heal_on_hit" || tag_name == "heals" || tag_name == "regenerate" || tag_name == "leadership"){
if(!int_matches_if_present(filter, cfg, "value" , 0)){
return false;
}
} else {
if(!int_matches_if_present(filter, cfg, "value")){