mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-01 22:07:45 +00:00
Code Activity

More style, more typo, more fix

Browse source
This commit is contained in:
Dantestyle 2018-05-21 23:21:15 +02:00
parent 24e63e52a5
commit 138dd3d536
3 changed files with 38 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/servers/Scripts/quest/subquest/gridania/SubFst003.cpp
View file

@ -37,82 +37,77 @@ class SubFst003 : public EventScript
static constexpr auto Seq1Actor1Npctradeok = 100; static constexpr auto Seq1Actor1Npctradeok = 100;
public: public:
SubFst003( ) : EventScript( 65562 ) SubFst003() : EventScript( 65562 )
{ }; {};
~SubFst003( ) ~SubFst003()
{ }; {};
void onTalk(uint32_t eventId, Entity::Player& player, uint64_t actorId) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
auto actor = Event::mapEventActorToRealActor(actorId); auto actor = Event::mapEventActorToRealActor( actorId );
if (actor == SubFst003::Actor0) if( actor == SubFst003::Actor0 )
{ {
Scene00000(player); Scene00000( player );
} }
else if (actor == SubFst003::Actor1 && player.getQuestUI8AL(m_id) == 1) else if(actor == SubFst003::Actor1 )
{ {
Scene00001(player); Scene00001( player );
} }
} }
private: private:
void Scene00000(Entity::Player& player) void Scene00000( Entity::Player& player )
{ {
player.playScene(m_id, 0, 8192, player.playScene( getId(), 0, HIDE_HOTBAR,
[&](Entity::Player& player, const Event::SceneResult& result) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if (result.param2 == 1) // accept quest if( result.param2 == 1 ) // accept quest
{ {
player.updateQuest(m_id, 255); player.updateQuest( getId(), 255 );
player.setQuestUI8AL(m_id, 1); player.setQuestUI8BH( getId(), 1 );
} }
}); } );
} }
void Scene00001(Entity::Player& player) void Scene00001( Entity::Player& player )
{ {
player.playScene(m_id, 1, 8192, player.playScene( getId(), 1, HIDE_HOTBAR,
[&](Entity::Player& player, const Event::SceneResult& result) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if (result.param2 == 1) if( result.param2 == 1 )
{ {
Scene00100(player); Scene00100( player );
} }
else else
{ {
Scene00099(player); Scene00099( player );
} }
}); } );
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
{ {
player.playScene(m_id, 99, 8192, player.playScene( getId(), 99, HIDE_HOTBAR,
[&](Entity::Player& player, const Event::SceneResult& result) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.playScene(m_id, 99, 0, 0, 0); player.playScene( getId(), 99, 0, 0, 0 );
}); } );
} }
void Scene00100( Entity::Player& player ) void Scene00100( Entity::Player& player )
{ {
player.playScene(m_id, 100, 8192, player.playScene( getId(), 100, HIDE_HOTBAR,
[&](Entity::Player& player, const Event::SceneResult& result) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.sendQuestMessage(m_id, 1, 0, 0, 0); player.setQuestUI8BH( getId(), 0);
player.setQuestUI8BH(m_id, 1);
player.setQuestUI8AL(m_id, 0);
if (player.getQuestUI8BH(m_id) == 1) if( player.giveQuestRewards( getId(), 0 ) )
{ {
if (player.giveQuestRewards(m_id, 0)) player.finishQuest( getId() );
{
player.finishQuest(m_id);
} }
} } );
});
} }
}; };

4
src/servers/Scripts/quest/subquest/gridania/SubFst004.cpp
View file

@ -42,9 +42,9 @@ class SubFst004 : public EventScript
public: public:
SubFst004() : EventScript( 65563 ) SubFst004() : EventScript( 65563 )
{ }; {};
~SubFst004() ~SubFst004()
{ }; {};
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {

4
src/servers/Scripts/quest/subquest/gridania/SubFst019.cpp
View file

@ -35,9 +35,9 @@ class SubFst019 : public EventScript
public: public:
SubFst019() : EventScript( 65585 ) SubFst019() : EventScript( 65585 )
{ }; {};
~SubFst019() ~SubFst019()
{ }; {};
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {