diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-14 16:50:12 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-14 16:50:12 +0000 |
| commit | ae38fdb123c207515468e409cd553f1a185c02e0 (patch) | |
| tree | 8071bce1603fa930f5f6646ecbf3c1a860da213b /src/map/status.c | |
| parent | 21912bafe72cf7685679cf95b705ad0d115ff7c7 (diff) | |
| download | hercules-ae38fdb123c207515468e409cd553f1a185c02e0.tar.gz hercules-ae38fdb123c207515468e409cd553f1a185c02e0.tar.bz2 hercules-ae38fdb123c207515468e409cd553f1a185c02e0.tar.xz hercules-ae38fdb123c207515468e409cd553f1a185c02e0.zip | |
- Fixed warmth skills draining SP of the target, not the caster.
- If val3 for a combo is set, then the combo will no longer delay attack/movement.
- When TK_DODGE triggers, it will no longer delay your attack or movement.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8757 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 5a116e5bf..6f17719a8 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5394,8 +5394,12 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_COMBO:
{
+ //val1: Skill ID
+ //val2: When given, target (for autotargetting skills)
+ //val3: When set, this combo time should NOT delay attack/movement
+ //val4: Combo time
struct unit_data *ud = unit_bl2ud(bl);
- switch (val1) { //Val1 contains the skill id
+ switch (val1) {
case TK_STORMKICK:
clif_skill_nodamage(bl,bl,TK_READYSTORM,1,1);
break;
@@ -5409,7 +5413,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val clif_skill_nodamage(bl,bl,TK_READYCOUNTER,1,1);
break;
}
- if (ud) {
+ if (ud && !val3)
+ {
ud->attackabletime = gettick()+tick;
unit_set_walkdelay(bl, gettick(), tick, 1);
}
|