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

- Added bayonet animations (standing against standing/crouched targets) for all merc bodytypes (by Taro)

Browse Source 
- Initiating a bayonet attack immediately after running adds a melee damage bonus (+20%)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-10-02 10:38:12 +00:00
parent c3592c23f3
commit 3f057567dc
8 changed files with 58 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+7
View File
@@ -9261,6 +9261,10 @@ INT32 HTHImpact( SOLDIERTYPE * pSoldier, SOLDIERTYPE * pTarget, INT32 iHitBy, BO
if( pSoldier->bWeaponMode == WM_ATTACHED_BAYONET )
{
iBonus += gSkillTraitValues.ubMEDamageBonusBlades; // +30% damage
// if this attack happens directly after running, the attack is slightly more powerful due to extra force
if (pSoldier->usSoldierFlagMask2 & SOLDIER_BAYONET_RUNBONUS)
iBonus += 20;
}
else if ( HAS_SKILL_TRAIT( pSoldier, MELEE_NT ) && ( gGameOptions.fNewTraitSystem ))
{
@@ -9297,6 +9301,9 @@ INT32 HTHImpact( SOLDIERTYPE * pSoldier, SOLDIERTYPE * pTarget, INT32 iHitBy, BO
}*/
}
// remove flag, regardless of whether it was used
pSoldier->usSoldierFlagMask2 &= ~SOLDIER_BAYONET_RUNBONUS;
// bonus damage for aggressive characters
if ( DoesMercHavePersonality( pSoldier, CHAR_TRAIT_AGGRESSIVE ) )
{