diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index d32054325..5342a4183 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -418,19 +418,11 @@ INSANE_AP_BONUS = 5 ; MIN_LOYALTY_TO_TRAIN is the lowest loyalty a town can have and still allow you to train Militia. ;****************************************************************************************************************************** -MAX_MILITIA_PER_SECTOR = 20 +MAX_MILITIA_PER_SECTOR = 20 MAX_TRAINING_SQUAD_SIZE = 10 -MIN_LOYALTY_TO_TRAIN = 20 -MILITIA_TRAINING_COST = 750 - -; Price Modifier for training Mobile Militia -MILITIA_COST_MODIFIER = 3 - -; Price Modifier for Promoting to Regular -REGULAR_COST_MODIFIER = 1 - -; Price Modifier for Promoting to Veteran -VETERAN_COST_MODIFIER = 2 +MILITIA_TRAINING_COST = 750 +MILITIA_COST_MODIFIER = 3 +MIN_LOYALTY_TO_TRAIN = 20 ;****************************************************************************************************************************** ; Settings for mobile militia @@ -442,12 +434,6 @@ VETERAN_COST_MODIFIER = 2 ; for Mobile Militia Groups. ;****************************************************************************************************************************** -;Delay ability to train veteran militia till this day -TRAIN_VETERAN_MILITIA_DELAY = 1 - -;Delay ability to train mobile militia till this day -ALLOW_MILITIA_MOBILE_DELAY = 1 - ;Allows the training of Veteran Militia TRAIN_VETERAN_MILITIA = FALSE @@ -680,7 +666,7 @@ ENABLE_ARMOR_COVERAGE = TRUE ; Range: TRUE/FALSE ALLOW_SOLDIER_TOOL_TIPS = TRUE -; How much infomation will the soldier tooltips display +; The minimum amount of information that soldier tooltips will display ; 1 = Limited - are they wearing any armor (but not where), general type of weapon ; (but no mention of attachments), do they have a gas mask or NVG. ; 2 = Basic - do they have a helmet, or a vest, or pants, general type of weapon @@ -688,16 +674,15 @@ ALLOW_SOLDIER_TOOL_TIPS = TRUE ; 3 = Full - includes exact types of armor, model of weapon and all attachments, and type of NVG. ; 4 = Debug - as Full, but also includes APs, Health, and other info for modders. -SOLDIER_TOOLTIP_DETAIL_LEVEL = 2 +SOLDIER_TOOLTIP_DETAIL_LEVEL = 1 ; If you have not choosen (Debug tooltip level), tooltips will only be displayed on the enemy, if you are not more than 13 tiles away ; and the enemy is in line of sight of the current selected merc. ; Enable/disable individual lines of information within the tooltip -DYNAMIC_SOLDIER_TOOLTIPS = TRUE - ; 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 +DYNAMIC_SOLDIER_TOOLTIPS = TRUE SOLDIER_TOOLTIP_DISPLAY_LOCATION = TRUE SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS = TRUE diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 52bb0637a..2cd585b42 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -679,7 +679,7 @@ ENABLE_ARMOR_COVERAGE = FALSE ; Range: TRUE/FALSE ALLOW_SOLDIER_TOOL_TIPS = FALSE -; How much infomation will the soldier tooltips display +; The minimum amount of information that soldier tooltips will display ; 1 = Limited - are they wearing any armor (but not where), general type of weapon ; (but no mention of attachments), do they have a gas mask or NVG. ; 2 = Basic - do they have a helmet, or a vest, or pants, general type of weapon @@ -693,10 +693,9 @@ SOLDIER_TOOLTIP_DETAIL_LEVEL = 1 ; and the enemy is in line of sight of the current selected merc. ; Enable/disable individual lines of information within the tooltip -DYNAMIC_SOLDIER_TOOLTIPS = TRUE - ; 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 +DYNAMIC_SOLDIER_TOOLTIPS = TRUE SOLDIER_TOOLTIP_DISPLAY_LOCATION = TRUE SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS = TRUE