Merge branch 'develop' into develop

src/common/Common.h

@@ -216,6 +216,8 @@ namespace Sapphire::Common
     HandIn = 2005,
     DamagedGear = 2007,
     //UNKNOWN_1 = 2008,
+    // Temporary inventory that is used for the "trade" window
+    TradeInventory = 2009,
 
     ArmoryOff = 3200,
     ArmoryHead = 3201,
@@ -234,6 +236,9 @@ namespace Sapphire::Common
     
     SaddleBag0 = 4000,
     SaddleBag1 = 4001,
+    // These are the ones you get when paying for premium companion app
+    PremiumSaddleBag0 = 4100,
+    PremiumSaddleBag1 = 4101,
 
     RetainerBag0 = 10000,
     RetainerBag1 = 10001,

src/common/Network/CommonActorControl.h

@@ -145,6 +145,15 @@ namespace Sapphire::Network::ActorControl
 
     SetPose = 0x127,
 
+    /*!
+     * This is used for general crafting events, I found some of them but some are missing:
+     * 
+     * param1 = event type, the rest of the struct depends on this param.
+     *  - 18 & 19: Quicksynth result, 19 means HQ result item, item ID is param2 and is + 1 000 000 when HQ. 
+     *             Quantity is param3 (possible quicksynth that gives more than one item in the future?)
+     * 
+     * All the other values have unkown behavior for now. 
+     */
     CraftingUnk = 0x12C,
 
     GatheringSenseMsg = 0x130,
@@ -178,6 +187,14 @@ namespace Sapphire::Network::ActorControl
 
     RelicInfuseMsg = 0x179,
 
+    /*!
+     * Sent as result of an aetherial reduction.
+     * param1 = Reduced item ID + 500 000 (idk what this 500 000 is but it's always here no matter what)
+     * param2 = First result item id (+ 1 000 000 if HQ)
+     * param3 = First result item quantity
+     * param4 = (Optional) Second result item id (+ 1 000 000 if HQ)
+     * param5 = (Optional) Second result item quantity
+     */ 
     AetherReductionDlg = 0x17D,
 
     /*!

src/common/Network/PacketDef/Ipcs.h

@@ -48,20 +48,24 @@ namespace Sapphire::Network::Packets
     Ping = 0x0065,
     Init = 0x0066,
 
-    ActorFreeSpawn = 0x0191,
+    ActorFreeSpawn = 0x0097, // updated 5.1
-    InitZone = 0x019A,
+    InitZone = 0x019B, // updated 5.1
 
-    EffectResult = 0x0141,
+    EffectResult = 0x0153, // updated 5.1
-    ActorControl = 0x0142,
+    ActorControl = 0x0164, // updated 5.1
-    ActorControlSelf = 0x0143,
+    ActorControlSelf = 0x0264, // updated 5.1
-    ActorControlTarget = 0x0144,
+    ActorControlTarget = 0x016C, // updated 5.1
-    UpdateHpMpTp = 0x0145, // used when resting
+
+    /*!
+     * @brief Used when resting
+     */
+    UpdateHpMpTp = 0x032D, // updated 5.1
 
     ///////////////////////////////////////////////////
 
     ChatBanned = 0x006B,
-    Playtime = 0x0100, // updated 5.0
+    Playtime = 0x01DB, // updated 5.1
-    Logout = 0x0077, // updated 5.0
+    Logout = 0x011D, // updated 5.1
     CFNotify = 0x0078,
     CFMemberStatus = 0x0079,
     CFDutyInfo = 0x007A,
@@ -75,27 +79,27 @@ namespace Sapphire::Network::Packets
 
     LogMessage = 0x00D0,
 
-    Chat = 0x0104, // updated 5.0
+    Chat = 0x02DC, // updated 5.1
 
     WorldVisitList = 0x00FE, // added 4.5
 
-    SocialList = 0x010D, // updated 5.0
+    SocialList = 0x007A, // updated 5.1
 
