From e48d59b07b2de28ff56ca5e3e7b3da5408a9f529 Mon Sep 17 00:00:00 2001
From: af4t <af4t@comcast.net>
Date: Mon, 25 Feb 2013 09:19:07 -0500
Subject: [PATCH 1/3] Melee tomes named "Skill: ..." can be handed to
 guildmasters and memorized.

---
 zone/effects.cpp  | 8 ++++++++
 zone/questmgr.cpp | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/zone/effects.cpp b/zone/effects.cpp
index 1a3ae9e56..8fbc43b8d 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -467,6 +467,14 @@ bool Client::TrainDiscipline(uint32 itemid) {
 		item->Name[2] == 'm' &&
 		item->Name[3] == 'e' &&
 		item->Name[4] == ' '
+		) && !(
+		item->Name[0] == 'S' &&
+		item->Name[1] == 'k' &&
+		item->Name[2] == 'i' &&
+		item->Name[3] == 'l' &&
+		item->Name[4] == 'l' &&
+		item->Name[5] == ':' &&
+		item->Name[6] == ' '
 		)) {
 		Message(13, "This item is not a tome.");
 		//summon them the item back...
diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 473f7ae1f..09dcc82c9 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -668,6 +668,14 @@ bool QuestManager::isdisctome(int item_id) {
 		item->Name[2] == 'm' &&
 		item->Name[3] == 'e' &&
 		item->Name[4] == ' '
+		) && !(
+		item->Name[0] == 'S' &&
+		item->Name[1] == 'k' &&
+		item->Name[2] == 'i' &&
+		item->Name[3] == 'l' &&
+		item->Name[4] == 'l' &&
+		item->Name[5] == ':' &&
+		item->Name[6] == ' '
 		)) {
 		return(false);
 	}

From 945db17cb828bf9c5acfe5e74e1ea7412604bf14 Mon Sep 17 00:00:00 2001
From: af4t <af4t@comcast.net>
Date: Mon, 25 Feb 2013 10:33:53 -0500
Subject: [PATCH 2/3] Fix targeting for summoned pets in
 Mob::DetermineSpellTargets

---
 zone/spells.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/spells.cpp b/zone/spells.cpp
index 41fe4d191..26393b76f 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -1313,8 +1313,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		case ST_SummonedPet:
 		{
 			uint8 body_type = spell_target ? spell_target->GetBodyType() : 0;
-			if(!spell_target || (spell_target != GetPet()) ||
-			   (body_type != BT_Summoned && body_type != BT_Summoned2 && body_type != BT_Summoned3 && body_type != BT_Animal))
+			if(spell_target && (spell_target == GetPet()) &&
+				(body_type == BT_Summoned || body_type == BT_Summoned2 || body_type == BT_Summoned3 || body_type == BT_Animal))
 			{
 				mlog(SPELLS__CASTING_ERR, "Spell %d canceled: invalid target of body type %d (summoned pet)",
 							  spell_id, body_type);

From 04dfe4512f8354e5aeb62c25083a0ed19661b58c Mon Sep 17 00:00:00 2001
From: af4t <af4t@comcast.net>
Date: Tue, 26 Feb 2013 09:48:36 -0500
Subject: [PATCH 3/3] SK AA Touch of the Wicked should reduce reuse timers for
 Improved Harm Touch & Leech Touch as well as regular HT.  Add to aa_actions
 with same redux rate as regular HT

---
 utils/sql/git/required/2013_02_25_Impr_HT_LT.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 utils/sql/git/required/2013_02_25_Impr_HT_LT.sql

diff --git a/utils/sql/git/required/2013_02_25_Impr_HT_LT.sql b/utils/sql/git/required/2013_02_25_Impr_HT_LT.sql
new file mode 100644
index 000000000..09f1e695c
--- /dev/null
+++ b/utils/sql/git/required/2013_02_25_Impr_HT_LT.sql
@@ -0,0 +1,4 @@
+/* SK AA Touch of the Wicked should reduce reuse timers for */
+/* Improved Harm Touch & Leech Touch as well as regular HT */
+update aa_actions set redux_aa=596, redux_rate=17 where aaid=207;
+update aa_actions set redux_aa=596, redux_rate=17 where aaid=208;