diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-23 01:56:52 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-23 01:56:52 +0000 |
| commit | 0ffe3b7569390da9b2dfa5493b70d363dce2439c (patch) | |
| tree | 66ce8fcdbc876c914e79639048c8fac3ec665814 /src | |
| parent | 021b26b8409a84b4c83eb0cc1eedbd65eedfd4e0 (diff) | |
| download | hercules-0ffe3b7569390da9b2dfa5493b70d363dce2439c.tar.gz hercules-0ffe3b7569390da9b2dfa5493b70d363dce2439c.tar.bz2 hercules-0ffe3b7569390da9b2dfa5493b70d363dce2439c.tar.xz hercules-0ffe3b7569390da9b2dfa5493b70d363dce2439c.zip | |
- Changed Preserve's cost to 30sp
- Fixed Arrow Shower, UNT_MAGIC_SKILLS was renamed to UNT_ATTACK_SKILLS
- Fixed skill_use_pos checking target tile CELL_CHKNOPASS as invalid instead of CELL_CHKNOREACH
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5708 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 8 | ||||
| -rw-r--r-- | src/map/skill.h | 3 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index fdf1911cb..e907fa862 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1314,7 +1314,7 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap) dy = 2*(-1+(i%3));
if (map_getcell(md->bl.m, tbl->x-dx, tbl->y-dy, CELL_CHKSTACK))
continue;
- if (unit_walktoxy(md, tbl->x-dx, tbl->y-dy, 0)) {
+ if (unit_walktoxy(&md->bl, tbl->x-dx, tbl->y-dy, 0)) {
unit_set_walkdelay(&md->bl, tick, 1000, 1);
break;
}
diff --git a/src/map/skill.c b/src/map/skill.c index 333db383c..8facca717 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6793,12 +6793,8 @@ int skill_unit_onplace_timer(struct skill_unit *src,struct block_list *bl,unsign break;
}
- case UNT_ARROWSHOWER:
- skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
- break;
-
- case UNT_MAGIC_SKILLS:
- skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
+ case UNT_ATTACK_SKILLS:
+ skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
break;
case UNT_FIREPILLAR_WAITING:
diff --git a/src/map/skill.h b/src/map/skill.h index 4fb2c9b40..4624e66b9 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -873,11 +873,10 @@ enum { UNT_FIREWALL,
UNT_WARP_WAITING,
UNT_WARP_ACTIVE,
- UNT_ARROWSHOWER = 0x82, //TODO: Get actual unit id.
UNT_SANCTUARY = 0x83,
UNT_MAGNUS,
UNT_PNEUMA,
- UNT_MAGIC_SKILLS,
+ UNT_ATTACK_SKILLS, //These show no effect on the client, therefore can be used for attack skills.
UNT_FIREPILLAR_WAITING,
UNT_FIREPILLAR_ACTIVE,
diff --git a/src/map/unit.c b/src/map/unit.c index a866cdf9e..c38e7fa6f 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -931,7 +931,7 @@ int unit_skilluse_pos2( struct block_list *src, int skill_x, int skill_y, int sk if (!status_check_skilluse(src, NULL, skill_num, 0))
return 0;
- if (map_getcell(src->m, skill_x, skill_y, CELL_CHKNOPASS))
+ if (map_getcell(src->m, skill_x, skill_y, CELL_CHKNOREACH))
{ //prevent casting ground targeted spells on non-walkable areas. [Skotlex]
if (sd) clif_skill_fail(sd,skill_num,0,0);
return 0;
|