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

-fixed mercs complaining about equipment when it's really good

Browse Source 
-fixed BR not getting new stock for items with indexes > 1000
-reduced re-ordering times for awesome BR's


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-07-20 03:36:19 +00:00
parent 8c19632c28
commit d18502accb
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.353" }; INT16 zVersionLabel[256] = { L"Release v1.13.357" };
#endif #endif
INT8 czVersionNumber[16] = { "Build 06.07.17" }; INT8 czVersionNumber[16] = { "Build 06.07.19" };
INT16 zTrackingNumber[16] = { L"Z" }; INT16 zTrackingNumber[16] = { L"Z" };
Laptop/BobbyR.cpp
+14 -6
View File
@@ -111,7 +111,7 @@
#define BOBBY_R_NEW_PURCHASE_ARRIVAL_TIME (1 * 60 * 24) // minutes in 1 day #define BOBBY_R_NEW_PURCHASE_ARRIVAL_TIME (1 * 60 * 24) // minutes in 1 day
#define BOBBY_R_USED_PURCHASE_OFFSET 1000 #define BOBBY_R_USED_PURCHASE_OFFSET MAXITEMS
#define BOBBYR_UNDERCONSTRUCTION_ANI_DELAY 150 #define BOBBYR_UNDERCONSTRUCTION_ANI_DELAY 150
#define BOBBYR_UNDERCONSTRUCTION_NUM_FRAMES 5 #define BOBBYR_UNDERCONSTRUCTION_NUM_FRAMES 5
@@ -643,10 +643,11 @@ BOOLEAN InitBobbyRayUsedInventory()
void DailyUpdateOfBobbyRaysNewInventory() void DailyUpdateOfBobbyRaysNewInventory()
{ {
INT16 i; INT32 i;
UINT16 usItemIndex; UINT16 usItemIndex;
BOOLEAN fPrevElig; BOOLEAN fPrevElig;
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("DailyUpdateOfBobbyRaysNewInventory: list length = %d", LaptopSaveInfo.usInventoryListLength[BOBBY_RAY_NEW]));
//simulate other buyers by reducing the current quantity on hand //simulate other buyers by reducing the current quantity on hand
SimulateBobbyRayCustomer(LaptopSaveInfo.BobbyRayInventory, BOBBY_RAY_NEW); SimulateBobbyRayCustomer(LaptopSaveInfo.BobbyRayInventory, BOBBY_RAY_NEW);
@@ -659,15 +660,18 @@ void DailyUpdateOfBobbyRaysNewInventory()
Assert(usItemIndex < MAXITEMS); Assert(usItemIndex < MAXITEMS);
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("DailyUpdateOfBobbyRaysNewInventory: checking item = %d, qty on order = %d",usItemIndex,LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnOrder));
// make sure this item is still sellable in the latest version of the store inventory // make sure this item is still sellable in the latest version of the store inventory
if ( StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] == 0 ) if ( StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] == 0 )
{ {
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("DailyUpdateOfBobbyRaysNewInventory: skipping item = %d",usItemIndex));
continue; continue;
} }
//if the item isn't already on order //if the item isn't already on order
if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnOrder == 0) if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnOrder == 0 || gGameOptions.ubBobbyRay == BR_AWESOME )
{ {
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("DailyUpdateOfBobbyRaysNewInventory: item = %d, qty on hand = %d, half desired amount = %d",usItemIndex,LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnHand,(StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] * gGameOptions.ubBobbyRay )/2));
//if the qty on hand is half the desired amount or fewer //if the qty on hand is half the desired amount or fewer
if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnHand <= (StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] * gGameOptions.ubBobbyRay )/2 ) if( LaptopSaveInfo.BobbyRayInventory[ i ].ubQtyOnHand <= (StoreInventory[ usItemIndex ][ BOBBY_RAY_NEW ] * gGameOptions.ubBobbyRay )/2 )
{ {
@@ -683,6 +687,7 @@ void DailyUpdateOfBobbyRaysNewInventory()
// if this is the first day the player is eligible to have access to this thing // if this is the first day the player is eligible to have access to this thing
if ( !fPrevElig || gGameOptions.ubBobbyRay == BR_AWESOME ) if ( !fPrevElig || gGameOptions.ubBobbyRay == BR_AWESOME )
{ {
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("DailyUpdateOfBobbyRaysNewInventory: item = %d, add fresh inventory",usItemIndex));
// eliminate the ordering delay and stock the items instantly! // eliminate the ordering delay and stock the items instantly!
// This is just a way to reward the player right away for making progress without the reordering lag... // This is just a way to reward the player right away for making progress without the reordering lag...
AddFreshBobbyRayInventory( usItemIndex ); AddFreshBobbyRayInventory( usItemIndex );
@@ -709,14 +714,13 @@ void DailyUpdateOfBobbyRaysUsedInventory()
UINT16 usItemIndex; UINT16 usItemIndex;
BOOLEAN fPrevElig; BOOLEAN fPrevElig;
//simulate other buyers by reducing the current quantity on hand //simulate other buyers by reducing the current quantity on hand
SimulateBobbyRayCustomer(LaptopSaveInfo.BobbyRayUsedInventory, BOBBY_RAY_USED); SimulateBobbyRayCustomer(LaptopSaveInfo.BobbyRayUsedInventory, BOBBY_RAY_USED);
for(i = 0; i < LaptopSaveInfo.usInventoryListLength[BOBBY_RAY_USED]; i++) for(i = 0; i < LaptopSaveInfo.usInventoryListLength[BOBBY_RAY_USED]; i++)
{ {
//if the used item isn't already on order //if the used item isn't already on order
if( LaptopSaveInfo.BobbyRayUsedInventory[ i ].ubQtyOnOrder == 0 ) if( LaptopSaveInfo.BobbyRayUsedInventory[ i ].ubQtyOnOrder == 0 || gGameOptions.ubBobbyRay == BR_AWESOME )
{ {
//if we don't have ANY //if we don't have ANY
if( LaptopSaveInfo.BobbyRayUsedInventory[ i ].ubQtyOnHand == 0 ) if( LaptopSaveInfo.BobbyRayUsedInventory[ i ].ubQtyOnHand == 0 )
@@ -763,10 +767,11 @@ UINT8 HowManyBRItemsToOrder(UINT16 usItemIndex, UINT8 ubCurrentlyOnHand, UINT8 u
{ {
UINT8 ubItemsOrdered = 0; UINT8 ubItemsOrdered = 0;
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("HowManyBRItemsToOrder: item = %d",usItemIndex));
Assert(usItemIndex < MAXITEMS); Assert(usItemIndex < MAXITEMS);
// formulas below will fail if there are more items already in stock than optimal // formulas below will fail if there are more items already in stock than optimal
Assert(ubCurrentlyOnHand <= StoreInventory[ usItemIndex ][ ubBobbyRayNewUsed ] * gGameOptions.ubBobbyRay) ; //Assert(ubCurrentlyOnHand <= StoreInventory[ usItemIndex ][ ubBobbyRayNewUsed ] * gGameOptions.ubBobbyRay) ;
Assert(ubBobbyRayNewUsed < BOBBY_RAY_LISTS); Assert(ubBobbyRayNewUsed < BOBBY_RAY_LISTS);
@@ -812,6 +817,7 @@ void AddFreshBobbyRayInventory( UINT16 usItemIndex )
BOOLEAN fUsed; BOOLEAN fUsed;
UINT8 ubItemQuality; UINT8 ubItemQuality;
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("AddFreshBobbyRayInventory: item = %d", usItemIndex ));
if( usItemIndex >= BOBBY_R_USED_PURCHASE_OFFSET ) if( usItemIndex >= BOBBY_R_USED_PURCHASE_OFFSET )
{ {
@@ -832,10 +838,12 @@ void AddFreshBobbyRayInventory( UINT16 usItemIndex )
sInventorySlot = GetInventorySlotForItem(pInventoryArray, usItemIndex, fUsed); sInventorySlot = GetInventorySlotForItem(pInventoryArray, usItemIndex, fUsed);
if (sInventorySlot == -1) if (sInventorySlot == -1)
{ {
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("AddFreshBobbyRayInventory: item not found! = %d", usItemIndex ));
AssertMsg( FALSE, String( "AddFreshBobbyRayInventory(), Item %d not found. AM-0.", usItemIndex ) ); AssertMsg( FALSE, String( "AddFreshBobbyRayInventory(), Item %d not found. AM-0.", usItemIndex ) );
return; return;
} }
DebugMsg(TOPIC_JA2, DBG_LEVEL_3,String("AddFreshBobbyRayInventory: item = %d, qty on hand = %d, qty on order = %d", usItemIndex,pInventoryArray[ sInventorySlot ].ubQtyOnHand, pInventoryArray[ sInventorySlot ].ubQtyOnOrder ));
pInventoryArray[ sInventorySlot ].ubQtyOnHand += pInventoryArray[ sInventorySlot ].ubQtyOnOrder; pInventoryArray[ sInventorySlot ].ubQtyOnHand += pInventoryArray[ sInventorySlot ].ubQtyOnOrder;
pInventoryArray[ sInventorySlot ].ubItemQuality = ubItemQuality; pInventoryArray[ sInventorySlot ].ubItemQuality = ubItemQuality;
Strategic/Strategic Merc Handler.cpp
+4 -4
View File
@@ -689,10 +689,10 @@ BOOLEAN SoldierHasWorseEquipmentThanUsedTo( SOLDIERTYPE *pSoldier )
{ {
INT32 cnt; INT32 cnt;
UINT16 usItem; UINT16 usItem;
INT8 bBestArmour = -1; INT32 bBestArmour = -1;
INT8 bBestArmourIndex = -1; INT32 bBestArmourIndex = -1;
INT8 bBestGun = -1; INT32 bBestGun = -1;
INT8 bBestGunIndex = -1; INT32 bBestGunIndex = -1;
for ( cnt = 0; cnt < NUM_INV_SLOTS; cnt++ ) for ( cnt = 0; cnt < NUM_INV_SLOTS; cnt++ )