diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-04 02:52:38 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-04 02:52:38 +0000 |
| commit | bdb423140e5779fae596257d24665762e33f1bdd (patch) | |
| tree | 6e28f5c512f1a0da159e9e1205541a644f7cce49 /src/map/battle.c | |
| parent | 8696a156589a80dffa658458b9a72d90d7de101f (diff) | |
| download | hercules-bdb423140e5779fae596257d24665762e33f1bdd.tar.gz hercules-bdb423140e5779fae596257d24665762e33f1bdd.tar.bz2 hercules-bdb423140e5779fae596257d24665762e33f1bdd.tar.xz hercules-bdb423140e5779fae596257d24665762e33f1bdd.zip | |
Bug fixes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@444 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 95ac787a9..be22723d3 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4394,8 +4394,13 @@ struct Damage battle_calc_misc_attack( } break; case SN_FALCONASSAULT: /* ファルコンアサルト */ +#ifdef TWILIGHT + skill = pc_checkskill(sd,HT_BLITZBEAT); + damage=(100+50*skill_lv+(dex/10+int_/2+skill*3+40)*2) * 2; +#else skill = pc_checkskill(sd,HT_STEELCROW); // Celest damage=((150+50*skill_lv)*(dex/10+int_/2+skill*3+40)*2)/100; +#endif break; } @@ -4958,7 +4963,7 @@ int battle_check_range(struct block_list *src,struct block_list *bl,int range) if( range>0 && range < arange ) {// 遠すぎる // be lenient if the skill was cast before we have moved to the correct position [Celest] if (src->type != BL_PC || - (src->type == BL_PC && ((struct map_session_data *)bl)->walktimer != -1 && + (bl->type == BL_PC && ((struct map_session_data *)bl)->walktimer != -1 && !((arange-=battle_config.skill_range_leniency)<=range))) return 0; } |