Skip to content

Added 'burstTracksTargets' attribute for repeating weapons. #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exinfinitum wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added 'burstTracksTargets' attribute for repeating weapons. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
321774f
Added 'burstTracksTargets' attribute for repeating weapons.
exinfinitum Oct 26, 2018
130bb5f
We now initialize lastTarget to NULL by default.
exinfinitum Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Include/TSEDeviceClassesImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,7 @@ class CWeaponClass : public CDeviceClass
int m_iRecoil; // 0-7 (as per momentum damage)
int m_iFailureChance; // Chance of failure

bool m_bBurstTracksTargets; // If the weapon is continuous, whether or not to track the target during the entire burst
bool m_bContinuousConsumePerShot; // If a continuous weapon, consume ammunition for every shot in burst
int m_iCounterPerShot; // How much to increment the ship's counter by per shot
bool m_bOmnidirectional; // Omnidirectional
Expand Down
4 changes: 4 additions & 0 deletions Include/TSEDevices.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ class CInstalledDevice
int GetHitPointsPercent (CSpaceObject *pSource);
inline const CString &GetID (void) const { return m_sID; }
inline CItem *GetItem (void) const { return m_pItem; }
inline CSpaceObject *GetLastTarget(void) const { return m_pLastTarget; }
DWORD GetLinkedFireOptions (void) const;
inline int GetLevel (void) const { return (m_pItem ? m_pItem->GetLevel() : GetClass()->GetLevel()); }
inline int GetMinFireArc (void) const { return m_iMinFireArc; }
Expand Down Expand Up @@ -518,6 +519,7 @@ class CInstalledDevice
inline void SetFireArc (int iMinFireArc, int iMaxFireArc) { m_iMinFireArc = iMinFireArc; m_iMaxFireArc = iMaxFireArc; }
inline void SetID (const CString &sID) { m_sID = sID; }
inline void SetLastActivateSuccessful (bool bSuccessful) { m_fLastActivateSuccessful = bSuccessful; }
inline void SetLastTarget(CSpaceObject *pTarget) { m_pLastTarget = pTarget; }
void SetLinkedFireOptions (DWORD dwOptions);
inline void SetOmniDirectional (bool bOmnidirectional = true) { m_fOmniDirectional = bOmnidirectional; }
inline void SetOptimized (bool bOptimized) { m_fOptimized = bOptimized; }
Expand Down Expand Up @@ -670,4 +672,6 @@ class CInstalledDevice
DWORD m_fSpare8:1;

DWORD m_dwSpare:8;

CSpaceObject *m_pLastTarget;
};
1 change: 1 addition & 0 deletions TSE/CInstalledDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
CInstalledDevice::CInstalledDevice (void) :
m_pItem(NULL),
m_pOverlay(NULL),
m_pLastTarget(NULL),
m_dwTargetID(0),
m_iDeviceSlot(-1),
m_iPosAngle(0),
Expand Down
15 changes: 14 additions & 1 deletion TSE/CWeaponClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define ALTERNATING_ATTRIB CONSTLIT("alternating")
#define AMMO_ID_ATTRIB CONSTLIT("ammoID")
#define ANGLE_ATTRIB CONSTLIT("angle")
#define BURST_TRACKS_TARGETS_ATTRIB CONSTLIT("burstTracksTargets")
#define CHARGES_ATTRIB CONSTLIT("charges")
#define CONFIGURATION_ATTRIB CONSTLIT("configuration")
#define CONTINUOUS_CONSUME_PERSHOT_ATTRIB CONSTLIT("consumeAmmoPerRepeatingShot")
Expand Down Expand Up @@ -272,6 +273,12 @@ bool CWeaponClass::Activate (CInstalledDevice *pDevice,

bool bSuccess = FireWeapon(pDevice, pShot, pSource, pTarget, 0, &bSourceDestroyed, retbConsumedItems);

// Store the target object if we need to
if (m_bBurstTracksTargets)
{
pDevice->SetLastTarget(pTarget);
}

// If firing the weapon destroyed the ship, then we bail out

if (bSourceDestroyed)
Expand Down Expand Up @@ -1439,6 +1446,7 @@ ALERROR CWeaponClass::CreateFromXML (SDesignLoadCtx &Ctx, CXMLElement *pDesc, CI
pWeapon->m_bTargetStationsOnly = pDesc->GetAttributeBool(TARGET_STATIONS_ONLY_ATTRIB);
pWeapon->m_bContinuousConsumePerShot = pDesc->GetAttributeBool(CONTINUOUS_CONSUME_PERSHOT_ATTRIB);
pWeapon->m_iCounterPerShot = pDesc->GetAttributeIntegerBounded(SHIP_COUNTER_PER_SHOT_ATTRIB, 0, -1, 0);
pWeapon->m_bBurstTracksTargets = pDesc->GetAttributeBool(BURST_TRACKS_TARGETS_ATTRIB);


// Configuration
Expand Down Expand Up @@ -1971,10 +1979,15 @@ bool CWeaponClass::FireWeapon (CInstalledDevice *pDevice,
int iFireAngle = pDevice->GetFireAngle();

// If the fire angle is -1 then we need to calc it ourselves
// If we need to recalculate for all shots in a repeating burst,
// then do so (since the AI only sets firing angle on first shot in burst).

if (iFireAngle == -1)
if (iFireAngle == -1 || (iRepeatingCount != 0 && m_bBurstTracksTargets))
{
bool bOutOfArc;
CSpaceObject *pStoredTarget = pDevice->GetLastTarget();
if (iRepeatingCount != 0 && m_bBurstTracksTargets && pTarget == NULL && pStoredTarget != NULL)
pTarget = pStoredTarget;
iFireAngle = CalcFireAngle(ItemCtx, rSpeed, pTarget, &bOutOfArc);
}

Expand Down