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

[Subquests] Adjusts

Browse source
This commit is contained in:
Dantestyle 2018-07-03 21:37:14 +02:00
parent 5a1812773d
commit ef31c62b44
11 changed files with 242 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst003_00026 // Quest Script: SubFst003_00026
@ -42,19 +41,19 @@ class SubFst003 : public EventScript
~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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst003::Actor0 ) if( actor == Actor0 )
{ {
Scene00000( player ); Scene00000( player );
}
else if( actor == SubFst003::Actor1 )
{
Scene00001( player );
}
} }
else if( actor == Actor1 )
{
Scene00001( player );
}
}
private: private:
@ -63,9 +62,9 @@ class SubFst003 : public EventScript
player.playScene( getId(), 0, HIDE_HOTBAR, 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 )
{ {
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
player.setQuestUI8BH( getId(), 1 ); player.setQuestUI8BH( getId(), 1 );
} }
} ); } );
@ -75,16 +74,16 @@ class SubFst003 : public EventScript
{ {
player.playScene( getId(), 1, HIDE_HOTBAR, player.playScene( getId(), 1, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 )
{ {
Scene00100( player ); if( result.param2 == 1 )
} {
else Scene00100( player );
{ }
Scene00099( player ); else
} {
} ); Scene00099( player );
}
} );
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
@ -101,10 +100,13 @@ class SubFst003 : public EventScript
player.playScene( getId(), 100, HIDE_HOTBAR, player.playScene( getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( result.param2 == 1 )
{ {
player.setQuestUI8BH( getId(), 0 ); if( player.giveQuestRewards( getId(), 0 ) )
player.finishQuest( getId() ); {
player.setQuestUI8BH( getId(), 0 );
player.finishQuest( getId() );
}
} }
} ); } );
} }

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

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst004_00027 // Quest Script: SubFst004_00027
@ -48,17 +47,17 @@ class SubFst004 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst004::Actor0 ) if( actor == Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }
else if( actor == SubFst004::Actor1 ) else if( actor == Actor1 )
{ {
Scene00001( player ); Scene00001( player );
} }
else if( actor == SubFst004::Actor2 ) else if( actor == Actor2 )
{ {
Scene00002( player ); Scene00002( player );
} }
@ -70,10 +69,12 @@ class SubFst004 : public EventScript
{ {
player.playScene( getId(), 0, HIDE_HOTBAR, 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 )
player.updateQuest( getId(), 1 ); {
} ); player.updateQuest( getId(), Seq1 );
}
} );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
@ -83,7 +84,7 @@ class SubFst004 : public EventScript
{ {
player.sendQuestMessage( getId(), 0, 1, 21002, 0 ); player.sendQuestMessage( getId(), 0, 1, 21002, 0 );
player.setQuestUI8BH( getId(), 1 ); player.setQuestUI8BH( getId(), 1 );
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
} ); } );
} }
@ -91,16 +92,16 @@ class SubFst004 : public EventScript
{ {
player.playScene( getId(), 2, HIDE_HOTBAR, player.playScene( getId(), 2, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 )
{ {
Scene00100( player ); if( result.param2 == 1 )
} {
else Scene00100( player );
{ }
Scene00099( player ); else
} {
} ); Scene00099( player );
}
} );
} }
void Scene00099( Entity::Player& player ) void Scene00099( Entity::Player& player )
@ -116,14 +117,15 @@ class SubFst004 : public EventScript
{ {
player.playScene( getId(), 100, HIDE_HOTBAR, player.playScene( getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setQuestUI8AL( getId(), 0 ); if( result.param2 == 1 )
if( player.giveQuestRewards( getId(), 0 ) )
{ {
player.finishQuest( getId() ); if(player.giveQuestRewards( getId(), 0 ) )
{
player.finishQuest( getId() );
}
} }
} ); } );
} }
}; };

