New Trait: Snitch (Trait 22) (by anv)

Every midnight snitches will give you a report about their collegues' opinions. Information includes:
- merc whining about high death rate,
- merc whining about player reputation,
- merc whining about his low morale,
- merc whining about some other merc (unliked, not only hated),
- merc planning to quit (leave without renewing contract, only AIM mercs) next day,
- merc whining about player inactivity,
- merc whining about player owing them money (you can only owe money to MERC mercs).

List of snitches (trait 22)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6723 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-01 12:02:23 +00:00
parent 224ebe9ba3
commit d5b4599e9c
54 changed files with 1395 additions and 163 deletions
+84 -5
View File
@@ -4,8 +4,7 @@
#include "Types.h"
#include "Soldier Control.h"
#define DEFAULT_MORALE 50
//#define DEFAULT_MORALE 50
typedef enum
{
@@ -45,20 +44,67 @@ typedef enum
MORALE_QUEEN_BATTLE_WON,
MORALE_SEX,
// added by SANDRO
MORALE_HEAT_INTOLERANT_IN_DESERT,
MORALE_HEAT_INTOLERANT_IN_DESERT, // 35
MORALE_PSYCHO_UNABLE_TO_PSYCHO,
MORALE_PACIFIST_GAIN_NONCOMBAT,
MORALE_MALICIOUS_HIT,
// added by Flugente
MORALE_FOOD,
MORALE_GOOD_FOOD,
MORALE_GOOD_FOOD, // 40
MORALE_BAD_FOOD,
MORALE_LOATHSOME_FOOD,
NUM_MORALE_EVENTS
// added by anv
MORALE_BUDDY_FIRED,
MORALE_BUDDY_FIRED_EARLY,
MORALE_BUDDY_FIRED_ON_BAD_TERMS, //45
MORALE_BAD_EQUIPMENT,
MORALE_OWED_MONEY,
MORALE_OWED_MONEY_DAYS,
MORALE_PLAYER_INACTIVE,
MORALE_PLAYER_INACTIVE_DAYS,
MORALE_PLAYER_INACTIVE_DAYS_AGGRESSIVE_BONUS,
MORALE_PLAYER_INACTIVE_DAYS_PACIFIST_BONUS,
NUM_MORALE_EVENTS,
} MoraleEventNames;
typedef enum
{
MORALE_MOD_MAX = 0,
PHOBIC_LIMIT,
MORALE_MODIFIER_SOCIABLE_ONE_MERC_NEARBY,
MORALE_MODIFIER_SOCIABLE_NO_MERCS_NEARBY,
MORALE_MODIFIER_LONER_ONE_MERC_NEARBY,
MORALE_MODIFIER_LONER_MORE_MERCS_NEARBY,
MORALE_MODIFIER_AGRESSIVE_VIOLENT_ACTION,
MORALE_MODIFIER_PACIFIST_VIOLENT_ACTION,
MORALE_MODIFIER_OPTIMIST,
MORALE_MODIFIER_SHOWOFF_AROUND,
MORALE_MODIFIER_DAUNTLESS_SQUADMATE_DIED,
MORALE_MODIFIER_DAUNTLESS_SUPPRESSED,
MORALE_MODIFIER_DAUNTLESS_TOOK_LOTS_OF_DAMAGE,
MORALE_MODIFIER_DAUNTLESS_TEAMMATE_DIED,
MORALE_MODIFIER_OT_OPTIMIST_GOOD_EVENT,
MORALE_MODIFIER_OT_AGGRESSIVE_GOOD_EVENT,
MORALE_MODIFIER_OT_PESSIMIST_GOOD_EVENT,
MORALE_MODIFIER_OT_OPTIMIST_BAD_EVENT,
MORALE_MODIFIER_OT_PESSIMIST_BAD_EVENT,
MORALE_MODIFIER_OT_COWARD_BAD_EVENT,
MORALE_MODIFIER_MALICIOUS_HOURLY_DECAY,
NUM_MORALE_MODIFIERS,
} MoraleModifierNames;
typedef enum
{
DRUG_EFFECT_MORALE_MOD = 0,
ALCOHOL_EFFECT_MORALE_MOD,
NUM_DRUG_AND_ALCOHOL_MODIFIERS,
} DrugAndAlcoholModifierNames;
typedef enum
{
TACTICAL_MORALE_EVENT = 0,
@@ -71,11 +117,44 @@ typedef struct MoraleEvent
INT8 bChange;
} MoraleEvent;
#define MAX_SNITCH_EVENTS 64;
#define MAX_SNITCHES 16;
typedef enum
{
SNITCH_INTRODUCTION= 0,
SNITCH_DEATH_RATE, // current death rate higher than preferable
SNITCH_REPUTATION, // current reputation worse than preferable
SNITCH_LOW_MORALE, // merc's morale worse than preferable
SNITCH_HATED_PERSON, // merc dislikes another person (not necessarily hates him)
SNITCH_GONNA_QUIT, // merc's contract going to end and he won't renew
SNITCH_PROGRESS, // merc thinks player is inactive too long
SNITCH_OWED_MONEY, // merc is owed money
SNITCH_TEAM_ROTATION, // unused at the moment (will have to add specific rotation tolerance to mercs or something)
// maybe with personal opinion on rotation depending on opinions (so they get pissed faster when liked mercs are fired)
NUM_SNITCH_EVENTS,
} SnitchEventType;
typedef struct SnitchEvent
{
UINT8 ubEventType;
UINT8 ubSnitchID;
UINT8 ubTargetProfile;
UINT8 ubSecondaryTargetProfile;
} SnitchEvent;
extern void HandleMoraleEvent( SOLDIERTYPE * pSoldier, INT8 bMoraleEvent, INT16 sMapX, INT16 sMapY, INT8 bMapZ );
extern void RefreshSoldierMorale( SOLDIERTYPE * pSoldier );
extern INT8 GetMoraleModifier( SOLDIERTYPE * pSoldier );
void HourlyMoraleUpdate( void );
void HandleSnitchCheck( void );
void HandleSnitchesReports( SnitchEvent *SnitchEvents, UINT8 ubSnitchEventsCounter );
INT8 RememberSnitchableEvent( UINT8 ubTargetProfile, UINT8 ubSecondaryTargetProfile, BOOLEAN fSameGroupOnly, UINT8 ubEventType, SnitchEvent SnitchEvents[], INT8 ubSnitchEventsCounter );
void DailyMoraleUpdate( SOLDIERTYPE *pSoldier );
void DecayTacticalMoraleModifiers( void );