From 13609c4f0939826e99f0fafbe182b905ef5b71c3 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Mon, 20 Jan 2014 16:24:17 -0500 Subject: [PATCH] Move Mez Mastery to DB --- utils/sql/git/required/2014_01_20_MezMastery.sql | 5 +++++ zone/effects.cpp | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 utils/sql/git/required/2014_01_20_MezMastery.sql diff --git a/utils/sql/git/required/2014_01_20_MezMastery.sql b/utils/sql/git/required/2014_01_20_MezMastery.sql new file mode 100644 index 000000000..4d9d5ec20 --- /dev/null +++ b/utils/sql/git/required/2014_01_20_MezMastery.sql @@ -0,0 +1,5 @@ +-- Mesmerization Mastery +INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('781', '1', '287', '1', '1'); +INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('781', '2', '137', '31', '0'); +INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('781', '3', '136', '5', '0'); + diff --git a/zone/effects.cpp b/zone/effects.cpp index 0dbd51ff4..b8aa9b17b 100644 --- a/zone/effects.cpp +++ b/zone/effects.cpp @@ -408,9 +408,6 @@ int32 Client::GetActSpellDuration(uint16 spell_id, int32 duration) int tic_inc = 0; tic_inc = GetFocusEffect(focusSpellDurByTic, spell_id); - if (IsMezSpell(spell_id)) - tic_inc += GetAA(aaMesmerizationMastery); - // Only need this for clients, since the change was for bard songs, I assume we should keep non bard songs getting +1 // However if its bard or not and is mez, charm or fear, we need to add 1 so that client is in sync if (!IsShortDurationBuff(spell_id) ||