20
src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst008_00032 // Quest Script: SubFst008_00032
@ -48,17 +47,17 @@ class SubFst008 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst008::Actor0 ) if( actor == Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }
else if( actor == SubFst008::Actor1 ) else if( actor == Actor1 )
{ {
Scene00001( player ); Scene00001( player );
} }
else if( Actor2 == SubFst008::Actor2 ) else if( Actor2 == Actor2 )
{ {
Scene00002( player ); Scene00002( player );
} }
@ -73,7 +72,7 @@ class SubFst008 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( getId(), 1 ); player.updateQuest( getId(), Seq1 );
} }
} ); } );
} }
@ -84,7 +83,7 @@ class SubFst008 : public EventScript
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
player.setQuestUI8BH( getId(), 1 ); player.setQuestUI8BH( getId(), 1 );
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
} ); } );
} }
@ -118,11 +117,14 @@ class SubFst008 : public EventScript
player.playScene(getId(), 100, HIDE_HOTBAR, player.playScene(getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if ( player.giveQuestRewards( getId(), 0 ) ) if( result.param2 == 1 )
{
if ( player.giveQuestRewards( getId(), 0 ) )
{ {
player.setQuestUI8BH( getId(), 0 ); player.setQuestUI8BH( getId(), 0 );
player.finishQuest( getId() ); player.finishQuest( getId() );
} }
}
} ); } );
} }
}; };

7
src/servers/Scripts/quest/subquest/gridania/SubFst009.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst009_00034 // Quest Script: SubFst009_00034
@ -44,7 +43,7 @@ class SubFst009 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == Actor0 ) if( actor == Actor0 )
{ {
@ -65,7 +64,7 @@ class SubFst009 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
player.setQuestUI8BH( getId(), 1 ); player.setQuestUI8BH( getId(), 1 );
} }
} ); } );

35
src/servers/Scripts/quest/subquest/gridania/SubFst011.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst011_00037 // Quest Script: SubFst011_00037
@ -41,13 +40,13 @@ 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( actorId ); auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == SubFst011::Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )
{ {
Scene00000( player ); Scene00000( player );
} }
else if( actor == SubFst011::Actor0 && player.getQuestSeq( getId() ) == SeqFinish ) else if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
{ {
Scene00001( player ); Scene00001( player );
} }
@ -61,7 +60,7 @@ public:
auto currentKC = player.getQuestUI8AL( getId() ) + 1; auto currentKC = player.getQuestUI8AL( getId() ) + 1;
if( currentKC >= 6 ) if( currentKC >= 6 )
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
else else
{ {
player.setQuestUI8AL( getId(), currentKC ); player.setQuestUI8AL( getId(), currentKC );
@ -75,22 +74,26 @@ private:
{ {
player.playScene( getId(), 0, HIDE_HOTBAR, 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 )
player.updateQuest( getId(), 1 ); {
} ); player.updateQuest( getId(), Seq1 );
}
} );
} }
void Scene00001( Entity::Player& player ) void Scene00001( Entity::Player& player )
{ {
player.playScene( getId(), 1, HIDE_HOTBAR, player.playScene( getId(), 1, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{
if( result.param2 == 1 ) // finish quest
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( result.param2 == 1 )
player.finishQuest( getId() ); {
} if (player.giveQuestRewards( getId(), 0 ) )
} ); {
player.finishQuest( getId() );
}
}
} );
}; };
}; };

