diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 13:54:56 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 13:54:56 +0000 |
| commit | 7fae29dea80ba1c6b005b195dc65e5e4df73ae21 (patch) | |
| tree | 29e1165d361f4d5b85215c741e164cdd327bd369 /src/map/mob.c | |
| parent | 469d68189f96c332eba0b90cd50f851ae751d75d (diff) | |
| download | hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.tar.gz hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.tar.bz2 hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.tar.xz hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.zip | |
* 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
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 9 |
1 files changed, 6 insertions, 3 deletions
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;i<MAX_MOBSKILL;i++) md->skilldelay[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) |