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

Merge pull request #646 from Sophira/more-quest-parser-updates

Browse source 
quest_parser: Fix case for constants
This commit is contained in:
Adam 2020-03-01 11:24:46 +11:00 • committed by GitHub
commit 8f71d01a69
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,17 @@ std::string titleCase( const std::string& str )
return retStr; return retStr;
} }
std::string titleCaseNoUnderscores( const std::string& str )
{
std::string result = titleCase( str );
result.erase( std::remove_if( result.begin(), result.end(), []( const char c ) {
return c == '_';
}), result.end());
return result;
}
void void
createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId ) createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< std::string >& additionalList, int questId )
{ {
@ -132,12 +143,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
} }
else else
{ {
std::string seqName = titleCase( entry ); std::string seqName = titleCaseNoUnderscores( entry );
seqName.erase( std::remove_if( seqName.begin(), seqName.end(), []( const char c ) {
return c == '_';
}), seqName.end());
std::string seqId = entry.substr( 4 ); std::string seqId = entry.substr( 4 );
seqStr += " " + seqName + " = " + seqId + ",\n"; seqStr += " " + seqName + " = " + seqId + ",\n";
} }
@ -195,12 +201,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
std::sort( script_entities.begin(), script_entities.end() ); std::sort( script_entities.begin(), script_entities.end() );
for( auto& entity : script_entities ) for( auto& entity : script_entities )
{ {
auto name = titleCase( entity ); auto name = titleCaseNoUnderscores( entity );
name.erase( std::remove_if( name.begin(), name.end(), []( const char c ) {
return c == '_';
}), name.end());
sentities += " static constexpr auto " + name + ";\n"; sentities += " static constexpr auto " + name + ";\n";
} }
@ -239,7 +240,7 @@ createScript( std::shared_ptr< Sapphire::Data::Quest >& pQuestData, std::set< st
for( auto enemy : enemy_strings ) for( auto enemy : enemy_strings )
{ {
scriptEntry += " case " + enemy + ": { break; }\n"; scriptEntry += " case " + titleCaseNoUnderscores( enemy ) + ": { break; }\n";
} }
if( !enemy_ids.empty() ) if( !enemy_ids.empty() )
@ -248,14 +249,14 @@ 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 ) override\n" " void onEObjHit( uint32_t npcId, Entity::Player& player, uint32_t actionId )\n"
" {\n" " {\n"
" switch( actionId )\n" " switch( actionId )\n"
" {\n" ); " {\n" );
for( auto action : action_names ) for( auto action : action_names )
{ {
actionEntry += " case " + action + ": { break; }\n"; actionEntry += " case " + titleCaseNoUnderscores( action ) + ": { break; }\n";
} }
if( !action_ids.empty() ) if( !action_ids.empty() )