update monster ai descriptions

use a common schedule naming scheme, and add the missing task name methods. Also added IsNormalMonster() to narrow down monsters to the ones that think using the base ai.
wootguy · Nov 6, 2024 · 8464a1c · 8464a1c
1 parent 42c4b2e
commit 8464a1c
Show file tree

Hide file tree

Showing 35 changed files with 351 additions and 207 deletions.
diff --git a/cl_dll/hl/hl_baseentity.cpp b/cl_dll/hl/hl_baseentity.cpp
@@ -253,6 +253,7 @@ const char* CBaseMonster::GetTaskName(int taskIdx) {return "";}
 const char* CBaseMonster::DisplayName() {return "";}
 BOOL CBaseMonster::IsMachine() {return 0;}
 void CBaseMonster::Precache() {}
+void CBaseMonster::GetAllSchedules(std::unordered_set<Schedule_t*>& schedulesOut) {}
 
 int TrainSpeed(int iSpeed, int iMax) { 	return 0; }
 void CBasePlayer :: DeathSound( void ) { }

diff --git a/dlls/CBasePlayer.h b/dlls/CBasePlayer.h
@@ -128,6 +128,7 @@ class EXPORT CBasePlayer : public CBaseMonster
 	int		IsObserver() { return m_isObserver; };
 	BOOL	IsFirstPerson() { return m_hViewEntity.GetEdict() == edict(); }
 	BOOL	IsBot() { return pev->flags & FL_FAKECLIENT; }
+	virtual	BOOL IsNormalMonster(void) { return FALSE; }
 	virtual int		GetEntindexPriority() { return ENTIDX_PRIORITY_HIGH; }
 
 	int					random_seed;    // See that is shared between client & server for shared weapons code

diff --git a/dlls/cbase.h b/dlls/cbase.h
@@ -229,6 +229,7 @@ class EXPORT CBaseEntity
 	virtual BOOL	HasTarget( string_t targetname ) { return FStrEq(STRING(targetname), STRING(pev->target) ); }
 	virtual BOOL    IsInWorld( void );
 	virtual	BOOL	IsMonster( void ) { return FALSE; }
+	virtual	BOOL	IsNormalMonster(void) { return FALSE; } // is this what you'd expect to be a monster? (not a monstermaker/grenade/etc.)
 	virtual	BOOL	IsPlayer( void ) { return FALSE; }
 	virtual	BOOL	IsPlayerCorpse( void ) { return FALSE; }
 	virtual BOOL	IsNetClient( void ) { return FALSE; }

diff --git a/dlls/monster/CAGrunt.cpp b/dlls/monster/CAGrunt.cpp
@@ -609,7 +609,7 @@ Schedule_t	slAGruntFail[] =
 		bits_COND_CAN_RANGE_ATTACK1	|
 		bits_COND_CAN_MELEE_ATTACK1,
 		0,
-		"AGrunt Fail"
+		"AGRUNT_FAIL"
 	},
 };
 
@@ -632,7 +632,7 @@ Schedule_t	slAGruntCombatFail[] =
 		bits_COND_CAN_RANGE_ATTACK1	|
 		bits_COND_CAN_MELEE_ATTACK1,
 		0,
-		"AGrunt Combat Fail"
+		"AGRUNT_COMBAT_FAIL"
 	},
 };
 
@@ -660,7 +660,7 @@ Schedule_t slAGruntStandoff[] =
 		bits_COND_HEAR_SOUND,
 
 		bits_SOUND_DANGER,
-		"Agrunt Standoff"
+		"AGRUNT_STANDOFF"
 	}
 };
 
@@ -680,7 +680,7 @@ Schedule_t slAGruntSuppress[] =
 		ARRAYSIZE ( tlAGruntSuppressHornet ),
 		0,
 		0,
-		"AGrunt Suppress Hornet",
+		"AGRUNT_SUPPRESS_HORNET",
 	},
 };
 
@@ -704,7 +704,7 @@ Schedule_t	slAGruntRangeAttack1[] =
 		bits_COND_HEAVY_DAMAGE,
 
 		0,
