mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-04 12:39:55 +00:00
125b21de20
The strong type is actually just a string underneath, but this will help in the future to have a distinction so it's easier to search and replace when we use an integer ID Slowly going through all the changes to make, still hundreds of errors a lot of functions/structures use std::string or stringview to designate an ID. So it takes time Continues slowly replacing ids. There are technically more and more compilation errors I have good hope that there is a point where the amount of errors will dramatically go down as all the main functions use the ESM::RefId type Continue moving forward, changes to the stores slowly moving along Starting to see the fruit of those changes. still many many error, but more and more Irun into a situation where a function is sandwiched between two functions that use the RefId type. More replacements. Things are starting to get easier I can see more and more often the issue is that the function is awaiting a RefId, but is given a string there is less need to go down functions and to fix a long list of them. Still moving forward, and for the first time error count is going down! Good pace, not sure about topics though, mId and mName are actually the same thing and are used interchangeably Cells are back to using string for the name, haven't fixed everything yet. Many other changes Under the bar of 400 compilation errors. more good progress <100 compile errors! More progress Game settings store can use string for find, it was a bit absurd how every use of it required to create refId from string some more progress on other fronts Mostly game settings clean one error opened a lot of other errors. Down to 18, but more will prbably appear only link errors left?? Fixed link errors OpenMW compiles, and launches, with some issues, but still!
240 lines
10 KiB
C++
240 lines
10 KiB
C++
#include "magiceffects.hpp"
|
|
#include "esmstore.hpp"
|
|
|
|
#include <components/esm3/loadarmo.hpp>
|
|
#include <components/esm3/loadclot.hpp>
|
|
#include <components/esm3/loadench.hpp>
|
|
#include <components/esm3/loadmgef.hpp>
|
|
#include <components/esm3/loadskil.hpp>
|
|
#include <components/esm3/loadspel.hpp>
|
|
#include <components/esm3/loadweap.hpp>
|
|
#include <components/esm3/npcstate.hpp>
|
|
|
|
#include "../mwbase/environment.hpp"
|
|
#include "../mwbase/world.hpp"
|
|
|
|
#include "../mwmechanics/magiceffects.hpp"
|
|
|
|
namespace
|
|
{
|
|
template <class T>
|
|
void getEnchantedItem(const ESM::RefId& id, ESM::RefId& enchantment, std::string& itemName)
|
|
{
|
|
const T* item = MWBase::Environment::get().getWorld()->getStore().get<T>().search(id);
|
|
if (item)
|
|
{
|
|
enchantment = item->mEnchant;
|
|
itemName = item->mName;
|
|
}
|
|
}
|
|
}
|
|
|
|
namespace MWWorld
|
|
{
|
|
void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory, ESM::NpcStats* npcStats)
|
|
{
|
|
const auto& store = MWBase::Environment::get().getWorld()->getStore();
|
|
// Convert corprus to format 10
|
|
for (const auto& [id, oldStats] : creatureStats.mSpells.mCorprusSpells)
|
|
{
|
|
const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
|
|
if (!spell)
|
|
continue;
|
|
|
|
ESM::CreatureStats::CorprusStats stats;
|
|
stats.mNextWorsening = oldStats.mNextWorsening;
|
|
for (int i = 0; i < ESM::Attribute::Length; ++i)
|
|
stats.mWorsenings[i] = 0;
|
|
|
|
for (auto& effect : spell->mEffects.mList)
|
|
{
|
|
if (effect.mEffectID == ESM::MagicEffect::DrainAttribute)
|
|
stats.mWorsenings[effect.mAttribute] = oldStats.mWorsenings;
|
|
}
|
|
creatureStats.mCorprusSpells[id] = stats;
|
|
}
|
|
// Convert to format 17
|
|
for (const auto& [id, oldParams] : creatureStats.mSpells.mSpellParams)
|
|
{
|
|
const ESM::Spell* spell = store.get<ESM::Spell>().search(id);
|
|
if (!spell || spell->mData.mType == ESM::Spell::ST_Spell || spell->mData.mType == ESM::Spell::ST_Power)
|
|
continue;
|
|
ESM::ActiveSpells::ActiveSpellParams params;
|
|
params.mId = id;
|
|
params.mDisplayName = spell->mName;
|
|
params.mItem.unset();
|
|
params.mCasterActorId = creatureStats.mActorId;
|
|
if (spell->mData.mType == ESM::Spell::ST_Ability)
|
|
params.mType = ESM::ActiveSpells::Type_Ability;
|
|
else
|
|
params.mType = ESM::ActiveSpells::Type_Permanent;
|
|
params.mWorsenings = -1;
|
|
params.mNextWorsening = ESM::TimeStamp();
|
|
int effectIndex = 0;
|
|
for (const auto& enam : spell->mEffects.mList)
|
|
{
|
|
if (oldParams.mPurgedEffects.find(effectIndex) == oldParams.mPurgedEffects.end())
|
|
{
|
|
ESM::ActiveEffect effect;
|
|
effect.mEffectId = enam.mEffectID;
|
|
effect.mArg = MWMechanics::EffectKey(enam).mArg;
|
|
effect.mDuration = -1;
|
|
effect.mTimeLeft = -1;
|
|
effect.mEffectIndex = effectIndex;
|
|
auto rand = oldParams.mEffectRands.find(effectIndex);
|
|
if (rand != oldParams.mEffectRands.end())
|
|
{
|
|
float magnitude = (enam.mMagnMax - enam.mMagnMin) * rand->second + enam.mMagnMin;
|
|
effect.mMagnitude = magnitude;
|
|
effect.mMinMagnitude = magnitude;
|
|
effect.mMaxMagnitude = magnitude;
|
|
// Prevent recalculation of resistances and don't reflect or absorb the effect
|
|
effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances
|
|
| ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
|
|
}
|
|
else
|
|
{
|
|
effect.mMagnitude = 0.f;
|
|
effect.mMinMagnitude = enam.mMagnMin;
|
|
effect.mMaxMagnitude = enam.mMagnMax;
|
|
effect.mFlags = ESM::ActiveEffect::Flag_None;
|
|
}
|
|
params.mEffects.emplace_back(effect);
|
|
}
|
|
effectIndex++;
|
|
}
|
|
creatureStats.mActiveSpells.mSpells.emplace_back(params);
|
|
}
|
|
std::multimap<ESM::RefId, int> equippedItems;
|
|
for (std::size_t i = 0; i < inventory.mItems.size(); ++i)
|
|
{
|
|
const ESM::ObjectState& item = inventory.mItems[i];
|
|
auto slot = inventory.mEquipmentSlots.find(i);
|
|
if (slot != inventory.mEquipmentSlots.end())
|
|
equippedItems.emplace(item.mRef.mRefID, slot->second);
|
|
}
|
|
for (const auto& [id, oldMagnitudes] : inventory.mPermanentMagicEffectMagnitudes)
|
|
{
|
|
ESM::RefId eId;
|
|
std::string name;
|
|
switch (store.find(id))
|
|
{
|
|
case ESM::REC_ARMO:
|
|
getEnchantedItem<ESM::Armor>(id, eId, name);
|
|
break;
|
|
case ESM::REC_CLOT:
|
|
getEnchantedItem<ESM::Clothing>(id, eId, name);
|
|
break;
|
|
case ESM::REC_WEAP:
|
|
getEnchantedItem<ESM::Weapon>(id, eId, name);
|
|
break;
|
|
}
|
|
if (eId.empty())
|
|
continue;
|
|
const ESM::Enchantment* enchantment = store.get<ESM::Enchantment>().search(eId);
|
|
if (!enchantment)
|
|
continue;
|
|
ESM::ActiveSpells::ActiveSpellParams params;
|
|
params.mId = id;
|
|
params.mDisplayName = name;
|
|
params.mCasterActorId = creatureStats.mActorId;
|
|
params.mType = ESM::ActiveSpells::Type_Enchantment;
|
|
params.mWorsenings = -1;
|
|
params.mNextWorsening = ESM::TimeStamp();
|
|
for (std::size_t effectIndex = 0;
|
|
effectIndex < oldMagnitudes.size() && effectIndex < enchantment->mEffects.mList.size(); ++effectIndex)
|
|
{
|
|
const auto& enam = enchantment->mEffects.mList[effectIndex];
|
|
auto [random, multiplier] = oldMagnitudes[effectIndex];
|
|
float magnitude = (enam.mMagnMax - enam.mMagnMin) * random + enam.mMagnMin;
|
|
magnitude *= multiplier;
|
|
if (magnitude <= 0)
|
|
continue;
|
|
ESM::ActiveEffect effect;
|
|
effect.mEffectId = enam.mEffectID;
|
|
effect.mMagnitude = magnitude;
|
|
effect.mMinMagnitude = magnitude;
|
|
effect.mMaxMagnitude = magnitude;
|
|
effect.mArg = MWMechanics::EffectKey(enam).mArg;
|
|
effect.mDuration = -1;
|
|
effect.mTimeLeft = -1;
|
|
effect.mEffectIndex = static_cast<int>(effectIndex);
|
|
// Prevent recalculation of resistances and don't reflect or absorb the effect
|
|
effect.mFlags = ESM::ActiveEffect::Flag_Ignore_Resistances | ESM::ActiveEffect::Flag_Ignore_Reflect
|
|
| ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
|
|
params.mEffects.emplace_back(effect);
|
|
}
|
|
auto [begin, end] = equippedItems.equal_range(id);
|
|
for (auto it = begin; it != end; ++it)
|
|
{
|
|
params.mItem = { static_cast<unsigned int>(it->second), 0 };
|
|
creatureStats.mActiveSpells.mSpells.emplace_back(params);
|
|
}
|
|
}
|
|
for (const auto& spell : creatureStats.mCorprusSpells)
|
|
{
|
|
auto it
|
|
= std::find_if(creatureStats.mActiveSpells.mSpells.begin(), creatureStats.mActiveSpells.mSpells.end(),
|
|
[&](const auto& params) { return params.mId == spell.first; });
|
|
if (it != creatureStats.mActiveSpells.mSpells.end())
|
|
{
|
|
it->mNextWorsening = spell.second.mNextWorsening;
|
|
int worsenings = 0;
|
|
for (int i = 0; i < ESM::Attribute::Length; ++i)
|
|
worsenings = std::max(spell.second.mWorsenings[i], worsenings);
|
|
it->mWorsenings = worsenings;
|
|
}
|
|
}
|
|
for (const auto& [key, actorId] : creatureStats.mSummonedCreatureMap)
|
|
{
|
|
if (actorId == -1)
|
|
continue;
|
|
for (auto& params : creatureStats.mActiveSpells.mSpells)
|
|
{
|
|
if (params.mId == key.mSourceId)
|
|
{
|
|
bool found = false;
|
|
for (auto& effect : params.mEffects)
|
|
{
|
|
if (effect.mEffectId == key.mEffectId && effect.mEffectIndex == key.mEffectIndex)
|
|
{
|
|
effect.mArg = actorId;
|
|
effect.mFlags |= ESM::ActiveEffect::Flag_Applied | ESM::ActiveEffect::Flag_Remove;
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
if (found)
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
// Reset modifiers that were previously recalculated each frame
|
|
for (std::size_t i = 0; i < ESM::Attribute::Length; ++i)
|
|
creatureStats.mAttributes[i].mMod = 0.f;
|
|
for (std::size_t i = 0; i < 3; ++i)
|
|
{
|
|
auto& dynamic = creatureStats.mDynamic[i];
|
|
dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
|
|
dynamic.mMod = 0.f;
|
|
}
|
|
for (std::size_t i = 0; i < 4; ++i)
|
|
creatureStats.mAiSettings[i].mMod = 0.f;
|
|
if (npcStats)
|
|
{
|
|
for (std::size_t i = 0; i < ESM::Skill::Length; ++i)
|
|
npcStats->mSkills[i].mMod = 0.f;
|
|
}
|
|
}
|
|
|
|
// Versions 17-19 wrote different modifiers to the savegame depending on whether the save had upgraded from a pre-17
|
|
// version or not
|
|
void convertStats(ESM::CreatureStats& creatureStats)
|
|
{
|
|
for (std::size_t i = 0; i < 3; ++i)
|
|
creatureStats.mDynamic[i].mMod = 0.f;
|
|
for (std::size_t i = 0; i < 4; ++i)
|
|
creatureStats.mAiSettings[i].mMod = 0.f;
|
|
}
|
|
}
|