diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2013-01-10 18:17:32 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2013-01-10 18:17:32 +0000 |
| commit | de0374e0afa0fe11e5609d619a222754a5e879c5 (patch) | |
| tree | 12791944920536ae2d18e7735bfdac6f137b83e5 /src/map/battle.c | |
| parent | bac08d580258b69b365db32ab1705df232851c5b (diff) | |
| download | hercules-de0374e0afa0fe11e5609d619a222754a5e879c5.tar.gz hercules-de0374e0afa0fe11e5609d619a222754a5e879c5.tar.bz2 hercules-de0374e0afa0fe11e5609d619a222754a5e879c5.tar.xz hercules-de0374e0afa0fe11e5609d619a222754a5e879c5.zip | |
Implemented official walk path dealing with obstacle.(bugreport:6159)
-see 'src/config/core.h' for settings[OFFICIAL_WALKPATH].
Fixed bugreport:7057 where HP_ASSUMPTIO should only double eDEF & eMDEF.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17091 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 6f9595108..7b6bf5869 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3137,7 +3137,10 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo short vit_def; defType def1 = status_get_def(target); //Don't use tstatus->def1 due to skill timer reductions. short def2 = tstatus->def2; - +#ifdef RENEWAL + if( tsc && tsc->data[SC_ASSUMPTIO] ) + def1 <<= 1; // only eDEF is doubled +#endif if( sd ) { i = sd->ignore_def[is_boss(target)?RC_BOSS:RC_NONBOSS]; @@ -4081,6 +4084,10 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list if(!flag.imdef){ defType mdef = tstatus->mdef; int mdef2= tstatus->mdef2; +#ifdef RENEWAL + if(tsc && tsc->data[SC_ASSUMPTIO]) + mdef <<= 1; // only eMDEF is doubled +#endif if(sd) { i = sd->ignore_mdef[is_boss(target)?RC_BOSS:RC_NONBOSS]; i+= sd->ignore_mdef[tstatus->race]; |