diff options
| author | blackhole89 <blackhole89@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-30 12:58:23 +0000 |
|---|---|---|
| committer | blackhole89 <blackhole89@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-30 12:58:23 +0000 |
| commit | 9d47df647756cb71d5efa85ccb15153c18d3c4e5 (patch) | |
| tree | ff9cdffaecc18605a7efe1c8e839e13821df311e | |
| parent | 1ea4e8fc7edf8861b7872825b177ee29626bcd7a (diff) | |
| download | hercules-9d47df647756cb71d5efa85ccb15153c18d3c4e5.tar.gz hercules-9d47df647756cb71d5efa85ccb15153c18d3c4e5.tar.bz2 hercules-9d47df647756cb71d5efa85ccb15153c18d3c4e5.tar.xz hercules-9d47df647756cb71d5efa85ccb15153c18d3c4e5.zip | |
Implemented NJ_SHADOWJUMP. Tell me if I forgot anything (especially DB entries).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6397 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | db/skill_db.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 17 |
3 files changed, 17 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6f437a620..6f5a03bcf 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/04/30
+ * Implemented NJ_SHADOWJUMP. [blackhole89]
* Moved the soul-drain code to skill_counter_additionaleffect [Skotlex]
* Fixed fake NPC missing code. Thanks to Skotlex for pointing out. [Lance]
diff --git a/db/skill_db.txt b/db/skill_db.txt index 295c91431..157f7fb5b 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -549,7 +549,7 @@ 526,9,6,1,0,0,0,10,1,no,0,0,0,misc,0 //NJ_ZENYNAGE#NJ_ZENYNAGE#
527,0,6,4,3,0,0,5,1,no,0,0,0,weapon,0 //NJ_TATAMIGAESHI#NJ_TATAMIGAESHI#
528,1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //NJ_KASUMIKIRI#NJ_KASUMIKIRI#
-529,1,6,4,0,1,0,5,1,no,0,0,0,none,0 //NJ_SHADOWJUMP#NJ_SHADOWJUMP#
+529,5:6:7:8:9,6,2,0,1,0,5,1,no,0,0,0,none,0 //NJ_SHADOWJUMP#NJ_SHADOWJUMP#
530,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //NJ_KIRIKAGE#NJ_KIRIKAGE#
531,0,6,4,0,1,0,5,1,no,0,0,0,none,0 //NJ_UTSUSEMI#NJ_UTSUSEMI#
532,0,6,4,0,1,0,10,1,no,0,0,0,none,0 //NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU#
diff --git a/src/map/skill.c b/src/map/skill.c index 8040127fb..180ce6a21 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3691,7 +3691,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case GS_GROUNDDRIFT:
case NJ_TATAMIGAESHI:
case NJ_KASUMIKIRI:
- case NJ_SHADOWJUMP:
case NJ_UTSUSEMI:
case NJ_BUNSINJYUTSU:
case NJ_NEN:
@@ -4696,6 +4695,21 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in skill_blown(src,bl,skill_get_blewcount(skillid,skilllv)|0x10000);
break;
+ case NJ_SHADOWJUMP: //[blackhole89]
+ {
+ if (sd && !(sd->sc.count && sd->sc.data[SC_HIDING].timer != -1)) {
+ map_freeblock_unlock();
+ return 1;
+ }
+
+ clif_skill_nodamage(src,src,NJ_SHADOWJUMP,skilllv,1);
+ if(map_getcell(src->m,x,y,CELL_CHKPASS)) {
+ unit_movepos(src, x, y, 1, 0);
+ clif_slide(src,x,y);
+ }
+ }
+ break;
+
case TK_HIGHJUMP:
{
int x,y, dir = unit_getdir(src);
@@ -8076,7 +8090,6 @@ int skill_check_condition(struct map_session_data *sd,int skill, int lv, int typ //Not implemented yet [Vicious]
case NJ_KASUMIKIRI:
- case NJ_SHADOWJUMP:
case NJ_KIRIKAGE:
case NJ_UTSUSEMI:
case NJ_BUNSINJYUTSU:
|