MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105

Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

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

gamedir/Data-UB/Data-Files/APBPConstants.ini

@@ -332,6 +332,43 @@ AP_JUMPWINDOW = 40
 AP_JUMPWALL = 40
 AP_JUMPOFFWALL = 40
 
+;***********************************************************************
+;* Inventory costs: The APs needed to take an item from position       *
+;***********************************************************************
+AP_INV_FROM_NONE = 0
+AP_INV_FROM_HANDS = 0
+AP_INV_FROM_EQUIPMENT = 15
+AP_INV_FROM_VEST = 5
+AP_INV_FROM_RIG = 4
+AP_INV_FROM_CPACK = 6
+AP_INV_FROM_BPACK = 8
+AP_INV_FROM_SLING = 6
+AP_INV_FROM_KNIFE = 5
+AP_INV_FROM_FACE = 2
+AP_INV_FROM_BIG_POCKET = 5
+AP_INV_FROM_SMALL_POCKET = 4 
+
+;***********************************************************************
+;* Inventory costs: The APs needed to move an item to position         *
+;***********************************************************************
+AP_INV_TO_NONE = 0
+AP_INV_TO_HANDS = 0
+AP_INV_TO_EQUIPMENT = 20
+AP_INV_TO_VEST = 6
+AP_INV_TO_RIG = 5
+AP_INV_TO_CPACK = 7
+AP_INV_TO_BPACK = 8
+AP_INV_TO_SLING = 7
+AP_INV_TO_KNIFE = 6
+AP_INV_TO_FACE = 2
+AP_INV_TO_BIG_POCKET = 4
+AP_INV_TO_SMALL_POCKET = 5
+
+;***********************************************************************
+;* Inventory costs: The maximum APs for inventory costs                *
+;***********************************************************************
+AP_INV_MAX_COST = 25
+
 ;***********************************************************************
 ;* Suppression AP values                                               *
 ;* Maximum AP penalty from suppression fire from a single attack       *

gamedir/Data-UB/Data-Files/Ja2_Options.ini

@@ -109,6 +109,21 @@ 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
+; is adjusted to a number bigger than MAX_ITEM_NUMBER, the item size will be 0. If the adjusted number is greater than
+; MAX_WEAPON_SIZE but bigger than MAX_ITEM_NUMBER, MAX_WEAPON_SIZE will be set. Values 0-65000, default is 34.
+; MAX_WEAPON_SIZE is the maximum item size you want to use for weapons. All weapons will be between size 0 and MAX_WEAPON_SIZE
+; regardless of attachments. Values 0-32000, default is 9
+; OLD_INVENTORY_ITEM_NUMBER is used for items that will not appear in NIV. Values 0-65535, default is 99.
+;------------------------------------------------------------------------------------------------------------------------------
+
+MAX_ITEM_SIZE = 34
+MAX_WEAPON_SIZE = 9
+OLD_INVENTORY_ITEM_NUMBER = 99
+
+
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
@@ -584,6 +599,12 @@ AUTOMATICALLY_FLAG_MINES_WHEN_SPOTTED = TRUE
 
 MINES_SPOTTED_NO_TALK = FALSE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; If this is "TRUE" your merc won't says anything and want stop when spotting an item in turn based mode.
+;------------------------------------------------------------------------------------------------------------------------------
+
+ITEMS_SPOTTED_NO_TALK = TRUE
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; If this is "TRUE", all mercs will stand up after the battle, which is the JA2 default behaviour.
 ; If set to "FALSE", the mercs will not stand up after the battle.
@@ -661,6 +682,21 @@ TACTICAL_FACE_ICON_STYLE = 0
 
 SHOW_CAMOUFLAGE_FACES = FALSE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; If enabled, you do not see the health text when hovering the mouse over an enemy / creature.
+;------------------------------------------------------------------------------------------------------------------------------
+
+HIDE_ENEMY_HEALTH_TEXT = FALSE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; How should the game display the enemy 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)
+;------------------------------------------------------------------------------------------------------------------------------
+
+ENEMY_HIT_COUNT = 0
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 10000
 ; regulates the bullet hit impact to stamina. The lower is the value, the more stamina is taken out. With the value of 6900 it 
@@ -1406,11 +1442,8 @@ SOLDIERS_ALWAYS_WEAR_ANY_ARMOR = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Improved Interrupt System (IIS)
-; Info: There is still a bug in IIS which causes the game to hang, so it is disabled per default for now.
-;------------------------------------------------------------------------------------------------------------------------------
-; Should the new improved interrupt system (IIS) be used?
-IMPROVED_INTERRUPT_SYSTEM = FALSE
-
+; (Enable IIS on gamestart screen.)
+;
 ; Basic percent amount of enemy used APs our merc percieves and is counted towards his reaction time (make it higher to get 
 ; interrupts more frequent)
 BASIC_PERCENTAGE_APS_REGISTERED = 60
