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

vcmi: now obstacles can have disappearing anim

Browse Source 
It is a reverse version of appearingAnimation.
This commit is contained in:
Konstantin
2023-03-26 19:57:21 +03:00
parent 7543fdf787
commit eff41f66ed
8 changed files with 108 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/battle/CObstacleInstance.cpp
View File

@@ -86,6 +86,37 @@ bool CObstacleInstance::triggersEffects() const
return false;
}
void CObstacleInstance::serializeJson(JsonSerializeFormat & handler)
{
auto obstacleInfo = getInfo();
auto hidden = false;
auto needAnimationOffsetFix = obstacleType == CObstacleInstance::USUAL;
int animationYOffset = 0;
if(getInfo().blockedTiles.front() < 0) //TODO: holy ground ID=62,65,63
animationYOffset -= 42;
//We need only a subset of obstacle info for correct render
handler.serializeInt("position", pos);
handler.serializeString("appearSound", obstacleInfo.appearSound);
handler.serializeString("appearAnimation", obstacleInfo.appearAnimation);
handler.serializeString("animation", obstacleInfo.animation);
handler.serializeInt("animationYOffset", animationYOffset);
handler.serializeBool("hidden", hidden);
handler.serializeBool("needAnimationOffsetFix", needAnimationOffsetFix);
}
void CObstacleInstance::toInfo(ObstacleChanges & info, BattleChanges::EOperation operation)
{
info.id = uniqueID;
info.operation = operation;
info.data.clear();
JsonSerializer ser(nullptr, info.data);
ser.serializeStruct("obstacle", *this);
}
SpellCreatedObstacle::SpellCreatedObstacle()
: turnsRemaining(-1),
casterSpellPower(0),
@@ -131,16 +162,6 @@ bool SpellCreatedObstacle::triggersEffects() const
return trigger;
}
void SpellCreatedObstacle::toInfo(ObstacleChanges & info)
{
info.id = uniqueID;
info.operation = ObstacleChanges::EOperation::ADD;
info.data.clear();
JsonSerializer ser(nullptr, info.data);
ser.serializeStruct("obstacle", *this);
}
void SpellCreatedObstacle::fromInfo(const ObstacleChanges & info)
{
uniqueID = info.id;