From 0ffe3b7569390da9b2dfa5493b70d363dce2439c Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 23 Mar 2006 01:56:52 +0000 Subject: - 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 --- Changelog-Trunk.txt | 1 + db/Changelog.txt | 1 + db/skill_require_db.txt | 2 +- src/map/mob.c | 2 +- src/map/skill.c | 8 ++------ src/map/skill.h | 3 +-- src/map/unit.c | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b594bc1e5..f2bf4c647 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/03/22 + * Fixed Arrow Shower. [Skotlex] * Merged the unit_data structure from jA for handling unit-related data (attack times, walking, auto-attack timers, skill related data). This is a huge change that affects walking, attacking, auto-attacking, skill usage diff --git a/db/Changelog.txt b/db/Changelog.txt index 882ef7424..af4703340 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -27,6 +27,7 @@ ========================= 03/22 + * Changed preserve's cost to 30 sp. [Skotlex] * Changed Soul Breaker's cast time to 700ms. [Skotlex] * Updated Elemental Converter ingredients. Thanks2 Haplo [Lupus] 03/21 diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt index 48b708b7c..bc3be6507 100644 --- a/db/skill_require_db.txt +++ b/db/skill_require_db.txt @@ -362,7 +362,7 @@ 471,0,0,55:35:15,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_SKE#Esk# 472,0,0,100:80:60,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_SKA#Eska# -475,0,0,40,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ST_PRESERVE## +475,0,0,30,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ST_PRESERVE## 476,0,0,22:24:26:28:30,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ST_FULLSTRIP## 477,0,0,5,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WS_WEAPONREFINE## 478,0,0,30,0,0,0,99,none,0,545,1,545,1,545,1,545,1,545,1,546,1,546,1,546,1,546,1,547,1 //CR_SLIMPITCHER## 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; -- cgit v1.2.3-70-g09d2