diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-06-14 19:37:59 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-06-14 19:37:59 +0000 |
| commit | 9b6c71e9f53861a0e35ad1842e695e789e21204f (patch) | |
| tree | 1ebeff785b014cc2cadc8657eda0cef07b940ea1 /src/map/skill.c | |
| parent | b26c654efca7862355e78f49af1f18b7d84d8581 (diff) | |
| download | hercules-9b6c71e9f53861a0e35ad1842e695e789e21204f.tar.gz hercules-9b6c71e9f53861a0e35ad1842e695e789e21204f.tar.bz2 hercules-9b6c71e9f53861a0e35ad1842e695e789e21204f.tar.xz hercules-9b6c71e9f53861a0e35ad1842e695e789e21204f.zip | |
* Blocked being able to use the skill CR_DEVOTION on players under the status SC_HELLPOWER.
- Additionally, users afflicted by the status can also no longer use Token of Siegfried to self-res.
* Added Manuk, Splendide and SC_HELLPOWER statuses to the status effects that can't be dispelled.
* Changed SC_SPEEDUP0 to use the correct status icon SI_MOVHASTE_HORSE.
* Changed SI_SPEEDUP1 to use the correct status icon SI_SPEEDPOTION1.
* Added updated 13.2 drops to existing monsters. (Most rates are unknown, and set to 0.1%)
* And time to squish database bug reports!
- Fixed guild event quest log entry time limit. (Bugreport:4204)
- Fixed Musika healing while attacking and not when attacked. (Bugreport:4211)
- Corrected the Int and HP/SP reduction on the Dead Tree Cane. (Bugreport:4217)
- Fixed the non-set bonus for Glorious Ring's heal increase. (Bugreport:4223)
- Fixed Death Guidance not casting NPC_HELLPOWER on the user. (Bugreport:4250)
- Changed the usable job for Bone Plate from all to thief class. (Bugreport:4286)
- Changed the bonus on alternate large bapho horns to subrace. (Bugreport:4291)
- Added slots to blu and pink night caps, and a couple others. (Bugreport:4301)
- Removed an extra comma from the Mini_Propeller_M headgear. (Bugreport:4307)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14342 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 4c34094b1..2f2a7e6b0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3851,7 +3851,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if( lv > battle_config.devotion_level_difference || // Level difference requeriments (dstsd->sc.data[type] && dstsd->sc.data[type]->val1 != src->id) || // Cannot Devote a player devoted from another source (skillid == ML_DEVOTION && (!mer || mer != dstsd->md)) || // Mercenary only can devote owner - (dstsd->class_&MAPID_UPPERMASK) == MAPID_CRUSADER ) // Crusader Cannot be devoted + (dstsd->class_&MAPID_UPPERMASK) == MAPID_CRUSADER || // Crusader Cannot be devoted + (dstsd->sc.data[SC_HELLPOWER])) // Players affected by SC_HELLPOWERR cannot be devoted. { if( sd ) clif_skill_fail(sd,skillid,0,0); @@ -4727,7 +4728,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case SC_READYSTORM: case SC_READYDOWN: case SC_READYTURN: case SC_READYCOUNTER:case SC_DODGE: case SC_WARM: case SC_SPEEDUP1: case SC_AUTOTRADE: case SC_CRITICALWOUND: - case SC_JEXPBOOST: case SC_INVINCIBLE: case SC_INVINCIBLEOFF: + case SC_JEXPBOOST: case SC_INVINCIBLE: case SC_INVINCIBLEOFF: + case SC_HELLPOWER: case SC_MANU_ATK: case SC_MANU_DEF: + case SC_SPL_ATK: case SC_SPL_DEF: case SC_MANU_MATK: + case SC_SPL_MATK: continue; case SC_ASSUMPTIO: if( bl->type == BL_MOB ) |