From 80bbbd367ab915f7df18fca6e6fea732e3238995 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Wed, 4 Sep 2013 10:45:26 +0000
Subject: [PATCH] - Turned on the new Feature "Merc Story Backgrounds" for the
 1.13 Mod per default (-> awesome mini feature) - Fixed crash on startup of
 "Vanilla" mod o Missing Backgrounds.xml o Made the initialization of the
 "SoldierProfileEnemy*.xml" files optional, because the "Vanilla" mod does not
 need it - Updated Ja2_Settings.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1751 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data/TableData/Backgrounds.xml        | 88 +++++++++++++++++++
 .../Profiles/UserProfile_JA2113/Ja2_sp.ini    |  4 +-
 .../UserProfile_JA2Vanilla/Ja2_Settings.INI   |  8 +-
 .../UserProfile_JA2Vanilla/Ja2_sp.ini         | 10 ++-
 .../UB/Ja2_Settings.INI                       |  8 +-
 .../UB/Ja2_sp.ini                             | 10 ++-
 .../UB_1.13/Ja2_Settings.INI                  |  6 +-
 .../UB_Vanilla/Ja2_Settings.INI               | 44 +++++-----
 8 files changed, 141 insertions(+), 37 deletions(-)
 create mode 100644 gamedir/Data/TableData/Backgrounds.xml

diff --git a/gamedir/Data/TableData/Backgrounds.xml b/gamedir/Data/TableData/Backgrounds.xml
new file mode 100644
index 000000000..2f21289c6
--- /dev/null
+++ b/gamedir/Data/TableData/Backgrounds.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>                                                                              
+<BACKGROUNDS>
+  <BACKGROUND>
+    <uiIndex>0</uiIndex>
+    <szName>Background name (128 letters)</szName>
+    <szShortName>short name (20)</szShortName>
+    <szDescription>Enter a description here. This will show up in the laptop and can be up to 256 letters long.</szDescription>
+    
+    <!-- sector dependent AP modifiers, values from -8 to 8-->
+    <ap_polar>0</ap_polar>
+    <ap_desert>0</ap_desert>
+    <ap_swamp>0</ap_swamp>
+    <ap_urban>0</ap_urban>
+    <ap_river>0</ap_river>
+    <ap_coastal>0</ap_coastal>
+    <ap_tropical>0</ap_tropical>
+    <ap_mountain>0</ap_mountain>
+    
+    <!-- stat effectiveness modifiers, values from -10 to 10 -->
+    <agility>0</agility>
+    <strength>0</strength>
+    <dexterity>0</dexterity>
+    <mechanical>0</mechanical>
+    <medical>0</medical>
+    <explosives>0</explosives>
+    <leadership>0</leadership>
+    <marksmanship>0</marksmanship>
+    
+    <!-- +- AP for other tasks-->
+    <ap_height>0</ap_height>                          <!-- +- AP if on a roof, -8 to 8 -->
+    <ap_swimming>0</ap_swimming>                      <!-- +- % APs needed for task, -40 to 40 -->
+    <ap_fortify>0</ap_fortify>                        <!-- +- % APs needed for task, -40 to 40 -->
+    <ap_artillery>0</ap_artillery>                    <!-- +- % APs needed for task, -40 to 40 -->
+    <ap_inventory>0</ap_inventory>                    <!-- +- % APs needed for task, -40 to 40 -->
+    <ap_airdrop>0</ap_airdrop>                        <!-- look into other direction after airdrop + +-AP in first turn after airdrop, -10 to 10 -->
+    <ap_assault>0</ap_assault>                        <!-- +- AP in first turn if attacking, -10 to 10 -->
+    
+    <!-- +-% travel speed modifiers, -20 to 20-->
+    <travel_foot>0</travel_foot>
+    <travel_car>0</travel_car>
+    <travel_air>0</travel_air>
+    <travel_boat>0</travel_boat>                      <!-- no boats exist in the trunk -->
+    
+    <!-- +-% resistances, -20 to 20-->
+    <resistance_poison>0</resistance_poison>
+    <resistance_fear>0</resistance_fear>
+    <resistance_suppression>0</resistance_suppression>
+    <resistance_physical>0</resistance_physical>
+    <resistance_alcohol>0</resistance_alcohol>
+    
+    <!--various boni-->
+    <interrogation>0</interrogation>                  <!-- +- prisoner interrogation strength, -50 to 300 -->
+    <prisonguard>0</prisonguard>                      <!-- +- prison guard strength, -50 to 300 -->
+    <betterprices_guns>0</betterprices_guns>          <!-- +- % prices when trading guns and ammo, -20 to 20 -->
+    <betterprices>0</betterprices>                    <!-- +- % prices when trading armour, lbe, blades, kits etc., -20 to 20 -->
+    <capitulation>0</capitulation>                    <!-- +- % total team strength when asking enemy for surrender, -50 to 100 -->
+    <speed_run>0</speed_run>                          <!-- +- running speed, -50 to 50 -->
+    <speed_bandaging>0</speed_bandaging>              <!-- +- bandaging speed, -50 to 50 -->
+    <drink_energyregen>0</drink_energyregen>          <!-- +- % breath restored by drinking, -80 to 300 -->
+    <carrystrength>0</carrystrength>                  <!-- +- % strength for weight calculations, -50 to 50 -->
+    <food>0</food>                                    <!-- +- % need for food, -50 to 100 -->
+    <water>0</water>                                  <!-- +- % need for water, -50 to 100 -->
+    <sleep>0</sleep>                                  <!-- +- need for sleep, -2 to 2 -->
+    <meleedamage>0</meleedamage>                      <!-- +- damage with melee attacks, -10 to 10 -->
+    <cth_blades>0</cth_blades>                        <!-- +- cth with blade weapons, -10 to 10 -->
+    <camo>0</camo>                                    <!-- +- effectiveness, -20 to 20 -->
+    <stealth>0</stealth>                              <!-- +- effectiveness, -20 to 20 -->
+    <increased_maxcth>0</increased_maxcth>            <!-- +- max possible cth, -5 to 5 -->
+    <hearing_night>0</hearing_night>                  <!-- +- hearing range, -10 to 10 -->
+    <hearing_day>0</hearing_day>                      <!-- +- hearing range, -10 to 10 -->
+        
+    <!-- +- % approach effectiveness, -50 to 50 -->
+    <approach_friendly>0</approach_friendly>
+    <approach_direct>0</approach_direct>
+    <approach_threaten>0</approach_threaten>
+    <approach_recruit>0</approach_recruit>
+    
+    <breachingcharge>0</breachingcharge>              <!-- +- success chance with door braching charges, -100 to 100 -->
+    
+    <!-- on/off properties: 1 for on, 0 for off -->      
+    <druguse>0</druguse>                              <!-- might use drugs from inventory (the 'Larry'-behaviour) -->
+    <xenophobic>0</xenophobic>                        <!-- lower opinion of everybody without this background -->
+    <level_underground>0</level_underground>          <!-- +1 effective level if underground -->
+    <scrounging>0</scrounging>                        <!-- might steal items (and put them in personal inventory) -->
+    <traplevel>0</traplevel>                          <!-- +1 level on bombs planted -->
+    <corruptionspread>0</corruptionspread>            <!-- unused in the trunk -->
+  </BACKGROUND>
+</BACKGROUNDS>
\ No newline at end of file
diff --git a/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini b/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini
index 92cee54c9..9947842d2 100644
--- a/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini
+++ b/gamedir/Profiles/UserProfile_JA2113/Ja2_sp.ini
@@ -147,9 +147,9 @@ USE_NCTH = 0
 IMPROVED_INTERRUPT_SYSTEM = 0
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; Story Backgrounds
+; Merc Story Backgrounds
 ;
 ; 0 = Off
 ; 1 = On
 ;------------------------------------------------------------------------------------------------------------------------------
