cleanup of old data after move of difficulty settings to new DifficultySettings.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2156 4f8fa57e-7814-0410-bad4-adc449f26b7c

Data-1.13/Ja2_Options.INI

@@ -108,7 +108,6 @@ MAX_NUMBER_CIVS_IN_TACTICAL = 32
 
 MAX_STRATEGIC_ENEMY_GROUP_SIZE = 20
 
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; MAX_ITEM_SIZE is the maximum item size you can use in the game. It is possible, with enough attachments that lower a weapon
 ; size to change the weapon size to a huge number, since 0-1 = 255. If any item with a size between 0 and MAX_WEAPON_SIZE
@@ -416,17 +415,6 @@ MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30
 ; Use these settings to change the financial difficulty of the game.
 ;******************************************************************************************************************************
 
-;------------------------------------------------------------------------------------------------------------------------------
-; These are the Starting cash values for the various difficulties.
-; The only restriction with these, is the INT32 they are stored in. (range is about 2 billion)
-; You can also set negative values here.
-;------------------------------------------------------------------------------------------------------------------------------
-
-STARTING_CASH_NOVICE 		= 45000
-STARTING_CASH_EXPERIENCED 	= 35000
-STARTING_CASH_EXPERT 		= 30000 
-STARTING_CASH_INSANE 		= 15000
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Increases or decreases (by percentage) the amount of cash that mines generate every day. 
 ;
@@ -869,6 +857,7 @@ SHOW_COVER_INDICATOR = 0
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; How should the game display the enemy/player hit counter?
+
 ; 0 = Show damage inflicted as used to
 ; 1 = Show "?" as indicator if you scored a hit
 ; 2 = Do not show anything at all (If you scored a hit you need to tell by target's reaction)
@@ -2168,7 +2157,7 @@ ENEMY_MEDICS_HEAL_SELF = TRUE
 ;******************************************************************************************************************************
 
 ; allow AI officers for the AI team. An officer is a soldier with the squadleader trait. There are two stages of this:
-; a officer with squadleader trait is considered a lieutnant, an officer with squadleader(expert) is a captain.
+; a officer with squadleader trait is considered a lieutenant, an officer with squadleader(expert) is a captain.
 ; For now, a officer grants boni to the entire enemy team present:
 ; - a bonus to suppression resistance
 ; - a percentage bonus to morale

Data/Ja2_Options.INI

@@ -333,6 +333,12 @@ RECRUITABLE_JOHN_KULBA_DELAY = 14
 ;------------------------------------------------------------------------------------------------------------------------------
 
 RECRUITABLE_JA1_NATIVES = FALSE
+;------------------------------------------------------------------------------------------------------------------------------
+; If outstanding debt to MERC exceeds this, Speck will complain on the website.
+; Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt
+;------------------------------------------------------------------------------------------------------------------------------
+
+MERC_BANKRUPT_WARNING = 5000
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Early Recruitment of Rebels - This enables recruiting Rebels earlier without the need to alter their .npc files.
@@ -407,17 +413,6 @@ MERCS_RANDOM_START_SALARY_PERCENTAGE_MAX_MODIFIER = 30
 ; Use these settings to change the financial difficulty of the game.
 ;******************************************************************************************************************************
 
-;------------------------------------------------------------------------------------------------------------------------------
-; These are the Starting cash values for the various difficulties.
-; The only restriction with these, is the INT32 they are stored in. (range is about 2 billion)
-; You can also set negative values here.
-;------------------------------------------------------------------------------------------------------------------------------
-
-STARTING_CASH_NOVICE 		= 45000
-STARTING_CASH_EXPERIENCED 	= 35000
-STARTING_CASH_EXPERT 		= 30000 
-STARTING_CASH_INSANE 		= 15000
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Increases or decreases (by percentage) the amount of cash that mines generate every day. 
 ;
@@ -2160,7 +2155,7 @@ ENEMY_MEDICS_HEAL_SELF = TRUE
 ;******************************************************************************************************************************
 
 ; allow AI officers for the AI team. An officer is a soldier with the squadleader trait. There are two stages of this:
-; a officer with squadleader trait is considered a lieutnant, an officer with squadleader(expert) is a captain.
+; a officer with squadleader trait is considered a lieutenant, an officer with squadleader(expert) is a captain.
 ; For now, a officer grants boni to the entire enemy team present:
 ; - a bonus to suppression resistance
 ; - a percentage bonus to morale
@@ -2750,6 +2745,24 @@ DYNAMIC_DIALOGUE_TIME_OFFSET = 3000
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
+[PMC Settings]
+
+;******************************************************************************************************************************
+; In this section you can specify wether you will have access to a private military contractor that allows hiring militia
+;******************************************************************************************************************************
+
+; if PMC is TRUE, you will get an email from a PMC once you've started training militia.
+PMC = FALSE
+
+; on the website you can hire regular and veteran militia (for a high price). These can enter Arulco in sectors with certain facilities, 
+; like airport, harbours and border posts
+; The PMc will slowly replenish its ranks, here you can define how many militia it will have at max
+PMC_MAX_REGULARS = 35
+PMC_MAX_VETERANS = 20
+
+;******************************************************************************************************************************
+;******************************************************************************************************************************
+
 [Tactical Fortification Settings]
 
 ;******************************************************************************************************************************