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

Fix: negative price backgrounds don't work as intended

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-11-22 21:20:14 +00:00
parent 5a602f0b9c
commit ae2656b975
1 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/ShopKeeper Interface.cpp
+11 -31
View File
@@ -3269,7 +3269,6 @@ UINT32 CalcShopKeeperItemPrice( BOOLEAN fDealerSelling, BOOLEAN fUnitPriceOnly,
UINT8 ubCnt; UINT8 ubCnt;
UINT32 uiUnitPrice = 0; UINT32 uiUnitPrice = 0;
UINT32 uiTotalPrice = 0; UINT32 uiTotalPrice = 0;
UINT32 uiDiscountValue = 0;
// UINT32 uiDifFrom10 = 0; // UINT32 uiDifFrom10 = 0;
#ifdef JA2UB #ifdef JA2UB
UINT8 ubItemsNotCounted = 0; //ja25 UB UINT8 ubItemsNotCounted = 0; //ja25 UB
@@ -3361,44 +3360,25 @@ UINT8 ubItemsNotCounted = 0; //ja25 UB
} }
}*/ }*/
// Flugente: backgrounds can alter prices
INT16 pricepercentage = 100;
// if it's a GUN or AMMO (but not Launchers, and all attachments and payload is included) // if it's a GUN or AMMO (but not Launchers, and all attachments and payload is included)
if ( Item [ usItemID ].usItemClass & (IC_GUN|IC_AMMO) ) if ( Item [ usItemID ].usItemClass & (IC_GUN|IC_AMMO) )
{ {
if ( gpSMCurrentMerc->GetBackgroundValue(BG_PERC_PRICES_GUNS) ) pricepercentage = max( 0, 100 + (fDealerSelling ? -1 : 1) * gpSMCurrentMerc->GetBackgroundValue( BG_PERC_PRICES_GUNS ) );
uiDiscountValue = ( uiItemPrice[ubCnt] * gpSMCurrentMerc->GetBackgroundValue(BG_PERC_PRICES_GUNS) ) / 100;
// if we play without backgrounds, Flo gets the hardcoded bonus
else if ( gpSMCurrentMerc->ubProfile == FLO )
uiDiscountValue = ( uiItemPrice[ubCnt] * FLO_DISCOUNT_PERCENTAGE ) / 100;
// she gets a discount! Read her M.E.R.C. profile to understand why // Even without backgrounds, Flo gets a discount. Read her M.E.R.C. profile to understand why
if ( fDealerSelling ) if ( !gGameOptions.fBackGround && gpSMCurrentMerc->ubProfile == FLO )
{ pricepercentage = max( 0, 100 + (fDealerSelling ? -1 : 1) * FLO_DISCOUNT_PERCENTAGE );
// she buys for less...
uiItemPrice[ubCnt] -= uiDiscountValue;
}
else
{
// and sells for more!
uiItemPrice[ubCnt] += uiDiscountValue;
}
} }
// Flugente: backgrounds
else if ( Item [ usItemID ].usItemClass & (IC_MAPFILTER_MELEE|IC_MAPFILTER_KIT|IC_MAPFILTER_LBE|IC_MAPFILTER_ARMOR|IC_MAPFILTER_MISC) ) else if ( Item [ usItemID ].usItemClass & (IC_MAPFILTER_MELEE|IC_MAPFILTER_KIT|IC_MAPFILTER_LBE|IC_MAPFILTER_ARMOR|IC_MAPFILTER_MISC) )
{ {
uiDiscountValue = ( uiItemPrice[ubCnt] * gpSMCurrentMerc->GetBackgroundValue(BG_PERC_PRICES) ) / 100; pricepercentage = max( 0, 100 + (fDealerSelling ? -1 : 1) * gpSMCurrentMerc->GetBackgroundValue( BG_PERC_PRICES ) );
if ( fDealerSelling )
{
// buy for less...
uiItemPrice[ubCnt] -= uiDiscountValue;
}
else
{
// and sell for more!
uiItemPrice[ubCnt] += uiDiscountValue;
}
} }
uiItemPrice[ubCnt] = (uiItemPrice[ubCnt] * pricepercentage) / 100;
// if it's the dealer selling this, make sure the item is worth at least $1 // if it's the dealer selling this, make sure the item is worth at least $1
// if he is buying this from a player, then we allow a value of 0, since that has a special "worthless" quote #18 // if he is buying this from a player, then we allow a value of 0, since that has a special "worthless" quote #18
if( fDealerSelling && ( uiItemPrice[ubCnt] == 0 ) ) if( fDealerSelling && ( uiItemPrice[ubCnt] == 0 ) )
@@ -3417,7 +3397,7 @@ UINT8 ubItemsNotCounted = 0; //ja25 UB
} }
// if we want the unit price, find the highest price in the stack // if we want the unit price, find the highest price in the stack
for (ubCnt = 0; ubCnt < pItemObject->ubNumberOfObjects; ubCnt++ ) for (ubCnt = 0; ubCnt < pItemObject->ubNumberOfObjects; ++ubCnt )
{ {
if(fUnitPriceOnly == TRUE) if(fUnitPriceOnly == TRUE)
{ {