summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c9
3 files changed, 9 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index aea5d1444..badf117ed 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -302,7 +302,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
&& rand()%100 < 20) {
clif_skill_nodamage(bl,bl,TK_DODGE,1,1);
if (sc->data[SC_COMBO].timer == -1)
- sc_start4(bl, SC_COMBO, 100, TK_JUMPKICK, src->id, 0, 0, 2000);
+ sc_start4(bl, SC_COMBO, 100, TK_JUMPKICK, src->id, 1, 0, 2000);
return 0;
}
diff --git a/src/map/skill.c b/src/map/skill.c
index f974a7f80..51f3286e3 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7069,7 +7069,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
if(bl->type==BL_PC)
//Only damage SP [Skotlex]
status_zap(bl, 0, 60);
- else if(status_charge(bl, 0, 2))
+ else if(status_charge(ss, 0, 2))
//Otherwise, Knockback attack.
skill_attack(BF_WEAPON,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
break;
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);
}