- New Feature: Spotter skill (available to every merc) allows a merc to be spotter for other snipers. Spotter items have to be in hands, spending APs cancels action.

- renamed GetObjectNCTHModifier to GetObjectModifier, as function is no longer used exclusively for NCTH

Warning: GameDir >= r1896 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-12-19 20:03:48 +00:00
parent eff779a966
commit 80c1b65494
30 changed files with 723 additions and 445 deletions
+18 -15
View File
@@ -277,24 +277,27 @@ INT16 GetRangeBonus( OBJECTTYPE * pObj );
// Flugente: unified function (no need to have 12 functions that all do the same thing and clutter the code)
enum {
NCTHMODIFIER_FLATBASE = 0,
NCTHMODIFIER_PERCENTBASE,
NCTHMODIFIER_FLATAIM,
NCTHMODIFIER_PERCENTAIM,
NCTHMODIFIER_PERCENTCAP,
NCTHMODIFIER_PERCENTHANDLING,
NCTHMODIFIER_DROPCOMPENSATION,
NCTHMODIFIER_COUNTERFORCEMAX,
NCTHMODIFIER_COUNTERFORCEACCURACY,
NCTHMODIFIER_COUNTERFORCEFREQUENCY,
NCTHMODIFIER_TRACKING,
NCTHMODIFIER_AIMLEVELS,
ITEMMODIFIER_FLATBASE = 0,
ITEMMODIFIER_PERCENTBASE,
ITEMMODIFIER_FLATAIM,
ITEMMODIFIER_PERCENTAIM,
ITEMMODIFIER_PERCENTCAP,
ITEMMODIFIER_PERCENTHANDLING,
ITEMMODIFIER_DROPCOMPENSATION,
ITEMMODIFIER_COUNTERFORCEMAX,
ITEMMODIFIER_COUNTERFORCEACCURACY,
ITEMMODIFIER_COUNTERFORCEFREQUENCY,
ITEMMODIFIER_TRACKING,
ITEMMODIFIER_AIMLEVELS,
NCTHMODIFIER_MAX,
// not NCTH, but works the same way...
ITEMMODIFIER_SPOTTER,
ITEMMODIFIER_MAX,
};
INT32 GetItemNCTHModifier(OBJECTTYPE* pObj, UINT8 ubRef, UINT8 usType);
INT32 GetObjectNCTHModifier( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, UINT8 ubStance, UINT8 type );
INT32 GetItemModifier(OBJECTTYPE* pObj, UINT8 ubRef, UINT8 usType);
INT32 GetObjectModifier( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, UINT8 ubStance, UINT8 type );
INT32 GetAimLevelsTraitModifier( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObj );