Skip to content

Implement ArmorMult for ArmorExtend #41

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 1 commit into from
Aug 29, 2025
Merged

Implement ArmorMult for ArmorExtend #41

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
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class ArmorTemplate
Real adjustDamage(DamageType t, Real damage) const;

static void parseArmorCoefficients( INI* ini, void *instance, void* /* store */, const void* userData );
static void parseArmorMultiplier( INI* ini, void *instance, void* /* store */, const void* userData );

protected:

Expand Down
23 changes: 22 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Armor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,26 @@ Real ArmorTemplate::adjustDamage(DamageType t, Real damage) const
self->m_damageCoefficient[dt] = pct;
}

void ArmorTemplate::parseArmorMultiplier(INI* ini, void* instance, void* /* store */, const void* userData)
{
ArmorTemplate* self = (ArmorTemplate*)instance;

const char* damageName = ini->getNextToken();
Real mult = INI::scanPercentToReal(ini->getNextToken());

if (stricmp(damageName, "Default") == 0)
{
for (Int i = 0; i < DAMAGE_NUM_TYPES; i++)
{
self->m_damageCoefficient[i] = self->m_damageCoefficient[i] * mult;
}
return;
}

DamageType dt = (DamageType)DamageTypeFlags::getSingleBitFromName(damageName);
self->m_damageCoefficient[dt] = self->m_damageCoefficient[dt] * mult;
}

//-------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -159,7 +179,8 @@ const ArmorTemplate* ArmorStore::findArmorTemplate(AsciiString name) const
{
static const FieldParse myFieldParse[] =
{
{ "Armor", ArmorTemplate::parseArmorCoefficients, NULL, 0 }
{ "Armor", ArmorTemplate::parseArmorCoefficients, NULL, 0 },
{ "ArmorMult", ArmorTemplate::parseArmorMultiplier, NULL, 0 }
};

const char* new_armor_name = ini->getNextToken();
Expand Down