Skip to content

add water depth to death behaviors #79

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
pWn3d1337 merged 2 commits into from
Feb 24, 2026
Merged

add water depth to death behaviors #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d5850
add water depth to death behavior
pWn3d1337 Feb 24, 2026
6751a05
add () to condition
pWn3d1337 Feb 24, 2026
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
2 changes: 2 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ class DieMuxData // does NOT inherit from ModuleData.
VeterancyLevelFlags m_veterancyLevels;
ObjectStatusMaskType m_exemptStatus; ///< die module is ignored if any of these status bits are set
ObjectStatusMaskType m_requiredStatus; ///< die module is ignored if any of these status bits are clear
Real m_minWaterDepth;
Real m_maxWaterDepth;

DieMuxData();
static const FieldParse* getFieldParse();
Expand Down
29 changes: 28 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include "GameLogic/GameLogic.h"
#include "GameLogic/Module/DieModule.h"
#include "GameLogic/Object.h"
#include <GameLogic/TerrainLogic.h>




Expand All @@ -50,6 +52,8 @@ DieMuxData::DieMuxData() {
if (TheGlobalData) {
m_deathTypes &= ~TheGlobalData->m_defaultExcludedDeathTypes;
}
m_minWaterDepth = 0.0f;
m_maxWaterDepth = std::numeric_limits<Real>::infinity();
}

//-------------------------------------------------------------------------------------------------
Expand All @@ -61,7 +65,9 @@ const FieldParse* DieMuxData::getFieldParse()
{ "VeterancyLevels", INI::parseVeterancyLevelFlags, nullptr, offsetof( DieMuxData, m_veterancyLevels ) },
{ "ExemptStatus", ObjectStatusMaskType::parseFromINI, nullptr, offsetof( DieMuxData, m_exemptStatus ) },
{ "RequiredStatus", ObjectStatusMaskType::parseFromINI, nullptr, offsetof( DieMuxData, m_requiredStatus ) },
{ nullptr, nullptr, nullptr, 0 }
{ "MinWaterDepth", INI::parseReal, nullptr, offsetof(DieMuxData, m_minWaterDepth )},
{ "MaxWaterDepth", INI::parseReal, nullptr, offsetof(DieMuxData, m_maxWaterDepth )},
{ nullptr, nullptr, nullptr, 0 }
};
return dataFieldParse;
}
Expand All @@ -86,6 +92,27 @@ Bool DieMuxData::isDieApplicable(const Object* obj, const DamageInfo *damageInfo
if( m_requiredStatus.any() && !obj->getStatusBits().testForAll( m_requiredStatus ) )
return false;

if ((m_minWaterDepth > 0.0f || m_maxWaterDepth < std::numeric_limits<Short>::infinity()) && obj != nullptr) {

// if on bride and we need water -> not applicable
if (obj->getLayer() > LAYER_GROUND && m_minWaterDepth > 0.0f) {
return false;
}

// Water level restriction
const Coord3D* pos = obj->getPosition();
Real waterZ{ 0 }, terrainZ{ 0 };

if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterZ, &terrainZ)) {
Real depth = waterZ - terrainZ;
return depth >= m_minWaterDepth && depth < m_maxWaterDepth;
}
else {
// we are over land
if (m_minWaterDepth > 0.0f) return false;
}
}

return true;
}

Expand Down