From 0962319a433e61dcf2857ad88a6a0bacde961fbc Mon Sep 17 00:00:00 2001
From: kitty624 <58940527+kitty624@users.noreply.github.com>
Date: Thu, 31 Aug 2023 02:55:51 +0200
Subject: [PATCH 1/2] Fix skill checks for backgrounds during IMP creation

fixed checks for major and minor traits determining available IMP backgrounds

edited disability trait case HEAT INTOLERANT

added case DEAF at disability traits
---
 Laptop/IMP Background.cpp | 137 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 135 insertions(+), 2 deletions(-)

diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp
index ec2694235..1ab6cd75c 100644
--- a/Laptop/IMP Background.cpp	
+++ b/Laptop/IMP Background.cpp	
@@ -17,6 +17,7 @@
 	#include "IMP Compile Character.h"
 	#include "IMP Disability Trait.h"
     #include "IMP Character Trait.h"
+    #include "IMP Minor Trait.h"
 	#include "GameSettings.h"
 	#include "Interface.h"
 
@@ -602,6 +603,11 @@ void ResetDisplaySkills()
 
 extern INT32 SkillsList[ ATTITUDE_LIST_SIZE ];
 
+extern BOOLEAN	gfSkillTraitQuestions[20];
+extern BOOLEAN	gfSkillTraitQuestions2[20];
+
+extern BOOLEAN	gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS];
+
 BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 {
 	if ( !ubNumber  )
@@ -613,6 +619,122 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 	else if ( !fCharacterIsMale && zBackground[ ubNumber ].uiFlags & BACKGROUND_NO_FEMALE )
 		return FALSE;
 
+	/* kitty: fixed following skillcheck
+	* the previous used "SkillList" and the after-remap naming convention (i.e. DOCTOR_NT) didn't work in this place/point of character creation
+	* left the out-commented previous code for reference and potential rollback
+	* used distinctive single and dual trait for major traits to allow for possible future finetuning by trait level
+	* 2023/08/30
+	*/
+
+	// major traits  (single-trait and dual-trait)
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS])
+		{
+			if (zBackground[ubNumber].value[BG_ARTILLERY] > 0) //dual trait (expert)
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_ARTILLERY] > 0) //single trait
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER])
+		{
+			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0)  //dual trait (expert)
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0)  //single trait
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS])
+		{
+			if (zBackground[ubNumber].value[BG_PERC_DAMAGE_MELEE] < 0)  //dual trait (expert)
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_PERC_DAMAGE_MELEE] < 0)  //single trait
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN])
+		{
+			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  //dual trait (expert)
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  //single trait
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR])
+		{
+			if (zBackground[ubNumber].value[BG_MEDICAL] < 0)  //dual trait (expert)
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_MEDICAL] < 0)  //single trait
+				return FALSE;
+		}
+	}
+
+	// minor traits (single trait only)
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_MELEE])
+	{
+		if (zBackground[ubNumber].value[BG_PERC_CTH_BLADE] < 0) //single trait
+			return FALSE;
+	}
+
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_STEALTHY])
+	{
+		if (zBackground[ubNumber].value[BG_PERC_STEALTH] < 0)
+			return FALSE;
+	}
+
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_ATHLETICS])
+	{
+		if (zBackground[ubNumber].value[BG_PERC_SPEED_RUNNING] < 0)
+			return FALSE;
+	}
+
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_DEMOLITIONS])
+	{
+		if (zBackground[ubNumber].value[BG_EXPLOSIVE_ASSIGN] < 0)
+			return FALSE;
+	}
+
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_SURVIVAL])
+	{
+		if (zBackground[ubNumber].value[BG_PERC_CAMO] < 0)
+			return FALSE;
+	}
+
+	/* previous code for reference
+	*
 	if ( SkillsList[0] == HEAVY_WEAPONS_NT || SkillsList[1] == HEAVY_WEAPONS_NT || SkillsList[2] == HEAVY_WEAPONS_NT )
 	{
 		if ( zBackground[ ubNumber ].value[BG_ARTILLERY] > 0 )
@@ -672,11 +794,18 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 		if ( zBackground[ ubNumber ].value[BG_EXPLOSIVE_ASSIGN] < 0 )
 			return FALSE;
 	}
+	*/
+
+	/*kitty:
+	* added BG_TROPICAL to case HEAT_INTOLERANT - since tropical sector also is part of "MercIsHot"+HEAT_INTOLERANT (SoldierProfile.cpp), like desert
+	* added case DEAF - if merc is deaf, granting any bonus to hearing seems implausible
+	* 2023/08/30
+	*/
 
 	switch ( iChosenDisabilityTrait() )
 	{
 	case HEAT_INTOLERANT:
-		if ( zBackground[ ubNumber ].value[BG_DESERT] > 0 )
+		if ( zBackground[ ubNumber ].value[BG_DESERT] > 0 || zBackground[ ubNumber ].value[BG_TROPICAL] > 0 )
 			return FALSE;
 		break;
 	case NERVOUS:
@@ -701,8 +830,12 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
 			return FALSE;
 		break;
+	case DEAF:
+		if (zBackground[ ubNumber ].value[BG_PERC_HEARING_NIGHT] > 0 || zBackground[ ubNumber ].value[BG_PERC_HEARING_DAY] > 0)
+			return FALSE;
+		break;
 	case AFRAID_OF_HEIGHTS:
-		if ( zBackground[ubNumber].value[BG_HEIGHT] > 0 )
+		if ( zBackground[ ubNumber ].value[BG_HEIGHT] > 0 )
 			return FALSE;
 		break;
 	default:

From 682dbaa8fcca3e5fda196028c4a22aeae4862608 Mon Sep 17 00:00:00 2001
From: kitty624 <58940527+kitty624@users.noreply.github.com>
Date: Tue, 19 Mar 2024 19:37:16 +0100
Subject: [PATCH 2/2] Alternative IMP Background Selection

- two new options in ja2options.ini
 ALTERNATIVE IMP CREATION
- adds new additional backgrounds, exclusive to this option
- which IMP backgrounds will be available at selection is determined by previously made choices for skills, character traits and disablities
- if a tag in background is contradicting to content of skill/character/disability, it won't be shown at selection
- what's considered contradicting is based on what's been found in code for conntent of skill/character/disability
- i.e. HeatIntolerant adds a penalty for desert and tropical sectors, so don't show backgrounds that add bonus for those sectortypes instead
- a new tag <alt_impcreation, has been added to backgrounds for this as well
- if that tag is found, it will be considered as additional IMP background exclusive to the option

REDUCED IMP CREATION
- same as above, but this time only the new additional backgrounds will be avaialable at selection
- same rules for possible restrictions to be shown

ALTERNATIVE IMP CREATION is required for REDUCED IMP CREATION to work

For ja2options.ini, a new category, "Backgrounds" was created.
This will contain the two new options and the general option to enable backgrounds

Accompanying changes in gamedir:

INIEditorJA2Options.xml
ja2options.ini
backgrounds.xml
---
 Ja2/GameSettings.cpp          |  12 +-
 Ja2/GameSettings.h            |   7 +
 Laptop/IMP Background.cpp     | 244 ++++++++++++++++++++--------------
 Laptop/IMP Disability Trait.h |   2 +-
 Laptop/IMP Minor Trait.cpp    |   2 +-
 Laptop/IMP Skill Trait.cpp    |   4 +-
 Tactical/Soldier Control.h    |   5 +-
 Tactical/XML_Background.cpp   |   8 +-
 8 files changed, 177 insertions(+), 107 deletions(-)

diff --git a/Ja2/GameSettings.cpp b/Ja2/GameSettings.cpp
index 00802dcba..e6ac7a4f2 100644
--- a/Ja2/GameSettings.cpp
+++ b/Ja2/GameSettings.cpp
@@ -992,9 +992,17 @@ void LoadGameExternalOptions()
 	//Madd: set number of pItem files to be used
 	gGameExternalOptions.ubNumPItems					= iniReader.ReadInteger("Data File Settings","NUM_P_ITEMS", 3, 3, MAX_PITEMS);
 
+	//################# Backgrounds #################
+
 	// Flugente: backgrounds
-	gGameExternalOptions.fBackGround					= iniReader.ReadBoolean("Data File Settings", "BACKGROUNDS", TRUE );
-	
+	gGameExternalOptions.fBackGround					= iniReader.ReadBoolean("Backgrounds", "ENABLE_BACKGROUNDS", TRUE );
+
+	// Kitty: show additional IMP backgrounds and determine which IMP backgrounds are available at selection based on choices for skills, chararcter traits and disabilities
+    gGameExternalOptions.fAltIMPCreation                = iniReader.ReadBoolean("Backgrounds", "ALTERNATIVE_IMP_CREATION", FALSE);
+
+	// Kitty: only show additional IMP backgrounds enabled by AlternativeImpCreation (same rules which are shown as with AlternativeImpCreation)
+	gGameExternalOptions.fReducedIMPCreation            = iniReader.ReadBoolean("Backgrounds", "REDUCED_IMP_CREATION", FALSE);
+
 	//################# Merc Recruitment Settings #################
 	
 	// silversurfer: read early recruitment options 1=immediately (control Omerta), 2=early (control 1, 2, 3 towns including Omerta)
diff --git a/Ja2/GameSettings.h b/Ja2/GameSettings.h
index b5df2be51..1aeb3404e 100644
--- a/Ja2/GameSettings.h
+++ b/Ja2/GameSettings.h
@@ -337,6 +337,7 @@ BOOLEAN UsingBackGroundSystem();
 BOOLEAN UsingImprovedInterruptSystem();
 BOOLEAN UsingInventoryCostsAPSystem();
 
+
 BOOLEAN IsNIVModeValid(bool checkRes = true);
 
 // Snap: Options read from an INI file in the default of custom Data directory
@@ -1558,6 +1559,12 @@ typedef struct
 	
 	// Flugente: backgrounds
 	BOOLEAN fBackGround;
+
+	// Kitty: Alternative IMP Creation (choices in skills/char-traits/disabilities determine available backgrounds, plus additional available backgrounds)
+    BOOLEAN fAltIMPCreation;
+
+	// Kitty: Reduced IMP Backgrounds (same as fAltIMPCreation, but for this only the additional backgrounds)
+	BOOLEAN fReducedIMPCreation;
 	
 	// Sandro: Alternative weapon holding (rifles fired from hip / pistols fired one-handed)
 	UINT8 ubAllowAlternativeWeaponHolding;
diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp
index 1ab6cd75c..14b30fa4f 100644
--- a/Laptop/IMP Background.cpp	
+++ b/Laptop/IMP Background.cpp	
@@ -608,36 +608,53 @@ extern BOOLEAN	gfSkillTraitQuestions2[20];
 
 extern BOOLEAN	gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS];
 
-BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
+BOOLEAN IsBackGroundAllowed(UINT16 ubNumber)
 {
-	if ( !ubNumber  )
+	if (!ubNumber)
 		return FALSE;
 
 	// some backgrounds are only allowed to specific genders. Set both to forbid a background from ever showing up in IMP creation (for merc-specific backgrounds)
-	if ( fCharacterIsMale && zBackground[ ubNumber ].uiFlags & BACKGROUND_NO_MALE )
+	if (fCharacterIsMale && zBackground[ubNumber].uiFlags & BACKGROUND_NO_MALE)
 		return FALSE;
-	else if ( !fCharacterIsMale && zBackground[ ubNumber ].uiFlags & BACKGROUND_NO_FEMALE )
+	else if (!fCharacterIsMale && zBackground[ubNumber].uiFlags & BACKGROUND_NO_FEMALE)
 		return FALSE;
 
-	/* kitty: fixed following skillcheck
-	* the previous used "SkillList" and the after-remap naming convention (i.e. DOCTOR_NT) didn't work in this place/point of character creation
-	* left the out-commented previous code for reference and potential rollback
-	* used distinctive single and dual trait for major traits to allow for possible future finetuning by trait level
-	* 2023/08/30
-	*/
+	// added new ini-options and accompanying background-tag
+	// choices in skills/character-traits/disabilities determine available backgrounds if true in ja2options.ini
+	// new tag <alt_impcreation> has been added to backgrounds.xml
+
+	if (!gGameExternalOptions.fAltIMPCreation)
+
+	{
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_ALT_IMP_CREATION) // don't show BG with tag <alt_impcreation> if Alt_Imp_Creation isn't true in ja2options.ini
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+
+	// show BG with tag <alt_impcreation>, 
+	// but don't show BG whose tags would contradict with a main bonus/penalty gained by skill/char-trait/disability
+
+	if (gGameExternalOptions.fAltIMPCreation)
+
+    // define which tags are considered contradicting for major traits, minor traits, disablities and character traits
 
 	// major traits  (single-trait and dual-trait)
 	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS])
 	{
 
 		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS])