-		"AGrunt Range Attack1"
+		"AGRUNT_RANGE_ATTACK1"
 	},
 };
 
@@ -718,6 +718,7 @@ Task_t	tlAGruntHiddenRangeAttack1[] =
 	{ TASK_RANGE_ATTACK1_NOTURN,		(float)0		},
 };
 
+
 Schedule_t	slAGruntHiddenRangeAttack[] =
 {
 	{ 
@@ -728,7 +729,7 @@ Schedule_t	slAGruntHiddenRangeAttack[] =
 		bits_COND_HEAR_SOUND,
 
 		bits_SOUND_DANGER,
-		"AGrunt Hidden Range Attack1"
+		"AGRUNT_HIDDEN_RANGE_ATTACK"
 	},
 };
 
@@ -754,7 +755,7 @@ Schedule_t	slAGruntTakeCoverFromEnemy[] =
 		ARRAYSIZE ( tlAGruntTakeCoverFromEnemy ), 
 		bits_COND_NEW_ENEMY,
 		0,
-		"AGruntTakeCoverFromEnemy"
+		"AGRUNT_TAKE_COVER_FROM_ENEMY"
 	},
 };
 
@@ -793,7 +794,7 @@ Schedule_t	slAGruntVictoryDance[] =
 		bits_COND_LIGHT_DAMAGE	|
 		bits_COND_HEAVY_DAMAGE,
 		0,
-		"AGruntVictoryDance"
+		"AGRUNT_VICTORY_DANCE"
 	},
 };
 
@@ -818,7 +819,7 @@ Schedule_t	slAGruntThreatDisplay[] =
 		bits_SOUND_PLAYER			|
 		bits_SOUND_COMBAT			|
 		bits_SOUND_WORLD,
-		"AGruntThreatDisplay"
+		"AGRUNT_THREAT_DISPLAY"
 	},
 };
 
@@ -1142,6 +1143,15 @@ Schedule_t* CAGrunt :: GetScheduleOfType ( int Type )
 	return CTalkSquadMonster :: GetScheduleOfType( Type );
 }
 
+const char* CAGrunt::GetTaskName(int taskIdx) {
+	switch (taskIdx) {
+	case TASK_AGRUNT_SETUP_HIDE_ATTACK: return "TASK_AGRUNT_SETUP_HIDE_ATTACK";
+	case TASK_AGRUNT_GET_PATH_TO_ENEMY_CORPSE: return "TASK_AGRUNT_GET_PATH_TO_ENEMY_CORPSE";
+	default:
+		return CTalkSquadMonster::GetTaskName(taskIdx);
+	}
+}
+
 void CAGrunt::StartFollowingSound() {
 	StopTalking();
 	EMIT_SOUND(ENT(pev), CHAN_VOICE, RANDOM_SOUND_ARRAY(pAlertSounds), 1.0, ATTN_NORM);

diff --git a/dlls/monster/CAGrunt.h b/dlls/monster/CAGrunt.h
@@ -60,6 +60,7 @@ class CAGrunt : public CTalkSquadMonster
 
 	Schedule_t* GetSchedule(void);
 	Schedule_t* GetScheduleOfType(int Type);
+	const char* GetTaskName(int taskIdx);
 	BOOL FCanCheckAttacks(void);
 	BOOL CheckMeleeAttack1(float flDot, float flDist);
 	BOOL CheckRangeAttack1(float flDot, float flDist);

diff --git a/dlls/monster/CBarney.cpp b/dlls/monster/CBarney.cpp
@@ -140,7 +140,7 @@ Schedule_t	slBaFollow[] =
 		bits_COND_HEAR_SOUND |
 		bits_COND_PROVOKED,
 		bits_SOUND_DANGER,
-		"Follow"
+		"BARNEY_FOLLOW"
 	},
 };
 
@@ -162,7 +162,7 @@ Schedule_t slBarneyEnemyDraw[] =
 		ARRAYSIZE ( tlBarneyEnemyDraw ),
 		0,
 		0,
-		"Barney Enemy Draw"
+		"BARNEY_ENEMY_DRAW"
 	}
 };
 
