mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-23 00:28:08 +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:
.travis.ymlCCallback.cppCCallback.h
AI
BattleAI
EmptyAI
StupidAI
VCAI
CI
CMakeLists.txtGlobal.hMods/vcmi/Data/s
client
CGameInfo.cppCGameInfo.hCMT.cppCMusicHandler.cppCMusicHandler.hCPlayerInterface.cppCPlayerInterface.hCServerHandler.cppClient.cppClient.hGraphics.cppGraphics.hNetPacksClient.cppVCMI_client.cbp
battle
gui
lobby
widgets
windows
cmake_modules
config
include
vcmi
Artifact.hArtifactService.hCreature.hCreatureService.hEntity.hEntityService.hEnvironment.hFaction.hFactionService.hHeroClass.hHeroClassService.hHeroType.hHeroTypeService.hMetatype.hPlayer.hServerCallback.hServices.hSkill.hSkillService.hTeam.h
events
AdventureEvents.hApplyDamage.hBattleEvents.hEvent.hEventBus.hGameResumed.hGenericEvents.hObjectVisitEnded.hObjectVisitStarted.hPlayerGotTurn.hSubscriptionRegistry.hTurnStarted.h
scripting
spells
vstd
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
BattleInfo.cppBattleInfo.hCBattleInfoCallback.cppCBattleInfoCallback.hCBattleInfoEssentials.hCCallbackBase.hCObstacleInstance.cppCPlayerBattleCallback.hCUnitState.cppCUnitState.hIBattleInfoCallback.hIBattleState.hSideInBattle.hUnit.h
events
ApplyDamage.cppApplyDamage.hGameResumed.cppGameResumed.hObjectVisitEnded.cppObjectVisitEnded.hObjectVisitStarted.cppObjectVisitStarted.hPlayerGotTurn.cppPlayerGotTurn.hTurnStarted.cppTurnStarted.h
filesystem
mapObjects
CArmedInstance.cppCBank.cppCGHeroInstance.cppCGHeroInstance.hCGMarket.cppCGPandoraBox.cppCGTownInstance.cppCGTownInstance.hCObjectClassesHandler.cppCObjectClassesHandler.hCObjectHandler.cppCObjectHandler.hCQuest.cppCRewardableObject.cppCommonConstructors.cppJsonRandom.cppMiscObjects.cpp
mapping
registerTypes
rmg
serializer
CSerializer.cppCSerializer.hJsonDeserializer.cppJsonSerializeFormat.cppJsonSerializeFormat.hJsonSerializer.cppJsonTreeSerializer.hJsonUpdater.cppJsonUpdater.h
spells
AbilityCaster.cppAbilityCaster.hAdventureSpellMechanics.cppAdventureSpellMechanics.hBattleSpellMechanics.cppBattleSpellMechanics.hBonusCaster.cppBonusCaster.hCSpellHandler.cppCSpellHandler.hISpellMechanics.cppISpellMechanics.hMagic.hProblem.hProxyCaster.cppProxyCaster.h
effects
vstd
osx
scripting
erm
CMakeLists.txtERM.cbpERMInterpreter.cppERMInterpreter.hERMParser.cppERMParser.hERMScriptModule.cppERMScriptModule.h
lua
CMakeLists.txtLua.cbpLuaCallWrapper.hLuaFunctor.hLuaReference.cppLuaReference.hLuaScriptModule.cppLuaScriptModule.hLuaScriptingContext.cppLuaScriptingContext.hLuaSpellEffect.cppLuaSpellEffect.hLuaStack.cppLuaStack.hLuaWrapper.hStdInc.cppStdInc.h
api
Artifact.cppArtifact.hBattleCb.cppBattleCb.hBonusSystem.cppBonusSystem.hCreature.cppCreature.hFaction.cppFaction.hGameCb.cppGameCb.hHeroClass.cppHeroClass.hHeroInstance.cppHeroInstance.hHeroType.cppHeroType.hObjectInstance.cppObjectInstance.hPlayer.cppPlayer.hRegistry.cppRegistry.hServerCb.cppServerCb.hServices.cppServices.hSkill.cppSkill.hSpell.cppSpell.hStackInstance.cppStackInstance.h
battle
events
AdventureEvents.cppAdventureEvents.hBattleEvents.cppBattleEvents.hEventBusProxy.cppEventBusProxy.hGenericEvents.cppGenericEvents.hSubscriptionRegistryProxy.cppSubscriptionRegistryProxy.h
netpacks
scripts/lib
Metatype.luaerm.lua
erm
BM.luaBU.luaDO.luaFU.luaFU_T.luaGM_T.luaHE.luaIF.luaMA.luaMF.luaMF_T.luaOW.luaPI_T.luaReceiverBase.luaTM.luaTM_T.luaTriggerBase.luaUN.luaVR.lua
verm.luaserver
test
CMakeLists.txtCVcmiTestConfig.cppJsonComparer.cppTest.cbp
vcmi.workspacebattle
entity
erm
ERMPersistenceTest.cppERM_BM.cppERM_BU.cppERM_FU.cppERM_GM_T.cppERM_MA.cppERM_MC.cppERM_MF.cppERM_OB_T.cppERM_TM_T.cppERM_UN.cppERM_VR.cppExamplesTest.cpp
events
game
mock
BattleFake.cppBattleFake.hmock_Creature.hmock_CreatureService.hmock_Environment.hmock_IBattleInfoCallback.hmock_IGameCallback.cppmock_IGameCallback.hmock_IGameEventCallback.hmock_IGameInfoCallback.hmock_ServerCallback.hmock_Services.hmock_battle_IBattleState.hmock_battle_Unit.hmock_events_ApplyDamage.hmock_scripting_Context.hmock_scripting_Pool.hmock_scripting_Script.hmock_scripting_Service.hmock_spells_Mechanics.hmock_spells_Problem.hmock_spells_Spell.hmock_spells_SpellService.hmock_spells_effects_Registry.hmock_vstd_CLoggerBase.h
netpacks
scripting
LuaSandboxTest.cppLuaSpellEffectAPITest.cppLuaSpellEffectTest.cppPoolTest.cppScriptFixture.cppScriptFixture.h
serializer
spells
CSpellTest.cpp
effects
testdata
erm
DO1.jsonDO1.vermDO2.jsonDO2.vermheroVar.jsonheroVar.vermindirectVar.jsonindirectVar.vermlist-manipulation.jsonlist-manipulation.vermre1.jsonre1.vermstd.jsonstd.vermtesty.jsontesty.verm
lua
vcai
232
scripting/lua/api/BonusSystem.cpp
Normal file
232
scripting/lua/api/BonusSystem.cpp
Normal file
@ -0,0 +1,232 @@
|
||||
/*
|
||||
* BonusSystem.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 "BonusSystem.h"
|
||||
|
||||
#include "../../../lib/HeroBonus.h"
|
||||
|
||||
#include "Registry.h"
|
||||
|
||||
#include "../LuaStack.h"
|
||||
#include "../LuaCallWrapper.h"
|
||||
|
||||
namespace scripting
|
||||
{
|
||||
namespace api
|
||||
{
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(BonusProxy, "Bonus");
|
||||
|
||||
const std::vector<BonusProxy::RegType> BonusProxy::REGISTER =
|
||||
{
|
||||
{"getType", &BonusProxy::getType},
|
||||
{"getSubtype", &BonusProxy::getSubtype},
|
||||
{"getDuration", &BonusProxy::getDuration},
|
||||
{"getTurns", &BonusProxy::getTurns},
|
||||
{"getValueType", &BonusProxy::getValueType},
|
||||
{"getVal", &BonusProxy::getVal},
|
||||
{"getSource", &BonusProxy::getSource},
|
||||
{"getSourceID", &BonusProxy::getSourceID},
|
||||
{"getEffectRange", &BonusProxy::getEffectRange},
|
||||
{"getStacking", &BonusProxy::getStacking},
|
||||
{"getDescription", &BonusProxy::getDescription},
|
||||
{"toJsonNode", &BonusProxy::toJsonNode}
|
||||
};
|
||||
|
||||
const std::vector<BonusProxy::CustomRegType> BonusProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
int BonusProxy::getType(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->type);
|
||||
}
|
||||
|
||||
int BonusProxy::getSubtype(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->subtype);
|
||||
}
|
||||
|
||||
int BonusProxy::getDuration(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->duration);
|
||||
}
|
||||
|
||||
int BonusProxy::getTurns(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->turnsRemain);
|
||||
}
|
||||
|
||||
int BonusProxy::getValueType(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->valType);
|
||||
}
|
||||
|
||||
int BonusProxy::getVal(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->val);
|
||||
}
|
||||
|
||||
int BonusProxy::getSource(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->source);
|
||||
}
|
||||
|
||||
int BonusProxy::getSourceID(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->sid);
|
||||
}
|
||||
|
||||
int BonusProxy::getEffectRange(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetInt(L, object->effectRange);
|
||||
}
|
||||
|
||||
int BonusProxy::getStacking(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetStr(L, object->stacking);
|
||||
}
|
||||
|
||||
int BonusProxy::getDescription(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
return LuaStack::quickRetStr(L, object->description);
|
||||
}
|
||||
|
||||
int BonusProxy::toJsonNode(lua_State * L, std::shared_ptr<const Bonus> object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
S.clear();
|
||||
S.push(object->toJsonNode());
|
||||
return 1;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static void publishMap(lua_State * L, const T & map)
|
||||
{
|
||||
for(auto & p : map)
|
||||
{
|
||||
const std::string & name = p.first;
|
||||
int32_t id = static_cast<int32_t>(p.second);
|
||||
|
||||
lua_pushstring(L, name.c_str());
|
||||
lua_pushinteger(L, id);
|
||||
lua_rawset(L, -3);
|
||||
}
|
||||
}
|
||||
|
||||
void BonusProxy::adjustStaticTable(lua_State * L) const
|
||||
{
|
||||
publishMap(L, bonusNameMap);
|
||||
publishMap(L, bonusValueMap);
|
||||
publishMap(L, bonusSourceMap);
|
||||
publishMap(L, bonusDurationMap);
|
||||
}
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(BonusListProxy, "BonusList");
|
||||
|
||||
const std::vector<BonusListProxy::RegType> BonusListProxy::REGISTER =
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
const std::vector<BonusListProxy::CustomRegType> BonusListProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
int BonusListProxy::index(lua_State * L)
|
||||
{
|
||||
//field = __index(self, key)
|
||||
LuaStack S(L);
|
||||
|
||||
std::shared_ptr<const BonusList> self;
|
||||
lua_Integer key = -1;
|
||||
|
||||
if(S.tryGet(1, self) && S.tryGetInteger(2, key))
|
||||
{
|
||||
if((key >= 1) && (key <= self->size()))
|
||||
{
|
||||
std::shared_ptr<const Bonus> ret = (*self)[key-1];
|
||||
|
||||
S.clear();
|
||||
S.push(ret);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return S.retNil();
|
||||
}
|
||||
|
||||
void BonusListProxy::adjustMetatable(lua_State * L) const
|
||||
{
|
||||
lua_pushstring(L, "__index");
|
||||
lua_pushcfunction(L, &BonusListProxy::index);
|
||||
lua_rawset(L, -3);
|
||||
}
|
||||
|
||||
|
||||
VCMI_REGISTER_SCRIPT_API(BonusBearerProxy, "BonusBearer");
|
||||
|
||||
const std::vector<BonusBearerProxy::RegType> BonusBearerProxy::REGISTER =
|
||||
{
|
||||
{"getBonuses", &BonusBearerProxy::getBonuses},
|
||||
};
|
||||
|
||||
const std::vector<BonusBearerProxy::CustomRegType> BonusBearerProxy::REGISTER_CUSTOM =
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
int BonusBearerProxy::getBonuses(lua_State * L, const IBonusBearer * object)
|
||||
{
|
||||
LuaStack S(L);
|
||||
|
||||
TConstBonusListPtr ret;
|
||||
|
||||
const bool hasSelector = S.isFunction(1);
|
||||
const bool hasRangeSelector = S.isFunction(2);
|
||||
|
||||
if(hasSelector)
|
||||
{
|
||||
auto selector = [](const Bonus * b)
|
||||
{
|
||||
return false; //TODO: BonusBearerProxy::getBonuses selector
|
||||
};
|
||||
|
||||
if(hasRangeSelector)
|
||||
{
|
||||
auto rangeSelector = [](const Bonus * b)
|
||||
{
|
||||
return false;//TODO: BonusBearerProxy::getBonuses rangeSelector
|
||||
};
|
||||
|
||||
ret = object->getBonuses(selector, rangeSelector);
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = object->getBonuses(selector, Selector::all);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = object->getBonuses(Selector::all, Selector::all);
|
||||
}
|
||||
|
||||
S.clear();
|
||||
S.push(ret);
|
||||
return S.retPushed();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user