mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
If USE_AIMED_BURST and AIMED_BURST_ALTERNATE_KEY are TRUE, we now use [o] intead of [Alt] + [t] to toggle aiming. This is for people who have no working mousewheel and thus couldn't aim with auto-only weapons.
This is necessary as [ALT] switches the mousewheel function between increasing aiming levels and adding more bullets. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
@@ -3894,8 +3894,18 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// Flugente: alternate for people without mousewheel who want to aim auto-only weapons
|
||||||
|
if ( gGameExternalOptions.bAimedBurstEnabled && gGameExternalOptions.bAimedBurstAlternateKey && gCurrentUIMode == CONFIRM_ACTION_MODE )
|
||||||
|
{
|
||||||
|
SOLDIERTYPE * pSoldier;
|
||||||
|
|
||||||
|
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
|
||||||
|
{
|
||||||
|
HandleWheelAdjustCursor( pSoldier, usMapPos, 1,brstmode );
|
||||||
|
}
|
||||||
|
}
|
||||||
// nothing in hand and the Options Screen button for whichever panel we're in must be enabled
|
// nothing in hand and the Options Screen button for whichever panel we're in must be enabled
|
||||||
if ( ( gpItemPointer == NULL ) && !gfDisableTacticalPanelButtons &&
|
else if ( ( gpItemPointer == NULL ) && !gfDisableTacticalPanelButtons &&
|
||||||
( ( gsCurInterfacePanel != SM_PANEL ) || ( ButtonList[ iSMPanelButtons[ OPTIONS_BUTTON ] ]->uiFlags & BUTTON_ENABLED ) ) )
|
( ( gsCurInterfacePanel != SM_PANEL ) || ( ButtonList[ iSMPanelButtons[ OPTIONS_BUTTON ] ]->uiFlags & BUTTON_ENABLED ) ) )
|
||||||
{
|
{
|
||||||
if( !fDisableMapInterfaceDueToBattle )
|
if( !fDisableMapInterfaceDueToBattle )
|
||||||
@@ -4296,17 +4306,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
|
|||||||
|
|
||||||
if( fAlt )
|
if( fAlt )
|
||||||
{
|
{
|
||||||
// Flugente: alternate for people without mousewheel who want to aim auto-only weapons
|
if ( CHEATER_CHEAT_LEVEL( ) )
|
||||||
if ( gGameExternalOptions.bAimedBurstEnabled && gGameExternalOptions.bAimedBurstAlternateKey && gCurrentUIMode == CONFIRM_ACTION_MODE )
|
|
||||||
{
|
|
||||||
SOLDIERTYPE * pSoldier;
|
|
||||||
|
|
||||||
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
|
|
||||||
{
|
|
||||||
HandleRightClickAdjustCursor( pSoldier, usMapPos );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ( CHEATER_CHEAT_LEVEL( ) )
|
|
||||||
{
|
{
|
||||||
TeleportSelectedSoldier();
|
TeleportSelectedSoldier();
|
||||||
}
|
}
|
||||||
|
|||||||
+139
-131
@@ -31,6 +31,7 @@
|
|||||||
#include "PATHAI.H"
|
#include "PATHAI.H"
|
||||||
#include "SkillCheck.h" // added by SANDRO
|
#include "SkillCheck.h" // added by SANDRO
|
||||||
#include "message.H" //ddd
|
#include "message.H" //ddd
|
||||||
|
#include "english.h" // added by Flugente
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//forward declarations of common classes to eliminate includes
|
//forward declarations of common classes to eliminate includes
|
||||||
@@ -3343,189 +3344,196 @@ void HandleWheelAdjustCursor( SOLDIERTYPE *pSoldier, INT32 sMapPos, INT32 sDelta
|
|||||||
switch( ubCursor )
|
switch( ubCursor )
|
||||||
{
|
{
|
||||||
case TARGETCURS:
|
case TARGETCURS:
|
||||||
|
|
||||||
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"cbef=%d",CalcChanceToHitGun( pSoldier, sMapPos, pSoldier->aiData.bShownAimTime, pSoldier->bAimShotLocation ) );
|
|
||||||
if(pSoldier->bDoAutofire && (gfKeyState[18] || brstmode) ) //íàêðóòêà êîë-âà ïóëåé â î÷åðåäè
|
|
||||||
{
|
{
|
||||||
INT16 sCurAPCosts;
|
if(pSoldier->bDoAutofire && (gfKeyState[ ALT ] || brstmode) ) //íàêðóòêà êîë-âà ïóëåé â î÷åðåäè // Flugente: how the fuck is this comment useful?
|
||||||
|
|
||||||
if(pSoldier->bDoAutofire==1 && sDelta<0) return;
|
|
||||||
|
|
||||||
if(usShotsLeft > pSoldier->bDoAutofire )
|
|
||||||
{
|
{
|
||||||
//Calculate how many bullets we need to fire to add at least one more AP
|
INT16 sCurAPCosts;
|
||||||
sAPCosts = sCurAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
|
||||||
while(EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) && sAPCosts <= sCurAPCosts && usShotsLeft > pSoldier->bDoAutofire) //Increment the bullet count until we run out of APs or we spend the whole AP
|
if(pSoldier->bDoAutofire==1 && sDelta<0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if(usShotsLeft > pSoldier->bDoAutofire )
|
||||||
{
|
{
|
||||||
pSoldier->bDoAutofire++;
|
//Calculate how many bullets we need to fire to add at least one more AP
|
||||||
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
sAPCosts = sCurAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
||||||
}
|
while(EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) && sAPCosts <= sCurAPCosts && usShotsLeft > pSoldier->bDoAutofire) //Increment the bullet count until we run out of APs or we spend the whole AP
|
||||||
|
{
|
||||||
|
pSoldier->bDoAutofire++;
|
||||||
|
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
||||||
|
}
|
||||||
|
|
||||||
//we've stepped over the border and used up one more ap, now let's make sure that it is spent to maximize the bullets
|
//we've stepped over the border and used up one more ap, now let's make sure that it is spent to maximize the bullets
|
||||||
|
|
||||||
sCurAPCosts = sAPCosts;
|
sCurAPCosts = sAPCosts;
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
pSoldier->bDoAutofire+=sDelta;
|
pSoldier->bDoAutofire+=sDelta;
|
||||||
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
||||||
}
|
}
|
||||||
while(EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) && sAPCosts == sCurAPCosts && usShotsLeft >= pSoldier->bDoAutofire);
|
while(EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) && sAPCosts == sCurAPCosts && usShotsLeft >= pSoldier->bDoAutofire);
|
||||||
pSoldier->bDoAutofire--;
|
|
||||||
|
|
||||||
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
|
||||||
|
|
||||||
if(!EnoughPoints( pSoldier, sAPCosts, 0, FALSE )) //We've not enough points to fire those bullets
|
|
||||||
{
|
|
||||||
pSoldier->flags.autofireLastStep = TRUE;
|
|
||||||
pSoldier->bDoAutofire--;
|
pSoldier->bDoAutofire--;
|
||||||
|
|
||||||
|
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, pSoldier->aiData.bShownAimTime);
|
||||||
|
|
||||||
|
if(!EnoughPoints( pSoldier, sAPCosts, 0, FALSE )) //We've not enough points to fire those bullets
|
||||||
|
{
|
||||||
|
pSoldier->flags.autofireLastStep = TRUE;
|
||||||
|
pSoldier->bDoAutofire--;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pSoldier->flags.autofireLastStep = FALSE; //both last step conditions are false
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
pSoldier->flags.autofireLastStep = FALSE; //both last step conditions are false
|
{
|
||||||
|
if(sDelta<0)
|
||||||
|
{
|
||||||
|
pSoldier->flags.autofireLastStep = FALSE;
|
||||||
|
pSoldier->bDoAutofire--;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pSoldier->flags.autofireLastStep = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(sDelta<0)
|
sGridNo = sMapPos;
|
||||||
|
bTargetLevel = (INT8)gsInterfaceLevel;
|
||||||
|
|
||||||
|
// Look for a target here...
|
||||||
|
if ( gfUIFullTargetFound )
|
||||||
{
|
{
|
||||||
pSoldier->flags.autofireLastStep = FALSE;
|
// Get target soldier, if one exists
|
||||||
pSoldier->bDoAutofire--;
|
pTSoldier = MercPtrs[ gusUIFullTargetID ];
|
||||||
|
sGridNo = pTSoldier->sGridNo;
|
||||||
|
bTargetLevel = pSoldier->pathing.bLevel;
|
||||||
|
|
||||||
|
if ( !HandleCheckForBadChangeToGetThrough( pSoldier, pTSoldier, sGridNo , bTargetLevel ) )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
pSoldier->flags.autofireLastStep = TRUE;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
///////////////////////////////
|
|
||||||
sGridNo = sMapPos;
|
|
||||||
bTargetLevel = (INT8)gsInterfaceLevel;
|
|
||||||
|
|
||||||
// Look for a target here...
|
bFutureAim = maxAimLevels;
|
||||||
if ( gfUIFullTargetFound )
|
|
||||||
{
|
|
||||||
// Get target soldier, if one exists
|
|
||||||
pTSoldier = MercPtrs[ gusUIFullTargetID ];
|
|
||||||
sGridNo = pTSoldier->sGridNo;
|
|
||||||
bTargetLevel = pSoldier->pathing.bLevel;
|
|
||||||
|
|
||||||
if ( !HandleCheckForBadChangeToGetThrough( pSoldier, pTSoldier, sGridNo , bTargetLevel ) )
|
//Find the actual maximum aim that can be done.
|
||||||
|
while( bFutureAim > 0 )
|
||||||
{
|
{
|
||||||
return;
|
//Can afford this many?
|
||||||
|
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, bFutureAim );
|
||||||
|
if( !maxAimCanAfford && EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) )
|
||||||
|
{
|
||||||
|
maxAimCanAfford = bFutureAim;
|
||||||
|
}
|
||||||
|
//Find the least amount of aiming needed to get maximum CtH
|
||||||
|
//Give some slack, but don't let the slack accumulate.
|
||||||
|
//dd???{
|
||||||
|
//hitChance = CalcChanceToHitGun( pSoldier, sMapPos, bFutureAim, pSoldier->bAimShotLocation );
|
||||||
|
//if( hitChance >= maxCtH - 3){
|
||||||
|
// minAimForCtH = bFutureAim;
|
||||||
|
// if(hitChance >= maxCtH) maxCtH = hitChance;
|
||||||
|
//}
|
||||||
|
//ddd???}
|
||||||
|
//Loop to 0.
|
||||||
|
--bFutureAim;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
bFutureAim = oldAim + sDelta;
|
||||||
bFutureAim = maxAimLevels;
|
if( bFutureAim < REFINE_AIM_1 )
|
||||||
|
|
||||||
//Find the actual maximum aim that can be done.
|
|
||||||
while( bFutureAim > 0 ){
|
|
||||||
//Can afford this many?
|
|
||||||
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, bFutureAim );
|
|
||||||
if( !maxAimCanAfford && EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) ){
|
|
||||||
maxAimCanAfford = bFutureAim;
|
|
||||||
}
|
|
||||||
//Find the least amount of aiming needed to get maximum CtH
|
|
||||||
//Give some slack, but don't let the slack accumulate.
|
|
||||||
//dd???{
|
|
||||||
//hitChance = CalcChanceToHitGun( pSoldier, sMapPos, bFutureAim, pSoldier->bAimShotLocation );
|
|
||||||
//if( hitChance >= maxCtH - 3){
|
|
||||||
// minAimForCtH = bFutureAim;
|
|
||||||
// if(hitChance >= maxCtH) maxCtH = hitChance;
|
|
||||||
//}
|
|
||||||
//ddd???}
|
|
||||||
//Loop to 0.
|
|
||||||
--bFutureAim;
|
|
||||||
}
|
|
||||||
|
|
||||||
bFutureAim = oldAim + sDelta;
|
|
||||||
if( bFutureAim < REFINE_AIM_1 ) return;
|
|
||||||
|
|
||||||
|
|
||||||
//Do it.
|
|
||||||
if( bFutureAim < REFINE_AIM_1 ){
|
|
||||||
//Went too low. Set to max aim.
|
|
||||||
bFutureAim = maxAimCanAfford;
|
|
||||||
gfDisplayFullCountRing = TRUE;
|
|
||||||
}else if( bFutureAim <= maxAimCanAfford ){
|
|
||||||
//Aim level is doable. No modification needed.
|
|
||||||
gfDisplayFullCountRing = FALSE;
|
|
||||||
}else{
|
|
||||||
//Aim too high. Give indicator that is is maxed, then reset aim refinement.
|
|
||||||
if ( gfDisplayFullCountRing )
|
|
||||||
return;
|
return;
|
||||||
else{
|
|
||||||
//Display ring to indicate maximum aim reached.
|
//Do it.
|
||||||
bFutureAim = oldAim;
|
if( bFutureAim < REFINE_AIM_1 )
|
||||||
|
{
|
||||||
|
//Went too low. Set to max aim.
|
||||||
|
bFutureAim = maxAimCanAfford;
|
||||||
gfDisplayFullCountRing = TRUE;
|
gfDisplayFullCountRing = TRUE;
|
||||||
}
|
}
|
||||||
|
else if( bFutureAim <= maxAimCanAfford )
|
||||||
|
{
|
||||||
|
//Aim level is doable. No modification needed.
|
||||||
|
gfDisplayFullCountRing = FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//Aim too high. Give indicator that is is maxed, then reset aim refinement.
|
||||||
|
if ( gfDisplayFullCountRing )
|
||||||
|
return;
|
||||||
|
else{
|
||||||
|
//Display ring to indicate maximum aim reached.
|
||||||
|
bFutureAim = oldAim;
|
||||||
|
gfDisplayFullCountRing = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//Apply.
|
||||||
|
pSoldier->aiData.bShownAimTime = bFutureAim;
|
||||||
|
|
||||||
|
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"caft=%d",CalcChanceToHitGun( pSoldier, sMapPos, pSoldier->aiData.bShownAimTime, pSoldier->bAimShotLocation ) );
|
||||||
}
|
}
|
||||||
//Apply.
|
}
|
||||||
pSoldier->aiData.bShownAimTime = bFutureAim;
|
|
||||||
|
|
||||||
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"caft=%d",CalcChanceToHitGun( pSoldier, sMapPos, pSoldier->aiData.bShownAimTime, pSoldier->bAimShotLocation ) );
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
case PUNCHCURS:
|
case PUNCHCURS:
|
||||||
|
|
||||||
bFutureAim = (INT8)( pSoldier->aiData.bShownAimTime + (sDelta*REFINE_PUNCH_2) );
|
|
||||||
if(bFutureAim<0) return;
|
|
||||||
if ( bFutureAim <= REFINE_PUNCH_2 )
|
|
||||||
{
|
{
|
||||||
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, (INT8)(bFutureAim / 2) );
|
bFutureAim = (INT8)( pSoldier->aiData.bShownAimTime + (sDelta*REFINE_PUNCH_2) );
|
||||||
|
if(bFutureAim < 0 )
|
||||||
|
return;
|
||||||
|
|
||||||
// Determine if we can afford!
|
if ( bFutureAim <= REFINE_PUNCH_2 )
|
||||||
if ( EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) )
|
|
||||||
{
|
{
|
||||||
pSoldier->aiData.bShownAimTime+= (sDelta*REFINE_PUNCH_2);
|
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, (INT8)(bFutureAim / 2) );
|
||||||
if ( pSoldier->aiData.bShownAimTime > REFINE_PUNCH_2 )
|
|
||||||
pSoldier->aiData.bShownAimTime = REFINE_PUNCH_2;
|
// Determine if we can afford!
|
||||||
gfDisplayFullCountRing = FALSE;
|
if ( EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) )
|
||||||
|
{
|
||||||
|
pSoldier->aiData.bShownAimTime+= (sDelta*REFINE_PUNCH_2);
|
||||||
|
if ( pSoldier->aiData.bShownAimTime > REFINE_PUNCH_2 )
|
||||||
|
pSoldier->aiData.bShownAimTime = REFINE_PUNCH_2;
|
||||||
|
gfDisplayFullCountRing = FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
gfDisplayFullCountRing = TRUE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
gfDisplayFullCountRing = TRUE;
|
gfDisplayFullCountRing = TRUE;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
gfDisplayFullCountRing = TRUE;
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case KNIFECURS:
|
case KNIFECURS:
|
||||||
|
|
||||||
bFutureAim = (INT8)( pSoldier->aiData.bShownAimTime + (sDelta*REFINE_KNIFE_2) );
|
|
||||||
if(bFutureAim<0) return;
|
|
||||||
if ( bFutureAim <= REFINE_KNIFE_2 )
|
|
||||||
{
|
{
|
||||||
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, (INT8)(bFutureAim / 2) );
|
bFutureAim = (INT8)( pSoldier->aiData.bShownAimTime + (sDelta*REFINE_KNIFE_2) );
|
||||||
|
if(bFutureAim<0)
|
||||||
|
return;
|
||||||
|
|
||||||
// Determine if we can afford!
|
if ( bFutureAim <= REFINE_KNIFE_2 )
|
||||||
if ( EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) )
|
|
||||||
{
|
{
|
||||||
pSoldier->aiData.bShownAimTime+= REFINE_KNIFE_2;
|
sAPCosts = CalcTotalAPsToAttack( pSoldier, sMapPos, TRUE, (INT8)(bFutureAim / 2) );
|
||||||
if ( pSoldier->aiData.bShownAimTime > REFINE_KNIFE_2 )
|
|
||||||
pSoldier->aiData.bShownAimTime = REFINE_KNIFE_2;
|
// Determine if we can afford!
|
||||||
gfDisplayFullCountRing = FALSE;
|
if ( EnoughPoints( pSoldier, sAPCosts, 0, FALSE ) )
|
||||||
|
{
|
||||||
|
pSoldier->aiData.bShownAimTime+= REFINE_KNIFE_2;
|
||||||
|
if ( pSoldier->aiData.bShownAimTime > REFINE_KNIFE_2 )
|
||||||
|
pSoldier->aiData.bShownAimTime = REFINE_KNIFE_2;
|
||||||
|
gfDisplayFullCountRing = FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
gfDisplayFullCountRing = TRUE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
gfDisplayFullCountRing = TRUE;
|
gfDisplayFullCountRing = TRUE;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
gfDisplayFullCountRing = TRUE;
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TOSSCURS:
|
case TOSSCURS:
|
||||||
|
|
||||||
//IncrementAimCubeUI( );
|
//IncrementAimCubeUI( );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
||||||
ErasePath( TRUE );
|
ErasePath( TRUE );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//îáðàáîòêà êîëåñà áåç ïðèöåëüíîé î÷åðåäè if ïðèöåëüíàÿ î÷åðåäü îòêëþ÷åíà â .èíè
|
//îáðàáîòêà êîëåñà áåç ïðèöåëüíîé î÷åðåäè if ïðèöåëüíàÿ î÷åðåäü îòêëþ÷åíà â .èíè
|
||||||
|
|||||||
Reference in New Issue
Block a user