diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-09 17:12:05 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-09 17:12:05 +0000 |
| commit | 4e0a18597c68595b7f76a329820078711fb88965 (patch) | |
| tree | b16aad0481847d03243cbe23376e8199c9c026b8 | |
| parent | a9fd826718de5515595a0c74ac6d9cfe296ddb3a (diff) | |
| download | hercules-4e0a18597c68595b7f76a329820078711fb88965.tar.gz hercules-4e0a18597c68595b7f76a329820078711fb88965.tar.bz2 hercules-4e0a18597c68595b7f76a329820078711fb88965.tar.xz hercules-4e0a18597c68595b7f76a329820078711fb88965.zip | |
- Fixed skill range considerations using skill_get_range rather than skill_get_range2
- Corrected the range of EnergyDrain/BloodDrain (when Tharis says the range is 7, that means 7 without the cells on which the chars stand, so that means 9 in eA terms)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9833 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/skill_db.txt | 4 | ||||
| -rw-r--r-- | src/map/battle.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/db/skill_db.txt b/db/skill_db.txt index 64b25150d..293dd3910 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -230,8 +230,8 @@ 196,0,0,4,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_SUMMONSLAVE#Follower Summons# 197,0,0,4,0,1,0,10,1,no,0,0x2,0,none,0 //NPC_EMOTION#Emotion# 198,0,0,4,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_TRANSFORMATION#Transformation# -199,7,6,1,7,0,0,1,1,no,0,0x2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood# -200,7,6,1,7,0,0,1,1,no,0,0x2,0,magic,0 //NPC_ENERGYDRAIN#Energy Drain# +199,9,6,1,7,0,0,1,1,no,0,0x2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood# +200,9,6,1,7,0,0,1,1,no,0,0x2,0,magic,0 //NPC_ENERGYDRAIN#Energy Drain# 201,0,0,4,0,1,0,1,1,no,0,0x2,0,weapon,0 //NPC_KEEPING#Keeping# 202,2,6,1,7,0,0,5,1,no,0,0x2,0,misc,0 //NPC_DARKBREATH#Dark Breath# 203,9,6,1,7,1,0,10,1,no,0,0x2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing# diff --git a/src/map/battle.c b/src/map/battle.c index 9f8270f42..1bd279ef3 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -964,7 +964,7 @@ static struct Damage battle_calc_weapon_attack( else wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; } else { //based on used skill's range - if (skill_get_range(skill_num, skill_lv) < 5) + if (skill_get_range2(src, skill_num, skill_lv) < 5) wd.flag=(wd.flag&~BF_RANGEMASK)|BF_SHORT; else wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; @@ -2209,7 +2209,7 @@ struct Damage battle_calc_magic_attack( else ad.flag=(ad.flag&~BF_RANGEMASK)|BF_LONG; } else { //based on used skill's range - if (skill_get_range(skill_num, skill_lv) < 5) + if (skill_get_range2(src, skill_num, skill_lv) < 5) ad.flag=(ad.flag&~BF_RANGEMASK)|BF_SHORT; else ad.flag=(ad.flag&~BF_RANGEMASK)|BF_LONG; @@ -2586,7 +2586,7 @@ struct Damage battle_calc_misc_attack( else md.flag=(md.flag&~BF_RANGEMASK)|BF_LONG; } else { //based on used skill's range - if (skill_get_range(skill_num, skill_lv) < 5) + if (skill_get_range2(src, skill_num, skill_lv) < 5) md.flag=(md.flag&~BF_RANGEMASK)|BF_SHORT; else md.flag=(md.flag&~BF_RANGEMASK)|BF_LONG; |