diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 18:46:08 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 18:46:08 +0000 |
| commit | 577e58a1ef5dfc658076c0600663c22e9415f892 (patch) | |
| tree | 1dcc3ca106be3d68534b4136688e130790031d73 | |
| parent | 90d59676f4e34d970a7c89d82afc8b57f4b34dc8 (diff) | |
| download | hercules-577e58a1ef5dfc658076c0600663c22e9415f892.tar.gz hercules-577e58a1ef5dfc658076c0600663c22e9415f892.tar.bz2 hercules-577e58a1ef5dfc658076c0600663c22e9415f892.tar.xz hercules-577e58a1ef5dfc658076c0600663c22e9415f892.zip | |
Fixed HAMI_CASTLE, HAMI_DEFENCE & HLIF_AVOID
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8408 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 9 |
4 files changed, 11 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 07e37453d..ef627586a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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.
2006/08/21
+ * Fixed HAMI_CASTLE, HAMI_DEFENCE & HLIF_AVOID [Toms]
* Adjusted Glittering's success rate to 20+10*lv% [Skotlex]
* Corrected isequipped() so that cards will not be tagged as "used up"
unless all the specified items were found. [Skotlex]
diff --git a/db/Changelog.txt b/db/Changelog.txt index 11bf88fb4..844492379 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -19,6 +19,8 @@ -----
=========================
+08/21
+ * Added delay to HLIF_AVOID [Toms]
08/20
* Fixed Fling not reducing DEF for 30 seconds [Playtester]
* Updates Zeny givers (Red Pouch) [Lupus]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 55eb05443..1b2f3060b 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -966,7 +966,7 @@ //-- HLIF_HEAL
8001,0,1000,0,0,1000
//-- HLIF_AVOID
-8002,0,0,0,40000:35000:30000:25000:20000,0
+8002,0,0,0,40000:35000:30000:25000:20000,40000:45000:50000:55000:60000
//-- HLIF_CHANGE
8004,0,0,0,60000:180000:300000,600000:900000:1200000
//-- HAMI_CASTLE
diff --git a/src/map/skill.c b/src/map/skill.c index ac11dc856..c00a85a9a 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3766,9 +3766,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv))); break; case HLIF_AVOID: + if (hd) + skill_blockmerc_start(hd, skillid, skill_get_time2(skillid,skilllv)); case HAMI_DEFENCE: i = skill_get_time(skillid,skilllv); - clif_skill_nodamage(src,bl,skillid,skilllv,sc_start(bl,type,100,skilllv,i)); // Master + clif_skill_nodamage(bl,bl,skillid,skilllv,sc_start(bl,type,100,skilllv,i)); // Master clif_skill_nodamage(src,src,skillid,skilllv,sc_start(src,type,100,skilllv,i)); // Homunc break; case NJ_BUNSINJYUTSU: @@ -5532,10 +5534,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in skill_blockmerc_start(hd, skillid, skill_get_time2(skillid,skilllv)); if (unit_movepos(src,bl->x,bl->y,0,0)) { - clif_skill_nodamage(src,bl,skillid,skilllv,1); + clif_skill_nodamage(src,src,skillid,skilllv,1); // Homunc clif_fixpos(src) ; if (unit_movepos(bl,x,y,0,0)) + { + clif_skill_nodamage(bl,bl,skillid,skilllv,1); // Master clif_fixpos(bl) ; + } //TODO: Shouldn't also players and the like switch targets? map_foreachinrange(skill_chastle_mob_changetarget,src, |