diff --git a/bin/config/settings_rest.xml b/bin/config/settings_rest.xml
index 1ee97228..af0c2fb9 100644
--- a/bin/config/settings_rest.xml
+++ b/bin/config/settings_rest.xml
@@ -11,7 +11,7 @@
127.0.0.1
127.0.0.1
-
+
default
80
@@ -23,4 +23,9 @@
sapphire
+
+
+
+ 255
+
\ No newline at end of file
diff --git a/bin/config/settings_zone.xml b/bin/config/settings_zone.xml
index a09254e9..2b0a3a4a 100644
--- a/bin/config/settings_zone.xml
+++ b/bin/config/settings_zone.xml
@@ -18,7 +18,11 @@
-
- <<<Welcome to Sapphire>>>
+
+
+ <<<Welcome to Sapphire>>>
+ This is a very good server
+ You can change these messages by editing MotDArray in config/settings_zone.xml
+
diff --git a/sql/charadetail.sql b/sql/charadetail.sql
index 1b27b1af..05ed0de0 100644
--- a/sql/charadetail.sql
+++ b/sql/charadetail.sql
@@ -69,6 +69,7 @@ CREATE TABLE IF NOT EXISTS `charadetail` (
`PathId` int(10) DEFAULT NULL,
`StepIndex` int(5) DEFAULT NULL,
`ChocoboTaxiStandFlags` binary(8) DEFAULT NULL,
+ `GMRank` int(3) DEFAULT '0',
`unlocks` binary(64) DEFAULT NULL,
`CharacterId` int(20) NOT NULL DEFAULT '0',
`IS_DELETE` int(3) DEFAULT '0',
diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/Server_Lobby/GameConnection.cpp
index c9388e5d..21f45ef3 100644
--- a/src/servers/Server_Lobby/GameConnection.cpp
+++ b/src/servers/Server_Lobby/GameConnection.cpp
@@ -218,7 +218,7 @@ void Core::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uin
uint64_t lookupId = *reinterpret_cast< uint64_t* >( &packet.data[0] + 0x18 );
- uint32_t logInCharId;
+ uint32_t logInCharId = -1;
std::string logInCharName;
auto charList = g_restConnector.getCharList( ( char * )m_pSession->getSessionId() );
for( uint32_t i = 0; i < charList.size(); i++ )
@@ -233,6 +233,8 @@ void Core::Network::GameConnection::enterWorld( FFXIVARR_PACKET_RAW& packet, uin
}
}
+ if( logInCharId == -1 )
+ return;
g_log.info( "[" + std::to_string( m_pSession->getAccountID() ) + "] Logging in as " + logInCharName + "(" + std::to_string( logInCharId ) + ")" );
diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp
index 591b05ca..98ebe9ac 100644
--- a/src/servers/Server_REST/PlayerMinimal.cpp
+++ b/src/servers/Server_REST/PlayerMinimal.cpp
@@ -270,6 +270,7 @@ namespace Core {
" unlocks, "
" QuestTracking, "
" Aetheryte, "
+ " GMRank, "
" UPDATE_DATE ) "
" VALUES (" + std::to_string( m_iD ) + ", "
+ std::to_string( m_guardianDeity ) + ", "
@@ -283,7 +284,8 @@ namespace Core {
+ "UNHEX('" + std::string( Util::binaryToHexString( (uint8_t*)questComplete, 200 ) ) + "'), "
+ "UNHEX('" + std::string( Util::binaryToHexString( (uint8_t*)unlocks, 64 ) ) + "'), "
+ "UNHEX('" + std::string( Util::binaryToHexString( (uint8_t*)questTracking, 10 ) ) + "'), "
- + "UNHEX('" + std::string( Util::binaryToHexString( (uint8_t*)aetherytes, 12 ) ) + "'), NOW());" );
+ + "UNHEX('" + std::string( Util::binaryToHexString( (uint8_t*)aetherytes, 12 ) ) + "'),"
+ + std::to_string( m_gmRank ) + ", NOW());" );
g_database.execute( "INSERT INTO characlass (CharacterId, Lv_" + std::to_string( g_exdData.m_classJobInfoMap[m_class].exp_idx ) + ", UPDATE_DATE ) "
diff --git a/src/servers/Server_REST/PlayerMinimal.h b/src/servers/Server_REST/PlayerMinimal.h
index af195966..01083752 100644
--- a/src/servers/Server_REST/PlayerMinimal.h
+++ b/src/servers/Server_REST/PlayerMinimal.h
@@ -140,6 +140,16 @@ namespace Core {
m_tribe = tribe;
}
+ uint8_t getGmRank()
+ {
+ return m_birthMonth;
+ }
+
+ void setGmRank( uint8_t rank )
+ {
+ m_gmRank = rank;
+ }
+
uint32_t m_modelEquip[10];
private:
@@ -162,6 +172,8 @@ namespace Core {
std::map m_classMap;
uint8_t m_look[26];
+ uint8_t m_gmRank;
+
char m_name[34];
diff --git a/src/servers/Server_REST/SapphireAPI.cpp b/src/servers/Server_REST/SapphireAPI.cpp
index a1072585..79bfd87f 100644
--- a/src/servers/Server_REST/SapphireAPI.cpp
+++ b/src/servers/Server_REST/SapphireAPI.cpp
@@ -113,7 +113,7 @@ bool Core::Network::SapphireAPI::createAccount( const std::string& username, con
}
-int Core::Network::SapphireAPI::createCharacter( const int& accountId, const std::string& name, const std::string& infoJson )
+int Core::Network::SapphireAPI::createCharacter( const int& accountId, const std::string& name, const std::string& infoJson, const int& gmRank )
{
Core::PlayerMinimal newPlayer;
@@ -166,6 +166,7 @@ int Core::Network::SapphireAPI::createCharacter( const int& accountId, const std
newPlayer.setBirthDay( tmpVector2.at( 3 ), tmpVector2.at( 2 ) );
newPlayer.setClass( tmpVector2.at( 4 ) );
newPlayer.setTribe( tmpVector2.at( 5 ) );
+ newPlayer.setGmRank( gmRank );
newPlayer.saveAsNew();
diff --git a/src/servers/Server_REST/SapphireAPI.h b/src/servers/Server_REST/SapphireAPI.h
index 09b86729..c16c6919 100644
--- a/src/servers/Server_REST/SapphireAPI.h
+++ b/src/servers/Server_REST/SapphireAPI.h
@@ -27,7 +27,7 @@ namespace Core
bool createAccount( const std::string& username, const std::string& pass, std::string& sId );
- int32_t createCharacter( const int& accountId, const std::string& name, const std::string& infoJson );
+ int32_t createCharacter( const int& accountId, const std::string& name, const std::string& infoJson, const int& gmRank );
void deleteCharacter( std::string name, uint32_t accountId );
diff --git a/src/servers/Server_REST/main.cpp b/src/servers/Server_REST/main.cpp
index df383565..419dc0a6 100644
--- a/src/servers/Server_REST/main.cpp
+++ b/src/servers/Server_REST/main.cpp
@@ -331,7 +331,7 @@ int main(int argc, char* argv[])
}
else
{
- int32_t charId = g_sapphireAPI.createCharacter( result, name, finalJson );
+ int32_t charId = g_sapphireAPI.createCharacter( result, name, finalJson, m_pConfig->getValue< uint8_t >( "Settings.Parameters.DefaultGMRank", 255 ) );
std::string json_string = "{\"result\":\"" + std::to_string( charId ) + "\"}";
*response << "HTTP/1.1 200\r\nContent-Length: " << json_string.length() << "\r\n\r\n" << json_string;
diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp
index 406ceefb..45aa6d3c 100644
--- a/src/servers/Server_Zone/Actor/Player.cpp
+++ b/src/servers/Server_Zone/Actor/Player.cpp
@@ -110,6 +110,16 @@ uint16_t Core::Entity::Player::getZoneId() const
return m_zoneId;
}
+uint8_t Core::Entity::Player::getGmRank() const
+{
+ return m_gmRank;
+}
+
+void Core::Entity::Player::setGmRank( uint8_t rank )
+{
+ m_gmRank = rank;
+}
+
uint8_t Core::Entity::Player::getMode() const
{
return m_mode;
@@ -780,11 +790,6 @@ void Core::Entity::Player::setLevelForClass( uint8_t level, Core::Common::ClassJ
setSyncFlag( PlayerSyncFlags::ExpLevel );
}
-uint8_t Core::Entity::Player::getUserLevel() const
-{
- return m_userLevel;
-}
-
void Core::Entity::Player::eventActionStart( uint32_t eventId,
uint32_t action,
ActionCallback finishCallback,
diff --git a/src/servers/Server_Zone/Actor/Player.h b/src/servers/Server_Zone/Actor/Player.h
index 6146cce4..a34d8a46 100644
--- a/src/servers/Server_Zone/Actor/Player.h
+++ b/src/servers/Server_Zone/Actor/Player.h
@@ -478,6 +478,9 @@ public:
uint16_t getZoneId() const;
+ uint8_t getGmRank() const;
+ void setGmRank( uint8_t rank );
+
uint8_t getMode() const;
void setMode( uint8_t mode );
@@ -589,7 +592,7 @@ private:
boost::shared_ptr< Common::QuestActive > m_activeQuests[30];
int16_t m_questTracking[5];
uint8_t m_stateFlags[7];
- uint8_t m_userLevel;
+ uint8_t m_gmRank;
uint16_t zoneId;
bool m_bInCombat;
diff --git a/src/servers/Server_Zone/Actor/PlayerEvent.cpp b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
index 70817511..1240c800 100644
--- a/src/servers/Server_Zone/Actor/PlayerEvent.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
@@ -234,9 +234,9 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
void Core::Entity::Player::onLogin()
{
- ;
- // TODO: Replace this with MoTD from config
- sendNotice( g_serverZone.getConfig()->getValue< std::string >( "Settings.Parameters.MotD", " <<>>" ) );
+ for( auto& child : g_serverZone.getConfig()->getChild( "Settings.Parameters.MotDArray" ) ) {
+ sendNotice( child.second.data() );
+ }
}
void Core::Entity::Player::onZoneStart()
diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp
index 6f7b507b..e5ba6a92 100644
--- a/src/servers/Server_Zone/Actor/PlayerSql.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp
@@ -80,7 +80,8 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
"cd.GrandCompany, "
"cd.GrandCompanyRank, "
"cd.CFPenaltyUntil, "
- "cd.OpeningSequence "
+ "cd.OpeningSequence, "
+ "cd.GMRank "
"FROM charabase AS c "
" INNER JOIN charadetail AS cd "
" ON c.CharacterId = cd.CharacterId "
@@ -171,13 +172,13 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
m_openingSequence = field[36].getUInt32();
+ m_gmRank = field[37].getUInt8();
+
m_pCell = nullptr;
if( !loadActiveQuests() || !loadClassData() || !loadSearchInfo() )
g_log.error( "Player id " + char_id_str + " data corrupt!" );
- m_userLevel = 1;
-
m_maxHp = getMaxHp();
m_maxMp = getMaxMp();
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
index 88136b4f..697bcbf8 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
@@ -70,6 +70,12 @@ void Core::DebugCommandHandler::registerCommand( const std::string& n, Core::Deb
void Core::DebugCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr pPlayer )
{
+ if( pPlayer->getGmRank() <= 0 )
+ {
+ pPlayer->sendUrgent( "You are not allowed to use debug commands." );
+ return;
+ }
+
// define callback pointer
void ( DebugCommandHandler::*pf )( char *, Entity::PlayerPtr, boost::shared_ptr< DebugCommand > );
diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
index d2a063b7..f51c776f 100644
--- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
@@ -49,373 +49,384 @@ using namespace Core::Network::Packets::Server;
enum GmCommand
{
- Pos = 0x0000,
- Lv = 0x0001,
- Race = 0x0002,
- Tribe = 0x0003,
- Sex = 0x0004,
- Time = 0x0005,
- Weather = 0x0006,
- Call = 0x0007,
- Inspect = 0x0008,
- Speed = 0x0009,
- Invis = 0x000D,
+ Pos = 0x0000,
+ Lv = 0x0001,
+ Race = 0x0002,
+ Tribe = 0x0003,
+ Sex = 0x0004,
+ Time = 0x0005,
+ Weather = 0x0006,
+ Call = 0x0007,
+ Inspect = 0x0008,
+ Speed = 0x0009,
+ Invis = 0x000D,
- Raise = 0x0010,
- Kill = 0x000E,
- Icon = 0x0012,
+ Raise = 0x0010,
+ Kill = 0x000E,
+ Icon = 0x0012,
- Hp = 0x0064,
- Mp = 0x0065,
- Tp = 0x0066,
- Gp = 0x0067,
+ Hp = 0x0064,
+ Mp = 0x0065,
+ Tp = 0x0066,
+ Gp = 0x0067,
- Item = 0x00C8,
- Gil = 0x00C9,
- Collect = 0x00CA,
+ Item = 0x00C8,
+ Gil = 0x00C9,
+ Collect = 0x00CA,
- QuestAccept = 0x012C,
- QuestCancel = 0x012D,
- QuestComplete = 0x012E,
- QuestIncomplete = 0x012F,
- QuestSequence = 0x0130,
- QuestInspect = 0x0131,
- GC = 0x0154,
- GCRank = 0x0155,
- TeriInfo = 0x025D,
- Jump = 0x025E,
- JumpNpc = 0x025F,
+ QuestAccept = 0x012C,
+ QuestCancel = 0x012D,
+ QuestComplete = 0x012E,
+ QuestIncomplete = 0x012F,
+ QuestSequence = 0x0130,
+ QuestInspect = 0x0131,
+ GC = 0x0154,
+ GCRank = 0x0155,
+ TeriInfo = 0x025D,
+ Jump = 0x025E,
+ JumpNpc = 0x025F,
};
-void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPacket,
- Entity::PlayerPtr pPlayer )
+void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPacket, Entity::PlayerPtr pPlayer )
{
- uint32_t commandId = inPacket.getValAt< uint32_t >( 0x20 );
- uint32_t param1 = inPacket.getValAt< uint32_t >( 0x24 );
- uint32_t param2 = inPacket.getValAt< uint32_t >( 0x28 );
- uint32_t param3 = inPacket.getValAt< uint32_t >( 0x38 );
+ if( pPlayer->getGmRank() <= 0 )
+ return;
- g_log.debug( pPlayer->getName() + " used GM1 commandId: " + std::to_string( commandId ) +
- ", params: " + std::to_string( param1 ) + ", " +
- std::to_string( param2 ) + ", " + std::to_string( param3 ) );
+ uint32_t commandId = inPacket.getValAt< uint32_t >( 0x20 );
+ uint32_t param1 = inPacket.getValAt< uint32_t >( 0x24 );
+ uint32_t param2 = inPacket.getValAt< uint32_t >( 0x28 );
+ uint32_t param3 = inPacket.getValAt< uint32_t >( 0x38 );
- Core::Entity::ActorPtr targetActor;
+ g_log.debug( pPlayer->getName() + " used GM1 commandId: " + std::to_string( commandId ) +
+ ", params: " + std::to_string( param1 ) + ", " +
+ std::to_string( param2 ) + ", " + std::to_string( param3 ) );
+
+ Core::Entity::ActorPtr targetActor;
- if( pPlayer->getId() == param3 )
- {
- targetActor = pPlayer;
- }
- else {
- auto inRange = pPlayer->getInRangeActors();
- for( auto actor : inRange )
- {
- if( actor->getId() == param3 )
- targetActor = actor;
- }
- }
+ if( pPlayer->getId() == param3 )
+ {
+ targetActor = pPlayer;
+ }
+ else {
+ auto inRange = pPlayer->getInRangeActors();
+ for( auto actor : inRange )
+ {
+ if( actor->getId() == param3 )
+ targetActor = actor;
+ }
+ }
- if( !targetActor )
- return;
- auto targetPlayer = targetActor->getAsPlayer();
+ if( !targetActor )
+ return;
+ auto targetPlayer = targetActor->getAsPlayer();
- switch( commandId )
- {
- case GmCommand::Kill:
- {
- targetActor->takeDamage( 9999999 );
- pPlayer->sendNotice( "Killed " + std::to_string( targetActor->getId() ) );
- break;
- }
- case GmCommand::QuestSequence:
- {
- targetPlayer->updateQuest( param1, param2 );
- break;
- }
- case GmCommand::QuestComplete:
- {
- targetPlayer->finishQuest( param1 );
- break;
- }
- case GmCommand::QuestAccept:
- {
- targetPlayer->updateQuest( param1, 1 );
- break;
- }
- case GmCommand::QuestCancel:
- {
- targetPlayer->removeQuest( param1 );
- break;
- }
- case GmCommand::QuestIncomplete:
- {
- targetPlayer->unfinishQuest( param1 );
- break;
- }
- case GmCommand::Speed:
- {
- targetPlayer->queuePacket( ActorControlPacket143( pPlayer->getId(), Flee, param1 ) );
- pPlayer->sendNotice( "Speed for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- break;
- }
- case GmCommand::Gil:
- {
- targetPlayer->addCurrency( 1, param1 );
- pPlayer->sendNotice( "Added " + std::to_string( param1 ) + " Gil for " + targetPlayer->getName() );
- break;
- }
- case GmCommand::Lv:
- {
- targetPlayer->setLevel( param1 );
- pPlayer->sendNotice( "Level for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- break;
- }
- case GmCommand::Hp:
- {
- targetPlayer->setHp( param1 );
- pPlayer->sendNotice( "Hp for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- break;
- }
- case GmCommand::Mp:
- {
- targetPlayer->setMp( param1 );
- pPlayer->sendNotice( "Mp for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- break;
- }
- case GmCommand::Gp:
- {
- targetPlayer->setHp( param1 );
- pPlayer->sendNotice( "Gp for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- break;
- }
- case GmCommand::Sex:
- {
- targetPlayer->setLookAt( CharaLook::Gender, param1 );
- pPlayer->sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- targetPlayer->spawn( targetPlayer );
- auto inRange = targetActor->getInRangeActors();
- for( auto actor : inRange )
- {
- targetPlayer->despawn( actor->getAsPlayer() );
- targetPlayer->spawn( actor->getAsPlayer() );
- }
- break;
- }
- case GmCommand::Race:
- {
- targetPlayer->setLookAt( CharaLook::Race, param1 );
- pPlayer->sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- targetPlayer->spawn( targetPlayer );
- auto inRange = targetPlayer->getInRangeActors();
- for( auto actor : inRange )
- {
- targetPlayer->despawn( actor->getAsPlayer() );
- targetPlayer->spawn( actor->getAsPlayer() );
- }
- break;
- }
- case GmCommand::Tribe:
- {
- targetPlayer->setLookAt( CharaLook::Tribe, param1 );
- pPlayer->sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- targetPlayer->spawn( targetPlayer );
- auto inRange = targetPlayer->getInRangeActors();
- for( auto actor : inRange )
- {
- targetPlayer->despawn( actor->getAsPlayer() );
- targetPlayer->spawn( actor->getAsPlayer() );
- }
- break;
- }
- case GmCommand::Item:
- {
- if( param2 < 1 || param2 > 99 )
- {
- param2 = 1;
- }
+ switch( commandId )
+ {
+ case GmCommand::Kill:
+ {
+ targetActor->takeDamage( 9999999 );
+ pPlayer->sendNotice( "Killed " + std::to_string( targetActor->getId() ) );
+ break;
+ }
+ case GmCommand::QuestSequence:
+ {
+ targetPlayer->updateQuest( param1, param2 );
+ break;
+ }
+ case GmCommand::QuestComplete:
+ {
+ targetPlayer->finishQuest( param1 );
+ break;
+ }
+ case GmCommand::QuestAccept:
+ {
+ targetPlayer->updateQuest( param1, 1 );
+ break;
+ }
+ case GmCommand::QuestCancel:
+ {
+ targetPlayer->removeQuest( param1 );
+ break;
+ }
+ case GmCommand::QuestIncomplete:
+ {
+ targetPlayer->unfinishQuest( param1 );
+ break;
+ }
+ case GmCommand::Speed:
+ {
+ targetPlayer->queuePacket( ActorControlPacket143( pPlayer->getId(), Flee, param1 ) );
+ pPlayer->sendNotice( "Speed for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ break;
+ }
+ case GmCommand::Gil:
+ {
+ targetPlayer->addCurrency( 1, param1 );
+ pPlayer->sendNotice( "Added " + std::to_string( param1 ) + " Gil for " + targetPlayer->getName() );
+ break;
+ }
+ case GmCommand::Lv:
+ {
+ targetPlayer->setLevel( param1 );
+ pPlayer->sendNotice( "Level for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ break;
+ }
+ case GmCommand::Hp:
+ {
+ targetPlayer->setHp( param1 );
+ pPlayer->sendNotice( "Hp for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ break;
+ }
+ case GmCommand::Mp:
+ {
+ targetPlayer->setMp( param1 );
+ pPlayer->sendNotice( "Mp for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ break;
+ }
+ case GmCommand::Gp:
+ {
+ targetPlayer->setHp( param1 );
+ pPlayer->sendNotice( "Gp for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ break;
+ }
+ case GmCommand::Sex:
+ {
+ targetPlayer->setLookAt( CharaLook::Gender, param1 );
+ pPlayer->sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ targetPlayer->spawn( targetPlayer );
+ auto inRange = targetActor->getInRangeActors();
+ for( auto actor : inRange )
+ {
+ targetPlayer->despawn( actor->getAsPlayer() );
+ targetPlayer->spawn( actor->getAsPlayer() );
+ }
+ break;
+ }
+ case GmCommand::Race:
+ {
+ targetPlayer->setLookAt( CharaLook::Race, param1 );
+ pPlayer->sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ targetPlayer->spawn( targetPlayer );
+ auto inRange = targetPlayer->getInRangeActors();
+ for( auto actor : inRange )
+ {
+ targetPlayer->despawn( actor->getAsPlayer() );
+ targetPlayer->spawn( actor->getAsPlayer() );
+ }
+ break;
+ }
+ case GmCommand::Tribe:
+ {
+ targetPlayer->setLookAt( CharaLook::Tribe, param1 );
+ pPlayer->sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ targetPlayer->spawn( targetPlayer );
+ auto inRange = targetPlayer->getInRangeActors();
+ for( auto actor : inRange )
+ {
+ targetPlayer->despawn( actor->getAsPlayer() );
+ targetPlayer->spawn( actor->getAsPlayer() );
+ }
+ break;
+ }
+ case GmCommand::Item:
+ {
+ if( param2 < 1 || param2 > 99 )
+ {
+ param2 = 1;
+ }
- if( ( param1 == 0xcccccccc ) )
- {
- pPlayer->sendUrgent( "Syntaxerror." );
- return;
- }
+ if( ( param1 == 0xcccccccc ) )
+ {
+ pPlayer->sendUrgent( "Syntaxerror." );
+ return;
+ }
- if( !targetPlayer->addItem( -1, param1, param2 ) )
- pPlayer->sendUrgent( "Item " + std::to_string( param1 ) + " not found..." );
- break;
- }
- case GmCommand::Weather:
- {
- targetPlayer->getCurrentZone()->setWeatherOverride( param1 );
- pPlayer->sendNotice( "Weather in Zone \"" + targetPlayer->getCurrentZone()->getName() + "\" of " +
- targetPlayer->getName() + " set in range." );
- break;
- }
- case GmCommand::TeriInfo:
- {
- pPlayer->sendNotice( "ZoneId: " + std::to_string( pPlayer->getZoneId() ) + "\nName: " +
- pPlayer->getCurrentZone()->getName() + "\nInternalName: " +
- pPlayer->getCurrentZone()->getInternalName() + "\nPopCount: " +
- std::to_string( pPlayer->getCurrentZone()->getPopCount() ) +
- "\nCurrentWeather:" + std::to_string( pPlayer->getCurrentZone()->getCurrentWeather() ) +
- "\nNextWeather:" + std::to_string( pPlayer->getCurrentZone()->getNextWeather() ) );
- break;
- }
- case GmCommand::Jump:
- {
+ if( !targetPlayer->addItem( -1, param1, param2 ) )
+ pPlayer->sendUrgent( "Item " + std::to_string( param1 ) + " not found..." );
+ break;
+ }
+ case GmCommand::Weather:
+ {
+ targetPlayer->getCurrentZone()->setWeatherOverride( param1 );
+ pPlayer->sendNotice( "Weather in Zone \"" + targetPlayer->getCurrentZone()->getName() + "\" of " +
+ targetPlayer->getName() + " set in range." );
+ break;
+ }
+ case GmCommand::TeriInfo:
+ {
+ pPlayer->sendNotice( "ZoneId: " + std::to_string( pPlayer->getZoneId() ) + "\nName: " +
+ pPlayer->getCurrentZone()->getName() + "\nInternalName: " +
+ pPlayer->getCurrentZone()->getInternalName() + "\nPopCount: " +
+ std::to_string( pPlayer->getCurrentZone()->getPopCount() ) +
+ "\nCurrentWeather:" + std::to_string( pPlayer->getCurrentZone()->getCurrentWeather() ) +
+ "\nNextWeather:" + std::to_string( pPlayer->getCurrentZone()->getNextWeather() ) );
+ break;
+ }
+ case GmCommand::Jump:
+ {
- auto inRange = pPlayer->getInRangeActors();
- for( auto actor : inRange )
- {
- pPlayer->changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
- targetActor->getRotation() );
- }
- pPlayer->sendNotice( "Jumping to " + targetPlayer->getName() + " in range." );
- break;
- }
- case GmCommand::Collect:
- {
- uint32_t gil = targetPlayer->getCurrency( 1 );
+ auto inRange = pPlayer->getInRangeActors();
+ for( auto actor : inRange )
+ {
+ pPlayer->changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
+ targetActor->getRotation() );
+ }
+ pPlayer->sendNotice( "Jumping to " + targetPlayer->getName() + " in range." );
+ break;
+ }
+ case GmCommand::Collect:
+ {
+ uint32_t gil = targetPlayer->getCurrency( 1 );
- if( gil < param1 )
- {
- pPlayer->sendUrgent( "Player does not have enough Gil(" + std::to_string( gil ) + ")" );
- }
- else
- {
- targetPlayer->removeCurrency( 1, param1 );
- pPlayer->sendNotice( "Removed " + std::to_string( param1 ) +
- " Gil from " + targetPlayer->getName() +
- "(" + std::to_string( gil ) + " before)" );
- }
- break;
- }
- case GmCommand::Icon:
- {
- targetPlayer->setOnlineStatusMask( param1 );
+ if( gil < param1 )
+ {
+ pPlayer->sendUrgent( "Player does not have enough Gil(" + std::to_string( gil ) + ")" );
+ }
+ else
+ {
+ targetPlayer->removeCurrency( 1, param1 );
+ pPlayer->sendNotice( "Removed " + std::to_string( param1 ) +
+ " Gil from " + targetPlayer->getName() +
+ "(" + std::to_string( gil ) + " before)" );
+ }
+ break;
+ }
+ case GmCommand::Icon:
+ {
+ targetPlayer->setOnlineStatusMask( param1 );
- GamePacketNew< FFXIVIpcSetOnlineStatus, ServerZoneIpcType > statusPacket( targetPlayer->getId() );
- statusPacket.data().onlineStatusFlags = param1;
- queueOutPacket( statusPacket );
+ GamePacketNew< FFXIVIpcSetOnlineStatus, ServerZoneIpcType > statusPacket( targetPlayer->getId() );
+ statusPacket.data().onlineStatusFlags = param1;
+ queueOutPacket( statusPacket );
- GamePacketNew< FFXIVIpcSetSearchInfo, ServerZoneIpcType > searchInfoPacket( targetPlayer->getId() );
- searchInfoPacket.data().onlineStatusFlags = param1;
- searchInfoPacket.data().selectRegion = targetPlayer->getSearchSelectRegion();
- sprintf( searchInfoPacket.data().searchMessage, targetPlayer->getSearchMessage() );
- targetPlayer->queuePacket( searchInfoPacket );
+ GamePacketNew< FFXIVIpcSetSearchInfo, ServerZoneIpcType > searchInfoPacket( targetPlayer->getId() );
+ searchInfoPacket.data().onlineStatusFlags = param1;
+ searchInfoPacket.data().selectRegion = targetPlayer->getSearchSelectRegion();
+ sprintf( searchInfoPacket.data().searchMessage, targetPlayer->getSearchMessage() );
+ targetPlayer->queuePacket( searchInfoPacket );
- targetPlayer->sendToInRangeSet( ActorControlPacket142( pPlayer->getId(), SetStatusIcon,
- static_cast< uint8_t >( pPlayer->getOnlineStatus() ) ),
- true );
- pPlayer->sendNotice( "Icon for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
- break;
- }
- case GmCommand::GC:
- {
- targetPlayer->setGc( param1 );
- pPlayer->sendNotice( "GC for " + targetPlayer->getName() +
- " was set to " + std::to_string( targetPlayer->getGc() ) );
- break;
- }
- case GmCommand::GCRank:
- {
- targetPlayer->setGcRankAt( targetPlayer->getGc() - 1, param1 );
- pPlayer->sendNotice( "GC Rank for " + targetPlayer->getName() +
- " for GC " + std::to_string( targetPlayer->getGc()) +
- " was set to " + std::to_string( targetPlayer->getGcRankArray()[targetPlayer->getGc() - 1] ) );
- break;
- }
+ targetPlayer->sendToInRangeSet( ActorControlPacket142( pPlayer->getId(), SetStatusIcon,
+ static_cast< uint8_t >( pPlayer->getOnlineStatus() ) ),
+ true );
+ pPlayer->sendNotice( "Icon for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
+ break;
+ }
+ case GmCommand::GC:
+ {
+ targetPlayer->setGc( param1 );
+ pPlayer->sendNotice( "GC for " + targetPlayer->getName() +
+ " was set to " + std::to_string( targetPlayer->getGc() ) );
+ break;
+ }
+ case GmCommand::GCRank:
+ {
+ targetPlayer->setGcRankAt( targetPlayer->getGc() - 1, param1 );
+ pPlayer->sendNotice( "GC Rank for " + targetPlayer->getName() +
+ " for GC " + std::to_string( targetPlayer->getGc() ) +
+ " was set to " + std::to_string( targetPlayer->getGcRankArray()[targetPlayer->getGc() - 1] ) );
+ break;
+ }
- default:
- pPlayer->sendUrgent( "GM1 Command not implemented: " + std::to_string( commandId ) );
- break;
- }
+ default:
+ pPlayer->sendUrgent( "GM1 Command not implemented: " + std::to_string( commandId ) );
+ break;
+ }
+
+ pPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
+ targetPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
}
-void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPacket,
- Entity::PlayerPtr pPlayer )
+void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPacket, Entity::PlayerPtr pPlayer )
{
- uint32_t commandId = inPacket.getValAt< uint32_t >( 0x20 );
- std::string param1 = inPacket.getStringAt( 0x34 );
+ if( pPlayer->getGmRank() <= 0 )
+ return;
- g_log.debug( pPlayer->getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
+ uint32_t commandId = inPacket.getValAt< uint32_t >( 0x20 );
+ std::string param1 = inPacket.getStringAt( 0x34 );
- auto targetSession = g_serverZone.getSession( param1 );
- Core::Entity::ActorPtr targetActor;
+ g_log.debug( pPlayer->getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
- if( targetSession != nullptr )
- {
- targetActor = targetSession->getPlayer();
- }
- else
- {
- if( param1 == "self" )
- {
- targetActor = pPlayer;
- }
- else
- {
- pPlayer->sendUrgent("Player " + param1 + " not found on this server.");
- return;
- }
- }
+ auto targetSession = g_serverZone.getSession( param1 );
+ Core::Entity::ActorPtr targetActor;
- if( !targetActor )
- return;
- auto targetPlayer = targetActor->getAsPlayer();
+ if( targetSession != nullptr )
+ {
+ targetActor = targetSession->getPlayer();
+ }
+ else
+ {
+ if( param1 == "self" )
+ {
+ targetActor = pPlayer;
+ }
+ else
+ {
+ pPlayer->sendUrgent( "Player " + param1 + " not found on this server." );
+ return;
+ }
+ }
- switch( commandId )
- {
- case GmCommand::Raise:
- {
- targetPlayer->resetHp();
- targetPlayer->resetMp();
- targetPlayer->setStatus( Entity::Actor::ActorStatus::Idle );
- targetPlayer->setSyncFlag( Status );
+ if( !targetActor )
+ return;
+ auto targetPlayer = targetActor->getAsPlayer();
- targetPlayer->sendToInRangeSet( ActorControlPacket143( pPlayer->getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
- targetPlayer->sendToInRangeSet( ActorControlPacket142( pPlayer->getId(), SetStatus,
- static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle ) ), true );
- pPlayer->sendNotice( "Raised " + targetPlayer->getName());
- break;
- }
- case GmCommand::Jump:
- {
- if( targetPlayer->getZoneId() != pPlayer->getZoneId() )
- {
- pPlayer->setZone( targetPlayer->getZoneId() );
- }
- pPlayer->changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
- targetActor->getRotation() );
- pPlayer->sendNotice( "Jumping to " + targetPlayer->getName());
- break;
- }
- case GmCommand::Call:
- {
- if( targetPlayer->getZoneId() != pPlayer->getZoneId() )
- targetPlayer->setZone( pPlayer->getZoneId() );
+ switch( commandId )
+ {
+ case GmCommand::Raise:
+ {
+ targetPlayer->resetHp();
+ targetPlayer->resetMp();
+ targetPlayer->setStatus( Entity::Actor::ActorStatus::Idle );
+ targetPlayer->setSyncFlag( Status );
- targetPlayer->changePosition( pPlayer->getPos().x, pPlayer->getPos().y, pPlayer->getPos().z,
- pPlayer->getRotation() );
- pPlayer->sendNotice( "Calling " + targetPlayer->getName() );
- break;
- }
- case GmCommand::Inspect:
- {
- pPlayer->sendNotice( "Name: " + targetPlayer->getName() +
- "\nGil: " + std::to_string( targetPlayer->getCurrency( 1 ) ) +
- "\nZone: " + targetPlayer->getCurrentZone()->getName() +
- "(" + std::to_string( targetPlayer->getZoneId() ) + ")" +
- "\nClass: " + std::to_string( targetPlayer->getClass() ) +
- "\nLevel: " + std::to_string( targetPlayer->getLevel() ) +
- "\nExp: " + std::to_string( targetPlayer->getExp() ) +
- "\nSearchMessage: " + targetPlayer->getSearchMessage() +
- "\nPlayTime: " + std::to_string( targetPlayer->getPlayTime() ) );
- break;
- }
+ targetPlayer->sendToInRangeSet( ActorControlPacket143( pPlayer->getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
+ targetPlayer->sendToInRangeSet( ActorControlPacket142( pPlayer->getId(), SetStatus,
+ static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle ) ), true );
+ pPlayer->sendNotice( "Raised " + targetPlayer->getName() );
+ break;
+ }
+ case GmCommand::Jump:
+ {
+ if( targetPlayer->getZoneId() != pPlayer->getZoneId() )
+ {
+ pPlayer->setZone( targetPlayer->getZoneId() );
+ }
+ pPlayer->changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
+ targetActor->getRotation() );
+ pPlayer->sendNotice( "Jumping to " + targetPlayer->getName() );
+ break;
+ }
+ case GmCommand::Call:
+ {
+ if( targetPlayer->getZoneId() != pPlayer->getZoneId() )
+ targetPlayer->setZone( pPlayer->getZoneId() );
+
+ targetPlayer->changePosition( pPlayer->getPos().x, pPlayer->getPos().y, pPlayer->getPos().z,
+ pPlayer->getRotation() );
+ pPlayer->sendNotice( "Calling " + targetPlayer->getName() );
+ break;
+ }
+ case GmCommand::Inspect:
+ {
+ pPlayer->sendNotice( "Name: " + targetPlayer->getName() +
+ "\nGil: " + std::to_string( targetPlayer->getCurrency( 1 ) ) +
+ "\nZone: " + targetPlayer->getCurrentZone()->getName() +
+ "(" + std::to_string( targetPlayer->getZoneId() ) + ")" +
+ "\nClass: " + std::to_string( targetPlayer->getClass() ) +
+ "\nLevel: " + std::to_string( targetPlayer->getLevel() ) +
+ "\nExp: " + std::to_string( targetPlayer->getExp() ) +
+ "\nSearchMessage: " + targetPlayer->getSearchMessage() +
+ "\nPlayTime: " + std::to_string( targetPlayer->getPlayTime() ) );
+ break;
+ }
+
+ default:
+ pPlayer->sendUrgent( "GM2 Command not implemented: " + std::to_string( commandId ) );
+ break;
+ }
+
+ pPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
+ targetPlayer->setSyncFlag( Common::PlayerSyncFlags::All );
- default:
- pPlayer->sendUrgent( "GM2 Command not implemented: " + std::to_string( commandId ) );
- break;
- }
}
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
index d4e726a0..5bd39a09 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -45,7 +45,7 @@ namespace Server {
m_data.tPCurr = pPlayer->getTp();
m_data.hPMax = pPlayer->getMaxHp();
m_data.mPMax = pPlayer->getMaxMp();
- m_data.gmRank = 0xff;
+ m_data.gmRank = pPlayer->getGmRank();
//m_data.tPMax = 3000;
m_data.level = pPlayer->getLevel();
memcpy( m_data.look, pPlayer->getLookArray(), 26 );
diff --git a/src/tools/Script/ce_dump_vfs_path_406.lua b/src/tools/Script/ce_dump_vfs_path_406.lua
new file mode 100644
index 00000000..36c16216
--- /dev/null
+++ b/src/tools/Script/ce_dump_vfs_path_406.lua
@@ -0,0 +1,147 @@
+-- init global variable
+g_dump = io.open(os.date("dump_%Y-%m-%d-%H-%M-%S.txt"), "a")
+g_dump:write("ptr, name\n")
+g_count = 0
+
+-- relative virtual address(rva) to register_whatever function
+-- this assume ffxiv sb benchmark
+-- YOU MUST EDIT THIS TO RIGHT VALUE TO WORK
+-- check http://imgur.com/a/nJCef for disasm
+g_addr = {}
+-- signature: 4053 4881EC60010000 488B??????????4833C4 4889842450010000 C70100000000 488BD9 4585C0 7514
+g_addr.load_master = 0x166140 -- looks like below function is called from this
+
+-- signature: 48895C2408 48896C2410 4889742418 57 4883EC40 498BD9 498BF8 488BF2 488BE9 4D85C9 740A
+-- rva on benchmark was at 0x1624B0 and it's now located at 0x1663E0 (offseted by 0x3F30)
+g_addr.load1 = 0x1663E0 -- mostly loads gfx stuff but does calc in it?
+
+-- these were just calculated from load1 offset (didn't tested)
+g_addr.load2 = 0x162410 + 0x3F30 -- mostly loads gfx stuff
+g_addr.load3 = 0x1626B0 + 0x3F30 -- mostly loads exd data
+g_addr.load4 = 0x162540 + 0x3F30 -- from this on found it because there are next to each other
+g_addr.load5 = 0x162360 + 0x3F30 -- umm, vfx?
+
+g_loadseen = {}
+
+g_xiv = {}
+g_xiv.proc_name = "ffxiv_dx11.exe"
+g_xiv.path = "C:\\Users\\Mino\\Desktop\\FFXIV-SB\\game\\" .. g_xiv.proc_name
+-- because I don't want to login and out every single try
+g_xiv.arg = "SYS.Language=1 SYS.Fps=0 SYS.MainAdapter=\"AMD_Radeon_HD_7800_Series(\\\\.\\DISPLAY1)\" SYS.ScreenMode=0 SYS.ScreenWidth=1280 SYS.ScreenHeight=720 SYS.FullScreenWidth=1280 SYS.FullScreenHeight=720 SYS.Gamma=50 SYS.IsSoundAlways=0 SYS.SoundMaster=100 SYS.SoundBgm=100 SYS.SoundSe=100 SYS.SoundVoice=100 SYS.SoundSystem=100 SYS.SoundEnv=100 SYS.IsSndMaster=0 SYS.IsSndBgm=0 SYS.IsSndSe=0 SYS.IsSndVoice=0 SYS.IsSndSystem=0 SYS.IsSndEnv=0 SYS.WaterWet_DX11=1 SYS.OcclusionCulling_DX11=1 SYS.LodType_DX11=1 SYS.ReflectionType_DX11=0 SYS.AntiAliasing_DX11=0 SYS.TranslucentQuality_DX11=0 SYS.GrassQuality_DX11=2 SYS.ShadowLOD_DX11=1 SYS.ShadowVisibilityTypeSelf_DX11=1 SYS.ShadowVisibilityTypeOther_DX11=0 SYS.ShadowTextureSizeType_DX11=1 SYS.ShadowCascadeCountType_DX11=2 SYS.ShadowSoftShadowType_DX11=1 SYS.PhysicsTypeSelf_DX11=2 SYS.PhysicsTypeOther_DX11=2 SYS.TextureFilterQuality_DX11=2 SYS.TextureAnisotropicQuality_DX11=0 SYS.Vignetting_DX11=1 SYS.RadialBlur_DX11=1 SYS.SSAO_DX11=1 SYS.Glare_DX11=2 SYS.DepthOfField_DX11=1 SYS.ParallaxOcclusion_DX11=0 SYS.Tessellation_DX11=0 SYS.GlareRepresentation_DX11=0"
+g_mode = "attach"
+
+function init()
+ -- attach debugger
+ if g_mode == "create" then
+ print(string.format("Launching ffxiv.exe w/ arg %s", g_xiv.arg))
+ createProcess(g_xiv.path, g_xiv.arg, true, true)
+ elseif g_mode == "attach" then
+ print("Looking for ffxiv.exe..")
+ while not openProcess("ffxiv.exe") do sleep(1) end
+ print("Attaching...")
+ debugProcess()
+ while not getAddress(g_xiv.proc_name) do sleep(1) end
+ print("Module loaded")
+ else
+ print("Unsupported mode!")
+ return
+ end
+
+ for k, v in pairs(g_addr) do
+ -- k = name
+ -- v = rva
+ print(string.format("Attaching %s breakpoint on 0x%X", k, v))
+ debug_setBreakpoint(get_va(v))
+ end
+
+ print("Now waiting for breakpoints..")
+end
+
+function debugger_onBreakpoint()
+ if RIP == get_va(g_addr.load1) then
+ -- dump_message("1>>")
+ dump_addr(R8)
+ elseif RIP == get_va(g_addr.load2) then
+ -- dump_message("2>>")
+ dump_addr(R8)
+ elseif RIP == get_va(g_addr.load3) then
+ -- dump_message("3>>")
+ dump_addr(RCX)
+ elseif RIP == get_va(g_addr.load4) then
+ -- dump_message("4>>")
+ dump_addr(RCX)
+ elseif RIP == get_va(g_addr.load5) then
+ -- dump_message("5>>")
+ dump_addr(RDX)
+ elseif RIP == get_va(g_addr.load_master) then
+ -- dump_message("master>>")
+ dump_addr(RDX)
+ else
+ -- user bp, update gui on ce, but who gives a shit?
+ -- continue execution anyway
+ debug_continueFromBreakpoint("co_run")
+ return 0
+ end
+
+ -- something is missing on the text file because it takes ageeeeeeeeees to write to file
+ -- let just wait it
+
+
+ -- continue execution
+ debug_continueFromBreakpoint("co_run")
+ --return 0 -- update gui
+ return 1
+end
+
+function dump_addr(addr)
+ local vfspath = readString(addr, 256)
+ if not g_loadseen[vfspath] then
+ g_loadseen[vfspath] = true -- set seen flag
+
+ local message = string.format("%X, %s", addr, vfspath)
+ dump_line(message)
+ end
+end
+
+function dump_line(message)
+ dump_message(message .. "\n")
+end
+
+function dump_message(message)
+ g_dump:write(message)
+ g_dump:flush()
+ print(message)
+end
+
+-- mod_base + rva = va
+function get_va(rva)
+ return getAddress(g_xiv.proc_name) + rva
+end
+
+-- rva = va - mod_base
+function get_rva(va)
+ return va - getAddress(g_xiv.proc_name)
+end
+
+-- check mod_base <= va <= mod_base + mod_size
+function is_mmod_addr(va)
+ local mod_base = getAddress(g_xiv.proc_name)
+ local mod_size = getModuleSize(g_xiv.proc_name)
+
+ if mod_base <= va and va <= mod_base + mod_size then
+ return true
+ end
+
+ return false
+end
+
+function split(str)
+ local result = {}
+ for token in string.gmatch(str..",", "([^,]+),%s*") do
+ table.insert(result, all_trim(token))
+ end
+
+ return result
+end
+
+init()