diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da
index a7c30dc9..5b280411 100644
--- a/nwn/nwnprc/trunk/2das/feat.2da
+++ b/nwn/nwnprc/trunk/2das/feat.2da
@@ -5294,7 +5294,7 @@
5290 AnvilofThunder 16834981 16834982 ife_X2CritDWHam **** 13 **** **** **** **** **** **** 28 41 0 0 1 **** **** 2791 **** 0.5 -1 **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1
5291 WeaponAndTorch 16834979 16834980 ife_X1ImpExp **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** 2775 **** 0.5 -1 **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1
5292 TrapEngineer 16834977 16834978 ife_X2EpSkFDsTr **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** 2226 **** 0.5 -1 **** **** **** **** **** **** **** 7 4 **** **** FEAT_HEX_SWIFT 5 0 **** **** **** **** 0 1
-5293 EfficientDefender 16834975 16834976 ife_X2ArSkin **** **** **** **** **** **** **** **** 2 **** 0 0 1 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_HEX_SWIFT 5 0 **** **** **** **** 0 0
+5293 EfficientDefender 16834975 16834976 ife_X2ArSkin **** **** **** **** **** **** **** **** 2 **** 0 0 1 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_EFFICIENT_DEFENDER 5 0 **** **** **** **** 0 0
5294 StonePower 16834973 16834974 ife_stonemind **** 13 **** **** **** **** **** **** **** **** 0 0 1 **** **** 3741 **** 0.5 -1 103 1 **** **** **** **** **** **** **** **** **** FEAT_HEX_SWIFT 5 0 **** **** **** **** 0 0
5295 TigerBlooded 16834971 16834972 ife_X2GWShp2 **** **** **** **** **** **** **** **** **** **** **** **** 1 **** **** **** **** **** **** 103 **** **** **** **** **** **** **** **** **** **** FEAT_BLADE_MEDITATION **** **** **** **** **** **** **** 1
5296 BonusDomainCold 16834961 16834964 ID_DESTRUCT **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** **** **** 111 **** **** **** **** **** **** **** **** **** **** FEAT_MASTERY_ELEMENTS_BACK 4 **** **** **** **** **** 0 0
diff --git a/nwn/nwnprc/trunk/scripts/prc_feats.nss b/nwn/nwnprc/trunk/scripts/prc_feats.nss
index e921d15f..1feceacf 100644
--- a/nwn/nwnprc/trunk/scripts/prc_feats.nss
+++ b/nwn/nwnprc/trunk/scripts/prc_feats.nss
@@ -869,20 +869,45 @@ void PRCFeat_AddCompositeBonuses(object oPC, object oSkin)
if(GetHasFeat(FEAT_EFFICIENT_DEFENDER, oPC))
{
- // Light or medium only
- if(6 > GetBaseAC(GetItemInSlot(INVENTORY_SLOT_CHEST, oPC)))
- {
- SetCompositeBonus(oSkin, "EfficientDefender", 1, AC_ARMOUR_ENCHANTMENT_BONUS, ITEM_PROPERTY_AC_BONUS);
- SetCompositeBonus(oSkin, "EDACPHide", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_HIDE);
- SetCompositeBonus(oSkin, "EDACPMS", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_MOVE_SILENTLY);
- SetCompositeBonus(oSkin, "EDACPParry", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_PARRY);
- SetCompositeBonus(oSkin, "EDACPPP", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_PICK_POCKET);
- SetCompositeBonus(oSkin, "EDACPSetT", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_SET_TRAP);
- SetCompositeBonus(oSkin, "EDACPTumble", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_TUMBLE);
- SetCompositeBonus(oSkin, "EDACPJump", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_JUMP);
- SetCompositeBonus(oSkin, "EDACPBalance", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_BALANCE);
- SetCompositeBonus(oSkin, "EDACPClimb", -1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_CLIMB);
- }
+
+ //ExecuteScript("prc_effdef", oPC);
+
+ //:: Light or medium armor only
+ object oArmor = GetItemInSlot(INVENTORY_SLOT_CHEST, oPC);
+
+ int nEvent = GetRunningEvent();
+ int nBaseAC = GetBaseAC(oArmor);
+
+ /* if(DEBUG) */ FloatingTextStringOnCreature("prc_feats: Efficient Defender running", oPC, FALSE);
+
+ if(nBaseAC > 0 && nBaseAC < 6)
+ {
+ /* if (DEBUG) */FloatingTextStringOnCreature("prc_feats: Efficient Defender: Light or medium armor found", oPC, FALSE);
+ SetCompositeBonus(oSkin, "EfficientDefender", 1, ITEM_PROPERTY_AC_BONUS);
+ SetCompositeBonus(oSkin, "EDACPHide", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_HIDE);
+ SetCompositeBonus(oSkin, "EDACPMS", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_MOVE_SILENTLY);
+ SetCompositeBonus(oSkin, "EDACPParry", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_PARRY);
+ SetCompositeBonus(oSkin, "EDACPPP", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_PICK_POCKET);
+ SetCompositeBonus(oSkin, "EDACPSetT", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_SET_TRAP);
+ SetCompositeBonus(oSkin, "EDACPTumble", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_TUMBLE);
+ SetCompositeBonus(oSkin, "EDACPJump", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_JUMP);
+ SetCompositeBonus(oSkin, "EDACPBalance", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_BALANCE);
+ SetCompositeBonus(oSkin, "EDACPClimb", 1, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_CLIMB);
+ }
+ else
+ {
+ /* if (DEBUG) */FloatingTextStringOnCreature("prc_feats: Efficient Defender: No light or medium armor found", oPC, FALSE);
+ SetCompositeBonus(oSkin, "EfficientDefender", 0, ITEM_PROPERTY_AC_BONUS);
+ SetCompositeBonus(oSkin, "EDACPHide", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_HIDE);
+ SetCompositeBonus(oSkin, "EDACPMS", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_MOVE_SILENTLY);
+ SetCompositeBonus(oSkin, "EDACPParry", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_PARRY);
+ SetCompositeBonus(oSkin, "EDACPPP", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_PICK_POCKET);
+ SetCompositeBonus(oSkin, "EDACPSetT", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_SET_TRAP);
+ SetCompositeBonus(oSkin, "EDACPTumble", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_TUMBLE);
+ SetCompositeBonus(oSkin, "EDACPJump", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_JUMP);
+ SetCompositeBonus(oSkin, "EDACPBalance", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_BALANCE);
+ SetCompositeBonus(oSkin, "EDACPClimb", 0, ITEM_PROPERTY_DECREASED_SKILL_MODIFIER, SKILL_CLIMB);
+ }
}
if(GetHasFeat(FEAT_MOUNTAINEER, oPC))
{
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
index 4f9d1ad2..78e73ae2 100644
--- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
+++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
@@ -71321,4 +71321,6 @@ Use: Activated
Manifesting: Upon reaching levels 2, 3, 4, 5, 6, 7, 8, 9, the Thrallherd gains a new manifester level, increasing his power points, total powers known, and maximum power level.
Spellcasting: Upon reaching levels 2, 3, 4, 5, 6 the Sanctified Mind gains new spells as if he had also gained a level in his highest level divine spellcasting class.
Spellcasting: Each level, the Soulmanifester gains new spells per day as if they had also gained a level in their highest level arcane spellcasting class.
+ ### BEGIN SPELLCASTER MARKER FEATS#
+