New Trait: SURVIVAL (new minor trait) gets the non-weapon parts of the ranger trait.

Requires GameDir >= r2213.

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

Laptop/IMP Background.cpp

@@ -501,7 +501,7 @@ void AssignBackgroundHelpText( UINT16 ubNumber, MOUSE_REGION* pMouseregion )
 			}
 			else if ( BG_TRACKER_ABILITY == i && zBackground[ubNumber].value[i] )
 			{
-				swprintf( atStr, szBackgroundText_Value[i], (UINT16)((gSkillTraitValues.usTrackerMaxRange * zBackground[ubNumber].value[i]) / 100) );
+				swprintf( atStr, szBackgroundText_Value[i], (UINT16)((gSkillTraitValues.usSVTrackerMaxRange * zBackground[ubNumber].value[i]) / 100) );
 				wcscat( apStr, atStr );
 			}
 			else if ( zBackground[ ubNumber ].value[i] )
@@ -611,7 +611,7 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == RANGER_NT || SkillsList[1] == RANGER_NT || SkillsList[2] == RANGER_NT )
+	if ( SkillsList[0] == SURVIVAL_NT || SkillsList[1] == SURVIVAL_NT || SkillsList[2] == SURVIVAL_NT )
 	{
 		if ( zBackground[ ubNumber ].value[BG_PERC_CAMO] < 0 )
 			return FALSE;

Laptop/IMP Compile Character.cpp

@@ -301,24 +301,20 @@ void AddSkillToSkillList( INT8 bSkill )
 		SkillsList[ iLastElementInSkillsList ] = ( INT32 )bSkill;
 
 		// increment attitude list counter
-		iLastElementInSkillsList++;
+		++iLastElementInSkillsList;
 	}
-
-	return;
 }
 
 // Kaiden : Added to clear the list when first visiting the IMP homepage,
 // Or for each visit there after.
 void ClearAllSkillsList( void )
 {
-	INT32		iLoop;
-
-	for ( iLoop = 0; iLoop < ATTITUDE_LIST_SIZE; iLoop++ ) // SANDRO - better clear everything to be sure
+	for ( INT32 iLoop = 0; iLoop < ATTITUDE_LIST_SIZE; ++iLoop ) // SANDRO - better clear everything to be sure
 	{
 		SkillsList[ iLoop ] = 0;
 	}
+
 	iLastElementInSkillsList = 0;
-	return;
 }
 
 

Laptop/IMP Confirm.cpp

@@ -799,6 +799,10 @@ void GiveItemsToPC( UINT8 ubProfileId )
 			{
 				GiveIMPRandomItems(pProfile,IMP_RADIO_OPERATOR);
 			}
+			if ( PROFILE_HAS_SKILL_TRAIT( ubProfileId, SURVIVAL_NT ) )
+			{
+				GiveIMPRandomItems( pProfile, IMP_SURVIVAL );
+			}
 		}
 		else
 		{

Laptop/IMP Gear.cpp

@@ -718,6 +718,7 @@ void CalculatePossibleItems()
 				case IMP_SKILL_TRAITS_NEW_TEACHING:			AddItemCategoryToPossibleGear( IMP_TEACHING );	break;
 				case IMP_SKILL_TRAITS_NEW_SCOUTING:			AddItemCategoryToPossibleGear( IMP_SCOUTING );	break;
 				case IMP_SKILL_TRAITS_NEW_RADIO_OPERATOR:	AddItemCategoryToPossibleGear( IMP_RADIO_OPERATOR );	break;
+				case IMP_SKILL_TRAITS_NEW_SURVIVAL:			AddItemCategoryToPossibleGear( IMP_SURVIVAL );	break;
 					
 				default:
 					break;

Laptop/IMP Minor Trait.cpp

@@ -74,6 +74,7 @@ UINT8 gusNewMinorTraitRemap[IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS] =
 	TEACHING_NT,		// IMP_SKILL_TRAITS_NEW_TEACHING
 	SCOUTING_NT,		// IMP_SKILL_TRAITS_NEW_SCOUTING
 	RADIO_OPERATOR_NT,	// IMP_SKILL_TRAITS_NEW_RADIO_OPERATOR
+	SURVIVAL_NT,		// IMP_SKILL_TRAITS_NEW_SURVIVAL
 	NO_SKILLTRAIT_NT,	// IMP_SKILL_TRAITS_NEW_MINOR_NONE
 };
 
