Skip to content

Commit

Permalink
Fix for Trip AoO doing a Touch Attack
Browse files Browse the repository at this point in the history
  • Loading branch information
DudeMcDude committed May 6, 2016
1 parent d43e69a commit 0cca97a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions TemplePlus/d20.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ ActionErrorCode D20ActionCallbacks::PerformTripAttack(D20Actn* d20a)
return AEC_TARGET_INVALID;

d20a->d20Caf |= D20CAF_TOUCH_ATTACK;
d20Sys.ToHitProc(d20a);
combatSys.ToHitProcessing(*d20a);
//d20Sys.ToHitProc(d20a);
if (animationGoals.PushAttemptAttack(d20a->d20APerformer, d20a->d20ATarget))
{
d20a->animID = animationGoals.GetAnimIdSthgSub_1001ABB0(d20a->d20APerformer);
Expand Down Expand Up @@ -1669,8 +1670,7 @@ ActionErrorCode D20ActionCallbacks::PerformAoo(D20Actn* d20a)
combatSys.FloatCombatLine(performer, 43); // attack of opportunity
histSys.CreateRollHistoryLineFromMesfile(1, performer, tgt);

if (d20Sys.d20Query(d20a->d20APerformer, DK_QUE_Trip_AOO))
{
if (d20Sys.d20Query(d20a->d20APerformer, DK_QUE_Trip_AOO) && !d20Sys.d20Query(d20a->d20ATarget, DK_QUE_Prone) ) {
return PerformTripAttack(d20a);
}
// else do standard attack
Expand Down

0 comments on commit 0cca97a

Please sign in to comment.