-    ExamineSearchInfo = 0x010F, // added 5.0
+    ExamineSearchInfo = 0x03D7, // updated 5.1
-    UpdateSearchInfo = 0x0110, // updated 5.0
+    UpdateSearchInfo = 0x0358, // updated 5.1
-    InitSearchInfo = 0x0111, // updated 5.0
+    InitSearchInfo = 0x03A1, // updated 5.1
     ExamineSearchComment = 0x0102, // updated 4.1
 
     ServerNoticeShort = 0x0115, // updated 5.0
     ServerNotice = 0x0116, // updated 5.0
-    SetOnlineStatus = 0x0117, // updated 5.0
+    SetOnlineStatus = 0x015E, // updated 5.1
 
-    CountdownInitiate = 0x011E, // updated 5.0
+    CountdownInitiate = 0x01EE, // updated 5.1
-    CountdownCancel = 0x011F, // updated 5.0
+    CountdownCancel = 0x03C6, // updated 5.1
 
-    PlayerAddedToBlacklist = 0x0120, // updated 5.0
+    PlayerAddedToBlacklist = 0x033F, // updated 5.1
-    PlayerRemovedFromBlacklist = 0x0121, // updated 5.0
+    PlayerRemovedFromBlacklist = 0x0385, // updated 5.1
-    BlackList = 0x0123, // updated 5.0
+    BlackList = 0x031F, // updated 5.1
 
     LinkshellList = 0x012A, // updated 5.0
 
@@ -120,41 +124,43 @@ namespace Sapphire::Network::Packets
 
     FreeCompanyUpdateShortMessage = 0x0157, // added 5.0
 
-    StatusEffectList = 0x015B, // updated 5.0
+    StatusEffectList = 0x023A, // updated 5.1
-    EurekaStatusEffectList = 0x015C, // updated 5.0
+    EurekaStatusEffectList = 0x0398, // updated 5.1
-    Effect = 0x015E, // updated 5.0
+    BossStatusEffectList = 0x00E6, // added 5.1
-    AoeEffect8 = 0x0161, // updated 5.0
+    Effect = 0x00A7, // updated 5.1
-    AoeEffect16 = 0x0162, // updated 5.0
+    AoeEffect8 = 0x00A9, // updated 5.1
-    AoeEffect24 = 0x0163, // updated 5.0
+    AoeEffect16 = 0x015F, // updated 5.1
-    AoeEffect32 = 0x0164, // updated 5.0
+    AoeEffect24 = 0x0292, // updated 5.1
+    AoeEffect32 = 0x0268, // updated 5.1
     PersistantEffect = 0x0165, // updated 5.0
 
     GCAffiliation = 0x016F, // updated 5.0
 
-    PlayerSpawn = 0x017F, // updated 5.0
+    PlayerSpawn = 0x0386, // updated 5.1
-    NpcSpawn = 0x0180, // updated 5.0
+    NpcSpawn = 0x010A, // updated 5.1
-    NpcSpawn2 = 0x0181, // ( Bigger statuseffectlist? ) updated 5.0
+    NpcSpawn2 = 0x0115, // ( Bigger statuseffectlist? ) updated 5.1
-    ActorMove = 0x0182, // updated 5.0
+    ActorMove = 0x01BC, // updated 5.1
 
-    ActorSetPos = 0x0184, // updated 5.0
+    ActorSetPos = 0x0311, // updated 5.1
 
-    ActorCast = 0x0186, // updated 5.0
+    ActorCast = 0x012C, // updated 5.1
     SomeCustomiseChangePacketProbably = 0x0187, // added 5.0
-    PartyList = 0x0188, // updated 5.0
+
-    HateRank = 0x0189, // updated 5.0
+    PartyList = 0x0231, // updated 5.1
-    HateList = 0x018A, // updated 5.0
+    HateRank = 0x0354, // updated 5.1
-    ObjectSpawn = 0x018B, // updated 5.0
+    HateList = 0x00C7, // updated 5.1
-    ObjectDespawn = 0x018C, // updated 5.0
+    ObjectSpawn = 0x0156, // updated 5.1
+    ObjectDespawn = 0x00A3, // updated 5.1
     UpdateClassInfo = 0x0399, // updated 5.11
     SilentSetClassJob = 0x018E, // updated 5.0 - seems to be the case, not sure if it's actually used for anything
     PlayerSetup = 0x01A1, // updated 5.11
     PlayerStats = 0x0324, // updated 5.11
