summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--db/Changelog.txt4
-rw-r--r--db/skill_db.txt4
-rw-r--r--src/map/mob.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 32c98ac0c..4aafa79db 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.
2007/01/30
+ * 'Long Range Attacked' mob skill conditions will no longer trigger on
+ magic attacks.
* Corrected char deletion not working (column is called homun_id, not
hom_id...)
* Collapsed config settings produce_item_name_input,
diff --git a/db/Changelog.txt b/db/Changelog.txt
index f0d1e3f46..ff7843e3a 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,10 @@
========================
+01/30
+ * Blood Drain and Energy Drain have their range updated to 7.
+ * Changed the element of Blood Drain from 'take weapon's element' to Dark.
+ [Skotlex]
01/24
* Fixed a typo in skill_cast_db.txt making the server skip NJ_KUNAI [ultramage]
Reported in http://www.eathena.ws/board/index.php?showtopic=136136
diff --git a/db/skill_db.txt b/db/skill_db.txt
index a5347f5e8..c548818c6 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -222,8 +222,8 @@
196,0,0,4,0,1,0,10,1,no,0,2,0,magic,0 //NPC_SUMMONSLAVE#Follower Summons#
197,0,0,4,0,1,0,10,1,no,0,2,0,none,0 //NPC_EMOTION#Emotion#
198,0,0,4,0,1,0,10,1,no,0,2,0,magic,0 //NPC_TRANSFORMATION#Transformation#
-199,9,6,1,-1,0,0,10,1,no,0,2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood#
-200,9,6,1,7,0,0,10,1,no,0,2,0,magic,0 //NPC_ENERGYDRAIN#Energy Drain#
+199,7,6,1,7,0,0,10,1,no,0,2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood#
+200,7,6,1,7,0,0,10,1,no,0,2,0,magic,0 //NPC_ENERGYDRAIN#Energy Drain#
201,0,0,4,0,1,0,10,1,no,0,2,0,weapon,0 //NPC_KEEPING#Keeping#
202,2,6,1,7,0,0,5,1,no,0,2,0,misc,0 //NPC_DARKBREATH#Dark Breath#
203,9,6,1,7,1,0,10,1,no,0,2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing#
diff --git a/src/map/mob.c b/src/map/mob.c
index b4ba0be55..b47dfcbb8 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2861,7 +2861,7 @@ int mobskill_event(struct mob_data *md, struct block_list *src, unsigned int tic
res = mobskill_use(md, tick, flag);
else if (flag&BF_SHORT)
res = mobskill_use(md, tick, MSC_CLOSEDATTACKED);
- else if (flag&BF_LONG)
+ else if (flag&BF_LONG && !(flag&BF_MAGIC)) //Long-attacked should not include magic.
res = mobskill_use(md, tick, MSC_LONGRANGEATTACKED);
if (!res)