diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-19 13:26:50 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-19 13:26:50 +0000 |
| commit | c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb (patch) | |
| tree | ffa19893e7d612e011d2d441a48ed23c37a15898 /src/map/skill.c | |
| parent | a36580661f18d01c8b4f97be7d56d827df520638 (diff) | |
| download | hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.tar.gz hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.tar.bz2 hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.tar.xz hercules-c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb.zip | |
* Implemented script command "areamobuseskill" and skill NPC_INVINCIBLE and NPC_INVINCIBLEOFF. (topic:217330)
* Using items no longer cancels invincibility(but using target and ground skills through items does). (bugreport:3259)
* Fixed Butterfly Wings not working during GVG. (bugreport:3264)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13897 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index f33b7bb59..ef3b65dac 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -360,7 +360,10 @@ int skillnotok (int skillid, struct map_session_data *sd) return 1; // invalid skill id if (battle_config.gm_skilluncond && pc_isGM(sd) >= battle_config.gm_skilluncond) - return 0; // GMs can do any damn thing they want + return 0; // GMs can do any damn thing they want + + if( skillid == AL_TELEPORT && sd->skillitem == skillid && sd->skillitemlv > 2 ) + return 0; // Teleport lv 3 bypasses this check.[Inkfish] if (sd->blockskill[i] > 0) return 1; @@ -385,10 +388,10 @@ int skillnotok (int skillid, struct map_session_data *sd) } return 0; case AL_TELEPORT: - // if(map[m].flag.noteleport) { - // clif_skill_teleportmessage(sd,0); - // return 1; - // } + if(map[m].flag.noteleport) { + clif_skill_teleportmessage(sd,0); + return 1; + } return 0; // gonna be checked in 'skill_castend_nodamage_id' case WE_CALLPARTNER: case WE_CALLPARENT: @@ -3662,6 +3665,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case NPC_DEFENDER: case NPC_MAGICMIRROR: case ST_PRESERVE: + case NPC_INVINCIBLE: + case NPC_INVINCIBLEOFF: clif_skill_nodamage(src,bl,skillid,skilllv, sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); break; |