@@ -186,7 +186,7 @@ Schedule_t	slBaFaceTarget[] =
 		bits_COND_HEAR_SOUND |
 		bits_COND_PROVOKED,
 		bits_SOUND_DANGER,
-		"FaceTarget"
+		"BARNEY_FACE_TARGET"
 	},
 };
 
@@ -219,7 +219,7 @@ Schedule_t	slIdleBaStand[] =
 		bits_SOUND_MEAT			|// scents
 		bits_SOUND_CARCASS		|
 		bits_SOUND_GARBAGE,
-		"IdleStand"
+		"BARNEY_IDLE_STAND"
 	},
 };
 

diff --git a/dlls/monster/CBaseGrunt.cpp b/dlls/monster/CBaseGrunt.cpp
@@ -1185,7 +1185,7 @@ Schedule_t	slGruntFail[] =
 		bits_COND_CAN_MELEE_ATTACK1 |
 		bits_COND_CAN_MELEE_ATTACK2,
 		0,
-		"Grunt Fail"
+		"GRUNT_FAIL"
 	},
 };
 
@@ -1219,7 +1219,7 @@ Schedule_t	slGruntCombatFail[] =
 		bits_SOUND_COMBAT |// sound flags
 		bits_SOUND_PLAYER |
 		bits_SOUND_DANGER,
-		"Grunt Combat Fail"
+		"GRUNT_COMBAT_FAIL"
 	},
 };
 
@@ -1247,7 +1247,7 @@ Schedule_t	slGruntVictoryDance[] =
 		bits_COND_LIGHT_DAMAGE	|
 		bits_COND_HEAVY_DAMAGE,
 		0,
-		"GruntVictoryDance"
+		"GRUNT_VICTORY_DANCE"
 	},
 };
 
@@ -1278,7 +1278,7 @@ Schedule_t slGruntEstablishLineOfFire[] =
 		bits_COND_HEAR_SOUND,
 
 		bits_SOUND_DANGER,
-		"GruntEstablishLineOfFire"
+		"GRUNT_ESTABLISH_LINE_OF_FIRE"
 	},
 };
 
@@ -1301,7 +1301,7 @@ Schedule_t	slGruntFoundEnemy[] =
 		bits_COND_HEAR_SOUND,
 
 		bits_SOUND_DANGER,
-		"GruntFoundEnemy"
+		"GRUNT_FOUND_ENEMY"
 	},
 };
 
@@ -1327,7 +1327,7 @@ Schedule_t	slGruntCombatFace[] =
 		bits_COND_CAN_RANGE_ATTACK1		|
 		bits_COND_CAN_RANGE_ATTACK2,
 		0,
-		"Combat Face"
+		"GRUNT_COMBAT_FACE"
 	},
 };
 
@@ -1370,7 +1370,7 @@ Schedule_t	slGruntSignalSuppress[] =
 		bits_COND_NO_AMMO_LOADED,
 
 		bits_SOUND_DANGER,
-		"SignalSuppress"
+		"GRUNT_SIGNAL_SUPPRESS"
 	},
 };
 
@@ -1407,7 +1407,7 @@ Schedule_t	slGruntSuppress[] =
 		bits_COND_NO_AMMO_LOADED,
 
 		bits_SOUND_DANGER,
-		"Suppress"
+		"GRUNT_SUPPRESS"
 	},
 };
 
@@ -1437,7 +1437,7 @@ Schedule_t	slGruntWaitInCover[] =
 		bits_COND_CAN_MELEE_ATTACK2,
 
 		bits_SOUND_DANGER,
-		"GruntWaitInCover"
+		"GRUNT_WAIT_IN_COVER"
 	},
 };
 
@@ -1465,7 +1465,7 @@ Schedule_t	slGruntTakeCover[] =
 		ARRAYSIZE ( tlGruntTakeCover1 ), 
 		0,
 		0,
-		"TakeCover"
+		"GRUNT_TAKE_COVER"
 	},
 };
 
@@ -1491,7 +1491,7 @@ Schedule_t	slGruntGrenadeCover[] =
 		ARRAYSIZE ( tlGruntGrenadeCover1 ), 
 		0,
 		0,
