mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-15 23:19:56 +00:00
f481c85e07
Previously, when recharging or repairing an item, the client sent a PlayerInventory packet to the server with the old version of the item that was supposed to be removed and then it sent a PlayerInventory packet with the new version of the item that was supposed to be added. Unfortunately, the current CoreScripts make it so custom items using generated IDs have their records deleted when they are completely removed from the world, however briefly, even if they are added back immediately afterwards. In practice, this meant that – before this commit – recharging or repairing a custom item led to its removal from the player inventory stored on the server, followed by the deletion of its record, followed by its readdition to the inventory (but with the record staying deleted). Logging out and logging back in immediately prevented the player from receiving the item anymore because of its now non-existent record.
140 lines
4.6 KiB
C++
140 lines
4.6 KiB
C++
#include "repair.hpp"
|
|
|
|
#include <boost/format.hpp>
|
|
|
|
#include <components/misc/rng.hpp>
|
|
|
|
/*
|
|
Start of tes3mp addition
|
|
|
|
Include additional headers for multiplayer purposes
|
|
*/
|
|
#include "../mwmp/Main.hpp"
|
|
#include "../mwmp/Networking.hpp"
|
|
#include "../mwmp/LocalPlayer.hpp"
|
|
#include "../mwmp/MechanicsHelper.hpp"
|
|
/*
|
|
End of tes3mp addition
|
|
*/
|
|
|
|
#include "../mwbase/world.hpp"
|
|
#include "../mwbase/environment.hpp"
|
|
#include "../mwbase/mechanicsmanager.hpp"
|
|
#include "../mwbase/windowmanager.hpp"
|
|
|
|
#include "../mwworld/containerstore.hpp"
|
|
#include "../mwworld/class.hpp"
|
|
#include "../mwworld/esmstore.hpp"
|
|
|
|
#include "creaturestats.hpp"
|
|
#include "npcstats.hpp"
|
|
#include "actorutil.hpp"
|
|
|
|
namespace MWMechanics
|
|
{
|
|
|
|
void Repair::repair(const MWWorld::Ptr &itemToRepair)
|
|
{
|
|
MWWorld::Ptr player = getPlayer();
|
|
MWWorld::LiveCellRef<ESM::Repair> *ref =
|
|
mTool.get<ESM::Repair>();
|
|
|
|
// unstack tool if required
|
|
player.getClass().getContainerStore(player).unstack(mTool, player);
|
|
|
|
// reduce number of uses left
|
|
int uses = mTool.getClass().getItemHealth(mTool);
|
|
mTool.getCellRef().setCharge(uses-1);
|
|
|
|
MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
|
|
MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats(player);
|
|
|
|
float fatigueTerm = stats.getFatigueTerm();
|
|
int pcStrength = stats.getAttribute(ESM::Attribute::Strength).getModified();
|
|
int pcLuck = stats.getAttribute(ESM::Attribute::Luck).getModified();
|
|
int armorerSkill = npcStats.getSkill(ESM::Skill::Armorer).getModified();
|
|
|
|
float fRepairAmountMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
|
|
.find("fRepairAmountMult")->getFloat();
|
|
|
|
float toolQuality = ref->mBase->mData.mQuality;
|
|
|
|
float x = (0.1f * pcStrength + 0.1f * pcLuck + armorerSkill) * fatigueTerm;
|
|
|
|
int roll = Misc::Rng::roll0to99();
|
|
if (roll <= x)
|
|
{
|
|
int y = static_cast<int>(fRepairAmountMult * toolQuality * roll);
|
|
y = std::max(1, y);
|
|
|
|
// repair by 'y' points
|
|
int charge = itemToRepair.getClass().getItemHealth(itemToRepair);
|
|
charge = std::min(charge + y, itemToRepair.getClass().getItemMaxHealth(itemToRepair));
|
|
|
|
/*
|
|
Start of tes3mp change (minor)
|
|
|
|
Send PlayerInventory packets that replace the original item with the new one
|
|
*/
|
|
mwmp::LocalPlayer *localPlayer = mwmp::Main::get().getLocalPlayer();
|
|
mwmp::Item removedItem = MechanicsHelper::getItem(itemToRepair, 1);
|
|
|
|
itemToRepair.getCellRef().setCharge(charge);
|
|
|
|
mwmp::Item addedItem = MechanicsHelper::getItem(itemToRepair, 1);
|
|
|
|
localPlayer->sendItemChange(addedItem, mwmp::InventoryChanges::ADD);
|
|
localPlayer->sendItemChange(removedItem, mwmp::InventoryChanges::REMOVE);
|
|
/*
|
|
End of tes3mp change (minor)
|
|
*/
|
|
|
|
// attempt to re-stack item, in case it was fully repaired
|
|
MWWorld::ContainerStoreIterator stacked = player.getClass().getContainerStore(player).restack(itemToRepair);
|
|
|
|
// set the OnPCRepair variable on the item's script
|
|
std::string script = stacked->getClass().getScript(itemToRepair);
|
|
if(script != "")
|
|
stacked->getRefData().getLocals().setVarByInt(script, "onpcrepair", 1);
|
|
|
|
// increase skill
|
|
player.getClass().skillUsageSucceeded(player, ESM::Skill::Armorer, 0);
|
|
|
|
MWBase::Environment::get().getWindowManager()->playSound("Repair");
|
|
MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairSuccess}");
|
|
}
|
|
else
|
|
{
|
|
MWBase::Environment::get().getWindowManager()->playSound("Repair Fail");
|
|
MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairFailed}");
|
|
}
|
|
|
|
// tool used up?
|
|
if (mTool.getCellRef().getCharge() == 0)
|
|
{
|
|
MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
|
|
|
|
store.remove(mTool, 1, player);
|
|
|
|
std::string message = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
|
|
.find("sNotifyMessage51")->getString();
|
|
|
|
MWBase::Environment::get().getWindowManager()->messageBox((boost::format(message) % mTool.getClass().getName(mTool)).str());
|
|
|
|
// try to find a new tool of the same ID
|
|
for (MWWorld::ContainerStoreIterator iter (store.begin());
|
|
iter!=store.end(); ++iter)
|
|
{
|
|
if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), mTool.getCellRef().getRefId()))
|
|
{
|
|
mTool = *iter;
|
|
|
|
MWBase::Environment::get().getWindowManager()->playSound("Item Repair Up");
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|