1dot13/gamedir
1
0
Fork 0
mirror of https://github.com/1dot13/gamedir.git synced 2026-07-22 13:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 2075

Browse Source 
- 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 1700bfa652
commit 9c758c3b69
9 changed files with 45 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data-1.13/Ja2_Options.INI
+10 -24
View File
@@ -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.
Data-1.13/TableData/Map/HeliSites.xml
+1 -1
View File
@@ -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.
-->
<HELI_INFO>
<REFUELLIST>
Data-1.13/TableData/MercProfiles.xml
+16 -16
View File
@@ -54,20 +54,20 @@
<!-- major Skill (7) Deputy/Squadleader -->
<!-- major Skill (8) Technician/Engineer -->
<!-- major Skill (9) Paramedic/Doctor -->
<!-- major Skill (20) Covert Ops -->
<!-- major Skill (20) Covert Ops -->
<!-- minor Skill (10) Ambidexterous -->
<!-- minor Skill (11) Melee -->
<!-- minor Skill (12) Throwing -->
<!-- minor Skill (10) Ambidexterous -->
<!-- minor Skill (11) Melee -->
<!-- minor Skill (12) Throwing -->
<!-- minor Skill (13) Night Ops -->
<!-- minor Skill (14) Stealthy -->
<!-- minor Skill (15) Athletics -->
<!-- minor Skill (16) Bodybuilding -->
<!-- minor Skill (17) Demolitions -->
<!-- minor Skill (16) Bodybuilding -->
<!-- minor Skill (17) Demolitions -->
<!-- minor Skill (18) Teaching -->
<!-- minor Skill (19) Scouting -->
<!-- minor Skill (21) Radio Operator -->
<!-- minor Skill (22) Snitch -->
<!-- minor Skill (21) Radio Operator -->
<!-- minor Skill (22) Snitch -->
<!-- STOMP Character Traits -->
@@ -1427,7 +1427,7 @@
<PROFILE>
<uiIndex>13</uiIndex>
<Type>1</Type>
<zName>Fidel Dahan </zName>
<zName>Fidel Dahan</zName>
<zNickname>Fidel</zNickname>
<ubFaceIndex>13</ubFaceIndex>
<usEyesX>8</usEyesX>
@@ -2473,7 +2473,7 @@
<PROFILE>
<uiIndex>24</uiIndex>
<Type>1</Type>
<zName>Ron "Raider" Higgens </zName>
<zName>Ron "Raider" Higgens</zName>
<zNickname>Raider</zNickname>
<ubFaceIndex>24</ubFaceIndex>
<usEyesX>6</usEyesX>
@@ -2663,7 +2663,7 @@
<PROFILE>
<uiIndex>26</uiIndex>
<Type>1</Type>
<zName>Kirk "Static" Stevenson </zName>
<zName>Kirk "Static" Stevenson</zName>
<zNickname>Static</zNickname>
<ubFaceIndex>26</ubFaceIndex>
<usEyesX>9</usEyesX>
@@ -9219,7 +9219,7 @@
<PROFILE>
<uiIndex>95</uiIndex>
<Type>4</Type>
<zName>Kyle Lemmons</zName>
<zName>Kyle Lemmons</zName>
<zNickname>Kyle</zNickname>
<ubFaceIndex>95</ubFaceIndex>
<usEyesX>21</usEyesX>
@@ -10074,7 +10074,7 @@
<PROFILE>
<uiIndex>104</uiIndex>
<Type>4</Type>
<zName>Gary "Gabby" Mulnick </zName>
<zName>Gary "Gabby" Mulnick</zName>
<zNickname>Gabby</zNickname>
<ubFaceIndex>104</ubFaceIndex>
<usEyesX>22</usEyesX>
@@ -10454,7 +10454,7 @@
<PROFILE>
<uiIndex>108</uiIndex>
<Type>4</Type>
<zName>Yanni Nomigotta </zName>
<zName>Yanni Nomigotta</zName>
<zNickname>Yanni</zNickname>
<ubFaceIndex>108</ubFaceIndex>
<usEyesX>24</usEyesX>
@@ -15014,7 +15014,7 @@
<PROFILE>
<uiIndex>156</uiIndex>
<Type>4</Type>
<zName>Oswald Johnston</zName>
<zName>Oswald Johnston</zName>
<zNickname>Oswald</zNickname>
<ubFaceIndex>156</ubFaceIndex>
<usEyesX>15</usEyesX>
@@ -15110,7 +15110,7 @@
<uiIndex>157</uiIndex>
<Type>4</Type>
<zName>Calvin Barkmore</zName>
<zNickname>Calvin </zNickname>
<zNickname>Calvin</zNickname>
<ubFaceIndex>157</ubFaceIndex>
<usEyesX>29</usEyesX>
<usEyesY>19</usEyesY>
Data/Ja2_Options.INI
+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
;------------------------------------------------------------------------------------------------------------------------------
Data/TableData/Map/HeliSites.xml
+1 -1
View File
@@ -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.
-->
<HELI_INFO>
<REFUELLIST>
Data/TableData/MercProfiles.xml
+11 -8
View File
@@ -54,6 +54,7 @@
<!-- major Skill (7) Deputy/Squadleader -->
<!-- major Skill (8) Technician/Engineer -->
<!-- major Skill (9) Paramedic/Doctor -->
<!-- major Skill (20) Covert Ops -->
<!-- minor Skill (10) Ambidexterous -->
<!-- minor Skill (11) Melee -->
@@ -65,6 +66,8 @@
<!-- minor Skill (17) Demolitions -->
<!-- minor Skill (18) Teaching -->
<!-- minor Skill (19) Scouting -->
<!-- minor Skill (21) Radio Operator -->
<!-- minor Skill (22) Snitch -->
<!-- STOMP Character Traits -->
@@ -1189,7 +1192,7 @@
<PROFILE>
<uiIndex>13</uiIndex>
<Type>1</Type>
<zName>Fidel Dahan </zName>
<zName>Fidel Dahan</zName>
<zNickname>Fidel</zNickname>
<ubFaceIndex>13</ubFaceIndex>
<usEyesX>8</usEyesX>
@@ -2113,7 +2116,7 @@
<PROFILE>
<uiIndex>24</uiIndex>
<Type>1</Type>
<zName>Ron "Raider" Higgens </zName>
<zName>Ron "Raider" Higgens</zName>
<zNickname>Raider</zNickname>
<ubFaceIndex>24</ubFaceIndex>
<usEyesX>6</usEyesX>
@@ -2281,7 +2284,7 @@
<PROFILE>
<uiIndex>26</uiIndex>
<Type>1</Type>
<zName>Kirk "Static" Stevenson </zName>
<zName>Kirk "Static" Stevenson</zName>
<zNickname>Static</zNickname>
<ubFaceIndex>26</ubFaceIndex>
<usEyesX>9</usEyesX>
@@ -8078,7 +8081,7 @@
<PROFILE>
<uiIndex>95</uiIndex>
<Type>4</Type>
<zName>Kyle Lemmons</zName>
<zName>Kyle Lemmons</zName>
<zNickname>Kyle</zNickname>
<ubFaceIndex>95</ubFaceIndex>
<usEyesX>21</usEyesX>
@@ -8834,7 +8837,7 @@
<PROFILE>
<uiIndex>104</uiIndex>
<Type>4</Type>
<zName>Gary "Gabby" Mulnick </zName>
<zName>Gary "Gabby" Mulnick</zName>
<zNickname>Gabby</zNickname>
<ubFaceIndex>104</ubFaceIndex>
<usEyesX>22</usEyesX>
@@ -9170,7 +9173,7 @@
<PROFILE>
<uiIndex>108</uiIndex>
<Type>4</Type>
<zName>Yanni Nomigotta </zName>
<zName>Yanni Nomigotta</zName>
<zNickname>Yanni</zNickname>
<ubFaceIndex>108</ubFaceIndex>
<usEyesX>24</usEyesX>
@@ -13202,7 +13205,7 @@
<PROFILE>
<uiIndex>156</uiIndex>
<Type>4</Type>
<zName>Oswald Johnston</zName>
<zName>Oswald Johnston</zName>
<zNickname>Oswald</zNickname>
<ubFaceIndex>156</ubFaceIndex>
<usEyesX>15</usEyesX>
@@ -13287,7 +13290,7 @@
<uiIndex>157</uiIndex>
<Type>4</Type>
<zName>Calvin Barkmore</zName>
<zNickname>Calvin </zNickname>
<zNickname>Calvin</zNickname>
<ubFaceIndex>157</ubFaceIndex>
<usEyesX>29</usEyesX>
<usEyesY>19</usEyesY>
Docs/Windows Compatibility Fixes/Windows 8 Fix.zip
BIN
View File
Binary file not shown.
INIEditorJA2Options.xml
BIN
View File
Binary file not shown.
Ja2.ini
+2 -2
View File
@@ -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?