diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-04 19:07:18 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-04 19:07:18 +0000 |
| commit | 606fb6292db080bcbd84958c6e54df8eba190999 (patch) | |
| tree | 48894ebd41340b63eb49b20df34cf5f82fdb789a /src/map/skill.c | |
| parent | e52bb631e65f92cb54f94b2fdbd6f149bde44457 (diff) | |
| download | hercules-606fb6292db080bcbd84958c6e54df8eba190999.tar.gz hercules-606fb6292db080bcbd84958c6e54df8eba190999.tar.bz2 hercules-606fb6292db080bcbd84958c6e54df8eba190999.tar.xz hercules-606fb6292db080bcbd84958c6e54df8eba190999.zip | |
- Fixed HVAN_INSTRUCT int bonuses.
- Renamed mob_db's "adelay" column to ThinkTime and made the mob.c code use it instead of MIN_MOBTHINKTIME. The adelay of mobs will also be equal to their thinktime unless their thinktime is less than their attack motion.
- Cleaned the mob_db reading code a bit.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9406 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index cd4786022..f987e69d0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5675,8 +5675,8 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) break; if(md) { - if(ud->skillid != NPC_EMOTION)//Set afterskill delay. - md->last_thinktime=tick + (tid==-1?md->status.adelay:md->status.amotion); + if(tid != -1) //Set afterskill delay. + md->last_thinktime=tick + md->status.amotion; if(battle_config.mob_ai&0x200) { //pass on delay to same skill. int i; for (i = 0; i < md->db->maxskill; i++) @@ -5866,7 +5866,8 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data) break; if(md) { - md->last_thinktime=tick + (tid==-1?md->status.adelay:md->status.amotion); + if (tid != -1) + md->last_thinktime=tick +md->status.amotion; if(battle_config.mob_ai&0x200) { //pass on delay to same skill. int i; for (i = 0; i < md->db->maxskill; i++) |