Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Oops, little error on previous commit.

Browse Source 
- And cleaned a bit the mob use skill code.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10236 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-04-12 16:00:59 +00:00
parent e1a0d14886
commit 2c8dd7666b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/mob.c
View File

@ -2826,8 +2826,10 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
map_search_freecell(&md->bl, md->bl.m, &x, &y, j, j, 3); map_search_freecell(&md->bl, md->bl.m, &x, &y, j, j, 3);
} }
md->skillidx = i; md->skillidx = i;
flag = unit_skilluse_pos2(&md->bl, x, y, ms[i].skill_id, ms[i].skill_lv, if (!unit_skilluse_pos2(&md->bl, x, y,
ms[i].casttime, ms[i].cancel); ms[i].skill_id, ms[i].skill_lv,
ms[i].casttime, ms[i].cancel))
continue;
} else { } else {
//Targetted skill //Targetted skill
switch (ms[i].target) { switch (ms[i].target) {
@ -2858,15 +2860,12 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
} }
if (!bl) continue; if (!bl) continue;
md->skillidx = i; md->skillidx = i;
flag = unit_skilluse_id2(&md->bl, bl->id, ms[i].skill_id, ms[i].skill_lv, if (!unit_skilluse_id2(&md->bl, bl->id,
ms[i].casttime, ms[i].cancel); ms[i].skill_id, ms[i].skill_lv,
ms[i].casttime, ms[i].cancel))
continue;
} }
//Skill used. Post-setups... //Skill used. Post-setups...
if (!flag)
{ //Skill failed.
md->skillidx = -1;
continue;
}
if(battle_config.mob_ai&0x200) if(battle_config.mob_ai&0x200)
{ //pass on delay to same skill. { //pass on delay to same skill.
for (j = 0; j < md->db->maxskill; j++) for (j = 0; j < md->db->maxskill; j++)
@ -2877,6 +2876,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
return 1; return 1;
} }
//No skill was used. //No skill was used.
md->skillidx = -1;
return 0; return 0;
} }
/*========================================== /*==========================================

2
src/map/skill.c
View File

@ -5678,6 +5678,8 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data)
inf = BCT_ENEMY; //Offensive skill. inf = BCT_ENEMY; //Offensive skill.
else if(inf2&INF2_NO_ENEMY) else if(inf2&INF2_NO_ENEMY)
inf = BCT_NOENEMY; inf = BCT_NOENEMY;
else
inf =0;
if(inf2 & (INF2_PARTY_ONLY|INF2_GUILD_ONLY) && src != target) if(inf2 & (INF2_PARTY_ONLY|INF2_GUILD_ONLY) && src != target)
{ {