1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved INITIAL_MERC_ARRIVAL_LOCATION from Ja2_Options.ini to Mod_Settings.ini. If Mod_Settings.ini has a value defined it will overwrite the value from Ja2_Options.ini. Otherwise it will leave it alone.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2303 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
silversurfer
2016-03-12 09:35:42 +00:00
parent fe6f234001
commit 03c1ff2aea
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Ja2_Options.INI
+1
View File
@@ -1668,6 +1668,7 @@ EXTERNAL_FEEDING = 2
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
; Set the grid number for the initial merc arrival location. ; Set the grid number for the initial merc arrival location.
; The JA2 default grid number is 4870 (Sector A9 Omerta). ; The JA2 default grid number is 4870 (Sector A9 Omerta).
; THIS HAS BEEN MOVED TO Mod_Settings.ini! Please set it there!
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
INITIAL_MERC_ARRIVAL_LOCATION = 4870 INITIAL_MERC_ARRIVAL_LOCATION = 4870
gamedir/Data-1.13/Mod_Settings.ini
+2
View File
@@ -76,6 +76,8 @@ PABLOS_STOLEN_DEST_GRIDNO = 1
LOST_SHIPMENT_GRIDNO = 2 LOST_SHIPMENT_GRIDNO = 2
[Omerta] [Omerta]
; initial arrival tile number in Omerta
INITIAL_MERC_ARRIVAL_LOCATION = 4870
[Drassen] [Drassen]
;meet Carmen in sector for reward collection ;meet Carmen in sector for reward collection
gamedir/Data/Ja2_Options.INI
+5 -3
View File
@@ -335,7 +335,7 @@ RECRUITABLE_JOHN_KULBA_DELAY = 14
RECRUITABLE_JA1_NATIVES = FALSE RECRUITABLE_JA1_NATIVES = FALSE
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
; If outstanding debt to MERC exceeds this, Speck will complain on the website. ; If outstanding debt to MERC exceeds this, Speck will complain on the website.
; Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt ; Note: this does NOT affect whether MERC goes bankrupt, as this is independent of the amount of debt
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
MERC_BANKRUPT_WARNING = 5000 MERC_BANKRUPT_WARNING = 5000
@@ -1479,6 +1479,7 @@ DYNAMIC_SOLDIER_TOOLTIPS = FALSE
; Enable/disable individual lines of information within the tooltip ; Enable/disable individual lines of information within the tooltip
; Set HELMET and VEST and LEGGINGS to FALSE (all 3) to prevent the display of the armor line ; Set HELMET and VEST and LEGGINGS to FALSE (all 3) to prevent the display of the armor line
; Set HEAD_SLOT_1 and HEAD_SLOT_2 both to FALSE to prevent the display of the NVG and gas mask lines ; Set HEAD_SLOT_1 and HEAD_SLOT_2 both to FALSE to prevent the display of the NVG and gas mask lines
; This requires SOLDIER_TOOLTIP_DETAIL_LEVEL = 4
; Location, Distance ; Location, Distance
SOLDIER_TOOLTIP_DISPLAY_LOCATION = FALSE SOLDIER_TOOLTIP_DISPLAY_LOCATION = FALSE
@@ -1665,6 +1666,7 @@ EXTERNAL_FEEDING = 2
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
; Set the grid number for the initial merc arrival location. ; Set the grid number for the initial merc arrival location.
; The JA2 default grid number is 4870 (Sector A9 Omerta). ; The JA2 default grid number is 4870 (Sector A9 Omerta).
; THIS HAS BEEN MOVED TO Mod_Settings.ini! Please set it there!
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
INITIAL_MERC_ARRIVAL_LOCATION = 4870 INITIAL_MERC_ARRIVAL_LOCATION = 4870
@@ -1991,7 +1993,7 @@ ENEMY_TANKS_BLOW_OBSTACLES_UP = TRUE
; If set to TRUE, tanks can be noticed as soon as any part of them is visible. ; If set to TRUE, tanks can be noticed as soon as any part of them is visible.
ENEMY_TANKS_ANY_PART_VISIBLE = FALSE ENEMY_TANKS_ANY_PART_VISIBLE = FALSE
; If set to TRUE, enemies can use launchables even against single mercs and in perfect health ; If set to TRUE, enemies can use launchables even against single mercs and in perfect health.
ENEMIES_DONT_SPARE_LAUNCHABLES = FALSE ENEMIES_DONT_SPARE_LAUNCHABLES = FALSE
; If set to TRUE, enemies can ignore chance to get through and destroy enemy cover even if it probably won't hit anyone behind it. ; If set to TRUE, enemies can ignore chance to get through and destroy enemy cover even if it probably won't hit anyone behind it.
ENEMIES_BLOW_OBSTACLES_UP = FALSE ENEMIES_BLOW_OBSTACLES_UP = FALSE
@@ -2358,7 +2360,7 @@ COVER_TOOLTIP_DISPLAY_DETAILED_TILE_PROPERTIES = TRUE
SUPPRESSION_EFFECTIVENESS = 0 SUPPRESSION_EFFECTIVENESS = 0
;------------------------------------------------------------------------------------------------------------------------------ ;------------------------------------------------------------------------------------------------------------------------------
; These modifiers control suppression effectiveness for different teams. They work together with SUPPRESSION_EFFECTIVENESS, ; These modifiers control suppression effectiveness against different teams. They work together with SUPPRESSION_EFFECTIVENESS,
; not instead ; not instead
; ;
; 0 = JA2 Default: Suppression is DISABLED. ; 0 = JA2 Default: Suppression is DISABLED.
gamedir/Data/Mod_Settings.ini
+2
View File
@@ -76,6 +76,8 @@ PABLOS_STOLEN_DEST_GRIDNO = 1
LOST_SHIPMENT_GRIDNO = 2 LOST_SHIPMENT_GRIDNO = 2
[Omerta] [Omerta]
; initial arrival tile number in Omerta
INITIAL_MERC_ARRIVAL_LOCATION = 4870
[Drassen] [Drassen]
;meet Carmen in sector for reward collection ;meet Carmen in sector for reward collection