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

vcmi: fix logistics specialist movement regression

Browse Source 
There was incorrect calculations introduced earlier.
This commit is contained in:
Konstantin 2023-03-12 14:39:36 +03:00
parent 0adffc824f
commit 580268bfd4
6 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/defaultMods.json
View File

@ -83,15 +83,10 @@
"type" : "MOVEMENT", //Basic land movement
"subtype" : 1,
"val" : 1300,
"valueType" : "BASE_NUMBER"
},
{
"type" : "MOVEMENT", //Enable army movement bonus
"subtype" : 1,
"valueType" : "BASE_NUMBER",
"updater" : {
"type" : "ARMY_MOVEMENT",
"parameters" : [ 20, 3, 10, 700]
"type" : "ARMY_MOVEMENT", //Enable army movement bonus
"parameters" : [20, 3, 10, 700]
}
},
{

9
lib/CPathfinder.cpp
View File

@ -1014,8 +1014,11 @@ TurnInfo::BonusCache::BonusCache(TConstBonusListPtr bl)
pathfindingVal = bl->valOfBonuses(Selector::type()(Bonus::ROUGH_TERRAIN_DISCOUNT));
}
TurnInfo::TurnInfo(const CGHeroInstance * Hero, const int turn)
: hero(Hero), maxMovePointsLand(-1), maxMovePointsWater(-1)
TurnInfo::TurnInfo(const CGHeroInstance * Hero, const int turn):
hero(Hero),
maxMovePointsLand(-1),
maxMovePointsWater(-1),
turn(turn)
{
bonuses = hero->getAllBonuses(Selector::days(turn), Selector::all, nullptr, "");
bonusCache = std::make_unique<BonusCache>(bonuses);
@ -1104,7 +1107,7 @@ void TurnInfo::updateHeroBonuses(Bonus::BonusType type, const CSelector& sel) co
bonusCache->pathfindingVal = bonuses->valOfBonuses(Selector::type()(Bonus::ROUGH_TERRAIN_DISCOUNT));
break;
default:
bonuses = hero->getUpdatedBonusList(*bonuses, Selector::type()(type).And(sel));
bonuses = hero->getAllBonuses(Selector::days(turn), Selector::all, nullptr, "");
}
}

1
lib/CPathfinder.h
View File

@ -529,6 +529,7 @@ struct DLL_LINKAGE TurnInfo
mutable int maxMovePointsLand;
mutable int maxMovePointsWater;
TerrainId nativeTerrain;
int turn;
TurnInfo(const CGHeroInstance * Hero, const int Turn = 0);
bool isLayerAvailable(const EPathfindingLayer layer) const;

28
lib/HeroBonus.cpp
View File

