1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change: dynamic opinion: the event OPINIONEVENT_BESTCOMMANDEREVER is only called if

Browse Source 
- we won the battle battle,
- the enemy outnumbered us at least 2:1,
- the enemy had at least 4 times our losses and
- the enemy patrol numbered at least MAX_STRATEGIC_ENEMY_GROUP_SIZE people

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-04-19 09:28:13 +00:00
parent c5c57c7976
commit d464d493e9
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/DynamicDialogue.cpp
+14 -12
View File
@@ -1769,22 +1769,24 @@ void HandleDynamicOpinionBattleFinished( BOOLEAN fBattleWon )
for ( UINT16 i = CAMPAIGNHISTORY_SD_ENEMY_ADMIN; i < CAMPAIGNHISTORY_SD_MAX; ++i ) for ( UINT16 i = CAMPAIGNHISTORY_SD_ENEMY_ADMIN; i < CAMPAIGNHISTORY_SD_MAX; ++i )
{ {
enemylosses += 10 * gCurrentIncident.usKills[i]; enemylosses += 10 * gCurrentIncident.usKills[i];
enemylosses += gCurrentIncident.usWounds[i]; enemylosses += 11 * gCurrentIncident.usPrisoners[i]; // capturing the enemy is even better than killing them
enemylosses += 12 * gCurrentIncident.usPrisoners[i]; // capturing the enemy is even better than killing them
enemysidesize += gCurrentIncident.usParticipants[i]; enemysidesize += gCurrentIncident.usParticipants[i];
} }
// complains only happen if there was a significant battle // if we've taken more losses than the enemy, our mercs will complain - even if we won. Our mercs don't seem to like phyrric victories...
if ( ourlosses > 100 || enemylosses > 100 ) if ( ourlosses > enemylosses && ourlosses > 75 )
{ {
// if we've taken more losses than the enemy, our mercs will complain - even if we won. Our mercs don't seem to like phyrric victories... HandleDynamicOpinionChange( MercPtrs[leaderid], OPINIONEVENT_WORSTCOMMANDEREVER, TRUE, TRUE );
if ( ourlosses > enemylosses ) }
{ else
HandleDynamicOpinionChange( MercPtrs[leaderid], OPINIONEVENT_WORSTCOMMANDEREVER, TRUE, TRUE ); {
} // our mercs praise their leader if
// if we won with our losses significantly lower than the enemies', while the enemy vastly outnumbered us, our mercs will be quite happy // they won the battle
else if ( fBattleWon && oursidesize < 2 * enemysidesize && 4 * ourlosses < enemylosses ) // the enemy outnumbered them at least 2:1
// the enemy had at least 4 times their losses
// the enemy patrol was of significant size (this is supposed to be given for huge battles only)
if ( fBattleWon && 2 * oursidesize < enemysidesize && 4 * ourlosses < enemylosses && enemylosses > 10 * gGameExternalOptions.iMaxEnemyGroupSize )
{ {
HandleDynamicOpinionChange( MercPtrs[leaderid], OPINIONEVENT_BESTCOMMANDEREVER, TRUE, TRUE ); HandleDynamicOpinionChange( MercPtrs[leaderid], OPINIONEVENT_BESTCOMMANDEREVER, TRUE, TRUE );
} }
@@ -2033,7 +2035,7 @@ UINT8 HighestInventoryCoolness( SOLDIERTYPE* pSoldier )
INT8 invsize = (INT8)pSoldier->inv.size( ); // remember inventorysize, so we don't call size() repeatedly INT8 invsize = (INT8)pSoldier->inv.size( ); // remember inventorysize, so we don't call size() repeatedly
for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop ) // ... for all items in our inventory ... for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop ) // ... for all items in our inventory ...
{ {
// ... if Item exists and is food ... // ... if Item exists
if ( pSoldier->inv[bLoop].exists( ) ) if ( pSoldier->inv[bLoop].exists( ) )
{ {
coolness = max( coolness, Item[pSoldier->inv[bLoop].usItem].ubCoolness ); coolness = max( coolness, Item[pSoldier->inv[bLoop].usItem].ubCoolness );