summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-11 16:10:00 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2013-01-11 16:10:00 +0000
commit02efda2130b68359b65c54c546187d027c5fc3e9 (patch)
tree3921a775eb055d2e356b44d55e510c58398ea8d5 /src
parent38e583df21eccd9e4f31d38acaae32579c6f0d27 (diff)
downloadhercules-02efda2130b68359b65c54c546187d027c5fc3e9.tar.gz
hercules-02efda2130b68359b65c54c546187d027c5fc3e9.tar.bz2
hercules-02efda2130b68359b65c54c546187d027c5fc3e9.tar.xz
hercules-02efda2130b68359b65c54c546187d027c5fc3e9.zip
Fixed bugreport:7159 where cooking formula and creation effect is not working properly.
Fixed bugreport:7129 where GN_MANDRAGORA is not working with other skills. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17093 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 06c74a5f8..a47a98891 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11057,7 +11057,7 @@ void clif_parse_Cooking(int fd,struct map_session_data *sd) {
return;
}
if( skill_can_produce_mix(sd,nameid,sd->menuskill_val, amount) )
- skill_produce_mix(sd,sd->menuskill_id,nameid,0,0,0,amount);
+ skill_produce_mix(sd,0,nameid,0,0,0,amount);
clif_menuskill_clear(sd);
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 757165107..8c21b7eba 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -13840,7 +13840,7 @@ int skill_vfcastfix (struct block_list *bl, double time, uint16 skill_id, uint16
if( sd && ( skill_lv = pc_checkskill(sd, WL_RADIUS) ) && skill_id >= WL_WHITEIMPRISON && skill_id <= WL_FREEZE_SP )
fixcast_r = max(fixcast_r, 5 + skill_lv * 5);
// Fixed cast non percentage bonuses
- if( sc->data[SC_MANDRAGORA] && (skill_id >= SM_BASH && skill_id <= RETURN_TO_ELDICASTES) )
+ if( sc->data[SC_MANDRAGORA] )
fixed += sc->data[SC_MANDRAGORA]->val1 * 1000 / 2;
if (sc->data[SC_IZAYOI] && (skill_id >= NJ_TOBIDOUGU && skill_id <= NJ_ISSEN))
fixed = 0;