1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00

Entities redesign and a few ERM features

* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
This commit is contained in:
AlexVinS
2018-03-17 17:58:30 +03:00
committed by AlexVinS
parent 11bb46780a
commit ecaa9f5d0b
475 changed files with 22491 additions and 7123 deletions
.travis.yml
AI
CCallback.cppCCallback.h
CI
CMakeLists.txtGlobal.h
Mods/vcmi/Data/s
client
cmake_modules
config
include
lib
CArtHandler.cppCArtHandler.hCCreatureHandler.cppCCreatureHandler.hCCreatureSet.cppCCreatureSet.hCGameInfoCallback.cppCGameInfoCallback.hCGameInterface.cppCGameInterface.hCGameState.cppCGameState.hCGameStateFwd.hCHeroHandler.cppCHeroHandler.hCMakeLists.txtCModHandler.cppCPathfinder.cppCPlayerState.cppCPlayerState.hCScriptingModule.cppCScriptingModule.hCSkillHandler.cppCSkillHandler.hCStack.cppCStack.hCThreadHelper.hCTownHandler.cppCTownHandler.hGameConstants.cppGameConstants.hHeroBonus.cppHeroBonus.hIGameCallback.cppIGameCallback.hIGameEventsReceiver.hIHandlerBase.hJsonNode.cppNetPacks.hNetPacksBase.hNetPacksLib.cppScriptHandler.cppScriptHandler.hVCMI_Lib.cppVCMI_Lib.hVCMI_lib.cbp
abilities
battle
events
filesystem
mapObjects
mapping
registerTypes
rmg
serializer
spells
vstd
osx
scripting
scripts/lib
server
test
CMakeLists.txtCVcmiTestConfig.cppJsonComparer.cppTest.cbp
battle
entity
erm
events
game
mock
netpacks
scripting
serializer
spells
testdata
vcai
vcmi.workspace

@ -126,9 +126,9 @@ std::shared_ptr<CBattleGameInterface> CDynLibHandler::getNewBattleAI(std::string
return createAnyAI<CBattleGameInterface>(dllname, "GetNewBattleAI");
}
std::shared_ptr<CScriptingModule> CDynLibHandler::getNewScriptingModule(std::string dllname)
std::shared_ptr<scripting::Module> CDynLibHandler::getNewScriptingModule(const boost::filesystem::path & dllname)
{
return createAny<CScriptingModule>(dllname, "GetNewModule");
return createAny<scripting::Module>(dllname, "GetNewModule");
}
BattleAction CGlobalAI::activeStack(const CStack * stack)
@ -160,13 +160,13 @@ void CAdventureAI::battleStart(const CCreatureSet * army1, const CCreatureSet *
assert(!battleAI);
assert(cbc);
battleAI = CDynLibHandler::getNewBattleAI(getBattleAIName());
battleAI->init(cbc);
battleAI->init(env, cbc);
battleAI->battleStart(army1, army2, tile, hero1, hero2, side);
}
void CAdventureAI::battleStacksAttacked(const std::vector<BattleStackAttacked> & bsa, const std::vector<MetaString> & battleLog)
void CAdventureAI::battleStacksAttacked(const std::vector<BattleStackAttacked> & bsa)
{
battleAI->battleStacksAttacked(bsa, battleLog);
battleAI->battleStacksAttacked(bsa);
}
void CAdventureAI::actionStarted(const BattleAction & action)
@ -215,9 +215,9 @@ void CAdventureAI::battleEnd(const BattleResult * br)
battleAI.reset();
}
void CAdventureAI::battleUnitsChanged(const std::vector<UnitChanges> & units, const std::vector<CustomEffectInfo> & customEffects, const std::vector<MetaString> & battleLog)
void CAdventureAI::battleUnitsChanged(const std::vector<UnitChanges> & units, const std::vector<CustomEffectInfo> & customEffects)
{
battleAI->battleUnitsChanged(units, customEffects, battleLog);
battleAI->battleUnitsChanged(units, customEffects);
}
BattleAction CAdventureAI::activeStack(const CStack * stack)
@ -233,20 +233,17 @@ void CAdventureAI::yourTacticPhase(int distance)
void CAdventureAI::saveGame(BinarySerializer & h, const int version) /*saving */
{
LOG_TRACE_PARAMS(logAi, "version '%i'", version);
CGlobalAI::saveGame(h, version);
bool hasBattleAI = static_cast<bool>(battleAI);
h & hasBattleAI;
if(hasBattleAI)
{
h & std::string(battleAI->dllName);
battleAI->saveGame(h, version);
h & battleAI->dllName;
}
}
void CAdventureAI::loadGame(BinaryDeserializer & h, const int version) /*loading */
{
LOG_TRACE_PARAMS(logAi, "version '%i'", version);
CGlobalAI::loadGame(h, version);
bool hasBattleAI = false;
h & hasBattleAI;
if(hasBattleAI)
@ -255,15 +252,6 @@ void CAdventureAI::loadGame(BinaryDeserializer & h, const int version) /*loading
h & dllName;
battleAI = CDynLibHandler::getNewBattleAI(dllName);
assert(cbc); //it should have been set by the one who new'ed us
battleAI->init(cbc);
//battleAI->loadGame(h, version);
battleAI->init(env, cbc);
}
}
void CBattleGameInterface::saveGame(BinarySerializer & h, const int version)
{
}
void CBattleGameInterface::loadGame(BinaryDeserializer & h, const int version)
{
}