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

Merge branch 'charming_stats' into 'master'

Browse Source 
Third time's the charm

Closes #6611

See merge request OpenMW/openmw!1657
This commit is contained in:
psi29a 2022-02-14 20:33:07 +00:00
commit be761b5c07
6 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/stat.cpp
View File

@ -21,13 +21,13 @@ namespace MWMechanics
void Stat<T>::writeState (ESM::StatState<T>& state) const
{
state.mBase = mBase;
state.mMod = mModifier + mBase;
state.mMod = mModifier;
}
template<typename T>
void Stat<T>::readState (const ESM::StatState<T>& state)
{
mBase = state.mBase;
mModifier = state.mMod - mBase;
mModifier = state.mMod;
}

5
apps/openmw/mwworld/cellstore.cpp
View File

@ -185,6 +185,11 @@ namespace
else if constexpr (std::is_same_v<T, ESM::NPC>)
MWWorld::convertMagicEffects(state.mCreatureStats, state.mInventory, &state.mNpcStats);
}
else if(state.mVersion < 20)
{
if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
MWWorld::convertStats(state.mCreatureStats);
}
if (state.mRef.mRefNum.hasContentFile())
{

13
apps/openmw/mwworld/magiceffects.cpp
View File

@ -201,14 +201,23 @@ namespace MWWorld
{
auto& dynamic = creatureStats.mDynamic[i];
dynamic.mCurrent -= dynamic.mMod - dynamic.mBase;
dynamic.mMod = dynamic.mBase;
dynamic.mMod = 0.f;
}
for(std::size_t i = 0; i < 4; ++i)
creatureStats.mAiSettings[i].mMod = creatureStats.mAiSettings[i].mBase;
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;
}
}

2
apps/openmw/mwworld/magiceffects.hpp
View File

@ -12,6 +12,8 @@ namespace MWWorld
{
void convertMagicEffects(ESM::CreatureStats& creatureStats, ESM::InventoryState& inventory,
ESM::NpcStats* npcStats = nullptr);
void convertStats(ESM::CreatureStats& creatureStats);
}
#endif

2
apps/openmw/mwworld/player.cpp
View File

@ -383,6 +383,8 @@ namespace MWWorld
}
if (reader.getFormat() < 17)
convertMagicEffects(player.mObject.mCreatureStats, player.mObject.mInventory, &player.mObject.mNpcStats);
else if(reader.getFormat() < 20)
convertStats(player.mObject.mCreatureStats);
if (!player.mObject.mEnabled)
{

2
components/esm3/savedgame.cpp
View File

@ -4,7 +4,7 @@
#include "esmwriter.hpp"
unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
int ESM::SavedGame::sCurrentFormat = 19;
int ESM::SavedGame::sCurrentFormat = 20;
void ESM::SavedGame::load (ESMReader &esm)
{