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

Fixed HAMI_CASTLE

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8366 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2006-08-19 16:57:03 +00:00
parent 29d910ea6e
commit 07365afd80
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/19 2006/08/19
* Fixed HAMI_CASTLE [Toms]
* Fixed HLIF_CHANGE [Toms] * Fixed HLIF_CHANGE [Toms]
* Updated HLIF_BRAIN skill [Toms] * Updated HLIF_BRAIN skill [Toms]
* Fixed homunculus intimacy on feeding [Toms] * Fixed homunculus intimacy on feeding [Toms]

1
db/Changelog.txt
View File

@ -20,6 +20,7 @@
========================= =========================
08/19 08/19
* Added HAMI_CASTLE block time [Toms]
* Updated NJ_BAKUENRYU skill tree [Toms] * Updated NJ_BAKUENRYU skill tree [Toms]
* Updated HLIF_CHANGE skill [Toms] * Updated HLIF_CHANGE skill [Toms]
* Updated Kouenka, removed aftercast delay [Toms] * Updated Kouenka, removed aftercast delay [Toms]

2
db/skill_cast_db.txt
View File

@ -969,6 +969,8 @@
8002,0,0,0,40000:35000:30000:25000:20000,0 8002,0,0,0,40000:35000:30000:25000:20000,0
//-- HLIF_CHANGE //-- HLIF_CHANGE
8004,0,0,0,60000:180000:300000,600000:900000:1200000 8004,0,0,0,60000:180000:300000,600000:900000:1200000
//-- HAMI_CASTLE
8005,0,0,0,0,60000:70000:80000:90000:129000
//-- HAMI_DEFENCE //-- HAMI_DEFENCE
8006,0,0,0,40000:35000:30000:25000:20000,30000 8006,0,0,0,40000:35000:30000:25000:20000,30000
//-- HAMI_BLOODLUST //-- HAMI_BLOODLUST

15
src/map/skill.c
View File

@ -5523,12 +5523,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break; break;
case HAMI_CASTLE: //[orn] case HAMI_CASTLE: //[orn]
if(rand()%100 > 20*skilllv || src == bl) if (src == bl && sd && sd->hd && merc_is_hom_active(sd->hd)) // (If used with @useskill, put the homunc as dest)
break; //Failed. bl = &sd->hd->bl;
if(rand()%100 < 20*skilllv && src != bl)
{ {
int x,y; int x,y;
x = src->x; x = src->x;
y = src->y; y = src->y;
if (hd)
skill_blockmerc_start(hd, skillid, skill_get_time2(skillid,skilllv));
if (unit_movepos(src,bl->x,bl->y,0,0)) { if (unit_movepos(src,bl->x,bl->y,0,0)) {
clif_skill_nodamage(src,bl,skillid,skilllv,1); clif_skill_nodamage(src,bl,skillid,skilllv,1);
@ -5541,6 +5544,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
AREA_SIZE, BL_MOB, bl, src); AREA_SIZE, BL_MOB, bl, src);
} }
} }
else
{
// Failed
if (hd)
clif_skill_fail(hd->master, skillid, 0, 0);
else
clif_skill_fail(sd, skillid, 0, 0);
}
break; break;
case HVAN_CHAOTIC: //[orn] case HVAN_CHAOTIC: //[orn]
{ {