Skip to content

Add husk soldier class to ai_allymanager #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blixibon wants to merge 1 commit into
base: ez2/mapbase
Choose a base branch
from
Open

Add husk soldier class to ai_allymanager #296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sp/src/game/server/hl2/ai_allymanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void CAI_AllyManager::CountAllies( int *pTotal, int *pMedics )

#ifdef EZ
// Blixibon - The soldiers' "IsCommandable" function only checks the spawnflag, so it's fine here
if( FClassnameIs( ppAIs[i], "npc_combine_s" ) )
if( FClassnameIs( ppAIs[i], "npc_combine_s" ) || FClassnameIs( ppAIs[i], "npc_husk_soldier" ) )
Copy link

@1upD 1upD Jan 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about other derivatives of the Combine soldier like Bad Cop, Clone Cop, and the Combine assassins?

Copy link
Collaborator Author

@Blixibon Blixibon Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've actually never thought about that 🤔

We should add them in the future, but I think I'd rather sort that out in another PR unless you think we should hold off on this one otherwise.

Copy link

@1upD 1upD Feb 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should hold off on this one just because I think it's unlikely we'll return to this issue and I could see this being needed for assassins at least. Some poor mapper is going to need it for Clone Cops or Bad Cops too. Maybe it should check if the entity is descended from the base Combine class?

{
CNPC_Combine *pCombine = assert_cast<CNPC_Combine*>(ppAIs[i]);
if ( !pCombine->IsCommandable() )
Expand Down
Loading