113
src/servers/Scripts/quest/subquest/gridania/SubFst014.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst014_00041 // Quest Script: SubFst014_00041
@ -48,88 +47,76 @@ class SubFst014 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst014::Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )
{ {
Scene00000( player ); Scene00000( player );
} }
else if ( actor == SubFst014::Actor0 ) else if ( actor == Actor0 )
{ {
Scene00007( player ); Scene00007( player );
} }
//EOBJECTS CHECK //EOBJECTS CHECK
else if( actor == SubFst014::Eobject0 ) else if( actor == Eobject0 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00001( player ); Scene00001( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst014::Eobject1 ) else if( actor == Eobject1 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00002( player ); Scene00002( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst014::Eobject2 ) else if( actor == Eobject2 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00003( player ); Scene00003( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst014::Eobject3 ) else if( actor == Eobject3 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00004( player ); Scene00004( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst014::Eobject4 ) else if( actor == Eobject4 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00005( player ); Scene00005( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst014::Eobject5 ) else if( actor == Eobject5 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00006( player ); Scene00006( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
} }
private: private:
void checkQuestcompletion( Entity::Player& player ) void checkQuestCompletion( Entity::Player& player )
{ {
auto currentCC = player.getQuestUI8AL( getId() ); auto currentCC = player.getQuestUI8AL( getId() );
@ -151,7 +138,7 @@ class SubFst014 : public EventScript
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
player.updateQuest( getId(), 1 ); player.updateQuest( getId(), Seq1 );
} ); } );
} }
@ -169,7 +156,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 2, HIDE_HOTBAR, player.playScene( getId(), 2, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00098( player ); Scene00098( player );
} ); } );
} }
@ -178,7 +165,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 3, HIDE_HOTBAR, player.playScene( getId(), 3, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00096( player ); Scene00096( player );
} ); } );
} }
@ -187,7 +174,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 4, HIDE_HOTBAR, player.playScene( getId(), 4, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00094( player ); Scene00094( player );
} ); } );
} }
@ -196,7 +183,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 5, HIDE_HOTBAR, player.playScene( getId(), 5, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00092( player ); Scene00092( player );
} ); } );
} }
@ -205,7 +192,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 6, HIDE_HOTBAR, player.playScene( getId(), 6, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00090( player ); Scene00090( player );
} ); } );
} }
@ -263,8 +250,8 @@ class SubFst014 : public EventScript
player.playScene( getId(), 90, HIDE_HOTBAR, player.playScene( getId(), 90, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 2, true ); player.setQuestBitFlag8( getId(), 2, true );
} ); } );
} }
@ -281,8 +268,8 @@ class SubFst014 : public EventScript
player.playScene( getId(), 92, HIDE_HOTBAR, player.playScene( getId(), 92, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 3, true ); player.setQuestBitFlag8( getId(), 3, true );
} ); } );
} }
@ -299,8 +286,8 @@ class SubFst014 : public EventScript
player.playScene( getId(), 94, HIDE_HOTBAR, player.playScene( getId(), 94, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 4, true ); player.setQuestBitFlag8( getId(), 4, true );
} ); } );
} }
@ -317,7 +304,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 96, HIDE_HOTBAR, player.playScene( getId(), 96, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 5, true ); player.setQuestBitFlag8( getId(), 5, true );
} ); } );
} }
@ -335,7 +322,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 98, HIDE_HOTBAR, player.playScene( getId(), 98, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 6, true ); player.setQuestBitFlag8( getId(), 6, true );
} ); } );
} }
@ -353,7 +340,7 @@ class SubFst014 : public EventScript
player.playScene( getId(), 100, HIDE_HOTBAR, player.playScene( getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 7, true ); player.setQuestBitFlag8( getId(), 7, true );
} ); } );
} }

149
src/servers/Scripts/quest/subquest/gridania/SubFst015.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst015_00042 // Quest Script: SubFst015_00042
@ -46,88 +45,76 @@ class SubFst015 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst015::Actor0 && !player.hasQuest( getId() ) ) if( actor == Actor0 && !player.hasQuest( getId() ) )
{ {
Scene00000( player ); Scene00000( player );
} }
else if( actor == SubFst015::Actor0 ) else if( actor == Actor0 )
{ {
Scene00007( player ); Scene00007( player );
} }
//EOBJECTS CHECK //EOBJECTS CHECK
else if( actor == SubFst015::Eobject0 ) else if( actor == Eobject0 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00001( player ); Scene00001( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst015::Eobject1 ) else if( actor == Eobject1 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00002( player ); Scene00002( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst015::Eobject2 ) else if( actor == Eobject2 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00003( player ); Scene00003( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst015::Eobject3 ) else if( actor == Eobject3 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00004( player ); Scene00004( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst015::Eobject4 ) else if( actor == Eobject4 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00005( player ); Scene00005( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
else if( actor == SubFst015::Eobject5 ) else if( actor == Eobject5 )
{ {
player.eventActionStart( getId(), 0x01, player.eventActionStart( getId(), 0x01,
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
{ {
Scene00006( player ); Scene00006( player );
}, },
[&]( Entity::Player& player, uint32_t eventId, uint64_t additional ) nullptr, eventId );
{},
eventId );
} }
} }
private: private:
void checkQuestcompletion( Entity::Player& player ) void checkQuestCompletion( Entity::Player& player )
{ {
auto currentCC = player.getQuestUI8AL( getId() ); auto currentCC = player.getQuestUI8AL( getId() );
@ -150,7 +137,7 @@ class SubFst015 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( getId(), 1 ); player.updateQuest( getId(), Seq1 );
} }
} ); } );
} }
@ -159,54 +146,54 @@ class SubFst015 : public EventScript
{ {
player.playScene( getId(), 1, HIDE_HOTBAR, player.playScene( getId(), 1, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00100( player ); Scene00100( player );
} ); } );
} }
void Scene00002( Entity::Player& player ) void Scene00002( Entity::Player& player )
{ {
player.playScene( getId(), 2, HIDE_HOTBAR, player.playScene( getId(), 2, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00098( player ); Scene00098( player );
} ); } );
} }
void Scene00003( Entity::Player& player ) void Scene00003( Entity::Player& player )
{ {
player.playScene( getId(), 3, HIDE_HOTBAR, player.playScene( getId(), 3, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00096( player ); Scene00096( player );
} ); } );
} }
void Scene00004( Entity::Player& player ) void Scene00004( Entity::Player& player )
{ {
player.playScene( getId(), 4, HIDE_HOTBAR, player.playScene( getId(), 4, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00094( player ); Scene00094( player );
} ); } );
} }
void Scene00005( Entity::Player& player ) void Scene00005( Entity::Player& player )
{ {
player.playScene( getId(), 5, HIDE_HOTBAR, player.playScene( getId(), 5, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00092( player ); Scene00092( player );
} ); } );
} }
void Scene00006( Entity::Player& player ) void Scene00006( Entity::Player& player )
{ {
player.playScene( getId(), 6, HIDE_HOTBAR, player.playScene( getId(), 6, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
Scene00090( player ); Scene00090( player );
} ); } );
} }
void Scene00007( Entity::Player& player ) void Scene00007( Entity::Player& player )
@ -216,8 +203,10 @@ class SubFst015 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if (player.giveQuestRewards( getId(), 0) )
{
player.finishQuest( getId() ); player.finishQuest( getId() );
}
} }
} ); } );
} }
@ -235,8 +224,8 @@ class SubFst015 : public EventScript
player.playScene( getId(), 90, HIDE_HOTBAR, player.playScene( getId(), 90, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 2, true ); player.setQuestBitFlag8( getId(), 2, true );
} ); } );
} }
@ -253,8 +242,8 @@ class SubFst015 : public EventScript
player.playScene( getId(), 92, HIDE_HOTBAR, player.playScene( getId(), 92, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 3, true ); player.setQuestBitFlag8( getId(), 3, true );
} ); } );
} }
@ -271,8 +260,8 @@ class SubFst015 : public EventScript
player.playScene( getId(), 94, HIDE_HOTBAR, player.playScene( getId(), 94, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 4, true ); player.setQuestBitFlag8( getId(), 4, true );
} ); } );
} }
@ -289,8 +278,8 @@ class SubFst015 : public EventScript
player.playScene( getId(), 96, HIDE_HOTBAR, player.playScene( getId(), 96, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 5, true ); player.setQuestBitFlag8( getId(), 5, true );
} ); } );
} }
@ -307,8 +296,8 @@ class SubFst015 : public EventScript
player.playScene( getId(), 98, HIDE_HOTBAR, player.playScene( getId(), 98, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 6, true ); player.setQuestBitFlag8( getId(), 6, true );
} ); } );
} }
@ -325,8 +314,8 @@ class SubFst015 : public EventScript
player.playScene( getId(), 100, HIDE_HOTBAR, player.playScene( getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
checkQuestcompletion( player ); checkQuestCompletion( player );
player.setQuestBitFlag8( getId(), 7, true ); player.setQuestBitFlag8( getId(), 7, true );
} ); } );
} }
}; };

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

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst019_00049 // Quest Script: SubFst019_00049
@ -41,13 +40,13 @@ class SubFst019 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst019::Actor0 ) if( actor == Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }
else if( actor == SubFst019::Actor1 ) else if( actor == Actor1 )
{ {
Scene00001( player ); Scene00001( player );
} }
@ -62,7 +61,7 @@ class SubFst019 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
} }
} ); } );
} }
@ -75,10 +74,11 @@ class SubFst019 : public EventScript
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ) )
{
player.finishQuest( getId() ); player.finishQuest( getId() );
}
} }
} ); } );
} }
}; };

19
src/servers/Scripts/quest/subquest/gridania/SubFst026.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst026_00170 // Quest Script: SubFst026_00170
@ -43,13 +42,13 @@ class SubFst026 : public EventScript
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( 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() ) == 255 ) else if( actor == Actor0 && player.getQuestSeq( getId() ) == SeqFinish )
{ {
Scene00001( player ); Scene00001( player );
} }
@ -63,7 +62,7 @@ class SubFst026 : public EventScript
auto currentKC = player.getQuestUI8AL( getId() ) + 1; auto currentKC = player.getQuestUI8AL( getId() ) + 1;
if( currentKC >= 6 ) if( currentKC >= 6 )
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
else else
{ {
player.setQuestUI8AL( getId(), currentKC ); player.setQuestUI8AL( getId(), currentKC );
@ -78,8 +77,10 @@ class SubFst026 : public EventScript
player.playScene( getId(), 0, HIDE_HOTBAR, player.playScene( getId(), 0, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if ( result.param2 == 1 ) if( result.param2 == 1 )
player.updateQuest( getId(), 1 ); {
player.updateQuest( getId(), Seq1 );
}
} ); } );
} }
@ -90,8 +91,10 @@ class SubFst026 : public EventScript
{ {
if ( result.param2 == 1 ) if ( result.param2 == 1 )
{ {
if ( player.giveQuestRewards( getId(), 0 ) ) if( player.giveQuestRewards( getId(), 0 ) )
{
player.finishQuest( getId() ); player.finishQuest( getId() );
}
} }
} ); } );
} }

7
src/servers/Scripts/quest/subquest/gridania/SubFst029.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst029_00172 // Quest Script: SubFst029_00172
@ -42,7 +41,7 @@ class SubFst029 : public EventScript
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( static_cast< uint32_t >( actorId ) );
//NOT SAFE - CRASH //NOT SAFE - CRASH
@ -65,7 +64,7 @@ class SubFst029 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
} }
} ); } );
} }

22
src/servers/Scripts/quest/subquest/gridania/SubFst041.cpp
View file

@ -1,6 +1,5 @@
#include <Script/NativeScriptApi.h>
#include <Actor/Player.h> #include <Actor/Player.h>
#include "Event/EventHelper.h" #include <Event/EventHelper.h>
#include <ScriptObject.h> #include <ScriptObject.h>
// Quest Script: SubFst041_00197 // Quest Script: SubFst041_00197
@ -49,13 +48,13 @@ class SubFst041 : public EventScript
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( static_cast< uint32_t >( actorId ) );
if( actor == SubFst041::Actor0 ) if( actor == Actor0 )
{ {
Scene00000( player ); Scene00000( player );
} }
if( actor == SubFst041::Actor1 ) if( actor == Actor1 )
{ {
Scene00001(player); Scene00001(player);
} }
@ -69,7 +68,7 @@ class SubFst041 : public EventScript
auto currentKC = player.getQuestUI8BH( getId() ) + 1; auto currentKC = player.getQuestUI8BH( getId() ) + 1;
if( currentKC >= 6 ) if( currentKC >= 6 )
player.updateQuest( getId(), 255 ); player.updateQuest( getId(), SeqFinish );
else else
{ {
player.setQuestUI8BH( getId(), currentKC ); player.setQuestUI8BH( getId(), currentKC );
@ -86,7 +85,7 @@ class SubFst041 : public EventScript
{ {
if( result.param2 == 1 ) if( result.param2 == 1 )
{ {
player.updateQuest( getId(), 1 ); player.updateQuest( getId(), Seq1 );
} }
} ); } );
} }
@ -121,10 +120,13 @@ class SubFst041 : public EventScript
player.playScene( getId(), 100, HIDE_HOTBAR, player.playScene( getId(), 100, HIDE_HOTBAR,
[&]( Entity::Player& player, const Event::SceneResult& result ) [&]( Entity::Player& player, const Event::SceneResult& result )
{ {
if( player.giveQuestRewards( getId(), 0 ) ) if( result.param2 == 1 )
{ {
player.setQuestUI8BH( getId(), 0 ); if( player.giveQuestRewards( getId(), 0 ) )
player.finishQuest( getId() ); {
player.setQuestUI8BH( getId(), 0 );
player.finishQuest( getId() );
}
} }
} ); } );
} }