From 46d70199099a93d73dd28017d736a84539784eca Mon Sep 17 00:00:00 2001 From: Paul Coene Date: Wed, 29 Apr 2015 08:26:59 -0400 Subject: [PATCH] Spells like flame_lick were not requiring flame lick. Noexpend for flame lick was not working. Also fixed a log message with arguments reversed. --- zone/spells.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index a4bef767c..020064637 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -1164,12 +1164,14 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, uint16 slot, } else if (!bard_song_mode) { + int noexpend; for(int t_count = 0; t_count < 4; t_count++) { component = spells[spell_id].components[t_count]; - if (component == -1) + noexpend = spells[spell_id].NoexpendReagent[t_count]; + if (component == -1 || noexpend == component) continue; component_count = spells[spell_id].component_counts[t_count]; - Log.Out(Logs::Detail, Logs::Spells, "Spell %d: Consuming %d of spell component item id %d", spell_id, component, component_count); + Log.Out(Logs::Detail, Logs::Spells, "Spell %d: Consuming %d of spell component item id %d", spell_id, component_count, component); // Components found, Deleting // now we go looking for and deleting the items one by one for(int s = 0; s < component_count; s++)