Add 'Ignored by' parameter for monsters

Author: FreeSlave

dlls/basemonster.h

@@ -447,6 +447,7 @@ class CBaseMonster : public CBaseToggle
 
 	int m_customSoundMask;
 	short m_prisonerTo;
+	short m_ignoredBy;
 	short m_freeRoam;
 	short m_activeAfterCombat;
 	short m_huntActivitiesCount;

dlls/hgrunt.cpp

@@ -2444,6 +2444,7 @@ void CHGruntRepel::RepelUse( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_
 	pGrunt->m_displayName = m_displayName;
 	pGrunt->m_customSoundMask = m_customSoundMask;
 	pGrunt->m_prisonerTo = m_prisonerTo;
+	pGrunt->m_ignoredBy = m_ignoredBy;
 	pGrunt->m_freeRoam = m_freeRoam;
 	pGrunt->m_activeAfterCombat = m_activeAfterCombat;
 	pGrunt->m_sizeForGrapple = m_sizeForGrapple;

dlls/monstermaker.cpp

@@ -740,6 +740,7 @@ CBaseEntity* CMonsterMaker::SpawnMonster(const Vector &placePosition, const Vect
 
 		createdMonster->m_customSoundMask = m_customSoundMask;
 		createdMonster->m_prisonerTo = m_prisonerTo;
+		createdMonster->m_ignoredBy = m_ignoredBy;
 		createdMonster->m_freeRoam = m_freeRoam;
 		createdMonster->m_activeAfterCombat = m_activeAfterCombat;
 		createdMonster->m_sizeForGrapple = m_sizeForGrapple;

dlls/monsters.cpp

@@ -123,6 +123,7 @@ TYPEDESCRIPTION	CBaseMonster::m_SaveData[] =
 
 	DEFINE_FIELD( CBaseMonster, m_customSoundMask, FIELD_INTEGER ),
 	DEFINE_FIELD( CBaseMonster, m_prisonerTo, FIELD_SHORT ),
+	DEFINE_FIELD( CBaseMonster, m_ignoredBy, FIELD_SHORT ),
 	DEFINE_FIELD( CBaseMonster, m_freeRoam, FIELD_SHORT ),
 	DEFINE_FIELD( CBaseMonster, m_activeAfterCombat, FIELD_SHORT ),
 	DEFINE_FIELD( CBaseMonster, m_huntActivitiesCount, FIELD_SHORT ),
@@ -361,9 +362,15 @@ void CBaseMonster::Look( int iDistance )
 				 (!m_prisonerTo || m_prisonerTo != pSightEnt->Classify()) &&
 				 pSightEnt->pev->health > 0 )
 			{
+				const int myClassify = Classify();
 				CBaseMonster* pSightMonster = pSightEnt->MyMonsterPointer();
-				if (pSightMonster && pSightMonster->m_prisonerTo != 0 && pSightMonster->m_prisonerTo == Classify())
-					continue;
+				if (pSightMonster)
+				{
+					if (pSightMonster->m_prisonerTo != 0 && pSightMonster->m_prisonerTo == myClassify)
+						continue;
+					if (pSightMonster->m_ignoredBy != 0 && pSightMonster->m_ignoredBy == myClassify)
+						continue;
+				}
 
 				const int iRelationship = IRelationship( pSightEnt );
 				// the looker will want to consider this entity
@@ -3672,6 +3679,11 @@ void CBaseMonster::KeyValue( KeyValueData *pkvd )
 		m_prisonerTo = (short)atoi( pkvd->szValue );
 		pkvd->fHandled = TRUE;
 	}
+	else if ( FStrEq( pkvd->szKeyName, "ignoredby" ) )
+	{
+		m_ignoredBy = (short)atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
 	else if ( FStrEq( pkvd->szKeyName, "freeroam" ) )
 	{
 		m_freeRoam = (short)atoi( pkvd->szValue );

dlls/triggers.cpp

@@ -5552,6 +5552,7 @@ class CTriggerConfigureMonster : public CPointEntity
 	short m_freeRoam;
 	short m_sizeForGrapple;
 	short m_gibPolicy;
+	short m_ignoredBy;
 
 	short m_iTriggerCondition;
 	short m_iTriggerAltCondition;
@@ -5583,6 +5584,7 @@ TYPEDESCRIPTION	CTriggerConfigureMonster::m_SaveData[] =
 	DEFINE_FIELD( CTriggerConfigureMonster, m_freeRoam, FIELD_SHORT ),
 	DEFINE_FIELD( CTriggerConfigureMonster, m_sizeForGrapple, FIELD_SHORT ),
 	DEFINE_FIELD( CTriggerConfigureMonster, m_gibPolicy, FIELD_SHORT ),
+	DEFINE_FIELD( CTriggerConfigureMonster, m_ignoredBy, FIELD_SHORT ),
 	DEFINE_FIELD( CTriggerConfigureMonster, m_iTriggerCondition, FIELD_SHORT ),
 	DEFINE_FIELD( CTriggerConfigureMonster, m_iTriggerAltCondition, FIELD_SHORT ),
 	DEFINE_FIELD( CTriggerConfigureMonster, m_iszTriggerTarget, FIELD_STRING ),
@@ -5658,6 +5660,11 @@ void CTriggerConfigureMonster::KeyValue(KeyValueData *pkvd)
 		m_gibPolicy = (short)atoi( pkvd->szValue );
 		pkvd->fHandled = TRUE;
 	}
+	else if ( FStrEq( pkvd->szKeyName, "ignoredby" ) )
+	{
+		m_ignoredBy = (short)atoi( pkvd->szValue );
+		pkvd->fHandled = TRUE;
+	}
 	else if( FStrEq( pkvd->szKeyName, "TriggerTarget" ) )
 	{
 		m_iszTriggerTarget = ALLOC_STRING( pkvd->szValue );
@@ -5773,6 +5780,7 @@ void CTriggerConfigureMonster::Affect(CBaseEntity *pEntity)
 	MaySetResettableValue(pMonster->m_freeRoam, m_freeRoam);
 	MaySetResettableValue2(pMonster->m_sizeForGrapple, m_sizeForGrapple);
 	MaySetResettableValue(pMonster->m_gibPolicy, m_gibPolicy);
+	MaySetResettableValue(pMonster->m_ignoredBy, m_ignoredBy);
 
 	MaySetResettableValue(pMonster->m_iTriggerCondition, m_iTriggerCondition);
 	MaySetResettableValue(pMonster->m_iTriggerAltCondition, m_iTriggerAltCondition);

fgd/halflife.fgd

@@ -295,6 +295,29 @@
 		18 : "Snark"
 		19 : "Gargantua"
 	]
+	ignoredby(choices) : "Ignored by classify" : : "Get ignored by this class" =
+	[
+		0 : "Not ignored"
+		1 : "Machine"
+		2 : "Player"
+		3 : "Human passive"
+		4 : "Human military"
+		5 : "Alien military"
+		6 : "Alien passive"
+		7 : "Alien monster"
+		8 : "Alien prey"
+		9 : "Alien predator"
+		10 : "Insect"
+		11 : "Player ally"
+		12 : "Player bioweapon"
+		13 : "Alien bioweapon"
+		14 : "Race X predator"
+		15 : "Race X shock"
+		16 : "Opfor ally"
+		17 : "Blackops"
+		18 : "Snark"
+		19 : "Gargantua"
+	]
 ]
 
 @BaseClass = MonsterSoundMask
@@ -7702,6 +7725,53 @@
 		127 : "Every sound and scent"
 		1028 : "Default, except Player"
 	]
