diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-03 00:33:37 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-03 00:33:37 +0000 |
| commit | c6b4414211979c7607110293f1d0f34b7c1ade5e (patch) | |
| tree | 3b6bbeaab86112ae04effd5379a11f6a843cbafc /src/map | |
| parent | 6e83d85081e03ba8d3af7dbee836f2ea4760cf12 (diff) | |
| download | hercules-c6b4414211979c7607110293f1d0f34b7c1ade5e.tar.gz hercules-c6b4414211979c7607110293f1d0f34b7c1ade5e.tar.bz2 hercules-c6b4414211979c7607110293f1d0f34b7c1ade5e.tar.xz hercules-c6b4414211979c7607110293f1d0f34b7c1ade5e.zip | |
- Implemented desperado as explained by Rockman-EXE.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6454 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/skill.c | 11 | ||||
| -rw-r--r-- | src/map/skill.h | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 162f47fd7..751f576d8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1932,7 +1932,6 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds case SM_MAGNUM:
case AS_SPLASHER:
case ASC_METEORASSAULT:
- case GS_DESPERADO:
case GS_SPREADATTACK:
dmg.dmotion = clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion, damage, dmg.div_, skillid, -1, 5);
break;
@@ -3205,8 +3204,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case CR_GRANDCROSS:
case NPC_GRANDDARKNESS:
//Until they're at right position - gs_ground- [Vicious]
+ case GS_DESPERADO:
case NJ_KAENSIN: /*火炎陣*/
- case GS_DESPERADO: /*デスペラード*/
case NJ_HYOUSYOURAKU:
case NJ_RAIGEKISAI:
return skill_castend_pos2(src,src->x,src->y,skillid,skilllv,tick,0);
@@ -3968,7 +3967,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in break;
case ASC_METEORASSAULT: /* ?テオアサルト */
- case GS_DESPERADO:
case GS_SPREADATTACK:
clif_skill_nodamage(src,bl,skillid,skilllv,1);
map_foreachinrange(skill_area_sub, src,
@@ -5976,6 +5974,7 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil case WE_CALLPARENT:
case WE_CALLBABY:
case AC_SHOWER: //Ground-placed skill implementation.
+ case GS_DESPERADO:
skill_unitsetting(src,skillid,skilllv,x,y,0);
break;
@@ -6154,7 +6153,6 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil break;
//Until they're at right position - gs_unit- [Vicious]
- case GS_DESPERADO: /* デスペラード*/
case GS_GROUNDDRIFT: /* グラウンドドリフト*/
case NJ_KAENSIN: /* 火炎陣*/
case NJ_BAKUENRYU: /* 爆炎龍*/
@@ -6871,6 +6869,11 @@ int skill_unit_onplace_timer(struct skill_unit *src,struct block_list *bl,unsign skill_attack(skill_get_type(sg->skill_id),ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
}
break;
+ case UNT_DESPERADO:
+ if (!(rand()%10)) //Has a low chance of connecting. [Skotlex]
+ skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
+ break;
+
case UNT_FIREPILLAR_WAITING:
skill_unitsetting(ss,sg->skill_id,sg->skill_lv,src->bl.x,src->bl.y,1);
skill_delunit(src);
diff --git a/src/map/skill.h b/src/map/skill.h index e57aba0be..0c1777699 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -931,10 +931,10 @@ enum { UNT_SPIDERWEB,
UNT_GRAVITATION,
UNT_HERMODE,
-
- UNT_KAENSIN,
+ UNT_DESPERADO,
UNT_SUITON,
-
+ UNT_TATAMIGAESHI,
+ UNT_KAENSIN,
};
#endif
|