diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-16 19:00:03 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-16 19:00:03 +0000 |
| commit | 68584f714db13e550ae532674fc39a6aeff428dc (patch) | |
| tree | 0a2b44b4189ce91417218aa7c281b366d707057d /src/map/battle.c | |
| parent | 0a9a02fb7798c957e1493aa20ab5904413d291e6 (diff) | |
| download | hercules-68584f714db13e550ae532674fc39a6aeff428dc.tar.gz hercules-68584f714db13e550ae532674fc39a6aeff428dc.tar.bz2 hercules-68584f714db13e550ae532674fc39a6aeff428dc.tar.xz hercules-68584f714db13e550ae532674fc39a6aeff428dc.zip | |
* Fixed a copy-paste mistake in disguise code (from r5833)
* Commented out clif_skill_damage2() as it is not used anymore
* Made Venom Splasher a splash attack that distributes damage
* Fixed displaying of several splash skills (see bugreport:238)
- added flag SD_PREAMBLE for skills that need the 'magic' packet (fixes Grimtooth / Cart Revolution displaying out of sync)
- hacked together Venom Splasher's "no animation for central mob"
- hacked in a custom packet to make Dragonfear display semi-correctly
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11491 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 475787dd1..1d0cbd046 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2432,8 +2432,7 @@ struct Damage battle_calc_magic_attack( /*========================================== * ‚»‚Ì‘¼ƒ_ƒ??[ƒWŒvŽZ *------------------------------------------*/ -struct Damage battle_calc_misc_attack( - struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag) +struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag) { int skill; short i, nk; @@ -2495,14 +2494,15 @@ struct Damage battle_calc_misc_attack( if(mflag > 1) //Autocasted Blitz. nk|=NK_SPLASHSPLIT; - if (skill_num == HT_BLITZBEAT) - break; - //Div fix of Blitzbeat - skill = skill_get_num(HT_BLITZBEAT, 5); - damage_div_fix(md.damage, skill); + if (skill_num == SN_FALCONASSAULT) + { + //Div fix of Blitzbeat + skill = skill_get_num(HT_BLITZBEAT, 5); + damage_div_fix(md.damage, skill); - //Falcon Assault Modifier - md.damage=md.damage*(150+70*skill_lv)/100; + //Falcon Assault Modifier + md.damage=md.damage*(150+70*skill_lv)/100; + } break; case TF_THROWSTONE: md.damage=50; @@ -2658,13 +2658,13 @@ struct Damage battle_calc_misc_attack( /*========================================== * ƒ_ƒ??[ƒWŒvŽZˆêŠ‡?ˆ—?—p *------------------------------------------*/ -struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int flag) +struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int count) { struct Damage d; switch(attack_type) { - case BF_WEAPON: d = battle_calc_weapon_attack(bl,target,skill_num,skill_lv,flag); break; - case BF_MAGIC: d = battle_calc_magic_attack(bl,target,skill_num,skill_lv,flag); break; - case BF_MISC: d = battle_calc_misc_attack(bl,target,skill_num,skill_lv,flag); break; + case BF_WEAPON: d = battle_calc_weapon_attack(bl,target,skill_num,skill_lv,count); break; + case BF_MAGIC: d = battle_calc_magic_attack(bl,target,skill_num,skill_lv,count); break; + case BF_MISC: d = battle_calc_misc_attack(bl,target,skill_num,skill_lv,count); break; default: if (battle_config.error_log) ShowError("battle_calc_attack: unknown attack type! %d\n",attack_type); |