1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

New merc (somewhat): Similar to Larry's two personalities, Buns now has an alternate personality as well.

Browse Source 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23806&goto=354149&#msg_354149

Requires GameDir >= r2430.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-25 20:14:33 +00:00
parent b70fcbe5e6
commit 887170dda5
24 changed files with 216 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Merc Contract.cpp
+9
View File
@@ -939,6 +939,15 @@ BOOLEAN StrategicRemoveMerc( SOLDIERTYPE *pSoldier )
EndCurrentContractRenewal( );
}
// Flugente: if this is Buns alternate personality, change her back.
// This way we don't have to deal with her transformation while she is absent (and we don't need additional laptop soundfiles).
if ( pSoldier->ubProfile == BUNS_CHAOTIC )
{
gMercProfiles[BUNS].bNPCData = 0;
SwapToProfile( pSoldier, BUNS );
}
// anv: let buddies react
HandleBuddiesReactionToFiringMerc(pSoldier, MORALE_BUDDY_FIRED);