-		{
-			if (zBackground[ubNumber].value[BG_ARTILLERY] > 0) //dual trait (expert)
+        {    
+			if (zBackground[ubNumber].value[BG_ARTILLERY] > 0) //dual trait (expert) 
 				return FALSE;
 		}
 		else
 		{
-			if (zBackground[ubNumber].value[BG_ARTILLERY] > 0) //single trait
+			if (zBackground[ubNumber].value[BG_ARTILLERY] > 10) //single trait
 				return FALSE;
 		}
 	}
@@ -647,12 +664,12 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 
 		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER])
 		{
-			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0)  //dual trait (expert)
+			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0 || zBackground[ubNumber].value[BG_MARKSMANSHIP] < 0 )
 				return FALSE;
 		}
 		else
 		{
-			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0)  //single trait
+			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0 )  
 				return FALSE;
 		}
 	}
@@ -662,12 +679,13 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 
 		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS])
 		{
-			if (zBackground[ubNumber].value[BG_PERC_DAMAGE_MELEE] < 0)  //dual trait (expert)
+			
+				if (zBackground[ubNumber].value[BG_RESI_PHYSICAL] < 0 )  
 				return FALSE;
 		}
 		else
 		{
-			if (zBackground[ubNumber].value[BG_PERC_DAMAGE_MELEE] < 0)  //single trait
+			if (zBackground[ubNumber].value[BG_RESI_PHYSICAL] < 0 )  
 				return FALSE;
 		}
 	}
