Add husk soldier class to ai_allymanager #296
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1upD
reviewed
Jan 26, 2025
| @@ -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" ) ) | |||
There was a problem hiding this comment.
What about other derivatives of the Combine soldier like Bad Cop, Clone Cop, and the Combine assassins?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?
1upD
requested changes
Feb 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds
npc_husk_soldiertoai_allymanageras an alternate classname for Combine soldiers. This allowsai_allymanagerto respect commandable husks when determining how many allies the player has available.Note that
CNPC_HuskSoldier::IsCommandableexplicitly checks whether the husk likes the player, so this will only count husks which are both commandable and friendly with the player.