diff --git a/Release/PRC8_20240914.7z b/Release/PRC8_20240914.7z new file mode 100644 index 00000000..b2d496e4 Binary files /dev/null and b/Release/PRC8_20240914.7z differ diff --git a/Release/PRC8_20240909.7z b/_backup/PRC8_20240909.7z similarity index 100% rename from Release/PRC8_20240909.7z rename to _backup/PRC8_20240909.7z diff --git a/nwn/nwnprc/trunk/2das/cls_feat_tempst.2da b/nwn/nwnprc/trunk/2das/cls_feat_tempst.2da index 8f97e1ab..0ffbf30b 100644 --- a/nwn/nwnprc/trunk/2das/cls_feat_tempst.2da +++ b/nwn/nwnprc/trunk/2das/cls_feat_tempst.2da @@ -1,193 +1,193 @@ 2DA V2.0 - FeatLabel FeatIndex List GrantedOnLevel OnMenu -0 Imp_Two_Weap 20 3 1 0 -1 GREATER_TWO_WEAPON_FIGHTING 4315 3 5 0 -2 SUPREME_TWO_WEAPON_FIGHTING 4316 3 10 0 -3 FEAT_TWO_WEAPON_DEFENSE_1 4317 3 2 0 -4 FEAT_TWO_WEAPON_DEFENSE_2 4318 3 4 0 -5 FEAT_TWO_WEAPON_DEFENSE_3 4319 3 7 0 -6 Absolute_Ambidex 4321 3 8 0 -7 FEAT_EPIC_TEMPEST 5470 3 11 0 -8 FEAT_EPIC_DEVASTATING_CRITICAL_CLUB 495 1 -1 0 -9 FEAT_EPIC_DEVASTATING_CRITICAL_DAGGER 496 1 -1 0 -10 FEAT_EPIC_DEVASTATING_CRITICAL_DART 497 1 -1 0 -11 FEAT_EPIC_DEVASTATING_CRITICAL_HEAVYCROSSBOW 498 1 -1 0 -12 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTCROSSBOW 499 1 -1 0 -13 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTMACE 500 1 -1 0 -14 FEAT_EPIC_DEVASTATING_CRITICAL_MORNINGSTAR 501 1 -1 0 -15 FEAT_EPIC_DEVASTATING_CRITICAL_QUARTERSTAFF 502 1 -1 0 -16 FEAT_EPIC_DEVASTATING_CRITICAL_SHORTSPEAR 503 1 -1 0 -17 FEAT_EPIC_DEVASTATING_CRITICAL_SICKLE 504 1 -1 0 -18 FEAT_EPIC_DEVASTATING_CRITICAL_SLING 505 1 -1 0 -19 FEAT_EPIC_DEVASTATING_CRITICAL_UNARMED 506 1 -1 0 -20 FEAT_EPIC_DEVASTATING_CRITICAL_LONGBOW 507 1 -1 0 -21 FEAT_EPIC_DEVASTATING_CRITICAL_SHORTBOW 508 1 -1 0 -22 FEAT_EPIC_DEVASTATING_CRITICAL_SHORTSWORD 509 1 -1 0 -23 FEAT_EPIC_DEVASTATING_CRITICAL_RAPIER 510 1 -1 0 -24 FEAT_EPIC_DEVASTATING_CRITICAL_SCIMITAR 511 1 -1 0 -25 FEAT_EPIC_DEVASTATING_CRITICAL_LONGSWORD 512 1 -1 0 -26 FEAT_EPIC_DEVASTATING_CRITICAL_GREATSWORD 513 1 -1 0 -27 FEAT_EPIC_DEVASTATING_CRITICAL_HANDAXE 514 1 -1 0 -28 FEAT_EPIC_DEVASTATING_CRITICAL_THROWINGAXE 515 1 -1 0 -29 FEAT_EPIC_DEVASTATING_CRITICAL_BATTLEAXE 516 1 -1 0 -30 FEAT_EPIC_DEVASTATING_CRITICAL_GREATAXE 517 1 -1 0 -31 FEAT_EPIC_DEVASTATING_CRITICAL_HALBERD 518 1 -1 0 -32 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTHAMMER 519 1 -1 0 -33 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTFLAIL 520 1 -1 0 -34 FEAT_EPIC_DEVASTATING_CRITICAL_WARHAMMER 521 1 -1 0 -35 FEAT_EPIC_DEVASTATING_CRITICAL_HEAVYFLAIL 522 1 -1 0 -36 FEAT_EPIC_DEVASTATING_CRITICAL_KAMA 523 1 -1 0 -37 FEAT_EPIC_DEVASTATING_CRITICAL_KUKRI 524 1 -1 0 -38 FEAT_EPIC_DEVASTATING_CRITICAL_SHURIKEN 525 1 -1 0 -39 FEAT_EPIC_DEVASTATING_CRITICAL_SCYTHE 526 1 -1 0 -40 FEAT_EPIC_DEVASTATING_CRITICAL_KATANA 527 1 -1 0 -41 FEAT_EPIC_DEVASTATING_CRITICAL_BASTARDSWORD 528 1 -1 0 -42 FEAT_EPIC_DEVASTATING_CRITICAL_DIREMACE 529 1 -1 0 -43 FEAT_EPIC_DEVASTATING_CRITICAL_DOUBLEAXE 530 1 -1 0 -44 FEAT_EPIC_DEVASTATING_CRITICAL_TWOBLADEDSWORD 531 1 -1 0 -45 DEVASTATING_CRITICAL_LIGHT_LANCE 24673 1 -1 0 -46 DEVASTATING_CRITICAL_HEAVY_PICK 24674 1 -1 0 -47 DEVASTATING_CRITICAL_LIGHT_PICK 24675 1 -1 0 -48 DEVASTATING_CRITICAL_SAI 24676 1 -1 0 -49 DEVASTATING_CRITICAL_NUNCHAKU 24677 1 -1 0 -50 DEVASTATING_CRITICAL_FALCHION 24678 1 -1 0 -51 DEVASTATING_CRITICAL_SAP 24679 1 -1 0 -52 DEVASTATING_CRITICAL_KATAR 24680 1 -1 0 -53 DEVASTATING_CRITICAL_HEAVY_MACE 24681 1 -1 0 -54 DEVASTATING_CRITICAL_MAUL 24682 1 -1 0 -55 DEVASTATING_CRITICAL_DBL_SCIMITAR 24683 1 -1 0 -56 DEVASTATING_CRITICAL_GOAD 24684 1 -1 0 -57 DEVASTATING_CRITICAL_ELVEN_LIGHTBLADE 24703 1 -1 0 -58 DEVASTATING_CRITICAL_ELVEN_THINBLADE 24711 1 -1 0 -59 DEVASTATING_CRITICAL_ELVEN_COURTBLADE 24719 1 -1 0 -60 FEAT_EPIC_PROWESS 584 1 -1 0 -61 FEAT_EPIC_WEAPON_FOCUS_CLUB 619 1 -1 0 -62 FEAT_EPIC_WEAPON_FOCUS_DAGGER 620 1 -1 0 -63 FEAT_EPIC_WEAPON_FOCUS_DART 621 1 -1 0 -64 FEAT_EPIC_WEAPON_FOCUS_HEAVYCROSSBOW 622 1 -1 0 -65 FEAT_EPIC_WEAPON_FOCUS_LIGHTCROSSBOW 623 1 -1 0 -66 FEAT_EPIC_WEAPON_FOCUS_LIGHTMACE 624 1 -1 0 -67 FEAT_EPIC_WEAPON_FOCUS_MORNINGSTAR 625 1 -1 0 -68 FEAT_EPIC_WEAPON_FOCUS_QUARTERSTAFF 626 1 -1 0 -69 FEAT_EPIC_WEAPON_FOCUS_SHORTSPEAR 627 1 -1 0 -70 FEAT_EPIC_WEAPON_FOCUS_SICKLE 628 1 -1 0 -71 FEAT_EPIC_WEAPON_FOCUS_SLING 629 1 -1 0 -72 FEAT_EPIC_WEAPON_FOCUS_UNARMED 630 1 -1 0 -73 FEAT_EPIC_WEAPON_FOCUS_LONGBOW 631 1 -1 0 -74 FEAT_EPIC_WEAPON_FOCUS_SHORTBOW 632 1 -1 0 -75 FEAT_EPIC_WEAPON_FOCUS_SHORTSWORD 633 1 -1 0 -76 FEAT_EPIC_WEAPON_FOCUS_RAPIER 634 1 -1 0 -77 FEAT_EPIC_WEAPON_FOCUS_SCIMITAR 635 1 -1 0 -78 FEAT_EPIC_WEAPON_FOCUS_LONGSWORD 636 1 -1 0 -79 FEAT_EPIC_WEAPON_FOCUS_GREATSWORD 637 1 -1 0 -80 FEAT_EPIC_WEAPON_FOCUS_HANDAXE 638 1 -1 0 -81 FEAT_EPIC_WEAPON_FOCUS_THROWINGAXE 639 1 -1 0 -82 FEAT_EPIC_WEAPON_FOCUS_BATTLEAXE 640 1 -1 0 -83 FEAT_EPIC_WEAPON_FOCUS_GREATAXE 641 1 -1 0 -84 FEAT_EPIC_WEAPON_FOCUS_HALBERD 642 1 -1 0 -85 FEAT_EPIC_WEAPON_FOCUS_LIGHTHAMMER 643 1 -1 0 -86 FEAT_EPIC_WEAPON_FOCUS_LIGHTFLAIL 644 1 -1 0 -87 FEAT_EPIC_WEAPON_FOCUS_WARHAMMER 645 1 -1 0 -88 FEAT_EPIC_WEAPON_FOCUS_HEAVYFLAIL 646 1 -1 0 -89 FEAT_EPIC_WEAPON_FOCUS_KAMA 647 1 -1 0 -90 FEAT_EPIC_WEAPON_FOCUS_KUKRI 648 1 -1 0 -91 FEAT_EPIC_WEAPON_FOCUS_SHURIKEN 649 1 -1 0 -92 FEAT_EPIC_WEAPON_FOCUS_SCYTHE 650 1 -1 0 -93 FEAT_EPIC_WEAPON_FOCUS_KATANA 651 1 -1 0 -94 FEAT_EPIC_WEAPON_FOCUS_BASTARDSWORD 652 1 -1 0 -95 FEAT_EPIC_WEAPON_FOCUS_DIREMACE 653 1 -1 0 -96 FEAT_EPIC_WEAPON_FOCUS_DOUBLEAXE 654 1 -1 0 -97 FEAT_EPIC_WEAPON_FOCUS_TWOBLADEDSWORD 655 1 -1 0 -98 EPIC_WEAPON_FOCUS_LANCE 24637 1 -1 0 -99 EPIC_WEAPON_FOCUS_HEAVY_PICK 24638 1 -1 0 -100 EPIC_WEAPON_FOCUS_LIGHT_PICK 24639 1 -1 0 -101 EPIC_WEAPON_FOCUS_SAI 24640 1 -1 0 -102 EPIC_WEAPON_FOCUS_NUNCHAKU 24641 1 -1 0 -103 EPIC_WEAPON_FOCUS_FALCHION 24642 1 -1 0 -104 EPIC_WEAPON_FOCUS_SAP 24643 1 -1 0 -105 EPIC_WEAPON_FOCUS_KATAR 24644 1 -1 0 -106 EPIC_WEAPON_FOCUS_HEAVY_MACE 24645 1 -1 0 -107 EPIC_WEAPON_FOCUS_MAUL 24646 1 -1 0 -108 EPIC_WEAPON_FOCUS_DBL_SCIMITAR 24647 1 -1 0 -109 EPIC_WEAPON_FOCUS_GOAD 24648 1 -1 0 -110 EPIC_WEAPON_FOCUS_ELVEN_LIGHTBLADE 24698 1 -1 0 -111 EPIC_WEAPON_FOCUS_ELVEN_THINBLADE 24706 1 -1 0 -112 EPIC_WEAPON_FOCUS_ELVEN_COURTBLADE 24714 1 -1 0 -113 FEAT_EPIC_OVERWHELMING_CRITICAL_CLUB 709 1 -1 0 -114 FEAT_EPIC_OVERWHELMING_CRITICAL_DAGGER 710 1 -1 0 -115 FEAT_EPIC_OVERWHELMING_CRITICAL_DART 711 1 -1 0 -116 FEAT_EPIC_OVERWHELMING_CRITICAL_HEAVYCROSSBOW 712 1 -1 0 -117 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTCROSSBOW 713 1 -1 0 -118 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTMACE 714 1 -1 0 -119 FEAT_EPIC_OVERWHELMING_CRITICAL_MORNINGSTAR 715 1 -1 0 -120 FEAT_EPIC_OVERWHELMING_CRITICAL_QUARTERSTAFF 716 1 -1 0 -121 FEAT_EPIC_OVERWHELMING_CRITICAL_SHORTSPEAR 717 1 -1 0 -122 FEAT_EPIC_OVERWHELMING_CRITICAL_SICKLE 718 1 -1 0 -123 FEAT_EPIC_OVERWHELMING_CRITICAL_SLING 719 1 -1 0 -124 FEAT_EPIC_OVERWHELMING_CRITICAL_UNARMED 720 1 -1 0 -125 FEAT_EPIC_OVERWHELMING_CRITICAL_LONGBOW 721 1 -1 0 -126 FEAT_EPIC_OVERWHELMING_CRITICAL_SHORTBOW 722 1 -1 0 -127 FEAT_EPIC_OVERWHELMING_CRITICAL_SHORTSWORD 723 1 -1 0 -128 FEAT_EPIC_OVERWHELMING_CRITICAL_RAPIER 724 1 -1 0 -129 FEAT_EPIC_OVERWHELMING_CRITICAL_SCIMITAR 725 1 -1 0 -130 FEAT_EPIC_OVERWHELMING_CRITICAL_LONGSWORD 726 1 -1 0 -131 FEAT_EPIC_OVERWHELMING_CRITICAL_GREATSWORD 727 1 -1 0 -132 FEAT_EPIC_OVERWHELMING_CRITICAL_HANDAXE 728 1 -1 0 -133 FEAT_EPIC_OVERWHELMING_CRITICAL_THROWINGAXE 729 1 -1 0 -134 FEAT_EPIC_OVERWHELMING_CRITICAL_BATTLEAXE 730 1 -1 0 -135 FEAT_EPIC_OVERWHELMING_CRITICAL_GREATAXE 731 1 -1 0 -136 FEAT_EPIC_OVERWHELMING_CRITICAL_HALBERD 732 1 -1 0 -137 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTHAMMER 733 1 -1 0 -138 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTFLAIL 734 1 -1 0 -139 FEAT_EPIC_OVERWHELMING_CRITICAL_WARHAMMER 735 1 -1 0 -140 FEAT_EPIC_OVERWHELMING_CRITICAL_HEAVYFLAIL 736 1 -1 0 -141 FEAT_EPIC_OVERWHELMING_CRITICAL_KAMA 737 1 -1 0 -142 FEAT_EPIC_OVERWHELMING_CRITICAL_KUKRI 738 1 -1 0 -143 FEAT_EPIC_OVERWHELMING_CRITICAL_SHURIKEN 739 1 -1 0 -144 FEAT_EPIC_OVERWHELMING_CRITICAL_SCYTHE 740 1 -1 0 -145 FEAT_EPIC_OVERWHELMING_CRITICAL_KATANA 741 1 -1 0 -146 FEAT_EPIC_OVERWHELMING_CRITICAL_BASTARDSWORD 742 1 -1 0 -147 FEAT_EPIC_OVERWHELMING_CRITICAL_DIREMACE 743 1 -1 0 -148 FEAT_EPIC_OVERWHELMING_CRITICAL_DOUBLEAXE 744 1 -1 0 -149 FEAT_EPIC_OVERWHELMING_CRITICAL_TWOBLADEDSWORD 745 1 -1 0 -150 OVERWHELMING_CRITICAL_LIGHT_LANCE 24661 1 -1 0 -151 OVERWHELMING_CRITICAL_HEAVY_PICK 24662 1 -1 0 -152 OVERWHELMING_CRITICAL_LIGHT_PICK 24663 1 -1 0 -153 OVERWHELMING_CRITICAL_SAI 24664 1 -1 0 -154 OVERWHELMING_CRITICAL_NUNCHAKU 24665 1 -1 0 -155 OVERWHELMING_CRITICAL_FALCHION 24666 1 -1 0 -156 OVERWHELMING_CRITICAL_SAP 24667 1 -1 0 -157 OVERWHELMING_CRITICAL_KATAR 24668 1 -1 0 -158 OVERWHELMING_CRITICAL_HEAVY_MACE 24669 1 -1 0 -159 OVERWHELMING_CRITICAL_MAUL 24670 1 -1 0 -160 OVERWHELMING_CRITICAL_DBL_SCIMITAR 24671 1 -1 0 -161 OVERWHELMING_CRITICAL_GOAD 24672 1 -1 0 -162 OVERWHELMING_CRITICAL_ELVEN_LIGHTBLADE 24702 1 -1 0 -163 OVERWHELMING_CRITICAL_ELVEN_THINBLADE 24710 1 -1 0 -164 OVERWHELMING_CRITICAL_ELVEN_COURTBLADE 24718 1 -1 0 -165 FEAT_EPIC_TOUGHNESS_1 754 1 -1 0 -166 FEAT_EPIC_TOUGHNESS_2 755 1 -1 0 -167 FEAT_EPIC_TOUGHNESS_3 756 1 -1 0 -168 FEAT_EPIC_TOUGHNESS_4 757 1 -1 0 -169 FEAT_EPIC_TOUGHNESS_5 758 1 -1 0 -170 FEAT_EPIC_TOUGHNESS_6 759 1 -1 0 -171 FEAT_EPIC_TOUGHNESS_7 760 1 -1 0 -172 FEAT_EPIC_TOUGHNESS_8 761 1 -1 0 -173 FEAT_EPIC_TOUGHNESS_9 762 1 -1 0 -174 FEAT_EPIC_TOUGHNESS_10 763 1 -1 0 -175 FEAT_EPIC_DEVASTATING_CRITICAL_DWAXE 955 1 -1 0 -176 FEAT_EPIC_WEAPON_FOCUS_DWAXE 956 1 -1 0 -177 FEAT_EPIC_WEAPON_SPECIALIZATION_DWAXE 957 1 -1 0 -178 FEAT_EPIC_OVERWHELMING_CRITICAL_DWAXE 958 1 -1 0 -179 FEAT_EPIC_WEAPON_FOCUS_WHIP 997 1 -1 0 -180 FEAT_EPIC_DEVASTATING_CRITICAL_TRIDENT 1075 1 -1 0 -181 FEAT_EPIC_WEAPON_FOCUS_TRIDENT 1076 1 -1 0 -182 FEAT_EPIC_OVERWHELMING_CRITICAL_TRIDENT 1078 1 -1 0 -183 FEAT_EPIC_SUPERIOR_INITIATIVE 753 1 -1 0 -184 FEAT_EPIC_BLINDING_SPEED 491 1 -1 1 -185 PERFECT_TWO_WEAPON_FIGHTING 4320 1 11 0 -186 DefArrow 8 0 -1 0 -187 TwoWeap 41 0 -1 0 -188 Ambidex 1 0 -1 0 -189 Two-Weapon_Rend 3113 1 -1 0 + FeatLabel FeatIndex List GrantedOnLevel OnMenu +0 Imp_Two_Weap 20 3 1 0 +1 GREATER_TWO_WEAPON_FIGHTING 4315 3 5 0 +2 SUPREME_TWO_WEAPON_FIGHTING 4316 3 10 0 +3 FEAT_TWO_WEAPON_DEFENSE_1 4317 3 2 0 +4 FEAT_TWO_WEAPON_DEFENSE_2 4318 3 4 0 +5 FEAT_TWO_WEAPON_DEFENSE_3 4319 3 7 0 +6 Absolute_Ambidex 4321 3 8 0 +7 FEAT_EPIC_TEMPEST 5470 3 11 0 +8 FEAT_EPIC_DEVASTATING_CRITICAL_CLUB 495 1 -1 0 +9 FEAT_EPIC_DEVASTATING_CRITICAL_DAGGER 496 1 -1 0 +10 FEAT_EPIC_DEVASTATING_CRITICAL_DART 497 1 -1 0 +11 FEAT_EPIC_DEVASTATING_CRITICAL_HEAVYCROSSBOW 498 1 -1 0 +12 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTCROSSBOW 499 1 -1 0 +13 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTMACE 500 1 -1 0 +14 FEAT_EPIC_DEVASTATING_CRITICAL_MORNINGSTAR 501 1 -1 0 +15 FEAT_EPIC_DEVASTATING_CRITICAL_QUARTERSTAFF 502 1 -1 0 +16 FEAT_EPIC_DEVASTATING_CRITICAL_SHORTSPEAR 503 1 -1 0 +17 FEAT_EPIC_DEVASTATING_CRITICAL_SICKLE 504 1 -1 0 +18 FEAT_EPIC_DEVASTATING_CRITICAL_SLING 505 1 -1 0 +19 FEAT_EPIC_DEVASTATING_CRITICAL_UNARMED 506 1 -1 0 +20 FEAT_EPIC_DEVASTATING_CRITICAL_LONGBOW 507 1 -1 0 +21 FEAT_EPIC_DEVASTATING_CRITICAL_SHORTBOW 508 1 -1 0 +22 FEAT_EPIC_DEVASTATING_CRITICAL_SHORTSWORD 509 1 -1 0 +23 FEAT_EPIC_DEVASTATING_CRITICAL_RAPIER 510 1 -1 0 +24 FEAT_EPIC_DEVASTATING_CRITICAL_SCIMITAR 511 1 -1 0 +25 FEAT_EPIC_DEVASTATING_CRITICAL_LONGSWORD 512 1 -1 0 +26 FEAT_EPIC_DEVASTATING_CRITICAL_GREATSWORD 513 1 -1 0 +27 FEAT_EPIC_DEVASTATING_CRITICAL_HANDAXE 514 1 -1 0 +28 FEAT_EPIC_DEVASTATING_CRITICAL_THROWINGAXE 515 1 -1 0 +29 FEAT_EPIC_DEVASTATING_CRITICAL_BATTLEAXE 516 1 -1 0 +30 FEAT_EPIC_DEVASTATING_CRITICAL_GREATAXE 517 1 -1 0 +31 FEAT_EPIC_DEVASTATING_CRITICAL_HALBERD 518 1 -1 0 +32 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTHAMMER 519 1 -1 0 +33 FEAT_EPIC_DEVASTATING_CRITICAL_LIGHTFLAIL 520 1 -1 0 +34 FEAT_EPIC_DEVASTATING_CRITICAL_WARHAMMER 521 1 -1 0 +35 FEAT_EPIC_DEVASTATING_CRITICAL_HEAVYFLAIL 522 1 -1 0 +36 FEAT_EPIC_DEVASTATING_CRITICAL_KAMA 523 1 -1 0 +37 FEAT_EPIC_DEVASTATING_CRITICAL_KUKRI 524 1 -1 0 +38 FEAT_EPIC_DEVASTATING_CRITICAL_SHURIKEN 525 1 -1 0 +39 FEAT_EPIC_DEVASTATING_CRITICAL_SCYTHE 526 1 -1 0 +40 FEAT_EPIC_DEVASTATING_CRITICAL_KATANA 527 1 -1 0 +41 FEAT_EPIC_DEVASTATING_CRITICAL_BASTARDSWORD 528 1 -1 0 +42 FEAT_EPIC_DEVASTATING_CRITICAL_DIREMACE 529 1 -1 0 +43 FEAT_EPIC_DEVASTATING_CRITICAL_DOUBLEAXE 530 1 -1 0 +44 FEAT_EPIC_DEVASTATING_CRITICAL_TWOBLADEDSWORD 531 1 -1 0 +45 DEVASTATING_CRITICAL_LIGHT_LANCE 24673 1 -1 0 +46 DEVASTATING_CRITICAL_HEAVY_PICK 24674 1 -1 0 +47 DEVASTATING_CRITICAL_LIGHT_PICK 24675 1 -1 0 +48 DEVASTATING_CRITICAL_SAI 24676 1 -1 0 +49 DEVASTATING_CRITICAL_NUNCHAKU 24677 1 -1 0 +50 DEVASTATING_CRITICAL_FALCHION 24678 1 -1 0 +51 DEVASTATING_CRITICAL_SAP 24679 1 -1 0 +52 DEVASTATING_CRITICAL_KATAR 24680 1 -1 0 +53 DEVASTATING_CRITICAL_HEAVY_MACE 24681 1 -1 0 +54 DEVASTATING_CRITICAL_MAUL 24682 1 -1 0 +55 DEVASTATING_CRITICAL_DBL_SCIMITAR 24683 1 -1 0 +56 DEVASTATING_CRITICAL_GOAD 24684 1 -1 0 +57 DEVASTATING_CRITICAL_ELVEN_LIGHTBLADE 24703 1 -1 0 +58 DEVASTATING_CRITICAL_ELVEN_THINBLADE 24711 1 -1 0 +59 DEVASTATING_CRITICAL_ELVEN_COURTBLADE 24719 1 -1 0 +60 FEAT_EPIC_PROWESS 584 1 -1 0 +61 FEAT_EPIC_WEAPON_FOCUS_CLUB 619 1 -1 0 +62 FEAT_EPIC_WEAPON_FOCUS_DAGGER 620 1 -1 0 +63 FEAT_EPIC_WEAPON_FOCUS_DART 621 1 -1 0 +64 FEAT_EPIC_WEAPON_FOCUS_HEAVYCROSSBOW 622 1 -1 0 +65 FEAT_EPIC_WEAPON_FOCUS_LIGHTCROSSBOW 623 1 -1 0 +66 FEAT_EPIC_WEAPON_FOCUS_LIGHTMACE 624 1 -1 0 +67 FEAT_EPIC_WEAPON_FOCUS_MORNINGSTAR 625 1 -1 0 +68 FEAT_EPIC_WEAPON_FOCUS_QUARTERSTAFF 626 1 -1 0 +69 FEAT_EPIC_WEAPON_FOCUS_SHORTSPEAR 627 1 -1 0 +70 FEAT_EPIC_WEAPON_FOCUS_SICKLE 628 1 -1 0 +71 FEAT_EPIC_WEAPON_FOCUS_SLING 629 1 -1 0 +72 FEAT_EPIC_WEAPON_FOCUS_UNARMED 630 1 -1 0 +73 FEAT_EPIC_WEAPON_FOCUS_LONGBOW 631 1 -1 0 +74 FEAT_EPIC_WEAPON_FOCUS_SHORTBOW 632 1 -1 0 +75 FEAT_EPIC_WEAPON_FOCUS_SHORTSWORD 633 1 -1 0 +76 FEAT_EPIC_WEAPON_FOCUS_RAPIER 634 1 -1 0 +77 FEAT_EPIC_WEAPON_FOCUS_SCIMITAR 635 1 -1 0 +78 FEAT_EPIC_WEAPON_FOCUS_LONGSWORD 636 1 -1 0 +79 FEAT_EPIC_WEAPON_FOCUS_GREATSWORD 637 1 -1 0 +80 FEAT_EPIC_WEAPON_FOCUS_HANDAXE 638 1 -1 0 +81 FEAT_EPIC_WEAPON_FOCUS_THROWINGAXE 639 1 -1 0 +82 FEAT_EPIC_WEAPON_FOCUS_BATTLEAXE 640 1 -1 0 +83 FEAT_EPIC_WEAPON_FOCUS_GREATAXE 641 1 -1 0 +84 FEAT_EPIC_WEAPON_FOCUS_HALBERD 642 1 -1 0 +85 FEAT_EPIC_WEAPON_FOCUS_LIGHTHAMMER 643 1 -1 0 +86 FEAT_EPIC_WEAPON_FOCUS_LIGHTFLAIL 644 1 -1 0 +87 FEAT_EPIC_WEAPON_FOCUS_WARHAMMER 645 1 -1 0 +88 FEAT_EPIC_WEAPON_FOCUS_HEAVYFLAIL 646 1 -1 0 +89 FEAT_EPIC_WEAPON_FOCUS_KAMA 647 1 -1 0 +90 FEAT_EPIC_WEAPON_FOCUS_KUKRI 648 1 -1 0 +91 FEAT_EPIC_WEAPON_FOCUS_SHURIKEN 649 1 -1 0 +92 FEAT_EPIC_WEAPON_FOCUS_SCYTHE 650 1 -1 0 +93 FEAT_EPIC_WEAPON_FOCUS_KATANA 651 1 -1 0 +94 FEAT_EPIC_WEAPON_FOCUS_BASTARDSWORD 652 1 -1 0 +95 FEAT_EPIC_WEAPON_FOCUS_DIREMACE 653 1 -1 0 +96 FEAT_EPIC_WEAPON_FOCUS_DOUBLEAXE 654 1 -1 0 +97 FEAT_EPIC_WEAPON_FOCUS_TWOBLADEDSWORD 655 1 -1 0 +98 EPIC_WEAPON_FOCUS_LANCE 24637 1 -1 0 +99 EPIC_WEAPON_FOCUS_HEAVY_PICK 24638 1 -1 0 +100 EPIC_WEAPON_FOCUS_LIGHT_PICK 24639 1 -1 0 +101 EPIC_WEAPON_FOCUS_SAI 24640 1 -1 0 +102 EPIC_WEAPON_FOCUS_NUNCHAKU 24641 1 -1 0 +103 EPIC_WEAPON_FOCUS_FALCHION 24642 1 -1 0 +104 EPIC_WEAPON_FOCUS_SAP 24643 1 -1 0 +105 EPIC_WEAPON_FOCUS_KATAR 24644 1 -1 0 +106 EPIC_WEAPON_FOCUS_HEAVY_MACE 24645 1 -1 0 +107 EPIC_WEAPON_FOCUS_MAUL 24646 1 -1 0 +108 EPIC_WEAPON_FOCUS_DBL_SCIMITAR 24647 1 -1 0 +109 EPIC_WEAPON_FOCUS_GOAD 24648 1 -1 0 +110 EPIC_WEAPON_FOCUS_ELVEN_LIGHTBLADE 24698 1 -1 0 +111 EPIC_WEAPON_FOCUS_ELVEN_THINBLADE 24706 1 -1 0 +112 EPIC_WEAPON_FOCUS_ELVEN_COURTBLADE 24714 1 -1 0 +113 FEAT_EPIC_OVERWHELMING_CRITICAL_CLUB 709 1 -1 0 +114 FEAT_EPIC_OVERWHELMING_CRITICAL_DAGGER 710 1 -1 0 +115 FEAT_EPIC_OVERWHELMING_CRITICAL_DART 711 1 -1 0 +116 FEAT_EPIC_OVERWHELMING_CRITICAL_HEAVYCROSSBOW 712 1 -1 0 +117 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTCROSSBOW 713 1 -1 0 +118 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTMACE 714 1 -1 0 +119 FEAT_EPIC_OVERWHELMING_CRITICAL_MORNINGSTAR 715 1 -1 0 +120 FEAT_EPIC_OVERWHELMING_CRITICAL_QUARTERSTAFF 716 1 -1 0 +121 FEAT_EPIC_OVERWHELMING_CRITICAL_SHORTSPEAR 717 1 -1 0 +122 FEAT_EPIC_OVERWHELMING_CRITICAL_SICKLE 718 1 -1 0 +123 FEAT_EPIC_OVERWHELMING_CRITICAL_SLING 719 1 -1 0 +124 FEAT_EPIC_OVERWHELMING_CRITICAL_UNARMED 720 1 -1 0 +125 FEAT_EPIC_OVERWHELMING_CRITICAL_LONGBOW 721 1 -1 0 +126 FEAT_EPIC_OVERWHELMING_CRITICAL_SHORTBOW 722 1 -1 0 +127 FEAT_EPIC_OVERWHELMING_CRITICAL_SHORTSWORD 723 1 -1 0 +128 FEAT_EPIC_OVERWHELMING_CRITICAL_RAPIER 724 1 -1 0 +129 FEAT_EPIC_OVERWHELMING_CRITICAL_SCIMITAR 725 1 -1 0 +130 FEAT_EPIC_OVERWHELMING_CRITICAL_LONGSWORD 726 1 -1 0 +131 FEAT_EPIC_OVERWHELMING_CRITICAL_GREATSWORD 727 1 -1 0 +132 FEAT_EPIC_OVERWHELMING_CRITICAL_HANDAXE 728 1 -1 0 +133 FEAT_EPIC_OVERWHELMING_CRITICAL_THROWINGAXE 729 1 -1 0 +134 FEAT_EPIC_OVERWHELMING_CRITICAL_BATTLEAXE 730 1 -1 0 +135 FEAT_EPIC_OVERWHELMING_CRITICAL_GREATAXE 731 1 -1 0 +136 FEAT_EPIC_OVERWHELMING_CRITICAL_HALBERD 732 1 -1 0 +137 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTHAMMER 733 1 -1 0 +138 FEAT_EPIC_OVERWHELMING_CRITICAL_LIGHTFLAIL 734 1 -1 0 +139 FEAT_EPIC_OVERWHELMING_CRITICAL_WARHAMMER 735 1 -1 0 +140 FEAT_EPIC_OVERWHELMING_CRITICAL_HEAVYFLAIL 736 1 -1 0 +141 FEAT_EPIC_OVERWHELMING_CRITICAL_KAMA 737 1 -1 0 +142 FEAT_EPIC_OVERWHELMING_CRITICAL_KUKRI 738 1 -1 0 +143 FEAT_EPIC_OVERWHELMING_CRITICAL_SHURIKEN 739 1 -1 0 +144 FEAT_EPIC_OVERWHELMING_CRITICAL_SCYTHE 740 1 -1 0 +145 FEAT_EPIC_OVERWHELMING_CRITICAL_KATANA 741 1 -1 0 +146 FEAT_EPIC_OVERWHELMING_CRITICAL_BASTARDSWORD 742 1 -1 0 +147 FEAT_EPIC_OVERWHELMING_CRITICAL_DIREMACE 743 1 -1 0 +148 FEAT_EPIC_OVERWHELMING_CRITICAL_DOUBLEAXE 744 1 -1 0 +149 FEAT_EPIC_OVERWHELMING_CRITICAL_TWOBLADEDSWORD 745 1 -1 0 +150 OVERWHELMING_CRITICAL_LIGHT_LANCE 24661 1 -1 0 +151 OVERWHELMING_CRITICAL_HEAVY_PICK 24662 1 -1 0 +152 OVERWHELMING_CRITICAL_LIGHT_PICK 24663 1 -1 0 +153 OVERWHELMING_CRITICAL_SAI 24664 1 -1 0 +154 OVERWHELMING_CRITICAL_NUNCHAKU 24665 1 -1 0 +155 OVERWHELMING_CRITICAL_FALCHION 24666 1 -1 0 +156 OVERWHELMING_CRITICAL_SAP 24667 1 -1 0 +157 OVERWHELMING_CRITICAL_KATAR 24668 1 -1 0 +158 OVERWHELMING_CRITICAL_HEAVY_MACE 24669 1 -1 0 +159 OVERWHELMING_CRITICAL_MAUL 24670 1 -1 0 +160 OVERWHELMING_CRITICAL_DBL_SCIMITAR 24671 1 -1 0 +161 OVERWHELMING_CRITICAL_GOAD 24672 1 -1 0 +162 OVERWHELMING_CRITICAL_ELVEN_LIGHTBLADE 24702 1 -1 0 +163 OVERWHELMING_CRITICAL_ELVEN_THINBLADE 24710 1 -1 0 +164 OVERWHELMING_CRITICAL_ELVEN_COURTBLADE 24718 1 -1 0 +165 FEAT_EPIC_TOUGHNESS_1 754 1 -1 0 +166 FEAT_EPIC_TOUGHNESS_2 755 1 -1 0 +167 FEAT_EPIC_TOUGHNESS_3 756 1 -1 0 +168 FEAT_EPIC_TOUGHNESS_4 757 1 -1 0 +169 FEAT_EPIC_TOUGHNESS_5 758 1 -1 0 +170 FEAT_EPIC_TOUGHNESS_6 759 1 -1 0 +171 FEAT_EPIC_TOUGHNESS_7 760 1 -1 0 +172 FEAT_EPIC_TOUGHNESS_8 761 1 -1 0 +173 FEAT_EPIC_TOUGHNESS_9 762 1 -1 0 +174 FEAT_EPIC_TOUGHNESS_10 763 1 -1 0 +175 FEAT_EPIC_DEVASTATING_CRITICAL_DWAXE 955 1 -1 0 +176 FEAT_EPIC_WEAPON_FOCUS_DWAXE 956 1 -1 0 +177 FEAT_EPIC_WEAPON_SPECIALIZATION_DWAXE 957 1 -1 0 +178 FEAT_EPIC_OVERWHELMING_CRITICAL_DWAXE 958 1 -1 0 +179 FEAT_EPIC_WEAPON_FOCUS_WHIP 997 1 -1 0 +180 FEAT_EPIC_DEVASTATING_CRITICAL_TRIDENT 1075 1 -1 0 +181 FEAT_EPIC_WEAPON_FOCUS_TRIDENT 1076 1 -1 0 +182 FEAT_EPIC_OVERWHELMING_CRITICAL_TRIDENT 1078 1 -1 0 +183 FEAT_EPIC_SUPERIOR_INITIATIVE 753 1 -1 0 +184 FEAT_EPIC_BLINDING_SPEED 491 1 -1 1 +185 PERFECT_TWO_WEAPON_FIGHTING 4320 1 -1 0 +186 DefArrow 8 0 -1 0 +187 TwoWeap 41 0 -1 0 +188 Ambidex 1 0 -1 0 +189 Two-Weapon_Rend 3113 1 -1 0 diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da index 1cd1bc00..e86b2523 100644 --- a/nwn/nwnprc/trunk/2das/feat.2da +++ b/nwn/nwnprc/trunk/2das/feat.2da @@ -3114,7 +3114,7 @@ 3110 SwordsageRecoverManeuver 16832269 16832270 ife_X2MightRage **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 3690 **** 1 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_ALERTNESS 5 **** **** **** **** **** 0 1 3111 FEAT_FULL_DRAGON_BREATH 16832855 16832856 ife_X2DDBreath **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_FULL_DRAGON_BREATH 5 **** 6 **** **** **** 0 1 3112 FEAT_CLIMB 16847418 16847419 ife_climb **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2749 **** 0 **** **** 0 **** **** **** **** **** **** **** **** **** FEAT_JUMP 4 **** **** **** **** **** 0 1 -3113 Two-Weapon_Rend 16828414 16828415 ife_tw_rend 9 **** 15 **** **** **** **** **** 41 20 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_TWO_WEAPON_REND 6 **** **** **** **** **** 1 1 +3113 Two-Weapon_Rend 16828414 16828415 ife_tw_rend 9 **** 15 **** **** **** **** **** 20 **** 0 0 1 **** **** **** **** 1 **** **** **** 41 374 **** **** **** **** **** **** **** FEAT_TWO_WEAPON_REND 6 **** **** **** **** **** 1 1 3114 FEAT_INVOKE_DIVINE_WRATH 16825348 16825349 ife_X1DivShl **** **** **** **** **** **** **** 9 13 **** 0 0 1 **** **** 2163 **** 1 **** **** 0 301 472 3139 3248 **** 7 26 **** **** FEAT_INVOKE_DIVINE_WRATH 6 1 **** **** **** **** 1 1 3115 FEAT_EPIC_DIVINE_VIGOR 16825346 16825347 ife_turnvigor **** **** **** **** **** **** 19 **** 3116 774 0 0 1 **** **** 2162 **** 1 **** **** 0 **** **** **** **** **** **** **** **** **** FEAT_EPIC_DIVINE_VIGOR 6 **** **** **** **** **** 1 1 3116 FEAT_DIVINE_VIGOR 16825344 16825345 ife_turnvigor **** **** **** **** **** **** 13 **** 13 294 0 0 1 **** **** 2164 3115 1 **** **** 1 **** **** **** **** **** **** **** **** **** FEAT_DIVINE_VIGOR 6 **** **** **** **** **** 0 1 @@ -5372,7 +5372,7 @@ 5368 CultistShatteredPeak_SmiteMage 16789658 16789659 ife_X1ADAbj **** **** **** **** **** **** **** **** **** **** 0 0 **** **** **** 2339 **** 0.5 1 **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 5369 Forsaker_FastHealing 16824830 16847615 ife_divineheal **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 3913 **** 1 1 **** 1 **** **** **** **** **** **** **** **** **** **** 4 **** **** **** **** **** 0 0 5370 AwesomeBlow 16833142 16833143 ife_wepspec_Bax **** 25 **** **** **** **** **** **** 2806 28 0 0 1 **** **** 2340 **** 0.5 -1 **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 -5371 OversizedTWF 16790149 16790150 ife_twoweap **** 13 **** **** **** **** **** **** 41 **** 0 0 1 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 +5371 OversizedTWF 16790149 16790150 ife_twoweap **** 13 **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 0.5 **** **** **** 41 374 **** **** **** **** **** **** **** FEAT_OTWF 6 1 **** **** **** **** 0 1 5372 FrostFolk_IceBlast 16790167 16790168 is_ConeCold **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 3802 **** 1 -1 **** **** **** **** **** **** **** **** **** **** **** **** 4 **** **** **** **** **** 0 1 5373 Uldra_RayFrost 894 6238 is_RayFrost **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 3804 **** 1 3 **** **** **** **** **** **** **** **** **** **** **** **** 4 **** **** **** **** **** 0 1 5374 Uldra_Fatigue 16790169 16790170 is_X1InfMin **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 3805 **** 1 1 **** **** **** **** **** **** **** **** **** **** **** **** 4 **** **** **** **** **** 0 1 diff --git a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss index a0830ea7..6dcee3b2 100644 --- a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss +++ b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss @@ -15,8 +15,6 @@ #include "inc_item_props" #include "prc_x2_itemprop" -//:: void main (){} - /** * All of the following functions use the following parameters: * @@ -673,16 +671,38 @@ void DoWeaponEquip(object oPC, object oItem, int nHand) ForceUnequip(oPC, oItem, nHand); } - //OTWF - if(GetHasFeat(FEAT_OTWF, oPC)) - { - // When wielding a one-handed weapon in your off hand, you take penalties for fighting with two weapons as if you were wielding a light weapon in your off hand - if (nWeaponSize == nRealSize && nHand == ATTACK_BONUS_OFFHAND) - { - SetCompositeAttackBonus(oPC, "OTWFL", 2, ATTACK_BONUS_OFFHAND); - SetCompositeAttackBonus(oPC, "OTWFR", 2, ATTACK_BONUS_ONHAND); - } - } +//:: Oversized TWF +//:: Check if the player is a Ranger, wearing medium/heavy armor, and does not have Two-Weapon Fighting feat + int bIsRestricted = FALSE; + + // Check if the player has levels in the Ranger class + if (GetLevelByClass(CLASS_TYPE_RANGER, oPC) > 0) + { + // Check if the player is wearing medium or heavy armor + int nArmorType = GetArmorType(GetItemInSlot(INVENTORY_SLOT_CHEST, oPC)); + if (nArmorType == ARMOR_TYPE_MEDIUM || nArmorType == ARMOR_TYPE_HEAVY) + { + // Check if the player does not have the Two-Weapon Fighting feat + if (!GetHasFeat(FEAT_TWO_WEAPON_FIGHTING, oPC)) + { + // Set the restricted flag to TRUE if all conditions are met + bIsRestricted = TRUE; + } + } + } + //:: Proceed with OSTWF bonuses if the restrictions are not met + if (!bIsRestricted) + { + if (GetHasFeat(FEAT_OTWF, oPC)) + { + // When wielding a one-handed weapon in your off hand, you take penalties for fighting with two weapons as if you were wielding a light weapon in your off hand + if (nWeaponSize == nRealSize && nHand == ATTACK_BONUS_OFFHAND) + { + SetCompositeAttackBonus(oPC, "OTWFL", 2, ATTACK_BONUS_OFFHAND); + SetCompositeAttackBonus(oPC, "OTWFR", 2, ATTACK_BONUS_ONHAND); + } + } + } //check for proficiency DoProficiencyCheck(oPC, oItem, nHand); @@ -757,4 +777,6 @@ void DoRacialEquip(object oPC, int nBaseType) else SetCompositeAttackBonus(oPC, "PrimitiveWeapon", 0); } -} \ No newline at end of file +} + +//:: void main (){} \ No newline at end of file diff --git a/nwn/nwnprc/trunk/makefile.temp b/nwn/nwnprc/trunk/makefile.temp index e2596f56..41e90d92 100644 --- a/nwn/nwnprc/trunk/makefile.temp +++ b/nwn/nwnprc/trunk/makefile.temp @@ -367,6 +367,7 @@ include\prc_inc_template.nss \ include\prc_inc_turning.nss \ include\prc_inc_unarmed.nss \ include\prc_inc_util.nss \ +include\prc_inc_wpnrest.ncs \ include\prc_inc_wpnrest.nss \ include\prc_ip_srcost.nss \ include\prc_ipfeat_const.nss \ @@ -35229,7 +35230,7 @@ newspellbookobjs\inv_ed_gift.ncs: newspellbook\inv_ed_gift.nss include\prc_inc_s newspellbookobjs\inv_eldrtch_glv.ncs: newspellbook\inv_eldrtch_glv.nss include\prc_inc_combat.nss include\inv_inc_invfunc.nss include\prc_inc_unarmed.nss include\prc_inc_onhit.nss include\prc_misc_const.nss include\prc_inc_fork.nss include\prc_inc_natweap.nss include\inc_utility.nss include\prc_inc_spells.nss include\prc_inc_nwscript.nss include\prc_class_const.nss include\inc_target_list.nss include\inc_logmessage.nss include\inc_threads.nss include\prc_inc_actions.nss include\inc_time.nss include\inc_draw_prc.nss include\inc_eventhook.nss include\inc_metalocation.nss include\inc_array_sort.nss include\inc_uniqueid.nss include\inc_set.nss include\prc_spell_const.nss include\inv_invoc_const.nss include\psi_power_const.nss include\prc_inc_racial.nss include\prc_inc_array.nss include\moi_meld_const.nss include\bnd_vestig_const.nss include\inc_2dacache.nss include\prc_feat_const.nss include\prc_racial_const.nss include\inc_debug.nss include\prc_inc_switch.nss include\inc_persist_loca.nss include\prc_inc_skin.nss include\inc_persistsql.nss include\inc_draw.nss include\inc_draw_tools.nss include\inc_pers_array.nss include\inc_area.nss include\inc_heap.nss include\inc_newspellbook.nss include\inc_vfx_const.nss include\spinc_necro_cyst.nss include\true_utter_const.nss include\prc_inc_sneak.nss include\prcsp_engine.nss include\inc_item_props.nss include\prc_inc_core.nss include\inc_sp_gain_mem.nss include\lookup_2da_spell.nss include\inc_lookups.nss include\prc_inc_damage.nss include\prc_inc_sb_const.nss include\prc_effect_inc.nss include\prc_inc_castlvl.nss include\prc_inc_newip.nss include\prc_inc_descrptr.nss include\prc_x2_itemprop.nss include\prc_ipfeat_const.nss include\inc_prc_npc.nss include\tob_move_const.nss include\prcsp_archmaginc.nss include\prc_add_spl_pen.nss include\prcsp_reputation.nss include\inc_abil_damage.nss include\inv_inc_invknown.nss include\inv_inc_invoke.nss include\inv_inc_blast.nss include\prc_add_spell_dc.nss include\prc_spellf_inc.nss include\prc_inc_sp_tch.nss include\prc_inc_clsfunc.nss -newspellbookobjs\inv_eldtch_blast.ncs: newspellbook\inv_eldtch_blast.nss include\prc_inc_combat.nss include\prc_inc_sp_tch.nss include\inv_inc_invfunc.nss include\inv_invokehook.nss include\inv_inc_blast.nss include\prc_inc_unarmed.nss include\prc_inc_onhit.nss include\prc_misc_const.nss include\prc_inc_fork.nss include\prc_inc_natweap.nss include\inc_utility.nss include\prc_inc_spells.nss include\prc_inc_nwscript.nss include\prc_class_const.nss include\inc_target_list.nss include\inc_logmessage.nss include\inc_threads.nss include\prc_inc_actions.nss include\inc_time.nss include\inc_draw_prc.nss include\inc_eventhook.nss include\inc_metalocation.nss include\inc_array_sort.nss include\inc_uniqueid.nss include\inc_set.nss include\prc_spell_const.nss include\inv_invoc_const.nss include\psi_power_const.nss include\prc_inc_racial.nss include\prc_inc_array.nss include\moi_meld_const.nss include\bnd_vestig_const.nss include\inc_2dacache.nss include\prc_feat_const.nss include\prc_racial_const.nss include\inc_debug.nss include\prc_inc_switch.nss include\inc_persist_loca.nss include\prc_inc_skin.nss include\inc_persistsql.nss include\inc_draw.nss include\inc_draw_tools.nss include\inc_pers_array.nss include\inc_area.nss include\inc_heap.nss include\inc_newspellbook.nss include\inc_vfx_const.nss include\spinc_necro_cyst.nss include\true_utter_const.nss include\prc_inc_sneak.nss include\prcsp_engine.nss include\inc_item_props.nss include\prc_inc_core.nss include\inc_sp_gain_mem.nss include\lookup_2da_spell.nss include\inc_lookups.nss include\prc_inc_damage.nss include\prc_inc_sb_const.nss include\prc_effect_inc.nss include\prc_inc_castlvl.nss include\prc_inc_newip.nss include\prc_inc_descrptr.nss include\prc_x2_itemprop.nss include\prc_ipfeat_const.nss include\inc_prc_npc.nss include\tob_move_const.nss include\prcsp_archmaginc.nss include\prc_add_spl_pen.nss include\prcsp_reputation.nss include\inc_abil_damage.nss include\inv_inc_invknown.nss include\inv_inc_invoke.nss include\prc_add_spell_dc.nss include\prc_spellf_inc.nss include\prc_inc_clsfunc.nss include\x2_inc_spellhook.nss include\prc_x2_craft.nss include\prc_inc_itmrstr.nss include\prc_inc_burn.nss include\pnp_shft_main.nss include\inc_dynconv.nss include\inc_npc.nss include\prc_getbest_inc.nss include\prc_inc_function.nss include\prc_inc_util.nss include\prc_inc_stunfist.nss include\inc_nwnx_funcs.nss include\prc_template_con.nss include\prc_alterations.nss +newspellbookobjs\inv_eldtch_blast.ncs: newspellbook\inv_eldtch_blast.nss include\prc_inc_combat.nss include\prc_inc_sp_tch.nss include\inv_inc_invfunc.nss include\inv_invokehook.nss include\inv_inc_blast.nss include\psi_inc_core.nss include\prc_inc_unarmed.nss include\prc_inc_onhit.nss include\prc_misc_const.nss include\prc_inc_fork.nss include\prc_inc_natweap.nss include\inc_utility.nss include\prc_inc_spells.nss include\prc_inc_nwscript.nss include\prc_class_const.nss include\inc_target_list.nss include\inc_logmessage.nss include\inc_threads.nss include\prc_inc_actions.nss include\inc_time.nss include\inc_draw_prc.nss include\inc_eventhook.nss include\inc_metalocation.nss include\inc_array_sort.nss include\inc_uniqueid.nss include\inc_set.nss include\prc_spell_const.nss include\inv_invoc_const.nss include\psi_power_const.nss include\prc_inc_racial.nss include\prc_inc_array.nss include\moi_meld_const.nss include\bnd_vestig_const.nss include\inc_2dacache.nss include\prc_feat_const.nss include\prc_racial_const.nss include\inc_debug.nss include\prc_inc_switch.nss include\inc_persist_loca.nss include\prc_inc_skin.nss include\inc_persistsql.nss include\inc_draw.nss include\inc_draw_tools.nss include\inc_pers_array.nss include\inc_area.nss include\inc_heap.nss include\inc_newspellbook.nss include\inc_vfx_const.nss include\spinc_necro_cyst.nss include\true_utter_const.nss include\prc_inc_sneak.nss include\prcsp_engine.nss include\inc_item_props.nss include\prc_inc_core.nss include\inc_sp_gain_mem.nss include\lookup_2da_spell.nss include\inc_lookups.nss include\prc_inc_damage.nss include\prc_inc_sb_const.nss include\prc_effect_inc.nss include\prc_inc_castlvl.nss include\prc_inc_newip.nss include\prc_inc_descrptr.nss include\prc_x2_itemprop.nss include\prc_ipfeat_const.nss include\inc_prc_npc.nss include\tob_move_const.nss include\prcsp_archmaginc.nss include\prc_add_spl_pen.nss include\prcsp_reputation.nss include\inc_abil_damage.nss include\inv_inc_invknown.nss include\inv_inc_invoke.nss include\prc_add_spell_dc.nss include\prc_spellf_inc.nss include\prc_inc_clsfunc.nss include\x2_inc_spellhook.nss include\prc_x2_craft.nss include\prc_inc_itmrstr.nss include\prc_inc_burn.nss include\pnp_shft_main.nss include\inc_dynconv.nss include\inc_npc.nss include\prc_getbest_inc.nss include\prc_inc_function.nss include\prc_inc_util.nss include\prc_inc_stunfist.nss include\inc_nwnx_funcs.nss include\prc_template_con.nss include\prc_alterations.nss include\psi_inc_const.nss newspellbookobjs\inv_eldtch_chain.ncs: newspellbook\inv_eldtch_chain.nss include\prc_inc_sp_tch.nss include\inv_inc_invfunc.nss include\inv_invokehook.nss include\inv_inc_blast.nss include\prc_inc_combat.nss include\prc_inc_unarmed.nss include\prc_inc_onhit.nss include\prc_misc_const.nss include\prc_inc_fork.nss include\prc_inc_natweap.nss include\inc_utility.nss include\prc_inc_spells.nss include\prc_inc_nwscript.nss include\prc_class_const.nss include\inc_target_list.nss include\inc_logmessage.nss include\inc_threads.nss include\prc_inc_actions.nss include\inc_time.nss include\inc_draw_prc.nss include\inc_eventhook.nss include\inc_metalocation.nss include\inc_array_sort.nss include\inc_uniqueid.nss include\inc_set.nss include\prc_spell_const.nss include\inv_invoc_const.nss include\psi_power_const.nss include\prc_inc_racial.nss include\prc_inc_array.nss include\moi_meld_const.nss include\bnd_vestig_const.nss include\inc_2dacache.nss include\prc_feat_const.nss include\prc_racial_const.nss include\inc_debug.nss include\prc_inc_switch.nss include\inc_persist_loca.nss include\prc_inc_skin.nss include\inc_persistsql.nss include\inc_draw.nss include\inc_draw_tools.nss include\inc_pers_array.nss include\inc_area.nss include\inc_heap.nss include\inc_newspellbook.nss include\inc_vfx_const.nss include\spinc_necro_cyst.nss include\true_utter_const.nss include\prc_inc_sneak.nss include\prcsp_engine.nss include\inc_item_props.nss include\prc_inc_core.nss include\inc_sp_gain_mem.nss include\lookup_2da_spell.nss include\inc_lookups.nss include\prc_inc_damage.nss include\prc_inc_sb_const.nss include\prc_effect_inc.nss include\prc_inc_castlvl.nss include\prc_inc_newip.nss include\prc_inc_descrptr.nss include\prc_x2_itemprop.nss include\prc_ipfeat_const.nss include\inc_prc_npc.nss include\tob_move_const.nss include\prcsp_archmaginc.nss include\prc_add_spl_pen.nss include\prcsp_reputation.nss include\inc_abil_damage.nss include\inv_inc_invknown.nss include\inv_inc_invoke.nss include\prc_add_spell_dc.nss include\prc_spellf_inc.nss include\prc_inc_clsfunc.nss include\x2_inc_spellhook.nss include\prc_x2_craft.nss include\prc_inc_itmrstr.nss include\prc_inc_burn.nss include\pnp_shft_main.nss include\inc_dynconv.nss include\inc_npc.nss include\prc_getbest_inc.nss include\prc_inc_function.nss include\prc_inc_util.nss include\prc_inc_stunfist.nss include\inc_nwnx_funcs.nss include\prc_template_con.nss include\prc_alterations.nss diff --git a/nwn/nwnprc/trunk/newspellbook/inv_eldtch_blast.nss b/nwn/nwnprc/trunk/newspellbook/inv_eldtch_blast.nss index 15b17bd5..508fd306 100644 --- a/nwn/nwnprc/trunk/newspellbook/inv_eldtch_blast.nss +++ b/nwn/nwnprc/trunk/newspellbook/inv_eldtch_blast.nss @@ -8,6 +8,7 @@ #include "inv_inc_invfunc" #include "inv_invokehook" #include "inv_inc_blast" +#include "psi_inc_core" //internal function for delayed damage void DoDelayedBlast(object oTarget, int nDamageType = DAMAGE_TYPE_FIRE, int nVFX = VFX_IMP_FLAME_M) @@ -92,6 +93,33 @@ void main() if(GetHasSpellEffect(INVOKE_WILD_FRENZY, oPC)) nDam += 2; +//:: RAW, Eldritch Blast is considered a ranged attack & should work with the Psionic Shot chain -Jaysyn. + + if(GetIsPsionicallyFocused()) + { + if (GetHasFeat(FEAT_PSIONIC_SHOT)) + { + nDam += d6(2); + } + if (GetHasFeat(FEAT_GREATER_PSIONIC_SHOT)) + { + nDam += d6(2); + } + + LosePsionicFocus(); + } + +/* if(GetIsPsionicallyFocused() && GetHasFeat(FEAT_GREATER_PSIONIC_SHOT)) + { + nDam += d6(4); + LosePsionicFocus(); + } + if(GetIsPsionicallyFocused() && GetHasFeat(FEAT_PSIONIC_SHOT)) + { + nDam += d6(2); + LosePsionicFocus(); + } */ + int nAtkBns = GetAttackBonus(oTarget, oPC, OBJECT_INVALID, FALSE, TOUCH_ATTACK_RANGED_SPELL); if(GetHasFeat(FEAT_ELDRITCH_SCULPTOR)) nAtkBns += 2; diff --git a/nwn/nwnprc/trunk/scripts/prc_feats.nss b/nwn/nwnprc/trunk/scripts/prc_feats.nss index 669a1767..ca233517 100644 --- a/nwn/nwnprc/trunk/scripts/prc_feats.nss +++ b/nwn/nwnprc/trunk/scripts/prc_feats.nss @@ -1065,12 +1065,36 @@ void PRCFeat_AddEventHooks(object oPC, object oSkin) AddEventScript(oPC, EVENT_ONPLAYERUNEQUIPITEM, sScript, TRUE, FALSE); } - if(GetHasFeat(FEAT_TWO_WEAPON_REND, oPC)) - { - sScript = "prc_tw_rend"; - AddEventScript(oPC, EVENT_ONPLAYEREQUIPITEM, sScript, TRUE, FALSE); - AddEventScript(oPC, EVENT_ONPLAYERUNEQUIPITEM, sScript, TRUE, FALSE); - } + // Check if the player is a Ranger, wearing medium/heavy armor, and does not have Two-Weapon Fighting feat + int bIsRestricted = FALSE; + + // Check if the player has levels in the Ranger class + if (GetLevelByClass(CLASS_TYPE_RANGER, oPC) > 0) + { + // Check if the player is wearing medium or heavy armor + int nArmorType = GetArmorType(GetItemInSlot(INVENTORY_SLOT_CHEST, oPC)); + if (nArmorType == ARMOR_TYPE_MEDIUM || nArmorType == ARMOR_TYPE_HEAVY) + { + // Check if the player does not have the Two-Weapon Fighting feat + if (!GetHasFeat(FEAT_TWO_WEAPON_FIGHTING, oPC)) + { + // Set the restricted flag to TRUE if all conditions are met + bIsRestricted = TRUE; + } + } + } + + // Proceed with the original logic only if the restrictions are not met + if (!bIsRestricted) + { + if (GetHasFeat(FEAT_TWO_WEAPON_REND, oPC)) + { + string sScript = "prc_tw_rend"; + AddEventScript(oPC, EVENT_ONPLAYEREQUIPITEM, sScript, TRUE, FALSE); + AddEventScript(oPC, EVENT_ONPLAYERUNEQUIPITEM, sScript, TRUE, FALSE); + } + } + if(GetHasFeat(FEAT_LINGERING_DAMAGE, oPC)) { sScript = "ft_lingdmg"; diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk index c8f32698..627c24e0 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 f214d3e5..db39845f 100644 --- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml +++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml @@ -5236,11 +5236,11 @@ Weapon Size: Large Feats Required: Martial Sap The sap is a simple weapon, typically consisting of a small bag filled with sand or lead shot. - Base Damage: 1d4 + Base Damage: 1d6 Base Critical Threat: x2 Base Damage Type: Bludgeoning Weapon Size: Small -Feats Required: Simple +Feats Required: Martial Katar The katar is also known as a punching dagger, discrete and efficient. Base Damage: 1d4 @@ -73181,4 +73181,4 @@ Use: Activated Spellcasting isn't required to take the Talon of Tiamat prestige class. If you currently have an arcane spellcasting, shadowcasting or invoking class, do not pick this marker feat. Spellcasting isn't required to take the Dragonsong Lyrist prestige class. If you currently have an arcane spellcasting or shadowcasting class, do not pick this marker feat. Spellcasting isn't required to take the Ollam prestige class. If you currently have an arcane spellcasting or shadowcasting class, do not pick this marker feat. - + \ No newline at end of file