games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge pull request #4225 from godric3/map-editor-town-configuration-improvements

Browse Source 
Map editor town configuration improvements (buildings, spells, events)
This commit is contained in:
Ivan Savenko
2024-08-09 15:26:33 +03:00
committed by GitHub
parent 1b6fd45aa7 e782d3984f
commit ffb8efc415
32 changed files with 4038 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/mapObjects/CGTownInstance.cpp
+6
View File
@@ -1221,6 +1221,12 @@ void CGTownInstance::serializeJsonOptions(JsonSerializeFormat & handler)
handler.serializeIdArray( "possibleSpells", possibleSpells);
handler.serializeIdArray( "obligatorySpells", obligatorySpells);
}
{
auto eventsHandler = handler.enterArray("events");
eventsHandler.syncSize(events, JsonNode::JsonType::DATA_VECTOR);
eventsHandler.serializeStruct(events);
}
}
FactionID CGTownInstance::getFaction() const
lib/mapObjects/CGTownInstance.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
std::vector<CGTownBuilding*> bonusingBuildings;
std::vector<SpellID> possibleSpells, obligatorySpells;
std::vector<std::vector<SpellID> > spells; //spells[level] -> vector of spells, first will be available in guild
std::list<CCastleEvent> events;
std::vector<CCastleEvent> events;
std::pair<si32, si32> bonusValue;//var to store town bonuses (rampart = resources from mystic pond);
//////////////////////////////////////////////////////////////////////////