New feature: food system requires mercs to eat and drink in order to survive

- food and water levels are lowered every hour, eat food to survive - not doing so leads to various penalties and ultimately death - added food items for that purpose. Food can degrade over time. Rotten food poisons. - Mercs automatically consume food if hungry/thirsty and food is in their inventories - for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307396/Re_Mercs_need_food_and_water_t.html#Post307396 - this feature requires new STI files from the GameDir trunk. - added a bunch of filler variable to the soldier type, so hopefully savegame compatibility can be maintained easier in the future. WARNING: This will break savegame compatibility git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5411 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2026-07-22 13:40:22 +02:00 · 2012-07-21 16:41:04 +00:00
parent b95d001812
commit f6bf6bf4aa
54 changed files with 2660 additions and 144 deletions
@@ -111,6 +111,7 @@
 #include "Dialogue Control.h"

 #include "IMP Skill Trait.h"	// added by Flugente
+#include "Food.h"				// added by Flugente

 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
@@ -1010,6 +1011,11 @@ SOLDIERTYPE& SOLDIERTYPE::operator=(const OLDSOLDIERTYPE_101& src)
 		this->bPoisonSum = 0;
 		this->bPoisonResistance = 0;
 		this->bPoisonAbsorption = 0;
+
+		this->bFoodLevel = 0;
+		this->bDrinkLevel = 0;
+		this->usStarveDamageHealth = 0;
+		this->usStarveDamageStrength = 0;
    }
    return *this;
 }
@@ -13256,7 +13262,7 @@ void SOLDIERTYPE::SoldierInventoryCoolDown(void)

 				FLOAT cooldownfactor = GetItemCooldownFactor(pObj);			// ... get cooldown factor ...

-				FLOAT newtemperature = max((FLOAT)0.0, temperature - cooldownfactor);	// ... calculate new temperature ...
+				FLOAT newtemperature = max(0.0f, temperature - cooldownfactor);	// ... calculate new temperature ...
 				(*pObj)[i]->data.bTemperature = newtemperature;				// ... set new temperature

 #if 0//def JA2TESTVERSION
@@ -13272,7 +13278,7 @@ void SOLDIERTYPE::SoldierInventoryCoolDown(void)

 						FLOAT cooldownfactor = GetItemCooldownFactor( &(*iter) );	// ... get cooldown factor ...

-						FLOAT newtemperature = max((FLOAT)0.0, temperature - cooldownfactor);	// ... calculate new temperature ...
+						FLOAT newtemperature = max(0.0f, temperature - cooldownfactor);	// ... calculate new temperature ...
 						(*iter)[i]->data.bTemperature = newtemperature;				// ... set new temperature

 #if 0//def JA2TESTVERSION
@@ -13289,7 +13295,7 @@ void SOLDIERTYPE::SoldierInventoryCoolDown(void)
  }
 }

-// Flugente: determine if we can rest our weapon on something. This can only happen when STANDING/CROUCHED. As a result, we get superior handling modifiers (we apply the PRONE modfiers)
+// Flugente: determine if we can rest our weapon on something. This ca6n only happen when STANDING/CROUCHED. As a result, we get superior handling modifiers (we apply the PRONE modfiers)
 BOOLEAN	SOLDIERTYPE::IsWeaponMounted( void )
 {
 	BOOLEAN applybipod = FALSE;
@@ -13568,6 +13574,27 @@ INT16	SOLDIERTYPE::GetPoisonDamagePercentage( void )
 	return( val );
 }

+// add poison
+void	SOLDIERTYPE::AddPoison( INT8 sPoisonAmount )
+{
+	if ( sPoisonAmount < 1 )
+		return;
+
+	INT8 oldpoisonsum = this->bPoisonSum;
+	this->bPoisonSum = min(this->bPoisonSum + sPoisonAmount,  this->stats.bLifeMax);
+
+	// recalc really added poison
+	sPoisonAmount = max(0, this->bPoisonSum - oldpoisonsum);
+
+	INT8 oldpoisonlife = this->bPoisonLife;
+	this->bPoisonLife = min(this->bPoisonLife + sPoisonAmount,  this->bPoisonSum);
+
+	INT8 poisontolife = max(0, this->bPoisonLife - oldpoisonlife);
+
+	INT8 oldpoisonbleed = this->bPoisonBleeding;
+	this->bPoisonBleeding = min(this->bPoisonBleeding + (sPoisonAmount - poisontolife),  this->bPoisonSum);
+}
+
 // reset the extra stat variables
 void	SOLDIERTYPE::ResetExtraStats()
 {
@@ -13642,6 +13669,33 @@ void	SOLDIERTYPE::InventoryExplosion( void )
 	}
 }

+// Flugente: Food decay in inventory (once an hour)
+void SOLDIERTYPE::SoldierInventoryFoodDecay(void)
+{
+	if ( !gGameOptions.fFoodSystem )
+		return;
+
+	// one hour has 60 minutes, with 12 5-second-intervals (cooldown values are based on 5-second values)
+	FLOAT decaymod = 12*60*gGameExternalOptions.sFoodDecayModificator;
+
+	INT8 invsize = (INT8)this->inv.size();									// remember inventorysize, so we don't call size() repeatedly
+	for ( INT8 bLoop = 0; bLoop < invsize; ++bLoop)							// ... for all items in our inventory ...
+	{
+		if ( Item[this->inv[bLoop].usItem].foodtype > 0 )					// food decays
+		{
+			OBJECTTYPE * pObj = &(this->inv[bLoop]);						// ... get pointer for this item ...
+
+			if ( pObj != NULL )												// ... if pointer is not obviously useless ...
+			{
+				for(INT16 i = 0; i < pObj->ubNumberOfObjects; ++i)			// ... there might be multiple items here (item stack), so for each one ...
+				{
+					(*pObj)[i]->data.bTemperature = max(0.0f, (*pObj)[i]->data.bTemperature - decaymod * Food[Item[pObj->usItem].foodtype].usDecayRate);	// set new temperature														
+				}
+			}
+		}
+	}
+}
+

 INT32 CheckBleeding( SOLDIERTYPE *pSoldier )
 {
@@ -15742,6 +15796,11 @@ UINT16 NumberOfDamagedStats( SOLDIERTYPE * pSoldier )
 		if (pSoldier->ubCriticalStatDamage[cnt] > 0 )
 			ubTotalStatsDamaged += pSoldier->ubCriticalStatDamage[cnt];
 	}
+
+	// Flugente: stats can also be damaged
+	ubTotalStatsDamaged += pSoldier->usStarveDamageHealth;
+	ubTotalStatsDamaged += pSoldier->usStarveDamageStrength;
+
 	return( ubTotalStatsDamaged );
 }

@@ -15874,6 +15933,102 @@ UINT8 RegainDamagedStats( SOLDIERTYPE * pSoldier, UINT16 usAmountRegainedHundred
 		}
 	}

