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: madlab's robot can be upgraded

Browse Source 
requires gamedir r2642

https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=364403

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
rftr
2022-03-21 17:34:49 +00:00
parent f7315115af
commit 87b0c7c6b7
26 changed files with 1114 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+112 -5
View File
@@ -3085,7 +3085,27 @@ BOOLEAN UseGunNCTH( SOLDIERTYPE *pSoldier , INT32 sTargetGridNo )
if ( !PreRandom( uiDepreciateTest ) && ( (*pObjAttHand)[0]->data.objectStatus > 1) )
{
(*pObjAttHand)[0]->data.objectStatus--;
if (AM_A_ROBOT(pSoldier) && HasItemFlag(pSoldier->inv[ROBOT_UTILITY_SLOT].usItem, CLEANING_KIT))
{
OBJECTTYPE* pRobotCleaningKit = &pSoldier->inv[ROBOT_UTILITY_SLOT];
if ((*pRobotCleaningKit)[0]->data.objectStatus > 0)
{
(*pRobotCleaningKit)[0]->data.objectStatus--;
if ((*pRobotCleaningKit)[0]->data.objectStatus <= 0)
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szRobotText[ROBOT_TEXT_CLEANING_KIT_DEPLETED] );
pRobotCleaningKit->RemoveObjectsFromStack(1);
}
}
else
{
(*pObjAttHand)[0]->data.objectStatus--;
}
}
else
{
(*pObjAttHand)[0]->data.objectStatus--;
}
}
// reduce monster smell (gunpowder smell)
@@ -3881,7 +3901,27 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT32 sTargetGridNo )
if ( !PreRandom( uiDepreciateTest ) && ( (*pObjUsed)[0]->data.objectStatus > 1) )
{
(*pObjUsed)[0]->data.objectStatus--;
if (AM_A_ROBOT(pSoldier) && HasItemFlag(pSoldier->inv[ROBOT_UTILITY_SLOT].usItem, CLEANING_KIT))
{
OBJECTTYPE* pRobotCleaningKit = &pSoldier->inv[ROBOT_UTILITY_SLOT];
if ((*pRobotCleaningKit)[0]->data.objectStatus > 0)
{
(*pRobotCleaningKit)[0]->data.objectStatus--;
if ((*pRobotCleaningKit)[0]->data.objectStatus <= 0)
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szRobotText[ROBOT_TEXT_CLEANING_KIT_DEPLETED] );
pRobotCleaningKit->RemoveObjectsFromStack(1);
}
}
else
{
(*pObjUsed)[0]->data.objectStatus--;
}
}
else
{
(*pObjUsed)[0]->data.objectStatus--;
}
}
// reduce monster smell (gunpowder smell)
@@ -7431,9 +7471,17 @@ UINT32 CalcChanceToHitGun(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTime,
// Equipment Modifiers
iChance += GetGearToHitBonus ( pSoldier );
INT16 moda = GetToHitBonus( pInHand, iRange, bLightLevel, stance && iRange > MIN_PRONE_RANGE );
INT16 modb = GetToHitBonus( pInHand, iRange, bLightLevel, gAnimControl[ pSoldier->usAnimState ].ubEndHeight && iRange > MIN_PRONE_RANGE );
iChance += (INT32)((gGameExternalOptions.ubProneModifierPercentage * moda + (100 - gGameExternalOptions.ubProneModifierPercentage) * modb)/100);
if (AM_A_ROBOT(pSoldier) && Item[pSoldier->inv[ROBOT_TARGETING_SLOT].usItem].fProvidesRobotLaserBonus)
{
iChance += GetToHitBonus(&(pSoldier->inv[ROBOT_TARGETING_SLOT]), iRange, bLightLevel, FALSE);
}
else
{
INT16 moda = GetToHitBonus(pInHand, iRange, bLightLevel, stance && iRange > MIN_PRONE_RANGE);
INT16 modb = GetToHitBonus(pInHand, iRange, bLightLevel, gAnimControl[pSoldier->usAnimState].ubEndHeight && iRange > MIN_PRONE_RANGE);
iChance += (INT32)((gGameExternalOptions.ubProneModifierPercentage * moda + (100 - gGameExternalOptions.ubProneModifierPercentage) * modb) / 100);
}
/////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
@@ -8071,6 +8119,24 @@ INT32 BulletImpact( SOLDIERTYPE *pFirer, BULLET *pBullet, SOLDIERTYPE * pTarget,
}
}
// robot plating damage resistance
if (AM_A_ROBOT(pTarget))
{
FLOAT robotDamageReduction = Item[pTarget->inv[ROBOT_CHASSIS_SLOT].usItem].fRobotDamageReductionModifier;
if (robotDamageReduction > 0.0f && robotDamageReduction < 1.0f)
{
// apply damage reduction, then degrade armour plate based on original damage
damagefactor *= Item[pTarget->inv[ROBOT_CHASSIS_SLOT].usItem].fRobotDamageReductionModifier;
OBJECTTYPE* pRobotPlate = &(pTarget->inv[ROBOT_CHASSIS_SLOT]);
(*pRobotPlate)[0]->data.objectStatus -= max(1, iOrigImpact/12);
if((*pRobotPlate)[0]->data.objectStatus <= 0)
{
ScreenMsg(FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szRobotText[ROBOT_TEXT_PLATE_DESTROYED]);
pRobotPlate->RemoveObjectsFromStack(1);
}
}
}
iOrigImpact = iOrigImpact * damagefactor;
// plus/minus up to 25% due to "random" factors (major organs hit or missed,
@@ -9940,6 +10006,42 @@ void HandleTacticalEffectsOfEquipmentChange( SOLDIERTYPE *pSoldier, UINT32 uiInv
}
}
}
if (AM_A_ROBOT(pSoldier) && gGameOptions.fNewTraitSystem )
{
const INT8 targetingSkill = Item[usOldItem].bRobotTargetingSkillGrant;
const INT8 chassisSkill = Item[usOldItem].bRobotChassisSkillGrant;
const INT8 utilitySkill = Item[usOldItem].bRobotUtilitySkillGrant;
for (int a = 0; a < 30; ++a)
{
if (targetingSkill > 0)
{
if (pSoldier->stats.ubSkillTraits[a] == targetingSkill)
pSoldier->stats.ubSkillTraits[a] = 0;
if (gMercProfiles[pSoldier->ubProfile].bSkillTraits[a] == targetingSkill)
gMercProfiles[pSoldier->ubProfile].bSkillTraits[a] = 0;
}
if (chassisSkill > 0)
{
if (pSoldier->stats.ubSkillTraits[a] == chassisSkill)
pSoldier->stats.ubSkillTraits[a] = 0;
if (gMercProfiles[pSoldier->ubProfile].bSkillTraits[a] == chassisSkill)
gMercProfiles[pSoldier->ubProfile].bSkillTraits[a] = 0;
}
if (utilitySkill > 0)
{
if (pSoldier->stats.ubSkillTraits[a] == utilitySkill)
pSoldier->stats.ubSkillTraits[a] = 0;
if (gMercProfiles[pSoldier->ubProfile].bSkillTraits[a] == utilitySkill)
gMercProfiles[pSoldier->ubProfile].bSkillTraits[a] = 0;
}
}
}
}
@@ -11064,6 +11166,11 @@ void CalcMagFactorSimple( SOLDIERTYPE *pSoldier, FLOAT d2DDistance, INT16 bAimTi
iHighestMagFactor = 1.0;
}
if (AM_A_ROBOT(pSoldier) && Item[pSoldier->inv[ROBOT_TARGETING_SLOT].usItem].fProvidesRobotLaserBonus)
{
gCTHDisplay.iBestLaserRange = max(gCTHDisplay.iBestLaserRange, GetBestLaserRange(&pSoldier->inv[ROBOT_TARGETING_SLOT]));
}
gCTHDisplay.FinalMagFactor = iHighestMagFactor;
}