mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-17 00:07:41 +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
AlexVinS
63
scripting/lua/api/netpacks/BattleLogMessage.cpp
Normal file
63
scripting/lua/api/netpacks/BattleLogMessage.cpp
Normal file
@ -0,0 +1,63 @@
|
||||
/*
|
||||
* api/netpacks/BattleLogMessage.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 "BattleLogMessage.h"
|
||||
|
||||
#include "../../LuaStack.h"
|
||||
|
||||
#include "../Registry.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(BattleLogMessageProxy, "netpacks.BattleLogMessage");
|
||||
|
||||
const std::vector<BattleLogMessageProxy::RegType> BattleLogMessageProxy::REGISTER =
|
||||
{
|
||||
{
|
||||
"addText",
|
||||
&BattleLogMessageProxy::addText
|
||||
},
|
||||
{
|
||||
"toNetpackLight",
|
||||
&PackForClientProxy<BattleLogMessageProxy>::toNetpackLight
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<BattleLogMessageProxy::CustomRegType> BattleLogMessageProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
{"new", &Wrapper::constructor, true}
|
||||
};
|
||||
|
||||
int BattleLogMessageProxy::addText(lua_State * L, std::shared_ptr<BattleLogMessage> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
|
||||
std::string text;
|
||||
|
||||
if(S.tryGet(1, text))
|
||||
{
|
||||
if(object->lines.empty())
|
||||
object->lines.emplace_back();
|
||||
object->lines.back() << text;
|
||||
}
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
35
scripting/lua/api/netpacks/BattleLogMessage.h
Normal file
35
scripting/lua/api/netpacks/BattleLogMessage.h
Normal file
@ -0,0 +1,35 @@
|
||||
/*
|
||||
* api/netpacks/BattleLogMessage.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 "PackForClient.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
class BattleLogMessageProxy : public SharedWrapper<BattleLogMessage, BattleLogMessageProxy>
|
||||
{
|
||||
public:
|
||||
using Wrapper = SharedWrapper<BattleLogMessage, BattleLogMessageProxy>;
|
||||
|
||||
static const std::vector<Wrapper::RegType> REGISTER;
|
||||
static const std::vector<typename Wrapper::CustomRegType> REGISTER_CUSTOM;
|
||||
|
||||
static int addText(lua_State * L, std::shared_ptr<BattleLogMessage> object);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
89
scripting/lua/api/netpacks/BattleStackMoved.cpp
Normal file
89
scripting/lua/api/netpacks/BattleStackMoved.cpp
Normal file
@ -0,0 +1,89 @@
|
||||
/*
|
||||
* api/netpacks/BattleStackMoved.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 "BattleStackMoved.h"
|
||||
|
||||
#include "../../LuaStack.h"
|
||||
|
||||
#include "../Registry.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(BattleStackMovedProxy, "netpacks.BattleStackMoved");
|
||||
|
||||
const std::vector<BattleStackMovedProxy::RegType> BattleStackMovedProxy::REGISTER =
|
||||
{
|
||||
{
|
||||
"addTileToMove",
|
||||
&BattleStackMovedProxy::addTileToMove
|
||||
},
|
||||
{
|
||||
"setUnitId",
|
||||
&BattleStackMovedProxy::setUnitId
|
||||
},
|
||||
{
|
||||
"setDistance",
|
||||
&BattleStackMovedProxy::setDistance
|
||||
},
|
||||
{
|
||||
"setTeleporting",
|
||||
&BattleStackMovedProxy::setTeleporting
|
||||
},
|
||||
{
|
||||
"toNetpackLight",
|
||||
&PackForClientProxy<BattleStackMovedProxy>::toNetpackLight
|
||||
}
|
||||
};
|
||||
|
||||
const std::vector<BattleStackMovedProxy::CustomRegType> BattleStackMovedProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
{"new", &Wrapper::constructor, true}
|
||||
};
|
||||
|
||||
int BattleStackMovedProxy::addTileToMove(lua_State * L, std::shared_ptr<BattleStackMoved> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
lua_Integer hex = 0;
|
||||
if(!S.tryGetInteger(1, hex))
|
||||
return S.retVoid();
|
||||
object->tilesToMove.emplace_back(hex);
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int BattleStackMovedProxy::setUnitId(lua_State * L, std::shared_ptr<BattleStackMoved> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
S.tryGet(1, object->stack);
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int BattleStackMovedProxy::setDistance(lua_State * L, std::shared_ptr<BattleStackMoved> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
S.tryGet(1, object->distance);
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int BattleStackMovedProxy::setTeleporting(lua_State * L, std::shared_ptr<BattleStackMoved> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
S.tryGet(1, object->teleporting);
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
39
scripting/lua/api/netpacks/BattleStackMoved.h
Normal file
39
scripting/lua/api/netpacks/BattleStackMoved.h
Normal file
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* api/netpacks/BattleStackMoved.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 "PackForClient.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
class BattleStackMovedProxy : public SharedWrapper<BattleStackMoved, BattleStackMovedProxy>
|
||||
{
|
||||
public:
|
||||
using Wrapper = SharedWrapper<BattleStackMoved, BattleStackMovedProxy>;
|
||||
|
||||
static const std::vector<Wrapper::RegType> REGISTER;
|
||||
static const std::vector<typename Wrapper::CustomRegType> REGISTER_CUSTOM;
|
||||
|
||||
static int addTileToMove(lua_State * L, std::shared_ptr<BattleStackMoved> object);
|
||||
|
||||
static int setUnitId(lua_State * L, std::shared_ptr<BattleStackMoved> object);
|
||||
static int setDistance(lua_State * L, std::shared_ptr<BattleStackMoved> object);
|
||||
static int setTeleporting(lua_State * L, std::shared_ptr<BattleStackMoved> object);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
114
scripting/lua/api/netpacks/BattleUnitsChanged.cpp
Normal file
114
scripting/lua/api/netpacks/BattleUnitsChanged.cpp
Normal file
@ -0,0 +1,114 @@
|
||||
/*
|
||||
* api/netpacks/BattleUnitsChanged.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 "BattleUnitsChanged.h"
|
||||
|
||||
#include "../../LuaStack.h"
|
||||
|
||||
#include "../Registry.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(BattleUnitsChangedProxy, "netpacks.BattleUnitsChanged");
|
||||
|
||||
const std::vector<BattleUnitsChangedProxy::RegType> BattleUnitsChangedProxy::REGISTER =
|
||||
{
|
||||
{
|
||||
"toNetpackLight",
|
||||
&PackForClientProxy<BattleUnitsChangedProxy>::toNetpackLight
|
||||
},
|
||||
{
|
||||
"add",
|
||||
&BattleUnitsChangedProxy::add
|
||||
},
|
||||
{
|
||||
"update",
|
||||
&BattleUnitsChangedProxy::update
|
||||
},
|
||||
{
|
||||
"resetState",
|
||||
&BattleUnitsChangedProxy::resetState
|
||||
},
|
||||
{
|
||||
"remove",
|
||||
&BattleUnitsChangedProxy::remove
|
||||
}
|
||||
};
|
||||
|
||||
const std::vector<BattleUnitsChangedProxy::CustomRegType> BattleUnitsChangedProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
{"new", &Wrapper::constructor, true}
|
||||
};
|
||||
|
||||
int BattleUnitsChangedProxy::add(lua_State * L, std::shared_ptr<BattleUnitsChanged> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
uint32_t id;
|
||||
|
||||
if(!S.tryGet(1, id))
|
||||
return S.retVoid();
|
||||
|
||||
UnitChanges changes(id, BattleChanges::EOperation::ADD);
|
||||
|
||||
if(!S.tryGet(2, changes.data))
|
||||
return S.retVoid();
|
||||
|
||||
if(!S.tryGet(3, changes.healthDelta))
|
||||
changes.healthDelta = 0;
|
||||
|
||||
object->changedStacks.push_back(changes);
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int BattleUnitsChangedProxy::update(lua_State * L, std::shared_ptr<BattleUnitsChanged> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
|
||||
uint32_t id;
|
||||
|
||||
if(!S.tryGet(1, id))
|
||||
return S.retVoid();
|
||||
|
||||
UnitChanges changes(id, BattleChanges::EOperation::UPDATE);
|
||||
|
||||
if(!S.tryGet(2, changes.data))
|
||||
return S.retVoid();
|
||||
|
||||
if(!S.tryGet(3, changes.healthDelta))
|
||||
changes.healthDelta = 0;
|
||||
|
||||
object->changedStacks.push_back(changes);
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int BattleUnitsChangedProxy::resetState(lua_State * L, std::shared_ptr<BattleUnitsChanged> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int BattleUnitsChangedProxy::remove(lua_State * L, std::shared_ptr<BattleUnitsChanged> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
38
scripting/lua/api/netpacks/BattleUnitsChanged.h
Normal file
38
scripting/lua/api/netpacks/BattleUnitsChanged.h
Normal file
@ -0,0 +1,38 @@
|
||||
/*
|
||||
* api/netpacks/BattleUnitsChanged.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 "PackForClient.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
class BattleUnitsChangedProxy : public SharedWrapper<BattleUnitsChanged, BattleUnitsChangedProxy>
|
||||
{
|
||||
public:
|
||||
using Wrapper = SharedWrapper<BattleUnitsChanged, BattleUnitsChangedProxy>;
|
||||
|
||||
static const std::vector<Wrapper::RegType> REGISTER;
|
||||
static const std::vector<typename Wrapper::CustomRegType> REGISTER_CUSTOM;
|
||||
|
||||
static int add(lua_State * L, std::shared_ptr<BattleUnitsChanged> object);
|
||||
static int update(lua_State * L, std::shared_ptr<BattleUnitsChanged> object);
|
||||
static int resetState(lua_State * L, std::shared_ptr<BattleUnitsChanged> object);
|
||||
static int remove(lua_State * L, std::shared_ptr<BattleUnitsChanged> object);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
69
scripting/lua/api/netpacks/EntitiesChanged.cpp
Normal file
69
scripting/lua/api/netpacks/EntitiesChanged.cpp
Normal file
@ -0,0 +1,69 @@
|
||||
/*
|
||||
* api/netpacks/EntitiesChanged.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 "EntitiesChanged.h"
|
||||
|
||||
#include "../../LuaStack.h"
|
||||
|
||||
#include "../Registry.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(EntitiesChangedProxy, "netpacks.EntitiesChanged");
|
||||
|
||||
const std::vector<EntitiesChangedProxy::RegType> EntitiesChangedProxy::REGISTER =
|
||||
{
|
||||
{
|
||||
"update",
|
||||
&EntitiesChangedProxy::update
|
||||
},
|
||||
{
|
||||
"toNetpackLight",
|
||||
&PackForClientProxy<EntitiesChangedProxy>::toNetpackLight
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<EntitiesChangedProxy::CustomRegType> EntitiesChangedProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
{"new", &Wrapper::constructor, true}
|
||||
};
|
||||
|
||||
int EntitiesChangedProxy::update(lua_State * L, std::shared_ptr<EntitiesChanged> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
|
||||
EntityChanges changes;
|
||||
|
||||
int32_t metaIndex = 0;
|
||||
|
||||
if(!S.tryGet(1, metaIndex))
|
||||
return S.retVoid();
|
||||
changes.metatype = static_cast<Metatype>(metaIndex);
|
||||
|
||||
if(!S.tryGet(2, changes.entityIndex))
|
||||
return S.retVoid();
|
||||
|
||||
if(!S.tryGet(3, changes.data))
|
||||
return S.retVoid();
|
||||
|
||||
object->changes.push_back(changes);
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
36
scripting/lua/api/netpacks/EntitiesChanged.h
Normal file
36
scripting/lua/api/netpacks/EntitiesChanged.h
Normal file
@ -0,0 +1,36 @@
|
||||
/*
|
||||
* api/netpacks/EntitiesChanged.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 "PackForClient.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
class EntitiesChangedProxy : public SharedWrapper<EntitiesChanged, EntitiesChangedProxy>
|
||||
{
|
||||
public:
|
||||
using Wrapper = SharedWrapper<EntitiesChanged, EntitiesChangedProxy>;
|
||||
|
||||
static const std::vector<typename Wrapper::RegType> REGISTER;
|
||||
static const std::vector<typename Wrapper::CustomRegType> REGISTER_CUSTOM;
|
||||
|
||||
static int update(lua_State * L, std::shared_ptr<EntitiesChanged> object);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
128
scripting/lua/api/netpacks/InfoWindow.cpp
Normal file
128
scripting/lua/api/netpacks/InfoWindow.cpp
Normal file
@ -0,0 +1,128 @@
|
||||
/*
|
||||
* api/netpacks/InfoWindow.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 "InfoWindow.h"
|
||||
|
||||
#include "../../LuaStack.h"
|
||||
|
||||
#include "../Registry.h"
|
||||
|
||||
using scripting::api::netpacks::InfoWindowProxy;
|
||||
using scripting::api::RegisterAPI;
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(InfoWindowProxy, "netpacks.InfoWindow")
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
const std::vector<InfoWindowProxy::RegType> InfoWindowProxy::REGISTER =
|
||||
{
|
||||
{
|
||||
"addReplacement",
|
||||
&InfoWindowProxy::addReplacement
|
||||
},
|
||||
{
|
||||
"addText",
|
||||
&InfoWindowProxy::addText
|
||||
},
|
||||
{
|
||||
"setPlayer",
|
||||
&InfoWindowProxy::setPlayer
|
||||
},
|
||||
{
|
||||
"toNetpackLight",
|
||||
&PackForClientProxy<InfoWindowProxy>::toNetpackLight
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<InfoWindowProxy::CustomRegType> InfoWindowProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
{"new", &Wrapper::constructor, true}
|
||||
};
|
||||
|
||||
int InfoWindowProxy::addReplacement(lua_State * L, std::shared_ptr<InfoWindow> object)
|
||||
{
|
||||
int top = lua_gettop(L);
|
||||
|
||||
if(top == 1)
|
||||
{
|
||||
if(lua_isstring(L, 1))
|
||||
{
|
||||
size_t len = 0;
|
||||
auto raw = lua_tolstring(L, 1, &len);
|
||||
std::string text(raw, len);
|
||||
|
||||
object->text.addReplacement(text);
|
||||
}
|
||||
else if(lua_isnumber(L, 1))
|
||||
{
|
||||
object->text.addReplacement(lua_tointeger(L, 1));
|
||||
}
|
||||
}
|
||||
else if(top >= 2)
|
||||
{
|
||||
if(lua_isnumber(L, 1) && lua_isnumber(L, 2))
|
||||
object->text.addReplacement(lua_tointeger(L, 1), lua_tointeger(L, 2));
|
||||
}
|
||||
|
||||
lua_settop(L, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int InfoWindowProxy::addText(lua_State * L, std::shared_ptr<InfoWindow> object)
|
||||
{
|
||||
int top = lua_gettop(L);
|
||||
|
||||
if(top == 1)
|
||||
{
|
||||
if(lua_isstring(L, 1))
|
||||
{
|
||||
size_t len = 0;
|
||||
auto raw = lua_tolstring(L, 1, &len);
|
||||
std::string text(raw, len);
|
||||
|
||||
object->text << text;
|
||||
}
|
||||
else if(lua_isnumber(L, 1))
|
||||
{
|
||||
object->text << (lua_tointeger(L, 1));
|
||||
}
|
||||
}
|
||||
|
||||
if(top >= 2)
|
||||
{
|
||||
if(lua_isnumber(L, 1) && lua_isnumber(L, 2))
|
||||
object->text.addTxt(lua_tointeger(L, 1), lua_tointeger(L, 2));
|
||||
}
|
||||
|
||||
lua_settop(L, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int InfoWindowProxy::setPlayer(lua_State * L, std::shared_ptr<InfoWindow> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
PlayerColor value;
|
||||
|
||||
if(S.tryGet(1, value))
|
||||
object->player = value;
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
36
scripting/lua/api/netpacks/InfoWindow.h
Normal file
36
scripting/lua/api/netpacks/InfoWindow.h
Normal file
@ -0,0 +1,36 @@
|
||||
/*
|
||||
* api/netpacks/InfoWindow.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 "PackForClient.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
class InfoWindowProxy : public SharedWrapper<InfoWindow, InfoWindowProxy>
|
||||
{
|
||||
public:
|
||||
using Wrapper = SharedWrapper<InfoWindow, InfoWindowProxy>;
|
||||
static const std::vector<typename Wrapper::RegType> REGISTER;
|
||||
static const std::vector<typename Wrapper::CustomRegType> REGISTER_CUSTOM;
|
||||
|
||||
static int addReplacement(lua_State * L, std::shared_ptr<InfoWindow> object);
|
||||
static int addText(lua_State * L, std::shared_ptr<InfoWindow> object);
|
||||
static int setPlayer(lua_State * L, std::shared_ptr<InfoWindow> object);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
39
scripting/lua/api/netpacks/PackForClient.h
Normal file
39
scripting/lua/api/netpacks/PackForClient.h
Normal file
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* api/netpacks/PackForClient.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 "../../../../lib/NetPacks.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
template <typename Derived>
|
||||
class PackForClientProxy
|
||||
{
|
||||
public:
|
||||
static int toNetpackLight(lua_State * L, typename Derived::UDataType object)
|
||||
{
|
||||
lua_settop(L, 0);
|
||||
lua_pushlightuserdata(L, static_cast<CPackForClient *>(object.get()));
|
||||
return 1;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
133
scripting/lua/api/netpacks/SetResources.cpp
Normal file
133
scripting/lua/api/netpacks/SetResources.cpp
Normal file
@ -0,0 +1,133 @@
|
||||
/*
|
||||
* api/netpacks/SetResources.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 "SetResources.h"
|
||||
|
||||
#include "../../LuaStack.h"
|
||||
|
||||
#include "../Registry.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(SetResourcesProxy, "netpacks.SetResources");
|
||||
|
||||
const std::vector<SetResourcesProxy::RegType> SetResourcesProxy::REGISTER =
|
||||
{
|
||||
{"getAbs",&SetResourcesProxy::getAbs},
|
||||
{"setAbs",&SetResourcesProxy::setAbs},
|
||||
{"getPlayer",&SetResourcesProxy::getPlayer},
|
||||
{"setPlayer",&SetResourcesProxy::setPlayer},
|
||||
{"setAmount",&SetResourcesProxy::setAmount},
|
||||
{"getAmount",&SetResourcesProxy::getAmount},
|
||||
{"clear",&SetResourcesProxy::clear},
|
||||
|
||||
{
|
||||
"toNetpackLight",
|
||||
&PackForClientProxy<SetResourcesProxy>::toNetpackLight
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<SetResourcesProxy::CustomRegType> SetResourcesProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
{"new", &Wrapper::constructor, true}
|
||||
};
|
||||
|
||||
int SetResourcesProxy::getAbs(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
return LuaStack::quickRetBool(L, object->abs);
|
||||
}
|
||||
|
||||
int SetResourcesProxy::setAbs(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
bool value = false;
|
||||
if(S.tryGet(1, value))
|
||||
object->abs = value;
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int SetResourcesProxy::getPlayer(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
S.clear();
|
||||
S.push(object->player);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int SetResourcesProxy::setPlayer(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
PlayerColor value;
|
||||
|
||||
if(S.tryGet(1, value))
|
||||
object->player = value;
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int SetResourcesProxy::getAmount(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
|
||||
Res::ERes type = Res::ERes::INVALID;
|
||||
|
||||
if(!S.tryGet(1, type))
|
||||
return S.retVoid();
|
||||
|
||||
S.clear();
|
||||
|
||||
const TQuantity amount = vstd::atOrDefault(object->res, static_cast<size_t>(type), 0);
|
||||
S.push(amount);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int SetResourcesProxy::setAmount(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
|
||||
Res::ERes type = Res::ERes::INVALID;
|
||||
|
||||
if(!S.tryGet(1, type))
|
||||
return S.retVoid();
|
||||
|
||||
int typeIdx = static_cast<int>(type);
|
||||
|
||||
if(typeIdx < 0 || typeIdx >= object->res.size())
|
||||
return S.retVoid();
|
||||
|
||||
TQuantity amount = 0;
|
||||
|
||||
if(!S.tryGet(2, amount))
|
||||
return S.retVoid();
|
||||
|
||||
object->res.at(typeIdx) = amount;
|
||||
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
int SetResourcesProxy::clear(lua_State * L, std::shared_ptr<SetResources> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
object->res.amin(0);
|
||||
object->res.positive();
|
||||
return S.retVoid();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
41
scripting/lua/api/netpacks/SetResources.h
Normal file
41
scripting/lua/api/netpacks/SetResources.h
Normal file
@ -0,0 +1,41 @@
|
||||
/*
|
||||
* api/netpacks/SetResources.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 "PackForClient.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
namespace netpacks
|
||||
{
|
||||
|
||||
class SetResourcesProxy : public SharedWrapper<SetResources, SetResourcesProxy>
|
||||
{
|
||||
public:
|
||||
using Wrapper = SharedWrapper<SetResources, SetResourcesProxy>;
|
||||
|
||||
static const std::vector<Wrapper::RegType> REGISTER;
|
||||
static const std::vector<typename Wrapper::CustomRegType> REGISTER_CUSTOM;
|
||||
|
||||
static int getAbs(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
static int setAbs(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
static int getPlayer(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
static int setPlayer(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
static int getAmount(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
static int setAmount(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
static int clear(lua_State * L, std::shared_ptr<SetResources> object);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user