@@ -462,7 +463,7 @@ void IMPMinorTraitDisplaySkills()
 	usPosX = IMP_MINOR_TRAIT__LEFT_COLUMN_START_X + IMP_MINOR_TRAIT__TEXT_OFFSET_X;
 	usPosY = IMP_MINOR_TRAIT__LEFT_COLUMN_START_Y + IMP_MINOR_TRAIT__TEXT_OFFSET_Y;
 
-	for( uiCnt=0; uiCnt<IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS; uiCnt++ )
+	for( uiCnt=0; uiCnt<IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS; ++uiCnt )
 	{
 		usBoxPosX = usPosX - IMP_MINOR_TRAIT__GREY_BOX_OFFSET_X;
 		usBoxPosY = usPosY - IMP_MINOR_TRAIT__GREY_BOX_OFFSET_Y;
@@ -674,6 +675,10 @@ void AddSelectedMinorTraitsToSkillsList()
 				case IMP_SKILL_TRAITS_NEW_RADIO_OPERATOR:
 					AddSkillToSkillList( RADIO_OPERATOR_NT );
 					break;
+
+				case IMP_SKILL_TRAITS_NEW_SURVIVAL:
+					AddSkillToSkillList( SURVIVAL_NT );
+					break;
 						
 				default:
 					break;

Laptop/IMP Minor Trait.h

@@ -22,6 +22,7 @@ enum
 	IMP_SKILL_TRAITS_NEW_TEACHING,
 	IMP_SKILL_TRAITS_NEW_SCOUTING,
 	IMP_SKILL_TRAITS_NEW_RADIO_OPERATOR,		// added by Flugente
+	IMP_SKILL_TRAITS_NEW_SURVIVAL,				// added by Flugente
 	//////
 	IMP_SKILL_TRAITS_NEW_MINOR_NONE,
 	IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS,

Laptop/IMP Skill Trait.cpp

@@ -63,7 +63,7 @@
 
 #define NEWTRAIT_EXPERT_OFFSET												12	// Flugente: offset between normal and expert trait strings
 
-// Flugente: Due to the unfortunate nature of our enums, they do not match the trait numbers. We thus have to remap them when obtining their description
+// Flugente: Due to the unfortunate nature of our enums, they do not match the trait numbers. We thus have to remap them when obtaining their description
 UINT8 gusNewMajorTraitRemap[IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS] =
 {
 	AUTO_WEAPONS_NT,	// IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS
@@ -121,13 +121,11 @@ void		AddImpSkillTraitButtons();
 void		HandleSkillTraitButtonStates( );
 void		HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait );
 void		IMPSkillTraitDisplaySkills();
-BOOLEAN ShouldTraitBeSkipped( UINT32 uiTrait );
+BOOLEAN		ShouldTraitBeSkipped( UINT32 uiTrait );
 //void		AddSelectedSkillsToSkillsList(); // SANDRO - second declaration not needed
 void		HandleLastSelectedTraits( INT8 bNewTrait );
-INT8 GetLastSelectedSkill( void );
-BOOLEAN CameBackToSpecialtiesPageButNotFinished();
-
-BOOLEAN DoesSkillHaveExpertLevel( UINT32 uiSkillTrait );
+INT8		GetLastSelectedSkill( void );
+BOOLEAN		CameBackToSpecialtiesPageButNotFinished();
 
 MOUSE_REGION	gMR_SkillTraitHelpTextRegions[IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS];
 //ppp
@@ -157,9 +155,7 @@ void EnterIMPSkillTrait( void )
 		Assert( 0 );
 		return;
 	}
-
-
-
+	
 	giIMPSkillTraitFinsihButtonImage =	LoadButtonImage( "LAPTOP\\button_5.sti" ,-1,0,-1,1,-1 );
 	giIMPSkillTraitFinsihButton = CreateIconAndTextButton( giIMPSkillTraitFinsihButtonImage, pImpButtonText[ 24 ], FONT12ARIAL,
 																FONT_WHITE, DEFAULT_SHADOW,
@@ -167,9 +163,7 @@ void EnterIMPSkillTrait( void )
 																TEXT_CJUSTIFIED,
 																LAPTOP_SCREEN_UL_X +	( 350 ), LAPTOP_SCREEN_WEB_UL_Y + ( 340 ), BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
 																BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnIMPSkillTraitFinishCallback );
-
-
-
+	
 	SetButtonCursor( giIMPSkillTraitFinsihButton, CURSOR_WWW);
 
 	//if we are not DONE and are just reviewing
@@ -193,7 +187,7 @@ void EnterIMPSkillTrait( void )
 	// add regions for help texts
 	UINT16 usPosX = IMP_SKILL_TRAIT__LEFT_COLUMN_START_X + 62;
 	UINT16 usPosY = IMP_SKILL_TRAIT__LEFT_COLUMN_START_Y + 8;
-	for( UINT32 uiCnt=0; uiCnt < (UINT8)( gGameOptions.fNewTraitSystem ? IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS : IMP_SKILL_TRAITS__NUMBER_SKILLS ); uiCnt++ )
+	for( UINT32 uiCnt=0; uiCnt < (UINT8)( gGameOptions.fNewTraitSystem ? IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS : IMP_SKILL_TRAITS__NUMBER_SKILLS ); ++uiCnt )
 	{
 		if( ShouldTraitBeSkipped( uiCnt ) )
 		{
@@ -327,7 +321,7 @@ void AddImpSkillTraitButtons()
 	usPosX = IMP_SKILL_TRAIT__LEFT_COLUMN_START_X;
 	usPosY = IMP_SKILL_TRAIT__LEFT_COLUMN_START_Y;
 
-	for(iCnt = 0; iCnt < (iCntMax); iCnt++)
+	for(iCnt = 0; iCnt < iCntMax; ++iCnt)
 	{
 		//reset
 		giIMPSkillTraitAnswerButton[iCnt] = -1;
@@ -392,7 +386,7 @@ void AddImpSkillTraitButtons()
 	usPosX = IMP_SKILL_TRAIT__LEFT_COLUMN_START_X + 26;
 	usPosY = IMP_SKILL_TRAIT__LEFT_COLUMN_START_Y;
 
-	for(iCnt = 0; iCnt < (iCntMax); iCnt++)
+	for(iCnt = 0; iCnt < iCntMax; ++iCnt)
 	{
 		//reset
 		giIMPSkillTraitAnswerButton2[iCnt] = -1;
@@ -527,7 +521,7 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait )
 			}
 		}
 		// if cannot have expert level of skill, don't continue
-		else if ( gfSkillTraitQuestions2[ uiSkillPressed ] && !DoesSkillHaveExpertLevel( uiSkillPressed ) )
+		else if ( gfSkillTraitQuestions2[uiSkillPressed] && !TwoStagedTrait( uiSkillPressed ) )
 		{
 			//dont need to do anything
 			return;
@@ -559,7 +553,7 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait )
 					if ( gSkillTraitValues.ubNumberOfMajorTraitsAllowedForIMP == 2 )
 					{
 						//loop through all the skill and reset them
-						for( uiCnt=0; uiCnt<uiCntMax; uiCnt++ )
+						for( uiCnt=0; uiCnt<uiCntMax; ++uiCnt )
 						{
 							gfSkillTraitQuestions[ uiCnt ] = FALSE;
 						}
@@ -629,7 +623,7 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait )
 			gfSkillTraitQuestions2[ uiSkillPressed ] = FALSE;
 
 			BOOLEAN fNoSkillSelected = TRUE;
-			for ( uiCnt=0; uiCnt<(uiCntMax-1); uiCnt++ )
+			for ( uiCnt=0; uiCnt<(uiCntMax-1); ++uiCnt )
 			{
 				if ( gfSkillTraitQuestions2[ uiCnt ] == TRUE )
 					fNoSkillSelected = FALSE;
@@ -641,7 +635,7 @@ void HandleIMPSkillTraitAnswers( UINT32 uiSkillPressed, BOOLEAN fSecondTrait )
 			}
 		}
 		// if cannot have expert level of skill, don't continue