@@ -677,12 +695,12 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 
 		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN])
 		{
-			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  //dual trait (expert)
+			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  
 				return FALSE;
 		}
 		else
 		{
-			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  //single trait
+			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  
 				return FALSE;
 		}
 	}
@@ -692,120 +710,80 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 
 		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR])
 		{
-			if (zBackground[ubNumber].value[BG_MEDICAL] < 0)  //dual trait (expert)
+			if (zBackground[ubNumber].value[BG_PERC_BANDAGING] < 0 || zBackground[ubNumber].value[BG_MEDICAL] < 0 )
 				return FALSE;
 		}
 		else
 		{
-			if (zBackground[ubNumber].value[BG_MEDICAL] < 0)  //single trait
+			if (zBackground[ubNumber].value[BG_PERC_BANDAGING] < 0)  
 				return FALSE;
 		}
 	}
 
-	// minor traits (single trait only)
-	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_MELEE])
-	{
-		if (zBackground[ubNumber].value[BG_PERC_CTH_BLADE] < 0) //single trait
-			return FALSE;
-	}
-
-	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_STEALTHY])
-	{
-		if (zBackground[ubNumber].value[BG_PERC_STEALTH] < 0)
-			return FALSE;
-	}
-
-	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_ATHLETICS])
-	{
-		if (zBackground[ubNumber].value[BG_PERC_SPEED_RUNNING] < 0)
-			return FALSE;
-	}
-
-	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_DEMOLITIONS])
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER])
 	{
-		if (zBackground[ubNumber].value[BG_EXPLOSIVE_ASSIGN] < 0)
-			return FALSE;
-	}
-
-	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_SURVIVAL])
-	{
-		if (zBackground[ubNumber].value[BG_PERC_CAMO] < 0)
-			return FALSE;
-	}
 
