summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-31 01:10:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-31 01:10:36 +0000
commit73726c90a229856a88c55fe5121ea511ac2c228d (patch)
tree15fb72e95d20c107315c964d8eede3a208868161 /src/map/skill.c
parent783d562f6761579e80277ae7417fa56e0be137e2 (diff)
downloadhercules-73726c90a229856a88c55fe5121ea511ac2c228d.tar.gz
hercules-73726c90a229856a88c55fe5121ea511ac2c228d.tar.bz2
hercules-73726c90a229856a88c55fe5121ea511ac2c228d.tar.xz
hercules-73726c90a229856a88c55fe5121ea511ac2c228d.zip
- Skill required-state will now only be checked on cast-begin, not cast-end.
- Added a check in status_calc_pc to prevent player rate adjustments from from going below 0. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8553 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 8f984019e..9d5f360f2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8376,6 +8376,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
}
}
+ if(!type)//States are only checked on begin-casting. [Skotlex]
switch(state) {
case ST_HIDING:
if(!(sc && sc->option&OPTION_HIDE)) {
@@ -8420,7 +8421,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
}
break;
case ST_SIGHT:
- if((!sc || sc->data[SC_SIGHT].timer == -1) && type&1) {
+ if(!sc || sc->data[SC_SIGHT].timer == -1) {
clif_skill_fail(sd,skill,0,0);
return 0;
}
@@ -8444,9 +8445,6 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
}
break;
case ST_MOVE_ENABLE:
- if(type)//Check only on begin casting. [Skotlex]
- break;
-
if (sc && sc->data[SC_COMBO].timer != -1 && sc->data[SC_COMBO].val1 == skill)
sd->ud.canmove_tick = gettick(); //When using a combo, cancel the can't move delay to enable the skill. [Skotlex]