-		else if ( gfSkillTraitQuestions[ uiSkillPressed ] && !DoesSkillHaveExpertLevel( uiSkillPressed ) )
+		else if ( gfSkillTraitQuestions[uiSkillPressed] && !TwoStagedTrait( uiSkillPressed ) )
 		{
 			//dont need to do anything
 			return;
@@ -753,7 +747,7 @@ INT8	CountNumSkillTraitsSelected( BOOLEAN fIncludeNoneSkill )
 	else
 		uiCntMax = IMP_SKILL_TRAITS__NUMBER_SKILLS;
 
-	for( uiCnt=0; uiCnt < uiCntMax; uiCnt++ )
+	for( uiCnt=0; uiCnt < uiCntMax; ++uiCnt )
 	{
 		if( !fIncludeNoneSkill && (uiCnt == (uiCntMax-1)) )
 			continue;
@@ -761,11 +755,11 @@ INT8	CountNumSkillTraitsSelected( BOOLEAN fIncludeNoneSkill )
 		//if the skill is selected ( ie depressed )
 		if( gfSkillTraitQuestions[ uiCnt ] )
 		{
-			iNumberSkills++;
+			++iNumberSkills;
 		}
 		if( gfSkillTraitQuestions2[ uiCnt ] )
 		{
-			iNumberSkills++;
+			++iNumberSkills;
 		} 
 	}
 
@@ -775,9 +769,7 @@ INT8	CountNumSkillTraitsSelected( BOOLEAN fIncludeNoneSkill )
 
 void HandleSkillTraitButtonStates( )
 {
-	INT32 uiCnt;
-
-	for( uiCnt=0; uiCnt<(gGameOptions.fNewTraitSystem ? IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS : IMP_SKILL_TRAITS__NUMBER_SKILLS); uiCnt++ )
+	for ( INT32 uiCnt = 0; uiCnt<(gGameOptions.fNewTraitSystem ? IMP_SKILL_TRAITS_NEW_NUMBER_MAJOR_SKILLS : IMP_SKILL_TRAITS__NUMBER_SKILLS); ++uiCnt )
 	{
 			//if the merc is a FEMALE, skip this skill cause there isnt any fenmal martial artists
 		if( ShouldTraitBeSkipped( uiCnt ) )
@@ -1016,34 +1008,6 @@ BOOLEAN ShouldTraitBeSkipped( UINT32 uiTrait )
 	}
 }
 
-BOOLEAN DoesSkillHaveExpertLevel( UINT32 uiSkillTrait )
-{
-	if( gGameOptions.fNewTraitSystem )
-	{
-		// WANNE: Yes we have no animation, but the Trait bonus also works with the missing animations.
-		/*
-		// WANNE: No material arts allowed for big body types and females, because we don't have a material art animation on big body types!
-		if (uiSkillTrait == IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS && (!fCharacterIsMale || bBigBodySelected()))
-			return (FALSE);
-		*/
-		
-		return( TRUE );
-	}
-	else
-	{
-		if (uiSkillTrait == IMP_SKILL_TRAITS__ELECTRONICS || 
-			uiSkillTrait == IMP_SKILL_TRAITS__AMBIDEXTROUS || 
-			uiSkillTrait == IMP_SKILL_TRAITS__CAMO )
-		{
-			return( FALSE );
-		}
-		
-		return( TRUE );		
-	}
-
-	return( TRUE );
-}
-
 void AddSelectedSkillsToSkillsList()
 {
 	INT32	uiCnt;
@@ -1346,44 +1310,36 @@ INT32 StrengthRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-			return (70);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] )
+			minreq = max( minreq, 70 );
 		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-			return (60);
-		else
-			return (45);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-			return (55);
-		else
-			return (40);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		return (45);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		return (40);
+			minreq = max( minreq, 55 );
 	}
 
