From 25c98dda305c8066e92a356b37b93bd7cd654ffb Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 8 May 2015 19:04:11 +0000 Subject: [PATCH] Wirecutters no longer give a bonus to disarm, as there is a separate tag for this. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7851 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 7ed1776ef..ce13f0e07 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -7048,27 +7048,15 @@ INT32 CheckBombDisarmChance(void) // owner - 2 gives the ID of the character who planted it if ( gTempObject[0]->data.misc.ubBombOwner > 1 && ( (INT32)gTempObject[0]->data.misc.ubBombOwner - 2 >= gTacticalStatus.Team[ OUR_TEAM ].bFirstID && gTempObject[0]->data.misc.ubBombOwner - 2 <= gTacticalStatus.Team[ OUR_TEAM ].bLastID ) ) { - // Flugente: get a tripwire-related bonus if we have a wire cutter in our hands - INT8 wirecutterbonus = 0; - if ( ( (&gpBoobyTrapSoldier->inv[HANDPOS])->exists() && Item[ gpBoobyTrapSoldier->inv[HANDPOS].usItem ].wirecutters == 1 ) || ( (&gpBoobyTrapSoldier->inv[SECONDHANDPOS])->exists() && Item[ gpBoobyTrapSoldier->inv[SECONDHANDPOS].usItem ].wirecutters == 1 ) ) - { - // + 10 if item gets activated by tripwire - if ( Item[gTempObject.usItem].tripwireactivation == 1 ) - wirecutterbonus += 10; - // + 10 if item is tripwire - if ( Item[gTempObject.usItem].tripwire == 1 ) - wirecutterbonus += 10; - } - if ( gTempObject[0]->data.misc.ubBombOwner - 2 == gpBoobyTrapSoldier->ubID ) { // my own boobytrap! - return SkillCheck( gpBoobyTrapSoldier, DISARM_TRAP_CHECK, 40 + wirecutterbonus ); + return SkillCheck( gpBoobyTrapSoldier, DISARM_TRAP_CHECK, 40 ); } else { // our team's boobytrap! - return SkillCheck( gpBoobyTrapSoldier, DISARM_TRAP_CHECK, 20 + wirecutterbonus ); + return SkillCheck( gpBoobyTrapSoldier, DISARM_TRAP_CHECK, 20 ); } }