From 8439b9a922905e0c05d9d54d23cd3eaf4df6367b Mon Sep 17 00:00:00 2001 From: Mordred Date: Sun, 27 May 2018 16:21:52 +0200 Subject: [PATCH] More initui adjustments --- .../Network/PacketDef/Zone/ServerZoneDef.h | 292 +++++++++--------- .../Network/PacketWrappers/InitUIPacket.h | 2 +- 2 files changed, 143 insertions(+), 151 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index b88b6024..1385202a 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -609,157 +609,149 @@ struct FFXIVIpcInitZone : FFXIVIpcBasePacket */ struct FFXIVIpcInitUI : FFXIVIpcBasePacket { - uint64_t contentId; - uint32_t unknown8; - uint32_t unknownC; - uint32_t charId; - uint32_t restedExp; - - uint32_t companionCurrentExp; - - uint32_t unknown3C; - uint32_t fishCaught; - uint32_t useBaitCatalogId; - - uint32_t pvpWolfFoldMatches; - uint16_t pvpWolfFoldWeeklyMatches; - uint16_t pvpWolfFoldWeeklyVictories; - uint16_t pvpStats[6]; - uint16_t playerCommendations; - uint16_t pvpStats1; - uint8_t frontlineCampaigns[4]; - uint16_t frontlineCampaignsWeekly; - uint8_t currentRelic; - uint8_t currentBook; - uint8_t masterCrafterMask; - uint8_t unknown69; - uint8_t unknown6A; - uint8_t unknown6B; - uint8_t unknown6C[4]; - uint8_t unknown70[34]; - - uint16_t unknown18; - uint8_t maxLevel; - uint8_t expansion; - uint8_t unknown; - uint8_t race; - uint8_t tribe; - uint8_t gender; - uint8_t currentJob; - uint8_t currentClass; - uint8_t deity; - uint8_t namedayMonth; - uint8_t namedayDay; - uint8_t cityState; - uint8_t homepoint; - uint8_t unknown26; - uint8_t petHotBar; - uint8_t companionRank; - uint8_t companionStars; - uint8_t companionSp; - uint8_t companionUnk2B; - uint8_t companionColor; - uint8_t companionFavoFeed; - uint8_t companionUnk2E; - uint8_t companionTimePassed[4]; - uint16_t unknown38[11]; - - uint32_t exp[25]; - uint8_t unknown564[16]; - uint32_t pvpFrontlineOverall1st; - uint32_t pvpFrontlineOverall2nd; - uint32_t pvpFrontlineOverall3rd; - uint8_t relicBookCompletion1[4]; - uint16_t levels[25]; - uint16_t levelsPadding; - uint8_t unknown__[16]; - uint16_t fishingRecordsFish[26]; - uint16_t fishingRecordsFishWeight[26]; - uint8_t unknownMask554[44]; - - uint8_t companion_name[21]; - uint8_t companionDefRank; - uint8_t companionAttRank; - uint8_t companionHealRank; - uint8_t mountGuideMask[16]; + // plain C types for a bit until the packet is actually fixed. + // makes conversion between different editors easier. + __int64 contentId; + unsigned int unknown8; + unsigned int unknownC; + unsigned int charId; + unsigned int restedExp; + unsigned int companionCurrentExp; + unsigned int unknown3C; + unsigned int fishCaught; + unsigned int useBaitCatalogId; + unsigned int pvpWolfFoldMatches; + unsigned __int16 pvpWolfFoldWeeklyMatches; + unsigned __int16 pvpWolfFoldWeeklyVictories; + unsigned __int16 pvpStats[6]; + unsigned __int16 playerCommendations; + unsigned __int16 pvpStats1; + unsigned __int8 frontlineCampaigns[4]; + unsigned __int16 frontlineCampaignsWeekly; + unsigned __int8 currentRelic; + unsigned __int8 currentBook; + unsigned __int8 masterCrafterMask; + unsigned __int8 unknown69; + unsigned __int8 unknown6A; + unsigned __int8 unknown6B; + unsigned __int8 unknown6C[4]; + unsigned __int8 unknown50[34]; + unsigned __int16 unknown18; + unsigned __int8 maxLevel; + unsigned __int8 expansion; + unsigned __int8 unknown76; + unsigned __int8 race; + unsigned __int8 tribe; + unsigned __int8 gender; + unsigned __int8 currentJob; + unsigned __int8 currentClass; + unsigned __int8 deity; + unsigned __int8 namedayMonth; + unsigned __int8 namedayDay; + unsigned __int8 cityState; + unsigned __int8 homepoint; + unsigned __int8 unknown26; + unsigned __int8 petHotBar; + unsigned __int8 companionRank; + unsigned __int8 companionStars; + unsigned __int8 companionSp; + unsigned __int8 companionUnk2B; + unsigned __int8 companionColor; + unsigned __int8 companionFavoFeed; + unsigned __int8 companionUnk89; + unsigned __int8 companionUnk90[5]; + unsigned __int16 unknown90[7]; + unsigned __int16 unknown9E; + unsigned __int16 unknownA0; + unsigned int exp[25]; + unsigned __int8 unknown564[16]; + unsigned int pvpFrontlineOverall1st; + unsigned int pvpFrontlineOverall2nd; + unsigned int pvpFrontlineOverall3rd; + unsigned __int8 relicBookCompletion1[4]; + unsigned __int16 levels[25]; + unsigned __int16 levelsPadding; + unsigned __int16 unknown15C[8]; + unsigned __int16 fishingRecordsFish[26]; + unsigned __int16 fishingRecordsFishWeight[26]; + unsigned __int8 unknownMask554[44]; + unsigned __int8 companion_name[21]; + unsigned __int8 companionDefRank; + unsigned __int8 companionAttRank; + unsigned __int8 companionHealRank; + unsigned __int8 mountGuideMask[16]; char name[32]; - uint8_t unknownOword[16]; - uint8_t unlockBitmask[64]; - uint8_t aetheryte[17]; - uint8_t discovery[421]; - uint8_t howto[33]; - uint8_t minions[38]; - uint8_t chocoboTaxiMask[8]; - uint8_t contentClearMask[111]; - uint8_t contentClearPadding; - uint16_t unknown428[8]; - uint8_t companionBardingMask[8]; - uint8_t companionEquippedHead; - uint8_t companionEquippedBody; - uint8_t companionEquippedFeet; - uint8_t companionUnk4[4]; - uint8_t companion_fields[11]; - - uint8_t fishingGuideMask[89]; - uint8_t fishingSpotVisited[25]; - - - uint8_t unknownMask4Padding; - - uint8_t rankAmalJaa; - uint8_t rankSylph; - uint8_t rankKobold; - uint8_t rankSahagin; - uint8_t rankIxal; - uint8_t rankVanu; - uint8_t rankVath; - uint8_t rankMoogle; - uint8_t rankKojin; - uint8_t rankAnata; - uint16_t expAmalJaa; - uint16_t expSylph; - uint16_t expKobold; - uint16_t expSahagin; - uint16_t expIxal; - uint16_t expVanu; - uint16_t expVath; - uint16_t expMoogle; - uint16_t expKojin; - uint16_t expAnata; - uint8_t unknown596[10]; - uint16_t unknown5A0[5]; - uint8_t unknownMask59E[5]; - uint8_t unknown5A3[18]; - uint8_t unknownMask5C1[28]; - uint8_t unknown_03411; - uint32_t unknownDword5E0; - uint16_t pvpFrontlineWeekly1st; - uint16_t pvpFrontlineWeekly2nd; - uint16_t pvpFrontlineWeekly3rd; - uint8_t relicBookCompletion2[8]; - uint8_t sightseeingMask[26]; - uint16_t unknown_XXX; - - uint8_t unknown61E; - uint8_t unknown61F[32]; - uint8_t unknown63F[22]; - uint8_t tripleTriadCards[28]; - uint8_t unknown671[11]; - uint8_t unknownMask67C[22]; - uint8_t unknown692[3]; - uint8_t orchestrionMask[40]; - uint8_t hallOfNoviceCompleteMask[3]; - uint8_t unknownMask6C0[11]; - uint8_t unknownMask6CB[16]; - uint8_t unknown6DB[14]; - uint8_t unlockedRaids[28]; - uint8_t unlockedDungeons[18]; - uint8_t unlockedGuildhests[10]; - uint8_t unlockedTrials[7]; - uint8_t unlockedPvp[5]; - uint8_t unknownMask72D[28]; - // uint8_t unknownMask749[18]; - //uint8_t unknown749[13]; + unsigned __int8 unknownOword[16]; + unsigned __int8 unknown258; + unsigned __int8 unlockBitmask[64]; + unsigned __int8 aetheryte[17]; + unsigned __int8 discovery[421]; + unsigned __int8 howto[33]; + unsigned __int8 minions[38]; + unsigned __int8 chocoboTaxiMask[8]; + unsigned __int8 contentClearMask[111]; + unsigned __int8 contentClearPadding; + unsigned __int16 unknown428[8]; + unsigned __int8 companionBardingMask[8]; + unsigned __int8 companionEquippedHead; + unsigned __int8 companionEquippedBody; + unsigned __int8 companionEquippedFeet; + unsigned __int8 companionUnk4[4]; + unsigned __int8 companion_fields[11]; + unsigned __int8 fishingGuideMask[89]; + unsigned __int8 fishingSpotVisited[25]; + unsigned __int8 unknownMask4Padding; + unsigned __int8 rankAmalJaa; + unsigned __int8 rankSylph; + unsigned __int8 rankKobold; + unsigned __int8 rankSahagin; + unsigned __int8 rankIxal; + unsigned __int8 rankVanu; + unsigned __int8 rankVath; + unsigned __int8 rankMoogle; + unsigned __int8 rankKojin; + unsigned __int8 rankAnata; + unsigned __int16 expAmalJaa; + unsigned __int16 expSylph; + unsigned __int16 expKobold; + unsigned __int16 expSahagin; + unsigned __int16 expIxal; + unsigned __int16 expVanu; + unsigned __int16 expVath; + unsigned __int16 expMoogle; + unsigned __int16 expKojin; + unsigned __int16 expAnata; + unsigned __int8 unknown596[10]; + unsigned __int16 unknown5A0[5]; + unsigned __int8 unknownMask59E[5]; + unsigned __int8 unknown5A3[18]; + unsigned __int8 unknownMask5C1[28]; + unsigned __int8 unknown_03411; + unsigned int unknownDword5E0; + unsigned __int16 pvpFrontlineWeekly1st; + unsigned __int16 pvpFrontlineWeekly2nd; + unsigned __int16 pvpFrontlineWeekly3rd; + unsigned __int8 relicBookCompletion2[8]; + unsigned __int8 sightseeingMask[26]; + unsigned __int16 unknown_XXX; + unsigned __int8 unknown61E[20]; + unsigned __int8 unknown656[29]; + unsigned __int8 unknown63F[22]; + unsigned __int8 tripleTriadCards[28]; + unsigned __int8 unknown671[11]; + unsigned __int8 unknownMask67C[22]; + unsigned __int8 unknown692[3]; + unsigned __int8 orchestrionMask[40]; + unsigned __int8 hallOfNoviceCompleteMask[3]; + unsigned __int8 unknownMask6C0[11]; + unsigned __int8 unknownMask6CB[16]; + unsigned __int8 unknown6DB[14]; + unsigned __int8 unlockedRaids[28]; + unsigned __int8 unlockedDungeons[18]; + unsigned __int8 unlockedGuildhests[10]; + unsigned __int8 unlockedTrials[7]; + unsigned __int8 unlockedPvp[5]; + unsigned __int8 unknownMask72D[28]; }; diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h index 548c45a6..14ac8bf2 100644 --- a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h +++ b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h @@ -77,7 +77,7 @@ private: // df stuff // todo: actually do this properly - m_data.unknown70[4] = 1; // enable df +// m_data.unknown70[4] = 1; // enable df // enable all raids/guildhests/dungeons memset( m_data.unlockedDungeons, 0xFF, sizeof( m_data.unlockedDungeons ) );