diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-18 14:33:52 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-18 14:33:52 +0000 |
| commit | 6713158b3247af09d6bf036028d94baf1e715525 (patch) | |
| tree | 45a39cd1e04bc80742a40410d3065bae7cfb86d7 /src/map/battle.c | |
| parent | ea64ed822782ca2e9f2dadf954a85da6d559ed54 (diff) | |
| download | hercules-6713158b3247af09d6bf036028d94baf1e715525.tar.gz hercules-6713158b3247af09d6bf036028d94baf1e715525.tar.bz2 hercules-6713158b3247af09d6bf036028d94baf1e715525.tar.xz hercules-6713158b3247af09d6bf036028d94baf1e715525.zip | |
- Corrected Venom splasher's splash damage
- You now can't move/attack/use-skills when using Cloaking of a level less than 3
- Fixed compilation of mercenary.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7729 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 3d38e3af9..dee87da15 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1406,11 +1406,10 @@ static struct Damage battle_calc_weapon_attack( skillratio += 100+100*skill_lv; break; case AS_SPLASHER: - skillratio += 400+50*skill_lv; - if (sd) - skillratio += 20*pc_checkskill(sd,AS_POISONREACT); - if(wflag>1) //FIXME: Splash damage... is this the correct method? [Skotlex] - skillratio /= wflag; + i = 400+50*skill_lv; + if (sd) i += 20*pc_checkskill(sd,AS_POISONREACT); + if (wflag) i/=2; //Splash damage is half. + skillratio += i; flag.cardfix = 0; break; case ASC_BREAKER: |