diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-04 01:17:11 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-04 01:17:11 +0000 |
| commit | 06d560398ec2e5d39b802b1db41aeb1d02316894 (patch) | |
| tree | 08f8d5e7f2fd1c5433d524fe1f6baa11c17a32e0 /src/map | |
| parent | 5189f62c76d4606c6203f8622e82b135244cf89a (diff) | |
| download | hercules-06d560398ec2e5d39b802b1db41aeb1d02316894.tar.gz hercules-06d560398ec2e5d39b802b1db41aeb1d02316894.tar.bz2 hercules-06d560398ec2e5d39b802b1db41aeb1d02316894.tar.xz hercules-06d560398ec2e5d39b802b1db41aeb1d02316894.zip | |
- Cleared up the bAutoSpellWhenHit description in doc/item_bonus.txt
- Fixed Phantasmic Arrow and Magical Bullet not being correctly tagged as a ranged arrow-type attack.
- Updated help.txt and help2.txt, thanks to Inuyasha for providing the updated files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7490 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 7 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c4a5b29fb..be22f4bc7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -843,7 +843,12 @@ static struct Damage battle_calc_weapon_attack( } wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; break; - + case GS_MAGICALBULLET: + case HT_PHANTASMIC: + //Since these do not consume ammo, they need to be explicitly set as arrow attacks. + flag.arrow = 1; + wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; + break; case CR_SHIELDBOOMERANG: case PA_SHIELDCHAIN: flag.weapon = 0; diff --git a/src/map/skill.c b/src/map/skill.c index a5b270329..6e8e0702c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6402,7 +6402,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid, { //Take on the base element, not the elemental one. struct status_data *bstatus = status_get_base_status(src); val1 = bstatus?bstatus->rhw.ele:status->rhw.ele; - if (sd) sd->state.arrow_atk = 0; //Disable consumption rigth away. + if (sd) sd->state.arrow_atk = 0; //Disable consumption right away. else if (!val1) val1 = ELE_WATER+rand()%(ELE_WIND-ELE_WATER); break; } |