Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow up to 2fc7472

Browse Source 
Fixed an issue with random calculation on abra in some cases.
Moved some commonly used functions into util and yaml database for global usage.

Thanks to @Daegaladh and @aleos89
This commit is contained in:
Lemongrass3110
2019-12-19 22:12:55 +01:00
parent 2fc7472001
commit deb0615639
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/map/skill.cpp
View File

@@ -6410,20 +6410,23 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case SA_ABRACADABRA:
if (abra_db.size() == 0) {
if (abra_db.empty()) {
clif_skill_nodamage (src, bl, skill_id, skill_lv, 1);
break;
}
else {
int abra_skill_id = 0, abra_skill_lv, checked = 0, checked_max = abra_db.size() * 3;
auto abra_spell = abra_db.begin();
do {
std::advance(abra_spell, rnd() % abra_db.size());
auto abra_spell = abra_db.random();
abra_skill_id = abra_spell->second->skill_id;
abra_skill_id = abra_spell->skill_id;
abra_skill_lv = min(skill_lv, skill_get_max(abra_skill_id));
} while (checked++ < checked_max && rnd() % 10000 >= abra_spell->second->per[max(skill_lv - 1, 0)]);
if( rnd() % 10000 < abra_spell->per[max(skill_lv - 1, 0)] ){
break;
}
} while (checked++ < checked_max);
if (!skill_get_index(abra_skill_id))
break;
@@ -21629,11 +21632,6 @@ uint64 AbraDatabase::parseBodyNode(const YAML::Node &node) {
if (!this->asUInt16Rate(probNode, "Probability", probability))
return 0;
if (!probability) {
this->invalidWarning(probNode["Probability"], "Probability has to be within the range of 1~10000, skipping.\n");
return 0;
}
abra->per.fill(probability);
} else {
abra->per.fill(0);
@@ -21652,11 +21650,6 @@ uint64 AbraDatabase::parseBodyNode(const YAML::Node &node) {
if (!this->asUInt16Rate(it, "Probability", probability))
continue;
if (!probability) {
this->invalidWarning(it["Probability"], "Probability has to be within the range of 1~10000, skipping.\n");
return 0;
}
abra->per[skill_lv - 1] = probability;
}
}