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

> Follow up to r17270: Fixed Base ATK not being calculated correctly.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17276 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
akinari1087 2013-04-20 17:30:25 +00:00
parent de86d74dc5
commit ac3e46de84
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map/status.c
View File

@ -1893,23 +1893,22 @@ static unsigned short status_base_atk(const struct block_list *bl, const struct
//Normally only players have base-atk, but homunc have a different batk //Normally only players have base-atk, but homunc have a different batk
// equation, hinting that perhaps non-players should use this for batk. // equation, hinting that perhaps non-players should use this for batk.
// [Skotlex] // [Skotlex]
if (bl->type == BL_HOM) {
#ifdef RENEWAL #ifdef RENEWAL
if (bl->type == BL_HOM) {
//str = ((rstr + dex + status->luk) / 3) + (((TBL_HOM*)bl)->homunculus.level / 10); //str = ((rstr + dex + status->luk) / 3) + (((TBL_HOM*)bl)->homunculus.level / 10);
str = (((rstr + dex + status->luk) / 3) + (((TBL_HOM*)bl)->homunculus.level / 10))*2; //Because Renewal ATK isn't implemented we adjust the actual ATK until it is str = (((rstr + dex + status->luk) / 3) + (((TBL_HOM*)bl)->homunculus.level / 10))*2; //Because Renewal ATK isn't implemented we adjust the actual ATK until it is
#else return cap_value(str, 0, USHRT_MAX);
dstr = str/10; }
str += dstr*dstr;
#endif #endif
} else if (bl->type != BL_PC) { dstr = str/10;
dstr = str/10; str += dstr*dstr;
str += dstr*dstr; if (bl->type == BL_PC) {
} else
#ifdef RENEWAL #ifdef RENEWAL
str = (rstr*10 + dex*10/5 + status->luk*10/3 + ((TBL_PC*)bl)->status.base_level*10/4)/10; str = (rstr*10 + dex*10/5 + status->luk*10/3 + ((TBL_PC*)bl)->status.base_level*10/4)/10;
#else #else
str+= dex/5 + status->luk/5; str+= dex/5 + status->luk/5;
#endif #endif
}
return cap_value(str, 0, USHRT_MAX); return cap_value(str, 0, USHRT_MAX);
} }