games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Unified CGameHandler::bulkMoveArtifacts and CGameHandler::bulkSwapArtifacts to one

Browse Source
This commit is contained in:
SoundSSGood
2022-11-10 19:09:37 +02:00
parent ad47a7573c
commit 30db38c0fe
3 changed files with 67 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
server/CGameHandler.cpp
View File

@ -3925,7 +3925,7 @@ bool CGameHandler::moveArtifact(const ArtifactLocation &al1, const ArtifactLocat
return true; return true;
} }
bool CGameHandler::bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID dstHero) bool CGameHandler::bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID dstHero, bool swap)
{ {
// Make sure exchange is even possible between the two heroes. // Make sure exchange is even possible between the two heroes.
if(!isAllowedExchange(srcHero, dstHero)) if(!isAllowedExchange(srcHero, dstHero))
@ -3933,60 +3933,14 @@ bool CGameHandler::bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID
auto psrcHero = getHero(srcHero); auto psrcHero = getHero(srcHero);
auto pdstHero = getHero(dstHero); auto pdstHero = getHero(dstHero);
BulkMoveArtifacts ma(static_cast<ConstTransitivePtr<CGHeroInstance>>(psrcHero), BulkMoveArtifacts ma(static_cast<ConstTransitivePtr<CGHeroInstance>>(psrcHero),
static_cast<ConstTransitivePtr<CGHeroInstance>>(pdstHero), false); static_cast<ConstTransitivePtr<CGHeroInstance>>(pdstHero), swap);
auto slots = &ma.artsPack0; auto & slotsSrcDst = ma.artsPack0;
auto & slotsDstSrc = ma.artsPack1;
// Temporary fitting set for artifacts. Used to select available slots before sending data. if(swap)
CArtifactFittingSet ArtFittingSet(pdstHero->bearerType());
ArtFittingSet.artifactsInBackpack = pdstHero->artifactsInBackpack;
ArtFittingSet.artifactsWorn = pdstHero->artifactsWorn;
// Move over artifacts that are worn
for(auto & artInfo : psrcHero->artifactsWorn)
{ {
if(ArtifactUtils::isArtRemovable(artInfo))
{
auto artifact = psrcHero->getArt(artInfo.first);
auto dstSlot = ArtifactUtils::getArtifactDstPosition(artifact, &ArtFittingSet, pdstHero->bearerType());
ArtFittingSet.putArtifact(dstSlot,
static_cast<ConstTransitivePtr<CArtifactInstance>>(psrcHero->getArt(artInfo.first)));
slots->push_back(BulkMoveArtifacts::LinkedSlots(artInfo.first, dstSlot));
if(ArtifactUtils::checkSpellbookIsNeeded(pdstHero, artifact->artType->id, dstSlot))
giveHeroNewArtifact(pdstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK);
}
}
// Move over artifacts that are in backpack
for(auto & slotInfo : psrcHero->artifactsInBackpack)
{
auto artifact = psrcHero->getArt(psrcHero->getArtPos(slotInfo.artifact));
auto dstSlot = ArtifactUtils::getArtifactDstPosition(artifact, &ArtFittingSet, pdstHero->bearerType());
ArtFittingSet.putArtifact(dstSlot, static_cast<ConstTransitivePtr<CArtifactInstance>>(slotInfo.artifact));
slots->push_back(BulkMoveArtifacts::LinkedSlots(psrcHero->getArtPos(slotInfo.artifact), dstSlot));
if(ArtifactUtils::checkSpellbookIsNeeded(pdstHero, artifact->artType->id, dstSlot))
giveHeroNewArtifact(pdstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK);
}
sendAndApply(&ma);
return true;
}
bool CGameHandler::bulkSwapArtifacts(ObjectInstanceID leftHero, ObjectInstanceID rightHero)
{
// Make sure exchange is even possible between the two heroes.
if(!isAllowedExchange(leftHero, rightHero))
COMPLAIN_RET("That heroes cannot make any exchange!");
auto pleftHero = getHero(leftHero);
auto prightHero = getHero(rightHero);
BulkMoveArtifacts ma(static_cast<ConstTransitivePtr<CGHeroInstance>>(pleftHero),
static_cast<ConstTransitivePtr<CGHeroInstance>>(prightHero), true);
ma.srcArtHolder = static_cast<ConstTransitivePtr<CGHeroInstance>>(prightHero);
ma.dstArtHolder = static_cast<ConstTransitivePtr<CGHeroInstance>>(pleftHero);
auto & slotsLeftRight = ma.artsPack0;
auto & slotsRightLeft = ma.artsPack1;
auto moveArtsWorn = [this](const CGHeroInstance * srcHero, const CGHeroInstance * dstHero, auto moveArtsWorn = [this](const CGHeroInstance * srcHero, const CGHeroInstance * dstHero,
std::vector<BulkMoveArtifacts::LinkedSlots> & slots) -> void std::vector<BulkMoveArtifacts::LinkedSlots> & slots) -> void
{ {
@ -4002,21 +3956,55 @@ bool CGameHandler::bulkSwapArtifacts(ObjectInstanceID leftHero, ObjectInstanceID
giveHeroNewArtifact(dstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK); giveHeroNewArtifact(dstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK);
} }
}; };
// Move over artifacts that are worn leftHero -> rightHero // Move over artifacts that are worn srcHero -> dstHero
moveArtsWorn(pleftHero, prightHero, slotsLeftRight); moveArtsWorn(psrcHero, pdstHero, slotsSrcDst);
// Move over artifacts that are worn rightHero -> leftHero // Move over artifacts that are worn dstHero -> srcHero
moveArtsWorn(prightHero, pleftHero, slotsRightLeft); moveArtsWorn(pdstHero, psrcHero, slotsDstSrc);
// Move over artifacts that are in backpack leftHero -> rightHero // Move over artifacts that are in backpack srcHero -> dstHero
for(auto & slotInfo : pleftHero->artifactsInBackpack) for(auto & slotInfo : psrcHero->artifactsInBackpack)
{ {
auto slot = pleftHero->getArtPos(slotInfo.artifact); auto slot = psrcHero->getArtPos(slotInfo.artifact);
slotsLeftRight.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot)); slotsSrcDst.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot));
} }
// Move over artifacts that are in backpack rightHero -> leftHero // Move over artifacts that are in backpack dstHero -> srcHero
for(auto & slotInfo : prightHero->artifactsInBackpack) for(auto & slotInfo : pdstHero->artifactsInBackpack)
{ {
auto slot = prightHero->getArtPos(slotInfo.artifact); auto slot = pdstHero->getArtPos(slotInfo.artifact);
slotsRightLeft.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot)); slotsDstSrc.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot));
}
}
else
{
auto & slots = ma.artsPack0;
// Temporary fitting set for artifacts. Used to select available slots before sending data.
CArtifactFittingSet ArtFittingSet(pdstHero->bearerType());
ArtFittingSet.artifactsInBackpack = pdstHero->artifactsInBackpack;
ArtFittingSet.artifactsWorn = pdstHero->artifactsWorn;
auto moveArtifact = [this, &ArtFittingSet, &slots](const CArtifactInstance * artifact,
ArtifactPosition srcSlot, const CGHeroInstance * pdstHero) -> void
{
auto dstSlot = ArtifactUtils::getArtifactDstPosition(artifact, &ArtFittingSet, pdstHero->bearerType());
ArtFittingSet.putArtifact(dstSlot, static_cast<ConstTransitivePtr<CArtifactInstance>>(artifact));
slots.push_back(BulkMoveArtifacts::LinkedSlots(srcSlot, dstSlot));
if(ArtifactUtils::checkSpellbookIsNeeded(pdstHero, artifact->artType->id, dstSlot))
giveHeroNewArtifact(pdstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK);
};
// Move over artifacts that are worn
for(auto & artInfo : psrcHero->artifactsWorn)
{
if(ArtifactUtils::isArtRemovable(artInfo))
{
moveArtifact(psrcHero->getArt(artInfo.first), artInfo.first, pdstHero);
}
}
// Move over artifacts that are in backpack
for(auto & slotInfo : psrcHero->artifactsInBackpack)
{
moveArtifact(psrcHero->getArt(psrcHero->getArtPos(slotInfo.artifact)), psrcHero->getArtPos(slotInfo.artifact), pdstHero);
}
} }
sendAndApply(&ma); sendAndApply(&ma);
return true; return true;

