diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-01 00:32:54 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-01 00:32:54 +0000 |
| commit | 58d4cb0ae8affce8115d965bb03206b9bb692820 (patch) | |
| tree | 084965d54ad1d7c5ed78ecbcc0bc045823ccc2e8 /src/map/battle.c | |
| parent | 6e909c5fe0ac44b801febce0076cf9866082899f (diff) | |
| download | hercules-58d4cb0ae8affce8115d965bb03206b9bb692820.tar.gz hercules-58d4cb0ae8affce8115d965bb03206b9bb692820.tar.bz2 hercules-58d4cb0ae8affce8115d965bb03206b9bb692820.tar.xz hercules-58d4cb0ae8affce8115d965bb03206b9bb692820.zip | |
- Fixed NPC_STOP id value in skill_cast_db
- Bladestop will no longer stop when you push either of the characters around.
- Fixed Enchant Poison having a near 100% chance of poisoning target on attack.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8015 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 27b718bc9..c7f200e8a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1585,8 +1585,8 @@ static struct Damage battle_calc_weapon_attack( skillratio += 150 +50*sc->data[SC_EDP].val1; } switch (skill_num) { - case AS_SONICBLOW: - if (sc && sc->data[SC_SPIRIT].timer != -1 && sc->data[SC_SPIRIT].val2 == SL_ASSASIN) + case AS_SONICBLOW: //EDP will not stack with Soul Link bonus. + if (sc && sc->data[SC_EDP].timer == -1 && sc->data[SC_SPIRIT].timer != -1 && sc->data[SC_SPIRIT].val2 == SL_ASSASIN) skillratio += (map_flag_gvg(src->m))?25:100; //+25% dmg on woe/+100% dmg on nonwoe if(sd && pc_checkskill(sd,AS_SONICACCEL)>0) skillratio += 10; |