-    ActorOwner = 0x0192, // updated 5.0
+    ActorOwner = 0x01A5, // updated 5.1
-    PlayerStateFlags = 0x0193, // updated 5.0
+    PlayerStateFlags = 0x019F, // updated 5.1
-    PlayerClassInfo = 0x0194, // updated 5.0
+    PlayerClassInfo = 0x02D4, // updated 5.1
 
-    ModelEquip = 0x0196, // updated 5.0
+    ModelEquip = 0x025E, // updated 5.1
-    Examine = 0x0197, // updated 5.0
+    Examine = 0x00EA, // updated 5.1
     CharaNameReq = 0x0198, // updated 5.0
 
     // nb: see #565 on github
@@ -163,12 +169,12 @@ namespace Sapphire::Network::Packets
     SetLevelSync = 0x1186, // not updated for 4.4, not sure what it is anymore
 
     ItemInfo = 0x01D4, // updated 5.11
-    ContainerInfo = 0x01A2, // updated 5.0
+    ContainerInfo = 0x0145, // updated 5.1
-    InventoryTransactionFinish = 0x01A3, // updated 5.0
+    InventoryTransactionFinish = 0x01AB, // updated 5.1
-    InventoryTransaction = 0x01A4, // updated 5.0
+    InventoryTransaction = 0x023E, // updated 5.1
     CurrencyCrystalInfo = 0x02CA, // updated 5.11
 
-    InventoryActionAck = 0x01A7, // updated 5.0
+    InventoryActionAck = 0x0084, // updated 5.1
     UpdateInventorySlot = 0x0112, // updated 5.11
 
     HuntingLogEntry = 0x01B3, // updated 5.0
@@ -201,13 +207,13 @@ namespace Sapphire::Network::Packets
 
     CFAvailableContents = 0xF1FD, // updated 4.2
 
-    WeatherChange = 0x0210, // updated 5.0
+    WeatherChange = 0x00B6, // updated 5.1
-    PlayerTitleList = 0x0211, // updated 5.0
+    PlayerTitleList = 0x037D, // updated 5.1
-    Discovery = 0x0212, // updated 5.0
+    Discovery = 0x0094, // updated 5.1
 
-    EorzeaTimeOffset = 0x0214, // updated 5.0
+    EorzeaTimeOffset = 0x03B8, // updated 5.1
 
-    EquipDisplayFlags = 0x0220, // updated 5.0
+    EquipDisplayFlags = 0x00F6, // updated 5.1
 
     /// Housing //////////////////////////////////////
 
@@ -244,8 +250,8 @@ namespace Sapphire::Network::Packets
     ActorGauge = 0x0292, // updated 4.3
 
     // daily quest info -> without them sent,  login will take longer...
-    DailyQuests = 0x025E, // updated 5.0
+    DailyQuests = 0x02B6, // updated 5.1
-    DailyQuestRepeatFlags = 0x0260, // updated 5.0
+    DailyQuestRepeatFlags = 0x0124, // updated 5.1
 
     /// Doman Mahjong //////////////////////////////////////
     MahjongOpenGui = 0x02A4, // only available in mahjong instance
