1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (by Buggler)

Browse Source 
- 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_v1.13_data@1594 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
2013-01-15 20:05:25 +00:00
parent 93e097b981
commit 0789934d9a
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Skills_Settings.INI
+5 -3
View File
@@ -25,10 +25,12 @@ MAX_NUMBER_OF_TRAITS = 3
; Values from 2 to 20 are allowed. ; Values from 2 to 20 are allowed.
NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2 NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2
; Allow special merc to have one more major trait?
ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
; Allow Dr.Q to have one more trait? (giving him Martial Arts + Paramedic + Night Ops) ; Assign the Merc ID to have one more major trait, only applies if ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
ALLOW_EXCEPTION_FOR_DR_Q = TRUE ; Values from 0 to 254 are allowed, does not work on IMPs. (Default: 33, giving Dr Q. Martial Arts + Night Ops + Paramedic)
SPECIAL_MERC_ID = 33
; Do traits set minimum attributes when selected? ; Do traits set minimum attributes when selected?
SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE
gamedir/Data-1.13/TableData/MercProfiles.xml
+2 -2
View File
@@ -2910,8 +2910,8 @@
<bOldSkillTrait2>4</bOldSkillTrait2> <bOldSkillTrait2>4</bOldSkillTrait2>
<bNewSkillTrait1>6</bNewSkillTrait1> <bNewSkillTrait1>6</bNewSkillTrait1>
<bNewSkillTrait2>6</bNewSkillTrait2> <bNewSkillTrait2>6</bNewSkillTrait2>
<bNewSkillTrait3>9</bNewSkillTrait3> <bNewSkillTrait3>13</bNewSkillTrait3>
<bNewSkillTrait4>13</bNewSkillTrait4> <bNewSkillTrait4>9</bNewSkillTrait4>
<bBuddy1>255</bBuddy1> <bBuddy1>255</bBuddy1>
<bBuddy2>255</bBuddy2> <bBuddy2>255</bBuddy2>
<bBuddy3>255</bBuddy3> <bBuddy3>255</bBuddy3>
gamedir/Data-UB/Skills_Settings.INI
+5 -3
View File
@@ -25,10 +25,12 @@ MAX_NUMBER_OF_TRAITS = 3
; Values from 2 to 20 are allowed. ; Values from 2 to 20 are allowed.
NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2 NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2
; Allow special merc to have one more major trait?
ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
; Allow Dr.Q to have one more trait? (giving him Martial Arts + Paramedic + Night Ops) ; Assign the Merc ID to have one more major trait, only applies if ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
ALLOW_EXCEPTION_FOR_DR_Q = TRUE ; Values from 0 to 254 are allowed, does not work on IMPs. (Default: 33, giving Dr Q. Martial Arts + Night Ops + Paramedic)
SPECIAL_MERC_ID = 33
; Do traits set minimum attributes when selected? ; Do traits set minimum attributes when selected?
SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE
gamedir/Data/Skills_Settings.INI
+5 -3
View File
@@ -25,10 +25,12 @@ MAX_NUMBER_OF_TRAITS = 3
; Values from 2 to 20 are allowed. ; Values from 2 to 20 are allowed.
NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2 NUMBER_OF_MAJOR_TRAITS_ALLOWED = 2
; Allow special merc to have one more major trait?
ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
; Allow Dr.Q to have one more trait? (giving him Martial Arts + Paramedic + Night Ops) ; Assign the Merc ID to have one more major trait, only applies if ALLOW_EXCEPTION_FOR_SPECIAL_MERC = TRUE
ALLOW_EXCEPTION_FOR_DR_Q = TRUE ; Values from 0 to 254 are allowed, does not work on IMPs. (Default: 33, giving Dr Q. Martial Arts + Night Ops + Paramedic)
SPECIAL_MERC_ID = 33
; Do traits set minimum attributes when selected? ; Do traits set minimum attributes when selected?
SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE SET_MINIMUM_ATTRIBUTES_FOR_TRAITS = TRUE