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

[Client] Fix spell casting probability synchronization

Browse source
This commit is contained in:
David Cernat 2017-08-06 00:11:54 +03:00
parent 721b218cc2
commit 77ce05b7d6
3 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -917,14 +917,8 @@ namespace MWMechanics
/*
Start of tes3mp change (major)
Instead of checking whether the caster is a player or an NPC,
first check whether it's the LocalPlayer or a DedicatedPlayer and calculate
calculate the success chance in clients' LocalPlayer::prepareAttack()
TODO: Make this make sense for NPCs too
TODO: See if LocalPlayer being the target and having godmode on
can be accounted for like it is in OpenMW's corresponding code
Make spell casting fail based on the attack success rated determined
in LocalPlayer and LocalActor's updateAttack()
*/
mwmp::Attack *localAttack = NULL;
mwmp::Attack *dedicatedAttack = MechanicsHelper::getDedicatedAttack(mCaster);
@ -944,19 +938,9 @@ namespace MWMechanics
}
fail = true;
}
else if (!(mCaster == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState()))
/*
End of tes3mp change (major)
*/
{
float successChance = getSpellSuccessChance(spell, mCaster);
if (Misc::Rng::roll0to99() >= successChance)
{
if (mCaster == getPlayer())
MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicSkillFail}");
fail = true;
}
}
if (fail)
{

4
apps/openmw/mwmp/LocalActor.cpp
View file

@ -241,7 +241,9 @@ void LocalActor::updateAttack()
{
MWMechanics::CreatureStats &attackerStats = ptr.getClass().getCreatureStats(ptr);
attack.spellId = attackerStats.getSpells().getSelectedSpell();
attack.success = MechanicsHelper::getSpellSuccess(attack.spellId, ptr);
if (attack.pressed)
attack.success = MechanicsHelper::getSpellSuccess(attack.spellId, ptr);
}
mwmp::Main::get().getNetworking()->getActorList()->addAttackActor(*this);

4
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -525,7 +525,9 @@ void LocalPlayer::updateAttack()
if (attack.type == Attack::MAGIC)
{
attack.spellId = MWBase::Environment::get().getWindowManager()->getSelectedSpell();
attack.success = MechanicsHelper::getSpellSuccess(attack.spellId, getPlayerPtr());
if (attack.pressed)
attack.success = MechanicsHelper::getSpellSuccess(attack.spellId, getPlayerPtr());
}
getNetworking()->getPlayerPacket(ID_PLAYER_ATTACK)->setPlayer(this);