diff --git a/Tactical/Item Types.h b/Tactical/Item Types.h index 78f1f5d5..37ba1be2 100644 --- a/Tactical/Item Types.h +++ b/Tactical/Item Types.h @@ -871,6 +871,7 @@ extern OBJECTTYPE gTempObject; #define ITEM_fProvidesRobotCamo 0x0000010000000000 // rftr: robot attachments #define ITEM_fProvidesRobotNightVision 0x0000020000000000 // rftr: robot attachments #define ITEM_fProvidesRobotLaserBonus 0x0000040000000000 // rftr: robot attachments +#define ITEM_FoodSystemExclusive 0x0000080000000000 // kitty: item exclusively available with food feature // ---------------------------------------------------------------- diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 10ac4652..5dd52f89 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -1271,12 +1271,14 @@ BOOLEAN ItemIsLegal( UINT16 usItemIndex, BOOLEAN fIgnoreCoolness ) if ( Item[usItemIndex].ubCoolness == 0 && !fIgnoreCoolness ) return FALSE; - // silversurfer: no food items if the food system is off - if ( !UsingFoodSystem() && Item[ usItemIndex ].foodtype > 0 ) + + // kitty: no food items if the food system is off + // whether the item is exclusive is defined by tag + // replaced previous system which used Item[usItemIndex].foodtype > 0 as criteria + // that also restricted dual use items (i.e. drugs that also have a foodtype, like coffee, etc.) + if (!gGameExternalOptions.fFoodSystem && ItemIsOnlyInFood(usItemIndex)) { - // Only restrict food for now. Water can be used to replenish lost energy so it is useful even without the food system. - if ( Food[Item[usItemIndex].foodtype].bFoodPoints > 0 ) - return FALSE; + return FALSE; } // kitty: no disease items if the disease system is off @@ -16128,3 +16130,4 @@ BOOLEAN ItemIsOnlyInDisease(UINT16 usItem) { return HasItemFlag2(usItem, ITEM_Di BOOLEAN ItemProvidesRobotCamo(UINT16 usItem) { return HasItemFlag2(usItem, ITEM_fProvidesRobotCamo); } BOOLEAN ItemProvidesRobotNightvision(UINT16 usItem) { return HasItemFlag2(usItem, ITEM_fProvidesRobotNightVision); } BOOLEAN ItemProvidesRobotLaserBonus(UINT16 usItem) { return HasItemFlag2(usItem, ITEM_fProvidesRobotLaserBonus); } +BOOLEAN ItemIsOnlyInFood(UINT16 usItem) { return HasItemFlag2(usItem, ITEM_FoodSystemExclusive); } diff --git a/Tactical/Items.h b/Tactical/Items.h index 6aa26659..cf58ac72 100644 --- a/Tactical/Items.h +++ b/Tactical/Items.h @@ -251,6 +251,7 @@ BOOLEAN ItemIsOnlyInDisease(UINT16 usItem); BOOLEAN ItemProvidesRobotCamo(UINT16 usItem); BOOLEAN ItemProvidesRobotNightvision(UINT16 usItem); BOOLEAN ItemProvidesRobotLaserBonus(UINT16 usItem); +BOOLEAN ItemIsOnlyInFood(UINT16 usItem); //Existing functions without header def's, added them here, just incase I'll need to call //them from the editor. diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 412a96fa..d1ecf8a6 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -1592,6 +1592,12 @@ itemEndElementHandle(void *userData, const XML_Char *name) pData->curElement = ELEMENT; pData->curItem.iTransportGroupMaxProgress = (INT8)atoi(pData->szCharData); } + else if (strcmp(name, "FoodSystemExclusive") == 0) + { + pData->curElement = ELEMENT; + if ((BOOLEAN)atol(pData->szCharData)) + pData->curItem.usItemFlag2 |= ITEM_FoodSystemExclusive; + } --pData->maxReadDepth; } @@ -2225,6 +2231,7 @@ BOOLEAN WriteItemStats() if (ItemProvidesRobotNightvision(cnt)) FilePrintf(hFile, "\t\t%d\r\n", 1); if (ItemProvidesRobotLaserBonus(cnt)) FilePrintf(hFile, "\t\t%d\r\n", 1); if (ItemIsOnlyInDisease(cnt)) FilePrintf(hFile, "\t\t%d\r\n", 1); + if (ItemIsOnlyInFood(cnt)) FilePrintf(hFile, "\t\t%d\r\n", 1); FilePrintf(hFile,"\t\r\n"); }