mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-21 22:21:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rangingareas' into 'master'

Browse Source 
Don't apply area of effect for potions and improve range handling

Closes #8018

See merge request OpenMW/openmw!4172
This commit is contained in:
psi29a 2024-06-15 08:42:11 +00:00
commit 05a70b29c5
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -180,6 +180,7 @@
Bug #7993: Cannot load Bloodmoon without Tribunal Bug #7993: Cannot load Bloodmoon without Tribunal
Bug #7997: Can toggle perspective when paralyzed Bug #7997: Can toggle perspective when paralyzed
Bug #8002: Portable light sources held by creatures do not emit lighting Bug #8002: Portable light sources held by creatures do not emit lighting
Bug #8018: Potion effects should never explode and always apply on self
Feature #1415: Infinite fall failsafe Feature #1415: Infinite fall failsafe
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples

2
apps/openmw/mwmechanics/activespells.cpp
View File

@ -52,6 +52,8 @@ namespace
{ {
for (const auto& enam : list.mList) for (const auto& enam : list.mList)
{ {
if (enam.mData.mRange != ESM::RT_Self)
continue;
ESM::ActiveEffect effect; ESM::ActiveEffect effect;
effect.mEffectId = enam.mData.mEffectID; effect.mEffectId = enam.mData.mEffectID;
effect.mArg = MWMechanics::EffectKey(enam.mData).mArg; effect.mArg = MWMechanics::EffectKey(enam.mData).mArg;

5
apps/openmw/mwmechanics/spellcasting.cpp
View File

@ -379,7 +379,10 @@ namespace MWMechanics
mFlags = static_cast<ESM::ActiveSpells::Flags>( mFlags = static_cast<ESM::ActiveSpells::Flags>(
ESM::ActiveSpells::Flag_Temporary | ESM::ActiveSpells::Flag_Stackable); ESM::ActiveSpells::Flag_Temporary | ESM::ActiveSpells::Flag_Stackable);
inflict(mCaster, potion->mEffects, ESM::RT_Self); // Ignore range and don't apply area of effect
inflict(mCaster, potion->mEffects, ESM::RT_Self, true);
inflict(mCaster, potion->mEffects, ESM::RT_Touch, true);
inflict(mCaster, potion->mEffects, ESM::RT_Target, true);
return true; return true;
} }