Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed skill range considerations using skill_get_range rather than skill_get_range2

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@9833 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-02-09 17:12:05 +00:00
parent 1de2ea7630
commit 6e7a224bd1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/skill_db.txt
View File

@ -230,8 +230,8 @@
196,0,0,4,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_SUMMONSLAVE#Follower Summons# 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# 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# 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# 199,9,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# 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# 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# 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# 203,9,6,1,7,1,0,10,1,no,0,0x2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing#

6
src/map/battle.c
View File

@ -964,7 +964,7 @@ static struct Damage battle_calc_weapon_attack(
else else
wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG;
} else { //based on used skill's range } 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; wd.flag=(wd.flag&~BF_RANGEMASK)|BF_SHORT;
else else
wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG; wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG;
@ -2209,7 +2209,7 @@ struct Damage battle_calc_magic_attack(
else else
ad.flag=(ad.flag&~BF_RANGEMASK)|BF_LONG; ad.flag=(ad.flag&~BF_RANGEMASK)|BF_LONG;
} else { //based on used skill's range } 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; ad.flag=(ad.flag&~BF_RANGEMASK)|BF_SHORT;
else else
ad.flag=(ad.flag&~BF_RANGEMASK)|BF_LONG; ad.flag=(ad.flag&~BF_RANGEMASK)|BF_LONG;
@ -2586,7 +2586,7 @@ struct Damage battle_calc_misc_attack(
else else
md.flag=(md.flag&~BF_RANGEMASK)|BF_LONG; md.flag=(md.flag&~BF_RANGEMASK)|BF_LONG;
} else { //based on used skill's range } 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; md.flag=(md.flag&~BF_RANGEMASK)|BF_SHORT;
else else
md.flag=(md.flag&~BF_RANGEMASK)|BF_LONG; md.flag=(md.flag&~BF_RANGEMASK)|BF_LONG;