From 728f76b912f9ed3ba8ff8a7401b6bba33703d5fc Mon Sep 17 00:00:00 2001 From: collett Date: Fri, 14 Jun 2024 18:22:56 +0900 Subject: [PATCH] fix limsa opening --- src/common/Network/CommonActorControl.h | 2 +- src/common/Network/PacketDef/Ipcs.h | 6 +++--- src/scripts/quest/ManSea001.cpp | 24 ++++++++++++++---------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index dd5f4426..0e8a81bf 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -381,7 +381,7 @@ namespace Sapphire::Network::ActorControl SetTitleReq = 0x12E, TitleList = 0x12F, - UpdatedSeenHowTos = 0x133, + UpdatedSeenHowTos = 0x132, CutscenePlayed = 0x134, // param1 = cutscene id AllotAttribute = 0x135, diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 2309f4b9..fc0efc6b 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -112,8 +112,8 @@ enum ServerZoneIpcType : BlackList = 0x38A, // updated 6.58 hotfix 2 LinkshellList = 0x2B2, // updated 6.58 hotfix 2 - CrossWorldLinkshellList = 0x2EA, // updated 6.58 hotfix 2? - FellowshipList = 0x0BD, // updated 6.58 hotfix 2? + CrossWorldLinkshellList = 0x3D5, // updated 6.58 hotfix 2 + FellowshipList = 0x373, // updated 6.58 hotfix 2 MailDeleteRequest = 0x168, // updated 6.58 hotfix 2? @@ -171,7 +171,7 @@ enum ServerZoneIpcType : SilentSetClassJob = 0xF18E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything PlayerSetup = 0x035F, // updated 6.58 hotfix 2 PlayerStats = 0x034F, // updated 6.58 hotfix 2 - ActorOwner = 0x2c3, // updated 6.58 hotfix 2? + ActorOwner = 0x2c3, // updated 6.58 hotfix 2 PlayerStateFlags = 0x1B6, // updated 6.58 hotfix 2 PlayerClassInfo = 0x238, // updated 6.58 hotfix 2 PlayerUpdateLook = 0xa8, // updated 6.48 diff --git a/src/scripts/quest/ManSea001.cpp b/src/scripts/quest/ManSea001.cpp index ddad3d00..cef649f1 100644 --- a/src/scripts/quest/ManSea001.cpp +++ b/src/scripts/quest/ManSea001.cpp @@ -74,21 +74,25 @@ private: void Scene00005( Entity::Player& player ) { - player.playSceneChain( getId(), 5, HIDE_HOTBAR, bindScene( &ManSea001::Scene00006 ) ); + player.playScene( getId(), 5, HIDE_HOTBAR, + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + if( result.param2 == 1 ) + { + Scene00006( player ); + } + } ); } void Scene00006( Entity::Player& player ) { player.playScene( getId(), 6, INVIS_OTHER_PC, - [ & ]( Entity::Player& player, const Event::SceneResult& result ) - { - if( result.param2 == 1 ) - { - player.updateQuest( getId(), SEQ_FINISH ); - player.prepareZoning( player.getZoneId(), true, 1, 0 ); - player.changePosition( 9, 40, 14, 2 ); - } - } ); + [ & ]( Entity::Player& player, const Event::SceneResult& result ) + { + player.updateQuest( getId(), SEQ_FINISH ); + player.prepareZoning( player.getZoneId(), true, 1, 0 ); + player.changePosition( 9, 40, 14, 2 ); + } ); } void Scene00007( Entity::Player& player )