From bfb40f6c5f79727ebf7426a27c1cf337e7c4a441 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sat, 30 May 2015 03:08:02 -0400 Subject: [PATCH] Add failure messages for RNG focus --- zone/spell_effects.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 3336026c7..8b71c7d92 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -5397,7 +5397,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { if(UsedItem && rand_effectiveness && focus_max_real != 0) realTotal = CalcFocusEffect(type, UsedFocusID, spell_id); - if (realTotal != 0 && UsedItem) { + if ((rand_effectiveness && UsedItem) || (realTotal != 0 && UsedItem)) { // there are a crap ton more of these, I was able to verify these ones though // the RNG effective ones appear to have a different message for failing to focus uint32 string_id = BEGINS_TO_GLOW; // this is really just clicky message ... @@ -5405,25 +5405,31 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { case focusSpellHaste: string_id = SHIMMERS_BRIEFLY; break; - case focusManaCost: + case focusManaCost: // this might be GROWS_DIM for fail string_id = FLICKERS_PALE_LIGHT; break; case focusSpellDuration: string_id = SPARKLES; break; case focusImprovedDamage: - string_id = ALIVE_WITH_POWER; + if (realTotal) + string_id = ALIVE_WITH_POWER; + else + string_id = SEEMS_DRAINED; break; case focusRange: string_id = PULSES_WITH_LIGHT; break; - case focusSpellHateMod: + case focusSpellHateMod: // GLOWS_RED for increasing hate string_id = GLOWS_BLUE; break; case focusImprovedHeal: - string_id = FEEDS_WITH_POWER; + if (realTotal) + string_id = FEEDS_WITH_POWER; + else + string_id = POWER_DRAIN_INTO; break; - case focusReagentCost: + case focusReagentCost: // this might be GROWS_DIM for fail as well ... string_id = BEGINS_TO_SHINE; break; default: