mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Feature change - Bobby Ray Selection on New Game screen split into two items: Quality and Quantity. Selectors allow for full 1-10 range of quality (coolness) / quantity multipliers, instead of just 1,2,4,10.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -989,9 +989,9 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA
|
||||
}
|
||||
|
||||
//Madd: Bobby Ray's will sell higher coolness stuff if it's used, and may also have a better selection at the start of the game, depending on selection
|
||||
if ( (bArmsDealer == bobbyRaysID || armsDealerInfo[bArmsDealer].useBRSetting) && gGameOptions.ubBobbyRay > BR_GOOD )
|
||||
if ( (bArmsDealer == bobbyRaysID || armsDealerInfo[bArmsDealer].useBRSetting) && gGameOptions.ubBobbyRayQuality > BR_GOOD )
|
||||
{
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRay - 1;
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRayQuality - 1;
|
||||
if (fUsed )
|
||||
{
|
||||
ubMaxCoolness += 1;
|
||||
@@ -1013,8 +1013,8 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA
|
||||
ubMaxCoolness += 1;
|
||||
|
||||
if (gGameExternalOptions.tonyUsesBRSetting) {
|
||||
ubMinCoolness += gGameOptions.ubBobbyRay / 3;
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRay;
|
||||
ubMinCoolness += gGameOptions.ubBobbyRayQuality / 3;
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRayQuality;
|
||||
}
|
||||
}
|
||||
else if (bArmsDealer == ARMS_DEALER_DEVIN)
|
||||
@@ -1027,8 +1027,8 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA
|
||||
}
|
||||
|
||||
if (gGameExternalOptions.devinUsesBRSetting) {
|
||||
ubMinCoolness += gGameOptions.ubBobbyRay / 3;
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRay;
|
||||
ubMinCoolness += gGameOptions.ubBobbyRayQuality / 3;
|
||||
ubMaxCoolness += gGameOptions.ubBobbyRayQuality;
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -1136,7 +1136,7 @@ UINT8 ChanceOfItemTransaction( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEAN fDe
|
||||
|
||||
// Madd
|
||||
if ( !fDealerIsSelling && fBobbyRay )
|
||||
ubChance = min(100,gGameOptions.ubBobbyRay * ubChance);
|
||||
ubChance = min(100,gGameOptions.ubBobbyRayQuality * ubChance);
|
||||
|
||||
// if there's any uncertainty
|
||||
if ((ubChance > 0) && (ubChance < 100))
|
||||
@@ -1150,7 +1150,7 @@ UINT8 ChanceOfItemTransaction( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEAN fDe
|
||||
ubChance /= 2;
|
||||
|
||||
if ( fBobbyRay )
|
||||
ubChance /= gGameOptions.ubBobbyRay;
|
||||
ubChance /= gGameOptions.ubBobbyRayQuality;
|
||||
}
|
||||
|
||||
// used items are traded more rarely
|
||||
|
||||
Reference in New Issue
Block a user