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:
.travis.ymlCCallback.cppCCallback.h
AI
BattleAI
EmptyAI
StupidAI
VCAI
CI
CMakeLists.txtGlobal.hMods/vcmi/Data/s
client
CGameInfo.cppCGameInfo.hCMT.cppCMusicHandler.cppCMusicHandler.hCPlayerInterface.cppCPlayerInterface.hCServerHandler.cppClient.cppClient.hGraphics.cppGraphics.hNetPacksClient.cppVCMI_client.cbp
battle
gui
lobby
widgets
windows
cmake_modules
config
include
vcmi
Artifact.hArtifactService.hCreature.hCreatureService.hEntity.hEntityService.hEnvironment.hFaction.hFactionService.hHeroClass.hHeroClassService.hHeroType.hHeroTypeService.hMetatype.hPlayer.hServerCallback.hServices.hSkill.hSkillService.hTeam.h
events
AdventureEvents.hApplyDamage.hBattleEvents.hEvent.hEventBus.hGameResumed.hGenericEvents.hObjectVisitEnded.hObjectVisitStarted.hPlayerGotTurn.hSubscriptionRegistry.hTurnStarted.h
scripting
spells
vstd
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
BattleInfo.cppBattleInfo.hCBattleInfoCallback.cppCBattleInfoCallback.hCBattleInfoEssentials.hCCallbackBase.hCObstacleInstance.cppCPlayerBattleCallback.hCUnitState.cppCUnitState.hIBattleInfoCallback.hIBattleState.hSideInBattle.hUnit.h
events
ApplyDamage.cppApplyDamage.hGameResumed.cppGameResumed.hObjectVisitEnded.cppObjectVisitEnded.hObjectVisitStarted.cppObjectVisitStarted.hPlayerGotTurn.cppPlayerGotTurn.hTurnStarted.cppTurnStarted.h
filesystem
mapObjects
CArmedInstance.cppCBank.cppCGHeroInstance.cppCGHeroInstance.hCGMarket.cppCGPandoraBox.cppCGTownInstance.cppCGTownInstance.hCObjectClassesHandler.cppCObjectClassesHandler.hCObjectHandler.cppCObjectHandler.hCQuest.cppCRewardableObject.cppCommonConstructors.cppJsonRandom.cppMiscObjects.cpp
mapping
registerTypes
rmg
serializer
CSerializer.cppCSerializer.hJsonDeserializer.cppJsonSerializeFormat.cppJsonSerializeFormat.hJsonSerializer.cppJsonTreeSerializer.hJsonUpdater.cppJsonUpdater.h
spells
AbilityCaster.cppAbilityCaster.hAdventureSpellMechanics.cppAdventureSpellMechanics.hBattleSpellMechanics.cppBattleSpellMechanics.hBonusCaster.cppBonusCaster.hCSpellHandler.cppCSpellHandler.hISpellMechanics.cppISpellMechanics.hMagic.hProblem.hProxyCaster.cppProxyCaster.h
effects
vstd
osx
scripting
erm
CMakeLists.txtERM.cbpERMInterpreter.cppERMInterpreter.hERMParser.cppERMParser.hERMScriptModule.cppERMScriptModule.h
lua
CMakeLists.txtLua.cbpLuaCallWrapper.hLuaFunctor.hLuaReference.cppLuaReference.hLuaScriptModule.cppLuaScriptModule.hLuaScriptingContext.cppLuaScriptingContext.hLuaSpellEffect.cppLuaSpellEffect.hLuaStack.cppLuaStack.hLuaWrapper.hStdInc.cppStdInc.h
api
Artifact.cppArtifact.hBattleCb.cppBattleCb.hBonusSystem.cppBonusSystem.hCreature.cppCreature.hFaction.cppFaction.hGameCb.cppGameCb.hHeroClass.cppHeroClass.hHeroInstance.cppHeroInstance.hHeroType.cppHeroType.hObjectInstance.cppObjectInstance.hPlayer.cppPlayer.hRegistry.cppRegistry.hServerCb.cppServerCb.hServices.cppServices.hSkill.cppSkill.hSpell.cppSpell.hStackInstance.cppStackInstance.h
battle
events
AdventureEvents.cppAdventureEvents.hBattleEvents.cppBattleEvents.hEventBusProxy.cppEventBusProxy.hGenericEvents.cppGenericEvents.hSubscriptionRegistryProxy.cppSubscriptionRegistryProxy.h
netpacks
scripts/lib
Metatype.luaerm.lua
erm
BM.luaBU.luaDO.luaFU.luaFU_T.luaGM_T.luaHE.luaIF.luaMA.luaMF.luaMF_T.luaOW.luaPI_T.luaReceiverBase.luaTM.luaTM_T.luaTriggerBase.luaUN.luaVR.lua
verm.luaserver
test
CMakeLists.txtCVcmiTestConfig.cppJsonComparer.cppTest.cbp
vcmi.workspacebattle
entity
erm
ERMPersistenceTest.cppERM_BM.cppERM_BU.cppERM_FU.cppERM_GM_T.cppERM_MA.cppERM_MC.cppERM_MF.cppERM_OB_T.cppERM_TM_T.cppERM_UN.cppERM_VR.cppExamplesTest.cpp
events
game
mock
BattleFake.cppBattleFake.hmock_Creature.hmock_CreatureService.hmock_Environment.hmock_IBattleInfoCallback.hmock_IGameCallback.cppmock_IGameCallback.hmock_IGameEventCallback.hmock_IGameInfoCallback.hmock_ServerCallback.hmock_Services.hmock_battle_IBattleState.hmock_battle_Unit.hmock_events_ApplyDamage.hmock_scripting_Context.hmock_scripting_Pool.hmock_scripting_Script.hmock_scripting_Service.hmock_spells_Mechanics.hmock_spells_Problem.hmock_spells_Spell.hmock_spells_SpellService.hmock_spells_effects_Registry.hmock_vstd_CLoggerBase.h
netpacks
scripting
LuaSandboxTest.cppLuaSpellEffectAPITest.cppLuaSpellEffectTest.cppPoolTest.cppScriptFixture.cppScriptFixture.h
serializer
spells
CSpellTest.cpp
effects
testdata
erm
DO1.jsonDO1.vermDO2.jsonDO2.vermheroVar.jsonheroVar.vermindirectVar.jsonindirectVar.vermlist-manipulation.jsonlist-manipulation.vermre1.jsonre1.vermstd.jsonstd.vermtesty.jsontesty.verm
lua
vcai
@ -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)
|
||||
{
|
||||
}
|
||||
|
Reference in New Issue
Block a user