-	/* previous code for reference
-	*
-	if ( SkillsList[0] == HEAVY_WEAPONS_NT || SkillsList[1] == HEAVY_WEAPONS_NT || SkillsList[2] == HEAVY_WEAPONS_NT )
-	{
-		if ( zBackground[ ubNumber ].value[BG_ARTILLERY] > 0 )
-			return FALSE;
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER])
+		{
+			if (zBackground[ubNumber].value[BG_RESI_SUPPRESSION] < 0 || zBackground[ubNumber].value[BG_RESI_FEAR] < 0 )
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_RESI_SUPPRESSION] < 0)
+				return FALSE;
+		}
 	}
 
-	if ( SkillsList[0] == SNIPER_NT || SkillsList[1] == SNIPER_NT || SkillsList[2] == SNIPER_NT )
+	// Minor Traits (single trait only) 
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_MELEE])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_CTH_MAX] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_CTH_BLADE] < 0 || zBackground[ubNumber].value[BG_PERC_DAMAGE_MELEE] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == SURVIVAL_NT || SkillsList[1] == SURVIVAL_NT || SkillsList[2] == SURVIVAL_NT )
-	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_CAMO] < 0 )
-			return FALSE;
-	}
-	
-	if ( SkillsList[0] == MARTIAL_ARTS_NT || SkillsList[1] == MARTIAL_ARTS_NT || SkillsList[2] == MARTIAL_ARTS_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_STEALTHY])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_DAMAGE_MELEE] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_STEALTH] < 0)
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == TECHNICIAN_NT || SkillsList[1] == TECHNICIAN_NT || SkillsList[2] == TECHNICIAN_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_DEMOLITIONS])  
 	{
-		if ( zBackground[ ubNumber ].value[BG_MECHANICAL] < 0 )
+		if (zBackground[ubNumber].value[BG_BONUS_BREACHINGCHARGE] < 0 || zBackground[ubNumber].value[BG_EXPLOSIVE_ASSIGN] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == DOCTOR_NT || SkillsList[1] == DOCTOR_NT || SkillsList[2] == DOCTOR_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_SURVIVAL]) 
 	{
-		if ( zBackground[ ubNumber ].value[BG_MEDICAL] < 0 )
+		if (zBackground[ubNumber].value[BG_TRAVEL_FOOT] < 0 || zBackground[ubNumber].value[BG_TRAVEL_CAR] <0 || zBackground[ubNumber].value[BG_TRAVEL_AIR] <0 ||
+			zBackground[ubNumber].value[BG_RESI_DISEASE] < 0  || zBackground[ubNumber].value[BG_SNAKEDEFENSE] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == MELEE_NT || SkillsList[1] == MELEE_NT || SkillsList[2] == MELEE_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_BODYBUILDING])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_CTH_BLADE] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_CARRYSTRENGTH] < 0)
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == STEALTHY_NT || SkillsList[1] == STEALTHY_NT || SkillsList[2] == STEALTHY_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_AMBIDEXTROUS])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_STEALTH] < 0 )
+		if (zBackground[ubNumber].value[BG_INVENTORY] > 0)
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == ATHLETICS_NT || SkillsList[1] == ATHLETICS_NT || SkillsList[2] == ATHLETICS_NT )
-	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_SPEED_RUNNING] < 0 )
-			return FALSE;
-	}
-		
-	if ( SkillsList[0] == DEMOLITIONS_NT || SkillsList[1] == DEMOLITIONS_NT || SkillsList[2] == DEMOLITIONS_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_NIGHT_OPS])
 	{
-		if ( zBackground[ ubNumber ].value[BG_EXPLOSIVE_ASSIGN] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_SLEEP] > 0 || zBackground[ubNumber].value[BG_PERC_HEARING_NIGHT] < 0 )
 			return FALSE;
 	}
-	*/
-
-	/*kitty:
-	* added BG_TROPICAL to case HEAT_INTOLERANT - since tropical sector also is part of "MercIsHot"+HEAT_INTOLERANT (SoldierProfile.cpp), like desert
-	* added case DEAF - if merc is deaf, granting any bonus to hearing seems implausible
-	* 2023/08/30
-	*/
 
