From 8a9600ded15d1846c9e38de0b660a0f6a72e20a9 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 29 Jan 2007 22:00:51 +0000 Subject: - Corrected the homunculus deletion functions so that the homunculus is deleted together with the character. - Added npc_check_areanpc so that Wand of Hermod will correctly check for nearby warps. - Emergency avoid now stacks with other speed boost statuses - Item skills and skills that bring up a menu now are cleared on death. - Minor cleanings git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9742 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mob.c | 4 ++-- src/map/npc.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/map/npc.h | 1 + src/map/pc.c | 6 +++++ src/map/skill.c | 3 +-- src/map/status.c | 7 +++--- 6 files changed, 80 insertions(+), 10 deletions(-) (limited to 'src/map') diff --git a/src/map/mob.c b/src/map/mob.c index c624643ef..b4ba0be55 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1100,8 +1100,8 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap) (md->ud.attacktimer == -1 && !status_check_skilluse(&md->bl, tbl, 0, 0)) || (md->ud.walktimer != -1 && !(battle_config.mob_ai&0x1) && !check_distance_bl(&md->bl, tbl, md->min_chase)) || ( - tbl->type == BL_PC && !(mode&MD_BOSS) && - (((TBL_PC*)tbl)->state.gangsterparadise || + tbl->type == BL_PC && + ((((TBL_PC*)tbl)->state.gangsterparadise && !(mode&MD_BOSS)) || ((TBL_PC*)tbl)->invincible_timer != INVALID_TIMER) )) { //Unlock current target. if (tbl && tbl->m != md->bl.m && battle_config.mob_ai&0x40) diff --git a/src/map/npc.c b/src/map/npc.c index c1caa3fee..a996b2112 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1005,6 +1005,67 @@ int npc_touch_areanpc2(struct block_list *bl) return 1; } +//Checks if there are any NPC on-touch objects on the given range. +//Flag determines the type of object to check for: +//&1: NPC Warps +//&2: NPCs with on-touch events. +int npc_check_areanpc(int flag,int m,int x,int y,int range) +{ + int i; + int x0,y0,y0,y1; + int xs,ys; + + if (range < 0) return 0; + x0 = x-range; + x1 = x+range; + y0 = y-range; + y1 = y+range; + + //First check for npc_cells on the range given + if (x0 < 0) x0 = 0; + if (y0 < 0) y0 = 0; + if (x1 >= map[m].xs) x1 = map[m].xs-1; + if (y1 >= map[m].ys) y1 = map[m].ys-1; + i = 0; + for (ys = y0; ys <= y1 && !i; ys++) { + for(xs = x0; xs <= x1 && !i; xs++){ + if (map_getcell(m,xs,ys,CELL_CHKNPC)) + i = 1; + } + } + if (!i) return 0; //No NPC_CELLs. + + //Now check for the actual NPC on said range. + for(i=0;isc.option&OPTION_INVISIBLE) + continue; + + switch(map[m].npc[i]->bl.subtype) { + case WARP: + if (!(flag&1)) + continue; + xs=map[m].npc[i]->u.warp.xs; + ys=map[m].npc[i]->u.warp.ys; + break; + case SCRIPT: + if (!(flag&2)) + continue; + xs=map[m].npc[i]->u.scr.xs; + ys=map[m].npc[i]->u.scr.ys; + break; + default: + continue; + } + if (x0 >= map[m].npc[i]->bl.x-xs/2 && x1 < map[m].npc[i]->bl.x-xs/2+xs && + y0 >= map[m].npc[i]->bl.y-ys/2 && y1 < map[m].npc[i]->bl.y-ys/2+ys) + break; + } + if (i==map[m].npc_num) + return 0; + + return (map[m].npc[i]->bl.id); +} + /*========================================== * 近くかどうかの判定 *------------------------------------------ @@ -1297,9 +1358,10 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list) nd = nd->master_nd; //For OnSell triggers. for(i=0,z=0;i=MAX_INVENTORY || qty < 0) break; @@ -1314,7 +1376,8 @@ int npc_selllist(struct map_session_data *sd,int n,unsigned short *item_list) else z+=(double)qty*pc_modifysellvalue(sd,sd->inventory_data[idx]->value_sell); - if(sd->inventory_data[idx]->type==7 && sd->status.inventory[idx].card[0] == (short)0xff00) + if(sd->inventory_data[idx]->type == IT_PETEGG && + sd->status.inventory[idx].card[0] == CARD0_PET) { if(search_petDB_index(sd->status.inventory[idx].nameid, PET_EGG) >= 0) intif_delete_petdata(MakeDWord(sd->status.inventory[idx].card[1],sd->status.inventory[idx].card[2])); diff --git a/src/map/npc.h b/src/map/npc.h index 63772089c..2f546ae0d 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -41,6 +41,7 @@ int npc_timer_event(const unsigned char *eventname); // Added by RoVeRT int npc_command(struct map_session_data *sd,const unsigned char *npcname,char *command); int npc_touch_areanpc(struct map_session_data *,int,int,int); int npc_touch_areanpc2(struct block_list *bl); // [Skotlex] +int npc_check_areanpc(int flag,int m,int x,int y,int range); int npc_click(struct map_session_data *sd,struct npc_data *nd); int npc_scriptcont(struct map_session_data *,int); TBL_NPC *npc_checknear(struct map_session_data *sd,struct block_list *bl); diff --git a/src/map/pc.c b/src/map/pc.c index d52303204..5d97b4587 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4874,9 +4874,15 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) } pc_setdead(sd); + //Reset menu skills/item skills + if (sd->skillitem) + sd->skillitem = sd->skillitemlv = 0; + if (sd->menuskill_id) + sd->menuskill_id = sd->menuskill_lv = 0; //Reset ticks. sd->hp_loss_tick = sd->sp_loss_tick = 0; + pc_setglobalreg(sd,"PC_DIE_COUNTER",++sd->die_counter); if (sd->state.event_death){ diff --git a/src/map/skill.c b/src/map/skill.c index 54c66986a..7259fa6c0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8265,8 +8265,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t break; } case CG_HERMODE: - if (map_foreachinrange (skill_check_condition_hermod_sub, &sd->bl, - skill_get_splash(skill, lv), BL_NPC) < 1) + if(!npc_check_areanpc(1,sd->bl.m,sd->bl.x,sd->bl.y,skill_get_splash(skill, lv))) { clif_skill_fail(sd,skill,0,0); return 0; diff --git a/src/map/status.c b/src/map/status.c index 0620b0c0f..9b228701c 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3654,9 +3654,12 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha speed += 300; if(sc->data[SC_GATLINGFEVER].timer==-1) - { //% increases (they don't stack, with the exception of Speedup1? @.@) + { //% increases (they don't stack, with a few exception) if(sc->data[SC_SPEEDUP1].timer!=-1) speed -= speed * 50/100; + else if(sc->data[SC_AVOID].timer!=-1) + speed -= speed * sc->data[SC_AVOID].val2/100; + if(sc->data[SC_RUN].timer!=-1) speed -= speed * 50/100; else if(sc->data[SC_SPEEDUP0].timer!=-1) @@ -3669,8 +3672,6 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha speed -= speed * 20/100; else if(sc->data[SC_BERSERK].timer!=-1) speed -= speed * 20/100; - else if(sc->data[SC_AVOID].timer!=-1) - speed -= speed * sc->data[SC_AVOID].val2/100; else if(sc->data[SC_WINDWALK].timer!=-1) speed -= speed * sc->data[SC_WINDWALK].val3/100; } -- cgit v1.2.3-70-g09d2