Merged revision(s) 6997-6998 from branches/ja2_source_official_2014:

- Campaign stats take spy actions and SAM sabotages into account
- spy encounters are not reproted if nothing of interest happened
- Fix: error in food system automatic canteen refill
- Fix: if min enemy group size is too high, the AI never replensishes garrisons, thereby severely dumbing down the game.
- Fix: enemy groups do not receive minimum size
- Fix: enemy groups sizes are cut down needlessly


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-03-01 01:48:43 +00:00
parent 618b1c1f8a
commit 3ae95a6c20
17 changed files with 156 additions and 37 deletions
+9
View File
@@ -15643,6 +15643,12 @@ BOOLEAN SOLDIERTYPE::RecognizeAsCombatant(UINT8 ubTargetID)
}
}
// campaign stats
if ( pSoldier->bTeam == ENEMY_TEAM )
gCurrentIncident.usIncidentFlags |= INCIDENT_SPYACTION_ENEMY;
else
gCurrentIncident.usIncidentFlags |= INCIDENT_SPYACTION_PLAYERSIDE;
// do we recognize this guy as an enemy?
if ( !pSoldier->SeemsLegit(this->ubID) )
{
@@ -15663,6 +15669,9 @@ BOOLEAN SOLDIERTYPE::RecognizeAsCombatant(UINT8 ubTargetID)
this->aiData.bOppList[pSoldier->ubID] = NOT_HEARD_OR_SEEN;
ManSeesMan(this, pSoldier, pSoldier->sGridNo, pSoldier->pathing.bLevel, 0, 0);
// campaign stats
gCurrentIncident.usIncidentFlags |= INCIDENT_SPYACTION_UNCOVERED;
}
return TRUE;