|
@@ -10069,19 +10069,20 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
|
case GN_MANDRAGORA:
|
|
case GN_MANDRAGORA:
|
|
if( flag&1 ) {
|
|
if( flag&1 ) {
|
|
int rate = 25 + (10 * skill_lv) - (tstatus->vit + tstatus->luk) / 5;
|
|
int rate = 25 + (10 * skill_lv) - (tstatus->vit + tstatus->luk) / 5;
|
|
|
|
+
|
|
if (rate < 10)
|
|
if (rate < 10)
|
|
rate = 10;
|
|
rate = 10;
|
|
- if (bl->type == BL_MOB)
|
|
|
|
- break;
|
|
|
|
- if (rnd()%100 < rate) {
|
|
|
|
- sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv));
|
|
|
|
- status_zap(bl,0,status_get_max_sp(bl) * (25 + 5 * skill_lv) / 100);
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- map_foreachinrange(skill_area_sub,bl,skill_get_splash(skill_id,skill_lv),BL_CHAR,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill_castend_nodamage_id);
|
|
|
|
- clif_skill_nodamage(src,src,skill_id,skill_lv,1);
|
|
|
|
|
|
+ if (bl->type == BL_MOB || (tsc && tsc->data[type]))
|
|
|
|
+ break; // Don't activate if target is a monster or zap SP if target already has Mandragora active.
|
|
|
|
+ if (rnd()%100 < rate) {
|
|
|
|
+ sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv));
|
|
|
|
+ status_zap(bl,0,status_get_max_sp(bl) * (25 + 5 * skill_lv) / 100);
|
|
}
|
|
}
|
|
- break;
|
|
|
|
|
|
+ } else {
|
|
|
|
+ map_foreachinrange(skill_area_sub,bl,skill_get_splash(skill_id,skill_lv),BL_CHAR,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill_castend_nodamage_id);
|
|
|
|
+ clif_skill_nodamage(src,src,skill_id,skill_lv,1);
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
case GN_SLINGITEM:
|
|
case GN_SLINGITEM:
|
|
if( sd ) {
|
|
if( sd ) {
|
|
short ammo_id;
|
|
short ammo_id;
|