+	// Flugente: Third, heal damage from starvation if possible
+	if ( !gGameOptions.fFoodSystem || ( gGameOptions.fFoodSystem && ubAmountRegained > 0 && pSoldier->bFoodLevel > FoodMoraleMods[FOOD_NORMAL].bThreshold && pSoldier->bDrinkLevel > FoodMoraleMods[FOOD_NORMAL].bThreshold ) )
+	{
+		// if we have a damaged stat here
+		if (pSoldier->usStarveDamageHealth > 0 )
+		{
+			if (ubAmountRegained >= pSoldier->usStarveDamageHealth)
+			{
+				// if the amount we can return is bigger than what we need, keep the rest, for other stats
+				usStatIncreasement = pSoldier->usStarveDamageHealth;
+				ubAmountRegained = max(0,(ubAmountRegained - usStatIncreasement));
+				pSoldier->usStarveDamageHealth = 0;
+			}
+			else
+			{
+				// if not having full amount, heal what we can
+				usStatIncreasement = ubAmountRegained;
+				ubAmountRegained = 0;
+				pSoldier->usStarveDamageHealth = max( 0, (pSoldier->usStarveDamageHealth - usStatIncreasement));
+			}
+
+			// so we can start regaining the stats
+			if ( usStatIncreasement > 0 )
+			{
+				bStatsReturned += usStatIncreasement; // keep value for feedback
+				
+				sStat = sStatGainStrings[0]; // set string
+				pSoldier->stats.bLifeMax += usStatIncreasement;
+				pSoldier->stats.bLife += usStatIncreasement;
+				pSoldier->iHealableInjury -= (usStatIncreasement * 100); // don't forget the healable injury
+				if (pSoldier->iHealableInjury < 0)
+					pSoldier->iHealableInjury = 0;
+				if (pSoldier->stats.bLifeMax >= 100 || pSoldier->stats.bLife >= 100 ) // repair if going too far
+				{
+					pSoldier->stats.bLifeMax = 100;
+					pSoldier->stats.bLife = 100;
+					pSoldier->iHealableInjury = 0;
+					pSoldier->usStarveDamageHealth = 0;
+				}
+				gMercProfiles[ pSoldier->ubProfile ].bLifeMax = pSoldier->stats.bLifeMax; // update profile
+
+				// Throw a message if healed anything
+				if ( gSkillTraitValues.fDORepStShouldThrowMessage )
+				{
+					if ( usStatIncreasement == 1 )
+						ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_REGAINED_ONE_POINTS_OF_STAT], pSoldier->name, sStat  );
+					else
+						ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_REGAINED_X_POINTS_OF_STATS], pSoldier->name, usStatIncreasement, sStat  );
+				}
+			}
+		}
+
+		// if we have a damaged stat here
+		if (pSoldier->usStarveDamageStrength > 0 )
+		{
+			if (ubAmountRegained >= pSoldier->usStarveDamageStrength)
+			{
+				// if the amount we can return is bigger than what we need, keep the rest, for other stats
+				usStatIncreasement = pSoldier->usStarveDamageStrength;
+				ubAmountRegained = max(0,(ubAmountRegained - usStatIncreasement));
+				pSoldier->usStarveDamageStrength = 0;
+			}
+			else
+			{
+				// if not having full amount, heal what we can
+				usStatIncreasement = ubAmountRegained;
+				ubAmountRegained = 0;
+				pSoldier->usStarveDamageStrength = max( 0, (pSoldier->usStarveDamageStrength - usStatIncreasement));
+			}
+
+			// so we can start regaining the stats
+			if ( usStatIncreasement > 0 )
+			{
+				bStatsReturned += usStatIncreasement; // keep value for feedback
+				
+				sStat = sStatGainStrings[9]; // set string
+				pSoldier->stats.bStrength += usStatIncreasement;
+				if (pSoldier->stats.bStrength >= 100 ) // repair if going too far
+				{
+					pSoldier->stats.bStrength = 100;
+					pSoldier->usStarveDamageStrength = 0;
+				}
+				gMercProfiles[ pSoldier->ubProfile ].bStrength = pSoldier->stats.bStrength; // update profile
+
+				// Throw a message if healed anything
+				if ( gSkillTraitValues.fDORepStShouldThrowMessage )
+				{
+					if ( usStatIncreasement == 1 )
+						ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_REGAINED_ONE_POINTS_OF_STAT], pSoldier->name, sStat  );
+					else
+						ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_REGAINED_X_POINTS_OF_STATS], pSoldier->name, usStatIncreasement, sStat  );
+				}
+			}
+		}
+	}
+
 	// Done, return what we healed
 	return( bStatsReturned );
 }