games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Improvements to bonus system node types / propagators

Browse Source 
- Node type is now set on construction and never changes
- Added army propagator that also checks for TOWN and HERO
- Renamed existing propagators to be in sync with enumeration
This commit is contained in:
Ivan Savenko
2025-06-25 17:34:20 +03:00
parent 099053437a
commit 6ac57a7cfc
31 changed files with 145 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/bonuses/Propagators.cpp
View File

@@ -16,37 +16,51 @@ VCMI_LIB_NAMESPACE_BEGIN
const std::map<std::string, TPropagatorPtr> bonusPropagatorMap =
{
{"BATTLE_WIDE", std::make_shared<CPropagatorNodeType>(CBonusSystemNode::BATTLE)},
{"VISITED_TOWN_AND_VISITOR", std::make_shared<CPropagatorNodeType>(CBonusSystemNode::TOWN_AND_VISITOR)},
{"PLAYER_PROPAGATOR", std::make_shared<CPropagatorNodeType>(CBonusSystemNode::PLAYER)},
{"HERO", std::make_shared<CPropagatorNodeType>(CBonusSystemNode::HERO)},
{"TEAM_PROPAGATOR", std::make_shared<CPropagatorNodeType>(CBonusSystemNode::TEAM)}, //untested
{"GLOBAL_EFFECT", std::make_shared<CPropagatorNodeType>(CBonusSystemNode::GLOBAL_EFFECTS)}
}; //untested
{"BATTLE_WIDE", std::make_shared<CPropagatorNodeType>(BonusNodeType::BATTLE_WIDE)},
{"TOWN_AND_VISITOR", std::make_shared<CPropagatorNodeType>(BonusNodeType::TOWN_AND_VISITOR)},
{"PLAYER", std::make_shared<CPropagatorNodeType>(BonusNodeType::PLAYER)},
{"HERO", std::make_shared<CPropagatorNodeType>(BonusNodeType::HERO)},
{"TOWN", std::make_shared<CPropagatorNodeType>(BonusNodeType::TOWN)},
{"ARMY", std::make_shared<CPropagatorNodeType>(BonusNodeType::ARMY)},
{"TEAM", std::make_shared<CPropagatorNodeType>(BonusNodeType::TEAM)},
{"GLOBAL_EFFECT", std::make_shared<CPropagatorNodeType>(BonusNodeType::GLOBAL_EFFECTS)},
// deprecated, for compatibility
{"VISITED_TOWN_AND_VISITOR", std::make_shared<CPropagatorNodeType>(BonusNodeType::TOWN_AND_VISITOR)},
{"PLAYER_PROPAGATOR", std::make_shared<CPropagatorNodeType>(BonusNodeType::PLAYER)},
{"TEAM_PROPAGATOR", std::make_shared<CPropagatorNodeType>(BonusNodeType::TEAM)},
};
bool IPropagator::shouldBeAttached(CBonusSystemNode *dest) const
{
return false;
}
CBonusSystemNode::ENodeTypes IPropagator::getPropagatorType() const
BonusNodeType IPropagator::getPropagatorType() const
{
return CBonusSystemNode::ENodeTypes::NONE;
return BonusNodeType::NONE;
}
CPropagatorNodeType::CPropagatorNodeType(CBonusSystemNode::ENodeTypes NodeType)
CPropagatorNodeType::CPropagatorNodeType(BonusNodeType NodeType)
: nodeType(NodeType)
{
}
CBonusSystemNode::ENodeTypes CPropagatorNodeType::getPropagatorType() const
BonusNodeType CPropagatorNodeType::getPropagatorType() const
{
return nodeType;
}
bool CPropagatorNodeType::shouldBeAttached(CBonusSystemNode *dest) const
{
return nodeType == dest->getNodeType();
if (nodeType == dest->getNodeType())
return true;
if (nodeType == BonusNodeType::ARMY)
return dest->getNodeType() == BonusNodeType::HERO || dest->getNodeType() == BonusNodeType::TOWN;
return false;
}
VCMI_LIB_NAMESPACE_END