diff --git a/nwn/nwnprc/trunk/2das/classes.2da b/nwn/nwnprc/trunk/2das/classes.2da
index a6bf51ba..1cd79f21 100644
--- a/nwn/nwnprc/trunk/2das/classes.2da
+++ b/nwn/nwnprc/trunk/2das/classes.2da
@@ -210,7 +210,7 @@
206 IncarnumBlade 16790690 16838136 16838137 16838138 16838139 IR_CRUSADER 10 CLS_ATK_1 CLS_FEAT_IBLADE CLS_SAVTHR_FIGHT CLS_SKILL_IBLADE CLS_BFEAT_BLANK 2 **** **** 1 0 16 14 14 14 10 8 STR 0X01 0X3 0 CLASS_TYPE_INCARNUM_BLADE 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_IBLADE 5 0 0 0 5 17 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
207 OAShaman 16790691 16827659 16827660 16827661 16827662 IR_CLERIC 6 CLS_ATK_2 CLS_FEAT_SHAMAN CLS_SAVTHR_WIZ CLS_SKILL_SHAMAN CLS_BFEAT_SHAMAN 4 CLS_SPGN_SHAMAN **** 1 1 10 13 12 16 13 12 WIS 0X00 0X0 0 CLASS_TYPE_SHAMAN 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_SHAMAN 0 1 0 0 -1 2 0 **** 1 0 1 0 0 0 0 WIS Shaman 1 1 1 0 0
208 Pyrokineticist 16790692 16827043 16827044 16827045 16827046 IR_BFZ 8 CLS_ATK_2 CLS_FEAT_PYRO CLS_SAVTHR_WILD CLS_SKILL_PYRO CLS_BFEAT_PYRO 2 **** **** 1 0 10 14 14 10 12 16 CHA 0X03 0X1 0 CLASS_TYPE_PYROKINETICIST 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_PYRO 40 0 0 0 10 9 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
-209 Shadowmind 16790693 16829364 16829365 16829366 16829367 IR_TFSHAD 6 CLS_ATK_2 CLS_FEAT_SDMIND CLS_SAVTHR_BARD CLS_SKILL_SDMIND CLS_BFEAT_SDMIND 4 **** **** 1 0 10 11 11 16 16 10 INT 0X00 0X0 0 CLASS_TYPE_SHADOWMIND 1 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_SDMIND 10 0 0 0 10 8 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
+209 Shadowmind 16790693 16829364 16829365 16829366 16829367 IR_TFSHAD 6 CLS_ATK_2 CLS_FEAT_SDMIND CLS_SAVTHR_BARD CLS_SKILL_SDMIND CLS_BFEAT_SDMIND 4 **** **** 1 0 10 11 11 16 16 10 INT 0X00 0X0 0 CLASS_TYPE_SHADOWMIND 1 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_SDMIND 40 0 0 0 10 8 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
210 Psychic_Thurge 16790694 16823908 16823909 16823910 16823911 IR_PSYCHIC 4 CLS_ATK_3 CLS_FEAT_PSYCH CLS_SAVTHR_WIZ CLS_SKILL_PSYCH CLS_BFEAT_PSYCH 2 **** **** 1 0 10 11 11 16 16 10 INT 0X00 0X0 0 CLASS_TYPE_PSYCHIC_THEURGE 1 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_PSYCH 40 0 0 1 10 10 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
211 Cerebremancer 16790695 16823912 16823913 16823914 16823915 IR_CEREBRE 4 CLS_ATK_3 CLS_FEAT_CEREB CLS_SAVTHR_WIZ CLS_SKILL_CEREB CLS_BFEAT_CEREB 2 **** **** 1 0 10 11 11 16 16 10 INT 0X00 0X0 0 CLASS_TYPE_CEREBREMANCER 1 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_CEREB 40 0 1 0 10 10 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
212 Thrallherd 16790696 16823940 16823941 16823942 16823943 IR_THRALLHERD 4 CLS_ATK_3 CLS_FEAT_THRALL CLS_SAVTHR_WIZ CLS_SKILL_THRALL CLS_BFEAT_THRALL 2 **** **** 1 0 10 11 11 16 16 10 INT 0X00 0X0 0 CLASS_TYPE_THRALLHERD 1 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 CLS_PRES_THRALL 10 0 0 0 10 10 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** ****
diff --git a/nwn/nwnprc/trunk/2das/cls_bfeat_sdmind.2da b/nwn/nwnprc/trunk/2das/cls_bfeat_sdmind.2da
index 89d5a6c3..a54c8844 100644
--- a/nwn/nwnprc/trunk/2das/cls_bfeat_sdmind.2da
+++ b/nwn/nwnprc/trunk/2das/cls_bfeat_sdmind.2da
@@ -1,63 +1,63 @@
2DA V2.0
- Bonus
-0 1
-1 0
-2 0
-3 0
-4 0
-5 0
-6 0
-7 0
-8 0
-9 0
-10 0
-11 0
-12 0
-13 0
-14 0
-15 0
-16 0
-17 0
-18 0
-19 0
-20 0
-21 0
-22 0
-23 0
-24 0
-25 0
-26 0
-27 0
-28 0
-29 0
-30 0
-31 0
-32 0
-33 0
-34 0
-35 0
-36 0
-37 0
-38 0
-39 0
-40 0
-41 0
-42 0
-43 0
-44 0
-45 0
-46 0
-47 0
-48 0
-49 0
-50 0
-51 0
-52 0
-53 0
-54 0
-55 0
-56 0
-57 0
-58 0
-59 0
+ Bonus
+0 1
+1 0
+2 0
+3 0
+4 0
+5 0
+6 0
+7 0
+8 0
+9 0
+10 0
+11 0
+12 1
+13 0
+14 0
+15 1
+16 0
+17 0
+18 1
+19 0
+20 0
+21 1
+22 0
+23 0
+24 1
+25 0
+26 0
+27 1
+28 0
+29 0
+30 1
+31 0
+32 0
+33 1
+34 0
+35 0
+36 1
+37 0
+38 0
+39 1
+40 0
+41 0
+42 1
+43 0
+44 0
+45 1
+46 0
+47 0
+48 1
+49 0
+50 0
+51 1
+52 0
+53 0
+54 1
+55 0
+56 0
+57 1
+58 0
+59 0
diff --git a/nwn/nwnprc/trunk/2das/cls_feat_sdmind.2da b/nwn/nwnprc/trunk/2das/cls_feat_sdmind.2da
index 27e6be9c..e843bc83 100644
--- a/nwn/nwnprc/trunk/2das/cls_feat_sdmind.2da
+++ b/nwn/nwnprc/trunk/2das/cls_feat_sdmind.2da
@@ -5,192 +5,277 @@
1 ShadowmindCloudMind 3627 3 3 1
2 ShadowmindCloudMindMass 3628 3 9 1
3 ShadowmindMindStab 3629 3 10 1
-4 **** **** **** **** ****
-5 Psionic_Endowment 4802 1 -1 1
-6 Greater_Psionic_Endowment 4801 1 -1 1
-7 Power_Specialization 4805 1 -1 1
-8 Greater_Power_Specialization 4804 1 -1 0
-9 Power_Penetration 4807 1 -1 1
-10 Greater_Power_Penetration 4806 1 -1 1
-11 Overchannel 4826 1 -1 1
-12 Talented 4829 1 -1 1
-13 Chain_Power 4937 1 -1 1
-14 Empower_Power 4938 1 -1 1
-15 Extend_Power 4939 1 -1 1
-16 Maximize_Power 4940 1 -1 1
-17 Split_Psionic_Ray 4941 1 -1 1
-18 Twin_Power 4942 1 -1 1
-19 Widen_Power 4943 1 -1 1
-20 Quicken_Power 4944 1 -1 1
-21 **** **** **** **** ****
-22 Psionic_Dodge 4803 1 -1 0
-23 Combat_Manifestation 4810 1 -1 0
-24 Boost_Construct 4833 1 -1 0
-25 Speed_Of_Thought 4834 1 -1 0
-26 Psionic_Talent_1 4835 1 -1 0
-27 Psionic_Talent_2 4836 1 -1 0
-28 Psionic_Talent_3 4837 1 -1 0
-29 Psionic_Talent_4 4838 1 -1 0
-30 Psionic_Talent_5 4839 1 -1 0
-31 Psionic_Talent_6 4840 1 -1 0
-32 Psionic_Talent_7 4841 1 -1 0
-33 Psionic_Talent_8 4842 1 -1 0
-34 Psionic_Talent_9 4843 1 -1 0
-35 Psionic_Talent_10 4844 1 -1 0
-36 Epic_Psionic_Focus_1 4857 1 -1 0
-37 Epic_Psionic_Focus_2 4858 1 -1 0
-38 Epic_Psionic_Focus_3 4859 1 -1 0
-39 Epic_Psionic_Focus_4 4860 1 -1 0
-40 Epic_Psionic_Focus_5 4861 1 -1 0
-41 Epic_Psionic_Focus_6 4862 1 -1 0
-42 Epic_Psionic_Focus_7 4863 1 -1 0
-43 Epic_Psionic_Focus_8 4864 1 -1 0
-44 Epic_Psionic_Focus_9 4865 1 -1 0
-45 Epic_Psionic_Focus_10 4866 1 -1 0
-46 Expanded_Knowledge_1 4867 1 -1 0
-47 Expanded_Knowledge_2 4868 1 -1 0
-48 Expanded_Knowledge_3 4869 1 -1 0
-49 Expanded_Knowledge_4 4870 1 -1 0
-50 Expanded_Knowledge_5 4871 1 -1 0
-51 Expanded_Knowledge_6 4872 1 -1 0
-52 Expanded_Knowledge_7 4873 1 -1 0
-53 Expanded_Knowledge_8 4874 1 -1 0
-54 Expanded_Knowledge_9 4875 1 -1 0
-55 Expanded_Knowledge_10 4876 1 -1 0
-56 Epic_Expanded_Knowledge_1 4877 1 -1 0
-57 Epic_Expanded_Knowledge_2 4878 1 -1 0
-58 Epic_Expanded_Knowledge_3 4879 1 -1 0
-59 Epic_Expanded_Knowledge_4 4880 1 -1 0
-60 Epic_Expanded_Knowledge_5 4881 1 -1 0
-61 Epic_Expanded_Knowledge_6 4882 1 -1 0
-62 Epic_Expanded_Knowledge_7 4883 1 -1 0
-63 Epic_Expanded_Knowledge_8 4884 1 -1 0
-64 Epic_Expanded_Knowledge_9 4885 1 -1 0
-65 Epic_Expanded_Knowledge_10 4886 1 -1 0
-66 Improved_Metapsionics_1 4887 1 -1 0
-67 Improved_Metapsionics_2 4888 1 -1 0
-68 Improved_Metapsionics_3 4889 1 -1 0
-69 Improved_Metapsionics_4 4890 1 -1 0
-70 Improved_Metapsionics_5 4891 1 -1 0
-71 Improved_Metapsionics_6 4892 1 -1 0
-72 Improved_Metapsionics_7 4893 1 -1 0
-73 Improved_Metapsionics_8 4894 1 -1 0
-74 Improved_Metapsionics_9 4895 1 -1 0
-75 Improved_Metapsionics_10 4896 1 -1 0
-76 Improved_Manifestation_1 4897 1 -1 0
-77 Improved_Manifestation_2 4898 1 -1 0
-78 Improved_Manifestation_3 4899 1 -1 0
-79 Improved_Manifestation_4 4900 1 -1 0
-80 Improved_Manifestation_5 4901 1 -1 0
-81 Improved_Manifestation_6 4902 1 -1 0
-82 Improved_Manifestation_7 4903 1 -1 0
-83 Improved_Manifestation_8 4904 1 -1 0
-84 Improved_Manifestation_9 4905 1 -1 0
-85 Improved_Manifestation_10 4906 1 -1 0
-86 Power_Knowledge_Psion_1 4907 1 -1 0
-87 Power_Knowledge_Psion_2 4908 1 -1 0
-88 Power_Knowledge_Psion_3 4909 1 -1 0
-89 Power_Knowledge_Psion_4 4910 1 -1 0
-90 Power_Knowledge_Psion_5 4911 1 -1 0
-91 Power_Knowledge_Psion_6 4912 1 -1 0
-92 Power_Knowledge_Psion_7 4913 1 -1 0
-93 Power_Knowledge_Psion_8 4914 1 -1 0
-94 Power_Knowledge_Psion_9 4915 1 -1 0
-95 Power_Knowledge_Psion_10 4916 1 -1 0
-96 Power_Knowledge_PsyWar_1 4917 1 -1 0
-97 Power_Knowledge_PsyWar_2 4918 1 -1 0
-98 Power_Knowledge_PsyWar_3 4919 1 -1 0
-99 Power_Knowledge_PsyWar_4 4920 1 -1 0
-100 Power_Knowledge_PsyWar_5 4921 1 -1 0
-101 Power_Knowledge_PsyWar_6 4922 1 -1 0
-102 Power_Knowledge_PsyWar_7 4923 1 -1 0
-103 Power_Knowledge_PsyWar_8 4924 1 -1 0
-104 Power_Knowledge_PsyWar_9 4925 1 -1 0
-105 Power_Knowledge_PsyWar_10 4926 1 -1 0
-106 Power_Knowledge_Wilder_1 4927 1 -1 0
-107 Power_Knowledge_Wilder_2 4928 1 -1 0
-108 Power_Knowledge_Wilder_3 4929 1 -1 0
-109 Power_Knowledge_Wilder_4 4930 1 -1 0
-110 Power_Knowledge_Wilder_5 4931 1 -1 0
-111 Power_Knowledge_Wilder_6 4932 1 -1 0
-112 Power_Knowledge_Wilder_7 4933 1 -1 0
-113 Power_Knowledge_Wilder_8 4934 1 -1 0
-114 Power_Knowledge_Wilder_9 4935 1 -1 0
-115 Power_Knowledge_Wilder_10 4936 1 -1 0
-116 Power_Knowledge_FistOfZuoken_1 4945 1 -1 0
-117 Power_Knowledge_FistOfZuoken_2 4946 1 -1 0
-118 Power_Knowledge_FistOfZuoken_3 4947 1 -1 0
-119 Power_Knowledge_FistOfZuoken_4 4948 1 -1 0
-120 Power_Knowledge_FistOfZuoken_5 4949 1 -1 0
-121 Power_Knowledge_FistOfZuoken_6 4950 1 -1 0
-122 Power_Knowledge_FistOfZuoken_7 4951 1 -1 0
-123 Power_Knowledge_FistOfZuoken_8 4952 1 -1 0
-124 Power_Knowledge_FistOfZuoken_9 4953 1 -1 0
-125 Power_Knowledge_FistOfZuoken_10 4954 1 -1 0
-126 FEAT_EPIC_ENERGY_RESISTANCE_COLD_1 533 1 -1 0
-127 FEAT_EPIC_ENERGY_RESISTANCE_COLD_2 534 1 -1 0
-128 FEAT_EPIC_ENERGY_RESISTANCE_COLD_3 535 1 -1 0
-129 FEAT_EPIC_ENERGY_RESISTANCE_COLD_4 536 1 -1 0
-130 FEAT_EPIC_ENERGY_RESISTANCE_COLD_5 537 1 -1 0
-131 FEAT_EPIC_ENERGY_RESISTANCE_COLD_6 538 1 -1 0
-132 FEAT_EPIC_ENERGY_RESISTANCE_COLD_7 539 1 -1 0
-133 FEAT_EPIC_ENERGY_RESISTANCE_COLD_8 540 1 -1 0
-134 FEAT_EPIC_ENERGY_RESISTANCE_COLD_9 541 1 -1 0
-135 FEAT_EPIC_ENERGY_RESISTANCE_COLD_10 542 1 -1 0
-136 FEAT_EPIC_ENERGY_RESISTANCE_ACID_1 543 1 -1 0
-137 FEAT_EPIC_ENERGY_RESISTANCE_ACID_2 544 1 -1 0
-138 FEAT_EPIC_ENERGY_RESISTANCE_ACID_3 545 1 -1 0
-139 FEAT_EPIC_ENERGY_RESISTANCE_ACID_4 546 1 -1 0
-140 FEAT_EPIC_ENERGY_RESISTANCE_ACID_5 547 1 -1 0
-141 FEAT_EPIC_ENERGY_RESISTANCE_ACID_6 548 1 -1 0
-142 FEAT_EPIC_ENERGY_RESISTANCE_ACID_7 549 1 -1 0
-143 FEAT_EPIC_ENERGY_RESISTANCE_ACID_8 550 1 -1 0
-144 FEAT_EPIC_ENERGY_RESISTANCE_ACID_9 551 1 -1 0
-145 FEAT_EPIC_ENERGY_RESISTANCE_ACID_10 552 1 -1 0
-146 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_1 553 1 -1 0
-147 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_2 554 1 -1 0
-148 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_3 555 1 -1 0
-149 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_4 556 1 -1 0
-150 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_5 557 1 -1 0
-151 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_6 558 1 -1 0
-152 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_7 559 1 -1 0
-153 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_8 560 1 -1 0
-154 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_9 561 1 -1 0
-155 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_10 562 1 -1 0
-156 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_1 563 1 -1 0
-157 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_2 564 1 -1 0
-158 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_3 565 1 -1 0
-159 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_4 566 1 -1 0
-160 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_5 567 1 -1 0
-161 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_6 568 1 -1 0
-162 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_7 569 1 -1 0
-163 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_8 570 1 -1 0
-164 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_9 571 1 -1 0
-165 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_10 572 1 -1 0
-166 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_1 573 1 -1 0
-167 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_2 574 1 -1 0
-168 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_3 575 1 -1 0
-169 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_4 576 1 -1 0
-170 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_5 577 1 -1 0
-171 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_6 578 1 -1 0
-172 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_7 579 1 -1 0
-173 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_8 580 1 -1 0
-174 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_9 581 1 -1 0
-175 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_10 582 1 -1 0
-176 FEAT_EPIC_GREAT_INTELLIGENCE_1 794 1 -1 0
-177 FEAT_EPIC_GREAT_INTELLIGENCE_2 795 1 -1 0
-178 FEAT_EPIC_GREAT_INTELLIGENCE_3 796 1 -1 0
-179 FEAT_EPIC_GREAT_INTELLIGENCE_4 797 1 -1 0
-180 FEAT_EPIC_GREAT_INTELLIGENCE_5 798 1 -1 0
-181 FEAT_EPIC_GREAT_INTELLIGENCE_6 799 1 -1 0
-182 FEAT_EPIC_GREAT_INTELLIGENCE_7 800 1 -1 0
-183 FEAT_EPIC_GREAT_INTELLIGENCE_8 801 1 -1 0
-184 FEAT_EPIC_GREAT_INTELLIGENCE_9 802 1 -1 0
-185 FEAT_EPIC_GREAT_INTELLIGENCE_10 803 1 -1 0
-186 FEAT_DRAGONFIRE_STRIKE 3949 0 -1 1
-187 FEAT_SHADOWMIND_MANIFEST_FOZ 18135 2 1 0
-188 FEAT_SHADOWMIND_MANIFEST_PSION 18142 2 1 0
-189 FEAT_SHADOWMIND_MANIFEST_PSYROUGE 18150 2 1 0
-190 FEAT_SHADOWMIND_MANIFEST_PSYWAR 18157 2 1 0
-191 FEAT_SHADOWMIND_MANIFEST_WARMIND 18164 2 1 0
-192 FEAT_SHADOWMIND_MANIFEST_WILDER 18171 2 1 0
+4 EPIC_SHADOWMIND 25091 3 11 0
+5 FEAT_SHADOWMIND_MANIFEST_FOZ 18135 2 1 0
+6 FEAT_SHADOWMIND_MANIFEST_PSION 18142 2 1 0
+7 FEAT_SHADOWMIND_MANIFEST_PSYROUGE 18150 2 1 0
+8 FEAT_SHADOWMIND_MANIFEST_PSYWAR 18157 2 1 0
+9 FEAT_SHADOWMIND_MANIFEST_WARMIND 18164 2 1 0
+10 FEAT_SHADOWMIND_MANIFEST_WILDER 18171 2 1 0
+11 FEAT_EPIC_ENERGY_RESISTANCE_COLD_1 533 1 2 0
+12 FEAT_EPIC_ENERGY_RESISTANCE_COLD_2 534 1 2 0
+13 FEAT_EPIC_ENERGY_RESISTANCE_COLD_3 535 1 2 0
+14 FEAT_EPIC_ENERGY_RESISTANCE_COLD_4 536 1 2 0
+15 FEAT_EPIC_ENERGY_RESISTANCE_COLD_5 537 1 2 0
+16 FEAT_EPIC_ENERGY_RESISTANCE_COLD_6 538 1 2 0
+17 FEAT_EPIC_ENERGY_RESISTANCE_COLD_7 539 1 2 0
+18 FEAT_EPIC_ENERGY_RESISTANCE_COLD_8 540 1 2 0
+19 FEAT_EPIC_ENERGY_RESISTANCE_COLD_9 541 1 2 0
+20 FEAT_EPIC_ENERGY_RESISTANCE_COLD_10 542 1 2 0
+21 FEAT_EPIC_ENERGY_RESISTANCE_ACID_1 543 1 2 0
+22 FEAT_EPIC_ENERGY_RESISTANCE_ACID_2 544 1 2 0
+23 FEAT_EPIC_ENERGY_RESISTANCE_ACID_3 545 1 2 0
+24 FEAT_EPIC_ENERGY_RESISTANCE_ACID_4 546 1 2 0
+25 FEAT_EPIC_ENERGY_RESISTANCE_ACID_5 547 1 2 0
+26 FEAT_EPIC_ENERGY_RESISTANCE_ACID_6 548 1 2 0
+27 FEAT_EPIC_ENERGY_RESISTANCE_ACID_7 549 1 2 0
+28 FEAT_EPIC_ENERGY_RESISTANCE_ACID_8 550 1 2 0
+29 FEAT_EPIC_ENERGY_RESISTANCE_ACID_9 551 1 2 0
+30 FEAT_EPIC_ENERGY_RESISTANCE_ACID_10 552 1 2 0
+31 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_1 553 1 2 0
+32 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_2 554 1 2 0
+33 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_3 555 1 2 0
+34 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_4 556 1 2 0
+35 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_5 557 1 2 0
+36 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_6 558 1 2 0
+37 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_7 559 1 2 0
+38 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_8 560 1 2 0
+39 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_9 561 1 2 0
+40 FEAT_EPIC_ENERGY_RESISTANCE_FIRE_10 562 1 2 0
+41 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_1 563 1 2 0
+42 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_2 564 1 2 0
+43 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_3 565 1 2 0
+44 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_4 566 1 2 0
+45 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_5 567 1 2 0
+46 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_6 568 1 2 0
+47 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_7 569 1 2 0
+48 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_8 570 1 2 0
+49 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_9 571 1 2 0
+50 FEAT_EPIC_ENERGY_RESISTANCE_ELECTRICAL_10 572 1 2 0
+51 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_1 573 1 2 0
+52 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_2 574 1 2 0
+53 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_3 575 1 2 0
+54 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_4 576 1 2 0
+55 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_5 577 1 2 0
+56 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_6 578 1 2 0
+57 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_7 579 1 2 0
+58 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_8 580 1 2 0
+59 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_9 581 1 2 0
+60 FEAT_EPIC_ENERGY_RESISTANCE_SONIC_10 582 1 2 0
+61 FEAT_EPIC_GREAT_DEXTERITY_1 784 1 2 0
+62 FEAT_EPIC_GREAT_DEXTERITY_2 785 1 2 0
+63 FEAT_EPIC_GREAT_DEXTERITY_3 786 1 2 0
+64 FEAT_EPIC_GREAT_DEXTERITY_4 787 1 2 0
+65 FEAT_EPIC_GREAT_DEXTERITY_5 788 1 2 0
+66 FEAT_EPIC_GREAT_DEXTERITY_6 789 1 2 0
+67 FEAT_EPIC_GREAT_DEXTERITY_7 790 1 2 0
+68 FEAT_EPIC_GREAT_DEXTERITY_8 791 1 2 0
+69 FEAT_EPIC_GREAT_DEXTERITY_9 792 1 2 0
+70 FEAT_EPIC_GREAT_DEXTERITY_10 793 1 2 0
+71 FEAT_EPIC_GREAT_INTELLIGENCE_1 794 1 2 0
+72 FEAT_EPIC_GREAT_INTELLIGENCE_2 795 1 2 0
+73 FEAT_EPIC_GREAT_INTELLIGENCE_3 796 1 2 0
+74 FEAT_EPIC_GREAT_INTELLIGENCE_4 797 1 2 0
+75 FEAT_EPIC_GREAT_INTELLIGENCE_5 798 1 2 0
+76 FEAT_EPIC_GREAT_INTELLIGENCE_6 799 1 2 0
+77 FEAT_EPIC_GREAT_INTELLIGENCE_7 800 1 2 0
+78 FEAT_EPIC_GREAT_INTELLIGENCE_8 801 1 2 0
+79 FEAT_EPIC_GREAT_INTELLIGENCE_9 802 1 2 0
+80 FEAT_EPIC_GREAT_INTELLIGENCE_10 803 1 2 0
+81 FEAT_EPIC_GREAT_WISDOM_1 804 1 2 0
+82 FEAT_EPIC_GREAT_WISDOM_2 805 1 2 0
+83 FEAT_EPIC_GREAT_WISDOM_3 806 1 2 0
+84 FEAT_EPIC_GREAT_WISDOM_4 807 1 2 0
+85 FEAT_EPIC_GREAT_WISDOM_5 808 1 2 0
+86 FEAT_EPIC_GREAT_WISDOM_6 809 1 2 0
+87 FEAT_EPIC_GREAT_WISDOM_7 810 1 2 0
+88 FEAT_EPIC_GREAT_WISDOM_8 811 1 2 0
+89 FEAT_EPIC_GREAT_WISDOM_9 812 1 2 0
+90 FEAT_EPIC_GREAT_WISDOM_10 813 1 2 0
+91 FEAT_EPIC_GREAT_CHARISMA_1 764 1 2 0
+92 FEAT_EPIC_GREAT_CHARISMA_2 765 1 2 0
+93 FEAT_EPIC_GREAT_CHARISMA_3 766 1 2 0
+94 FEAT_EPIC_GREAT_CHARISMA_4 767 1 2 0
+95 FEAT_EPIC_GREAT_CHARISMA_5 768 1 2 0
+96 FEAT_EPIC_GREAT_CHARISMA_6 769 1 2 0
+97 FEAT_EPIC_GREAT_CHARISMA_7 770 1 2 0
+98 FEAT_EPIC_GREAT_CHARISMA_8 771 1 2 0
+99 FEAT_EPIC_GREAT_CHARISMA_9 772 1 2 0
+100 FEAT_EPIC_GREAT_CHARISMA_10 773 1 2 0
+101 FEAT_EPIC_ARMOR_SKIN 490 1 2 0
+102 FEAT_EPIC_BLINDING_SPEED 491 1 2 1
+103 FEAT_EPIC_SELF_CONCEALMENT_10 748 1 2 0
+104 FEAT_EPIC_SELF_CONCEALMENT_20 749 1 2 0
+105 FEAT_EPIC_SELF_CONCEALMENT_30 750 1 2 0
+106 FEAT_EPIC_SELF_CONCEALMENT_40 751 1 2 0
+107 FEAT_EPIC_SELF_CONCEALMENT_50 752 1 2 0
+108 FEAT_EPIC_SUPERIOR_INITIATIVE 753 1 2 0
+109 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_1 834 1 2 0
+110 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_2 835 1 2 0
+111 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_3 836 1 2 0
+112 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_4 837 1 2 0
+113 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_5 838 1 2 0
+114 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_6 839 1 2 0
+115 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_7 840 1 2 0
+116 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_8 841 1 2 0
+117 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_9 842 1 2 0
+118 FEAT_EPIC_IMPROVED_SNEAK_ATTACK_10 843 1 2 0
+119 FEAT_EPIC_SKILL_FOCUS_USEMAGICDEVICE 609 1 2 0
+120 FEAT_EPIC_SKILL_FOCUS_RIDE 3038 1 2 0
+121 FEAT_EPIC_SKILL_FOCUS_JUMP 3040 1 2 0
+122 FEAT_EPIC_SKILL_FOCUS_SENSE_MOTIVE 3042 1 2 0
+123 FEAT_EPIC_SKILL_FOCUS_MARTIAL_LORE 3044 1 2 0
+124 FEAT_EPIC_SKILL_FOCUS_BALANCE 3046 1 2 0
+125 FEAT_EPIC_SKILL_FOCUS_CRAFT_POISON 3048 1 2 0
+126 FEAT_EPIC_SKILL_FOCUS_PSICRAFT 3050 1 2 0
+127 FEAT_EPIC_SKILL_FOCUS_CLIMB 3052 1 2 0
+128 FEAT_EPIC_SKILL_FOCUS_CRAFT_GENERAL 3054 1 2 0
+129 FEAT_EPIC_SKILL_FOCUS_APPRAISE 588 1 2 0
+130 FEAT_EPIC_SKILL_FOCUS_CONCENTRATION 589 1 2 0
+131 FEAT_EPIC_SKILL_FOCUS_CRAFT_TRAP 590 1 2 0
+132 FEAT_EPIC_SKILL_FOCUS_DISABLETRAP 591 1 2 0
+133 FEAT_EPIC_SKILL_FOCUS_DISCIPLINE 592 1 2 0
+134 FEAT_EPIC_SKILL_FOCUS_HEAL 593 1 2 0
+135 FEAT_EPIC_SKILL_FOCUS_HIDE 594 1 2 0
+136 FEAT_EPIC_SKILL_FOCUS_LISTEN 595 1 2 0
+137 FEAT_EPIC_SKILL_FOCUS_LORE 596 1 2 0
+138 FEAT_EPIC_SKILL_FOCUS_MOVESILENTLY 597 1 2 0
+139 FEAT_EPIC_SKILL_FOCUS_OPENLOCK 598 1 2 0
+140 FEAT_EPIC_SKILL_FOCUS_PERSUADE 601 1 2 0
+141 FEAT_EPIC_SKILL_FOCUS_PICKPOCKET 602 1 2 0
+142 FEAT_EPIC_SKILL_FOCUS_SEARCH 603 1 2 0
+143 FEAT_EPIC_SKILL_FOCUS_SETTRAP 604 1 2 0
+144 FEAT_EPIC_SKILL_FOCUS_SPELLCRAFT 605 1 2 0
+145 FEAT_EPIC_SKILL_FOCUS_SPOT 606 1 2 0
+146 FEAT_EPIC_SKILL_FOCUS_TUMBLE 608 1 2 0
+147 FEAT_EPIC_SKILL_FOCUS_CRAFT_ARMOR 913 1 2 0
+148 FEAT_EPIC_SKILL_FOCUS_CRAFT_WEAPON 914 1 2 0
+149 FEAT_EPIC_SKILL_FOCUS_BLUFF 917 1 2 0
+150 FEAT_EPIC_SKILL_FOCUS_INTIMIDATE 918 1 2 0
+151 FEAT_LINGERING_DAMAGE 3099 1 2 0
+152 FEAT_EPIC_PROWESS 584 1 2 0
+153 FEAT_EPIC_DODGE 856 1 2 0
+154 FEAT_EPIC_REPUTATION 586 1 2 0
+155 **** **** **** **** ****
+156 Psionic_Endowment 4802 0 -1 1
+157 Greater_Psionic_Endowment 4801 0 -1 1
+158 Power_Specialization 4805 0 -1 1
+159 Greater_Power_Specialization 4804 0 -1 0
+160 Power_Penetration 4807 0 -1 1
+161 Greater_Power_Penetration 4806 0 -1 1
+162 Overchannel 4826 0 -1 1
+163 Talented 4829 0 -1 1
+164 Chain_Power 4937 0 -1 1
+165 Empower_Power 4938 0 -1 1
+166 Extend_Power 4939 0 -1 1
+167 Maximize_Power 4940 0 -1 1
+168 Split_Psionic_Ray 4941 0 -1 1
+169 Twin_Power 4942 0 -1 1
+170 Widen_Power 4943 0 -1 1
+171 Quicken_Power 4944 0 -1 1
+172 **** **** **** **** ****
+173 Psionic_Dodge 4803 0 -1 0
+174 Combat_Manifestation 4810 0 -1 0
+175 Boost_Construct 4833 0 -1 0
+176 Speed_Of_Thought 4834 0 -1 0
+177 Psionic_Talent_1 4835 0 -1 0
+178 Psionic_Talent_2 4836 0 -1 0
+179 Psionic_Talent_3 4837 0 -1 0
+180 Psionic_Talent_4 4838 0 -1 0
+181 Psionic_Talent_5 4839 0 -1 0
+182 Psionic_Talent_6 4840 0 -1 0
+183 Psionic_Talent_7 4841 0 -1 0
+184 Psionic_Talent_8 4842 0 -1 0
+185 Psionic_Talent_9 4843 0 -1 0
+186 Psionic_Talent_10 4844 1 -1 0
+187 Epic_Psionic_Focus_1 4857 1 -1 0
+188 Epic_Psionic_Focus_2 4858 1 -1 0
+189 Epic_Psionic_Focus_3 4859 1 -1 0
+190 Epic_Psionic_Focus_4 4860 1 -1 0
+191 Epic_Psionic_Focus_5 4861 1 -1 0
+192 Epic_Psionic_Focus_6 4862 1 -1 0
+193 Epic_Psionic_Focus_7 4863 1 -1 0
+194 Epic_Psionic_Focus_8 4864 1 -1 0
+195 Epic_Psionic_Focus_9 4865 1 -1 0
+196 Epic_Psionic_Focus_10 4866 1 -1 0
+197 Expanded_Knowledge_1 4867 0 -1 0
+198 Expanded_Knowledge_2 4868 0 -1 0
+199 Expanded_Knowledge_3 4869 0 -1 0
+200 Expanded_Knowledge_4 4870 0 -1 0
+201 Expanded_Knowledge_5 4871 0 -1 0
+202 Expanded_Knowledge_6 4872 0 -1 0
+203 Expanded_Knowledge_7 4873 0 -1 0
+204 Expanded_Knowledge_8 4874 0 -1 0
+205 Expanded_Knowledge_9 4875 0 -1 0
+206 Expanded_Knowledge_10 4876 0 -1 0
+207 Epic_Expanded_Knowledge_1 4877 1 -1 0
+208 Epic_Expanded_Knowledge_2 4878 1 -1 0
+209 Epic_Expanded_Knowledge_3 4879 1 -1 0
+210 Epic_Expanded_Knowledge_4 4880 1 -1 0
+211 Epic_Expanded_Knowledge_5 4881 1 -1 0
+212 Epic_Expanded_Knowledge_6 4882 1 -1 0
+213 Epic_Expanded_Knowledge_7 4883 1 -1 0
+214 Epic_Expanded_Knowledge_8 4884 1 -1 0
+215 Epic_Expanded_Knowledge_9 4885 1 -1 0
+216 Epic_Expanded_Knowledge_10 4886 1 -1 0
+217 Improved_Metapsionics_1 4887 1 -1 0
+218 Improved_Metapsionics_2 4888 1 -1 0
+219 Improved_Metapsionics_3 4889 1 -1 0
+220 Improved_Metapsionics_4 4890 1 -1 0
+221 Improved_Metapsionics_5 4891 1 -1 0
+222 Improved_Metapsionics_6 4892 1 -1 0
+223 Improved_Metapsionics_7 4893 1 -1 0
+224 Improved_Metapsionics_8 4894 1 -1 0
+225 Improved_Metapsionics_9 4895 1 -1 0
+226 Improved_Metapsionics_10 4896 1 -1 0
+227 Improved_Manifestation_1 4897 1 -1 0
+228 Improved_Manifestation_2 4898 1 -1 0
+229 Improved_Manifestation_3 4899 1 -1 0
+230 Improved_Manifestation_4 4900 1 -1 0
+231 Improved_Manifestation_5 4901 1 -1 0
+232 Improved_Manifestation_6 4902 1 -1 0
+233 Improved_Manifestation_7 4903 1 -1 0
+234 Improved_Manifestation_8 4904 1 -1 0
+235 Improved_Manifestation_9 4905 1 -1 0
+236 Improved_Manifestation_10 4906 1 -1 0
+237 Power_Knowledge_Psion_1 4907 0 -1 0
+238 Power_Knowledge_Psion_2 4908 0 -1 0
+239 Power_Knowledge_Psion_3 4909 0 -1 0
+240 Power_Knowledge_Psion_4 4910 0 -1 0
+241 Power_Knowledge_Psion_5 4911 0 -1 0
+242 Power_Knowledge_Psion_6 4912 0 -1 0
+243 Power_Knowledge_Psion_7 4913 0 -1 0
+244 Power_Knowledge_Psion_8 4914 0 -1 0
+245 Power_Knowledge_Psion_9 4915 0 -1 0
+246 Power_Knowledge_Psion_10 4916 0 -1 0
+247 Power_Knowledge_PsyWar_1 4917 0 -1 0
+248 Power_Knowledge_PsyWar_2 4918 0 -1 0
+249 Power_Knowledge_PsyWar_3 4919 0 -1 0
+250 Power_Knowledge_PsyWar_4 4920 0 -1 0
+251 Power_Knowledge_PsyWar_5 4921 0 -1 0
+252 Power_Knowledge_PsyWar_6 4922 0 -1 0
+253 Power_Knowledge_PsyWar_7 4923 0 -1 0
+254 Power_Knowledge_PsyWar_8 4924 0 -1 0
+255 Power_Knowledge_PsyWar_9 4925 0 -1 0
+256 Power_Knowledge_PsyWar_10 4926 0 -1 0
+257 Power_Knowledge_Wilder_1 4927 0 -1 0
+258 Power_Knowledge_Wilder_2 4928 0 -1 0
+259 Power_Knowledge_Wilder_3 4929 0 -1 0
+260 Power_Knowledge_Wilder_4 4930 0 -1 0
+261 Power_Knowledge_Wilder_5 4931 0 -1 0
+262 Power_Knowledge_Wilder_6 4932 0 -1 0
+263 Power_Knowledge_Wilder_7 4933 0 -1 0
+264 Power_Knowledge_Wilder_8 4934 0 -1 0
+265 Power_Knowledge_Wilder_9 4935 0 -1 0
+266 Power_Knowledge_Wilder_10 4936 0 -1 0
+267 Power_Knowledge_FistOfZuoken_1 4945 0 -1 0
+268 Power_Knowledge_FistOfZuoken_2 4946 0 -1 0
+269 Power_Knowledge_FistOfZuoken_3 4947 0 -1 0
+270 Power_Knowledge_FistOfZuoken_4 4948 0 -1 0
+271 Power_Knowledge_FistOfZuoken_5 4949 0 -1 0
+272 Power_Knowledge_FistOfZuoken_6 4950 0 -1 0
+273 Power_Knowledge_FistOfZuoken_7 4951 0 -1 0
+274 Power_Knowledge_FistOfZuoken_8 4952 0 -1 0
+275 Power_Knowledge_FistOfZuoken_9 4953 0 -1 0
+276 Power_Knowledge_FistOfZuoken_10 4954 0 -1 0
+277 FEAT_DRAGONFIRE_STRIKE 3949 0 -1 1
diff --git a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
index 9544d517..401b3231 100644
--- a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
+++ b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss
@@ -467,8 +467,52 @@ int GetWeaponProfIPFeat(int nWeaponProfFeat)
return nWeaponProfFeat - 3300;
}
-//handles the feat chain for Elven Lightblades
-void DoEquipLightblade(object oPC, object oItem, int nHand)
+//:: Handles the feat emulation chain for Elven Lightblades
+void DoEquipLightblade(object oPC, object oItem)
+{
+ effect eLightblade;
+ int bHasEffect;
+
+ //:: Weapon Focus
+ if(GetHasFeat(FEAT_WEAPON_FOCUS_SHORT_SWORD, oPC) || GetHasFeat(FEAT_WEAPON_FOCUS_RAPIER, oPC))
+ {
+ eLightblade = EffectBonusFeat(FEAT_WEAPON_FOCUS_ELVEN_LIGHTBLADE);
+ bHasEffect = TRUE;
+
+ //:: Epic Weapon Focus
+ if(GetHasFeat(FEAT_EPIC_WEAPON_FOCUS_SHORTSWORD, oPC) || GetHasFeat(FEAT_EPIC_WEAPON_FOCUS_RAPIER, oPC))
+ {
+ eLightblade = EffectLinkEffects(eLightblade, EffectBonusFeat(FEAT_EPIC_WEAPON_FOCUS_ELVEN_LIGHTBLADE));
+ }
+ //:: Weapon Specialization
+ if(GetHasFeat(FEAT_WEAPON_SPECIALIZATION_SHORT_SWORD, oPC) || GetHasFeat(FEAT_WEAPON_SPECIALIZATION_RAPIER, oPC))
+ {
+ eLightblade = EffectLinkEffects(eLightblade, EffectBonusFeat(FEAT_WEAPON_SPECIALIZATION_ELVEN_LIGHTBLADE));
+
+ //:: Epic Weapon Specialization
+ if(GetHasFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_SHORTSWORD, oPC) || GetHasFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_RAPIER, oPC))
+ {
+ eLightblade = EffectLinkEffects(eLightblade, EffectBonusFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_LIGHTBLADE));
+ }
+ }
+ }
+ //:: Improved Critical
+ if(GetHasFeat(FEAT_IMPROVED_CRITICAL_SHORT_SWORD, oPC) || GetHasFeat(FEAT_IMPROVED_CRITICAL_RAPIER, oPC))
+ {
+ eLightblade = EffectLinkEffects(eLightblade, EffectBonusFeat(FEAT_IMPROVED_CRITICAL_ELVEN_LIGHTBLADE));
+ bHasEffect = TRUE;
+ }
+
+ if (bHasEffect)
+ {
+ eLightblade = TagEffect(eLightblade, "LIGHTBLADE_FEAT_EMULATATION");
+ eLightblade = SupernaturalEffect(eLightblade);
+ ApplyEffectToObject(DURATION_TYPE_PERMANENT, eLightblade, oPC);
+ }
+}
+
+/* //handles the feat chain for Elven Lightblades
+void DoEquipLightblade(object oPC, object oItem)
{
if(DEBUG) DoDebug("Checking Lightblade feats"); // optimised as some feats are prereq for others
if(GetHasFeat(FEAT_WEAPON_FOCUS_SHORT_SWORD, oPC) || GetHasFeat(FEAT_WEAPON_FOCUS_RAPIER, oPC))
@@ -486,8 +530,53 @@ void DoEquipLightblade(object oPC, object oItem, int nHand)
if(GetHasFeat(FEAT_IMPROVED_CRITICAL_SHORT_SWORD, oPC) || GetHasFeat(FEAT_IMPROVED_CRITICAL_RAPIER, oPC))
IPSafeAddItemProperty(oItem, ItemPropertyKeen(), 99999.0, X2_IP_ADDPROP_POLICY_KEEP_EXISTING, FALSE, FALSE);
}
+ */
-//handles the feat chain for Elven Thinblades
+//:: Handles the feat emulation chain for Elven Thinblades
+void DoEquipThinblade(object oPC, object oItem)
+{
+ effect eThinblade;
+ int bHasEffect;
+
+ //:: Weapon Focus
+ if(GetHasFeat(FEAT_WEAPON_FOCUS_LONG_SWORD, oPC) || GetHasFeat(FEAT_WEAPON_FOCUS_RAPIER, oPC))
+ {
+ eThinblade = EffectBonusFeat(FEAT_WEAPON_FOCUS_ELVEN_THINBLADE);
+ bHasEffect = TRUE;
+
+ //:: Epic Weapon Focus
+ if(GetHasFeat(FEAT_EPIC_WEAPON_FOCUS_LONGSWORD, oPC) || GetHasFeat(FEAT_EPIC_WEAPON_FOCUS_RAPIER, oPC))
+ {
+ eThinblade = EffectLinkEffects(eThinblade, EffectBonusFeat(FEAT_EPIC_WEAPON_FOCUS_ELVEN_THINBLADE));
+ }
+ //:: Weapon Specialization
+ if(GetHasFeat(FEAT_WEAPON_SPECIALIZATION_LONG_SWORD, oPC) || GetHasFeat(FEAT_WEAPON_SPECIALIZATION_RAPIER, oPC))
+ {
+ eThinblade = EffectLinkEffects(eThinblade, EffectBonusFeat(FEAT_WEAPON_SPECIALIZATION_ELVEN_THINBLADE));
+
+ //:: Epic Weapon Specialization
+ if(GetHasFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_LONGSWORD, oPC) || GetHasFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_RAPIER, oPC))
+ {
+ eThinblade = EffectLinkEffects(eThinblade, EffectBonusFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_THINBLADE));
+ }
+ }
+ }
+ //:: Improved Critical
+ if(GetHasFeat(FEAT_IMPROVED_CRITICAL_LONG_SWORD, oPC) || GetHasFeat(FEAT_IMPROVED_CRITICAL_RAPIER, oPC))
+ {
+ eThinblade = EffectLinkEffects(eThinblade, EffectBonusFeat(FEAT_IMPROVED_CRITICAL_ELVEN_THINBLADE));
+ bHasEffect = TRUE;
+ }
+
+ if (bHasEffect)
+ {
+ eThinblade = TagEffect(eThinblade, "THINBLADE_FEAT_EMULATATION");
+ eThinblade = SupernaturalEffect(eThinblade);
+ ApplyEffectToObject(DURATION_TYPE_PERMANENT, eThinblade, oPC);
+ }
+}
+
+/* //handles the feat chain for Elven Thinblades
void DoEquipThinblade(object oPC, object oItem, int nHand)
{
if(GetHasFeat(FEAT_WEAPON_FOCUS_LONG_SWORD, oPC) || GetHasFeat(FEAT_WEAPON_FOCUS_RAPIER, oPC))
@@ -504,51 +593,50 @@ void DoEquipThinblade(object oPC, object oItem, int nHand)
}
if(GetHasFeat(FEAT_IMPROVED_CRITICAL_LONG_SWORD, oPC) || GetHasFeat(FEAT_IMPROVED_CRITICAL_RAPIER, oPC))
IPSafeAddItemProperty(oItem, ItemPropertyKeen(), 99999.0, X2_IP_ADDPROP_POLICY_KEEP_EXISTING, FALSE, FALSE);
-}
+} */
-//handles the feat chain for Elven Courtblades
-void DoEquipCourtblade(object oPC, object oItem, int nHand)
+//:: Handles the feat emulation chain for Elven Courtblades
+void DoEquipCourtblade(object oPC, object oItem)
{
- // Check if the PC qualifies with Greatsword feats
- if (GetHasFeat(FEAT_WEAPON_FOCUS_GREAT_SWORD, oPC))
+ effect eCourtblade;
+ int bHasEffect;
+
+ //:: Weapon Focus
+ if(GetHasFeat(FEAT_WEAPON_FOCUS_GREAT_SWORD, oPC))
{
- // Weapon Focus: Elven Courtblade
- effect eWF = EffectBonusFeat(FEAT_WEAPON_FOCUS_ELVEN_COURTBLADE);
- TagEffect(eWF, "EFF_CB_WF");
- ApplyEffectToObject(DURATION_TYPE_PERMANENT, eWF, oPC);
-
- // Epic Weapon Focus: Elven Courtblade
- if (GetHasFeat(FEAT_EPIC_WEAPON_FOCUS_GREATSWORD, oPC))
+ eCourtblade = EffectBonusFeat(FEAT_WEAPON_FOCUS_ELVEN_COURTBLADE);
+ bHasEffect = TRUE;
+
+ //:: Epic Weapon Focus
+ if(GetHasFeat(FEAT_EPIC_WEAPON_FOCUS_GREATSWORD, oPC))
+ {
+ eCourtblade = EffectLinkEffects(eCourtblade, EffectBonusFeat(FEAT_EPIC_WEAPON_FOCUS_ELVEN_COURTBLADE));
+ }
+ //:: Weapon Specialization
+ if(GetHasFeat(FEAT_WEAPON_SPECIALIZATION_GREAT_SWORD, oPC))
{
- effect eEpicWF = EffectBonusFeat(FEAT_EPIC_WEAPON_FOCUS_ELVEN_COURTBLADE);
- TagEffect(eEpicWF, "EFF_CB_EPICWF");
- ApplyEffectToObject(DURATION_TYPE_PERMANENT, eEpicWF, oPC);
- }
+ eCourtblade = EffectLinkEffects(eCourtblade, EffectBonusFeat(FEAT_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE));
- // Weapon Specialization: Elven Courtblade
- if (GetHasFeat(FEAT_WEAPON_SPECIALIZATION_GREAT_SWORD, oPC))
- {
- effect eWS = EffectBonusFeat(FEAT_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE);
- TagEffect(eWS, "EFF_CB_WS");
- ApplyEffectToObject(DURATION_TYPE_PERMANENT, eWS, oPC);
-
- // Epic Weapon Specialization: Elven Courtblade
- if (GetHasFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_GREATSWORD, oPC))
- {
- effect eEpicWS = EffectBonusFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE);
- TagEffect(eEpicWS, "EFF_CB_EPICWS");
- ApplyEffectToObject(DURATION_TYPE_PERMANENT, eEpicWS, oPC);
- }
+ //:: Epic Weapon Specialization
+ if(GetHasFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_GREATSWORD, oPC))
+ {
+ eCourtblade = EffectLinkEffects(eCourtblade, EffectBonusFeat(FEAT_EPIC_WEAPON_SPECIALIZATION_ELVEN_COURTBLADE));
+ }
}
}
-
- // Improved Critical: Elven Courtblade
- if (GetHasFeat(FEAT_IMPROVED_CRITICAL_GREAT_SWORD, oPC))
- {
- effect eICrit = EffectBonusFeat(FEAT_IMPROVED_CRITICAL_ELVEN_COURTBLADE);
- TagEffect(eICrit, "EFF_CB_ICRIT");
- ApplyEffectToObject(DURATION_TYPE_PERMANENT, eICrit, oPC);
- }
+ //:: Improved Critical
+ if(GetHasFeat(FEAT_IMPROVED_CRITICAL_GREAT_SWORD, oPC))
+ {
+ eCourtblade = EffectLinkEffects(eCourtblade, EffectBonusFeat(FEAT_IMPROVED_CRITICAL_ELVEN_COURTBLADE));
+ bHasEffect = TRUE;
+ }
+
+ if (bHasEffect)
+ {
+ eCourtblade = TagEffect(eCourtblade, "COURTBLADE_FEAT_EMULATATION");
+ eCourtblade = SupernaturalEffect(eCourtblade);
+ ApplyEffectToObject(DURATION_TYPE_PERMANENT, eCourtblade, oPC);
+ }
}
/* void DoEquipCourtblade(object oPC, object oItem, int nHand)
@@ -570,6 +658,7 @@ void DoEquipCourtblade(object oPC, object oItem, int nHand)
} */
//clears any bonuses used to simulate feat chains on unequip
+//:: None of this should be needed now -Jaysyn
void DoWeaponFeatUnequip(object oPC, object oItem, int nHand)
{
// fluffyamoeba - going to assume redundant local var clearing isn't worth tradeoff
@@ -954,15 +1043,13 @@ void DoWeaponEquip(object oPC, object oItem, int nHand)
}
- //Handle feat bonuses for Lightblade, thinblade, and courtblade
- //using else if so they don't overlap.
- /*if(nBaseType == BASE_ITEM_ELVEN_LIGHTBLADE)
- DoEquipLightblade(oPC, oItem, nHand);
+ //:: Handle feat emulation Elven Blades
+ if(nBaseType == BASE_ITEM_ELVEN_LIGHTBLADE)
+ DoEquipLightblade(oPC, oItem);
else if(nBaseType == BASE_ITEM_ELVEN_THINBLADE)
- DoEquipThinblade(oPC, oItem, nHand);
+ DoEquipThinblade(oPC, oItem);
else if(nBaseType == BASE_ITEM_ELVEN_COURTBLADE)
- DoEquipCourtblade(oPC, oItem, nHand);*/
- // Beamdog allowing us to do feats means we don't need this any more
+ DoEquipCourtblade(oPC, oItem);
DoRacialEquip(oPC, nBaseType);
}
diff --git a/nwn/nwnprc/trunk/scripts/prc_unequip.nss b/nwn/nwnprc/trunk/scripts/prc_unequip.nss
index edab59a2..782b4292 100644
--- a/nwn/nwnprc/trunk/scripts/prc_unequip.nss
+++ b/nwn/nwnprc/trunk/scripts/prc_unequip.nss
@@ -144,7 +144,20 @@ void DoWeaponUnequip(object oPC, object oItem)
int nSize = nRealSize; //size for equipment restrictions
int nWeaponSize = GetWeaponSize(oItem);
- //Powerful Build bonus
+ //:: Handle Elven blade feat emulation.
+ effect eEffect = GetFirstEffect(oPC);
+ while(GetIsEffectValid(eEffect))
+ {
+ if(GetEffectTag(eEffect) == "LIGHTBLADE_FEAT_EMULATATION")
+ RemoveEffect(oPC, eEffect);
+ if(GetEffectTag(eEffect) == "THINBLADE_FEAT_EMULATATION")
+ RemoveEffect(oPC, eEffect);
+ if(GetEffectTag(eEffect) == "COURTBLADE_FEAT_EMULATATION")
+ RemoveEffect(oPC, eEffect);
+ eEffect = GetNextEffect(oPC);
+ }
+
+ //Powerful Build bonus
if(GetHasFeat(FEAT_RACE_POWERFUL_BUILD, oPC))
nSize++;
//Monkey Grip
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk
index 2023f914..88dad203 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk differ
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
index d12af052..8e3ffc53 100644
--- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
+++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
@@ -74601,7 +74601,7 @@ Armor Skin, Automatic Quicken Spell, Automatic Silent Spell, Automatic Still Spe
Hit Die: d8
Skill Points at Each Additional Level: 2 + Int Modifier
-Bonus Feats: The epic Pyrokineticist gains a bonus feat every other level.
+Bonus Feats: The epic Pyrokineticist gains a bonus feat every three levels.
Epic Pyrokineticist Bonus Feat List:
Armor Skin, Blinding Speed, Epic Damage Reduction, Epic Energy Resistance, Epic Fortitude, Epic Prowess, Epic Reflexes, Epic Reputation, Epic Toughness, Epic Weapon Focus, Epic Will, Fast Healing, Great Charisma, Epic Psionic Feats, Superior Initiative.
@@ -74617,7 +74617,7 @@ Sneak Attack: the epic Shadowmind's sneak attack continues to gain +1d6 damage e
Manifesting: At each class level the epic Shadowmind continues to increase in manifester level (and powers known, if applicable).
Epic Shadowmind Bonus Feat List:
-Armor Skin, Blinding Speed, Epic Dodge, Epic Prowess, Epic Reputation, Epic Skill Focus, Epic Trapfinding, Epic Weapon Focus, Great Charisma, Great Dexterity, Great Intelligence, Great Wisdom, Improved Sneak Attack, Lingering Damage, Psionic Feats, Self-Concealment, Superior Initiative.
+Armor Skin, Blinding Speed, Epic Dodge, Epic Energy Resistance, Epic Prowess, Epic Reputation, Epic Skill Focus, Great Charisma, Great Dexterity, Great Intelligence, Great Wisdom, Improved Sneak Attack, Lingering Damage, Epic Psionic Feats, Self-Concealment, Superior Initiative.
Epic Psychic Thurge
To the epic Psychic Theurge, the boundary between faith and thought is a veil easily pierced. Wielding divine miracles and mental might in seamless harmony, they are living conduits of transcendent purpose. Their prayers echo with psionic force, and their psionic power is guided by divine insight. These rare visionaries stand at the nexus of will and wonder, forging a path where no spell nor power is beyond reach.
diff --git a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk
index 2023f914..88dad203 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk differ