mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 08:27:46 +00:00
Code Activity

quest_parser template update

Browse source 
Use correct method of determining actor, use callback variables instead
of inline functions within scenes, and use the correct namespace.
This commit is contained in:
Sophie Hamilton 2020-02-29 10:30:25 +00:00
parent 34f66fbcd8
commit 71f4e5b8bb
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/tools/quest_parser/main.cpp
View file

@ -27,7 +27,8 @@ using namespace Sapphire;
const std::string onTalkStr( const std::string onTalkStr(
" void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n" " void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n"
" {\n" " {\n"
" auto actor = Event::mapEventActorToRealActor( actorId );\n" " auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n"
" auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
" }\n\n" " }\n\n"
); );
@ -40,6 +41,8 @@ const std::string onWithinRangeStr(
const std::string onEmoteStr( const std::string onEmoteStr(
" void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n" " void onEmote( uint32_t eventId, Entity::Player& player, uint64_t actorId, uint32_t emoteId ) override\n"
" {\n" " {\n"
" auto pEventMgr = m_framework->get< World::Manager::EventMgr >();\n"
" auto actor = pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );\n"
" }\n\n" " }\n\n"
); );
@ -101,12 +104,15 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
sceneName + sceneName +
"( Entity::Player& player )\n" "( Entity::Player& player )\n"
" {\n" " {\n"
" auto callback = [ & ]( Entity::Player& player, const Event::SceneResult& result )\n"
" {\n"
" };\n"
"\n"
" player.playScene( getId(), " + " player.playScene( getId(), " +
sceneId + sceneId + ", "
", 0,\n" "NONE, "
" [ & ]( Entity::Player& player, const Event::SceneResult& result )\n" "callback"
" {\n" " );\n"
" });\n"
" }\n\n" " }\n\n"
); );
} }
@ -204,6 +210,8 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
additional += "// Start NPC: " + std::to_string( pQuestData->issuerStart ) + "\n"; additional += "// Start NPC: " + std::to_string( pQuestData->issuerStart ) + "\n";
additional += "// End NPC: " + std::to_string( pQuestData->targetEnd ) + "\n\n"; additional += "// End NPC: " + std::to_string( pQuestData->targetEnd ) + "\n\n";
additional += "using namespace Sapphire;\n\n";
std::string actionEntry; std::string actionEntry;
std::string scriptEntry; std::string scriptEntry;
scriptEntry.reserve( 0xFFFF ); scriptEntry.reserve( 0xFFFF );
@ -224,7 +232,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
if( !enemy_ids.empty() ) if( !enemy_ids.empty() )
scriptEntry += std::string( scriptEntry += std::string(
" void onBNpcKill( uint32_t npcId, Entity::Player& player )\n" " void onBNpcKill( uint32_t npcId, Entity::Player& player ) override\n"
" {\n" " {\n"
" switch( npcId )\n" " switch( npcId )\n"
" {\n" ); " {\n" );
@ -240,7 +248,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
if( !action_ids.empty() ) if( !action_ids.empty() )
actionEntry += std::string( actionEntry += std::string(
" void onEObjHit( uint32_t npcId, Entity::Player& player, uin32_t actionId )\n" " void onEObjHit( uint32_t npcId, Entity::Player& player, uin32_t actionId ) override\n"
" {\n" " {\n"
" switch( actionId )\n" " switch( actionId )\n"
" {\n" ); " {\n" );