From 3fde30a988f4fa8ea92076c3cda88bd13d7a53f4 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 10 May 2013 23:14:57 +0000
Subject: [PATCH] new feature: soldier profiles allows defining individual
 names/bodytypes/hair/skin/traits of soldiers and militia. The game will
 choose randomly from this pool.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1672 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/Ja2_Options.INI             |  7 +++
 .../Profiles/SoldierProfileEnemyAdmin.xml     | 62 +++++++++++++++++++
 .../Profiles/SoldierProfileEnemyElite.xml     | 62 +++++++++++++++++++
 .../Profiles/SoldierProfileEnemyRegular.xml   | 62 +++++++++++++++++++
 .../Profiles/SoldierProfileMilitiaGreen.xml   | 62 +++++++++++++++++++
 .../Profiles/SoldierProfileMilitiaRegular.xml | 62 +++++++++++++++++++
 .../Profiles/SoldierProfileMilitiaVeteran.xml | 62 +++++++++++++++++++
 gamedir/Data-UB/Ja2_Options.ini               |  7 +++
 8 files changed, 386 insertions(+)
 create mode 100644 gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyAdmin.xml
 create mode 100644 gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyElite.xml
 create mode 100644 gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyRegular.xml
 create mode 100644 gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaGreen.xml
 create mode 100644 gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaRegular.xml
 create mode 100644 gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaVeteran.xml

diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index b37ca92fe..a0c14fd82 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1580,6 +1580,13 @@ INDIVIDUAL_ENEMY_RANK = TRUE
 ;------------------------------------------------------------------------------------------------------------------------------
 INDIVIDUAL_CIVILIAN_NAMES = TRUE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Controls wether enemy soldiers/militiamen can use predefined profiles from TableData/Profiles.
