diff --git a/Release/PRC8_20240919.7z b/Release/PRC8_20240919.7z new file mode 100644 index 00000000..68a6cdc3 Binary files /dev/null and b/Release/PRC8_20240919.7z differ diff --git a/Release/PRC8_20240917.7z b/_backup/PRC8_20240917.7z similarity index 100% rename from Release/PRC8_20240917.7z rename to _backup/PRC8_20240917.7z diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da index 96be60d3..7e266fde 100644 --- a/nwn/nwnprc/trunk/2das/feat.2da +++ b/nwn/nwnprc/trunk/2das/feat.2da @@ -27,7 +27,7 @@ 23 KnockDown 409 410 ife_knockdow **** 99 99 99 99 99 99 99 **** **** 0 0 1 22 1 **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_KNOCKDOWN 2 1 **** **** **** **** 0 1 24 LightngRef 411 412 ife_lightflex **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_LIGHTNING_REFLEXES 3 **** **** **** **** **** 0 1 25 MaxSpell 413 414 ife_maximize **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAXIMIZE_SPELL 4 **** **** **** **** **** 0 1 -26 Mobility 415 416 ife_mobility **** **** 13 **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** 10 5202 **** **** **** **** **** **** **** FEAT_MOBILITY 3 **** **** **** **** **** 0 1 +26 Mobility 415 416 ife_mobility **** **** 13 **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** 10 5202 8885 4179 **** **** **** **** **** FEAT_MOBILITY 3 **** **** **** **** **** 0 1 27 PBShot 215 233 ife_pbshot **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_POINT_BLANK_SHOT 1 **** **** **** **** **** 0 1 28 PowerAtk 417 418 ife_powhit **** 13 **** **** **** **** **** **** **** **** 0 0 1 22 1 **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_POWER_ATTACK 2 1 **** **** **** **** 0 1 29 Quicken 216 234 ife_quicken **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_QUICKEN_SPELL 4 **** **** **** **** **** 0 1 @@ -393,7 +393,7 @@ 389 Expertise 2773 2774 ife_X1Expert **** **** **** 13 **** **** **** **** **** **** 0 0 1 22 1 **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_EXPERTISE 6 **** **** **** **** **** 0 1 390 ImpExpertise 2777 2778 ife_X1ImpExp **** **** **** 13 **** **** **** **** 389 **** 0 0 1 22 1 **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_IMPROVED_EXPERTISE 6 **** **** **** **** **** 0 1 391 GreatCleave 2779 2780 ife_X1GCleave 4 13 **** **** **** **** **** **** 28 6 0 0 1 **** **** **** **** 0.5 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_GREAT_CLEAVE 1 **** **** **** **** **** 0 1 -392 SpringAttack 2781 2782 ife_X1SpAtt 4 **** 13 **** **** **** **** **** 26 **** 0 0 1 **** **** **** **** 0.5 **** **** **** 10 5202 **** **** **** **** **** **** **** FEAT_SPRING_ATTACK 6 **** **** **** **** **** 0 1 +392 SpringAttack 2781 2782 ife_X1SpAtt 4 **** 13 **** **** **** **** **** 26 **** 0 0 1 **** **** **** **** 0.5 **** **** **** 10 5202 8885 4179 **** **** **** **** **** FEAT_SPRING_ATTACK 6 **** **** **** **** **** 0 1 393 GrSpllFcsAbj 2783 2791 ife_X1GSFAbj **** **** **** **** **** **** **** **** 35 **** 0 0 1 **** **** **** 610 0.5 **** 6 **** **** **** **** **** **** **** **** **** **** FEAT_GREATER_SPELL_FOCUS_ABJURATION 4 **** **** **** **** **** 0 1 394 GrSpllFcsCnj 2784 2791 ife_X1GSFCnj **** **** **** **** **** **** **** **** 166 **** 0 0 1 **** **** **** 611 0.5 **** 6 **** **** **** **** **** **** **** **** **** **** FEAT_GREATER_SPELL_FOCUS_CONJURATION 4 **** **** **** **** **** 0 1 395 GrSpllFcsDiv 2785 2791 ife_X1GSFDiv **** **** **** **** **** **** **** **** 167 **** 0 0 1 **** **** **** 612 0.5 **** 6 **** **** **** **** **** **** **** **** **** **** FEAT_GREATER_SPELL_FOCUS_DIVINATION 4 **** **** **** **** **** 0 1 @@ -3506,7 +3506,7 @@ 3502 SUMMON_UNDEAD_2 16822349 16822350 is_AnimDead **** **** **** **** **** **** **** **** **** **** 0 0 0 **** 0.5 3010 **** 1 33 **** **** **** **** **** **** **** **** **** **** **** FEAT_SHROUDS_SUM2 6 **** 5 150 **** **** 0 1 3503 SUMMON_UNDEAD_3 16822351 16822352 is_AnimDead **** **** **** **** **** **** **** **** **** **** 0 0 0 **** 0.5 3011 **** 1 33 **** **** **** **** **** **** **** **** **** **** **** FEAT_SHROUDS_SUM3 6 **** 7 150 **** **** 0 1 3504 SUMMON_UNDEAD_4 16822353 16822354 is_AnimDead **** **** **** **** **** **** **** **** **** **** 0 0 0 **** 0.5 3012 **** 1 33 **** **** **** **** **** **** **** **** **** **** **** FEAT_SHROUDS_SUM4 6 **** 9 150 **** **** 0 1 -3505 SidestepCharge 16834597 16834598 ife_trackstep **** **** 13 **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** 10 5202 **** **** **** **** **** **** **** FEAT_ALERTNESS 5 **** **** **** **** **** 0 1 +3505 SidestepCharge 16834597 16834598 ife_trackstep **** **** 13 **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** 10 5202 8885 4179 **** **** **** **** **** FEAT_ALERTNESS 5 **** **** **** **** **** 0 1 3506 PowerfulCharge 16834599 16834600 ife_X2DiviWrth 1 **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_ALERTNESS 5 **** **** **** **** **** 0 1 3507 GreaterPowerfulCharge 16834601 16834602 ife_X2EpicProw 4 **** **** **** **** **** **** **** 3506 **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_ALERTNESS 5 **** **** **** **** **** 0 1 3508 RhinoTribeCharge 16834603 16834604 ife_x2grcon1 **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_ALERTNESS 5 **** **** **** **** **** 0 1 @@ -5191,7 +5191,7 @@ 5187 RangedRecall 16836452 16836453 ife_goodaim **** **** **** **** **** **** **** **** 4819 27 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** 16 4 **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 5188 ImprovedRapidShot 16836450 16836451 ife_goodaim **** **** **** **** **** **** **** **** 3306 **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 5189 BearFang 16836448 16836449 ife_X2GWShp4 **** 15 **** **** **** **** **** **** 41 28 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 -5190 QuickStaff 16836446 16836447 ife_X2CritDQSta **** **** **** **** **** **** **** **** 389 **** 0 0 1 **** **** **** **** 1 **** **** **** 10 5202 **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 +5190 QuickStaff 16836446 16836447 ife_X2CritDQSta **** **** **** **** **** **** **** **** 389 **** 0 0 1 **** **** **** **** 1 **** **** **** 10 5202 8885 4179 **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 5191 StealandStrike 16836444 16836445 ife_X2CritORapr **** **** **** **** **** **** **** **** 41 5196 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 5192 RangedDisarm 16836442 16836443 im_RisePhoenix 5 **** 15 **** **** **** **** **** 27 **** 0 0 1 **** **** 3493 **** 1 -1 **** **** **** **** **** **** **** **** **** **** **** FEAT_RANGED_DISARM 4 1 **** **** **** **** 0 1 5193 MountainStance 16836440 16836441 ife_X2Epbarba **** **** **** **** 13 **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** 32 5 1 2 FEAT_SMITE_UNDEAD 6 1 **** **** **** **** 0 1 diff --git a/nwn/nwnprc/trunk/2das/spells.2da b/nwn/nwnprc/trunk/2das/spells.2da index c8f42745..7d26ec98 100644 --- a/nwn/nwnprc/trunk/2das/spells.2da +++ b/nwn/nwnprc/trunk/2das/spells.2da @@ -7,7 +7,7 @@ 3 Barkskin 753 is_Barkskin T T vs 0x3a 0x2B NW_S0_Barkskin **** **** 2 **** 2 **** 2 1500 hand **** vco_smhannatr01 **** sco_mehannatr01 vs_chant_ench_lm vs_chant_ench_lf self 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 13 **** 1 16790148 1 0 **** 0 **** **** **** 0 **** **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** 4 Bestow_Curse 754 is_BesCurse T T vs 0x38 0x2B NW_S0_BesCurse 3 3 **** **** **** 4 3 1500 hand **** vco_mehanevil01 **** sco_mehanevil01 vs_chant_ench_lm vs_chant_ench_lf touch 1000 **** **** **** **** 0 **** **** **** **** **** **** 1 **** **** **** **** **** 3 **** 1 6100 1 0 **** 1 **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** 4 5 Blade_Barrier 755 is_BladeBar V M vs 0x3f 0x2e NW_S0_BladeBar **** 6 **** **** **** **** 6 1500 hand **** vco_mehanevil02 vco_lgrinevil01 sco_lgrinevil01 vs_chant_evoc_hm vs_chant_evoc_hf area 1000 **** **** **** **** 1 vpr_los accelerating hand spr_los path **** 1 **** **** **** **** **** 11 **** 1 6101 1 0 **** 1 **** **** **** 1 rectangle 1 10 3 **** **** **** **** **** **** **** **** **** **** **** **** **** -6 Bless 756 is_Bless E P vs 0x3a 0x09 NW_S0_Bless **** 1 **** 1 **** **** 1 1500 hand **** vco_smhanholy01 **** sco_mehanholy01 vs_chant_ench_lm vs_chant_ench_lf area 1000 **** **** **** **** 0 **** **** **** **** **** Mind_Affecting 0 **** **** **** **** **** 9 **** 1 6102 1 0 **** 0 **** 449 **** 0 sphere 10 **** 4 **** **** **** **** 1 1 **** **** 1 1 **** **** 1 +6 Bless 756 is_Bless E P vs 0x3a 0x09 NW_S0_Bless **** 1 **** 1 **** **** 1 1500 hand **** vco_smhanholy01 **** sco_mehanholy01 vs_chant_ench_lm vs_chant_ench_lf area 1000 **** **** **** **** 0 **** **** **** **** **** Mind_Affecting 0 **** **** **** **** **** 9 **** 1 6102 1 0 **** 0 **** 449 **** 0 sphere 10 **** 20 **** **** **** **** 1 1 **** **** 1 1 **** **** 1 7 Bless_Weapon **** is_BlessWeap T T vs **** 0x28 NW_S0_BlessWeap **** **** **** **** **** **** 1 1500 head **** **** **** **** vs_chant_ench_lm vs_chant_ench_lf **** **** **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 9 **** 1 6103 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** 8 Blindness_and_Deafness 758 is_BlindDeaf T M v 0x1a 0x2A NW_S0_BlindDeaf 2 3 **** **** **** 2 2 1500 hand **** vco_mehanodd02 **** sco_mehanodd02 vs_chant_ench_lm vs_chant_ench_lf out 1000 **** **** **** **** 1 vpr_los accelerating hand spr_los path **** 1 **** **** **** **** **** 2 **** 1 16836432 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** 1 **** **** **** **** **** **** **** **** **** 3 9 Bulls_Strength 759 is_BullStr T T vs 0x3f 0x2b nw_s0_abilbuff 2 2 2 2 **** 2 2 1500 hand **** vco_smhanodd01 **** sco_mehanodd01 vs_chant_ench_lm vs_chant_ench_lf touch 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 9 **** 1 6105 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** 2 2 2 2 **** **** **** **** 2 @@ -450,7 +450,7 @@ 446 Inferno 2368 is_X1Inferno T S vs 0x3f 0x3A x0_s0_inferno **** **** 5 **** **** **** 5 1500 hand **** vco_smhanfire01 **** sco_mehanfire01 vs_chant_evoc_lm vs_chant_evoc_lf out 1000 **** **** **** **** 0 vpr_aroacid homing hand spr_aroacid path Fire 1 **** **** **** **** **** 2 **** 1 2374 1 0 **** 1 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** 447 Isaacs_Lesser_Missile_Storm 2377 is_X1LesMis V L vs 0x3d 0x1E x0_s0_missstorm1 **** **** **** **** **** 4 4 1500 hand **** vco_mehancold03 **** sco_mehancold03 vs_chant_evoc_lm vs_chant_evoc_lf out 1900 **** vca_outsonic **** sca_outsonic 0 **** **** **** **** path **** 1 **** **** **** **** **** 2 **** 1 2375 1 0 **** 1 **** **** **** 1 sphere 8.33 **** 2 **** **** **** **** **** **** **** **** **** **** **** **** **** 448 Isaacs_Greater_Missile_Storm 2378 is_X1GreMis V L vs 0x3d 0x1E x0_s0_missstorm2 **** **** **** **** **** 6 6 1500 hand **** vco_mehancold03 **** sco_mehancold03 vs_chant_evoc_lm vs_chant_evoc_lf out 2500 **** vca_outsonic **** sca_outsonic 0 **** **** **** **** path **** 1 **** **** **** **** **** 2 **** 1 2376 1 0 **** 1 **** **** **** 1 sphere 8.33 **** 2 **** **** **** **** **** **** **** **** **** **** **** **** **** -449 Bane 2663 is_X1Bane E P vs 0x3a 0x09 X0_S0_Bane **** 1 **** **** **** **** 1 1500 head **** **** vco_grndpurp sco_megrdodd01 vs_chant_evoc_lm vs_chant_evoc_lf up 1000 **** **** **** **** 0 **** **** **** **** **** Mind_Affecting 0 **** **** **** **** **** 9 **** 1 2664 1 0 **** 0 **** 6 **** 0 sphere 10 **** 2 **** **** **** **** 1 **** **** **** **** **** 1 **** 1 +449 Bane 2663 is_X1Bane E P vs 0x3a 0x09 X0_S0_Bane **** 1 **** **** **** **** 1 1500 head **** **** vco_grndpurp sco_megrdodd01 vs_chant_evoc_lm vs_chant_evoc_lf up 1000 **** **** **** **** 0 **** **** **** **** **** Mind_Affecting 0 **** **** **** **** **** 9 **** 1 2664 1 0 **** 0 **** 6 **** 0 sphere 10 **** 18 **** **** **** **** 1 **** **** **** **** **** 1 **** 1 450 Shield_of_Faith 2666 is_X1ShlFat A T vs 0x3a 0x2B X0_S0_ShieldFait **** 1 **** **** **** **** 1 1500 hand **** vco_smhannatr01 **** sco_mehannatr01 vs_chant_conj_lm vs_chant_conj_lf up 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 13 **** 1 2665 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** 1 1 **** **** **** 1 **** **** 1 451 Planar_Ally 2667 is_X1PlaAll C S vs 0x3a 0x2E X0_S0_Planar **** 6 **** **** **** **** 6 1500 head **** **** vco_lgupodd01 sco_lgupodd01 vs_chant_conj_hm vs_chant_conj_hf up 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 15 **** 1 2668 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** 6 452 Magic_Fang 2670 is_X1MagFan C T vs 0x3a 0x2B x0_s0_magicfang **** **** 1 **** 1 **** 1 1500 hand **** vco_smhanelec01 **** sco_mehanelec01 vs_chant_conj_lm vs_chant_conj_lf self 1000 **** **** **** **** 0 **** **** **** **** **** **** 0 **** **** **** **** **** 13 **** 1 16825075 1 0 **** 0 **** **** **** 0 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** diff --git a/nwn/nwnprc/trunk/include/prc_inc_spells.nss b/nwn/nwnprc/trunk/include/prc_inc_spells.nss index 9c3a0cb0..bd96a99c 100644 --- a/nwn/nwnprc/trunk/include/prc_inc_spells.nss +++ b/nwn/nwnprc/trunk/include/prc_inc_spells.nss @@ -2458,13 +2458,27 @@ effect PRCEffectDamage(object oTarget, int nDamageAmount, int nDamageType=DAMAGE ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_FNF_LOS_EVIL_10), oTarget); } } + + //:: Get the current spell being cast + int nCurrentSpell = PRCGetSpellId(); + + //:: Skip Reserve Feat spellIDs + if (nCurrentSpell < 19359 || nCurrentSpell > 19396) + { + //:: Piercing Cold for the Frost Mage + if (GetLevelByClass(CLASS_TYPE_FROST_MAGE, oCaster) >= 4 && nDamageType == DAMAGE_TYPE_COLD) + { + int nCurrentHP = GetCurrentHitPoints(oTarget); + DelayCommand(0.1, DoPiercingCold(oCaster, oTarget, nDamageAmount, nCurrentHP)); + } + } - // Piercing Cold for the Frost Mage +/* // Piercing Cold for the Frost Mage if (GetLevelByClass(CLASS_TYPE_FROST_MAGE, oCaster) >= 4 && nDamageType == DAMAGE_TYPE_COLD) { int nCurrentHP = GetCurrentHitPoints(oTarget); DelayCommand(0.1, DoPiercingCold(oCaster, oTarget, nDamageAmount, nCurrentHP)); - } + } */ // Die DR die if (GetLocalInt(oCaster, "MoveIgnoreDR")) diff --git a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss index 6dcee3b2..027b292b 100644 --- a/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss +++ b/nwn/nwnprc/trunk/include/prc_inc_wpnrest.nss @@ -707,7 +707,8 @@ void DoWeaponEquip(object oPC, object oItem, int nHand) //check for proficiency DoProficiencyCheck(oPC, oItem, nHand); - //simulate Weapon Finesse for Elven *blades +//:: This is no longer needed with NWN:EE - Jaysyn +/* //simulate Weapon Finesse for Elven *blades if((nBaseType == BASE_ITEM_ELVEN_LIGHTBLADE || nBaseType == BASE_ITEM_ELVEN_THINBLADE || nBaseType == BASE_ITEM_ELVEN_COURTBLADE) && GetHasFeat(FEAT_WEAPON_FINESSE, oPC) && nElfFinesse > 0) { @@ -715,7 +716,7 @@ void DoWeaponEquip(object oPC, object oItem, int nHand) SetCompositeAttackBonus(oPC, "ElfFinesseRH", nElfFinesse, nHand); else if(nHand == ATTACK_BONUS_OFFHAND) SetCompositeAttackBonus(oPC, "ElfFinesseLH", nElfFinesse, nHand); - } + } */ //Two-hand damage bonus if(!GetWeaponRanged(oItem) && PRCLargeWeaponCheck(nBaseType, nWeaponSize) && (nWeaponSize == nSize + 1 || (nWeaponSize == nRealSize + 1 && GetItemInSlot(INVENTORY_SLOT_LEFTHAND, oPC) == OBJECT_INVALID) && nRealSize > CREATURE_SIZE_SMALL))