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

fix formatting again

Browse source 
thanks clion
This commit is contained in:
Adam 2018-03-20 22:43:16 +11:00
parent 66fbc9931b
commit 660709becb
11 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/servers/Scripts/quest/ManFst001.cpp
View file

@ -86,7 +86,7 @@ private:
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if( player.giveQuestRewards( getId(), 0 )) if( player.giveQuestRewards( getId(), 0 ))
player.finishQuest( getId()); player.finishQuest( getId() );
} }
}; };
@ -95,11 +95,11 @@ private:
public: public:
ManFst001() : EventScript( 65575 ) ManFst001() : EventScript( 65575 )
{ } {}
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

10
src/servers/Scripts/quest/ManFst002.cpp
View file

@ -72,9 +72,9 @@ private:
else else
player.sendQuestMessage( getId(), 0, 0, 0, 0 ); player.sendQuestMessage( getId(), 0, 0, 0, 0 );
auto var_attuned = player.getQuestUI8AL( 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_class = player.getQuestUI8BH( static_cast< uint16_t >( getId() ) );
auto var_trade = player.getQuestUI8BL( 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 ) if( var_attuned == 1 && var_class == 1 && var_trade == 1 )
player.updateQuest( getId(), SEQ_FINISH ); player.updateQuest( getId(), SEQ_FINISH );
@ -185,11 +185,11 @@ private:
public: public:
ManFst002() : EventScript( 65621 ) ManFst002() : EventScript( 65621 )
{ } {}
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

3
src/servers/Scripts/quest/ManFst003.cpp
View file

@ -15,7 +15,8 @@ private:
public: public:
ManFst003() : EventScript( 65659 ) {} ManFst003() : EventScript( 65659 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {

6
src/servers/Scripts/quest/ManSea001.cpp
View file

@ -132,7 +132,7 @@ private:
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 )) if( player.giveQuestRewards( getId(), 0 ) )
player.finishQuest( getId()); player.finishQuest( getId());
} }
}; };
@ -147,11 +147,11 @@ private:
public: public:
ManSea001() : EventScript( 65643 ) ManSea001() : EventScript( 65643 )
{ } {}
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

4
src/servers/Scripts/quest/ManSea002.cpp
View file

@ -141,11 +141,11 @@ private:
public: public:
ManSea002() : EventScript( 65644 ) ManSea002() : EventScript( 65644 )
{ } {}
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( 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 // todo: this doesn't actually play a cutscene after accepting the quest
if( actor == ACTOR0 ) if( actor == ACTOR0 )

4
src/servers/Scripts/quest/ManWil001.cpp
View file

@ -132,11 +132,11 @@ private:
public: public:
ManWil001() : EventScript( 66130 ) ManWil001() : EventScript( 66130 )
{ } {}
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

2
src/servers/Scripts/quest/ManWil002.cpp
View file

@ -152,7 +152,7 @@ public:
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

6
src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
View file

@ -64,7 +64,7 @@ private:
public: public:
SubFst001() : EventScript( 65560 ) SubFst001() : EventScript( 65560 )
{ } {}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{ {
@ -72,13 +72,13 @@ public:
if( actor == ACTOR0 ) if( actor == ACTOR0 )
{ {
if( !player.hasQuest( getId())) if( !player.hasQuest( getId() ) )
Scene00000( player ); Scene00000( player );
else else
Scene00001( player ); Scene00001( player );
} else if( actor == ACTOR1 ) } else if( actor == ACTOR1 )
{ {
if( !player.hasQuest( getId())) if( !player.hasQuest( getId() ) )
Scene00099( player ); Scene00099( player );
else else
Scene00100( player ); Scene00100( player );

12
src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
View file

@ -40,8 +40,8 @@ private:
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 )) if( player.giveQuestRewards( getId(), 0 ) )
player.finishQuest( getId()); player.finishQuest( getId() );
} }
}; };
@ -50,15 +50,15 @@ private:
public: public:
SubFst002() : EventScript( 65561 ) SubFst002() : EventScript( 65561 )
{ } {}
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( 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 ); Scene00000( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH ) else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH )
Scene00001( player ); Scene00001( player );
} }

8
src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
View file

@ -36,8 +36,8 @@ private:
{ {
if( result.param2 == 1 ) // finish quest if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 )) if( player.giveQuestRewards( getId(), 0 ) )
player.finishQuest( getId()); player.finishQuest( getId() );
} }
}; };
@ -46,11 +46,11 @@ private:
public: public:
SubFst010() : EventScript( 65537 ) SubFst010() : EventScript( 65537 )
{ } {}
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 ) if( actor == ACTOR0 )
Scene00000( player ); Scene00000( player );

16
src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
View file

@ -152,11 +152,11 @@ private:
public: public:
SubFst013() : EventScript( 65576 ) SubFst013() : EventScript( 65576 )
{ } {}
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( static_cast< uint32_t >( actorId )); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( !player.hasQuest( getId())) if( !player.hasQuest( getId()))
{ {
@ -166,11 +166,11 @@ public:
if( actor == ACTOR1 ) // talking to Aunillie while on quest if( actor == ACTOR1 ) // talking to Aunillie while on quest
Scene00003( player ); Scene00003( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_2 ) else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_2 )
Scene00002( player ); Scene00002( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_4 ) else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_4 )
Scene00004( player ); Scene00004( player );
else if( actor == ACTOR0 && player.getQuestSeq( getId()) == SEQ_FINISH ) else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH )
Scene00006( player ); Scene00006( player );
} }
@ -178,11 +178,11 @@ public:
{ {
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId )); 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 ); 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 ); 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 ); Scene00096( player );
} }
}; };