diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-09 14:47:09 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-09 14:47:09 +0000 |
| commit | af46f27288833c9f7889f669491988bd8f6fb2a5 (patch) | |
| tree | 2b9bfb7edaa0bfc013e5e4d864b9da07831fbb12 | |
| parent | a7d28720038070b6f8a15c707b38a0ce746c8206 (diff) | |
| download | hercules-af46f27288833c9f7889f669491988bd8f6fb2a5.tar.gz hercules-af46f27288833c9f7889f669491988bd8f6fb2a5.tar.bz2 hercules-af46f27288833c9f7889f669491988bd8f6fb2a5.tar.xz hercules-af46f27288833c9f7889f669491988bd8f6fb2a5.zip | |
* Fixed GX's skill level modifier is missing
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13745 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 93ff57c09..7497446bc 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,7 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 09/05/09 + * Fixed GX's skill level modifier is missing [Inkfish] * Fixed some known and unknown player attached NPC timer problems [Inkfish] - Attached timer now can be stopped properly. - Attached timer will now stop if the NPC is unloaded. (bugreport:2510) diff --git a/src/map/battle.c b/src/map/battle.c index 2b9443e82..d05f3ade5 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2479,7 +2479,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list if( skill_num == CR_GRANDCROSS || skill_num == NPC_GRANDDARKNESS ) { //Apply the physical part of the skill's damage. [Skotlex] struct Damage wd = battle_calc_weapon_attack(src,target,skill_num,skill_lv,mflag); - ad.damage = battle_attr_fix(src, target, wd.damage + ad.damage, s_ele, tstatus->def_ele, tstatus->ele_lv); + ad.damage = battle_attr_fix(src, target, wd.damage + ad.damage, s_ele, tstatus->def_ele, tstatus->ele_lv) * (100 + 40*skill_lv)/100;; if( src == target ) { if( src->type == BL_PC ) |