-BACKGROUNDS = 0
\ No newline at end of file
+BACKGROUNDS = 1
\ No newline at end of file
diff --git a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI
index 0e959bdf9..ca48132f3 100644
--- a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI
+++ b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI
@@ -30,7 +30,7 @@
 
 
 [JA2 Game Settings]
-bLastSavedGameSlot                       = -1
+bLastSavedGameSlot                       = 0
 ubMusicVolumeSetting                     = 65
 ubSoundEffectsVolume                     = 65
 ubSpeechVolume                           = 65
@@ -84,15 +84,15 @@ TOPTION_QUIET_REPAIRING			 		 = FALSE
 TOPTION_QUIET_DOCTORING			 		 = FALSE
 TOPTION_AUTO_FAST_FORWARD_MODE		 	 = FALSE
 TOPTION_ZOMBIES				 			 = FALSE
-TOPTION_ENABLE_INVENTORY_POPUPS		 	 = FALSE
-TOPTION_SHOW_LBE_CONTENT		 		 = FALSE
 TOPTION_SHOW_LAST_ENEMY			 		 = FALSE
+TOPTION_SHOW_LBE_CONTENT				 = FALSE
 TOPTION_INVERT_WHEEL			 		 = FALSE
+TOPTION_ENABLE_INVENTORY_POPUPS          = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_HEADER        = FALSE
 TOPTION_FORCE_BOBBY_RAY_SHIPMENTS        = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_END           = FALSE
 TOPTION_DEBUG_MODE_OPTIONS_HEADER        = FALSE
-TOPTION_REPORT_MISS_MARGIN		 		 = FALSE
+TOPTION_REPORT_MISS_MARGIN				 = FALSE
 TOPTION_SHOW_RESET_ALL_OPTIONS           = FALSE
 TOPTION_RESET_ALL_OPTIONS                = FALSE
 TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE  = FALSE
diff --git a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_sp.ini b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_sp.ini
index 31c2ccdc6..9941282d4 100644
--- a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_sp.ini
+++ b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_sp.ini
@@ -136,4 +136,12 @@ SECRET_WEAPON_CACHES = 0
 ; 8 =  Available in 800x600 and 1024x768 screen resolution
 ; 10 = Available in 1024x768 screen resolution
 ;------------------------------------------------------------------------------------------------------------------------------
-SQUAD_SIZE = 6
\ No newline at end of file
+SQUAD_SIZE = 6
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Merc Story Backgrounds
+;
+; 0 = Off
+; 1 = On
+;------------------------------------------------------------------------------------------------------------------------------
+BACKGROUNDS = 0
\ No newline at end of file
diff --git a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_Settings.INI
index 0e959bdf9..ca48132f3 100644
--- a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_Settings.INI
+++ b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_Settings.INI
@@ -30,7 +30,7 @@
 
 
 [JA2 Game Settings]
-bLastSavedGameSlot                       = -1
+bLastSavedGameSlot                       = 0
 ubMusicVolumeSetting                     = 65
 ubSoundEffectsVolume                     = 65
 ubSpeechVolume                           = 65
@@ -84,15 +84,15 @@ TOPTION_QUIET_REPAIRING			 		 = FALSE
 TOPTION_QUIET_DOCTORING			 		 = FALSE
 TOPTION_AUTO_FAST_FORWARD_MODE		 	 = FALSE
 TOPTION_ZOMBIES				 			 = FALSE
-TOPTION_ENABLE_INVENTORY_POPUPS		 	 = FALSE
-TOPTION_SHOW_LBE_CONTENT		 		 = FALSE
 TOPTION_SHOW_LAST_ENEMY			 		 = FALSE
+TOPTION_SHOW_LBE_CONTENT				 = FALSE
 TOPTION_INVERT_WHEEL			 		 = FALSE
+TOPTION_ENABLE_INVENTORY_POPUPS          = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_HEADER        = FALSE
 TOPTION_FORCE_BOBBY_RAY_SHIPMENTS        = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_END           = FALSE
 TOPTION_DEBUG_MODE_OPTIONS_HEADER        = FALSE
