summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-23 04:07:21 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-23 04:07:21 +0000
commit0cda5758665c392494f70495b9f6a636b2d73675 (patch)
tree8cd6be62f9c178e26a44b0ef0e5f529343ac7355 /src
parent6550dccef376b5a100dd6019e3f4890436f76c25 (diff)
downloadhercules-0cda5758665c392494f70495b9f6a636b2d73675.tar.gz
hercules-0cda5758665c392494f70495b9f6a636b2d73675.tar.bz2
hercules-0cda5758665c392494f70495b9f6a636b2d73675.tar.xz
hercules-0cda5758665c392494f70495b9f6a636b2d73675.zip
Fixed bugreport:2424 Twilight Alchemy III no longer allows you to attempt to bypass empty bottle count
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15770 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 90b4c42d8..e9a3ab61d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5877,10 +5877,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break;
case AM_TWILIGHT3:
if (sd) {
+ int ebottle = pc_search_inventory(sd,713);
+ if( ebottle >= 0 )
+ ebottle = sd->status.inventory[ebottle].amount;
//check if you can produce all three, if not, then fail:
if (!skill_can_produce_mix(sd,970,-1, 100) //100 Alcohol
|| !skill_can_produce_mix(sd,7136,-1, 50) //50 Acid Bottle
|| !skill_can_produce_mix(sd,7135,-1, 50) //50 Flame Bottle
+ || ebottle < 200 //200 empty bottle are required at total.
) {
clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);
break;