Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix damage Commit (#1614)

Browse source 
* Fix Commit

* Revision
This commit is contained in:
TrainWrack 2025-03-14 19:49:18 -04:00 • committed by GitHub
parent d7d9aad0d9
commit bed466be9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TombEngine/Game/effects/tomb4fx.cpp
View file

@ -355,6 +355,7 @@ void ThrowPoison(const ItemInfo& item, int boneID, const Vector3& offset, const
auto& part = SetupPoisonParticle(colorStart, colorEnd);
AttachAndCreateSpark(&part, &item, boneID, offset, vel, spriteID);
part.flags = SP_POISON | SP_SCALE | SP_DEF | SP_ROTATE | SP_EXPDEF;
part.damage = 5;
}
}

2
TombEngine/Objects/Effects/EmberEmitter.cpp
View file

@ -76,6 +76,7 @@ namespace TEN::Effects::EmberEmitter
spark.scalar = 3.0f;
spark.gravity = Random::GenerateFloat(32.0f, 96.0f);
spark.flags = SP_DAMAGE | SP_ROTATE | SP_DEF | SP_SCALE | SP_EXPDEF;
spark.damage = 2;
}
else
{
@ -150,6 +151,7 @@ namespace TEN::Effects::EmberEmitter
spark.size = Random::GenerateFloat(32.0f, 48.0f);
spark.dSize = spark.size;
spark.flags = SP_DAMAGE | SP_ROTATE | SP_DEF | SP_SCALE;
spark.damage = 2;
}
}
}

5
TombEngine/Objects/TR5/Emitter/tr5_smoke_emitter.cpp
View file

@ -140,8 +140,11 @@ namespace TEN::Effects::SmokeEmitter
bool ignoreDamage = item.ItemFlags[3] & SmokeEmitterFlags::NoDamage;
if (!ignoreDamage && TestGlobalTimeInterval(DAMAGE_TIME_INTERVAL))
{
part.flags |= SP_DAMAGE;
part.damage = 2;
}
part.rotAng = Random::GenerateAngle(ANGLE(0.0f), ANGLE(22.5f));
part.rotAdd = Random::GenerateAngle(ANGLE(0.04f), ANGLE(0.08f)) * (Random::TestProbability(1 / 2.0f) ? 1 : -1);

4
TombEngine/Scripting/Internal/TEN/Effects/EffectsFunctions.cpp
View file

@ -213,8 +213,10 @@ namespace TEN::Scripting::Effects
bool convertedApplyDamage = ValueOr<bool>(applyDamage, false);
if (convertedApplyDamage)
{
part.flags |= SP_DAMAGE;
part.damage = 2;
}
// TODO: Add option to turn off wind.
if (TestEnvironment(RoomEnvFlags::ENV_FLAG_WIND, part.roomNumber))
part.flags |= SP_WIND;