From de2efce1cfc561b6eec9f68736eb39d201307d4d Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 21 Jul 2014 18:09:59 +0000 Subject: [PATCH] Merged from revision: 2075 - Fixed extra spaces in names and nicknames in MercProfiles.xml (by Buggler) - Changed Ja2Options.ini settings (by Buggler & Sevenfm): MAX_NUMBER_PLAYER_MERCS = 32 DIRT_SYSTEM = FALSE AUTO_FAST_FORWARD_ENEMIES = 2 AUTO_FAST_FORWARD_MILITIA = 1 AUTO_FAST_FORWARD_CIVS = 1 AUTO_FAST_FORWARD_CREATURES = 1 CLOCK_SPEED_PERCENT = 120 ENEMY_CLOCK_SPEED_PERCENT = 120 - Removed unused Ja2Options.ini: MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY STAMINA_HIT - Updated ReadMe in Windows 8 Fix.zip (by Buggler) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2076 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 34 ++++++------------- gamedir/Data-1.13/TableData/Map/HeliSites.xml | 2 +- gamedir/Data-1.13/TableData/MercProfiles.xml | 32 ++++++++--------- gamedir/Data/Ja2_Options.INI | 22 +++--------- gamedir/Data/TableData/Map/HeliSites.xml | 2 +- gamedir/Data/TableData/MercProfiles.xml | 19 ++++++----- gamedir/Ja2.ini | 4 +-- 7 files changed, 45 insertions(+), 70 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index f5dbf5f2b..4a63ea588 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -82,7 +82,7 @@ ;------------------------------------------------------------------------------------------------------------------------------ ; Player mercs, valid values 16 through 32, default is 24 -MAX_NUMBER_PLAYER_MERCS = 24 +MAX_NUMBER_PLAYER_MERCS = 32 ; Player vehicles, valid values 2 through 6, default is 2 MAX_NUMBER_PLAYER_VEHICLES = 2 @@ -924,14 +924,6 @@ SHOW_SUPPRESSION_USE_ASTERISK = FALSE SHOW_SUPPRESSION_SCALE_ASTERISK = FALSE SHOW_SUPPRESSION_COUNT_ALT = FALSE -;------------------------------------------------------------------------------------------------------------------------------ -; 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 -; takes 3-4 hits to take all the breath away. -;------------------------------------------------------------------------------------------------------------------------------ - -STAMINA_HIT = 6900 - ;------------------------------------------------------------------------------------------------------------------------------ ; Additional mouse keys (and the "scrolling wheel") are enabled. Now we can use the mouse wheel to aim the weapon, ; toggle between merc-s or auto fire length. Middle mouse button is used to look (= "L" key), alt + middle mouse button changes @@ -2415,9 +2407,6 @@ CTH_PENALTY_DIVISOR_FOR_CROUCHED_SHOCKED_TARGET_HEAD = 3 CTH_PENALTY_DIVISOR_FOR_CROUCHED_SHOCKED_TARGET_TORSO = 4 CTH_PENALTY_FOR_COWERING_CROUCHED_TARGET_LEGS_DIVISOR = 5 -; Minimum range at which you get the full CTH penalty. If you are closer than this, the penalty begins to drop. -MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY = 100 - ;------------------------------------------------------------------------------------------------------------------------------ ; Shock Effects ; @@ -3119,7 +3108,7 @@ ONLY_REPAIR_GUNS_AND_ARMOUR = FALSE MERCS_CAN_DO_ADVANCED_REPAIRS = FALSE ; allows a gun to get dirty when used, thereby increasing the chance of weapon jamming -DIRT_SYSTEM = TRUE +DIRT_SYSTEM = FALSE ; repairing a gun to its currently possible maximum value also cleans the gun (always so on repair shopkeepers) FULL_REPAIR_CLEANS_GUN = FALSE @@ -3490,7 +3479,7 @@ PERCENT_EXTRA_ELITES_INSANE = 50 ; Queen's Pool ; ; These settings control how many troops the queen has for using against you, how many new troops she gets every day, -; and so on. If the queen runs out of troops, she cannot dispatch new army units to send against you. +; and so on. If the queen runs out of troops, she will take some time to recruit new soldiers. ;------------------------------------------------------------------------------------------------------------------------------ ; Determines whether or not the queen has unlimited troops. If she does, most of the settings below are completely ignored. @@ -3499,7 +3488,7 @@ UNLIMITED_POOL_OF_TROOPS_EXPERIENCED = FALSE UNLIMITED_POOL_OF_TROOPS_EXPERT = FALSE UNLIMITED_POOL_OF_TROOPS_INSANE = TRUE -; Amount of troops avaliable to the queen at game start +; Amount of troops available to the queen at game start QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE = 150 QUEENS_INITIAL_POOL_OF_TROOPS_EXPERIENCED = 200 QUEENS_INITIAL_POOL_OF_TROOPS_EXPERT = 400 @@ -4111,14 +4100,14 @@ USE_XML_SQUADNAMES = FALSE ; Range: 100 - 300 Default: 150 ;------------------------------------------------------------------------------------------------------------------------------ -CLOCK_SPEED_PERCENT = 150 +CLOCK_SPEED_PERCENT = 120 ;------------------------------------------------------------------------------------------------------------------------------ ; Clock speed percent during enemy turns ; Range: 100 - 300 Default: 150 ;------------------------------------------------------------------------------------------------------------------------------ -ENEMY_CLOCK_SPEED_PERCENT = 150 +ENEMY_CLOCK_SPEED_PERCENT = 120 ;------------------------------------------------------------------------------------------------------------------------------ ; Timeslice in microseconds. The frequency that the screen is refreshed. @@ -4146,13 +4135,10 @@ UPDATE_FREQUENCY = 16000 ; Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed ;------------------------------------------------------------------------------------------------------------------------------ -AUTO_FAST_FORWARD_ENEMIES = 0 - -AUTO_FAST_FORWARD_MILITIA = 0 - -AUTO_FAST_FORWARD_CIVS = 0 - -AUTO_FAST_FORWARD_CREATURES = 0 +AUTO_FAST_FORWARD_ENEMIES = 2 +AUTO_FAST_FORWARD_MILITIA = 1 +AUTO_FAST_FORWARD_CIVS = 1 +AUTO_FAST_FORWARD_CREATURES = 1 ;------------------------------------------------------------------------------------------------------------------------------ ; Fast forward timeslice in milliseconds. The frequency that the base clock is updated. diff --git a/gamedir/Data-1.13/TableData/Map/HeliSites.xml b/gamedir/Data-1.13/TableData/Map/HeliSites.xml index ac2aa4ccc..8ea8d6fe8 100644 --- a/gamedir/Data-1.13/TableData/Map/HeliSites.xml +++ b/gamedir/Data-1.13/TableData/Map/HeliSites.xml @@ -21,7 +21,7 @@ Fields index: NOTE: Helicopter can be initialized in Overhead.lua script. -Maximum 2 refuel sites can be used in game. +Maximum 30 refuel sites can be used in game. --> diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index 0fae68f30..12bda722c 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -54,20 +54,20 @@ - + - - - + + + - - + + - - + + @@ -1427,7 +1427,7 @@ 13 1 - Fidel Dahan + Fidel Dahan Fidel 13 8 @@ -2473,7 +2473,7 @@ 24 1 - Ron "Raider" Higgens + Ron "Raider" Higgens Raider 24 6 @@ -2663,7 +2663,7 @@ 26 1 - Kirk "Static" Stevenson + Kirk "Static" Stevenson Static 26 9 @@ -9219,7 +9219,7 @@ 95 4 - Kyle Lemmons + Kyle Lemmons Kyle 95 21 @@ -10074,7 +10074,7 @@ 104 4 - Gary "Gabby" Mulnick + Gary "Gabby" Mulnick Gabby 104 22 @@ -10454,7 +10454,7 @@ 108 4 - Yanni Nomigotta + Yanni Nomigotta Yanni 108 24 @@ -15014,7 +15014,7 @@ 156 4 - Oswald Johnston + Oswald Johnston Oswald 156 15 @@ -15110,7 +15110,7 @@ 157 4 Calvin Barkmore - Calvin + Calvin 157 29 19 diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index e1d1294f4..883781e9e 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -923,14 +923,6 @@ SHOW_SUPPRESSION_USE_ASTERISK = FALSE SHOW_SUPPRESSION_SCALE_ASTERISK = FALSE SHOW_SUPPRESSION_COUNT_ALT = FALSE -;------------------------------------------------------------------------------------------------------------------------------ -; 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 -; takes 3-4 hits to take all the breath away. -;------------------------------------------------------------------------------------------------------------------------------ - -STAMINA_HIT = 10000 - ;------------------------------------------------------------------------------------------------------------------------------ ; Additional mouse keys (and the "scrolling wheel") are enabled. Now we can use the mouse wheel to aim the weapon, ; toggle between merc-s or auto fire length. Middle mouse button is used to look (= "L" key), alt + middle mouse button changes @@ -2377,9 +2369,6 @@ CTH_PENALTY_DIVISOR_FOR_CROUCHED_SHOCKED_TARGET_HEAD = 3 CTH_PENALTY_DIVISOR_FOR_CROUCHED_SHOCKED_TARGET_TORSO = 4 CTH_PENALTY_FOR_COWERING_CROUCHED_TARGET_LEGS_DIVISOR = 5 -; Minimum range at which you get the full CTH penalty. If you are closer than this, the penalty begins to drop. -MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY = 100 - ;------------------------------------------------------------------------------------------------------------------------------ ; Shock Effects ; @@ -3404,7 +3393,7 @@ PERCENT_EXTRA_ELITES_INSANE = 50 ; Queen's Pool ; ; These settings control how many troops the queen has for using against you, how many new troops she gets every day, -; and so on. If the queen runs out of troops, she cannot dispatch new army units to send against you. +; and so on. If the queen runs out of troops, she will take some time to recruit new soldiers. ;------------------------------------------------------------------------------------------------------------------------------ ; Determines whether or not the queen has unlimited troops. If she does, most of the settings below are completely ignored. @@ -3413,7 +3402,7 @@ UNLIMITED_POOL_OF_TROOPS_EXPERIENCED = FALSE UNLIMITED_POOL_OF_TROOPS_EXPERT = FALSE UNLIMITED_POOL_OF_TROOPS_INSANE = TRUE -; Amount of troops avaliable to the queen at game start +; Amount of troops available to the queen at game start QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE = 150 QUEENS_INITIAL_POOL_OF_TROOPS_EXPERIENCED = 200 QUEENS_INITIAL_POOL_OF_TROOPS_EXPERT = 400 @@ -4025,14 +4014,14 @@ USE_XML_SQUADNAMES = FALSE ; Range: 100 - 300 Default: 150 ;------------------------------------------------------------------------------------------------------------------------------ -CLOCK_SPEED_PERCENT = 150 +CLOCK_SPEED_PERCENT = 120 ;------------------------------------------------------------------------------------------------------------------------------ ; Clock speed percent during enemy turns ; Range: 100 - 300 Default: 150 ;------------------------------------------------------------------------------------------------------------------------------ -ENEMY_CLOCK_SPEED_PERCENT = 150 +ENEMY_CLOCK_SPEED_PERCENT = 120 ;------------------------------------------------------------------------------------------------------------------------------ ; Timeslice in microseconds. The frequency that the screen is refreshed. @@ -4061,11 +4050,8 @@ UPDATE_FREQUENCY = 16000 ;------------------------------------------------------------------------------------------------------------------------------ AUTO_FAST_FORWARD_ENEMIES = 0 - AUTO_FAST_FORWARD_MILITIA = 0 - AUTO_FAST_FORWARD_CIVS = 0 - AUTO_FAST_FORWARD_CREATURES = 0 ;------------------------------------------------------------------------------------------------------------------------------ diff --git a/gamedir/Data/TableData/Map/HeliSites.xml b/gamedir/Data/TableData/Map/HeliSites.xml index ac2aa4ccc..8ea8d6fe8 100644 --- a/gamedir/Data/TableData/Map/HeliSites.xml +++ b/gamedir/Data/TableData/Map/HeliSites.xml @@ -21,7 +21,7 @@ Fields index: NOTE: Helicopter can be initialized in Overhead.lua script. -Maximum 2 refuel sites can be used in game. +Maximum 30 refuel sites can be used in game. --> diff --git a/gamedir/Data/TableData/MercProfiles.xml b/gamedir/Data/TableData/MercProfiles.xml index 64ab45337..f8aa1debc 100644 --- a/gamedir/Data/TableData/MercProfiles.xml +++ b/gamedir/Data/TableData/MercProfiles.xml @@ -54,6 +54,7 @@ + @@ -65,6 +66,8 @@ + + @@ -1189,7 +1192,7 @@ 13 1 - Fidel Dahan + Fidel Dahan Fidel 13 8 @@ -2113,7 +2116,7 @@ 24 1 - Ron "Raider" Higgens + Ron "Raider" Higgens Raider 24 6 @@ -2281,7 +2284,7 @@ 26 1 - Kirk "Static" Stevenson + Kirk "Static" Stevenson Static 26 9 @@ -8078,7 +8081,7 @@ 95 4 - Kyle Lemmons + Kyle Lemmons Kyle 95 21 @@ -8834,7 +8837,7 @@ 104 4 - Gary "Gabby" Mulnick + Gary "Gabby" Mulnick Gabby 104 22 @@ -9170,7 +9173,7 @@ 108 4 - Yanni Nomigotta + Yanni Nomigotta Yanni 108 24 @@ -13202,7 +13205,7 @@ 156 4 - Oswald Johnston + Oswald Johnston Oswald 156 15 @@ -13287,7 +13290,7 @@ 157 4 Calvin Barkmore - Calvin + Calvin 157 29 19 diff --git a/gamedir/Ja2.ini b/gamedir/Ja2.ini index 185b4efa7..208152f32 100644 --- a/gamedir/Ja2.ini +++ b/gamedir/Ja2.ini @@ -87,10 +87,10 @@ JA2_START_FILE = ja2.exe ;****************************************************************************************************************************** ; The screen resolution of the game -SCREEN_RESOLUTION = 2 +SCREEN_RESOLUTION = 4 ; The screen resolution of the map editor -EDITOR_SCREEN_RESOLUTION = 2 +EDITOR_SCREEN_RESOLUTION = 4 ;****************************************************************************************************************************** ; Select windowed or full screen mode?