-added underslung/attached GLs to AI inventory and enabled AI to use them :)

-rewrote the AI sniper code to take advantage of readying weapons.  Added new SNIPER order for soldiers that's assigned when a soldier has a sniper rifle (80% chance) or a scope (40% chance).
-spreadsheet update

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@216 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/Handle UI.cpp

@@ -4630,7 +4630,7 @@ BOOLEAN MakeSoldierTurn( SOLDIERTYPE *pSoldier, INT16 sXPos, INT16 sYPos )
 
 		pSoldier->sLastTarget = sXPos + (MAXCOL * sYPos);
 		DeductPoints( pSoldier, (INT16)(sAPCost - sAPCostToReady), 0 );
-		
+
 		HandleSight( pSoldier, SIGHT_LOOK ); 
 
 		return( TRUE );

Tactical/Inventory Choosing.cpp

@@ -1534,7 +1534,11 @@ void ChooseSpecialWeaponsForSoldierCreateStruct( SOLDIERCREATE_STRUCT *pp, INT8
 //		CreateItem( 298, (INT8)(50 + Random( 51 )), &Object );
 //		PlaceObjectInSoldierCreateStruct( pp, &Object );
 
-	if (fGrenadeLauncher)
+	if ( IsGrenadeLauncherAttached(&pp->Inv[HANDPOS]) ) //Madd: if there's a grenade launcher attached to the gun, then use that instead of giving him another one
+	{
+		itemGrenadeLauncher = GetAttachedGrenadeLauncher(&pp->Inv[HANDPOS]);
+	}
+	else if (fGrenadeLauncher)
 	{
 		itemGrenadeLauncher = PickARandomItem ( GRENADELAUNCHER );
 		// give grenade launcher

Tactical/Overhead Types.h

@@ -125,7 +125,7 @@ enum
 	ONCALL,						// helps buddies anywhere within the sector
 	SEEKENEMY,				// not tied down to any one particular spot
 	RNDPTPATROL,			// patrols randomly using patrolGrids
-	//SNIPER,	// snipes
+	SNIPER,					// snipes
 	MAXORDERS
 };
 

Tactical/Soldier Control.cpp

@@ -3253,6 +3253,8 @@ BOOLEAN InternalSoldierReadyWeapon( SOLDIERTYPE *pSoldier, UINT8 sFacingDir, BOO
 
 	}
 
+	HandleSight(pSoldier, SIGHT_LOOK );
+
 	return( fReturnVal );
 }
 

Tactical/Soldier Create.cpp

@@ -123,6 +123,26 @@ void RandomizeNewSoldierStats( SOLDIERCREATE_STRUCT *pCreateStruct )
 	pCreateStruct->bAIMorale							= MORALE_FEARLESS;
 }
 
+void DecideToAssignSniperOrders( SOLDIERCREATE_STRUCT * pp )
+{
+	//Madd: decide if soldier should be a sniper
+
+	// 30% of anybody w/a scope and decent range being a sniper, 80% chance of a guy w/a sniper rifle being a sniper
+	if ( (GunRange(&pp->Inv[HANDPOS]) >= 40 && IsScoped(&pp->Inv[HANDPOS]) && Random(100) < 30) || ( Weapon[pp->Inv[HANDPOS].usItem].ubWeaponType == GUN_SN_RIFLE && Random(100) < 80 ) )
+	{
+		pp->bOrders = SNIPER;
+
+		if (pp->bAttitude == BRAVEAID)
+			pp->bAttitude = BRAVESOLO;
+
+		if (pp->bAttitude == CUNNINGAID)
+			pp->bAttitude = CUNNINGSOLO;
+
+		DebugMsg ( TOPIC_JA2AI , DBG_LEVEL_3 , String("Sniper Created") );
+	}
+
+}
+
 SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *pubID )
 {
 	SOLDIERTYPE			Soldier;
@@ -1651,6 +1671,8 @@ void CreateDetailedPlacementGivenBasicPlacementInfo( SOLDIERCREATE_STRUCT *pp, B
 	if( !bp->fDetailedPlacement && ubSoldierClass != SOLDIER_CLASS_NONE && ubSoldierClass != SOLDIER_CLASS_CREATURE && ubSoldierClass != SOLDIER_CLASS_MINER )
 		GenerateRandomEquipment( pp, ubSoldierClass, bp->bRelativeEquipmentLevel);
 
+	DecideToAssignSniperOrders(pp);
+
 	DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("CreateDetailedPlacementGivenBasicPlacementInfo done"));
 }
 
@@ -1810,13 +1832,14 @@ void CreateDetailedPlacementGivenStaticDetailedPlacementAndBasicPlacementInfo(
 			//return;
 		}
 	}
-	if ( !gGameOptions.fGunNut ) 
-	{
-		ReplaceExtendedGuns( pp, bp->ubSoldierClass );
-	}
+	//if ( !gGameOptions.fGunNut ) 
+	//{
+	//	ReplaceExtendedGuns( pp, bp->ubSoldierClass );
+	//}
 	if( bp->ubSoldierClass != SOLDIER_CLASS_NONE && bp->ubSoldierClass != SOLDIER_CLASS_CREATURE && bp->ubSoldierClass != SOLDIER_CLASS_MINER )
 	{
 		GenerateRandomEquipment( pp, bp->ubSoldierClass, bp->bRelativeEquipmentLevel);
+		DecideToAssignSniperOrders(pp);
 	}
 
 	DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("CreateDetailedPlacementGivenStaticDetailedPlacementAndBasicPlacementInfo done"));
@@ -2103,6 +2126,7 @@ SOLDIERTYPE* TacticalCreateArmyTroop()
 		pSoldier->sNoiseGridno = (INT16) (CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
 		pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
 	}
+
 	return( pSoldier );
 }
 
@@ -2146,6 +2170,7 @@ SOLDIERTYPE* TacticalCreateEliteEnemy()
 		pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
 		pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
 	}
+
 	return( pSoldier );
 }
 
@@ -2208,7 +2233,9 @@ SOLDIERTYPE* TacticalCreateMilitia( UINT8 ubMilitiaClass )
 	//bp.bAttitude = AGGRESSIVE;
 	bp.bBodyType = -1;
 	CreateDetailedPlacementGivenBasicPlacementInfo( &pp, &bp );
-	return TacticalCreateSoldier( &pp, &ubID );
+	pSoldier = TacticalCreateSoldier( &pp, &ubID );
+
+	return pSoldier;
 }
 
 SOLDIERTYPE* TacticalCreateCreature( INT8 bCreatureBodyType )

Tactical/bullets.cpp

@@ -410,6 +410,7 @@ void AddMissileTrail( BULLET *pBullet, FIXEDPT qCurrX, FIXEDPT qCurrY, FIXEDPT q
 	{
 		strcpy( AniParams.zCachedFile, "TILECACHE\\BULLET_TRACER.STI" );
 		AniParams.uiFlags |= ANITILE_LIGHT;
+		AniParams.sDelay = 0;
 	}
 
 	CreateAnimationTile( &AniParams );

Tactical/opplist.cpp

@@ -830,7 +830,8 @@ void HandleSight(SOLDIERTYPE *pSoldier, UINT8 ubSightFlags)
 		else if ( gGameOptions.ubDifficultyLevel >= DIF_LEVEL_MEDIUM )
 		{
 			// don't allow admins to radio
-			if ( pSoldier->bTeam == ENEMY_TEAM && gTacticalStatus.Team[ ENEMY_TEAM ].bAwareOfOpposition && pSoldier->ubSoldierClass != 	SOLDIER_CLASS_ADMINISTRATOR )
+			//Madd: Huh?  why not admins?  removed.
+			if ( pSoldier->bTeam == ENEMY_TEAM && gTacticalStatus.Team[ ENEMY_TEAM ].bAwareOfOpposition ) //&& pSoldier->ubSoldierClass != 	SOLDIER_CLASS_ADMINISTRATOR )
 			{
 				RadioSightings(pSoldier,EVERYBODY, pSoldier->bTeam );
 			}