summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-25 17:33:34 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-25 17:33:34 +0000
commitef36e90d81beded9f0ca580215b27fd02c00f119 (patch)
tree94b0292b2eb790cbe33703e6598f5b731b9fd3f7 /src/map
parenta2bc8b2b7c30bd02b8a22c0abbdc711093d852f2 (diff)
downloadhercules-ef36e90d81beded9f0ca580215b27fd02c00f119.tar.gz
hercules-ef36e90d81beded9f0ca580215b27fd02c00f119.tar.bz2
hercules-ef36e90d81beded9f0ca580215b27fd02c00f119.tar.xz
hercules-ef36e90d81beded9f0ca580215b27fd02c00f119.zip
Fixed bugreport:6521 where MO_CALLSPIRIT doesn't benefit with SR_RAISINGDRAGON effect.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16705 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 3b06d9fea..cee8ed3f6 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -506,7 +506,7 @@ int skillnotok (int skillid, struct map_session_data *sd)
(map_flag_gvg(m) && skill_get_nocast (skillid) & 4) ||
(map[m].flag.battleground && skill_get_nocast (skillid) & 8) ||
(map[m].flag.restricted && map[m].zone && skill_get_nocast (skillid) & (8*map[m].zone)) ){
- clif_msgtable(sd->fd,0x536); // This skill cannot be used within this area
+ clif_msg(sd, 0x536); // This skill cannot be used within this area
return 1;
}
@@ -5445,8 +5445,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case MO_CALLSPIRITS:
if(sd) {
+ int limit = skilllv;
+ if( sd->sc.data[SC_RAISINGDRAGON] )
+ limit += sd->sc.data[SC_RAISINGDRAGON]->val1;
clif_skill_nodamage(src,bl,skillid,skilllv,1);
- pc_addspiritball(sd,skill_get_time(skillid,skilllv),skilllv);
+ pc_addspiritball(sd,skill_get_time(skillid,skilllv),limit);
}
break;
@@ -12238,6 +12241,8 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh
}
break;
case MO_CALLSPIRITS:
+ if(sc && sc->data[SC_RAISINGDRAGON])
+ lv += sc->data[SC_RAISINGDRAGON]->val1;
if(sd->spiritball >= lv) {
clif_skill_fail(sd,skill,USESKILL_FAIL_LEVEL,0);
return 0;