From 4853ee89c97a6c6d4c7dff56fee664a92386b242 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 13 Sep 2013 06:33:28 +0000 Subject: [PATCH] Mobile Militia Improvements (by moa) o see: http://www.bears-pit.com/board/ubbthreads.php/topics/325133/Re_Fix_Catched_the_mobiles.html#Post325133 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1773 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 13 +++-- .../TableData/Map/DynamicRestrictions.xml | 53 ------------------- gamedir/Data/Ja2_Options.INI | 10 +++- 3 files changed, 17 insertions(+), 59 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 654ae09b6..1fc19ccdf 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1287,7 +1287,7 @@ SOLDIER_TOOLTIP_DISPLAY_ORDERS = TRUE SOLDIER_TOOLTIP_DISPLAY_ATTITUDE = TRUE SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS = TRUE SOLDIER_TOOLTIP_DISPLAY_HEALTH = TRUE -SOLDIER_TOOLTIP_DISPLAY_ENERGY = TRUE +SOLDIER_TOOLTIP_DISPLAY_ENERGY = FALSE SOLDIER_TOOLTIP_DISPLAY_MORALE = TRUE SOLDIER_TOOLTIP_DISPLAY_TRAITS = TRUE ; Armor, Headgear @@ -1417,7 +1417,7 @@ WEAPON_RESTING_DISPLAY = TRUE WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50 ;------------------------------------------------------------------------------------------------------------------------------ -; scope modes +; Scope modes ;------------------------------------------------------------------------------------------------------------------------------ ; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical) @@ -1659,11 +1659,13 @@ INDIVIDUAL_HIDDEN_PERSON_NAMES = TRUE ; Turn this on, and the game uses individual enemy names (in tactical) defined in 'TableData\EnemyNames.xml'. ; If you set SOLDIER_PROFILES_ENEMY = TRUE the name in the profile takes precedence. ;------------------------------------------------------------------------------------------------------------------------------ + INDIVIDUAL_ENEMY_NAMES = FALSE ;------------------------------------------------------------------------------------------------------------------------------ ; Turn this on, and the game uses individual enemy ranks (in tactical) defined in 'TableData\EnemyRank.xml'. ;------------------------------------------------------------------------------------------------------------------------------ + INDIVIDUAL_ENEMY_RANK = TRUE ;------------------------------------------------------------------------------------------------------------------------------ @@ -1803,7 +1805,8 @@ ACCESS_OTHER_MERC_INVENTORIES = TRUE ; Get an AP penalty for filled backpacks. This includes the weight of the backpack itself ; 1 AP penalty for each 5kg of weight up to the penalty defined by AP_MODIFIER_PACK (default = 4) -BACKPACKWEIGHT_LOWERS_AP = FALSE +; TRUE: weightbased penalty, FALSE: no penalty +BACKPACKWEIGHT_LOWERS_AP = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -3110,11 +3113,11 @@ RESTRICT_ROAMING = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ; EXPLORATION-based restrictions ; -; Allow Mobile Militia to move through any EXPLORED sectors regardless of any other movement restrictions. +; Allow Mobile Militia to move through any EXPLORED sectors. ; RESTRICT_ROAMING must be set to TRUE. ;------------------------------------------------------------------------------------------------------------------------------ -ALLOW_MILITIA_MOVEMENT_THROUGH_EXPLORED_SECTORS = FALSE +ALLOW_MILITIA_MOVEMENT_THROUGH_EXPLORED_SECTORS = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ; CONQUEST-based restrictions diff --git a/gamedir/Data-1.13/TableData/Map/DynamicRestrictions.xml b/gamedir/Data-1.13/TableData/Map/DynamicRestrictions.xml index 54ccdcd7c..fbbf0c0e3 100644 --- a/gamedir/Data-1.13/TableData/Map/DynamicRestrictions.xml +++ b/gamedir/Data-1.13/TableData/Map/DynamicRestrictions.xml @@ -5,14 +5,6 @@ With this system in place, a militia unit trained in one city can end up patroll --> - - A9 - 2 - - - A10 - 2 - A12 2 @@ -453,16 +445,6 @@ With this system in place, a militia unit trained in one city can end up patroll K2 4 - - C5 - 2 - 12 - - - C6 - 2 - 12 - C7 2 @@ -478,16 +460,6 @@ With this system in place, a militia unit trained in one city can end up patroll 2 12 - - D4 - 2 - 12 - - - D5 - 2 - 12 - C5 6 @@ -593,11 +565,6 @@ With this system in place, a militia unit trained in one city can end up patroll 6 10 - - I6 - 6 - 10 - J6 6 @@ -613,11 +580,6 @@ With this system in place, a militia unit trained in one city can end up patroll 6 10 - - J9 - 6 - 10 - C5 4 @@ -683,11 +645,6 @@ With this system in place, a militia unit trained in one city can end up patroll 4 6 - - J9 - 4 - 6 - K6 4 @@ -703,16 +660,6 @@ With this system in place, a militia unit trained in one city can end up patroll 4 12 - - D4 - 4 - 12 - - - D5 - 4 - 12 - L2 2 diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index c97a90cd2..582ea265e 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -800,6 +800,7 @@ SHOW_CAMOUFLAGE_FACES = FALSE ;------------------------------------------------------------------------------------------------------------------------------ HIDE_ENEMY_HEALTH_TEXT = FALSE + ;------------------------------------------------------------------------------------------------------------------------------ ; If enabled, you see the health and fatigue bar when hovering over your mercs, and on the currently selected merc. ;------------------------------------------------------------------------------------------------------------------------------ @@ -1284,6 +1285,8 @@ SOLDIER_TOOLTIP_DISPLAY_ORDERS = FALSE SOLDIER_TOOLTIP_DISPLAY_ATTITUDE = FALSE SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS = FALSE SOLDIER_TOOLTIP_DISPLAY_HEALTH = FALSE +SOLDIER_TOOLTIP_DISPLAY_ENERGY = FALSE +SOLDIER_TOOLTIP_DISPLAY_MORALE = TRUE SOLDIER_TOOLTIP_DISPLAY_TRAITS = FALSE ; Armor, Headgear SOLDIER_TOOLTIP_DISPLAY_HELMET = FALSE @@ -1798,6 +1801,11 @@ ALL_NAMED_NPCS_DECIDE_ACTION = FALSE ; allow accessing other mercs inventories. This works just like stealing, but on your teammembers, even when they are dying or unconscious ACCESS_OTHER_MERC_INVENTORIES = FALSE +; Get an AP penalty for filled backpacks. This includes the weight of the backpack itself +; 1 AP penalty for each 5kg of weight up to the penalty defined by AP_MODIFIER_PACK (default = 4) +; TRUE: weightbased penalty, FALSE: no penalty +BACKPACKWEIGHT_LOWERS_AP = FALSE + ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -3103,7 +3111,7 @@ RESTRICT_ROAMING = FALSE ;------------------------------------------------------------------------------------------------------------------------------ ; EXPLORATION-based restrictions ; -; Allow Mobile Militia to move through any EXPLORED sectors regardless of any other movement restrictions. +; Allow Mobile Militia to move through any EXPLORED sectors. ; RESTRICT_ROAMING must be set to TRUE. ;------------------------------------------------------------------------------------------------------------------------------