@@ -267,36 +273,36 @@ namespace Sapphire::Network::Packets
   {
 
     PingHandler = 0x0065, // unchanged 5.0
-    InitHandler = 0x0066, // unchanged 5.0
+    InitHandler = 0x03D2, // updated 5.1
 
-    FinishLoadingHandler = 0x0069, // unchanged 5.0
+    FinishLoadingHandler = 0x01DC, // updated 5.1
 
     CFCommenceHandler = 0x006F,
 
 
     CFRegisterDuty = 0x0071,
     CFRegisterRoulette = 0x0072,
-    PlayTimeHandler = 0x0073, // unchanged 5.0
+    PlayTimeHandler = 0x0276, // updated 5.1
-    LogoutHandler = 0x0074, // unchanged 5.0
+    LogoutHandler = 0x02D6, // updated 5.1
-    CancelLogout = 0x0075, // updated 5.0
+    CancelLogout = 0x008F, // updated 5.1
 
     CFDutyInfoHandler = 0x0078, // updated 4.2
 
     SocialReqSendHandler = 0x00AE, // updated 4.1
     CreateCrossWorldLS = 0x00AF, // updated 4.3
 
-    ChatHandler = 0x00D9, // updated 5.0
+    ChatHandler = 0x02FF, // updated 5.1
 
-    SocialListHandler = 0x00E1, // updated 5.0
+    SocialListHandler = 0x01F6, // updated 5.1
     SetSearchInfoHandler = 0x00E4, // updated 5.0
-    ReqSearchInfoHandler = 0x00E6, // updated 5.0
+    ReqSearchInfoHandler = 0x024D, // updated 5.1
     ReqExamineSearchCommentHandler = 0x00E7, // updated 5.0
 
     ReqRemovePlayerFromBlacklist = 0x00F1, // updated 5.0
-    BlackListHandler = 0x00F2, // updated 5.0
+    BlackListHandler = 0x0167, // updated 5.1
     PlayerSearchHandler = 0x00F4, // updated 5.0
 
-    LinkshellListHandler = 0x00FA, // updated 5.0
+    LinkshellListHandler = 0x00D3, // updated 5.1
 
     MarketBoardRequestItemListingInfo = 0x0102, // updated 4.5
     MarketBoardRequestItemListings = 0x0103, // updated 4.5
@@ -315,20 +321,21 @@ namespace Sapphire::Network::Packets
     ReqCountdownInitiate = 0x0135, // updated 5.0
     ReqCountdownCancel = 0x0136, // updated 5.0
 
-    ZoneLineHandler = 0x0139, // updated 5.0
+    ZoneLineHandler = 0x02E0, // updated 5.1
-    ClientTrigger = 0x013A, // updated 5.0
+    ClientTrigger = 0x00B1, // updated 5.1
-    DiscoveryHandler = 0x013B, // updated 5.0
+    DiscoveryHandler = 0x0177, // updated 5.1
 
     PlaceFieldMarker = 0x013C, // updated 5.0
 
     SkillHandler = 0x013D, // updated 5.0
-    GMCommand1 = 0x013E, // updated 5.0
+    GMCommand1 = 0x00A4, // updated 5.1
     GMCommand2 = 0x013F, // updated 5.0
     AoESkillHandler = 0x140, // updated 5.0
 
-    UpdatePositionHandler = 0x0141, // updated 5.0
+    UpdatePositionHandler = 0x01EC, // updated 5.1
 
     InventoryModifyHandler = 0x029B, // updated 5.11
+    
     InventoryEquipRecommendedItems = 0x0149, // updated 5.0
 
     ReqPlaceHousingItem = 0x014B, // updated 5.0
@@ -349,7 +356,7 @@ namespace Sapphire::Network::Packets
 
     ReqEquipDisplayFlagsChange = 0x0175, // updated 5.0
 
-    LandRenameHandler = 0x0177, // updated 5.0
+    LandRenameHandler = 0xF177, // updated 5.0
     HousingUpdateHouseGreeting = 0x0178, // updated 5.0
     HousingUpdateObjectPosition = 0x0179, // updated 5.0
 

src/tools/exd_struct_gen/main.cpp

@@ -127,8 +127,17 @@ std::string generateStruct( const std::string& exd )
   }
 
   auto sheet = nlohmann::json();
+
+  try
+  {
     std::ifstream defJson( path );
     defJson >> sheet;
+  }
+  catch( const std::exception& ex )
+  {
+    Logger::error( "Failed parsing json definition, err: {}  file: {}", ex.what(), path );
+    return "";
+  }
 
   for( auto& definition : sheet[ "definitions" ] )
   {

src/world/Territory/Housing/HousingInteriorTerritory.h

@@ -5,7 +5,7 @@
 
 namespace Sapphire::World::Territory::Housing
 {
-  class HousingInteriorTerritory : public Territory
+  class HousingInteriorTerritory : public Sapphire::Territory
   {
   public:
     HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,