mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Added Speck as a playable merc (by anv)
o Speck can be hired by M.E.R.C o From now on, as long as Speck is hired (or dead, or POW, or travelling), he won't be sitting on Speck Com nor sending you emails. However, is he's able to, he'll comment on current situation from battlefield: player owing money, Flo getting married, MERC merc dying, etc., so keeping him alive might be a good idea o GameDir data revision >= 1701 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -94,6 +94,10 @@
|
||||
#include "Ja25Update.h"
|
||||
#endif
|
||||
|
||||
// anv: for playable Speck
|
||||
#include "Speck Quotes.h"
|
||||
#include "mercs.h"
|
||||
|
||||
//forward declarations of common classes to eliminate includes
|
||||
class OBJECTTYPE;
|
||||
class SOLDIERTYPE;
|
||||
@@ -2724,6 +2728,14 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
|
||||
if( pSoldier->ubProfile == FLO )
|
||||
{
|
||||
SetFactTrue( FACT_PC_MARRYING_DARYL_IS_FLO );
|
||||
// anv: make Speck whine about it immediately if on team
|
||||
if( !IsMercDead(BIFF) && !IsSpeckComAvailable() )
|
||||
{
|
||||
TacticalCharacterDialogue( FindSoldierByProfileID( SPECK_PLAYABLE , TRUE ), SPECK_PLAYABLE_QUOTE_FLO_MARRIED_A_COUSIN_BIFF_IS_ALIVE );
|
||||
// don't bring this up again
|
||||
LaptopSaveInfo.fSpeckSaidFloMarriedCousinQuote = TRUE;
|
||||
MakeBiffAwayForCoupleOfDays();
|
||||
}
|
||||
}
|
||||
|
||||
HandleMoraleEvent( pSoldier, MORALE_MERC_MARRIED, gWorldSectorX, gWorldSectorY, gbWorldSectorZ );
|
||||
|
||||
Reference in New Issue
Block a user