summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-28 05:19:28 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-28 05:19:28 +0000
commit3b518ff7cc8546064a62a7da3f258cb424f204b0 (patch)
treea1ba049a90510a35a8d3499aa18a9ab9d17c498b
parent71c1fa8df4802faefc39cd8ec7b6ffb2800d3c94 (diff)
downloadhercules-3b518ff7cc8546064a62a7da3f258cb424f204b0.tar.gz
hercules-3b518ff7cc8546064a62a7da3f258cb424f204b0.tar.bz2
hercules-3b518ff7cc8546064a62a7da3f258cb424f204b0.tar.xz
hercules-3b518ff7cc8546064a62a7da3f258cb424f204b0.zip
Fixed bugreport:5517 Warlock's Comet no longer requires 2 gemstones if you cast it beside another warlock.
Also Fixed Adoramus bug of same fashion, now it no longer requires a blue gesmtone if you cast it beside another character of acolyte base class git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15811 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c42
1 files changed, 22 insertions, 20 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 97e128ec8..22061a312 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -11739,10 +11739,6 @@ int skill_check_condition_castend(struct map_session_data* sd, short skill, shor
case PR_BENEDICTIO:
skill_check_pc_partner(sd, skill, &lv, 1, 1);
break;
- case AB_ADORAMUS:
- //if( skill_check_pc_partner(sd,skill,&lv, 1, 2) )
- // sd->state.no_gemstone = 1; // Mark this skill as it don't consume ammo because partners gives SP
- break;
case AM_CANNIBALIZE:
case AM_SPHEREMINE:
{
@@ -11979,25 +11975,31 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, short
req.ammo_qty = 1;
}
- for( i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++ )
- {
+ for( i = 0; i < MAX_SKILL_ITEM_REQUIRE; i++ ) {
if( (skill == AM_POTIONPITCHER || skill == CR_SLIMPITCHER || skill == CR_CULTIVATION) && i != lv%11 - 1 )
continue;
- switch( skill )
- {
- case AM_CALLHOMUN:
- if (sd->status.hom_id) //Don't delete items when hom is already out.
- continue;
- break;
- case NC_SHAPESHIFT:
- if( i < 4 )
- continue;
- break;
- case WZ_FIREPILLAR: // celest
- if (lv <= 5) // no gems required at level 1-5
- continue;
- break;
+ switch( skill ) {
+ case AM_CALLHOMUN:
+ if (sd->status.hom_id) //Don't delete items when hom is already out.
+ continue;
+ break;
+ case NC_SHAPESHIFT:
+ if( i < 4 )
+ continue;
+ break;
+ case WZ_FIREPILLAR: // celest
+ if (lv <= 5) // no gems required at level 1-5
+ continue;
+ break;
+ case AB_ADORAMUS:
+ if( itemid_isgemstone(skill_db[j].itemid[i]) && skill_check_pc_partner(sd,skill,&lv, 1, 2) )
+ continue;
+ break;
+ case WL_COMET:
+ if( itemid_isgemstone(skill_db[j].itemid[i]) && skill_check_pc_partner(sd,skill,&lv, 1, 0) )
+ continue;
+ break;
}
req.itemid[i] = skill_db[j].itemid[i];