+; In the xml, one can specify name/bodytype/hair/skin/traits
+; If selected, the game will select a newly created soldier's data from these profiles randomly
+;------------------------------------------------------------------------------------------------------------------------------
+SOLDIER_PROFILES_ENEMY   = TRUE
+SOLDIER_PROFILES_MILITIA = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; If this is set tot TRUE, you can repaint one type of camouflage by using different type camo kit on self. You can also use 
diff --git a/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyAdmin.xml b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyAdmin.xml
new file mode 100644
index 000000000..aceec30f6
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyAdmin.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>                                                              
+                                                                                                    
+<!--                                                                                                
+uiIndex           number of profile, 0 is a template            
+szName            name of soldier                                                                  
+uiBodyType        body type:                                                                        
+                  1: REGMALE                                                                        
+                  2: BIGMALE                                                                        
+                  3: STOCKYMALE                                                                     
+                  4: REGFEMALE                                                                      
+                                                                                                    
+uiHair            hair colour:                                                                      
+                  1: WHITEHEAD                                                                      
+                  2: BLACKHEAD                                                      
+                  3: BROWNHEAD                                                                      
+                  4: BLONDHEAD                                                                      
+                  5: REDHEAD                                                                        
+                                                                                                    
+uiSkin            skin colour:                                                                      
+                  1: PINKSKIN                                                                       
+                  2: TANSKIN                                                                        
+                  3: DARKSKIN                                                                       
+                  4: BLACKSKIN                                                                      
+                                                                                                    
+uiTrait1, uiTrait2, uiTrait3: according to the trait numbers:                                       
+                  // MAJOR TRAITS                                                                   
+                  AUTO_WEAPONS_NT, // 1                                                             
+                  HEAVY_WEAPONS_NT, // 2                                                            
+                  SNIPER_NT, // 3                                                                   
+                  RANGER_NT, // 4                                                                   
+                  GUNSLINGER_NT, // 5                                                               
+                  MARTIAL_ARTS_NT, // 6                                                             
+                  SQUADLEADER_NT, // 7                                                              
+                  TECHNICIAN_NT, // 8                                                               
+                  DOCTOR_NT, // 9                                                                   
+                                                                                                    
+                  // MINOR TRAITS                                                                   
+                  AMBIDEXTROUS_NT, // 10                                                            
+                  MELEE_NT, // 11                                                                   
+                  THROWING_NT, // 12                                                                
+                  NIGHT_OPS_NT, // 13                                                               
+                  STEALTHY_NT, // 14                                                                
+                  ATHLETICS_NT, // 15                                                               
+                  BODYBUILDING_NT, // 16                                                            
+                  DEMOLITIONS_NT, // 17                                                             
+                  TEACHING_NT, // 18                                                                
+                  SCOUTING_NT, // 19                                                                
+                                                                                                    
+                  COVERT_NT, // 20                                               
+-->                                                                                                 
+<PROFILES>
+  <PROFILE>
+    <uiIndex>0</uiIndex>
+    <szName>This template should never show up ingame...</szName>
+    <uiBodyType>0</uiBodyType>
+    <uiHair>0</uiHair>
+    <uiSkin>0</uiSkin>
+    <uiTrait1>0</uiTrait1>
+    <uiTrait2>0</uiTrait2>
+    <uiTrait3>0</uiTrait3>
+  </PROFILE>
+</PROFILES>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyElite.xml b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyElite.xml
new file mode 100644
index 000000000..aceec30f6
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyElite.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>                                                              
+                                                                                                    
+<!--                                                                                                
+uiIndex           number of profile, 0 is a template            
+szName            name of soldier                                                                  
+uiBodyType        body type:                                                                        
+                  1: REGMALE                                                                        
+                  2: BIGMALE                                                                        
+                  3: STOCKYMALE                                                                     
+                  4: REGFEMALE                                                                      
+                                                                                                    
+uiHair            hair colour:                                                                      
+                  1: WHITEHEAD                                                                      
+                  2: BLACKHEAD                                                      
+                  3: BROWNHEAD                                                                      
+                  4: BLONDHEAD                                                                      
+                  5: REDHEAD                                                                        
+                                                                                                    
+uiSkin            skin colour:                                                                      
+                  1: PINKSKIN                                                                       
+                  2: TANSKIN                                                                        
+                  3: DARKSKIN                                                                       
+                  4: BLACKSKIN                                                                      
+                                                                                                    
+uiTrait1, uiTrait2, uiTrait3: according to the trait numbers:                                       
+                  // MAJOR TRAITS                                                                   
+                  AUTO_WEAPONS_NT, // 1                                                             
+                  HEAVY_WEAPONS_NT, // 2                                                            
+                  SNIPER_NT, // 3                                                                   
+                  RANGER_NT, // 4                                                                   
+                  GUNSLINGER_NT, // 5                                                               
+                  MARTIAL_ARTS_NT, // 6                                                             
+                  SQUADLEADER_NT, // 7                                                              
+                  TECHNICIAN_NT, // 8                                                               
+                  DOCTOR_NT, // 9                                                                   
+                                                                                                    
+                  // MINOR TRAITS                                                                   
+                  AMBIDEXTROUS_NT, // 10                                                            
+                  MELEE_NT, // 11                                                                   
+                  THROWING_NT, // 12                                                                
+                  NIGHT_OPS_NT, // 13                                                               
+                  STEALTHY_NT, // 14                                                                
+                  ATHLETICS_NT, // 15                                                               
+                  BODYBUILDING_NT, // 16                                                            
+                  DEMOLITIONS_NT, // 17                                                             
+                  TEACHING_NT, // 18                                                                
+                  SCOUTING_NT, // 19                                                                
+                                                                                                    
+                  COVERT_NT, // 20                                               
+-->                                                                                                 
+<PROFILES>
+  <PROFILE>
+    <uiIndex>0</uiIndex>
+    <szName>This template should never show up ingame...</szName>
+    <uiBodyType>0</uiBodyType>
+    <uiHair>0</uiHair>
+    <uiSkin>0</uiSkin>
+    <uiTrait1>0</uiTrait1>
+    <uiTrait2>0</uiTrait2>
+    <uiTrait3>0</uiTrait3>
+  </PROFILE>
+</PROFILES>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyRegular.xml b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyRegular.xml
new file mode 100644
index 000000000..aceec30f6
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileEnemyRegular.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>                                                              
+                                                                                                    
+<!--                                                                                                
+uiIndex           number of profile, 0 is a template            
+szName            name of soldier                                                                  
+uiBodyType        body type:                                                                        
+                  1: REGMALE                                                                        
+                  2: BIGMALE                                                                        
+                  3: STOCKYMALE                                                                     
+                  4: REGFEMALE                                                                      
+                                                                                                    
+uiHair            hair colour:                                                                      
+                  1: WHITEHEAD                                                                      
+                  2: BLACKHEAD                                                      
+                  3: BROWNHEAD                                                                      
+                  4: BLONDHEAD                                                                      
+                  5: REDHEAD                                                                        
+                                                                                                    
+uiSkin            skin colour:                                                                      
+                  1: PINKSKIN                                                                       
+                  2: TANSKIN                                                                        
+                  3: DARKSKIN                                                                       
+                  4: BLACKSKIN                                                                      
+                                                                                                    
+uiTrait1, uiTrait2, uiTrait3: according to the trait numbers:                                       
+                  // MAJOR TRAITS                                                                   
+                  AUTO_WEAPONS_NT, // 1                                                             
+                  HEAVY_WEAPONS_NT, // 2                                                            
+                  SNIPER_NT, // 3                                                                   
+                  RANGER_NT, // 4                                                                   
+                  GUNSLINGER_NT, // 5                                                               
+                  MARTIAL_ARTS_NT, // 6                                                             
+                  SQUADLEADER_NT, // 7                                                              
+                  TECHNICIAN_NT, // 8                                                               
+                  DOCTOR_NT, // 9                                                                   
+                                                                                                    
+                  // MINOR TRAITS                                                                   
+                  AMBIDEXTROUS_NT, // 10                                                            
+                  MELEE_NT, // 11                                                                   
+                  THROWING_NT, // 12                                                                
+                  NIGHT_OPS_NT, // 13                                                               
+                  STEALTHY_NT, // 14                                                                
+                  ATHLETICS_NT, // 15                                                               
+                  BODYBUILDING_NT, // 16                                                            
+                  DEMOLITIONS_NT, // 17                                                             
+                  TEACHING_NT, // 18                                                                
+                  SCOUTING_NT, // 19                                                                
+                                                                                                    
+                  COVERT_NT, // 20                                               
+-->                                                                                                 
+<PROFILES>
+  <PROFILE>
+    <uiIndex>0</uiIndex>
+    <szName>This template should never show up ingame...</szName>
+    <uiBodyType>0</uiBodyType>
+    <uiHair>0</uiHair>
+    <uiSkin>0</uiSkin>
+    <uiTrait1>0</uiTrait1>
+    <uiTrait2>0</uiTrait2>
+    <uiTrait3>0</uiTrait3>
+  </PROFILE>
+</PROFILES>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaGreen.xml b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaGreen.xml
new file mode 100644
index 000000000..aceec30f6
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaGreen.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>                                                              
+                                                                                                    
+<!--                                                                                                
+uiIndex           number of profile, 0 is a template            
+szName            name of soldier                                                                  
+uiBodyType        body type:                                                                        
+                  1: REGMALE                                                                        
+                  2: BIGMALE                                                                        
+                  3: STOCKYMALE                                                                     
+                  4: REGFEMALE                                                                      
+                                                                                                    
+uiHair            hair colour:                                                                      
+                  1: WHITEHEAD                                                                      
+                  2: BLACKHEAD                                                      
+                  3: BROWNHEAD                                                                      
+                  4: BLONDHEAD                                                                      
+                  5: REDHEAD                                                                        
+                                                                                                    
+uiSkin            skin colour:                                                                      
+                  1: PINKSKIN                                                                       
+                  2: TANSKIN                                                                        
+                  3: DARKSKIN                                                                       
+                  4: BLACKSKIN                                                                      
+                                                                                                    
+uiTrait1, uiTrait2, uiTrait3: according to the trait numbers:                                       
+                  // MAJOR TRAITS                                                                   
+                  AUTO_WEAPONS_NT, // 1                                                             
+                  HEAVY_WEAPONS_NT, // 2                                                            
+                  SNIPER_NT, // 3                                                                   
+                  RANGER_NT, // 4                                                                   
+                  GUNSLINGER_NT, // 5                                                               
+                  MARTIAL_ARTS_NT, // 6                                                             
+                  SQUADLEADER_NT, // 7                                                              
+                  TECHNICIAN_NT, // 8                                                               
+                  DOCTOR_NT, // 9                                                                   
+                                                                                                    
+                  // MINOR TRAITS                                                                   
+                  AMBIDEXTROUS_NT, // 10                                                            
+                  MELEE_NT, // 11                                                                   
+                  THROWING_NT, // 12                                                                
+                  NIGHT_OPS_NT, // 13                                                               
+                  STEALTHY_NT, // 14                                                                
+                  ATHLETICS_NT, // 15                                                               
+                  BODYBUILDING_NT, // 16                                                            
+                  DEMOLITIONS_NT, // 17                                                             
+                  TEACHING_NT, // 18                                                                
+                  SCOUTING_NT, // 19                                                                
+                                                                                                    
+                  COVERT_NT, // 20                                               
+-->                                                                                                 
+<PROFILES>
+  <PROFILE>
+    <uiIndex>0</uiIndex>
+    <szName>This template should never show up ingame...</szName>
+    <uiBodyType>0</uiBodyType>
+    <uiHair>0</uiHair>
+    <uiSkin>0</uiSkin>
+    <uiTrait1>0</uiTrait1>
+    <uiTrait2>0</uiTrait2>
+    <uiTrait3>0</uiTrait3>
+  </PROFILE>
+</PROFILES>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaRegular.xml b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaRegular.xml
new file mode 100644
index 000000000..aceec30f6
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaRegular.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>                                                              
+                                                                                                    
+<!--                                                                                                
+uiIndex           number of profile, 0 is a template            
+szName            name of soldier                                                                  
+uiBodyType        body type:                                                                        
+                  1: REGMALE                                                                        
+                  2: BIGMALE                                                                        
+                  3: STOCKYMALE                                                                     
+                  4: REGFEMALE                                                                      
+                                                                                                    
+uiHair            hair colour:                                                                      
+                  1: WHITEHEAD                                                                      
+                  2: BLACKHEAD                                                      
+                  3: BROWNHEAD                                                                      
+                  4: BLONDHEAD                                                                      
+                  5: REDHEAD                                                                        
+                                                                                                    
+uiSkin            skin colour:                                                                      
+                  1: PINKSKIN                                                                       
+                  2: TANSKIN                                                                        
+                  3: DARKSKIN                                                                       
+                  4: BLACKSKIN                                                                      
+                                                                                                    
+uiTrait1, uiTrait2, uiTrait3: according to the trait numbers:                                       
+                  // MAJOR TRAITS                                                                   
+                  AUTO_WEAPONS_NT, // 1                                                             
+                  HEAVY_WEAPONS_NT, // 2                                                            
+                  SNIPER_NT, // 3                                                                   
+                  RANGER_NT, // 4                                                                   
+                  GUNSLINGER_NT, // 5                                                               
+                  MARTIAL_ARTS_NT, // 6                                                             
+                  SQUADLEADER_NT, // 7                                                              
+                  TECHNICIAN_NT, // 8                                                               
+                  DOCTOR_NT, // 9                                                                   
+                                                                                                    
+                  // MINOR TRAITS                                                                   
+                  AMBIDEXTROUS_NT, // 10                                                            
+                  MELEE_NT, // 11                                                                   
+                  THROWING_NT, // 12                                                                
+                  NIGHT_OPS_NT, // 13                                                               
+                  STEALTHY_NT, // 14                                                                
+                  ATHLETICS_NT, // 15                                                               
+                  BODYBUILDING_NT, // 16                                                            
+                  DEMOLITIONS_NT, // 17                                                             
+                  TEACHING_NT, // 18                                                                
+                  SCOUTING_NT, // 19                                                                
+                                                                                                    
+                  COVERT_NT, // 20                                               
+-->                                                                                                 
+<PROFILES>
+  <PROFILE>
+    <uiIndex>0</uiIndex>
+    <szName>This template should never show up ingame...</szName>
+    <uiBodyType>0</uiBodyType>
+    <uiHair>0</uiHair>
+    <uiSkin>0</uiSkin>
+    <uiTrait1>0</uiTrait1>
+    <uiTrait2>0</uiTrait2>
+    <uiTrait3>0</uiTrait3>
+  </PROFILE>
+</PROFILES>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaVeteran.xml b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaVeteran.xml
new file mode 100644
index 000000000..aceec30f6
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Profiles/SoldierProfileMilitiaVeteran.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>                                                              
+                                                                                                    
+<!--                                                                                                
+uiIndex           number of profile, 0 is a template            
+szName            name of soldier                                                                  
+uiBodyType        body type:                                                                        
+                  1: REGMALE                                                                        
+                  2: BIGMALE                                                                        
+                  3: STOCKYMALE                                                                     
+                  4: REGFEMALE                                                                      
+                                                                                                    
+uiHair            hair colour:                                                                      
+                  1: WHITEHEAD                                                                      
+                  2: BLACKHEAD                                                      
+                  3: BROWNHEAD                                                                      
+                  4: BLONDHEAD                                                                      
+                  5: REDHEAD                                                                        
+                                                                                                    
+uiSkin            skin colour:                                                                      
+                  1: PINKSKIN                                                                       
+                  2: TANSKIN                                                                        
+                  3: DARKSKIN                                                                       
+                  4: BLACKSKIN                                                                      
+                                                                                                    
+uiTrait1, uiTrait2, uiTrait3: according to the trait numbers:                                       
+                  // MAJOR TRAITS                                                                   
+                  AUTO_WEAPONS_NT, // 1                                                             
+                  HEAVY_WEAPONS_NT, // 2                                                            
+                  SNIPER_NT, // 3                                                                   
+                  RANGER_NT, // 4                                                                   
+                  GUNSLINGER_NT, // 5                                                               
+                  MARTIAL_ARTS_NT, // 6                                                             
+                  SQUADLEADER_NT, // 7                                                              
+                  TECHNICIAN_NT, // 8                                                               
+                  DOCTOR_NT, // 9                                                                   
+                                                                                                    
+                  // MINOR TRAITS                                                                   
+                  AMBIDEXTROUS_NT, // 10                                                            
+                  MELEE_NT, // 11                                                                   
+                  THROWING_NT, // 12                                                                
+                  NIGHT_OPS_NT, // 13                                                               
+                  STEALTHY_NT, // 14                                                                
+                  ATHLETICS_NT, // 15                                                               
+                  BODYBUILDING_NT, // 16                                                            
+                  DEMOLITIONS_NT, // 17                                                             
+                  TEACHING_NT, // 18                                                                
+                  SCOUTING_NT, // 19                                                                
+                                                                                                    
+                  COVERT_NT, // 20                                               
+-->                                                                                                 
+<PROFILES>
+  <PROFILE>
+    <uiIndex>0</uiIndex>
+    <szName>This template should never show up ingame...</szName>
+    <uiBodyType>0</uiBodyType>
+    <uiHair>0</uiHair>
+    <uiSkin>0</uiSkin>
+    <uiTrait1>0</uiTrait1>
+    <uiTrait2>0</uiTrait2>
+    <uiTrait3>0</uiTrait3>
+  </PROFILE>
+</PROFILES>
\ No newline at end of file
diff --git a/gamedir/Data-UB/Ja2_Options.ini b/gamedir/Data-UB/Ja2_Options.ini
index 05829fd78..e33f96436 100644
--- a/gamedir/Data-UB/Ja2_Options.ini
+++ b/gamedir/Data-UB/Ja2_Options.ini
@@ -1554,6 +1554,13 @@ INDIVIDUAL_ENEMY_RANK = TRUE
 ;------------------------------------------------------------------------------------------------------------------------------
 INDIVIDUAL_CIVILIAN_NAMES = TRUE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Controls wether enemy soldiers/militiamen can use predefined profiles from TableData/Profiles.
+; In the xml, one can specify name/bodytype/hair/skin/traits
+; If selected, the game will select a newly created soldier's data from these profiles randomly
+;------------------------------------------------------------------------------------------------------------------------------
+SOLDIER_PROFILES_ENEMY   = TRUE
+SOLDIER_PROFILES_MILITIA = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; If this is set tot TRUE, you can repaint one type of camouflage by using different type camo kit on self. You can also use