diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-10 04:04:36 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-10 04:04:36 +0000 |
| commit | 14d2e0e61a8d2ca85f15eb0c8eb6238564edb375 (patch) | |
| tree | 44b8aacfec5239f554fa2bfe4c2246e41778dc23 /src/map/status.c | |
| parent | ecbca44f124c5e379c9a1ef5433c2c3c0ed07c4f (diff) | |
| download | hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.tar.gz hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.tar.bz2 hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.tar.xz hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.zip | |
- Rewrote/cleaned up trade.c for a more clean trading implementation.
- Added @request commands, sends a request to all connected GMs of lowest_gm_level or above as a whisper message. Defaults to gm level 20 users.
- Made SC_COMBO status start delay attackabletime and walkdelay by sc's duration regardless of skill used (previously it was only for TK kicks, now it's for both those and Monk combos)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6542 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index b9d2b904e..6afc10bb0 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4452,21 +4452,21 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val switch (val1) { //Val1 contains the skill id
case TK_STORMKICK:
clif_skill_nodamage(bl,bl,TK_READYSTORM,1,1);
- if (ud) ud->attackabletime = gettick()+tick;
break;
case TK_DOWNKICK:
clif_skill_nodamage(bl,bl,TK_READYDOWN,1,1);
- if (ud) ud->attackabletime = gettick()+tick;
break;
case TK_TURNKICK:
clif_skill_nodamage(bl,bl,TK_READYTURN,1,1);
- if (ud) ud->attackabletime = gettick()+tick;
break;
case TK_COUNTER:
clif_skill_nodamage(bl,bl,TK_READYCOUNTER,1,1);
- if (ud) ud->attackabletime = gettick()+tick;
break;
}
+ if (ud) {
+ ud->attackabletime = gettick()+tick;
+ unit_set_walkdelay(bl, gettick(), tick, 1);
+ }
}
break;
case SC_TKREST:
|