-	return(0);
+	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] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+			minreq = max( minreq, 55 );
+		else
+			minreq = max( minreq, 40 );
+	}
+
+	return minreq;
 }
+
 INT32 AgilityRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1392,44 +1348,36 @@ INT32 AgilityRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-			return (70);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] )
+			minreq = max( minreq, 70 );
 		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-			return (65);
-		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-			return (60);
-		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		return (45);
+			minreq = max( minreq, 55 );
 	}
 
-	return(0);
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_GUNSLINGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_GUNSLINGER] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_GUNSLINGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_GUNSLINGER] )
+			minreq = max( minreq, 65 );
+		else
+			minreq = max( minreq, 50 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	return minreq;
 }
+
 INT32 DexterityRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1438,88 +1386,68 @@ INT32 DexterityRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-			return (70);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] )
+			minreq = max( minreq, 70 );
 		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-			return (70);
-		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-			return (65);
-		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-			return (65);
-		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-			return (65);
-		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-			return (65);
-		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-			return (60);
-		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		return (45);
+			minreq = max( minreq, 55 );
 	}
 
-	return(0);
+	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] )
+			minreq = max( minreq, 70 );
+		else
+			minreq = max( minreq, 55 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+			minreq = max( minreq, 65 );
+		else
+			minreq = max( minreq, 50 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_GUNSLINGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_GUNSLINGER] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_GUNSLINGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_GUNSLINGER] )
+			minreq = max( minreq, 65 );
+		else
+			minreq = max( minreq, 50 );
+	}
+
+	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] )
+			minreq = max( minreq, 65 );
+		else
+			minreq = max( minreq, 50 );
+	}
+
+	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] )
+			minreq = max( minreq, 65 );
+		else
+			minreq = max( minreq, 50 );
+	}
+
+	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] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	return minreq;
 }
+
 INT32 HealthRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1528,44 +1456,36 @@ INT32 HealthRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_RANGER ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-			return (70);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+			minreq = max( minreq, 70 );
 		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-			return (60);
-		else
-			return (45);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-			return (60);
-		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		return (45);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS ])
-	{
-		return (45);
+			minreq = max( minreq, 55 );
 	}
 
-	return(0);
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	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] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	return minreq;
 }
+
 INT32 LeadershipRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1574,43 +1494,34 @@ INT32 LeadershipRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_SQUADLEADER ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_SQUADLEADER ])
-			return (65);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER] )
+			minreq = max( minreq, 65 );
 		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-			return (50);
-		else
-			return (35);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_COVERT ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_COVERT ])
-			return (45);
-		else
-			return (30);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_SQUADLEADER ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		return (35);
-	}
-	else if ( gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_COVERT] )
-	{
-		return (30);
+			minreq = max( minreq, 50 );
 	}
 
-	return(0);
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+			minreq = max( minreq, 50 );
+		else
+			minreq = max( minreq, 35 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_COVERT] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_COVERT] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_COVERT] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_COVERT] )
+			minreq = max( minreq, 45 );
+		else
+			minreq = max( minreq, 30 );
+	}
+
+	return minreq;
 }
 
 INT32 WisdomRequiredDueToMajorSkills( void )
@@ -1621,73 +1532,60 @@ INT32 WisdomRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_SQUADLEADER ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_SQUADLEADER ])
-			return (75);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER] )
+			minreq = max( minreq, 75 );
 		else
-			return (60);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_COVERT ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_COVERT ])
-			return (75);
-		else
-			return (60);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-			return (70);
-		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-			return (70);
-		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-			return (65);
-		else
-			return (50);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-			return (60);
-		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_SQUADLEADER ])
-	{
-		return (60);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-	{
-		return (50);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		return (45);
+			minreq = max( minreq, 60 );
 	}
 
-	return(0);
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_COVERT] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_COVERT] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_COVERT] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_COVERT] )
+			minreq = max( minreq, 75 );
+		else
+			minreq = max( minreq, 60 );
+	}
+
+	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] )
+			minreq = max( minreq, 70 );
+		else
+			minreq = max( minreq, 55 );
+	}
+
+	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] )
+			minreq = max( minreq, 70 );
+		else
+			minreq = max( minreq, 55 );
+	}
+
+	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] )
+			minreq = max( minreq, 65 );
+		else
+			minreq = max( minreq, 50 );
+	}
+
+	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] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	return minreq;
 }
