Skip to content

MinefieldBehavior: Adjust health based on remaining mines and regeneration #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

MinefieldBehavior: Adjust health based on remaining mines and regeneration #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,36 @@ void MinefieldBehavior::detonateOnce(const Coord3D& position)
if (m_virtualMinesRemaining > 0)
--m_virtualMinesRemaining;

// Calculate the desired health based on remaining virtual mines
Real percent = (Real)m_virtualMinesRemaining / (Real)d->m_numVirtualMines;
BodyModuleInterface* body = getObject()->getBodyModule();
Real health = body->getHealth();
Real desired = percent * body->getMaxHealth();

// If we don't regenerate and have no mines left, health should go to 0 to trigger natural death
// Otherwise, keep a minimum health for regenerating minefields
if (!m_regenerates && m_virtualMinesRemaining == 0)
desired = 0.0f;
else if (desired < MIN_HEALTH)
desired = MIN_HEALTH;

Real amount = health - desired;

if (amount > 0.0f)
{
TheGameLogic->destroyObject(getObject());
}
else
{
Real percent = (Real)m_virtualMinesRemaining / (Real)d->m_numVirtualMines;
BodyModuleInterface* body = getObject()->getBodyModule();
Real health = body->getHealth();
Real desired = percent * body->getMaxHealth();
if (desired < MIN_HEALTH)
desired = MIN_HEALTH;
Real amount = health - desired;

if (amount > 0.0f)
{
m_ignoreDamage = true;
m_ignoreDamage = true;

//body->internalChangeHealth(desired - health);
//can't use this, AutoHeal won't work unless we go thru normal damage stuff
//body->internalChangeHealth(desired - health);
//can't use this, AutoHeal won't work unless we go thru normal damage stuff

DamageInfo extraDamageInfo;
extraDamageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
extraDamageInfo.in.m_deathType = DEATH_NONE;
extraDamageInfo.in.m_sourceID = getObject()->getID();
extraDamageInfo.in.m_amount = amount;
getObject()->attemptDamage(&extraDamageInfo);
DamageInfo extraDamageInfo;
extraDamageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
extraDamageInfo.in.m_deathType = DEATH_NONE;
extraDamageInfo.in.m_sourceID = getObject()->getID();
extraDamageInfo.in.m_amount = amount;
getObject()->attemptDamage(&extraDamageInfo);

m_ignoreDamage = false;
}
m_ignoreDamage = false;
}

if (m_virtualMinesRemaining == 0)
Expand Down
50 changes: 25 additions & 25 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,36 +279,36 @@ void MinefieldBehavior::detonateOnce(const Coord3D& position)
if (m_virtualMinesRemaining > 0)
--m_virtualMinesRemaining;

// Calculate the desired health based on remaining virtual mines
Real percent = (Real)m_virtualMinesRemaining / (Real)d->m_numVirtualMines;
BodyModuleInterface* body = getObject()->getBodyModule();
Real health = body->getHealth();
Real desired = percent * body->getMaxHealth();

// If we don't regenerate and have no mines left, health should go to 0 to trigger natural death
// Otherwise, keep a minimum health for regenerating minefields
if (!m_regenerates && m_virtualMinesRemaining == 0)
desired = 0.0f;
else if (desired < MIN_HEALTH)
desired = MIN_HEALTH;

Real amount = health - desired;

if (amount > 0.0f)
{
TheGameLogic->destroyObject(getObject());
}
else
{
Real percent = (Real)m_virtualMinesRemaining / (Real)d->m_numVirtualMines;
BodyModuleInterface* body = getObject()->getBodyModule();
Real health = body->getHealth();
Real desired = percent * body->getMaxHealth();
if (desired < MIN_HEALTH)
desired = MIN_HEALTH;
Real amount = health - desired;

if (amount > 0.0f)
{
m_ignoreDamage = true;
m_ignoreDamage = true;

//body->internalChangeHealth(desired - health);
//can't use this, AutoHeal won't work unless we go thru normal damage stuff
//body->internalChangeHealth(desired - health);
//can't use this, AutoHeal won't work unless we go thru normal damage stuff

DamageInfo extraDamageInfo;
extraDamageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
extraDamageInfo.in.m_deathType = DEATH_NONE;
extraDamageInfo.in.m_sourceID = getObject()->getID();
extraDamageInfo.in.m_amount = amount;
getObject()->attemptDamage(&extraDamageInfo);
DamageInfo extraDamageInfo;
extraDamageInfo.in.m_damageType = DAMAGE_UNRESISTABLE;
extraDamageInfo.in.m_deathType = DEATH_NONE;
extraDamageInfo.in.m_sourceID = getObject()->getID();
extraDamageInfo.in.m_amount = amount;
getObject()->attemptDamage(&extraDamageInfo);

m_ignoreDamage = false;
}
m_ignoreDamage = false;
}

if (m_virtualMinesRemaining == 0)
Expand Down
Loading