From 7fae29dea80ba1c6b005b195dc65e5e4df73ae21 Mon Sep 17 00:00:00 2001 From: celest Date: Mon, 13 Dec 2004 13:54:56 +0000 Subject: * Added 'Throw Tomahawk' * Added some new monster skills - still not complete. * Adjusted Palm Strike, Tiger Fist and Chain Crush * Removed redundant 'sg_count' * Save both persons' data after trading * Removed 'type' paramater from pc_unequipitem * Moved unequip checking code from clif.c to pc.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@554 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mob.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/map/mob.c') diff --git a/src/map/mob.c b/src/map/mob.c index 0c9bbc734..d773de1ec 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -961,7 +961,6 @@ int mob_spawn(int id) md->guild_id = gc->guild_id; } - md->sg_count=0; md->deletetimer=-1; md->skilltimer=-1; @@ -2672,8 +2671,7 @@ int mob_class_change(struct mob_data *md,int *value) md->next_walktime = tick+rand()%50+5000; md->attackabletime = tick; md->canmove_tick = tick; - md->sg_count=0; - + for(i=0,c=tick-1000*3600*10;iskilldelay[i] = c; md->skillid=0; @@ -3281,6 +3279,11 @@ int mobskill_use_id(struct mob_data *md,struct block_list *target,int skill_idx) case SA_SPELLBREAKER: forcecast=1; break; + case NPC_SUMMONSLAVE: + case NPC_SUMMONMONSTER: + if(md->master_id!=0) + return 0; + break; } if(battle_config.mob_skill_log) -- cgit v1.2.3-70-g09d2