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

Corrected battle config default_fixed_castrate (#4341)

Browse Source 
* When default_fixed_castrate is set to 0, it should not replace the value of the databases' fixed value when greater than 0.
Thanks to @SeravySensei!
This commit is contained in:
Aleos 2019-10-15 13:48:41 -04:00 committed by GitHub
parent 72338366c9
commit fb6dbc306a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/skill.cpp
View File

@ -16648,12 +16648,13 @@ int skill_vfcastfix(struct block_list *bl, double time, uint16 skill_id, uint16
if (bl->type == BL_MOB || bl->type == BL_NPC) if (bl->type == BL_MOB || bl->type == BL_NPC)
return (int)time; return (int)time;
if (fixed < 0 || !battle_config.default_fixed_castrate) // no fixed cast time if (fixed < 0) // no fixed cast time
fixed = 0; fixed = 0;
else if (fixed == 0) { else if (fixed == 0) {
fixed = (int)time * battle_config.default_fixed_castrate / 100; // fixed time fixed = (int)time * battle_config.default_fixed_castrate / 100; // fixed time
time = time * (100 - battle_config.default_fixed_castrate) / 100; // variable time time = time * (100 - battle_config.default_fixed_castrate) / 100; // variable time
} }
// Else, use fixed cast time from database (when default_fixed_castrate is set to 0)
// Additive Variable Cast bonus adjustments by items // Additive Variable Cast bonus adjustments by items
if (sd && !(flag&4)) { if (sd && !(flag&4)) {