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

Advance triggered events serialization

Browse Source 
(-) missing indentifier serialization (unimplemented in engine)
(-) missing tests
This commit is contained in:
AlexVinS 2015-08-15 18:09:39 +03:00 committed by AlexVinS
parent 11af00bcdf
commit 27bf2524a3
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/LogicalExpression.h
View File

@ -262,7 +262,7 @@ namespace LogicalExpressionDetail
} }
}; };
/// Prints expression in human-readable format /// Serializes expression in JSON format. Part of map format.
template <typename ContainedClass> template <typename ContainedClass>
class Writer : public boost::static_visitor<JsonNode> class Writer : public boost::static_visitor<JsonNode>
{ {

41
lib/mapping/MapFormatJson.cpp
View File

@ -50,9 +50,38 @@ static EventCondition JsonToCondition(const JsonNode & node)
return event; return event;
} }
static void ConditionToJson(const EventCondition& event, JsonNode& dest) static JsonNode ConditionToJson(const EventCondition& event)
{ {
JsonNode json;
JsonVector& asVector = json.Vector();
JsonNode condition;
condition.String() = conditionNames.at(event.condition);
asVector.push_back(condition);
JsonNode data;
//todo: save identifier
if(event.value != -1)
data["value"].Float() = event.value;
if(event.position != int3(-1,-1,-1))
{
auto & position = data["position"].Vector();
JsonNode coord;
coord.Float() = event.position.x;
position.push_back(coord);
coord.Float() = event.position.y;
position.push_back(coord);
coord.Float() = event.position.z;
position.push_back(coord);
}
asVector.push_back(data);
return std::move(json);
} }
///CMapFormatJson ///CMapFormatJson
@ -98,10 +127,10 @@ void CMapFormatJson::writeTriggeredEvents(JsonNode& output)
output["defeatString"].String() = map->defeatMessage; output["defeatString"].String() = map->defeatMessage;
output["defeatIconIndex"].Float() = map->defeatIconIndex; output["defeatIconIndex"].Float() = map->defeatIconIndex;
// JsonMap & triggeredEvents = output["triggeredEvents"].Struct(); JsonMap & triggeredEvents = output["triggeredEvents"].Struct();
//
// for(auto event : map->triggeredEvents) for(auto event : map->triggeredEvents)
// writeTriggeredEvent(event, triggeredEvents[event.identifier]); writeTriggeredEvent(event, triggeredEvents[event.identifier]);
} }
void CMapFormatJson::writeTriggeredEvent(const TriggeredEvent& event, JsonNode& dest) void CMapFormatJson::writeTriggeredEvent(const TriggeredEvent& event, JsonNode& dest)
@ -112,7 +141,7 @@ void CMapFormatJson::writeTriggeredEvent(const TriggeredEvent& event, JsonNode&
dest["effect"]["type"].String() = typeNames.at(event.effect.type); dest["effect"]["type"].String() = typeNames.at(event.effect.type);
dest["effect"]["messageToSend"].String() = event.effect.toOtherMessage; dest["effect"]["messageToSend"].String() = event.effect.toOtherMessage;
dest["condition"] = event.trigger.toJson(ConditionToJson);
} }