@ -960,7 +960,7 @@ void CBonusSystemNode::getAllParents(TCNodes & out) const //retrieves list of pa
}
}
void CBonusSystemNode::getAllBonusesRec(BonusList &out) const
void CBonusSystemNode::getAllBonusesRec(BonusList &out, const CSelector & selector) const
{
//out has been reserved sufficient capacity at getAllBonuses() call
@ -980,13 +980,14 @@ void CBonusSystemNode::getAllBonusesRec(BonusList &out) const
for (auto parent : lparents)
{
parent->getAllBonusesRec(beforeUpdate);
parent->getAllBonusesRec(beforeUpdate, selector);
}
bonuses.getAllBonuses(beforeUpdate);
for(const auto & b : beforeUpdate)
{
auto updated = b->updater
//We should not run updaters on non-selected bonuses
auto updated = selector(b.get()) && b->updater
? getUpdatedBonus(b, b->updater)
: b;
@ -1023,7 +1024,7 @@ TConstBonusListPtr CBonusSystemNode::getAllBonuses(const CSelector &selector, co
cachedBonuses.clear();
cachedRequests.clear();
getAllBonusesRec(allBonuses);
getAllBonusesRec(allBonuses, Selector::all);
limitBonuses(allBonuses, cachedBonuses);
cachedBonuses.stackBonuses();
@ -1065,7 +1066,7 @@ TConstBonusListPtr CBonusSystemNode::getAllBonusesWithoutCaching(const CSelector
// Get bonus results without caching enabled.
BonusList beforeLimiting, afterLimiting;
getAllBonusesRec(beforeLimiting);
getAllBonusesRec(beforeLimiting, selector);
if(!root || root == this)
{
@ -1076,7 +1077,7 @@ TConstBonusListPtr CBonusSystemNode::getAllBonusesWithoutCaching(const CSelector
//We want to limit our query against an external node. We get all its bonuses,
// add the ones we're considering and see if they're cut out by limiters
BonusList rootBonuses, limitedRootBonuses;
getAllBonusesRec(rootBonuses);
getAllBonusesRec(rootBonuses, selector);
for(auto b : beforeLimiting)
rootBonuses.push_back(b);
@ -1099,19 +1100,6 @@ std::shared_ptr<Bonus> CBonusSystemNode::getUpdatedBonus(const std::shared_ptr<B
return updater->createUpdatedBonus(b, * this);
}
TConstBonusListPtr CBonusSystemNode::getUpdatedBonusList(const BonusList & out, const CSelector & sel) const
{
auto ret = std::make_shared<BonusList>();
for(const auto & b : out)
{
if(sel(b.get()) && b->updater)
ret->push_back(getUpdatedBonus(b, b->updater));
else
ret->push_back(b);
}
return ret;
}
CBonusSystemNode::CBonusSystemNode()
:CBonusSystemNode(false)
{
@ -2788,7 +2776,7 @@ std::shared_ptr<Bonus> ArmyMovementUpdater::createUpdatedBonus(const std::shared
auto counted = armySpeed * multiplier;
auto newBonus = std::make_shared<Bonus>(*b);
newBonus->source = Bonus::ARMY;
newBonus->val = vstd::amin(counted, max);
newBonus->val += vstd::amin(counted, max);
return newBonus;
}
if(b->type != Bonus::MOVEMENT)

3
lib/HeroBonus.h
View File

@ -789,7 +789,7 @@ private:
mutable std::map<std::string, TBonusListPtr > cachedRequests;
mutable boost::mutex sync;
void getAllBonusesRec(BonusList &out) const;
void getAllBonusesRec(BonusList &out, const CSelector & selector) const;
TConstBonusListPtr getAllBonusesWithoutCaching(const CSelector &selector, const CSelector &limit, const CBonusSystemNode *root = nullptr) const;
std::shared_ptr<Bonus> getUpdatedBonus(const std::shared_ptr<Bonus> & b, const TUpdaterPtr updater) const;
@ -805,7 +805,6 @@ public:
TConstBonusListPtr getAllBonuses(const CSelector &selector, const CSelector &limit, const CBonusSystemNode *root = nullptr, const std::string &cachingStr = "") const override;
void getParents(TCNodes &out) const; //retrieves list of parent nodes (nodes to inherit bonuses from),
std::shared_ptr<const Bonus> getBonusLocalFirst(const CSelector & selector) const;
TConstBonusListPtr getUpdatedBonusList(const BonusList& out, const CSelector &sel) const; //update bonuses in list with builtin updaters, passes this as context
//non-const interface
void getParents(TNodes &out); //retrieves list of parent nodes (nodes to inherit bonuses from)

4
lib/mapObjects/CGHeroInstance.cpp
View File

@ -199,7 +199,9 @@ void CGHeroInstance::updateArmyMovementBonus(bool onLand, const TurnInfo * ti) c
if(lowestCreatureSpeed != realLowestSpeed)
{
lowestCreatureSpeed = realLowestSpeed;
ti->updateHeroBonuses(Bonus::MOVEMENT, Selector::subtype()(!!onLand).And(Selector::sourceTypeSel(Bonus::ARMY)));
//Let updaters run again
treeHasChanged();
ti->updateHeroBonuses(Bonus::MOVEMENT, Selector::subtype()(!!onLand));
}
}