mirror of
https://github.com/1dot13/source.git
synced 2026-08-26 14:30:26 +02:00
Enemy Taunts Update (by anv)
- replaced 5 different riposte tags with one <riposte_quote>XXX<riposte_quote>, where XXX can be any quote number, that taunt is supposed to be answer to. All but quotes 20-22 use random enemy witnessing quote to taunt, these three - last attacker. - added above ripostes + some more. - see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/4/Externalised_taunts.html git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+3
-23
@@ -1229,11 +1229,7 @@ void PossiblyStartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType, SOLDIERTYPE *p
|
||||
return;
|
||||
break;
|
||||
|
||||
case TAUNT_R_1ST_ENEMY_DETECTED:
|
||||
case TAUNT_R_ENEMY_DETECTED:
|
||||
case TAUNT_R_MULTIPLE_ENEMIES:
|
||||
case TAUNT_R_BULLET_FLEW_BY:
|
||||
case TAUNT_R_UNDER_HEAVY_FIRE:
|
||||
case TAUNT_RIPOSTE:
|
||||
if( Random(100)+1 > gTauntsSettings.ubRiposteChance)
|
||||
return;
|
||||
break;
|
||||
@@ -1534,24 +1530,8 @@ void StartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType, SOLDIERTYPE *pTarget )
|
||||
break;
|
||||
|
||||
// ripostes to merc quotes
|
||||
case TAUNT_R_BULLET_FLEW_BY:
|
||||
if( !(zTaunt[ i ].uiFlags & TAUNT_S_R_BULLET_FLEW_BY) )
|
||||
continue;
|
||||
break;
|
||||
case TAUNT_R_UNDER_HEAVY_FIRE:
|
||||
if( !(zTaunt[ i ].uiFlags & TAUNT_S_R_UNDER_HEAVY_FIRE) )
|
||||
continue;
|
||||
break;
|
||||
case TAUNT_R_ENEMY_DETECTED:
|
||||
if( !(zTaunt[ i ].uiFlags & TAUNT_S_R_ENEMY_DETECTED) )
|
||||
continue;
|
||||
break;
|
||||
case TAUNT_R_1ST_ENEMY_DETECTED:
|
||||
if( !(zTaunt[ i ].uiFlags2 & TAUNT_S_R_1ST_ENEMY_DETECTED) )
|
||||
continue;
|
||||
break;
|
||||
case TAUNT_R_MULTIPLE_ENEMIES:
|
||||
if( !(zTaunt[ i ].uiFlags2 & TAUNT_S_R_MULTIPLE_ENEMIES) )
|
||||
case TAUNT_RIPOSTE:
|
||||
if( !(gTacticalStatus.ubLastQuoteSaid == zTaunt[ i ].value[TAUNT_RIPOSTE_QUOTE]) )
|
||||
continue;
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user