1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +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

@ -0,0 +1,92 @@
/*
* ScriptFixture.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 "ScriptFixture.h"
namespace test
{
using namespace ::testing;
using namespace ::scripting;
ScriptFixture::ScriptFixture() = default;
ScriptFixture::~ScriptFixture() = default;
void ScriptFixture::loadScriptFromFile(const std::string & path)
{
JsonNode scriptConfig(JsonNode::JsonType::DATA_STRUCT);
scriptConfig["source"].String() = path;
loadScript(scriptConfig);
}
void ScriptFixture::loadScript(const JsonNode & scriptConfig)
{
subject = VLC->scriptHandler->loadFromJson(&loggerMock, "core", scriptConfig, "test");
GTEST_ASSERT_NE(subject, nullptr);
context = subject->createContext(&environmentMock);
EXPECT_CALL(*pool, getContext(Eq(subject.get()))).WillRepeatedly(Return(context));
}
void ScriptFixture::loadScript(ModulePtr module, const std::string & scriptSource)
{
subject = std::make_shared<ScriptImpl>(VLC->scriptHandler);
subject->host = module;
subject->sourceText = scriptSource;
subject->identifier = "test";
subject->compile(&loggerMock);
context = subject->createContext(&environmentMock);
EXPECT_CALL(*pool, getContext(Eq(subject.get()))).WillRepeatedly(Return(context));
}
void ScriptFixture::loadScript(ModulePtr module, const std::vector<std::string> & scriptSource)
{
std::string source = boost::algorithm::join(scriptSource, "\n");
loadScript(module, source);
}
void ScriptFixture::setUp()
{
pool = std::make_shared<PoolMock>();
EXPECT_CALL(environmentMock, battle()).WillRepeatedly(Return(&binfoMock));
EXPECT_CALL(environmentMock, game()).WillRepeatedly(Return(&infoMock));
EXPECT_CALL(environmentMock, logger()).WillRepeatedly(Return(&loggerMock));
EXPECT_CALL(environmentMock, eventBus()).WillRepeatedly(Return(&eventBus));
EXPECT_CALL(environmentMock, services()).WillRepeatedly(Return(&servicesMock));
}
JsonNode ScriptFixture::runClientServer(const JsonNode & scriptState)
{
context->run(scriptState);
return context->saveState();
}
JsonNode ScriptFixture::runServer(const JsonNode & scriptState)
{
context->run(&serverMock, scriptState);
return context->saveState();
}
JsonNode ScriptFixture::runScript(ModulePtr module, const std::string & scriptSource, const JsonNode & scriptState)
{
loadScript(module, scriptSource);
return runClientServer(scriptState);
}
}