1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

* WIP on event condition format

* Hero portrait serialization
* Fix town spells serialization

* Added support for float exponential part in Json
* Added support for int64 in Json
* Added basic Hero definitions serialization
* Added rumors serialization
* Advanced player info serialization.
* Added Disposed heroes serialization, (!) not covered with tests yet
* Added Local event serialization
* Added Pandoras box serialization
* Added Seer hut reward serialization
* Added CQuest serialization
* Added API for map object instance names serialization.
* Added random dwelling options serialization
* Advanced town options serialization
* Advanced hero options serialization
* More map format tests
* A lot of fixes, cleanup and refactoring
This commit is contained in:
AlexVinS
2016-11-13 13:38:42 +03:00
parent 5127061e28
commit a85b4cf2a5
70 changed files with 18728 additions and 687 deletions

View File

@@ -33,6 +33,8 @@ class DLL_LINKAGE ObjectTemplate
/// list of terrains on which this object can be placed
std::set<ETerrainType> allowedTerrains;
void afterLoadFixup();
public:
/// H3 ID/subID of this object
Obj id;
@@ -42,6 +44,9 @@ public:
/// animation file that should be used to display object
std::string animationFile;
/// map editor only animation file
std::string editorAnimationFile;
/// string ID, equals to def base name for h3m files (lower case, no extension) or specified in mod data
std::string stringID;
@@ -86,6 +91,10 @@ public:
{
h & usedTiles & allowedTerrains & animationFile & stringID;
h & id & subid & printPriority & visitDir;
if(version >= 770)
{
h & editorAnimationFile;
}
}
};