diff --git a/sql/update.sql b/sql/update.sql index 38c3fe04..5e9fabbc 100644 --- a/sql/update.sql +++ b/sql/update.sql @@ -47,3 +47,6 @@ ALTER TABLE `charainfo` CHANGE `Mounts` `Mounts` BINARY(15) NULL DEFAULT NULL; ALTER TABLE `charainfo` CHANGE `Orchestrion` `Orchestrion` BINARY(40) NULL DEFAULT NULL; ALTER TABLE `charainfo` CHANGE `Minions` `Minions` BINARY(37) NULL DEFAULT NULL; ALTER TABLE `charainfo` CHANGE `QuestCompleteFlags` `QuestCompleteFlags` VARBINARY(396) NULL DEFAULT NULL; + +ALTER TABLE `charainfofriendlist` CHANGE `CharacterIdList` `CharacterIdList` VARBINARY(1600) NULL DEFAULT NULL; +ALTER TABLE `charainfofriendlist` CHANGE `InviteDataList` `InviteDataList` VARBINARY(1600) NULL DEFAULT NULL; \ No newline at end of file diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 1614df6c..1e7614bb 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -68,13 +68,13 @@ namespace Packets { CFDutyInfo = 0x007A, CFPlayerInNeed = 0x007F, - SocialRequestError = 0x00AD, - Playtime = 0x00DF, // updated 4.2 CFRegistered = 0x00B8, // updated 4.1 CancelAllianceForming = 0x00C6, // updated 4.2 Chat = 0x00E1, // updated 4.2 - SocialRequestResponse = 0x00E5, // updated 4.1 + + SocialRequestError = 0x00E4, // updated 4.2 + SocialRequestResponse = 0x00E5, // updated 4.2 SocialRequestReceive = 0x00E6, // updated 4.2 SocialList = 0x00E7, // updated 4.2 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index d15a5db6..ab4fec84 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -101,6 +101,7 @@ struct PlayerEntry { uint8_t one; char name[0x20]; char fcTag[5]; + uint32_t unknown_p1; // Added 4.2 }; struct FFXIVIpcSocialRequestReceive : FFXIVIpcBasePacket @@ -123,6 +124,8 @@ struct FFXIVIpcSocialRequestReceive : FFXIVIpcBasePacket struct FFXIVIpcSocialRequestError : FFXIVIpcBasePacket { + uint32_t unknown_p1; // Added on 4.2, unknown. Possibly padding/crossworld related + uint32_t unknown_p2; uint32_t messageId; // if 0 then type's message is used (type must 2/4/5 or it wont print) Common::SocialCategory category; // 2 - friend request, 4 - fc petition, 5 - fc invitation, anything else and wont print uint8_t unknown; // possibly padding diff --git a/src/servers/Scripts/common/ScriptLoader.cpp b/src/servers/Scripts/common/ScriptLoader.cpp index e4bc7a56..c1871bea 100644 --- a/src/servers/Scripts/common/ScriptLoader.cpp +++ b/src/servers/Scripts/common/ScriptLoader.cpp @@ -2,19 +2,19 @@ #include "Aethernet.cpp" #include "Aetheryte.cpp" -#include "HouFurOrchestrion.cpp" -#include "CmnDefInnBed.cpp" #include "CmnDefCutSceneReplay.cpp" +#include "CmnDefInnBed.cpp" #include "CmnDefLinkShell.cpp" +#include "HouFurOrchestrion.cpp" const ScriptObject* ptrs[] = { static_cast< ScriptObject* >( new Aethernet ), static_cast< ScriptObject* >( new Aetheryte ), - static_cast< ScriptObject* >( new HouFurOrchestrion ), - static_cast< ScriptObject* >( new CmnDefInnBed ), static_cast< ScriptObject* >( new CmnDefCutSceneReplay ), + static_cast< ScriptObject* >( new CmnDefInnBed ), static_cast< ScriptObject* >( new CmnDefLinkShell ), + static_cast< ScriptObject* >( new HouFurOrchestrion ), nullptr }; diff --git a/src/servers/Scripts/instances/ScriptLoader.cpp b/src/servers/Scripts/instances/ScriptLoader.cpp index 2c0c33c0..7d8fbf10 100644 --- a/src/servers/Scripts/instances/ScriptLoader.cpp +++ b/src/servers/Scripts/instances/ScriptLoader.cpp @@ -1,542 +1,542 @@ #include