-TOPTION_REPORT_MISS_MARGIN		 		 = FALSE
+TOPTION_REPORT_MISS_MARGIN				 = FALSE
 TOPTION_SHOW_RESET_ALL_OPTIONS           = FALSE
 TOPTION_RESET_ALL_OPTIONS                = FALSE
 TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE  = FALSE
diff --git a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_sp.ini b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_sp.ini
index d509697d2..4350be199 100644
--- a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_sp.ini
+++ b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB/Ja2_sp.ini
@@ -136,4 +136,12 @@ SECRET_WEAPON_CACHES = 0
 ; 8 =  Available in 800x600 and 1024x768 screen resolution
 ; 10 = Available in 1024x768 screen resolution
 ;------------------------------------------------------------------------------------------------------------------------------
-SQUAD_SIZE = 6
\ No newline at end of file
+SQUAD_SIZE = 6
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Merc Story Backgrounds
+;
+; 0 = Off
+; 1 = On
+;------------------------------------------------------------------------------------------------------------------------------
+BACKGROUNDS = 0
\ No newline at end of file
diff --git a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI
index 0e465225d..c87d58b58 100644
--- a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI
+++ b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_1.13/Ja2_Settings.INI
@@ -30,7 +30,7 @@
 
 
 [JA2 Game Settings]
-bLastSavedGameSlot                       = 10
+bLastSavedGameSlot                       = 0
 ubMusicVolumeSetting                     = 65
 ubSoundEffectsVolume                     = 65
 ubSpeechVolume                           = 65
@@ -83,16 +83,16 @@ TOPTION_QUIET_TRAINING					  = FALSE
 TOPTION_QUIET_REPAIRING				  = FALSE
 TOPTION_QUIET_DOCTORING				  = FALSE
 TOPTION_AUTO_FAST_FORWARD_MODE           = FALSE
+TOPTION_ZOMBIES				 			 = FALSE
 TOPTION_SHOW_LAST_ENEMY				  = FALSE
 TOPTION_SHOW_LBE_CONTENT				  = TRUE
 TOPTION_INVERT_WHEEL				  = FALSE
-TOPTION_ZOMBIES						  = FALSE
 TOPTION_ENABLE_INVENTORY_POPUPS          = TRUE
 TOPTION_CHEAT_MODE_OPTIONS_HEADER        = FALSE
 TOPTION_FORCE_BOBBY_RAY_SHIPMENTS        = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_END           = FALSE
 TOPTION_DEBUG_MODE_OPTIONS_HEADER        = FALSE
-TOPTION_REPORT_MISS_MARGIN				  = FALSE
+TOPTION_REPORT_MISS_MARGIN				 = FALSE
 TOPTION_SHOW_RESET_ALL_OPTIONS           = FALSE
 TOPTION_RESET_ALL_OPTIONS                = FALSE
 TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE  = FALSE
diff --git a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI
index 2cb012c21..ca48132f3 100644
--- a/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI
+++ b/gamedir/Profiles/UserProfile_UnfinishedBusiness/UB_Vanilla/Ja2_Settings.INI
@@ -30,7 +30,7 @@
 
 
 [JA2 Game Settings]
-bLastSavedGameSlot                       = -1
+bLastSavedGameSlot                       = 0
 ubMusicVolumeSetting                     = 65
 ubSoundEffectsVolume                     = 65
 ubSpeechVolume                           = 65
@@ -56,9 +56,9 @@ TOPTION_GLOW_ITEMS                       = TRUE
 TOPTION_TOGGLE_TREE_TOPS                 = TRUE
 TOPTION_TOGGLE_WIREFRAME                 = TRUE
 TOPTION_3D_CURSOR                        = FALSE
-TOPTION_CTH_CURSOR                       = TRUE
+TOPTION_CTH_CURSOR                       = FALSE
 TOPTION_GL_BURST_CURSOR                  = TRUE
