1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-25 00:37:24 +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,90 @@
/*
* LuaScriptingContext.h, 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
*
*/
#pragma once
#include "LuaWrapper.h"
#include "LuaReference.h"
#include "../../lib/ScriptHandler.h"
#include "../../lib/CScriptingModule.h"
namespace scripting
{
class LuaContext : public ContextBase
{
public:
static const std::string STATE_FIELD;
LuaContext(const Script * source, const Environment * env_);
virtual ~LuaContext();
void run(const JsonNode & initialState) override;
void run(ServerCallback * server, const JsonNode & initialState) override;
//log error and return nil from LuaCFunction
int errorRetVoid(const std::string & message);
JsonNode callGlobal(const std::string & name, const JsonNode & parameters) override;
JsonNode callGlobal(ServerCallback * cb, const std::string & name, const JsonNode & parameters) override;
void getGlobal(const std::string & name, int & value) override;
void getGlobal(const std::string & name, std::string & value) override;
void getGlobal(const std::string & name, double & value) override;
void getGlobal(const std::string & name, JsonNode & value) override;
void setGlobal(const std::string & name, int value) override;
void setGlobal(const std::string & name, const std::string & value) override;
void setGlobal(const std::string & name, double value) override;
void setGlobal(const std::string & name, const JsonNode & value) override;
JsonNode saveState() override;
void pop(JsonNode & value);
void popAll();
void push(const std::string & value);
void push(lua_CFunction f, void * opaque);
std::string toStringRaw(int index);
private:
lua_State * L;
const Script * script;
const Environment * env;
std::shared_ptr<LuaReference> modules;
std::shared_ptr<LuaReference> scriptClosure;
void cleanupGlobals();
void registerCore();
//require global function
static int require(lua_State * L);
//print global function
static int print(lua_State * L);
static int logError(lua_State * L);
//require function implementation
int loadModule();
int printImpl();
int logErrorImpl();
};
}