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

@@ -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

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
 -->
 
 <DYNAMICROAMING>
-	<RESTRICTION>
-		<SectorGrid>A9</SectorGrid>
-		<ReqTown>2</ReqTown>
-	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>A10</SectorGrid>
-		<ReqTown>2</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>A12</SectorGrid>
 		<ReqTown>2</ReqTown>
@@ -453,16 +445,6 @@ With this system in place, a militia unit trained in one city can end up patroll
 		<SectorGrid>K2</SectorGrid>
 		<ReqTown>4</ReqTown>
 	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>C5</SectorGrid>
-		<ReqTown>2</ReqTown>
-		<ReqTown>12</ReqTown>
-	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>C6</SectorGrid>
-		<ReqTown>2</ReqTown>
-		<ReqTown>12</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>C7</SectorGrid>
 		<ReqTown>2</ReqTown>
@@ -478,16 +460,6 @@ With this system in place, a militia unit trained in one city can end up patroll
 		<ReqTown>2</ReqTown>
 		<ReqTown>12</ReqTown>
 	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>D4</SectorGrid>
-		<ReqTown>2</ReqTown>
-		<ReqTown>12</ReqTown>
-	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>D5</SectorGrid>
-		<ReqTown>2</ReqTown>
-		<ReqTown>12</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>C5</SectorGrid>
 		<ReqTown>6</ReqTown>
@@ -593,11 +565,6 @@ With this system in place, a militia unit trained in one city can end up patroll
 		<ReqTown>6</ReqTown>
 		<ReqTown>10</ReqTown>
 	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>I6</SectorGrid>
-		<ReqTown>6</ReqTown>
-		<ReqTown>10</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>J6</SectorGrid>
 		<ReqTown>6</ReqTown>
@@ -613,11 +580,6 @@ With this system in place, a militia unit trained in one city can end up patroll
 		<ReqTown>6</ReqTown>
 		<ReqTown>10</ReqTown>
 	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>J9</SectorGrid>
-		<ReqTown>6</ReqTown>
-		<ReqTown>10</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>C5</SectorGrid>
 		<ReqTown>4</ReqTown>
@@ -683,11 +645,6 @@ With this system in place, a militia unit trained in one city can end up patroll
 		<ReqTown>4</ReqTown>
 		<ReqTown>6</ReqTown>
 	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>J9</SectorGrid>
-		<ReqTown>4</ReqTown>
-		<ReqTown>6</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>K6</SectorGrid>
 		<ReqTown>4</ReqTown>
@@ -703,16 +660,6 @@ With this system in place, a militia unit trained in one city can end up patroll
 		<ReqTown>4</ReqTown>
 		<ReqTown>12</ReqTown>
 	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>D4</SectorGrid>
-		<ReqTown>4</ReqTown>
-		<ReqTown>12</ReqTown>
-	</RESTRICTION>
-	<RESTRICTION>
-		<SectorGrid>D5</SectorGrid>
-		<ReqTown>4</ReqTown>
-		<ReqTown>12</ReqTown>
-	</RESTRICTION>
 	<RESTRICTION>
 		<SectorGrid>L2</SectorGrid>
 		<ReqTown>2</ReqTown>

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.
 ;------------------------------------------------------------------------------------------------------------------------------