@@ -1696,7 +1729,28 @@ DELAY_IN_SECONDS_IF_SEEN_SOMEONE_DURING_LIGHTNING_IN_TURNBASED = 5
 CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35
 
 
+;******************************************************************************************************************************
+;******************************************************************************************************************************
 
+[Tactical Weapon Overheating Settings]
+
+;******************************************************************************************************************************
+; In this section you can modify global settings for weapon overheating.
+;******************************************************************************************************************************
+
+; Maximum 'temperature' a gun can have
+OVERHEATING_MAX_TEMPERATURE = 40000
+
+; Should a 'thermometer' for guns and replacable barrels be displayed?
+OVERHEATING_DISPLAY_THERMOMETER = TRUE
+
+; A weapon's cooldown factor is multiplied with this, accounting for worse heat reduction due to attachments
+OVERHEATING_COOLDOWN_MODIFICATOR_SILENCER         = 0.8
+OVERHEATING_COOLDOWN_MODIFICATOR_BARRELEXTENDER   = 0.85
+OVERHEATING_COOLDOWN_MODIFICATOR_FLASHSUPPRESSOR  = 0.97
+
+; If a barrel is not in someone's inventory, it cools down a little bit better
+OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
@@ -2000,6 +2054,21 @@ ADDITIONAL_REPAIR_MODE = TRUE
 
 ALLOW_SKYRIDER_HOT_LZ = 2
 
+;******************************************************************************************************************************
+; Always make all the terrorists to appear in Arulco.
+;
+;******************************************************************************************************************************
+
+ENABLE_ALL_TERRORISTS = TRUE
+
+;******************************************************************************************************************************
+; Enable all sectors with "secret" weapon caches. 
+; (These sectors hold usually a few chests with various mediocre to good equipment.)
+;
+;******************************************************************************************************************************
+
+ENABLE_ALL_WEAPON_CACHES = FALSE
+
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
@@ -2031,9 +2100,12 @@ FAST_WWW_SITES_LOADING = FALSE
 ; Use these settings to control Bobby Ray's on-line store, and shipments from Bobby Ray's.
 ;******************************************************************************************************************************
 
-;When enabled, mouse over a weapon in Bobby Ray's store to see a list of attachments it can take.
+; When enabled, mouse over a weapon in Bobby Ray's store to see a list of attachments it can take.
 BOBBY_RAY_TOOLTIPS_SHOW_POSSIBLE_ATTACHMENTS = TRUE
 
+; With this setting you can set the maximum purchase amount from Bobby Ray. For JA2 vanilla this is 10 per shipment.
+BOBBY_RAY_MAX_PURCHASE_AMOUNT = 30
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Item shipment settings
 ;------------------------------------------------------------------------------------------------------------------------------
@@ -2543,6 +2615,11 @@ DEVIN_USES_BOBBY_RAYS_SETTING = TRUE
 
 CHANCE_TONY_AVAILABLE = 80
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Turn on to get BR shipments faster
+
+FAST_BOBBY_RAY_SHIPMENTS = FALSE
+
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
@@ -2661,3 +2738,42 @@ REPAIR_RATE_DIVISOR = 2500
 ; the character can generate daily, and divide them by this number (normally 24, representing 24 hours).A higher value here slows
 ; down repair. A lower value speeds it up.
 REPAIR_SESSIONS_PER_DAY = 24
+
+
+[Clock Settings]
+
+;******************************************************************************************************************************
+; These settings control the speed behavior of the game.
+;******************************************************************************************************************************
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Change in Clock Speed from base clock speed in percent
+; Range: 100 - 300   Default: 150
+;------------------------------------------------------------------------------------------------------------------------------
+
+CLOCK_SPEED_PERCENT = 150
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Timeslice in microseconds. The frequency that the screen is refreshed.
+; At normal speed the clock is updated every 16 milliseconds. 
+; Range: 1000 - 20000   Default: 16000
+;------------------------------------------------------------------------------------------------------------------------------
+
+UPDATE_FREQUENCY = 16000
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Fast forward timeslice in milliseconds.  The frequency that the base clock is updated.
+; At normal speed the clock is updated every 10 milliseconds. 
+; Range: 1-10000   Default: 500
+;------------------------------------------------------------------------------------------------------------------------------
+
+FAST_FORWARD_PERIOD = 500
+
+;------------------------------------------------------------------------------------------------------------------------------
+; When the specified key(s) is pressed (and hold down), the fast forward mode will be enabled.  
+; Based on the virtual key system without VK_ prefix in http://msdn.microsoft.com/en-us/library/ms645540%28VS.85%29.aspx
+; Note MENU = [ALT], CONTROL = [CTRL]
+; Examples (separated by comma):
+; SCROLL, CONTROL + MENU + SHIFT + S,  MULTIPLY, NUMPAD9, DECIMAL, LCONTROL + RSHIFT + LALT + NUMPAD1
+;------------------------------------------------------------------------------------------------------------------------------
+FAST_FORWARD_KEY = SUBTRACT