From a2903a4652f8ad3e349a983d8f2b358ad48fcc94 Mon Sep 17 00:00:00 2001 From: Biscuit Date: Sat, 12 Jan 2019 13:18:58 +1100 Subject: [PATCH 1/3] Updated GMCommand2 Def Added worldId to the def since you can now Player@WorldName, this also fixes GM2 Commands not working --- src/common/Network/PacketDef/Zone/ClientZoneDef.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index f4a057ad..d6537d9c 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -29,8 +29,9 @@ struct FFXIVIpcGmCommand2 : /* 0008 */ uint32_t param2; /* 000C */ uint32_t param3; /* 0010 */ uint32_t param4; - /* 0014 */ char target[0x20]; - /* 0034 */ uint32_t unknown1; + /* 0014 */ uint16_t worldId; + /* 0016 */ char target[0x20]; + /* 0036 */ uint16_t unknown1; }; struct FFXIVIpcClientTrigger : From ddbc93c500b9c6addf60a29cb576689c9c3ecacd Mon Sep 17 00:00:00 2001 From: Mordred Date: Sat, 12 Jan 2019 10:47:45 +0100 Subject: [PATCH 2/3] Linux build fix --- .../Network/PacketDef/Zone/ServerZoneDef.h | 228 +++++++++--------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 4b251100..87205190 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -781,8 +781,8 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI > unsigned int fishCaught; unsigned int useBaitCatalogId; unsigned int unknown28; - unsigned __int16 unknownPvp2C; - unsigned __int16 unknown3; + unsigned short unknownPvp2C; + unsigned short unknown3; unsigned int pvpFrontlineOverallCampaigns; unsigned int unknownTimestamp34; unsigned int unknownTimestamp38; @@ -791,126 +791,126 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI > unsigned int unknown44; float companionTimePassed; unsigned int unknown4C; - unsigned __int16 unknown50; - unsigned __int16 unknownPvp52[4]; - unsigned __int16 playerCommendations; - unsigned __int16 unknown5C; - unsigned __int16 unknown5E; - unsigned __int16 pvpFrontlineWeeklyCampaigns; - unsigned __int16 enhancedAnimaGlassProgress; - unsigned __int16 unknown64[4]; - unsigned __int16 pvpRivalWingsTotalMatches; - unsigned __int16 pvpRivalWingsTotalVictories; - unsigned __int16 pvpRivalWingsWeeklyMatches; - unsigned __int16 pvpRivalWingsWeeklyVictories; - 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 unknown81; - unsigned __int8 petHotBar; - unsigned __int8 companionRank; - unsigned __int8 companionStars; - unsigned __int8 companionSp; - unsigned __int8 companionUnk86; - unsigned __int8 companionColor; - unsigned __int8 companionFavoFeed; - unsigned __int8 unknown89; - unsigned __int8 unknown8A[4]; - unsigned __int8 hasRelicBook; - unsigned __int8 relicBookId; - unsigned __int8 unknown90[4]; - unsigned __int8 craftingMasterMask; - unsigned __int8 unknown95[10]; - unsigned __int8 unknown9F[2]; - unsigned __int8 unknownA1[3]; + unsigned short unknown50; + unsigned short unknownPvp52[4]; + unsigned short playerCommendations; + unsigned short unknown5C; + unsigned short unknown5E; + unsigned short pvpFrontlineWeeklyCampaigns; + unsigned short enhancedAnimaGlassProgress; + unsigned short unknown64[4]; + unsigned short pvpRivalWingsTotalMatches; + unsigned short pvpRivalWingsTotalVictories; + unsigned short pvpRivalWingsWeeklyMatches; + unsigned short pvpRivalWingsWeeklyVictories; + unsigned char maxLevel; + unsigned char expansion; + unsigned char unknown76; + unsigned char race; + unsigned char tribe; + unsigned char gender; + unsigned char currentJob; + unsigned char currentClass; + unsigned char deity; + unsigned char namedayMonth; + unsigned char namedayDay; + unsigned char cityState; + unsigned char homepoint; + unsigned char unknown81; + unsigned char petHotBar; + unsigned char companionRank; + unsigned char companionStars; + unsigned char companionSp; + unsigned char companionUnk86; + unsigned char companionColor; + unsigned char companionFavoFeed; + unsigned char unknown89; + unsigned char unknown8A[4]; + unsigned char hasRelicBook; + unsigned char relicBookId; + unsigned char unknown90[4]; + unsigned char craftingMasterMask; + unsigned char unknown95[10]; + unsigned char unknown9F[2]; + unsigned char unknownA1[3]; unsigned int exp[26]; unsigned int unknown108; unsigned int pvpTotalExp; unsigned int unknownPvp110; unsigned int pvpExp; unsigned int pvpFrontlineOverallRanks[3]; - unsigned __int16 levels[26]; - unsigned __int16 unknown15C[9]; - unsigned __int16 u1; - unsigned __int16 u2; - unsigned __int16 unknown112[23]; - unsigned __int16 fishingRecordsFish[26]; - unsigned __int16 beastExp[11]; - unsigned __int16 unknown1EA[5]; - unsigned __int16 pvpFrontlineWeeklyRanks[3]; - unsigned __int16 unknownMask1FA[4]; - unsigned __int8 companionName[21]; - unsigned __int8 companionDefRank; - unsigned __int8 companionAttRank; - unsigned __int8 companionHealRank; - unsigned __int8 unknown21A[19]; + unsigned short levels[26]; + unsigned short unknown15C[9]; + unsigned short u1; + unsigned short u2; + unsigned short unknown112[23]; + unsigned short fishingRecordsFish[26]; + unsigned short beastExp[11]; + unsigned short unknown1EA[5]; + unsigned short pvpFrontlineWeeklyRanks[3]; + unsigned short unknownMask1FA[4]; + unsigned char companionName[21]; + unsigned char companionDefRank; + unsigned char companionAttRank; + unsigned char companionHealRank; + unsigned char unknown21A[19]; char name[32]; - unsigned __int8 unknownOword[16]; - unsigned __int8 unknownOw; - unsigned __int8 unlockBitmask[64]; - unsigned __int8 aetheryte[17]; - unsigned __int8 discovery[421]; - unsigned __int8 howto[34]; - unsigned __int8 minions[42]; - unsigned __int8 chocoboTaxiMask[8]; - unsigned __int8 watchedCutscenes[118]; - unsigned __int8 companionBardingMask[9]; - unsigned __int8 companionEquippedHead; - unsigned __int8 companionEquippedBody; - unsigned __int8 companionEquippedLegs; - unsigned __int8 unknown52A[4]; - unsigned __int8 unknownMask52E[11]; - unsigned __int8 fishingGuideMask[89]; - unsigned __int8 fishingSpotVisited[25]; - unsigned __int8 unknown59A[15]; - unsigned __int8 unknown5A9[5]; - unsigned __int8 beastRank[11]; - unsigned __int8 unknownPvp5AB[11]; - unsigned __int8 unknown5B9[5]; - unsigned __int8 unknown5B91; - unsigned __int8 pose; - unsigned __int8 challengeLogComplete[9]; - unsigned __int8 weaponPose; - unsigned __int8 unknownMask673[10]; - unsigned __int8 unknownMask5DD[28]; - unsigned __int8 relicCompletion[12]; - unsigned __int8 unknown694[26]; - unsigned __int8 huntingMarkMask[55]; - unsigned __int8 tripleTriadCards[32]; - unsigned __int8 animaCompletion[11]; - unsigned __int8 u13; - unsigned __int8 aetherCurrentMask[22]; - unsigned __int8 u10[3]; - unsigned __int8 orchestrionMask[40]; - unsigned __int8 u11[3]; - unsigned __int8 u12[11]; - unsigned __int8 u14[16]; - unsigned __int8 u15[13]; - unsigned __int8 unlockedRaids[28]; - unsigned __int8 unlockedDungeons[18]; - unsigned __int8 unlockedGuildhests[10]; - unsigned __int8 unlockedTrials[8]; - unsigned __int8 unlockedPvp[5]; - unsigned __int8 clearedRaids[28]; - unsigned __int8 clearedDungeons[18]; - unsigned __int8 clearedGuildhests[10]; - unsigned __int8 clearedTrials[8]; - unsigned __int8 clearedPvp[5]; - unsigned __int8 mountGuideMask[17]; - unsigned __int16 fishingRecordsFishWeight[26]; + unsigned char unknownOword[16]; + unsigned char unknownOw; + unsigned char unlockBitmask[64]; + unsigned char aetheryte[17]; + unsigned char discovery[421]; + unsigned char howto[34]; + unsigned char minions[42]; + unsigned char chocoboTaxiMask[8]; + unsigned char watchedCutscenes[118]; + unsigned char companionBardingMask[9]; + unsigned char companionEquippedHead; + unsigned char companionEquippedBody; + unsigned char companionEquippedLegs; + unsigned char unknown52A[4]; + unsigned char unknownMask52E[11]; + unsigned char fishingGuideMask[89]; + unsigned char fishingSpotVisited[25]; + unsigned char unknown59A[15]; + unsigned char unknown5A9[5]; + unsigned char beastRank[11]; + unsigned char unknownPvp5AB[11]; + unsigned char unknown5B9[5]; + unsigned char unknown5B91; + unsigned char pose; + unsigned char challengeLogComplete[9]; + unsigned char weaponPose; + unsigned char unknownMask673[10]; + unsigned char unknownMask5DD[28]; + unsigned char relicCompletion[12]; + unsigned char unknown694[26]; + unsigned char huntingMarkMask[55]; + unsigned char tripleTriadCards[32]; + unsigned char animaCompletion[11]; + unsigned char u13; + unsigned char aetherCurrentMask[22]; + unsigned char u10[3]; + unsigned char orchestrionMask[40]; + unsigned char u11[3]; + unsigned char u12[11]; + unsigned char u14[16]; + unsigned char u15[13]; + unsigned char unlockedRaids[28]; + unsigned char unlockedDungeons[18]; + unsigned char unlockedGuildhests[10]; + unsigned char unlockedTrials[8]; + unsigned char unlockedPvp[5]; + unsigned char clearedRaids[28]; + unsigned char clearedDungeons[18]; + unsigned char clearedGuildhests[10]; + unsigned char clearedTrials[8]; + unsigned char clearedPvp[5]; + unsigned char mountGuideMask[17]; + unsigned short fishingRecordsFishWeight[26]; unsigned int exploratoryMissionNextTimestamp; - unsigned __int8 pvpLevel; - unsigned __int8 sightseeingMask[26]; + unsigned char pvpLevel; + unsigned char sightseeingMask[26]; }; From f2080a6cbfbb7b503bea685b11690a87babf5df2 Mon Sep 17 00:00:00 2001 From: Mordred Date: Sat, 12 Jan 2019 11:22:30 +0100 Subject: [PATCH 3/3] SightseeingMask fixed in initui --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 87205190..5422d272 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -884,16 +884,16 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI > unsigned char unknownMask673[10]; unsigned char unknownMask5DD[28]; unsigned char relicCompletion[12]; - unsigned char unknown694[26]; + unsigned char sightseeingMask[26]; unsigned char huntingMarkMask[55]; unsigned char tripleTriadCards[32]; - unsigned char animaCompletion[11]; + unsigned char u12[11]; unsigned char u13; unsigned char aetherCurrentMask[22]; unsigned char u10[3]; unsigned char orchestrionMask[40]; - unsigned char u11[3]; - unsigned char u12[11]; + unsigned char hallOfNoviceCompletion[3]; + unsigned char animaCompletion[11]; unsigned char u14[16]; unsigned char u15[13]; unsigned char unlockedRaids[28]; @@ -910,7 +910,6 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI > unsigned short fishingRecordsFishWeight[26]; unsigned int exploratoryMissionNextTimestamp; unsigned char pvpLevel; - unsigned char sightseeingMask[26]; };