-		"GrenadeCover"
+		"GRUNT_GRENADE_COVER"
 	},
 };
 
@@ -1513,7 +1513,7 @@ Schedule_t	slGruntTossGrenadeCover[] =
 		ARRAYSIZE ( tlGruntTossGrenadeCover1 ), 
 		0,
 		0,
-		"TossGrenadeCover"
+		"GRUNT_TOSS_GRENADE_COVER"
 	},
 };
 
@@ -1538,7 +1538,7 @@ Schedule_t	slGruntTakeCoverFromBestSound[] =
 		ARRAYSIZE ( tlGruntTakeCoverFromBestSound ), 
 		0,
 		0,
-		"GruntTakeCoverFromBestSound"
+		"GRUNT_TAKE_COVER_FROM_BEST_SOUND"
 	},
 };
 
@@ -1566,7 +1566,7 @@ Schedule_t slGruntHideReload[] =
 		bits_COND_HEAR_SOUND,
 
 		bits_SOUND_DANGER,
-		"GruntHideReload"
+		"GRUNT_HIDE_RELOAD"
 	}
 };
 
@@ -1598,7 +1598,7 @@ Schedule_t	slGruntSweep[] =
 		bits_SOUND_DANGER		|
 		bits_SOUND_PLAYER,
 
-		"Grunt Sweep"
+		"GRUNT_SWEEP"
 	},
 };
 
@@ -1637,7 +1637,7 @@ Schedule_t	slGruntRangeAttack1A[] =
 		bits_COND_NO_AMMO_LOADED,
 
 		bits_SOUND_DANGER,
-		"Range Attack1A"
+		"GRUNT_RANGE_ATTACK_1A"
 	},
 };
 
@@ -1674,7 +1674,7 @@ Schedule_t	slGruntRangeAttack1B[] =
 		bits_COND_HEAR_SOUND,
 
 		bits_SOUND_DANGER,
-		"Range Attack1B"
+		"GRUNT_RANGE_ATTACK_1B"
 	},
 };
 
@@ -1710,7 +1710,7 @@ Schedule_t	slGruntRangeAttack1C[] =
 		bits_COND_NO_AMMO_LOADED,
 
 		bits_SOUND_DANGER,
-		"Range Attack"
+		"GRUNT_RANGE_ATTACK_1C"
 	},
 };
 
@@ -1733,7 +1733,7 @@ Schedule_t	slGruntRangeAttack2[] =
 		ARRAYSIZE ( tlGruntRangeAttack2 ), 
 		0,
 		0,
-		"RangeAttack2"
+		"GRUNT_RANGE_ATTACK2"
 	},
 };
 
@@ -1762,7 +1762,7 @@ Schedule_t	slGruntRepel[] =
 		bits_SOUND_DANGER			|
 		bits_SOUND_COMBAT			|
 		bits_SOUND_PLAYER, 
-		"Repel"
+		"GRUNT_REPEL"
 	},
 };
 
@@ -1784,7 +1784,7 @@ Schedule_t	slGruntRepelAttack[] =
 		ARRAYSIZE ( tlGruntRepelAttack ), 
 		bits_COND_ENEMY_OCCLUDED,
 		0,
-		"Repel Attack"
+		"GRUNT_REPEL_ATTACK"
 	},
 };
 
@@ -1815,7 +1815,7 @@ Schedule_t	slGruntRepelLand[] =
 		bits_SOUND_DANGER			|
 		bits_SOUND_COMBAT			|
 		bits_SOUND_PLAYER, 
-		"Repel Land"
+		"GRUNT_REPEL_LAND"
 	},
 };
 
@@ -1838,7 +1838,7 @@ Schedule_t	slMinigunSpinup[] =
 		bits_COND_GRUNT_NOFIRE,
 
 		0,
-		"Minigun spinup"
+		"GRUNT_MINIGUN_SPINUP"
 	},
 };
 
@@ -1855,7 +1855,7 @@ Schedule_t	slMinigunSpindown[] =
 		0,
 
 		0,
-		"Minigun spindown"
+		"GRUNT_MINIGUN_SPINDOWN"
 	},
 };