diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 109d098cd..1385fe568 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -1181,7 +1181,7 @@ WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50 ;------------------------------------------------------------------------------------------------------------------------------ ; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical) -USE_SCOPE_MODES = FALSE +USE_SCOPE_MODES = TRUE ; Allow display of scope modes on weapon DISPLAY_SCOPE_MODES = TRUE @@ -2113,7 +2113,7 @@ ENABLE_ALL_WEAPON_CACHES = FALSE BRIEFING_ROOM = FALSE ; If set to TRUE, you can browse to the encyclopedia website on the laptop -ENCYCLOPEDIA = TRUE +ENCYCLOPEDIA = FALSE ; If disabled, the transition will be skipped when opening/closing the laptop DISABLE_LAPTOP_TRANSITION = FALSE diff --git a/Data-UB/Data-Files/Ja2_Options.ini b/Data-UB/Data-Files/Ja2_Options.ini index 44ff3c4ae..382d19c49 100644 --- a/Data-UB/Data-Files/Ja2_Options.ini +++ b/Data-UB/Data-Files/Ja2_Options.ini @@ -498,10 +498,8 @@ RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE = TRUE ; Default: FALSE ; New thin progress bar in tactical interface for turns is drawn instead of the default one. ;------------------------------------------------------------------------------------------------------------------------------ - SMALL_SIZE_PB = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -605,6 +603,13 @@ MINES_SPOTTED_NO_TALK = FALSE ITEMS_SPOTTED_NO_TALK = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; If this is "TRUE", mercs can exit sector using grid exit in turn based mode, default behaviour. +; This setting does not affect leaving sectors on map edges +;------------------------------------------------------------------------------------------------------------------------------ + +GRID_EXIT_IN_TURNBASED = 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. @@ -1157,6 +1162,32 @@ ALLOW_DYNAMIC_TOOLTIP_DETAIL_LEVEL = TRUE ALLOW_WALKING_WITH_WEAPON_RAISED = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; Weapon resting features +;------------------------------------------------------------------------------------------------------------------------------ + +; Should it be allowed to rest your weapon onto tables, rocks, open windows etc. if crouched or standing? +; This basically gives you the boni you would get if in prone position, while you're crouched or standing and behind a crate, rock etc. +WEAPON_RESTING = TRUE + +; Should a little 'M' indicate your weapon is currently rested against something (useful in the beginning, when your still +; unfamiliar with the feature) +WEAPON_RESTING_DISPLAY = TRUE + +; Boni are calculated by this formula: WEAPON_RESTING_PRONE_BONI_PERCENTAGE * boni[PRONE] + (100 - WEAPON_RESTING_PRONE_BONI_PERCENTAGE) * boni[state you're in]. +; Value Range: 0 - 100. +WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50 + +;------------------------------------------------------------------------------------------------------------------------------ +; scope modes +;------------------------------------------------------------------------------------------------------------------------------ + +; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical) +USE_SCOPE_MODES = FALSE + +; Allow display of scope modes on weapon +DISPLAY_SCOPE_MODES = TRUE + ;------------------------------------------------------------------------------------------------------------------------------ ; Set the grid number for the initial merc arrival location. ; The JA2 default grid number is 4870 (Sector A9 Omerta). @@ -1738,20 +1769,21 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35 ; 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 +; Starting amount of red colour in the temperature bar. Must be in [0, 255] +OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100 -; If a barrel is not in someone's inventory, it cools down a little bit better +; If a barrel is not in someone's inventory, it cools down a little bit better. OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15 +; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector? +; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded. +; This can be exploited, but why would you do that? +; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are. +OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = TRUE + ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -2776,4 +2808,5 @@ FAST_FORWARD_PERIOD = 500 ; Examples (separated by comma): ; SCROLL, CONTROL + MENU + SHIFT + S, MULTIPLY, NUMPAD9, DECIMAL, LCONTROL + RSHIFT + LALT + NUMPAD1 ;------------------------------------------------------------------------------------------------------------------------------ + FAST_FORWARD_KEY = SUBTRACT diff --git a/Data-UB/Data-Files/TableData/Text/Chinese.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/Chinese.TacticalMessages.xml deleted file mode 100644 index 56c355eef..000000000 --- a/Data-UB/Data-Files/TableData/Text/Chinese.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s听到从Jerry身体下面传来的金属吱嘎声，这令人不安的声音听起来就像你的笔记本电脑天线被压碎一样。 - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/Dutch.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/Dutch.TacticalMessages.xml deleted file mode 100644 index 5b7be84bd..000000000 --- a/Data-UB/Data-Files/TableData/Text/Dutch.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s hears the sound of crumpling metal coming from underneath Jerry's body. It sounds disturbingly like your laptop antenna being crushed. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/French.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/French.TacticalMessages.xml deleted file mode 100644 index cd991479f..000000000 --- a/Data-UB/Data-Files/TableData/Text/French.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s entend le son de métal broyé provenant d'en dessous du corps de Jerry. On dirait que l'antenne de votre PC ne sers plus ŕ rien. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/German.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/German.TacticalMessages.xml deleted file mode 100644 index 9d8ac5c62..000000000 --- a/Data-UB/Data-Files/TableData/Text/German.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s hört das Geräusch knirschenden Metalls unter Jerry hervordringen. Es klingt grässlich - die Antenne ihres Laptop-Computers ist zerstört. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/Italian.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/Italian.TacticalMessages.xml deleted file mode 100644 index 7a7172425..000000000 --- a/Data-UB/Data-Files/TableData/Text/Italian.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s sente venire da sotto al corpo di Jerry il rumore di metallo che si accartoccia. E' un suono fastidioso, come se l'antenna del tuo portatile venisse schiacciata. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/Polish.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/Polish.TacticalMessages.xml deleted file mode 100644 index f6b5d857e..000000000 --- a/Data-UB/Data-Files/TableData/Text/Polish.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s słyszy dźwięk zgniatanego metalu dochodzący spod ciała Jerrego. To niestety zabrzmiało jak dźwięk zgniatanej anteny od twojego laptopa. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/Russian.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/Russian.TacticalMessages.xml deleted file mode 100644 index 745064634..000000000 --- a/Data-UB/Data-Files/TableData/Text/Russian.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s слышит металлический хруст под телом Джерри. Кажется, это чмо сломало антенну вашего ноутбука. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/TacticalMessages.xml deleted file mode 100644 index 5b7be84bd..000000000 --- a/Data-UB/Data-Files/TableData/Text/TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s hears the sound of crumpling metal coming from underneath Jerry's body. It sounds disturbingly like your laptop antenna being crushed. - - \ No newline at end of file diff --git a/Data-UB/Data-Files/TableData/Text/Taiwanese.TacticalMessages.xml b/Data-UB/Data-Files/TableData/Text/Taiwanese.TacticalMessages.xml deleted file mode 100644 index 5b7be84bd..000000000 --- a/Data-UB/Data-Files/TableData/Text/Taiwanese.TacticalMessages.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - 0 - %s hears the sound of crumpling metal coming from underneath Jerry's body. It sounds disturbingly like your laptop antenna being crushed. - - \ No newline at end of file diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index edaa43faa..c63e2da32 100644 --- a/Data/Ja2_Options.INI +++ b/Data/Ja2_Options.INI @@ -108,6 +108,7 @@ 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 @@ -160,7 +161,7 @@ READ_PROFILE_DATA_FROM_XML = FALSE WRITE_PROFILE_DATA_TO_XML = FALSE ;------------------------------------------------------------------------------------------------------------------------------ -; 0 = Use default drop item system for enemies (and possibly also militia). +; 0 = Use default drop item system for enemies / militia. ; 1 = Use the new drop item system from XML-Files (EnemyWeaponDrops.xml, EnemyAmmoDrops.xml, EnemyArmourDrops.xml, ; EnemyExplosiveDrops.xml, EnemyMiscDrops.xml) for enemies (and militia). ; @@ -215,11 +216,11 @@ IMP_FEMALE_3 = 56 ; The following values deal with the I.M.P "personalized" merc generation. ;------------------------------------------------------------------------------------------------------------------------------ -;The financial cost of the created IMP character. +; The financial cost of the created IMP character. IMP_PROFILE_COST = 3000 -;If this is set to TRUE, the IMP profile cost is multiplied by how many IMP characters you have generated -;(i.e. the price of the second IMP character is doubled, of third character tripled etc.) +; If this is set to TRUE, the IMP profile cost is multiplied by how many IMP characters you have generated +; (i.e. the price of the second IMP character is doubled, of third character tripled etc.) DYNAMIC_IMP_PROFILE_COST = FALSE ; This is a TOTAL amount of points distributable between the attributes. This value reflects how good IMP character @@ -227,22 +228,22 @@ DYNAMIC_IMP_PROFILE_COST = FALSE ; < 5 * imp_min_attribute + 5 * imp_bonus_points_for_zero_attribute >. IMP_INITIAL_POINTS = 500 -;How low any attribute can go before it drops straight to 0. +; How low any attribute can go before it drops straight to 0. IMP_MIN_ATTRIBUTE = 35 -;You get this many points when an attribute is lowered from IMP_MIN_ATTRIBUTE to 0. +; You get this many points when an attribute is lowered from IMP_MIN_ATTRIBUTE to 0. IMP_BONUS_POINTS_FOR_ZERO_ATTRIBUTE = 15 -;How high any attribute can be increased. +; How high any attribute can be increased. IMP_MAX_ATTRIBUTE = 85 -;The cost to increase your starting EXP level = (IMP_STARTING_LEVEL_COST_MULTIPLIER * Current EXP Level). +; The cost to increase your starting EXP level = (IMP_STARTING_LEVEL_COST_MULTIPLIER * Current EXP Level). IMP_STARTING_LEVEL_COST_MULTIPLIER = 5 -;You get this many points for selecting a disability for your IMP. +; You get this many points for selecting a disability for your IMP. IMP_BONUS_POINTS_FOR_DISABILITY = 0 -;You get this many bonus attribute points for every skill trait you haven't took at IMP creation. +; You get this many bonus attribute points for every skill trait you haven't took at IMP creation. IMP_BONUS_POINTS_PER_SKILL_NOT_TAKEN = 25 ; If set to "TRUE", IMPs with expert traits will get different items than without expert traits. @@ -495,10 +496,8 @@ RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE = FALSE ; Default: FALSE ; New thin progress bar in tactical interface for turns is drawn instead of the default one. ;------------------------------------------------------------------------------------------------------------------------------ - SMALL_SIZE_PB = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -1165,6 +1164,10 @@ ALLOW_WALKING_WITH_WEAPON_RAISED = FALSE ; Weapon resting features ;------------------------------------------------------------------------------------------------------------------------------ +; Should it be allowed to rest your weapon onto tables, rocks, open windows etc. if crouched or standing? +; This basically gives you the boni you would get if in prone position, while you're crouched or standing and behind a crate, rock etc. +WEAPON_RESTING = FALSE + ; Should a little 'M' indicate your weapon is currently rested against something (useful in the beginning, when your still ; unfamiliar with the feature) WEAPON_RESTING_DISPLAY = FALSE @@ -1178,7 +1181,6 @@ WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50 ;------------------------------------------------------------------------------------------------------------------------------ ; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical) -; Info: To see the difference field of views for the scopes, enable the mercenary-view by pressing SHIFT + V USE_SCOPE_MODES = FALSE ; Allow display of scope modes on weapons in tactical @@ -1469,7 +1471,7 @@ SOLDIERS_ALWAYS_WEAR_ANY_ARMOR = FALSE ;------------------------------------------------------------------------------------------------------------------------------ ; Improved Interrupt System (IIS) -; (Enable IIS on gamestart screen) +; (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) @@ -1494,8 +1496,6 @@ ALLOW_INSTANT_INTERRUPTS_ON_SPOTTING = FALSE ;------------------------------------------------------------------------------------------------------------------------------ - - ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -1782,7 +1782,6 @@ OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15 ; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are. OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -1875,7 +1874,6 @@ INCLUDE_CONTRACTS_IN_PROJECTED_EXPENSES_WINDOW = 0 ; If disabled, the transition from the strategy screen will be skipped before entering tactical screen DISABLE_STRATEGIC_TRANSITION = FALSE - ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -2522,8 +2520,6 @@ LEADERSHIP_AFFECTS_MOBILE_MILITIA_QUALITY = TRUE PERCENT_MOBILE_MILITIA_ELITES = 20 PERCENT_MOBILE_MILITIA_REGULARS = 30 - - ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -2654,6 +2650,7 @@ CHANCE_TONY_AVAILABLE = 80 FAST_BOBBY_RAY_SHIPMENTS = FALSE + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI b/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI index 2927ee5fc..a6889bf66 100644 --- a/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI +++ b/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI @@ -49,7 +49,7 @@ TOPTION_SHOW_MISSES = FALSE TOPTION_RTCONFIRM = FALSE TOPTION_SLEEPWAKE_NOTIFICATION = TRUE TOPTION_USE_METRIC_SYSTEM = TRUE -TOPTION_MERC_ALWAYS_LIGHT_UP = FALSE +TOPTION_MERC_ALWAYS_LIGHT_UP = TRUE TOPTION_SMART_CURSOR = FALSE TOPTION_SNAP_CURSOR_TO_DOOR = TRUE TOPTION_GLOW_ITEMS = TRUE @@ -59,7 +59,7 @@ TOPTION_3D_CURSOR = FALSE TOPTION_CTH_CURSOR = TRUE TOPTION_GL_BURST_CURSOR = TRUE TOPTION_ALLOW_TAUNTS = TRUE -TOPTION_GL_HIGH_ANGLE = FALSE +TOPTION_GL_HIGH_ANGLE = TRUE TOPTION_ALLOW_REAL_TIME_SNEAK = FALSE TOPTION_SPACE_SELECTS_NEXT_SQUAD = TRUE TOPTION_SHOW_ITEM_SHADOW = TRUE