From 95a5c7d4ccd8cab04bd873421ba2392b00273ece Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Mon, 20 Jan 2014 15:57:44 -0500
Subject: [PATCH] Move Spell Casting Reinforcement to aa_effects

---
 .../2014_01_20_SpellCastingReinforcement.sql  | 27 +++++++++++++++++++
 zone/effects.cpp                              | 16 -----------
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 utils/sql/git/required/2014_01_20_SpellCastingReinforcement.sql

diff --git a/utils/sql/git/required/2014_01_20_SpellCastingReinforcement.sql b/utils/sql/git/required/2014_01_20_SpellCastingReinforcement.sql
new file mode 100644
index 000000000..0d7385433
--- /dev/null
+++ b/utils/sql/git/required/2014_01_20_SpellCastingReinforcement.sql
@@ -0,0 +1,27 @@
+-- Spell Casting Reinforcement
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('86', '1', '128', '5', '5');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('86', '2', '138', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('86', '3', '140', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('86', '4', '139', '-2741', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('86', '5', '139', '-16843', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('86', '6', '385', '-16192', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('87', '1', '128', '15', '15');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('87', '2', '138', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('87', '3', '140', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('87', '4', '139', '-2741', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('87', '5', '139', '-16843', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('87', '6', '385', '-16192', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('88', '1', '128', '30', '30');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('88', '2', '138', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('88', '3', '140', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('88', '4', '139', '-2741', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('88', '5', '139', '-16843', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('88', '6', '385', '-16192', '0');
+-- Spell Casting Reinforcement Mastery
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('266', '1', '128', '50', '50');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('266', '2', '138', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('266', '3', '140', '1', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('266', '4', '139', '-2741', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('266', '5', '139', '-16843', '0');
+INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('266', '6', '385', '-16192', '0');
+
diff --git a/zone/effects.cpp b/zone/effects.cpp
index ba071ae49..0dbd51ff4 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -408,22 +408,6 @@ int32 Client::GetActSpellDuration(uint16 spell_id, int32 duration)
 	int tic_inc = 0;
 	tic_inc = GetFocusEffect(focusSpellDurByTic, spell_id);
 
-	if (IsBeneficialSpell(spell_id)) {
-		switch (GetAA(aaSpellCastingReinforcement)) {
-		case 1:
-			increase += 5;
-			break;
-		case 2:
-			increase += 15;
-			break;
-		case 3:
-			increase += 30;
-			if (GetAA(aaSpellCastingReinforcementMastery) == 1)
-				increase += 20;
-			break;
-		}
-	}
-
 	if (IsMezSpell(spell_id))
 		tic_inc += GetAA(aaMesmerizationMastery);