diff --git a/trunk/2das/cls_feat_fh.2da b/trunk/2das/cls_feat_fh.2da index fac12048..70b504d8 100644 --- a/trunk/2das/cls_feat_fh.2da +++ b/trunk/2das/cls_feat_fh.2da @@ -1,35 +1,37 @@ 2DA V2.0 - FeatLabel FeatIndex List GrantedOnLevel OnMenu -0 Hated_Enemy_Dwarf 4326 2 1 0 -1 Hated_Enemy_elf 4327 2 1 0 -2 Hated_Enemy_gnome 4328 2 1 0 -3 Hated_Enemy_halfling 4329 2 1 0 -4 Hated_Enemy_halfelf 4330 2 1 0 -5 Hated_Enemy_halforc 4331 2 1 0 -6 Hated_Enemy_human 4332 2 1 0 -7 Hated_Enemy_abberation 4333 2 1 0 -8 Hated_Enemy_animal 4334 2 1 0 -9 Hated_Enemy_beast 4335 2 1 0 -10 Hated_Enemy_construct 4336 2 1 0 -11 Hated_Enemy_dragon 4337 2 1 0 -12 Hated_Enemy_goblin 4338 2 1 0 -13 Hated_Enemy_monstrous 4339 2 1 0 -14 Hated_Enemy_orc 4340 2 1 0 -15 Hated_Enemy_reptile 4341 2 1 0 -16 Hated_Enemy_elemental 4342 2 1 0 -17 Hated_Enemy_fey 4343 2 1 0 -18 Hated_Enemy_giant 4344 2 1 0 -19 Hated_Enemy_mbeast 4345 2 1 0 -20 Hated_Enemy_outsider 4346 2 1 0 -21 Hated_Enemy_shapechanger 4347 2 1 0 -22 Hated_Enemy_undead 4348 2 1 0 -23 Hated_Enemy_vermin 4349 2 1 0 -24 Rancor 4322 3 1 0 -25 Death_Attack 4325 3 10 1 -26 DR 4323 3 2 0 -27 SR 4324 3 4 0 -28 FEAT_EPIC_BLINDING_SPEED 491 0 -1 1 -29 DefArrow 8 0 -1 0 -30 TwoWeap 41 0 -1 0 -31 Ambidex 1 0 -1 0 + FeatLabel FeatIndex List GrantedOnLevel OnMenu +0 Hated_Enemy_Dwarf 4326 2 1 0 +1 Hated_Enemy_elf 4327 2 1 0 +2 Hated_Enemy_gnome 4328 2 1 0 +3 Hated_Enemy_halfling 4329 2 1 0 +4 Hated_Enemy_halfelf 4330 2 1 0 +5 Hated_Enemy_halforc 4331 2 1 0 +6 Hated_Enemy_human 4332 2 1 0 +7 Hated_Enemy_abberation 4333 2 1 0 +8 Hated_Enemy_animal 4334 2 1 0 +9 Hated_Enemy_beast 4335 2 1 0 +10 Hated_Enemy_construct 4336 2 1 0 +11 Hated_Enemy_dragon 4337 2 1 0 +12 Hated_Enemy_goblin 4338 2 1 0 +13 Hated_Enemy_monstrous 4339 2 1 0 +14 Hated_Enemy_orc 4340 2 1 0 +15 Hated_Enemy_reptile 4341 2 1 0 +16 Hated_Enemy_elemental 4342 2 1 0 +17 Hated_Enemy_fey 4343 2 1 0 +18 Hated_Enemy_giant 4344 2 1 0 +19 Hated_Enemy_mbeast 4345 2 1 0 +20 Hated_Enemy_outsider 4346 2 1 0 +21 Hated_Enemy_shapechanger 4347 2 1 0 +22 Hated_Enemy_undead 4348 2 1 0 +23 Hated_Enemy_vermin 4349 2 1 0 +24 FEAT_HATED_ENEMY_OOZE 3469 2 1 0 +25 FEAT_HATED_ENEMY_PLANT 3470 2 1 0 +26 Rancor 4322 3 1 0 +27 Death_Attack 4325 3 10 1 +28 DR 4323 3 2 0 +29 SR 4324 3 4 0 +30 FEAT_EPIC_BLINDING_SPEED 491 0 -1 1 +31 DefArrow 8 0 -1 0 +32 TwoWeap 41 0 -1 0 +33 Ambidex 1 0 -1 0 diff --git a/trunk/2das/feat.2da b/trunk/2das/feat.2da index 630c20eb..81a1e91c 100644 --- a/trunk/2das/feat.2da +++ b/trunk/2das/feat.2da @@ -2928,7 +2928,7 @@ 2924 FEAT_PRESTIGE_LICH_CRAFT_WO_ITEM 16823136 16823137 ife_X1SFCrTrap **** **** **** **** **** **** **** **** **** **** 0 0 0 3 **** 1907 **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PRESTIGE_LICH_CRAFT_WO_ITEM 5 **** **** **** **** **** 0 1 2925 CraftWondrousItem 16823156 16823157 ife_crft_wonditm **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_CRAFT_WONDROUS_ITEM 4 **** 3 **** **** **** 0 1 2926 CraftMagicArmsArmor 16823158 16823159 ife_crftarmarmor **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_CRAFT_MAGIC_ARMS_ARMOR 4 **** 5 **** **** **** 0 1 -2927 CraftRod 16823160 16823161 ife_craft_rod **** **** **** **** **** **** **** 99 **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_CRAFT_ROD 4 **** 9 **** **** **** 0 1 +2927 CraftRod 16823160 16823161 ife_craft_rod **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_CRAFT_ROD 4 **** 9 **** **** **** 0 1 2928 CraftStaff 16823162 16823163 ife_craft_staff **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_CRAFT_STAFF 4 **** 12 **** **** **** 0 1 2929 ForgeRing 16823164 16823165 ife_forge_ring **** **** **** **** **** **** **** **** **** **** 0 0 1 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_FORGE_RING 4 **** 12 **** **** **** 0 1 2930 FEAT_PRESTIGE_ASSN_DEATH_ATTACK 16823144 16823145 ife_X1DethAtt **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 1909 **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PRESTIGE_ASSN_DEATH_ATTACK 1 **** **** **** **** **** 0 0 @@ -3470,8 +3470,8 @@ 3466 FEAT_AP_CONTAGION3 777 16825553 is_Contagion **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2087 3467 1 3 **** **** **** **** **** **** **** **** **** **** **** FEAT_AP_CONTAGION3 3 **** **** **** **** **** 0 1 3467 FEAT_AP_CONTAGION4 777 16825553 is_Contagion **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2087 3468 1 4 **** **** **** **** **** **** **** **** **** **** **** FEAT_AP_CONTAGION4 3 **** **** **** **** **** 0 1 3468 FEAT_AP_CONTAGION5 777 16825553 is_Contagion **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2087 **** 1 5 **** **** **** **** **** **** **** **** **** **** **** FEAT_AP_CONTAGION5 3 **** **** **** **** **** 0 1 -3469 **** 16825602 16825603 is_CharmPer **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** 3470 1 1 **** **** **** **** **** **** **** **** **** **** **** FEAT_CO_CORRUPTSOUL1 3 **** **** **** **** **** 0 1 -3470 **** 16825602 16825603 is_CharmPer **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** 3471 1 2 **** **** **** **** **** **** **** **** **** **** **** FEAT_CO_CORRUPTSOUL2 3 **** **** **** **** **** 0 1 +3469 FEAT_HATED_ENEMY_OOZE 16790073 16824269 ife_racehate **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 0.5 **** 55 **** **** 2354 **** **** **** **** **** **** **** FEAT_HATED_ENEMY_OOZE 6 **** **** **** **** **** 0 1 +3470 FEAT_HATED_ENEMY_PLANT 16790074 16824269 ife_racehate **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 0.5 **** 55 **** **** 2355 **** **** **** **** **** **** **** FEAT_HATED_ENEMY_PLANT 6 **** **** **** **** **** 0 1 3471 **** 16825602 16825603 is_CharmPer **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** 3472 1 3 **** **** **** **** **** **** **** **** **** **** **** FEAT_CO_CORRUPTSOUL3 3 **** **** **** **** **** 0 1 3472 **** 16825602 16825603 is_CharmPer **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** 3473 1 4 **** **** **** **** **** **** **** **** **** **** **** FEAT_CO_CORRUPTSOUL4 3 **** **** **** **** **** 0 1 3473 **** 16825602 16825603 is_CharmPer **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 5 **** **** **** **** **** **** **** **** **** **** **** FEAT_CO_CORRUPTSOUL5 3 **** **** **** **** **** 0 1 @@ -24004,7 +24004,7 @@ 24000 SkillFocusAlchemy 16847243 424 ife_X2BrewPotion **** **** **** **** **** **** **** **** **** **** **** 1 1 4 **** **** **** **** **** 4 **** **** **** **** **** **** **** **** **** **** FEAT_SKILL_FOCUS_ALCHEMY **** 0 **** **** **** **** **** 1 24001 EpicSkillFocusAlchemy 16847245 4063 ife_X2BrewPotion **** **** **** **** **** **** **** **** **** **** **** 1 1 15 **** **** **** **** **** **** **** **** **** **** **** **** 34 20 **** **** FEAT_EPIC_SKILL_FOCUS_ALCHEMY **** 0 **** **** **** **** 1 1 24002 MagicalArtisanMagicArmsAndArmor 16847247 16847257 ife_crftarmarmor **** **** **** **** **** **** **** **** 2926 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAGICAL_ARTISAN_CRAFT_MAGIC_ARMS **** 0 **** **** **** **** **** 1 -24003 MagicalArtisanCraftRod 16847248 16847257 ife_craft_rod **** **** **** **** **** **** **** 99 2927 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAGICAL_ARTISAN_CRAFT_ROD **** 0 **** **** **** **** **** 1 +24003 MagicalArtisanCraftRod 16847248 16847257 ife_craft_rod **** **** **** **** **** **** **** **** 2927 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAGICAL_ARTISAN_CRAFT_ROD **** 0 **** **** **** **** **** 1 24004 MagicalArtisanCraftStaff 16847249 16847257 ife_craft_staff **** **** **** **** **** **** **** **** 2928 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAGICAL_ARTISAN_CRAFT_STAFF **** 0 **** **** **** **** **** 1 24005 MagicalArtisanCraftWand 16847250 16847257 ife_X2CraftWand **** **** **** **** **** **** **** **** 946 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAGICAL_ARTISAN_CRAFT_WAND **** 0 **** **** **** **** **** 1 24006 MagicalArtisanCraftWonderousItem 16847251 16847257 ife_crft_wonditm **** **** **** **** **** **** **** **** 2925 **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** FEAT_MAGICAL_ARTISAN_CRAFT_WONDROUS **** 0 **** **** **** **** **** 1 diff --git a/trunk/include/prc_feat_const.nss b/trunk/include/prc_feat_const.nss index 4df2ae49..ab3cee82 100644 --- a/trunk/include/prc_feat_const.nss +++ b/trunk/include/prc_feat_const.nss @@ -1710,6 +1710,8 @@ const int FEAT_HATED_ENEMY_OUTSIDER = 4346; const int FEAT_HATED_ENEMY_SHAPECHANGER = 4347; const int FEAT_HATED_ENEMY_UNDEAD = 4348; const int FEAT_HATED_ENEMY_VERMIN = 4349; +const int FEAT_HATED_ENEMY_OOZE = 3469; +const int FEAT_HATED_ENEMY_PLANT = 3470; // Thrall of Graz'zt const int FEAT_TOG_SUMMON_DEMON = 2889; diff --git a/trunk/scripts/prc_foe_hntr.nss b/trunk/scripts/prc_foe_hntr.nss index 64a25f6c..b3726eae 100644 --- a/trunk/scripts/prc_foe_hntr.nss +++ b/trunk/scripts/prc_foe_hntr.nss @@ -43,6 +43,8 @@ void SetHatedEnemyRace(object oPC) else if(GetHasFeat(FEAT_HATED_ENEMY_SHAPECHANGER, oPC)) hatedEnemy = RACIAL_TYPE_SHAPECHANGER; else if(GetHasFeat(FEAT_HATED_ENEMY_UNDEAD, oPC)) hatedEnemy = RACIAL_TYPE_UNDEAD; else if(GetHasFeat(FEAT_HATED_ENEMY_VERMIN, oPC)) hatedEnemy = RACIAL_TYPE_VERMIN; + else if(GetHasFeat(FEAT_HATED_ENEMY_OOZE, oPC)) hatedEnemy = RACIAL_TYPE_OOZE; + else if(GetHasFeat(FEAT_HATED_ENEMY_PLANT, oPC)) hatedEnemy = RACIAL_TYPE_PLANT; SetLocalInt(oPC, "HatedFoe", hatedEnemy); } diff --git a/trunk/tlk/prc_consortium.tlk b/trunk/tlk/prc_consortium.tlk index 0c5abcaa..1d6de365 100644 Binary files a/trunk/tlk/prc_consortium.tlk and b/trunk/tlk/prc_consortium.tlk differ diff --git a/trunk/tlk/prc_consortium.tlk.xml b/trunk/tlk/prc_consortium.tlk.xml index 644299d0..c2aa3de2 100644 --- a/trunk/tlk/prc_consortium.tlk.xml +++ b/trunk/tlk/prc_consortium.tlk.xml @@ -2,6 +2,21 @@ Bad Strref + ## NEW NWN .35 DAMAGE TYPES ## + Force Damage + <CUSTOM0> Force + Poison Damage + <CUSTOM0> Poison + Psychic Damage + <CUSTOM0> Psychic + Radiant Damage + <CUSTOM0> Radiant + Subdual Damage + <CUSTOM0> Subdual + Untyped Damage + <CUSTOM0> Untyped + Vile Damage + <CUSTOM0> Vile Ocular Adept Ocular Adepts ocular adepts @@ -2310,6 +2325,10 @@ Use: Automatic. Prerequisite: Elf or Scent ability. Specifics: Characters with Keen Senses may apply their full Search skill even when making a passive search. Use: Automatic. + Hated Enemy: Oozes + Hated Enemy: Plants + Favored Enemy: Oozes + Favored Enemy: Plants Practiced Invoker (Dragonfire Adept) Practiced Invoker (Warlock) Type of Feat: General. @@ -4796,7 +4815,7 @@ your current position. 96 97 98 - 100 + 99 Tomb-Tainted Soul Type of Feat: General Prerequisite: Nongood alignment. @@ -71236,4 +71255,12 @@ Use: Activated Fra CSM Sht + ##START CASTER PRC MARKER FEATS## + The Archmage sacrifices the bonus spell slots he would gain in order to take a High Arcana feat at each level. He does, however, add his level to his base caster class when determining spell power (damage, duration...). + Archmage Spellcasting (Beguiler) + Archmage Spellcasting (Dread Necromancer) + Archmage Spellcasting (Sorcerer) + Archmage Spellcasting (Sublime Chord) + Archmage Spellcasting (Warmage) + Archmage Spellcasting (Wizard)