diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-05 15:03:53 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-05 15:03:53 +0000 |
| commit | fc694ecbe6734d01c0a1626beb96f514fb06aa5e (patch) | |
| tree | 153214b8623bb3671d0ed5f8876020add55740c7 /src/map/battle.c | |
| parent | 6fc7c2a2614eeb39ac8a6f62e8d4998b7860fd27 (diff) | |
| download | hercules-fc694ecbe6734d01c0a1626beb96f514fb06aa5e.tar.gz hercules-fc694ecbe6734d01c0a1626beb96f514fb06aa5e.tar.bz2 hercules-fc694ecbe6734d01c0a1626beb96f514fb06aa5e.tar.xz hercules-fc694ecbe6734d01c0a1626beb96f514fb06aa5e.zip | |
- Kaupe now will only block all skills of players, for non-players, only normal attacks can be missed.
- Moved the Kaite spell-reflect code after the damage calculation function, so the reflected damage is exactly the damage the original target would have received. Will only trigger if the damage to be reflected is above 0.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6489 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 8a66cbedf..b8426214a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -461,8 +461,10 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i && rand()%100 < 75 && !(skill_get_inf(skill_num)&INF_GROUND_SKILL))
return 0;
- if(sc->data[SC_KAUPE].timer != -1 && rand()%100 < sc->data[SC_KAUPE].val2)
- {
+ if(sc->data[SC_KAUPE].timer != -1 &&
+ rand()%100 < sc->data[SC_KAUPE].val2 &&
+ (bl->type == BL_PC || !skill_num))
+ { //Kaupe only blocks all skills of players.
clif_skill_nodamage(bl,bl,SL_KAUPE,1,1);
if (--sc->data[SC_KAUPE].val3 <= 0) //We make it work like Safety Wall, even though it only blocks 1 time.
status_change_end(bl, SC_KAUPE, -1);
|