games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +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

9
test/battle/CUnitStateMagicTest.cpp
View File

@ -16,15 +16,13 @@
#include "../../lib/battle/CUnitState.h"
#include "../../lib/CCreatureHandler.h"
class UnitStateMagicTest : public testing::Test
class UnitStateMagicTest : public ::testing::Test
{
public:
UnitInfoMock infoMock;
UnitEnvironmentMock envMock;
BonusBearerMock bonusMock;
spells::SpellMock spellMock;
const CCreature * pikeman;
::testing::StrictMock<spells::SpellMock> spellMock;
battle::CUnitStateDetached subject;
@ -39,7 +37,6 @@ public:
spellMock(),
subject(&infoMock, &bonusMock)
{
pikeman = CreatureID(0).toCreature();
}
void setDefaultExpectations()
@ -197,7 +194,7 @@ TEST_F(UnitStateMagicTest, getOwner)
EXPECT_CALL(envMock, unitEffectiveOwner(_));
EXPECT_EQ(subject.getOwner(), otherPlayer);
EXPECT_EQ(subject.getCasterOwner(), otherPlayer);
}
TEST_F(UnitStateMagicTest, spendMana)