-TOPTION_ALLOW_TAUNTS                     = TRUE
+TOPTION_ALLOW_TAUNTS                     = FALSE
 TOPTION_GL_HIGH_ANGLE                    = FALSE
 TOPTION_ALLOW_REAL_TIME_SNEAK            = FALSE
 TOPTION_SPACE_SELECTS_NEXT_SQUAD         = TRUE
@@ -67,32 +67,32 @@ TOPTION_SHOW_WEAPON_RANGE_IN_TILES       = TRUE
 TOPTION_TRACERS_FOR_SINGLE_FIRE          = FALSE
 TOPTION_RAIN_SOUND                       = TRUE
 TOPTION_ALLOW_CROWS                      = TRUE
-TOPTION_ALLOW_SOLDIER_TOOLTIPS           = TRUE
+TOPTION_ALLOW_SOLDIER_TOOLTIPS           = FALSE
 TOPTION_USE_AUTO_SAVE                    = FALSE
 TOPTION_SILENT_SKYRIDER                  = FALSE
-TOPTION_ENHANCED_DESC_BOX                = TRUE
+TOPTION_ENHANCED_DESC_BOX                = FALSE
 TOPTION_TOGGLE_TURN_MODE                 = FALSE
-TOPTION_STAT_PROGRESS_BARS               = TRUE
-TOPTION_ALT_MAP_COLOR					  = FALSE
-TOPTION_ALTERNATE_BULLET_GRAPHICS        = TRUE
-TOPTION_SHOW_MERC_RANKS				  = FALSE
-TOPTION_SHOW_TACTICAL_FACE_GEAR          = TRUE
-TOPTION_SHOW_TACTICAL_FACE_ICONS         = TRUE
-TOPTION_DISABLE_CURSOR_SWAP              = FALSE
-TOPTION_QUIET_TRAINING					  = FALSE
-TOPTION_QUIET_REPAIRING				  = FALSE
-TOPTION_QUIET_DOCTORING				  = FALSE
-TOPTION_AUTO_FAST_FORWARD_MODE           = FALSE
-TOPTION_SHOW_LAST_ENEMY				  = FALSE
-TOPTION_SHOW_LBE_CONTENT				  = TRUE
-TOPTION_INVERT_WHEEL				  = FALSE
-TOPTION_ZOMBIES						  = FALSE
-TOPTION_ENABLE_INVENTORY_POPUPS          = TRUE
+TOPTION_STAT_PROGRESS_BARS               = FALSE
+TOPTION_ALT_MAP_COLOR			 		 = FALSE
+TOPTION_ALTERNATE_BULLET_GRAPHICS        = FALSE
+TOPTION_SHOW_MERC_RANKS			 		 = FALSE
+TOPTION_SHOW_TACTICAL_FACE_GEAR          = FALSE
+TOPTION_SHOW_TACTICAL_FACE_ICONS         = FALSE
+TOPTION_DISABLE_CURSOR_SWAP		 		 = FALSE
+TOPTION_QUIET_TRAINING			 		 = FALSE
+TOPTION_QUIET_REPAIRING			 		 = FALSE
+TOPTION_QUIET_DOCTORING			 		 = FALSE
+TOPTION_AUTO_FAST_FORWARD_MODE		 	 = FALSE
+TOPTION_ZOMBIES				 			 = FALSE
+TOPTION_SHOW_LAST_ENEMY			 		 = FALSE
+TOPTION_SHOW_LBE_CONTENT				 = FALSE
+TOPTION_INVERT_WHEEL			 		 = FALSE
+TOPTION_ENABLE_INVENTORY_POPUPS          = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_HEADER        = FALSE
 TOPTION_FORCE_BOBBY_RAY_SHIPMENTS        = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_END           = FALSE
 TOPTION_DEBUG_MODE_OPTIONS_HEADER        = FALSE
-TOPTION_REPORT_MISS_MARGIN				  = FALSE
+TOPTION_REPORT_MISS_MARGIN				 = FALSE
 TOPTION_SHOW_RESET_ALL_OPTIONS           = FALSE
 TOPTION_RESET_ALL_OPTIONS                = FALSE
 TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE  = FALSE