diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da index f6cf654b..40fe3f3f 100644 --- a/nwn/nwnprc/trunk/2das/feat.2da +++ b/nwn/nwnprc/trunk/2das/feat.2da @@ -3298,7 +3298,7 @@ 3294 FEAT_WEAPON_TEMPUS_KUKRI 16822972 16822945 ife_X2WpCh **** **** **** **** **** **** **** **** 118 **** 0 0 0 **** **** **** **** 0.5 **** 94 **** **** **** **** **** **** **** **** **** **** FEAT_WEAPON_TEMPUS_KUKRI 1 **** **** **** **** **** 0 1 3295 FEAT_ARMY_POWER 16822973 16822974 id_war **** **** **** **** **** **** **** **** **** **** 0 0 0 8 5 2219 **** 0.5 1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_ARMY_POWER 6 0 **** **** **** **** 0 1 3296 FEAT_BATTLEFORGER 16822983 16822984 ife_X2SkFCrAr **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_BATTLEFORGER 6 **** **** **** **** **** 0 1 -3297 FEAT_DIEHARD 16822975 16822976 ife_dibod 2 **** **** **** **** **** **** **** 22 40 0 0 1 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_DIEHARD 6 **** 8 **** **** **** 0 1 +3297 FEAT_DIEHARD 16822975 16822976 ife_dibod **** **** **** **** **** **** **** **** 2568 **** 0 0 1 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_DIEHARD 6 **** **** **** **** **** 0 1 3298 FEAT_IDENTIFY 16822985 16822986 is_Identify **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 86 **** 0.5 3 **** 1 **** **** **** **** **** **** **** **** **** FEAT_IDENTIFY 6 **** **** **** **** **** 0 1 3299 FEAT_ENCHANT_WEAPON1 16822977 16822978 is_X2MagcWeap **** **** **** **** **** **** **** **** **** **** 0 0 0 9 **** 2220 3300 0.5 1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_ENCHANT_WEAPON1 6 **** **** **** **** **** 0 1 3300 FEAT_ENCHANT_WEAPON2 16822979 16822980 is_X2MagcWeap **** **** **** **** **** **** **** **** **** **** 0 0 0 9 **** 2220 3301 0.5 1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_ENCHANT_WEAPON2 6 **** **** **** **** **** 0 1 diff --git a/nwn/nwnprc/trunk/scripts/prc_enforce_feat.nss b/nwn/nwnprc/trunk/scripts/prc_enforce_feat.nss index 541425cd..1c8b150d 100644 --- a/nwn/nwnprc/trunk/scripts/prc_enforce_feat.nss +++ b/nwn/nwnprc/trunk/scripts/prc_enforce_feat.nss @@ -2433,19 +2433,26 @@ int ToB() return TRUE; } - if (GetHasFeat(FEAT_IMPROVED_TWO_WEAPON_FIGHTING) && !GetHasFeat(FEAT_AMBIDEXTERITY) && !GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && !GetLevelByClass(CLASS_TYPE_TEMPEST) && 9 > GetLevelByClass(CLASS_TYPE_RANGER)) + if (GetHasFeat(FEAT_IMPROVED_TWO_WEAPON_FIGHTING) && !GetHasFeat(FEAT_AMBIDEXTERITY) && !GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && !GetLevelByClass(CLASS_TYPE_TEMPEST) && 9 > !GetLevelByClass(CLASS_TYPE_RANGER)) { FloatingTextStringOnCreature("You must have ambidexterity to take Improved Two Weapon Fighting", OBJECT_SELF, FALSE); return TRUE; } + + if (GetHasFeat(FEAT_IMPROVED_TWO_WEAPON_FIGHTING) && GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && 17 > GetAbilityScore(OBJECT_SELF, ABILITY_DEXTERITY, TRUE) && !GetLevelByClass(CLASS_TYPE_TEMPEST) && + GetLevelByClass(CLASS_TYPE_RANGER) < 9) + { + FloatingTextStringOnCreature("You must have 17 Dexterity to take Improved Two Weapon Fighting under 3.5 rules", OBJECT_SELF, FALSE); + return TRUE; + } - if (GetHasFeat(FEAT_IMPROVED_TWO_WEAPON_FIGHTING) && GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && 17 > GetAbilityScore(OBJECT_SELF, ABILITY_DEXTERITY, TRUE) && !GetLevelByClass(CLASS_TYPE_TEMPEST) && 9 > GetLevelByClass(CLASS_TYPE_RANGER)) +/* if (GetHasFeat(FEAT_IMPROVED_TWO_WEAPON_FIGHTING) && GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && 17 > GetAbilityScore(OBJECT_SELF, ABILITY_DEXTERITY, TRUE) && !GetLevelByClass(CLASS_TYPE_TEMPEST) && 9 > !GetLevelByClass(CLASS_TYPE_RANGER)) { FloatingTextStringOnCreature("You must have 17 Dexterity to take Improved Two Weapon Fighting under 3.5 rules", OBJECT_SELF, FALSE); return TRUE; - } + } */ - if (GetHasFeat(FEAT_TWO_WEAPON_FIGHTING) && GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && 15 > GetAbilityScore(OBJECT_SELF, ABILITY_DEXTERITY, TRUE) && !GetLevelByClass(CLASS_TYPE_RANGER) && 2 > GetLevelByClass(CLASS_TYPE_CW_SAMURAI)) + if (GetHasFeat(FEAT_TWO_WEAPON_FIGHTING) && GetPRCSwitch(PRC_35_TWO_WEAPON_FIGHTING) && 15 > GetAbilityScore(OBJECT_SELF, ABILITY_DEXTERITY, TRUE) && !GetLevelByClass(CLASS_TYPE_RANGER) && 2 > !GetLevelByClass(CLASS_TYPE_CW_SAMURAI)) { FloatingTextStringOnCreature("You must have 15 Dexterity to take Two Weapon Fighting under 3.5 rules", OBJECT_SELF, FALSE); return TRUE; diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml index d32210ad..cfdeca37 100644 --- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml +++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml @@ -8318,9 +8318,9 @@ Prerequisite: Access to Army. Specifics: Inspire Allies: Able to inspire allies within 30 feet, giving them +2 on saving throws, attacks rolls, ability checks (turning), skill checks and damages rolls. Allies must be able to hear you. The effect will last for charisma modifier rounds. Use: Automatic. - Die Hard + Diehard Type of Feat: General -Prerequisite: Base Attack Bonus 2, Iron Will, Toughness, Crusader level 10 or Battleguard of Tempus level 7 +Prerequisite: Endurance or Crusader level 10 or Battleguard of Tempus level 7 Specifics: When your hit points are reduced to 0 or below, you automatically become stable. You heal to 1 HP. Your bonus attack decreases and your spells fail. Use: Automatic. Enchant Weapon +1 @@ -73426,4 +73426,4 @@ Tortoise shell slows a creature's movement as if it were wearing heavy armor. An Tortoise Shell (12) Tortoise Shell (15) Tortoise Shell (18) - \ No newline at end of file +