games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

BulkEraseArtifacts network pack

Browse Source
This commit is contained in:
SoundSSGood 2024-08-29 18:47:06 +03:00
parent 247be94015
commit e15ea4fc75
9 changed files with 68 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ClientNetPackVisitors.h
View File

@ -47,7 +47,7 @@ public:
void visitBulkRebalanceStacks(BulkRebalanceStacks & pack) override; void visitBulkRebalanceStacks(BulkRebalanceStacks & pack) override;
void visitBulkSmartRebalanceStacks(BulkSmartRebalanceStacks & pack) override; void visitBulkSmartRebalanceStacks(BulkSmartRebalanceStacks & pack) override;
void visitPutArtifact(PutArtifact & pack) override; void visitPutArtifact(PutArtifact & pack) override;
void visitEraseArtifact(EraseArtifact & pack) override; void visitEraseArtifact(BulkEraseArtifacts & pack) override;
void visitBulkMoveArtifacts(BulkMoveArtifacts & pack) override; void visitBulkMoveArtifacts(BulkMoveArtifacts & pack) override;
void visitAssembledArtifact(AssembledArtifact & pack) override; void visitAssembledArtifact(AssembledArtifact & pack) override;
void visitDisassembledArtifact(DisassembledArtifact & pack) override; void visitDisassembledArtifact(DisassembledArtifact & pack) override;

5
client/NetPacksClient.cpp
View File

@ -290,9 +290,10 @@ void ApplyClientNetPackVisitor::visitPutArtifact(PutArtifact & pack)
callInterfaceIfPresent(cl, cl.getOwner(pack.al.artHolder), &IGameEventsReceiver::askToAssembleArtifact, pack.al); callInterfaceIfPresent(cl, cl.getOwner(pack.al.artHolder), &IGameEventsReceiver::askToAssembleArtifact, pack.al);
} }
void ApplyClientNetPackVisitor::visitEraseArtifact(EraseArtifact & pack) void ApplyClientNetPackVisitor::visitEraseArtifact(BulkEraseArtifacts & pack)
{ {
callInterfaceIfPresent(cl, cl.getOwner(pack.al.artHolder), &IGameEventsReceiver::artifactRemoved, pack.al); for(const auto & slotErase : pack.posPack)
callInterfaceIfPresent(cl, cl.getOwner(pack.artHolder), &IGameEventsReceiver::artifactRemoved, ArtifactLocation(pack.artHolder, slotErase));
} }
void ApplyClientNetPackVisitor::visitBulkMoveArtifacts(BulkMoveArtifacts & pack) void ApplyClientNetPackVisitor::visitBulkMoveArtifacts(BulkMoveArtifacts & pack)

2
lib/networkPacks/NetPackVisitor.h
View File

@ -78,7 +78,7 @@ public:
virtual void visitBulkRebalanceStacks(BulkRebalanceStacks & pack) {} virtual void visitBulkRebalanceStacks(BulkRebalanceStacks & pack) {}
virtual void visitBulkSmartRebalanceStacks(BulkSmartRebalanceStacks & pack) {} virtual void visitBulkSmartRebalanceStacks(BulkSmartRebalanceStacks & pack) {}
virtual void visitPutArtifact(PutArtifact & pack) {} virtual void visitPutArtifact(PutArtifact & pack) {}
virtual void visitEraseArtifact(EraseArtifact & pack) {} virtual void visitEraseArtifact(BulkEraseArtifacts & pack) {}
virtual void visitBulkMoveArtifacts(BulkMoveArtifacts & pack) {} virtual void visitBulkMoveArtifacts(BulkMoveArtifacts & pack) {}
virtual void visitAssembledArtifact(AssembledArtifact & pack) {} virtual void visitAssembledArtifact(AssembledArtifact & pack) {}
virtual void visitDisassembledArtifact(DisassembledArtifact & pack) {} virtual void visitDisassembledArtifact(DisassembledArtifact & pack) {}

46
lib/networkPacks/NetPacksLib.cpp
View File

@ -336,7 +336,7 @@ void PutArtifact::visitTyped(ICPackVisitor & visitor)
visitor.visitPutArtifact(*this); visitor.visitPutArtifact(*this);
} }
void EraseArtifact::visitTyped(ICPackVisitor & visitor) void BulkEraseArtifacts::visitTyped(ICPackVisitor & visitor)
{ {
visitor.visitEraseArtifact(*this); visitor.visitEraseArtifact(*this);
} }
@ -1611,9 +1611,10 @@ void RebalanceStacks::applyGs(CGameState *gs)
//else - artifact can be lost :/ //else - artifact can be lost :/
else else
{ {
EraseArtifact ea; BulkEraseArtifacts ea;
ea.al = ArtifactLocation(dstHero->id, ArtifactPosition::CREATURE_SLOT); ea.artHolder = dstHero->id;
ea.al.creature = dst.slot; ea.posPack.emplace_back(ArtifactPosition::CREATURE_SLOT);
ea.creature = dst.slot;
ea.applyGs(gs); ea.applyGs(gs);
logNetwork->warn("Cannot move artifact! No free slots"); logNetwork->warn("Cannot move artifact! No free slots");
} }
@ -1701,21 +1702,29 @@ void PutArtifact::applyGs(CGameState *gs)
art->putAt(*hero, al.slot); art->putAt(*hero, al.slot);
} }
void EraseArtifact::applyGs(CGameState *gs) void BulkEraseArtifacts::applyGs(CGameState *gs)
{ {
const auto artSet = gs->getArtSet(al.artHolder); const auto artSet = gs->getArtSet(artHolder);
assert(artSet); assert(artSet);
const auto slot = artSet->getSlot(al.slot);
if(slot->locked)
{
logGlobal->debug("Erasing locked artifact: %s", slot->artifact->artType->getNameTranslated());
DisassembledArtifact dis;
dis.al.artHolder = al.artHolder;
for(auto & slotInfo : artSet->artifactsWorn) std::sort(posPack.begin(), posPack.end(), [](const ArtifactPosition & slot0, const ArtifactPosition & slot1) -> bool
{ {
auto art = slotInfo.second.artifact; return slot0.num > slot1.num;
if(art->isCombined() && art->isPart(slot->artifact)) });
for(const auto & slot : posPack)
{
const auto slotInfo = artSet->getSlot(slot);
if(slotInfo->locked)
{
logGlobal->debug("Erasing locked artifact: %s", slotInfo->artifact->artType->getNameTranslated());
DisassembledArtifact dis;
dis.al.artHolder = artHolder;
for(auto & slotInfoWorn : artSet->artifactsWorn)
{
auto art = slotInfoWorn.second.artifact;
if(art->isCombined() && art->isPart(slotInfo->getArt()))
{ {
dis.al.slot = artSet->getArtPos(art); dis.al.slot = artSet->getArtPos(art);
break; break;
@ -1727,11 +1736,12 @@ void EraseArtifact::applyGs(CGameState *gs)
} }
else else
{ {
logGlobal->debug("Erasing artifact %s", slot->artifact->artType->getNameTranslated()); logGlobal->debug("Erasing artifact %s", slotInfo->artifact->artType->getNameTranslated());
} }
auto art = artSet->getArt(al.slot); auto art = artSet->getArt(slot);
assert(art); assert(art);
art->removeFrom(*artSet, al.slot); art->removeFrom(*artSet, slot);
}
} }
void BulkMoveArtifacts::applyGs(CGameState *gs) void BulkMoveArtifacts::applyGs(CGameState *gs)

10
lib/networkPacks/PacksForClient.h
View File

@ -998,16 +998,20 @@ struct DLL_LINKAGE NewArtifact : public CArtifactOperationPack
} }
}; };
struct DLL_LINKAGE EraseArtifact : CArtifactOperationPack struct DLL_LINKAGE BulkEraseArtifacts : CArtifactOperationPack
{ {
ArtifactLocation al; ObjectInstanceID artHolder;
std::vector<ArtifactPosition> posPack;
std::optional<SlotID> creature;
void applyGs(CGameState * gs) override; void applyGs(CGameState * gs) override;
void visitTyped(ICPackVisitor & visitor) override; void visitTyped(ICPackVisitor & visitor) override;
template <typename Handler> void serialize(Handler & h) template <typename Handler> void serialize(Handler & h)
{ {
h & al; h & artHolder;
h & posPack;
h & creature;
} }
}; };

2
lib/serializer/RegisterTypes.h
View File

