mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-20 20:23:03 +02:00
0b70baa95e
* Indirect spell effects loading * Json serializer improvements * spell->canBeCastAt do not allow useless cast for any spell * Added proxy caster class for spell-created obstacles * Handle damage from spell-created obstacles inside mechanics * Experimental GameState integration/regression tests * Ignore mod settings and load only "vcmi" mod when running tests * fixed https://bugs.vcmi.eu/view.php?id=2765 (with tests) * Huge improvements of BattleAI regarding spell casts * AI can cast almost any combat spell except TELEPORT, SACRIFICE and obstacle placement spells. * Possible fix for https://bugs.vcmi.eu/view.php?id=1811 * CStack factored out to several classes * [Battle] Allowed RETURN_AFTER_STRIKE effect on server side to be optional * [Battle] Allowed BattleAction have multiple destinations * [Spells] Converted limit|immunity to target condition * [Spells] Use partial configuration reload for backward compatibility handling * [Tests] Started tests for CUnitState * Partial fixes of fire shield effect * [Battle] Do HP calculations in 64 bits * [BattleAI] Use threading for spell cast evaluation * [BattleAI] Made AI be able to evaluate modified turn order (on hypothetical battle state) * Implemented https://bugs.vcmi.eu/view.php?id=2811 * plug rare freeze when hypnotized unit shots vertically * Correctly apply ONLY_MELEE_FIGHT / ONLY_DISTANCE_FIGHT for unit damage, attack & defense * [BattleAI] Try to not waste a cast if battle is actually won already * Extended JsonSerializeFormat API * fixed https://bugs.vcmi.eu/view.php?id=2847 * Any unit effect can be now chained (not only damage like Chain Lightning) ** only damage effect for now actually uses "chainFactor" * Possible quick fix for https://bugs.vcmi.eu/view.php?id=2860
270 lines
6.8 KiB
C++
270 lines
6.8 KiB
C++
/*
|
|
* JsonDeserializer.cpp, part of VCMI engine
|
|
*
|
|
* Authors: listed in file AUTHORS in main folder
|
|
*
|
|
* License: GNU General Public License v2.0 or later
|
|
* Full text of license available in license.txt file, in main folder
|
|
*
|
|
*/
|
|
#include "StdInc.h"
|
|
#include "JsonDeserializer.h"
|
|
|
|
#include "../JsonNode.h"
|
|
|
|
JsonDeserializer::JsonDeserializer(const IInstanceResolver * instanceResolver_, const JsonNode & root_):
|
|
JsonTreeSerializer(instanceResolver_, &root_, false)
|
|
{
|
|
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(const std::string & fieldName, boost::logic::tribool & value)
|
|
{
|
|
const JsonNode & data = currentObject->operator[](fieldName);
|
|
if(data.getType() != JsonNode::JsonType::DATA_BOOL)
|
|
value = boost::logic::indeterminate;
|
|
else
|
|
value = data.Bool();
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(const std::string & fieldName, si32 & value, const boost::optional<si32> & defaultValue, const TDecoder & decoder, const TEncoder & encoder)
|
|
{
|
|
std::string identifier;
|
|
serializeString(fieldName, identifier);
|
|
|
|
value = defaultValue ? defaultValue.get() : 0;
|
|
|
|
if(identifier != "")
|
|
{
|
|
si32 rawId = decoder(identifier);
|
|
if(rawId >= 0)
|
|
value = rawId;
|
|
}
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(const std::string & fieldName, std::vector<si32> & value, const TDecoder & decoder, const TEncoder & encoder)
|
|
{
|
|
const JsonVector & data = currentObject->operator[](fieldName).Vector();
|
|
|
|
value.clear();
|
|
value.reserve(data.size());
|
|
|
|
for(const JsonNode elem : data)
|
|
{
|
|
si32 rawId = decoder(elem.String());
|
|
|
|
if(rawId >= 0)
|
|
value.push_back(rawId);
|
|
}
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(const std::string & fieldName, double & value, const boost::optional<double> & defaultValue)
|
|
{
|
|
const JsonNode & data = currentObject->operator[](fieldName);
|
|
|
|
if(!data.isNumber())
|
|
value = defaultValue ? defaultValue.get() : 0;//todo: report error on not null?
|
|
else
|
|
value = data.Float();
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(const std::string & fieldName, si64 & value, const boost::optional<si64> & defaultValue)
|
|
{
|
|
const JsonNode & data = currentObject->operator[](fieldName);
|
|
|
|
if(!data.isNumber())
|
|
value = defaultValue ? defaultValue.get() : 0;//todo: report error on not null?
|
|
else
|
|
value = data.Integer();
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(const std::string & fieldName, si32 & value, const boost::optional<si32> & defaultValue, const std::vector<std::string> & enumMap)
|
|
{
|
|
const std::string & valueName = currentObject->operator[](fieldName).String();
|
|
|
|
const si32 actualOptional = defaultValue ? defaultValue.get() : 0;
|
|
|
|
si32 rawValue = vstd::find_pos(enumMap, valueName);
|
|
if(rawValue < 0)
|
|
value = actualOptional;
|
|
else
|
|
value = rawValue;
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(std::string & value)
|
|
{
|
|
value = currentObject->String();
|
|
}
|
|
|
|
void JsonDeserializer::serializeInternal(int64_t & value)
|
|
{
|
|
value = currentObject->Integer();
|
|
}
|
|
|
|
void JsonDeserializer::serializeLIC(const std::string & fieldName, const TDecoder & decoder, const TEncoder & encoder, const std::vector<bool> & standard, std::vector<bool> & value)
|
|
{
|
|
const JsonNode & field = currentObject->operator[](fieldName);
|
|
|
|
const JsonNode & anyOf = field["anyOf"];
|
|
const JsonNode & allOf = field["allOf"];
|
|
const JsonNode & noneOf = field["noneOf"];
|
|
|
|
if(anyOf.Vector().empty() && allOf.Vector().empty())
|
|
{
|
|
//permissive mode
|
|
value = standard;
|
|
}
|
|
else
|
|
{
|
|
//restrictive mode
|
|
value.clear();
|
|
value.resize(standard.size(), false);
|
|
|
|
readLICPart(anyOf, decoder, true, value);
|
|
readLICPart(allOf, decoder, true, value);
|
|
}
|
|
|
|
readLICPart(noneOf, decoder, false, value);
|
|
}
|
|
|
|
void JsonDeserializer::serializeLIC(const std::string & fieldName, LIC & value)
|
|
{
|
|
const JsonNode & field = currentObject->operator[](fieldName);
|
|
|
|
const JsonNode & anyOf = field["anyOf"];
|
|
const JsonNode & allOf = field["allOf"];
|
|
const JsonNode & noneOf = field["noneOf"];
|
|
|
|
if(anyOf.Vector().empty())
|
|
{
|
|
//permissive mode
|
|
value.any = value.standard;
|
|
}
|
|
else
|
|
{
|
|
//restrictive mode
|
|
value.any.clear();
|
|
value.any.resize(value.standard.size(), false);
|
|
|
|
readLICPart(anyOf, value.decoder, true, value.any);
|
|
}
|
|
|
|
readLICPart(allOf, value.decoder, true, value.all);
|
|
readLICPart(noneOf, value.decoder, true, value.none);
|
|
|
|
//remove any banned from allowed and required
|
|
for(si32 idx = 0; idx < value.none.size(); idx++)
|
|
{
|
|
if(value.none[idx])
|
|
{
|
|
value.all[idx] = false;
|
|
value.any[idx] = false;
|
|
}
|
|
}
|
|
|
|
//add all required to allowed
|
|
for(si32 idx = 0; idx < value.all.size(); idx++)
|
|
{
|
|
if(value.all[idx])
|
|
{
|
|
value.any[idx] = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
void JsonDeserializer::serializeLIC(const std::string & fieldName, LICSet & value)
|
|
{
|
|
const JsonNode & field = currentObject->operator[](fieldName);
|
|
|
|
const JsonNode & anyOf = field["anyOf"];
|
|
const JsonNode & allOf = field["allOf"];
|
|
const JsonNode & noneOf = field["noneOf"];
|
|
|
|
value.all.clear();
|
|
value.none.clear();
|
|
|
|
if(anyOf.Vector().empty())
|
|
{
|
|
//permissive mode
|
|
value.any = value.standard;
|
|
}
|
|
else
|
|
{
|
|
//restrictive mode
|
|
value.any.clear();
|
|
readLICPart(anyOf, value.decoder, value.any);
|
|
|
|
for(si32 item : value.standard)
|
|
if(!vstd::contains(value.any, item))
|
|
value.none.insert(item);
|
|
}
|
|
|
|
readLICPart(allOf, value.decoder, value.all);
|
|
readLICPart(noneOf, value.decoder, value.none);
|
|
|
|
//remove any banned from allowed and required
|
|
auto isBanned = [&value](const si32 item)->bool
|
|
{
|
|
return vstd::contains(value.none, item);
|
|
};
|
|
vstd::erase_if(value.all, isBanned);
|
|
vstd::erase_if(value.any, isBanned);
|
|
|
|
//add all required to allowed
|
|
for(si32 item : value.all)
|
|
{
|
|
value.any.insert(item);
|
|
}
|
|
}
|
|
|
|
void JsonDeserializer::serializeString(const std::string & fieldName, std::string & value)
|
|
{
|
|
value = currentObject->operator[](fieldName).String();
|
|
}
|
|
|
|
void JsonDeserializer::serializeRaw(const std::string & fieldName, JsonNode & value, const boost::optional<const JsonNode &> defaultValue)
|
|
{
|
|
const JsonNode & data = currentObject->operator[](fieldName);
|
|
if(data.getType() == JsonNode::JsonType::DATA_NULL)
|
|
{
|
|
if(defaultValue)
|
|
value = defaultValue.get();
|
|
else
|
|
value.clear();
|
|
}
|
|
else
|
|
{
|
|
value = data;
|
|
}
|
|
}
|
|
|
|
void JsonDeserializer::readLICPart(const JsonNode & part, const TDecoder & decoder, const bool val, std::vector<bool> & value)
|
|
{
|
|
for(size_t index = 0; index < part.Vector().size(); index++)
|
|
{
|
|
const std::string & identifier = part.Vector()[index].String();
|
|
|
|
const si32 rawId = decoder(identifier);
|
|
if(rawId >= 0)
|
|
{
|
|
if(rawId < value.size())
|
|
value[rawId] = val;
|
|
else
|
|
logGlobal->error("JsonDeserializer::serializeLIC: id out of bounds %d", rawId);
|
|
}
|
|
}
|
|
}
|
|
|
|
void JsonDeserializer::readLICPart(const JsonNode & part, const TDecoder & decoder, std::set<si32> & value)
|
|
{
|
|
for(size_t index = 0; index < part.Vector().size(); index++)
|
|
{
|
|
const std::string & identifier = part.Vector()[index].String();
|
|
|
|
const si32 rawId = decoder(identifier);
|
|
if(rawId != -1)
|
|
value.insert(rawId);
|
|
}
|
|
}
|
|
|