+	prisonerto(choices) : "Act as Prisoner to" =
+	[
+		-1 : "Reset"
+		0 : "No change"
+		1 : "Machine"
+		2 : "Player"
+		3 : "Human passive"
+		4 : "Human military"
+		5 : "Alien military"
+		6 : "Alien passive"
+		7 : "Alien monster"
+		8 : "Alien prey"
+		9 : "Alien predator"
+		10 : "Insect"
+		11 : "Player ally"
+		12 : "Player bioweapon"
+		13 : "Alien bioweapon"
+		14 : "Race X predator"
+		15 : "Race X shock"
+		16 : "Opfor ally"
+		17 : "Blackops"
+		18 : "Snark"
+		19 : "Gargantua"
+	]
+	ignoredby(choices) : "Ignored by classify" =
+	[
+		-1 : "Reset"
+		0 : "No change"
+		1 : "Machine"
+		3 : "Human passive"
+		4 : "Human military"
+		5 : "Alien military"
+		6 : "Alien passive"
+		7 : "Alien monster"
+		8 : "Alien prey"
+		9 : "Alien predator"
+		10 : "Insect"
+		11 : "Player ally"
+		12 : "Player bioweapon"
+		13 : "Alien bioweapon"
+		14 : "Race X predator"
+		15 : "Race X shock"
+		16 : "Opfor ally"
+		17 : "Blackops"
+		18 : "Snark"
+		19 : "Gargantua"
+	]
 	TriggerTarget(String) : "TriggerTarget" : : "The event to trigger when the TriggerCondition is met. Setting 'null' means clearing the trigger target."
 	TriggerCondition(Choices) : "Trigger Condition" : : "This controls the condition under which a monster will trigger its TriggerTarget. The options are:" =
 	[