mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-05 10:43:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'baseresistance' into 'master'

Browse source 
Ignore resistances for base diseases

Closes #8485

See merge request OpenMW/openmw!4662
This commit is contained in:
psi29a 2025-07-01 21:32:55 +00:00
commit 583af381a6
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/activespells.cpp
View file

@ -267,7 +267,7 @@ namespace MWMechanics
if (spell->mData.mType != ESM::Spell::ST_Spell && spell->mData.mType != ESM::Spell::ST_Power
&& !isSpellActive(spell->mId))
{
mSpells.emplace_back(ActiveSpellParams{ spell, ptr });
mSpells.emplace_back(ActiveSpellParams{ spell, ptr, true });
mSpells.back().setActiveSpellId(MWBase::Environment::get().getESMStore()->generateId());
}
}
@ -506,9 +506,9 @@ namespace MWMechanics
mQueue.emplace_back(params);
}
void ActiveSpells::addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor)
void ActiveSpells::addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances)
{
mQueue.emplace_back(ActiveSpellParams{ spell, actor, true });
mQueue.emplace_back(ActiveSpellParams{ spell, actor, ignoreResistances });
}
void ActiveSpells::purge(ParamsPredicate predicate, const MWWorld::Ptr& ptr)

4
apps/openmw/mwmechanics/activespells.hpp
View file

@ -137,8 +137,8 @@ namespace MWMechanics
///
void addSpell(const ActiveSpellParams& params);
/// Bypasses resistances
void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor);
/// Force resistances
void addSpell(const ESM::Spell* spell, const MWWorld::Ptr& actor, bool ignoreResistances = true);
/// Removes the active effects from this spell/potion/.. with \a id
void removeEffectsBySourceSpellId(const MWWorld::Ptr& ptr, const ESM::RefId& id);

4
apps/openmw/mwmechanics/disease.hpp
View file

@ -66,7 +66,9 @@ namespace MWMechanics
if (Misc::Rng::rollDice(10000, prng) < x)
{
// Contracted disease!
actor.getClass().getCreatureStats(actor).getSpells().add(spell);
MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
creatureStats.getSpells().add(spell);
creatureStats.getActiveSpells().addSpell(spell, actor, false);
MWBase::Environment::get().getWorld()->applyLoopingParticles(actor);
std::string msg = MWBase::Environment::get()