3
server/CGameHandler.h
View File

@ -181,8 +181,7 @@ public:
void putArtifact(const ArtifactLocation &al, const CArtifactInstance *a) override; void putArtifact(const ArtifactLocation &al, const CArtifactInstance *a) override;
void removeArtifact(const ArtifactLocation &al) override; void removeArtifact(const ArtifactLocation &al) override;
bool moveArtifact(const ArtifactLocation & al1, const ArtifactLocation & al2) override; bool moveArtifact(const ArtifactLocation & al1, const ArtifactLocation & al2) override;
bool bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID dstHero); bool bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID dstHero, bool swap);
bool bulkSwapArtifacts(ObjectInstanceID leftHero, ObjectInstanceID rightHero);
void synchronizeArtifactHandlerLists(); void synchronizeArtifactHandlerLists();
void showCompInfo(ShowInInfobox * comp) override; void showCompInfo(ShowInInfobox * comp) override;

5
server/NetPacksServer.cpp
View File

@ -184,10 +184,7 @@ bool BulkExchangeArtifacts::applyGh(CGameHandler * gh)
{ {
const CGHeroInstance * pSrcHero = gh->getHero(srcHero); const CGHeroInstance * pSrcHero = gh->getHero(srcHero);
throwOnWrongPlayer(gh, pSrcHero->getOwner()); throwOnWrongPlayer(gh, pSrcHero->getOwner());
if(swap) return gh->bulkMoveArtifacts(srcHero, dstHero, swap);
return gh->bulkSwapArtifacts(srcHero, dstHero);
else
return gh->bulkMoveArtifacts(srcHero, dstHero);
} }
bool AssembleArtifacts::applyGh(CGameHandler * gh) bool AssembleArtifacts::applyGh(CGameHandler * gh)