diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp index 578ca55b..22e53190 100644 --- a/src/servers/Scripts/quest/ManFst001.cpp +++ b/src/servers/Scripts/quest/ManFst001.cpp @@ -86,7 +86,7 @@ private: if( result.param2 == 1 ) { if( player.giveQuestRewards( getId(), 0 )) - player.finishQuest( getId()); + player.finishQuest( getId() ); } }; @@ -95,11 +95,11 @@ private: public: ManFst001() : EventScript( 65575 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp index b2824886..9f3c6e3f 100644 --- a/src/servers/Scripts/quest/ManFst002.cpp +++ b/src/servers/Scripts/quest/ManFst002.cpp @@ -72,9 +72,9 @@ private: else player.sendQuestMessage( getId(), 0, 0, 0, 0 ); - auto var_attuned = player.getQuestUI8AL( static_cast< uint16_t >( getId())); - auto var_class = player.getQuestUI8BH( static_cast< uint16_t >( getId())); - auto var_trade = player.getQuestUI8BL( static_cast< uint16_t >( getId())); + auto var_attuned = player.getQuestUI8AL( static_cast< uint16_t >( getId() ) ); + auto var_class = player.getQuestUI8BH( static_cast< uint16_t >( getId() ) ); + auto var_trade = player.getQuestUI8BL( static_cast< uint16_t >( getId() ) ); if( var_attuned == 1 && var_class == 1 && var_trade == 1 ) player.updateQuest( getId(), SEQ_FINISH ); @@ -185,11 +185,11 @@ private: public: ManFst002() : EventScript( 65621 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp index 3da79b16..25344bf2 100644 --- a/src/servers/Scripts/quest/ManFst003.cpp +++ b/src/servers/Scripts/quest/ManFst003.cpp @@ -15,7 +15,8 @@ private: public: - ManFst003() : EventScript( 65659 ) {} + ManFst003() : EventScript( 65659 ) + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp index 3b9bc45e..3c4600a3 100644 --- a/src/servers/Scripts/quest/ManSea001.cpp +++ b/src/servers/Scripts/quest/ManSea001.cpp @@ -132,7 +132,7 @@ private: { if( result.param2 == 1 ) // finish quest { - if( player.giveQuestRewards( getId(), 0 )) + if( player.giveQuestRewards( getId(), 0 ) ) player.finishQuest( getId()); } }; @@ -147,11 +147,11 @@ private: public: ManSea001() : EventScript( 65643 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp index 268fc643..9817969a 100644 --- a/src/servers/Scripts/quest/ManSea002.cpp +++ b/src/servers/Scripts/quest/ManSea002.cpp @@ -141,11 +141,11 @@ private: public: ManSea002() : EventScript( 65644 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); // todo: this doesn't actually play a cutscene after accepting the quest if( actor == ACTOR0 ) diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp index 123551cc..8dd296fb 100644 --- a/src/servers/Scripts/quest/ManWil001.cpp +++ b/src/servers/Scripts/quest/ManWil001.cpp @@ -132,11 +132,11 @@ private: public: ManWil001() : EventScript( 66130 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp index ef99b871..55530020 100644 --- a/src/servers/Scripts/quest/ManWil002.cpp +++ b/src/servers/Scripts/quest/ManWil002.cpp @@ -152,7 +152,7 @@ public: void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp index f5558a74..4c22f807 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp @@ -64,7 +64,7 @@ private: public: SubFst001() : EventScript( 65560 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { @@ -72,13 +72,13 @@ public: if( actor == ACTOR0 ) { - if( !player.hasQuest( getId())) + if( !player.hasQuest( getId() ) ) Scene00000( player ); else Scene00001( player ); } else if( actor == ACTOR1 ) { - if( !player.hasQuest( getId())) + if( !player.hasQuest( getId() ) ) Scene00099( player ); else Scene00100( player ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp index c3f9ae6e..505a601c 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp @@ -40,8 +40,8 @@ private: { if( result.param2 == 1 ) // finish quest { - if( player.giveQuestRewards( getId(), 0 )) - player.finishQuest( getId()); + if( player.giveQuestRewards( getId(), 0 ) ) + player.finishQuest( getId() ); } }; @@ -50,15 +50,15 @@ private: public: SubFst002() : EventScript( 65561 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); - if( actor == ACTOR0 && !player.hasQuest( getId())) + if( actor == ACTOR0 && !player.hasQuest( getId() ) ) Scene00000( player ); - else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH ) + else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH ) Scene00001( player ); } diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp index 83da85a8..a7053079 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp @@ -36,8 +36,8 @@ private: { if( result.param2 == 1 ) // finish quest { - if( player.giveQuestRewards( getId(), 0 )) - player.finishQuest( getId()); + if( player.giveQuestRewards( getId(), 0 ) ) + player.finishQuest( getId() ); } }; @@ -46,11 +46,11 @@ private: public: SubFst010() : EventScript( 65537 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( actor == ACTOR0 ) Scene00000( player ); diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp index 55e50d2d..6c5e2b99 100644 --- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp +++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp @@ -152,11 +152,11 @@ private: public: SubFst013() : EventScript( 65576 ) - { } + {} void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override { - auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); + auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ); if( !player.hasQuest( getId())) { @@ -166,11 +166,11 @@ public: if( actor == ACTOR1 ) // talking to Aunillie while on quest Scene00003( player ); - else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_2 ) + else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_2 ) Scene00002( player ); - else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_4 ) + else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_4 ) Scene00004( player ); - else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH ) + else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH ) Scene00006( player ); } @@ -178,11 +178,11 @@ public: { auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); - if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId()) == SEQ_1 ) + if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 ) Scene00100( player ); - else if( actor == ACTOR1 && emoteId == 18 && player.getQuestSeq( getId()) == SEQ_3 ) + else if( actor == ACTOR1 && emoteId == 18 && player.getQuestSeq( getId() ) == SEQ_3 ) Scene00098( player ); - else if( actor == ACTOR1 && emoteId == 11 && player.getQuestSeq( getId()) == SEQ_5 ) + else if( actor == ACTOR1 && emoteId == 11 && player.getQuestSeq( getId() ) == SEQ_5 ) Scene00096( player ); } }; \ No newline at end of file