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
This commit is contained in:
Wanne
2014-07-21 18:09:59 +00:00
parent 80b08d53d2
commit de2efce1cf
7 changed files with 45 additions and 70 deletions
+4 -18
View File
@@ -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
;------------------------------------------------------------------------------------------------------------------------------