diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/script.c | 13 | ||||
| -rw-r--r-- | src/map/skill.c | 7 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index f680ce297..46a73fbd7 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3267,6 +3267,7 @@ int buildin_heal(struct script_state *st); int buildin_itemheal(struct script_state *st); int buildin_percentheal(struct script_state *st); int buildin_jobchange(struct script_state *st); +int buildin_jobname(struct script_state *st); int buildin_input(struct script_state *st); int buildin_setlook(struct script_state *st); int buildin_set(struct script_state *st); @@ -3583,6 +3584,7 @@ struct script_function buildin_func[] = { {buildin_return,"return","*"}, {buildin_getarg,"getarg","i"}, {buildin_jobchange,"jobchange","i*"}, + {buildin_jobname,"jobname","i"}, {buildin_input,"input","*"}, {buildin_warp,"warp","sii"}, {buildin_areawarp,"areawarp","siiiisii"}, @@ -4570,6 +4572,17 @@ int buildin_jobchange(struct script_state *st) * *------------------------------------------ */ +int buildin_jobname(struct script_state *st) +{ + int class_=conv_num(st,& (st->stack->stack_data[st->start+2])); + push_str(st->stack,C_CONSTSTR,job_name(class_)); + return 0; +} + +/*========================================== + * + *------------------------------------------ + */ int buildin_input(struct script_state *st) { struct map_session_data *sd = script_rid2sd(st); diff --git a/src/map/skill.c b/src/map/skill.c index 75ae90425..671dce936 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1877,8 +1877,11 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds tsd = (bl->type == BL_PC)?(TBL_PC*)bl:NULL; if (sc && !sc->count) sc = NULL; //Don't need it. - if (sc && sc->data[SC_SPIRIT].timer != -1 && sc->data[SC_SPIRIT].val2 == SL_WIZARD) - { //Spirit of Wizard blocks bounced back spells. + //Spirit of Wizard blocks bounced back spells. + if (sc && sc->data[SC_SPIRIT].timer != -1 && sc->data[SC_SPIRIT].val2 == SL_WIZARD + && !(tsd && (type = pc_search_inventory (tsd, 7321)) < 0)) + { + if (tsd) pc_delitem(tsd, type, 1, 0); dmg.damage = dmg.damage2 = 0; dmg.dmg_lv = ATK_FLEE; } |