summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-28 16:54:21 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-28 16:54:21 +0000
commit8066ddee9b937a7f835f0af8a1fb393dfd0256b6 (patch)
tree1233a36cdfc6b4eb55487219a7bab14dcee8feb1 /src/map
parent9e94e8ad83d23ce2082b30217ed2f14f0b38a4bd (diff)
downloadhercules-8066ddee9b937a7f835f0af8a1fb393dfd0256b6.tar.gz
hercules-8066ddee9b937a7f835f0af8a1fb393dfd0256b6.tar.bz2
hercules-8066ddee9b937a7f835f0af8a1fb393dfd0256b6.tar.xz
hercules-8066ddee9b937a7f835f0af8a1fb393dfd0256b6.zip
* Updated specialeffect2 to accept player names. (follow up to r14353)
* Bascilica now allows boss-flagged monsters to knock you back as per official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14357 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c3
-rw-r--r--src/map/skill.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 51d5f8376..3a08cfd90 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11017,6 +11017,9 @@ BUILDIN_FUNC(specialeffect2)
if(sd==NULL)
return 0;
+ if( script_hasdata(st,4) )
+ sd = map_nick2sd(script_getstr(st,4));
+
clif_specialeffect(&sd->bl, type, target);
return 0;
diff --git a/src/map/skill.c b/src/map/skill.c
index 3e63a9211..6b045c43e 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1493,8 +1493,8 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in
case BL_PC:
{
struct map_session_data *sd = BL_CAST(BL_PC, target);
- if( sd->sc.data[SC_BASILICA] && sd->sc.data[SC_BASILICA]->val4 == sd->bl.id )
- return 0; // Basilica caster can't be knocked-back
+ if( sd->sc.data[SC_BASILICA] && sd->sc.data[SC_BASILICA]->val4 == sd->bl.id && !is_boss(src))
+ return 0; // Basilica caster can't be knocked-back by normal monsters.
if( src != target && sd->special_state.no_knockback )
return 0;
}