else if (bLightLevel > NORMAL_LIGHTLEVEL_DAY + 5)
{
	// Snap: penalise for wearing sun goggles
	if (pSoldier->inv[HEAD1POS].usItem == SUNGOGGLES || pSoldier->inv[HEAD2POS].usItem == SUNGOGGLES)
	{
		// decrease sighting distance by up to 2 tiles
		sDistVisible -= STRAIGHT_RATIO;
		if (bLightLevel > NORMAL_LIGHTLEVEL_NIGHT)
		{
			sDistVisible -= STRAIGHT_RATIO;
		}
	}

// Snap: check the light level when calculating a bonus due to sun goggles or laser scope
// NB: Higher is darker!
UINT8 bLightLevel = LightTrueLevel(sGridNo, pSoldier->bTargetLevel);

if ( (pSoldier->inv[HEAD1POS].usItem == SUNGOGGLES || pSoldier->inv[HEAD2POS].usItem == SUNGOGGLES)
	&& bLightLevel < (NORMAL_LIGHTLEVEL_NIGHT + NORMAL_LIGHTLEVEL_DAY)/2 )  // Snap
{
	// decrease effective range by 10% when using sungoggles (w or w/o scope)
	iSightRange -= iRange / 10;	//basically, +1% to hit per every 2 squares
}

bAttachPos = FindAttachment( pInHand, LASERSCOPE );
if (usInHand == ROCKET_RIFLE || usInHand == AUTO_ROCKET_RIFLE || bAttachPos != NO_SLOT) // rocket rifle has one built in
{
	// Snap: Reduce laser scope bonus at long ranges and high light levels
	// #define NORMAL_RANGE ... world units considered an 'avg' shot

	if (iSightRange <= NORMAL_RANGE) {
		// No penalty within this range
		iScopeBonus = LASERSCOPE_BONUS;
	}
	else {
		// Figure out max. visible distance for the laser dot.
		// Day: 1.5*NORMAL_RANGE, night: 2.5*NORMAL_RANGE
		// iMaxLaserRange = NORMAL_RANGE * ( 1.5 + ( bLightLevel - NORMAL_LIGHTLEVEL_DAY )
		//                               / ( NORMAL_LIGHTLEVEL_NIGHT - NORMAL_LIGHTLEVEL_DAY ) )
		// (bLightLevel was calculated above for sun goggles)
		INT32 iMaxLaserRange = ( NORMAL_RANGE*( 2*bLightLevel + 3*NORMAL_LIGHTLEVEL_NIGHT - 5*NORMAL_LIGHTLEVEL_DAY ) )
		                     / ( 2 * ( NORMAL_LIGHTLEVEL_NIGHT - NORMAL_LIGHTLEVEL_DAY ) );

		// Beyond NORMAL_RANGE laser bonus drops linearly to 0
		iScopeBonus = ( LASERSCOPE_BONUS * (iMaxLaserRange - iSightRange) )
		            / ( iMaxLaserRange - NORMAL_RANGE );
		if (iScopeBonus < 0) iScopeBonus = 0;
	}

	INT8 bLaserStatus;

	if ( usInHand == ROCKET_RIFLE || usInHand == AUTO_ROCKET_RIFLE )
	{
		bLaserStatus = WEAPON_STATUS_MOD(pInHand->bGunStatus);
	}
	else
	{
		bLaserStatus = WEAPON_STATUS_MOD(pInHand->bAttachStatus[ bAttachPos ]);
	}

	// laser scope in bad condition creates aim penalty!
	//   Snap: refactored some ugly code here :)
	iScopeBonus = ( iScopeBonus * (bLaserStatus - 50) ) / 50;

	iChance += iScopeBonus;
}

iSightRange *= 2;