- slow progress for enemy items choice added

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@658 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -544,6 +544,8 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fEnableAllTerrorists				= iniReader.ReadBoolean("JA2 Gameplay Settings", "ENABLE_ALL_TERRORISTS", FALSE); 
 	gGameExternalOptions.fEnableAllWeaponCaches				= iniReader.ReadBoolean("JA2 Gameplay Settings", "ENABLE_ALL_WEAPON_CACHES", FALSE); 
 
+	gGameExternalOptions.fSlowProgressForEnemyItemsChoice	= iniReader.ReadBoolean("JA2 Gameplay Settings", "SLOW_PROGRESS_FOR_ENEMY_ITEMS_CHOICE", TRUE);
+
 	// Kaiden: Vehicle Inventory change - Added INI file Option VEHICLE_INVENTORY
 	gGameExternalOptions.fVehicleInventory					= iniReader.ReadBoolean("JA2 Gameplay Settings", "VEHICLE_INVENTORY", TRUE);
 

GameSettings.h

@@ -389,6 +389,8 @@ typedef struct
 	INT32 giExpertMercDeaths;
 	INT32 giInsaneMercDeaths;
 
+	// Lesh: slow enemy items choice progress
+	BOOLEAN fSlowProgressForEnemyItemsChoice;
 
 } GAME_EXTERNAL_OPTIONS;
 

Tactical/Inventory Choosing.cpp

@@ -247,6 +247,21 @@ void GenerateRandomEquipment( SOLDIERCREATE_STRUCT *pp, INT8 bSoldierClass, INT8
 
 	// equipment level is modified by 1/10 of the difficulty percentage, -5, so it's between -5 to +5
 	// (on normal, this is actually -4 to +4, easy is -5 to +3, and hard is -3 to +5)
+	//bEquipmentModifier = bEquipmentRating + ( ( CalcDifficultyModifier( bSoldierClass ) / 10 ) - 5 );
+
+	// Lesh 1.13 mod notes
+	// My idea of enemy choice balancing is based on bEquipmentModifier, which is influenced by
+	// game progress and difficulty. You can see that I throw out bEquipmentRating from the formulae.
+	// This variable has a very big influence to result. Also as you can see below I commented
+	// out such constants as BAD_ADMINISTRATOR_EQUIPMENT_RATING. They have big influence too,
+	// maybe because of enemy choices table was incorrectly assembled. For example:
+	// BAD_ADMINISTRATOR_EQUIPMENT_RATING is equal 1 and BAD_ELITE_EQUIPMENT_RATING is equal 5.
+	// So in the same time when admins hold crappy weapons, elites get stuff up to nearly 6 level
+	// in Drassen counter-attack. In this situation it is very hard to make balanced xml-file(IMHO).
+	// Made in optional form
+	if ( gGameExternalOptions.fSlowProgressForEnemyItemsChoice )
+		bEquipmentModifier = ( CalcDifficultyModifier( bSoldierClass ) / 10 );
+	else
 		bEquipmentModifier = bEquipmentRating + ( ( CalcDifficultyModifier( bSoldierClass ) / 10 ) - 5 );
 
 	switch( bSoldierClass )
@@ -260,6 +275,9 @@ void GenerateRandomEquipment( SOLDIERCREATE_STRUCT *pp, INT8 bSoldierClass, INT8
 
 		case SOLDIER_CLASS_ADMINISTRATOR:
 		case SOLDIER_CLASS_GREEN_MILITIA:
+			if ( gGameExternalOptions.fSlowProgressForEnemyItemsChoice )
+				bRating = bEquipmentModifier;
+			else
 				bRating = BAD_ADMINISTRATOR_EQUIPMENT_RATING + bEquipmentModifier;
 			bRating = (INT8)max( MIN_EQUIPMENT_CLASS, min( MAX_EQUIPMENT_CLASS, bRating ) );
 
@@ -302,6 +320,9 @@ void GenerateRandomEquipment( SOLDIERCREATE_STRUCT *pp, INT8 bSoldierClass, INT8
 		case SOLDIER_CLASS_ARMY:
 		case SOLDIER_CLASS_REG_MILITIA:
 			//army guys tend to have a broad range of equipment
+			if ( gGameExternalOptions.fSlowProgressForEnemyItemsChoice )
+				bRating = bEquipmentModifier;
+			else
 				bRating = BAD_ARMY_EQUIPMENT_RATING + bEquipmentModifier;
 			bRating = (INT8)max( MIN_EQUIPMENT_CLASS, min( MAX_EQUIPMENT_CLASS, bRating ) );
 
@@ -411,6 +432,9 @@ void GenerateRandomEquipment( SOLDIERCREATE_STRUCT *pp, INT8 bSoldierClass, INT8
 
 		case SOLDIER_CLASS_ELITE:
 		case SOLDIER_CLASS_ELITE_MILITIA:
+			if ( gGameExternalOptions.fSlowProgressForEnemyItemsChoice )
+				bRating = bEquipmentModifier;
+			else
 				bRating = BAD_ELITE_EQUIPMENT_RATING + bEquipmentModifier;
 			bRating = (INT8)max( MIN_EQUIPMENT_CLASS, min( MAX_EQUIPMENT_CLASS, bRating ) );
 
@@ -1631,6 +1655,8 @@ void ChooseFaceGearForSoldierCreateStruct( SOLDIERCREATE_STRUCT *pp )
 	{
 		case SOLDIER_CLASS_ELITE:
 		case SOLDIER_CLASS_ELITE_MILITIA:
+			if ( Chance( bDifficultyRating ) )
+			{
 				//All elites get a gasmask and either night goggles or uv goggles.
 				if( Chance( 75 ) )
 				{
@@ -1650,6 +1676,9 @@ void ChooseFaceGearForSoldierCreateStruct( SOLDIERCREATE_STRUCT *pp )
 						pp->Inv[ HEAD1POS ].fFlags |= OBJECT_UNDROPPABLE;
 					}
 				}
+			}
+			if ( Chance( bDifficultyRating / 3 ) )
+			{
 				if( Chance( 75 ) )
 				{
 					usItem = PickARandomItem(NVGLOW);
@@ -1668,6 +1697,7 @@ void ChooseFaceGearForSoldierCreateStruct( SOLDIERCREATE_STRUCT *pp )
 						pp->Inv[ HEAD2POS ].fFlags |= OBJECT_UNDROPPABLE;
 					}
 				}
+			}
 			break;
 		case SOLDIER_CLASS_ARMY:
 		case SOLDIER_CLASS_REG_MILITIA: