mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-30 05:07:46 +00:00
Code Activity

Merge e84941ffd0 into c0fd27f73b

Browse source
This commit is contained in:
DantestyleXD 2018-06-12 17:49:40 +00:00 • committed by GitHub
commit 238fc73a23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/servers/Scripts/common/Aethernet.cpp
View file

@ -17,7 +17,7 @@ public:
Aethernet() : EventScript( EVENTSCRIPT_AETHERNET_ID )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
{

2
src/servers/Scripts/common/Aetheryte.cpp
View file

@ -19,7 +19,7 @@ public:
Aetheryte() : EventScript( EVENTSCRIPT_AETHERYTE_ID )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
if( player.isAetheryteRegistered( eventId & 0xFFFF ) )
{

2
src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
View file

@ -31,7 +31,7 @@ public:
player.playScene( getId(), 1, 0xFB2EC8F8, 0, 1, returnScene, callback );
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
Scene00000( player );
}

2
src/servers/Scripts/common/CmnDefInnBed.cpp
View file

@ -46,7 +46,7 @@ public:
player.playScene( getId(), 100, 0x800, 0, 0, callback );
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
Scene00000( player );
}

2
src/servers/Scripts/common/CmnDefLinkShell.cpp
View file

@ -53,7 +53,7 @@ public:
player.playScene( getId(), 4, 0, 0, 0 );
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
Scene00001( player );
}

2
src/servers/Scripts/common/HouFurOrchestrion.cpp
View file

@ -13,7 +13,7 @@ public:
player.playScene( getId(), 0, 0x2000, 0, 1 );
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
Scene00000( player );
}

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

@ -87,9 +87,9 @@ public:
ManFst001() : EventScript( 65575 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 )
Scene00000( player );

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

@ -187,9 +187,9 @@ public:
ManFst002() : EventScript( 65621 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 )
Scene00000( player );

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

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

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

@ -77,9 +77,9 @@ public:
//////////////////////////////////////////////////////////////////////
// Event Handlers
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ManFst004::Actor0 )
{

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

@ -134,9 +134,9 @@ public:
ManSea001() : EventScript( 65643 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 )
Scene00000( player );

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

@ -143,9 +143,9 @@ public:
ManSea002() : EventScript( 65644 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
// todo: this doesn't actually play a cutscene after accepting the quest
if( actor == ACTOR0 )

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

@ -129,9 +129,9 @@ public:
ManWil001() : EventScript( 66130 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 )
Scene00000( player );

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

@ -150,9 +150,9 @@ public:
ManWil002() : EventScript( 66104 )
{ }
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 )
Scene00000( player );

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

@ -66,9 +66,9 @@ public:
SubFst001() : EventScript( 65560 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR0 )
{

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

@ -52,9 +52,9 @@ public:
SubFst002() : EventScript( 65561 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 && !player.hasQuest( getId() ) )
Scene00000( player );

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

@ -48,9 +48,9 @@ public:
SubFst010() : EventScript( 65537 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( actor == ACTOR0 )
Scene00000( player );

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

@ -154,9 +154,9 @@ public:
SubFst013() : EventScript( 65576 )
{}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
if( !player.hasQuest( getId()))
{
@ -176,7 +176,7 @@ public:
void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) override
{
auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
uint32_t actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ));
if( actor == ACTOR1 && emoteId == 5 && player.getQuestSeq( getId() ) == SEQ_1 )
Scene00100( player );

2
src/servers/sapphire_zone/Script/NativeScriptApi.h
View file

@ -88,7 +88,7 @@ public:
ScriptObject( questId, typeid( EventScript ).hash_code() )
{ }
virtual void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) { }
virtual void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) { }
virtual void onNpcKill( uint32_t npcId, Entity::Player& player ) { }
virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) { }
virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }

21
src/tools/quest_parser/main.cpp
View file

@ -24,9 +24,9 @@ Core::Logger g_log;
Core::Data::ExdDataGenerated g_exdDataGen;
const std::string onTalkStr(
" void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override\n"
" void onTalk( uint32_t eventId, Entity::Player& player, uint32_t actorId ) override\n"
" {\n"
" auto actor = Event::mapEventActorToRealActor( actorId );\n"
" uint32_t actor = Event::mapEventActorToRealActor( actorId );\n"
" }\n\n"
);
@ -67,6 +67,9 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
"// In order for this script to be loaded, change its extension to .cpp\n"
"// and move it to the correct folder in <root>/scripts/native/\n"
"\n"
"#include <Script/NativeScriptApi.h>\n"
"#include <Actor/Player.h>\n"
"#include <Event/EventHelper.h>\n"
"#include <ScriptObject.h>\n\n"
);
@ -95,10 +98,10 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
sceneName +
"( Entity::Player& player )\n"
" {\n"
" player.eventPlay( this->getId(), " +
" player.playScene( getId(), " +
sceneId +
", 0,\n"
" [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )\n"
" [&]( Entity::Player& player, const Event::SceneResult& result )\n"
" {\n"
" });\n"
" }\n\n"
@ -147,7 +150,7 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
if( !pQuestData->itemReward0.empty() )
{
rewards += " static constexpr auto RewardItem[] = { ";
rewards += " uint16_t RewardItem[] = { ";
for( size_t ca = 0; ca < pQuestData->itemReward0.size(); ca++ )
{
rewards += std::to_string( pQuestData->itemReward0.at( ca ) );
@ -161,7 +164,7 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
if( !pQuestData->itemReward0.empty() )
{
rewards += " static constexpr auto RewardItemCount[] = { ";
rewards += " uint16_t RewardItemCount[] = { ";
for( size_t ca = 0; ca < pQuestData->itemCountReward0.size(); ca++ )
{
rewards += std::to_string( pQuestData->itemCountReward0.at( ca ) );
@ -175,7 +178,7 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
if( !pQuestData->itemReward1.empty() )
{
rewards += " static constexpr auto RewardItemOptional[] = { ";
rewards += " uint16_t RewardItemOptional[] = { ";
for( size_t ca = 0; ca < pQuestData->itemReward1.size(); ca++ )
{
rewards += std::to_string( pQuestData->itemReward1.at( ca ) );
@ -189,7 +192,7 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
if( !pQuestData->itemCountReward1.empty() )
{
rewards += " static constexpr auto RewardItemOptionalCount[] = { ";
rewards += " uint16_t RewardItemOptionalCount[] = { ";
for( size_t ca = 0; ca < pQuestData->itemCountReward1.size(); ca++ )
{
rewards += std::to_string( pQuestData->itemCountReward1.at( ca ) );
@ -258,7 +261,7 @@ void createScript( boost::shared_ptr< Core::Data::Quest >& pQuestData, std::set<
for( auto enemy : enemy_ids )
{
scriptEntry += std::string(
" void onMobKill_" + std::to_string( enemy ) + "( Entity::Player& player )\n"
" void onMobKill_" + std::to_string( enemy ) + "( Entity::Player& player, uint64_t npcId )\n"
" {\n"
" }\n\n"
);