diff --git a/Notes/Warlock_Advancing_Prestige_Classes.txt b/Notes/Warlock_Advancing_Prestige_Classes.txt
new file mode 100644
index 00000000..67d47897
--- /dev/null
+++ b/Notes/Warlock_Advancing_Prestige_Classes.txt
@@ -0,0 +1,84 @@
+Abjurant Champion
+Acolyte of the Skin
+Anima Mage
+Arcane Trickster
+Blood Magus
+Disciple of Asmodeus
+Eldritch Disciple
+Eldritch Theurge
+Enlightened Fist
+Hellfire Warlock
+Maester
+Talon of Tiamat
+Unseen Seer
+Virtuoso
+Wild Mage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da
index 1295d8a4..3f7d346e 100644
--- a/nwn/nwnprc/trunk/2das/feat.2da
+++ b/nwn/nwnprc/trunk/2das/feat.2da
@@ -7945,9 +7945,9 @@
7941 WP_Sai 16834135 16834259 ife_wepprof_sai **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 44 1 **** 87 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_SAI 1 **** **** **** **** **** 0 1
7942 WP_Nunchaku 16834144 16834259 ife_wepprof_nun **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 44 1 **** 87 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_NUNCHAKU 1 **** **** **** **** **** 0 1
7943 WP_Falchion 16834153 16834258 ife_wepprof_fal **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 45 1 **** 86 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_FALCHION 1 **** **** **** **** **** 0 1
-7944 WP_Sap 16834162 16834257 ife_wepprof_sap **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 46 1 **** 85 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_SAP 1 **** **** **** **** **** 0 1
+7944 WP_Sap 16834162 16834258 ife_wepprof_sap **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 46 1 **** 86 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_SAP 1 **** **** **** **** **** 0 1
7945 WP_Katar 16834171 16834259 ife_wepprof_kat **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 44 1 **** 87 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_KATAR 1 **** **** **** **** **** 0 1
-7946 WP_Heavy_Mace 16834180 16834258 ife_wepprof_hmc **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 45 1 **** 86 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_HEAVY_MACE 1 **** **** **** **** **** 0 1
+7946 WP_Heavy_Mace 16834180 16834257 ife_wepprof_hmc **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 46 1 **** 85 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_HEAVY_MACE 1 **** **** **** **** **** 0 1
7947 WP_Maul 16834189 16834258 ife_wepprof_mau **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 45 1 **** 86 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_MAUL 1 **** **** **** **** **** 0 1
7948 WP_Double_Scimitar 16834198 16834259 ife_wepprof_dsc **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 44 1 **** 87 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_DOUBLE_SCIMITAR 1 **** **** **** **** **** 0 1
7949 WP_Goad 16834207 16834257 ife_wepprof_goa **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** 46 1 **** 85 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_PROFICIENCY_GOAD 1 **** **** **** **** **** 0 1
diff --git a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
index ccd73828..0545dca5 100644
--- a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
+++ b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
@@ -212,7 +212,7 @@ int IsProficient(object oPC, int nBaseItem)
case BASE_ITEM_GOAD:
return GetHasFeat(FEAT_WEAPON_PROFICIENCY_GOAD, oPC)
- || GetHasFeat(FEAT_WEAPON_PROFICIENCY_MARTIAL, oPC);
+ || GetHasFeat(FEAT_WEAPON_PROFICIENCY_SIMPLE, oPC);
case BASE_ITEM_HEAVY_MACE:
return GetHasFeat(FEAT_WEAPON_PROFICIENCY_HEAVY_MACE, oPC)
diff --git a/nwn/nwnprc/trunk/tlk/35_consortium.tlk b/nwn/nwnprc/trunk/tlk/35_consortium.tlk
index 431f836f..9235a0bf 100644
Binary files a/nwn/nwnprc/trunk/tlk/35_consortium.tlk and b/nwn/nwnprc/trunk/tlk/35_consortium.tlk differ
diff --git a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk
index 431f836f..9235a0bf 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk differ
diff --git a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk.xml
index 4f652123..a8d51a2d 100644
--- a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk.xml
+++ b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk.xml
@@ -5065,11 +5065,11 @@ Weapon Size: Large
Feats Required: Exotic</entry>
<entry id="30068" lang="en" sex="m">Goad</entry>
<entry id="30069" lang="en" sex="m">Derived from a tool used to herd unruly oxen, the goad has seen use as a weapon in its own right.</entry>
- <entry id="30070" lang="en" sex="m">Base Damage: 1d6
+ <entry id="30070" lang="en" sex="m">Base Damage: 1d4
Base Critical Threat: x2
Base Damage Type: Piercing
Weapon Size: Small
-Feats Required: Martial</entry>
+Feats Required: Simple</entry>
<entry id="44999" lang="en" sex="m">+++++++++++++ PRC Pack Feats 45,000 - 54,999 ++++++++++++++</entry>
<entry id="45001" lang="en" sex="m">Type of Feat: General
Prerequisite: Spell Focus (conjuration)