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

-added ammo weight fixes from Pulmu, including dynamic ammo weight option in ini file

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-08-04 15:48:16 +00:00
parent d7ea36a736
commit 67811ac431
5 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+2
View File
@@ -480,6 +480,8 @@ void LoadGameExternalOptions()
gGameExternalOptions.iMilitiaTrainingCost = iniReader.ReadInteger("JA2 Gameplay Settings","MILITIA_TRAINING_COST",750);
gGameExternalOptions.iMinLoyaltyToTrain = iniReader.ReadInteger("JA2 Gameplay Settings","MIN_LOYALTY_TO_TRAIN",20);
//Misc
gGameExternalOptions.fAmmoDynamicWeight = iniReader.ReadBoolean("JA2 Gameplay Settings", "DYNAMIC_AMMO_WEIGHT", TRUE); //Pulmu
}
GameSettings.h
+2
View File
@@ -303,6 +303,8 @@ typedef struct
BOOLEAN gfHardAggressiveQueen;
BOOLEAN gfInsaneAggressiveQueen;
BOOLEAN fAmmoDynamicWeight; //Pulmu
} GAME_EXTERNAL_OPTIONS;
//This structure will contain general Ja2 settings NOT individual game settings.
GameVersion.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.400" };
INT16 zVersionLabel[256] = { L"Release v1.13.401" };
#endif
INT8 czVersionNumber[16] = { "Build 06.08.03" };
INT8 czVersionNumber[16] = { "Build 06.08.04" };
INT16 zTrackingNumber[16] = { L"Z" };
Tactical/Items.cpp
+64 -12
View File
@@ -2179,6 +2179,7 @@ UINT8 CalculateObjectWeight( OBJECTTYPE *pObject )
if ( pItem->ubPerPocket < 2 && pItem->usItemClass != IC_AMMO )
{
// account for any attachments
for ( cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ )
{
@@ -2191,19 +2192,63 @@ UINT8 CalculateObjectWeight( OBJECTTYPE *pObject )
// add in weight of ammo
if (Item[ pObject->usItem ].usItemClass == IC_GUN && pObject->ubGunShotsLeft > 0)
{
usWeight += (INT16)((pObject->ubGunShotsLeft / Magazine[Item[pObject->usGunAmmoItem].ubClassIndex].ubMagSize ) * Item[ pObject->usGunAmmoItem ].ubWeight);//Madd: added weight allowance for ammo not being full
}
}
else if ( pItem->usItemClass == IC_AMMO )//Madd: added weight allowance for ammo not being full
{
for ( cnt = 0; cnt < MAX_OBJECTS_PER_SLOT; cnt++ )
{
if (pObject->ubShotsLeft[cnt] > 0 )
if( gGameExternalOptions.fAmmoDynamicWeight == TRUE )
{
usWeight += (INT16)(pObject->ubShotsLeft[cnt]/Magazine[pItem->ubClassIndex].ubMagSize) * pItem->ubWeight;
//Pulmu:
//Temporary calculation for minWeight
UINT32 uiMinWeight = (Item[ pObject->usGunAmmoItem].ubWeight / 5.0) + 0.5;
if( uiMinWeight < 1 || uiMinWeight > Item[ pObject->usGunAmmoItem].ubWeight)
{
uiMinWeight = 1;
}
if( uiMinWeight == Item[ pObject->usGunAmmoItem].ubWeight )
{
usWeight += uiMinWeight;
}
else
{
double weight = (double)uiMinWeight + (( (double)pObject->ubGunShotsLeft / (double)Weapon[pObject->usItem].ubMagSize) * ( (double)Item[ pObject->usGunAmmoItem].ubWeight - (double)uiMinWeight )) + 0.5; //Pulmu: Account for number of rounds left.
usWeight += (UINT16)weight;
}
}
else
{
usWeight += Item[ pObject->usGunAmmoItem ].ubWeight;
}
}
}
else if ( pItem->usItemClass == IC_AMMO && gGameExternalOptions.fAmmoDynamicWeight == TRUE )//Pulmu: added weight allowance for ammo not being full
{
usWeight = 0;
//Temporary calculation for minWeight. 0.2*ubWeight rounded correctly
UINT32 uiMinWeight = (Item[pObject->usItem].ubWeight / 5.0) + 0.5;
//UINT32 uiMinWeight = Magazine[ Item[ pObject->usItem].ubClassIndex].ubMinWeight; //Minimum weight of magazine, now disabled because not corresponding entry in magazines.xml and weapons.h
if( uiMinWeight < 1 || uiMinWeight > Item[pObject->usItem].ubWeight)
{
uiMinWeight = 1;
}
double weight = 0.0;
for( cnt = 0; cnt < pObject->ubNumberOfObjects; cnt++ )
{
if(pObject->ubShotsLeft[cnt] > 0)
{
if( uiMinWeight == Item[pObject->usItem].ubWeight )
{
weight += (double)uiMinWeight;
}
else
{
weight += (double)uiMinWeight + (( (double)pObject->ubShotsLeft[cnt] / (double)Magazine[ Item[ pObject->usItem].ubClassIndex ].ubMagSize) * ( (double)Item[pObject->usItem].ubWeight - (double)uiMinWeight ));
}
}
}
weight += 0.5; //Pulmu:To round correctly
usWeight = (UINT16)weight;
//Pulmu end
}
// make sure it really fits into that UINT8, in case we ever add anything real heavy with attachments/ammo
@@ -2223,10 +2268,11 @@ UINT32 CalculateCarriedWeight( SOLDIERTYPE * pSoldier )
UINT16 usWeight;
UINT8 ubStrengthForCarrying;
//Pulmu: Changes for dynamic ammo weight
for( ubLoop = 0; ubLoop < NUM_INV_SLOTS; ubLoop++)
{
usWeight = pSoldier->inv[ubLoop].ubWeight;
if (Item[ pSoldier->inv[ubLoop].usItem ].ubPerPocket > 1)
if (Item[ pSoldier->inv[ubLoop].usItem ].ubPerPocket > 1 && (Item[ pSoldier->inv[ubLoop].usItem].usItemClass != IC_AMMO || gGameExternalOptions.fAmmoDynamicWeight == FALSE))
{
// account for # of items
usWeight *= pSoldier->inv[ubLoop].ubNumberOfObjects;
@@ -2784,7 +2830,9 @@ BOOLEAN EmptyWeaponMagazine( OBJECTTYPE * pWeapon, OBJECTTYPE *pAmmo )
}
pWeapon->ubWeight = CalculateObjectWeight( pWeapon );
// Pulmu bugfix:
pAmmo->ubWeight = CalculateObjectWeight( pAmmo );
// Pulmu end:
return( TRUE );
}
else
@@ -3755,7 +3803,9 @@ BOOLEAN PlaceObject( SOLDIERTYPE * pSoldier, INT8 bPos, OBJECTTYPE * pObj )
}
ApplyEquipmentBonuses(pSoldier);
//Pulmu bugfix
pInSlot->ubWeight = CalculateObjectWeight(pInSlot);
//Pulmu end
return( TRUE );
}
@@ -3768,6 +3818,8 @@ BOOLEAN InternalAutoPlaceObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pObj, BOOL
// statuses of extra objects would be 0 if the # exceeds the maximum
Assert( pObj->ubNumberOfObjects <= MAX_OBJECTS_PER_SLOT);
//Pulmu bugfix
pObj->ubWeight = CalculateObjectWeight( pObj);
pItem = &(Item[pObj->usItem]);
ubPerSlot = pItem->ubPerPocket;
Tactical/Points.cpp
+5
View File
@@ -1629,6 +1629,11 @@ void DeductAmmo( SOLDIERTYPE *pSoldier, INT8 bInvPos )
if ( pObj->ubGunShotsLeft != 0 )
{
pObj->ubGunShotsLeft--;
//Pulmu: Update weight after firing gun to account for bullets fired
if( gGameExternalOptions.fAmmoDynamicWeight == TRUE && pObj->ubGunShotsLeft > 0)
{
pSoldier->inv[HANDPOS].ubWeight = CalculateObjectWeight( &(pSoldier->inv[HANDPOS]));
}
}
}
else