Fixes (by Buggler)

- Fixed allow exception to Dr Q. skill trait code not fully functional
- Swapped Dr Q. skill trait xml order so that when exception disabled, he will still have his night ops minor skill due to code execution order
- Externalized allow_exception ID number for modding

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-15 20:04:41 +00:00
parent c49f59f66e
commit 56e08dbeae
4 changed files with 30 additions and 17 deletions
+3 -2
View File
@@ -1925,8 +1925,9 @@ void LoadSkillTraitsExternalSettings()
gSkillTraitValues.ubMaxNumberOfTraits = iniReader.ReadInteger("Generic Traits Settings","MAX_NUMBER_OF_TRAITS", 3, 2, 30);
gSkillTraitValues.ubNumberOfMajorTraitsAllowed = iniReader.ReadInteger("Generic Traits Settings","NUMBER_OF_MAJOR_TRAITS_ALLOWED", 2, 2, 20);
// Allow an exception in number of traits for Dr.Q?
gSkillTraitValues.fAllowDrQTraitsException = iniReader.ReadBoolean("Generic Traits Settings","ALLOW_EXCEPTION_FOR_DR_Q", TRUE);
// Allow an exception in number of traits for Special Merc?
gSkillTraitValues.fAllowSpecialMercTraitsException = iniReader.ReadBoolean("Generic Traits Settings","ALLOW_EXCEPTION_FOR_SPECIAL_MERC", TRUE);
gSkillTraitValues.ubSpecialMercID = iniReader.ReadInteger("Generic Traits Settings","SPECIAL_MERC_ID", 33, 0, 254);
// Allow traits prerequisities for attributes?
gSkillTraitValues.fAllowAttributePrereq = iniReader.ReadBoolean("Generic Traits Settings","SET_MINIMUM_ATTRIBUTES_FOR_TRAITS", TRUE);