summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-17 16:11:05 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-17 16:11:05 +0000
commit52e68dbe1533b916cab84e0e1e3f825f81e6153e (patch)
tree09c0a3ba3b82d502c9ecb7c2a79f987950c63c0b
parent59035dbca3d4af546f87263378168bf3c2e716ad (diff)
downloadhercules-52e68dbe1533b916cab84e0e1e3f825f81e6153e.tar.gz
hercules-52e68dbe1533b916cab84e0e1e3f825f81e6153e.tar.bz2
hercules-52e68dbe1533b916cab84e0e1e3f825f81e6153e.tar.xz
hercules-52e68dbe1533b916cab84e0e1e3f825f81e6153e.zip
* Eske and Eska now affect friendly guardians and slaves. (bugreport:2131)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13786 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c14
2 files changed, 10 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ba842f769..b30f79859 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/05/17
* Monocell, Instant Death and Class Change will now fail on bosses (bugreport:2907) [Playtester]
+ * Eske and Eska now affect friendly guardians and slaves. (bugreport:2131) [Inkfish]
09/05/15
* AutoSpellWhenHit now triggers on normal+skill by default (bugreport:1652) [Playtester]
* Removed the undocumented custom level feature from monster spawn lines (bugreport:3076) [ultramage]
diff --git a/src/map/skill.c b/src/map/skill.c
index 525beac6f..cb97bd0d0 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5308,13 +5308,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
clif_skill_fail(sd,skillid,0,0);
status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
- } else
- clif_skill_nodamage(src,bl,skillid,skilllv,
- sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
-
+ break;
+ }
+ clif_skill_nodamage(src,bl,skillid,skilllv,sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
if (skillid == SL_SKE)
sc_start(src,SC_SMA,100,skilllv,skill_get_time(SL_SMA,skilllv));
-
break;
// New guild skills [Celest]
@@ -5674,6 +5672,12 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
inf &= ~BCT_NEUTRAL;
}
+ if( ud->skillid >= SL_SKE && ud->skillid <= SL_SKA && target->type == BL_MOB )
+ {
+ if( ((TBL_MOB*)target)->class_ == MOBID_EMPERIUM )
+ break;
+ }
+ else
if (inf && battle_check_target(src, target, inf) <= 0)
break;