@ -223,7 +223,7 @@ void registerTypes(Serializer &s)
s.template registerType<InsertNewStack>(166); s.template registerType<InsertNewStack>(166);
s.template registerType<RebalanceStacks>(167); s.template registerType<RebalanceStacks>(167);
s.template registerType<PutArtifact>(169); s.template registerType<PutArtifact>(169);
s.template registerType<EraseArtifact>(170); s.template registerType<BulkEraseArtifacts>(170);
s.template registerType<AssembledArtifact>(171); s.template registerType<AssembledArtifact>(171);
s.template registerType<DisassembledArtifact>(172); s.template registerType<DisassembledArtifact>(172);
s.template registerType<BulkMoveArtifacts>(173); s.template registerType<BulkMoveArtifacts>(173);

16
server/CGameHandler.cpp
View File

@ -1191,8 +1191,14 @@ void CGameHandler::stopHeroVisitCastle(const CGTownInstance * obj, const CGHeroI
void CGameHandler::removeArtifact(const ArtifactLocation & al) void CGameHandler::removeArtifact(const ArtifactLocation & al)
{ {
EraseArtifact ea; removeArtifact(al.artHolder, {al.slot});
ea.al = al; }
void CGameHandler::removeArtifact(const ObjectInstanceID & srcId, const std::vector<ArtifactPosition> & slotsPack)
{
BulkEraseArtifacts ea;
ea.artHolder = srcId;
ea.posPack.insert(ea.posPack.end(), slotsPack.begin(), slotsPack.end());
sendAndApply(&ea); sendAndApply(&ea);
} }
@ -3491,8 +3497,10 @@ bool CGameHandler::sacrificeArtifact(const IMarket * market, const CGHeroInstanc
const auto artSet = market->getArtifactsStorage(); const auto artSet = market->getArtifactsStorage();
int expSum = 0; int expSum = 0;
auto finish = [this, &hero, &expSum]() std::vector<ArtifactPosition> artPack;
auto finish = [this, &hero, &expSum, &artPack, market]()
{ {
removeArtifact(market->getObjInstanceID(), artPack);
giveExperience(hero, hero->calculateXp(expSum)); giveExperience(hero, hero->calculateXp(expSum));
}; };
@ -3506,7 +3514,7 @@ bool CGameHandler::sacrificeArtifact(const IMarket * market, const CGHeroInstanc
int expToGive; int expToGive;
market->getOffer(art->getTypeId(), 0, dmp, expToGive, EMarketMode::ARTIFACT_EXP); market->getOffer(art->getTypeId(), 0, dmp, expToGive, EMarketMode::ARTIFACT_EXP);
expSum += expToGive; expSum += expToGive;
removeArtifact(ArtifactLocation(market->getObjInstanceID(), artSet->getArtPos(art))); artPack.push_back(artSet->getArtPos(art));
} }
else else
{ {

1
server/CGameHandler.h
View File

@ -136,6 +136,7 @@ public:
bool giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact * artType, ArtifactPosition pos = ArtifactPosition::FIRST_AVAILABLE) override; bool giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact * artType, ArtifactPosition pos = ArtifactPosition::FIRST_AVAILABLE) override;
bool putArtifact(const ArtifactLocation & al, const CArtifactInstance * art, std::optional<bool> askAssemble) override; bool putArtifact(const ArtifactLocation & al, const CArtifactInstance * art, std::optional<bool> askAssemble) override;
void removeArtifact(const ArtifactLocation &al) override; void removeArtifact(const ArtifactLocation &al) override;
void removeArtifact(const ObjectInstanceID & srcId, const std::vector<ArtifactPosition> & slotsPack);
bool moveArtifact(const PlayerColor & player, const ArtifactLocation & src, const ArtifactLocation & dst) override; bool moveArtifact(const PlayerColor & player, const ArtifactLocation & src, const ArtifactLocation & dst) override;
bool bulkMoveArtifacts(const PlayerColor & player, ObjectInstanceID srcId, ObjectInstanceID dstId, bool swap, bool equipped, bool backpack); bool bulkMoveArtifacts(const PlayerColor & player, ObjectInstanceID srcId, ObjectInstanceID dstId, bool swap, bool equipped, bool backpack);
bool scrollBackpackArtifacts(const PlayerColor & player, const ObjectInstanceID heroID, bool left); bool scrollBackpackArtifacts(const PlayerColor & player, const ObjectInstanceID heroID, bool left);