summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-20 14:33:54 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-20 14:33:54 +0000
commitd3df9e597f966fff6bdabc088257ad0f090903e1 (patch)
treeb2b73ee9bcad4baaa4a553cc892b8dd4662e383b /src/map/skill.c
parent0c98e7140a0d11fe40d277f8e04eb852b629ace3 (diff)
downloadhercules-d3df9e597f966fff6bdabc088257ad0f090903e1.tar.gz
hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.tar.bz2
hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.tar.xz
hercules-d3df9e597f966fff6bdabc088257ad0f090903e1.zip
- Updated skill_require_db to place the Zeny requirements of ZenyNage and Fling.
- Fixed crash when non-players use ZenyNage. Added the correct Zeny check in skill_check_condition, fixed the skill so that it's damage is based on whatever zeny is specified in skill_require_db. - Can-act delay will not be reset when warping now. - Fixed Quagmire not altering walking-speed. - Silence now blocks skills both on begin/end casting. - Updated status_calc_bl so that when walking speed changes, the character is made to rewalk so that the new speed takes effect inmediately. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7264 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index c316c6b74..22dfc71a7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1454,7 +1454,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
rate = sd?(sd->addeff2[type]+(sd->state.arrow_atk?sd->arrow_addeff2[type]:0)):0;
- if (rate) //Self infliced status from attacking.
+ if (rate) //Self inflicted status from attacking.
status_change_start(src,i,rate,7,0,0,0,skill_get_time2(StatusSkillChangeTable[type],7),0);
rate = dstsd?dstsd->addeff3[type]:0;
@@ -2934,6 +2934,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
case NPC_SMOKING:
case NPC_SELFDESTRUCTION:
case GS_FLING:
+ case NJ_ZENYNAGE:
skill_attack(BF_MISC,src,src,bl,skillid,skilllv,tick,flag);
break;
@@ -2999,12 +3000,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
skill_castend_damage_id);
}
break;
- case NJ_ZENYNAGE:
- if(sd->status.zeny < skilllv*1000)
- clif_skill_fail(sd,skillid,5,0);
- else
- skill_attack(BF_MISC,src,src,bl,skillid,skilllv,tick,flag);
- break;
case NJ_KASUMIKIRI:
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
sc_start(src,SC_HIDING,100,skilllv,skill_get_time(skillid,skilllv));
@@ -3032,7 +3027,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
//case NJ_SYURIKEN:
//case NJ_KUNAI:
//case NJ_HUUMA:
- //case NJ_ZENYNAGE:
case NJ_TATAMIGAESHI:
//case NJ_KASUMIKIRI:
//case NJ_KIRIKAGE:
@@ -7904,13 +7898,20 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
clif_skill_fail(sd,skill,0,0);
return 0;
}
- zeny = 1;
break;
case NJ_ISSEN:
if (sc && sc->data[SC_NEN].timer!=-1)
return 0;
break;
+
+ case NJ_ZENYNAGE:
+ if(sd->status.zeny < zeny) {
+ clif_skill_fail(sd,skill,5,0);
+ return 0;
+ }
+ zeny = 0; //Zeny is reduced on skill_attack.
+ break;
}
if(!(type&2)){