-	switch ( iChosenDisabilityTrait() )
+	// Disabiliies
+	switch (iChosenDisabilityTrait())
 	{
 	case HEAT_INTOLERANT:
-		if ( zBackground[ ubNumber ].value[BG_DESERT] > 0 || zBackground[ ubNumber ].value[BG_TROPICAL] > 0 )
+		if (zBackground[ubNumber].value[BG_DESERT] > 0 || zBackground[ubNumber].value[BG_TROPICAL] > 0)  
 			return FALSE;
 		break;
 	case NERVOUS:
@@ -815,7 +793,7 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 			return FALSE;
 		break;
 	case NONSWIMMER:
-		if ( zBackground[ ubNumber ].value[BG_RIVER] > 0 || zBackground[ ubNumber ].value[BG_COASTAL] > 0 || zBackground[ ubNumber ].value[BG_SWIMMING] > 0 )
+		if ( zBackground[ ubNumber ].value[BG_RIVER] > 0 || zBackground[ ubNumber ].value[BG_COASTAL] > 0 )
 			return FALSE;
 		break;
 	case FEAR_OF_INSECTS:
@@ -823,39 +801,109 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 			return FALSE;
 		break;
 	case FORGETFUL:
-		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
+		if (zBackground[ubNumber].value[BG_INVENTORY] < 0 || zBackground[ubNumber].value[BG_ASSAULT] < 0 )
 			return FALSE;
 		break;
 	case PSYCHO:
-		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
+		if (zBackground[ubNumber].value[BG_LEADERSHIP] > 5)
 			return FALSE;
 		break;
 	case DEAF:
 		if (zBackground[ ubNumber ].value[BG_PERC_HEARING_NIGHT] > 0 || zBackground[ ubNumber ].value[BG_PERC_HEARING_DAY] > 0)
 			return FALSE;
 		break;
+	case SHORTSIGHTED:
+		if (zBackground[ ubNumber ].value[BG_PERC_CTH_MAX] > 0 || zBackground[ubNumber].value[BG_PERC_SPOTTER] > 0 )
+			return FALSE;
+		break;
+	case HEMOPHILIAC:
+		if (zBackground[ubNumber].value[BG_RESI_DISEASE] > 0)
+			return FALSE;
+		break;
 	case AFRAID_OF_HEIGHTS:
-		if ( zBackground[ ubNumber ].value[BG_HEIGHT] > 0 )
+		if ( zBackground[ ubNumber ].value[BG_HEIGHT] > 0 || zBackground[ubNumber].value[BG_AIRDROP] > 0 )
+			return FALSE;
+		break;
+	case SELF_HARM:
+		if (zBackground[ubNumber].value[BG_RESI_DISEASE] > 0)
 			return FALSE;
 		break;
 	default:
 		break;
 	}
 
