summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshenhuyong <shenhuyong@hotmail.com>2013-09-29 15:17:34 +0800
committershenhuyong <shenhuyong@hotmail.com>2013-09-29 15:17:34 +0800
commit608c1314e4db3cbb6653fe8e1a2cfc9413302747 (patch)
tree2c79d0da7239d95cfdb05220f6c16d729d808acf /src/map
parent5697031dce0f02a55044504077775b909a42982d (diff)
downloadhercules-608c1314e4db3cbb6653fe8e1a2cfc9413302747.tar.gz
hercules-608c1314e4db3cbb6653fe8e1a2cfc9413302747.tar.bz2
hercules-608c1314e4db3cbb6653fe8e1a2cfc9413302747.tar.xz
hercules-608c1314e4db3cbb6653fe8e1a2cfc9413302747.zip
* Fixed Bug #7713
http://hercules.ws/board/tracker/issue-7713-bnogemstone-reverted/ Per official behavior, Mistress card effect removes all gemstone requirements on all skills EXCEPT Hocus Pocus and Ganbantein.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 127eb1aa2..fe9703741 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -13584,16 +13584,18 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
if( itemid_isgemstone(req.itemid[i]) && skill_id != HW_GANBANTEIN )
{
if( sd->special_state.no_gemstone )
- { //Make it substract 1 gem rather than skipping the cost.
- if( --req.amount[i] < 1 )
- req.itemid[i] = 0;
+ { // All gem skills except Hocus Pocus and Ganbantein can cast for free with Mistress card -helvetica
+ if( skill_id != SA_ABRACADABRA )
+ req.itemid[i] = req.amount[i] = 0;
+ else if( --req.amount[i] < 1 )
+ req.amount[i] = 1; // Hocus Pocus always use at least 1 gem
}
if(sc && sc->data[SC_INTOABYSS])
{
if( skill_id != SA_ABRACADABRA )
req.itemid[i] = req.amount[i] = 0;
else if( --req.amount[i] < 1 )
- req.amount[i] = 1; // Hocus Pocus allways use at least 1 gem
+ req.amount[i] = 1; // Hocus Pocus always use at least 1 gem
}
}
if( skill_id >= HT_SKIDTRAP && skill_id <= HT_TALKIEBOX && pc->checkskill(sd, RA_RESEARCHTRAP) > 0){