summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-04 20:00:25 +0000
committerVicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-04 20:00:25 +0000
commit18440ee042105029a3164315855fe2b860b68323 (patch)
tree79dd4ab6ec689cdf631407afcc6526117f77b9fa
parent00d7fbeb638034bfb7b3805107f324047d7788ad (diff)
downloadhercules-18440ee042105029a3164315855fe2b860b68323.tar.gz
hercules-18440ee042105029a3164315855fe2b860b68323.tar.bz2
hercules-18440ee042105029a3164315855fe2b860b68323.tar.xz
hercules-18440ee042105029a3164315855fe2b860b68323.zip
Skotlex's Falcon Assault fix
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5189 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3d95bf511..026211be0 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
+2006/02/04
+ * Skotlex's Falcon Assault fix. [Vicious]
2006/02/03
* Fixed the debug script messages specifying the wrong mapname for NPCs.
[Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index 8431a6c16..d6614a17b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2818,7 +2818,7 @@ struct Damage battle_calc_misc_attack(
case SN_FALCONASSAULT: /* ファルコンアサルト */
if( sd==NULL || (skill = pc_checkskill(sd,HT_STEELCROW)) <= 0)
skill=0;
- damage=(dex/10+int_/2+skill*3+40)*2; //Blitz Beat Damage
+ damage=(dex/10+int_/2+skill*3+40)*2*skill_get_num(HT_BLITZBEAT, skill_lv); //Blitz Beat Damage
damage=damage*(150+70*skill_lv)/100; //Falcon Assault Modifier
if(flag > 1)
damage /= flag;