1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.

Browse Source 
Also includes mechansim for easy implementation of new skills.

For more info see http://www.bears-pit.com/board/ubbthreads.php/topics/327348.html#Post327348

Requires GameDir >= r1848.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-10-30 23:05:37 +00:00
parent bef4e7b52b
commit f17829fac9
80 changed files with 4722 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+81
View File
@@ -13019,4 +13019,85 @@ FLOAT CalcNewChanceToHitAimTraitBonus(SOLDIERTYPE *pSoldier, FLOAT fAimCap, FLOA
}
return fAimChance;
}
extern BOOLEAN IsRoofPresentAtGridNo( INT32 sGridNo );
// Flugente: fire item from A to B (intended for mortarshells and launchable grenades)
BOOLEAN ArtilleryStrike( UINT16 usItem, UINT32 usStartingGridNo, UINT32 usTargetMapPos )
{
FLOAT dForce, dDegrees;
INT16 sDestX, sDestY, sSrcX, sSrcY;
vector_3 vForce, vDirNormal;
INT16 sStartZ = ( 1 * 256 ) + 50;
INT16 sEndZ = 0;
// radius is way smaller for signal shells, otherwise the inaccuraccy would increase too much
INT8 bRadius = gSkillTraitValues.usVOMortarRadius;
if ( HasItemFlag(usItem, SIGNAL_SHELL) )
bRadius = gSkillTraitValues.usVOMortarSignalShellRadius;
INT32 sTargetGridNo = GetArtilleryTargetGridNo( usTargetMapPos, bRadius );
if ( TileIsOutOfBounds(sTargetGridNo) )
return FALSE;
UINT8 ubLevel = 0;
if ( IsRoofPresentAtGridNo( sTargetGridNo ) )
ubLevel = 1;
// create shell
OBJECTTYPE shellobj;
CreateItem( usItem, 100, &shellobj );
// Get basic launch params...
if ( !GetArtilleryLaunchParams(usStartingGridNo, sTargetGridNo, sStartZ, sEndZ, usItem, &shellobj, &dForce, &dDegrees) )
return FALSE;
// Get XY from gridno
ConvertGridNoToCenterCellXY( sTargetGridNo, &sDestX, &sDestY );
ConvertGridNoToCenterCellXY( usStartingGridNo, &sSrcX, &sSrcY );
// OK, get direction normal
vDirNormal.x = (float)(sDestX - sSrcX);
vDirNormal.y = (float)(sDestY - sSrcY);
vDirNormal.z = 0;
// NOmralize
vDirNormal = VGetNormal( &vDirNormal );
// From degrees, calculate Z portion of normal
vDirNormal.z = (float)sin( dDegrees );
// Do force....
vForce.x = dForce * vDirNormal.x;
vForce.y = dForce * vDirNormal.y;
vForce.z = dForce * vDirNormal.z;
float dX = (float)sSrcX;
float dY = (float)sSrcY;
float dZ = (float)sStartZ;
float dForceX = vForce.x;
float dForceY = vForce.y;
float dForceZ = vForce.z;
if ( Weapon[ usItem ].sSound != NO_WEAPON_SOUND )
{
PlayJA2Sample( Weapon[ usItem ].sSound, RATE_11025, SoundVolume( HIGHVOLUME, usStartingGridNo ), 1, SoundDir( usStartingGridNo ) );
}
INT32 iID = CreatePhysicalObject( &shellobj, -1, dX, dY, dZ, dForceX, dForceY, dForceZ, 0, THROW_ARM_ITEM, 0, FALSE );
// OJW - 20091002 - Explosives
/*if (is_networked && is_client)
{
if (pSoldier->bTeam == 0 || (pSoldier->bTeam == 1 && is_server))
{
send_grenade( &shellobj , dLifeSpan,dX, dY, dZ, dForceX, dForceY, dForceZ, sTargetGridNo, pSoldier->ubID, ubActionCode, uiActionData, iID , false);
}
}*/
//REAL_OBJECT* pObject = &( ObjectSlots[ iID ] );
return TRUE;
}