summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 19:41:04 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 19:41:04 +0000
commit6de48b6df0789f9625e8604215fe856dc43776e1 (patch)
treef62625cefa74613cf7aebf41c91f596d933e194b
parenta5a5d08082d272690f89389db6029edf94fe551d (diff)
downloadhercules-6de48b6df0789f9625e8604215fe856dc43776e1.tar.gz
hercules-6de48b6df0789f9625e8604215fe856dc43776e1.tar.bz2
hercules-6de48b6df0789f9625e8604215fe856dc43776e1.tar.xz
hercules-6de48b6df0789f9625e8604215fe856dc43776e1.zip
- Self destruction will now hit all characters in range, not just enemies.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7950 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 63776ef8f..7cd1caf30 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.
2006/07/28
+ * Self destruction will now hit all characters in range, not just enemies.
+ [Skotlex]
* Cleaned up the NJ update code: [Skotlex]
- Restored code which was removed (stuff like SC_SKA)
- Fixed possible crashes on some NJ skills if used by non-players.
diff --git a/src/map/skill.c b/src/map/skill.c
index 1c09354d2..78b142d8b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4091,10 +4091,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break;
case NPC_SELFDESTRUCTION:
+ //Self Destruction hits everyone in range (allies+enemies)
clif_skill_nodamage(src, src, skillid, -1, 1);
map_foreachinrange(skill_area_sub, bl,
skill_get_splash(skillid, skilllv), BL_CHAR,
- src, skillid, skilllv, tick, flag|BCT_ENEMY,
+ src, skillid, skilllv, tick, flag|BCT_ALL,
skill_castend_damage_id);
status_damage(src, src, sstatus->max_hp,0,0,1);
break;