games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Entities redesign and a few ERM features

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

79
test/erm/ERM_VR.cpp Normal file
View File

@@ -0,0 +1,79 @@
/*
* ERM_VR.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 "../scripting/ScriptFixture.h"
namespace test
{
namespace scripting
{
using namespace ::testing;
class ERM_VR : public Test, public ScriptFixture
{
protected:
void SetUp() override
{
ScriptFixture::setUp();
}
};
TEST_F(ERM_VR, C)
{
std::stringstream source;
source << "VERM" << std::endl;
source << "!?PI;" << std::endl;
source << "!!VRv2:S99;" << std::endl;
source << "!!VRv45:S100;" << std::endl;
source << "!!VRv42:C3/5/75/?k/v2;" << std::endl;
JsonNode actualState = runScript(VLC->scriptHandler->erm, source.str());
SCOPED_TRACE("\n" + subject->code);
EXPECT_EQ(actualState["ERM"]["Q"]["k"], JsonUtils::floatNode(100)) << actualState.toJson(true);
const JsonNode & v = actualState["ERM"]["v"];
EXPECT_EQ(v["42"], JsonUtils::floatNode(3)) << actualState.toJson(true);
EXPECT_EQ(v["43"], JsonUtils::floatNode(5)) << actualState.toJson(true);
EXPECT_EQ(v["44"], JsonUtils::floatNode(75)) << actualState.toJson(true);
EXPECT_EQ(v["46"], JsonUtils::floatNode(99)) << actualState.toJson(true);
}
TEST_F(ERM_VR, H)
{
std::stringstream source;
source << "VERM" << std::endl;
source << "!?PI;" << std::endl;
source << "!!VRz100:S^Test!^;" << std::endl;
source << "!!VRz101:S^^;" << std::endl;
source << "!!VRz102:S^ ^;" << std::endl;
source << "!!VRz100:H200;" << std::endl;
source << "!!VRz101:H201;" << std::endl;
source << "!!VRz102:H202;" << std::endl;
JsonNode actualState = runScript(VLC->scriptHandler->erm, source.str());
SCOPED_TRACE("\n" + subject->code);
const JsonNode & f = actualState["ERM"]["F"];
EXPECT_EQ(f["200"], JsonUtils::boolNode(true)) << actualState.toJson(true);
EXPECT_EQ(f["201"], JsonUtils::boolNode(false)) << actualState.toJson(true);
EXPECT_EQ(f["202"], JsonUtils::boolNode(false)) << actualState.toJson(true);
}
}
}