diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-17 07:38:10 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-17 07:38:10 +0000 |
| commit | 6aa1ac3bede23b22ca1a8919818f226225c21165 (patch) | |
| tree | e136085d0b840eae7d98f1f56862926b2ea93caf /src/map/skill.c | |
| parent | 2afa19f37c9977e00f4b0b745ea1bc72ef3e5d5a (diff) | |
| download | hercules-6aa1ac3bede23b22ca1a8919818f226225c21165.tar.gz hercules-6aa1ac3bede23b22ca1a8919818f226225c21165.tar.bz2 hercules-6aa1ac3bede23b22ca1a8919818f226225c21165.tar.xz hercules-6aa1ac3bede23b22ca1a8919818f226225c21165.zip | |
- Fixed NPC_INVISIBLE's cloak ending after attacking once.
- Fixed SG_FUSION being castable without Soul Link state.
- Moved the item-use restriction SC checks from clif.c to pc_use_item, fixed Gravitation blocking potion usage on it's area of effect.
- Sphere Marines and Summoned Flora are now inmune to class-changing.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8782 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 790707090..af022a5af 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4941,7 +4941,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in //On level 1, use level 10 cloaking (no speed penalty) //with val4 passed as 1 is for "infinite cloak". clif_skill_nodamage(src,bl,skillid,skilllv, - sc_start4(bl,type,100,9+skilllv,0,0,1,skill_get_time(skillid,skilllv))); + sc_start4(bl,type,100,9+skilllv,0,0,2,skill_get_time(skillid,skilllv))); break; case NPC_SIEGEMODE: @@ -8226,7 +8226,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t clif_skill_fail(sd,skill,0,0); return 0; case SG_FUSION: - if (!sc || sc->data[SC_FUSION].timer!=-1) + if (sc && sc->data[SC_FUSION].timer!=-1) return 1; if (sc && sc->data[SC_SPIRIT].timer != -1 && sc->data[SC_SPIRIT].val2 == SL_STAR) break; |