-	switch ( iChosenCharacterTrait() )
+	// Character Traits
+	switch (iChosenCharacterTrait())
 	{
 	case CHAR_TRAIT_SOCIABLE:
-		if ( zBackground[ ubNumber ].uiFlags & BACKGROUND_XENOPHOBIC )
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_XENOPHOBIC || zBackground[ubNumber].value[BG_PERC_SPOTTER] < 0)
 			return FALSE;
 		break;
 	case CHAR_TRAIT_LONER:
-		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
+		if (zBackground[ubNumber].value[BG_LEADERSHIP] > 0 || zBackground[ubNumber].value[BG_PERC_SPOTTER] > 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_OPTIMIST:
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_TRAPLEVEL)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_ASSERTIVE:
+		if (zBackground[ubNumber].value[BG_PERC_INTERROGATION] < 0 || zBackground[ubNumber].value[BG_PERC_APPROACH_THREATEN] < 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_INTELLECTUAL:
+		if (zBackground[ubNumber].value[BG_ADMINISTRATION_ASSIGNMENT] < 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_PRIMITIVE:
+		if (zBackground[ubNumber].value[BG_ADMINISTRATION_ASSIGNMENT] > 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_AGGRESSIVE:
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_TRAPLEVEL || zBackground[ubNumber].value[BG_PERC_DISARM] > 0 )
+			return FALSE;
+		break;
+	case CHAR_TRAIT_PHLEGMATIC:
+		if (zBackground[ubNumber].value[BG_ASSAULT] > 0 )
+			return FALSE;
+		break;
+	case CHAR_TRAIT_DAUNTLESS:
+		if (zBackground[ubNumber].value[BG_CROUCHEDDEFENSE] < 0 )
+			return FALSE;
+		break;
+	case CHAR_TRAIT_PACIFIST:
+		break;
+	case CHAR_TRAIT_MALICIOUS:
+		if (zBackground[ubNumber].value[BG_PERC_APPROACH_FRIENDLY] > 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_SHOWOFF:
+		break;
+	case CHAR_TRAIT_COWARD:
+		if (zBackground[ubNumber].value[BG_PERC_CAPITULATION] > 0)
 			return FALSE;
 		break;
 	default:
 		break;
 	}
 
+	// show exclusivly the BG's with tag <alt_impcreation> if Reduced_Imp_Creation is true in ja2options.ini
+	// requires Alt_Imp_Creation to be true in ja2options.ini (otherwise BG's with tag <alt_impcreation> won't be shown)
+
+	if (gGameExternalOptions.fReducedIMPCreation)
+
+	{
+
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_ALT_IMP_CREATION)   
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 
diff --git a/Laptop/IMP Disability Trait.h b/Laptop/IMP Disability Trait.h
index ce728d739..58ffd66ae 100644
--- a/Laptop/IMP Disability Trait.h	
+++ b/Laptop/IMP Disability Trait.h	
@@ -8,7 +8,7 @@ void RenderIMPDisabilityTrait( void );
 void ExitIMPDisabilityTrait( void );
 void HandleIMPDisabilityTrait( void );
 
-INT8 iChosenDisabilityTrait();
+INT8 iChosenDisabilityTrait(); 
 INT8 iPlayersAttributePointsBonusForDisabilitySelected();
 
 #endif
diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp
index 51286ca91..848b4c497 100644
--- a/Laptop/IMP Minor Trait.cpp	
+++ b/Laptop/IMP Minor Trait.cpp	
@@ -80,7 +80,7 @@ UINT8 gusNewMinorTraitRemap[IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS] =
 
 BOOLEAN gfIMT_Redraw=FALSE;
 
-BOOLEAN	gfMinorTraitQuestions[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ];
+BOOLEAN	gfMinorTraitQuestions[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ]; 
 
 // these are the buttons for the questions
 INT32 giIMPMinorTraitAnswerButton[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ];
diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp
index eb1e18df6..93fab856c 100644
--- a/Laptop/IMP Skill Trait.cpp	
+++ b/Laptop/IMP Skill Trait.cpp	
@@ -98,8 +98,8 @@ UINT8 gusOldMajorTraitRemap[IMP_SKILL_TRAITS__NUMBER_SKILLS] =
 // Global Variables
 //
 //*******************************************************************
-BOOLEAN	gfSkillTraitQuestions[ 20 ];
-BOOLEAN	gfSkillTraitQuestions2[ 20 ];
+BOOLEAN	gfSkillTraitQuestions[ 20 ]; 
+BOOLEAN	gfSkillTraitQuestions2[ 20 ]; 
 
 
 BOOLEAN gfIST_Redraw=FALSE;
diff --git a/Tactical/Soldier Control.h b/Tactical/Soldier Control.h
index f461f30dc..74c08462e 100644
--- a/Tactical/Soldier Control.h	
+++ b/Tactical/Soldier Control.h	
@@ -466,12 +466,13 @@ enum
 
 #define BACKGROUND_ANIMALFRIEND					0x0000000000000200	//512			// refuses to attack animals
 #define BACKGROUND_CIVGROUPLOYAL				0x0000000000000400	//1024			// refuses to attack members of the same civgroup
+#define BACKGROUND_ALT_IMP_CREATION				0x0000000000000800	//2048			// BG can only be used when ALT_IMP_CREATION is TRUE in ja2options.ini (IMP creation)
 
-#define BACKGROUND_FLAG_MAX	11					// number of flagged backgrounds - keep this updated, or properties will get lost!
+#define BACKGROUND_FLAG_MAX	12					// number of flagged backgrounds - keep this updated, or properties will get lost!
 
 // some properties are hidden (forbid background in MP creation)
 // corruption property is not relevant in 1.13
-#define BACKGROUND_HIDDEN_FLAGS					(BACKGROUND_NO_MALE|BACKGROUND_NO_FEMALE|BACKGROUND_CORRUPTIONSPREAD)
+#define BACKGROUND_HIDDEN_FLAGS					(BACKGROUND_NO_MALE|BACKGROUND_NO_FEMALE|BACKGROUND_CORRUPTIONSPREAD|BACKGROUND_ALT_IMP_CREATION)
 
 // anv: externalised taunts
 // taunt properties
diff --git a/Tactical/XML_Background.cpp b/Tactical/XML_Background.cpp
index 26fa67b82..829f8669d 100644
--- a/Tactical/XML_Background.cpp
+++ b/Tactical/XML_Background.cpp
@@ -152,7 +152,8 @@ backgroundStartElementHandle(void *userData, const XML_Char *name, const XML_Cha
 				strcmp(name, "no_female") == 0 ||
 				strcmp(name, "loyalitylossondeath" ) == 0  ||
 				strcmp(name, "animal_friend") == 0 || 
-				strcmp(name, "civgroup_loyal") == 0 ))
+				strcmp(name, "civgroup_loyal") == 0 ||
+				strcmp(name, "alt_impcreation") == 0 ))
 		{
 			pData->curElement = ELEMENT_PROPERTY;
 
@@ -693,6 +694,11 @@ backgroundEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = ELEMENT;
 			pData->curBackground.uiFlags |= (UINT16)atol(pData->szCharData) ? BACKGROUND_CIVGROUPLOYAL : 0;
 		}
+		else if (strcmp(name, "alt_impcreation") == 0)
+		{
+		    pData->curElement = ELEMENT;
+		    pData->curBackground.uiFlags |= (UINT16)atol(pData->szCharData) ? BACKGROUND_ALT_IMP_CREATION : 0;
+		}
 		else if (strcmp(name, "drugtypes") == 0)
 		{
 			pData->curElement = ELEMENT;