1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- new Item_Settings.ini modifiers for weapon class specific range

Browse Source 
- renamed weapon overheating modifiers to get a common naming scheme
- added weapon overheating modifiers for launchers
- renamed TURNING_FROM_PRONE_FOR_PUNCH_OR_STUB to TURNING_FROM_PRONE_FOR_PUNCH_OR_STAB for search reasons


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2013-10-04 18:55:50 +00:00
parent d83f23ce2b
commit 2b19bd1959
7 changed files with 104 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+7 -6
View File
@@ -13876,11 +13876,10 @@ UINT16 GetModifiedGunRange(UINT16 usWeaponIndex)
}
// Only apply range modifier on "real" guns!
if (Item[Weapon[usWeaponIndex].uiIndex].usItemClass == IC_GUN ||
Item[Weapon[usWeaponIndex].uiIndex].usItemClass == IC_LAUNCHER)
{
ubRange = (INT16)(( ubRange * gGameExternalOptions.iGunRangeModifier ) / 100);
}
if (Item[Weapon[usWeaponIndex].uiIndex].usItemClass == IC_GUN )
ubRange = (INT16)((FLOAT)( ubRange * gGameExternalOptions.iGunRangeModifier ) / 100 * gItemSettings.fRangeModifierGun[ Weapon[usWeaponIndex].ubWeaponType ] );
else if (Item[Weapon[usWeaponIndex].uiIndex].usItemClass == IC_LAUNCHER )
ubRange = (INT16)((FLOAT)( ubRange * gGameExternalOptions.iGunRangeModifier ) / 100 * gItemSettings.fRangeModifierLauncher );
return (UINT16)ubRange;
}
@@ -14098,7 +14097,9 @@ FLOAT GetItemCooldownFactor( OBJECTTYPE * pObj )
{
FLOAT cooldownfactor = Item[pObj->usItem].usOverheatingCooldownFactor; // ... get item-specific cooldown factor ...
if ( Item[pObj->usItem].usItemClass & IC_GUN )
cooldownfactor *= gItemSettings.fOverheatCooldownModifier[ Weapon[ pObj->usItem ].ubWeaponType ];
cooldownfactor *= gItemSettings.fOverheatCooldownModifierGun[ Weapon[ pObj->usItem ].ubWeaponType ];
else if ( Item[pObj->usItem].usItemClass & IC_LAUNCHER )
cooldownfactor *= gItemSettings.fOverheatCooldownModifierLauncher;
FLOAT modificator = 1.0f + GetItemCooldownModificator( pObj );