+
 INT32 MarksmanshipRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1696,55 +1594,44 @@ INT32 MarksmanshipRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-			return (80);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] )
+			minreq = max( minreq, 80 );
 		else
-			return (65);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-			return (70);
-		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-			return (70);
-		else
-			return (55);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-			return (60);
-		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_PROF_SNIPER ])
-	{
-		return (65);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_RANGER ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_GUNSLINGER ])
-	{
-		return (55);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS ])
-	{
-		return (45);
+			minreq = max( minreq, 65 );
 	}
 
-	return(0);
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_RANGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_RANGER] )
+			minreq = max( minreq, 70 );
+		else
+			minreq = max( minreq, 55 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_GUNSLINGER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_GUNSLINGER] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_GUNSLINGER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_GUNSLINGER] )
+			minreq = max( minreq, 70 );
+		else
+			minreq = max( minreq, 55 );
+	}
+
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+	{
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_AUTO_WEAPONS] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	return minreq;
 }
+
 INT32 MechanicalRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1753,22 +1640,20 @@ INT32 MechanicalRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-			return (60);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN] )
+			minreq = max( minreq, 60 );
 		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		return (45);
+			minreq = max( minreq, 45 );
 	}
 
-	return(0);
+	return minreq;
 }
+
 INT32 MedicalRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1777,22 +1662,20 @@ INT32 MedicalRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-			return (60);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR] )
+			minreq = max( minreq, 60 );
 		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_DOCTOR ])
-	{
-		return (45);
+			minreq = max( minreq, 45 );
 	}
 
-	return(0);
+	return minreq;
 }
+
 INT32 ExplosivesRequiredDueToMajorSkills( void )
 {
 	// Only for new trait system
@@ -1801,30 +1684,24 @@ INT32 ExplosivesRequiredDueToMajorSkills( void )
 		return 0;
 	}
 
+	INT32 minreq = 0;
+
 	// Check first skill trait (plus second for double trait)
-	if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
+	if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] )
 	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-			return (60);
+		if ( gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] )
+			minreq = max( minreq, 60 );
 		else
-			return (45);
-	}
-	else if (gfSkillTraitQuestions[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-			return (60);
-		else
-			return (45);
-	}
-	// Check the second skill trait
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS ])
-	{
-		return (45);
-	}
-	else if (gfSkillTraitQuestions2[ IMP_SKILL_TRAITS_NEW_TECHNICIAN ])
-	{
-		return (45);
+			minreq = max( minreq, 45 );
 	}
 
-	return(0);
-}
+	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] )
+			minreq = max( minreq, 60 );
+		else
+			minreq = max( minreq, 45 );
+	}
+
+	return minreq;
+}

Laptop/email.cpp

@@ -4695,6 +4695,12 @@ void HandleIMPCharProfileResultsMessage( void)
 			wcscpy(pString, MissingIMPSkillsDescriptions[12]);
 			AddEmailRecordToList( pString );
 		}
+		// Survival
+		if ( ProfileHasSkillTrait( iCurrentIMPSlot, SURVIVAL_NT ) > 0 )
+		{
+			wcscpy( pString, MissingIMPSkillsDescriptions[13] );
+			AddEmailRecordToList( pString );
+		}
 	}
 	else
 	{

Laptop/personnel.cpp

@@ -7453,42 +7453,6 @@ void AssignPersonnelSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLeve
 
 					wcscat( apStr, atStr );
 				}
-				if( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot != 0 )
-				{
-					swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[6], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot * (fExpertLevel ? 2 : 1)), sSpecialCharacters[0]);
-					wcscat( apStr, atStr );
-				}
-				if( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle != 0 )
-				{
-					swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[7], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle * (fExpertLevel ? 2 : 1)), sSpecialCharacters[0]);
-					wcscat( apStr, atStr );
-				}
-				if( gSkillTraitValues.ubRABreathForTravellingReduction != 0 )
-				{
-					swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[8], ( gSkillTraitValues.ubRABreathForTravellingReduction * (fExpertLevel ? 2 : 1)), sSpecialCharacters[0]);
-					wcscat( apStr, atStr );
-				}
-				if( gSkillTraitValues.ubRAWeatherPenaltiesReduction != 0 )
-				{
-					swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[9], ( gSkillTraitValues.ubRAWeatherPenaltiesReduction * (fExpertLevel ? 2 : 1)), sSpecialCharacters[0]);
-					wcscat( apStr, atStr );
-				}
-				//if( gSkillTraitValues.ubRACamoEffectivenessBonus != 0 )
-				//{
-				//	swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[10], ( gSkillTraitValues.ubRACamoEffectivenessBonus * (fExpertLevel ? 2 : 1)), sSpecialCharacters[0]);
-				//	wcscat( apStr, atStr );
-				//}
-				if( gSkillTraitValues.ubRACamoWornountSpeedReduction != 0 )
-				{
-					swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[11], ( gSkillTraitValues.ubRACamoWornountSpeedReduction * (fExpertLevel ? 2 : 1)), sSpecialCharacters[0]);
-					wcscat( apStr, atStr );
-				}
-
-				if ( gSkillTraitValues.usTrackerMaxRange && gSkillTraitValues.usTrackerAbility )
-				{
-					swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[12], (gSkillTraitValues.usTrackerAbility * (fExpertLevel ? 2 : 1) * gSkillTraitValues.usTrackerMaxRange / 100) );
-					wcscat( apStr, atStr );
-				}
 
 				break;
 			}
@@ -8298,6 +8262,44 @@ void AssignPersonnelSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLeve
 				}
 				break;
 			}
+			case SURVIVAL_NT:
+			{
+				swprintf( apStr, L"" );
+
+				if ( gSkillTraitValues.ubSVGroupTimeSpentForTravellingFoot != 0 )
+				{
+					swprintf( atStr, gzIMPMajorTraitsHelpTextsSurvival[0], gSkillTraitValues.ubSVGroupTimeSpentForTravellingFoot, sSpecialCharacters[0] );
+					wcscat( apStr, atStr );
+				}
+				if ( gSkillTraitValues.ubSVGroupTimeSpentForTravellingVehicle != 0 )
+				{
+					swprintf( atStr, gzIMPMajorTraitsHelpTextsSurvival[1], gSkillTraitValues.ubSVGroupTimeSpentForTravellingVehicle, sSpecialCharacters[0] );
+					wcscat( apStr, atStr );
+				}
+				if ( gSkillTraitValues.ubSVBreathForTravellingReduction != 0 )
+				{
+					swprintf( atStr, gzIMPMajorTraitsHelpTextsSurvival[2], gSkillTraitValues.ubSVBreathForTravellingReduction, sSpecialCharacters[0] );
+					wcscat( apStr, atStr );
+				}
+				if ( gSkillTraitValues.ubSVWeatherPenaltiesReduction != 0 )
+				{
+					swprintf( atStr, gzIMPMajorTraitsHelpTextsSurvival[3], gSkillTraitValues.ubSVWeatherPenaltiesReduction, sSpecialCharacters[0] );
+					wcscat( apStr, atStr );
+				}
+
+				if ( gSkillTraitValues.ubSVCamoWornountSpeedReduction != 0 )
+				{
+					swprintf( atStr, gzIMPMajorTraitsHelpTextsSurvival[4], gSkillTraitValues.ubSVCamoWornountSpeedReduction, sSpecialCharacters[0] );
+					wcscat( apStr, atStr );
+				}
+
+				if ( gSkillTraitValues.usSVTrackerMaxRange && gSkillTraitValues.usSVTrackerAbility )
+				{
+					swprintf( atStr, gzIMPMajorTraitsHelpTextsSurvival[5], (gSkillTraitValues.usSVTrackerAbility * gSkillTraitValues.usSVTrackerMaxRange / 100) );
+					wcscat( apStr, atStr );
+				}
+				break;
+			}
 			case NO_SKILLTRAIT_NT:
 			{
 				swprintf( apStr, L"" );