Removed distinction between male and female IMP slots. Number of IMP slots is now set via MAX_IMP_CHARACTERS, slots are set with IMP_'number'.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2441 4f8fa57e-7814-0410-bad4-adc449f26b7c
2026-07-29 13:52:17 +02:00 · 2018-08-31 21:39:20 +00:00
parent ee33133354
commit 4e4db1ed03
2 changed files with 26 additions and 51 deletions
@@ -208,37 +208,26 @@ NUM_P_ITEMS = 3
 ;******************************************************************************************************************************

 ;------------------------------------------------------------------------------------------------------------------------------
-; The following allow you to change how many and which slots from prof.dat are available for 
-; male and female IMPs. The "usual" slots are 51,52,53 for males and 54,55,56 for females. Other
-; slots will work only if they have a blank full name in prof.dat. Even slots without full IMP voice
-; sets will work although the IMPs will be silent a lot of the time.
-;
-; There should be one IMP_[FE]MALE_X for each slot. The total number is still limited by 
-; MAX_IMP_CHARACTERS above. You can reduce the numbers but there should always be at least one
-; male and one female slot available.
-; 
+; The following settings allow you to control how many IMPs you can have. For each IMP you need to define a profile slot.
+; See MercProfiles.xml to check which slots are still free.
+; The old distinction between male and female slots no longer applies.
+
 ; If there are any errors in the following then the default values (3 males slots 51-53 and 3 females
 ; slots 54-56) will be used instead.
 ;------------------------------------------------------------------------------------------------------------------------------

-IMP_MALE_CHARACTER_COUNT = 7
-IMP_FEMALE_CHARACTER_COUNT = 3
+MAX_IMP_CHARACTERS = 10

-IMP_MALE_1 = 51
-IMP_MALE_2 = 52
-IMP_MALE_3 = 53
-IMP_MALE_4 = 169
-
-; The following 3 IMP Males have copied voice sets from IMP 51, 52, 53 (currently all 3 voice sets are in Russian)
-
-IMP_MALE_5 = 192
-IMP_MALE_6 = 193
-IMP_MALE_7 = 194
-;IMP_MALE_8 = 164
-
-IMP_FEMALE_1 = 54
-IMP_FEMALE_2 = 55
-IMP_FEMALE_3 = 56
+IMP_1 = 51
+IMP_2 = 52
+IMP_3 = 53
+IMP_4 = 54
+IMP_5 = 55
+IMP_6 = 56
+IMP_7 = 169
+IMP_8 = 192
+IMP_9 = 193
+IMP_10 = 194

 ;------------------------------------------------------------------------------------------------------------------------------
 ; The following values deal with the I.M.P "personalized" merc generation.
@@ -208,36 +208,22 @@ NUM_P_ITEMS = 3
 ;******************************************************************************************************************************

 ;------------------------------------------------------------------------------------------------------------------------------
-; The following allow you to change how many and which slots from prof.dat are available for 
-; male and female IMPs. The "usual" slots are 51,52,53 for males and 54,55,56 for females. Other
-; slots will work only if they have a blank full name in prof.dat. Even slots without full IMP voice
-; sets will work although the IMPs will be silent a lot of the time.
-;
-; There should be one IMP_[FE]MALE_X for each slot. The total number is still limited by 
-; MAX_IMP_CHARACTERS above. You can reduce the numbers but there should always be at least one
-; male and one female slot available.
-; 
+; The following settings allow you to control how many IMPs you can have. For each IMP you need to define a profile slot.
+; See MercProfiles.xml to check which slots are still free.
+; The old distinction between male and female slots no longer applies.
+
 ; If there are any errors in the following then the default values (3 males slots 51-53 and 3 females
 ; slots 54-56) will be used instead.
 ;------------------------------------------------------------------------------------------------------------------------------

-IMP_MALE_CHARACTER_COUNT = 3
-IMP_FEMALE_CHARACTER_COUNT = 3
+MAX_IMP_CHARACTERS = 6

-IMP_MALE_1 = 51
-IMP_MALE_2 = 52
-IMP_MALE_3 = 53
-
-; The following are empty in standard JA2 1.13 but do not have full voice sets.
-;IMP_MALE_4 = 169
-;IMP_MALE_5 = 65
-;IMP_MALE_6 = 71
-;IMP_MALE_7 = 163
-;IMP_MALE_8 = 164
-
-IMP_FEMALE_1 = 54
-IMP_FEMALE_2 = 55
-IMP_FEMALE_3 = 56
+IMP_1 = 51
+IMP_2 = 52
+IMP_3 = 53
+IMP_4 = 54
+IMP_5 = 55
+IMP_6 = 56

 ;------------------------------------------------------------------------------------------------------------------------------
 ; The following values deal with the I.M.P "personalized" merc generation.