diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-19 02:58:40 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-19 02:58:40 +0000 |
| commit | b97753dfe8dec3dc954f8f44c039cd994e59a1b0 (patch) | |
| tree | 5defc680e9cbfbce4f937aead79666290b85bf31 /src/map/battle.c | |
| parent | a5e721f8cf55f3e174f70412ef4a6f11aaa40a59 (diff) | |
| download | hercules-b97753dfe8dec3dc954f8f44c039cd994e59a1b0.tar.gz hercules-b97753dfe8dec3dc954f8f44c039cd994e59a1b0.tar.bz2 hercules-b97753dfe8dec3dc954f8f44c039cd994e59a1b0.tar.xz hercules-b97753dfe8dec3dc954f8f44c039cd994e59a1b0.zip | |
- Fixed Spider Web fire damage bonus.
- Made Global chat always reply back to you even on @/# commands, this prevents the client from muting yourself due to "hack". However, this same fix isn't easily applicable to @ commands invoked from whispers or party/guild messages, those are still pending.
- Some fixes in socket.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8801 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 9d7bf7514..f9590a50c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -201,8 +201,6 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag ratio += enchant_eff[sc->data[SC_VIOLENTGALE].val1-1]; if(sc->data[SC_DELUGE].timer!=-1 && atk_elem == ELE_WATER) ratio += enchant_eff[sc->data[SC_DELUGE].val1-1]; - if(sc->data[SC_SPIDERWEB].timer!=-1 && atk_elem == ELE_FIRE) // [Celest] - damage *= 2; //FIXME: Double damage instead of double ratio? } if (tsc && tsc->count) { @@ -214,6 +212,8 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag if (tsc->data[SC_ARMOR_ELEMENT].val3 == atk_elem) ratio -= tsc->data[SC_ARMOR_ELEMENT].val4; } + if(tsc->data[SC_SPIDERWEB].timer!=-1 && atk_elem == ELE_FIRE) // [Celest] + damage <<= 1; } return damage*ratio/100; } |