teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Initial work on implementing corprus worsening effect

Browse source
This commit is contained in:
MiroslavR 2014-08-18 15:33:12 +02:00
parent 4e521d1aca
commit 3722c7adc3
3 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwmechanics/actors.cpp
View file

@ -477,6 +477,25 @@ namespace MWMechanics
creatureStats.setAttribute(i, stat);
}
{
Spells & spells = creatureStats.getSpells();
for (Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
{
if (spells.mCorprusSpells.find(it->first) != spells.mCorprusSpells.end())
{
const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(it->first);
if (MWBase::Environment::get().getWorld()->getTimeStamp() >= spells.mCorprusSpells[it->first].mNextWorsening)
{
spells.worsenCorprus(it->first);
if (ptr.getRefData().getHandle() == "player")
MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicCorprusWorsens}");
}
}
}
}
// dynamic stats
for(int i = 0;i < 3;++i)
{

37
apps/openmw/mwmechanics/spells.cpp
View file

@ -44,6 +44,25 @@ namespace MWMechanics
}
}
bool hasCorprusEffect = false;
for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
{
if (effectIt->mEffectID == ESM::MagicEffect::Corprus)
{
hasCorprusEffect = true;
break;
}
}
if (hasCorprusEffect)
{
CorprusStats corprus;
corprus.mWorsenings = 0;
corprus.mNextWorsening = MWBase::Environment::get().getWorld()->getTimeStamp() + CorprusStats::sWorseningPeriod;
mCorprusSpells[spellId] = corprus;
}
mSpells.insert (std::make_pair (Misc::StringUtils::lowerCase(spellId), random));
}
}
@ -52,10 +71,14 @@ namespace MWMechanics
{
std::string lower = Misc::StringUtils::lowerCase(spellId);
TContainer::iterator iter = mSpells.find (lower);
std::map<std::string, CorprusStats>::iterator corprusIt = mCorprusSpells.find(lower);
if (iter!=mSpells.end())
mSpells.erase (iter);
if (corprusIt != mCorprusSpells.end())
mCorprusSpells.erase(corprusIt);
if (spellId==mSelectedSpell)
mSelectedSpell.clear();
}
@ -81,6 +104,14 @@ namespace MWMechanics
if (iter->second.find(i) != iter->second.end())
random = iter->second.at(i);
int applyTimes = 1;
if (mCorprusSpells.find(spell->mId) != mCorprusSpells.end())
{
const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(spell->mEffects.mList.front().mEffectID);
if ((it->mEffectID != ESM::MagicEffect::Corprus) && (effect->mData.mFlags & ESM::MagicEffect::UncappedDamage)) // APPLIED_ONCE
applyTimes += mCorprusSpells.at(spell->mId).mWorsenings;
}
for (int j = 0; j < applyTimes; j++)
effects.add (*it, it->mMagnMin + (it->mMagnMax - it->mMagnMin) * random);
++i;
}
@ -216,6 +247,12 @@ namespace MWMechanics
}
}
void Spells::worsenCorprus(const std::string &corpSpellId)
{
mCorprusSpells[corpSpellId].mNextWorsening = MWBase::Environment::get().getWorld()->getTimeStamp() + CorprusStats::sWorseningPeriod;
mCorprusSpells[corpSpellId].mWorsenings++;
}
bool Spells::canUsePower(const std::string &power) const
{
std::map<std::string, MWWorld::TimeStamp>::const_iterator it = mUsedPowers.find(power);

12
apps/openmw/mwmechanics/spells.hpp
View file

@ -44,6 +44,18 @@ namespace MWMechanics
std::map<std::string, MWWorld::TimeStamp> mUsedPowers;
public:
struct CorprusStats
{
static const int sWorseningPeriod = 24;
int mWorsenings;
MWWorld::TimeStamp mNextWorsening;
};
std::map<std::string, CorprusStats> mCorprusSpells;
void worsenCorprus(const std::string &corpSpellId);
public:
bool canUsePower (const std::string& power) const;