mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 08:27:46 +00:00
Code Activity

Fully fixed initui and quests

Browse source
This commit is contained in:
Mordred 2018-02-03 01:51:46 +01:00
parent 595a9e3079
commit 95efd65e0f
4 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/Network/PacketDef/Ipcs.h
View file

@ -126,9 +126,9 @@ namespace Packets {
QuestMessage = 0x01B8, // updated 4.2
QuestTracker = 0x01BD, // updated 4.2
QuestFinish = 0x01A0, // updated 4.2
MSQTrackerComplete = 0x01A1, // updated 4.2
MSQTrackerProgress = 0x01A2, // updated 4.2
QuestFinish = 0x01B0, // updated 4.2
MSQTrackerComplete = 0x01B1, // updated 4.2
MSQTrackerProgress = 0x01B2, // updated 4.2
QuestActiveList = 0x01AD, // updated 4.2

65
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -621,6 +621,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint16_t unknown18;
uint8_t maxLevel;
uint8_t expansion;
uint8_t unknown1A;
uint8_t race;
uint8_t tribe;
uint8_t gender;
@ -636,24 +637,23 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint8_t companionRank;
uint8_t companionStars;
uint8_t companionSp;
uint8_t companionUnk1;
uint8_t companionUnk2B;
uint8_t companionColor;
uint8_t companionFavoFeed;
uint16_t companionUnk2;
uint8_t companionUnk2E;
float companionTimePassed;
uint32_t companionCurrentExp;
uint32_t unknown38;
uint32_t unknown3C;
uint32_t fishCaught;
uint32_t useBaitCatalogId;
uint16_t pvpWolfFoldMatches;
uint16_t pvpWolfFoldVictories;
uint32_t pvpWolfFoldMatches;
uint16_t pvpWolfFoldWeeklyMatches;
uint16_t pvpWolfFoldWeeklyVictories;
uint16_t pvpStats[6];
uint16_t playerCommendations;
uint16_t pvpStats1;
uint32_t frontlineCampaigns;
uint8_t frontlineCampaigns[4];
uint16_t frontlineCampaignsWeekly;
uint8_t currentRelic;
uint8_t currentBook;
@ -661,7 +661,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint8_t unknown69;
uint8_t unknown6A;
uint8_t unknown6B;
uint32_t unknown6C;
uint8_t unknown6C[4];
uint8_t unknown70[61];
uint8_t preNamePadding;
char name[32];
@ -672,30 +672,31 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint32_t exp[25];
uint8_t unlockBitmask[64];
uint8_t aetheryte[16];
uint8_t discovery[420];
uint8_t discovery[421];
uint8_t howto[33];
uint8_t minions[35];
uint8_t minions[37];
uint8_t chocoboTaxiMask[8];
uint8_t contentClearMask[105];
uint8_t contentClearMask[108];
uint8_t contentClearPadding;
uint16_t unknown422[8];
uint16_t unknown428[8];
uint8_t companionBardingMask[8];
uint8_t companionEquippedHead;
uint8_t companionEquippedBody;
uint8_t companionEquippedFeet;
uint8_t companion_fields[15];
uint8_t companionUnk4[4];
uint8_t companion_fields[11];
uint8_t companion_name[21];
uint8_t companionDefRank;
uint8_t companionAttRank;
uint8_t companionHealRank;
uint8_t mountGuideMask[14];
uint8_t mountGuideMask[15];
uint8_t fishingGuideMask[89];
uint8_t fishingSpotVisited[25];
uint16_t fishingRecordsFish[26];
uint16_t fishingRecordsFishWeight[26];
uint8_t unknownMask4[15];
uint8_t unknownMask554[15];
uint8_t unknownMask4Padding;
uint8_t unknown55C[19];
uint8_t unknown564[19];
uint8_t rankAmalJaa;
uint8_t rankSylph;
uint8_t rankKobold;
@ -705,6 +706,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint8_t rankVath;
uint8_t rankMoogle;
uint8_t rankKojin;
uint8_t rankAnata;
uint16_t expAmalJaa;
uint16_t expSylph;
uint16_t expKobold;
@ -714,13 +716,14 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint16_t expVath;
uint16_t expMoogle;
uint16_t expKojin;
uint8_t unknown58A[10];
uint16_t unknown594[5];
uint16_t expAnata;
uint8_t unknown596[10];
uint16_t unknown5A0[5];
uint8_t unknownMask59E[5];
uint8_t unknown5A3[16];
uint8_t unknownMask5B3[28];
uint8_t unknown5A3[18];
uint8_t unknownMask5C1[28];
uint8_t unknown_03411;
uint32_t unknownDword5D0;
uint32_t unknownDword5E0;
uint8_t relicBookCompletion[12];
uint8_t sightseeingMask[26];
uint16_t unknown_XXX;
@ -730,25 +733,25 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint16_t pvpFrontlineWeekly1st;
uint16_t pvpFrontlineWeekly2nd;
uint16_t pvpFrontlineWeekly3rd;
uint8_t unknown60E;
uint8_t unknown60F[32];
uint8_t unknown62F[22];
uint8_t tripleTriadCards[27];
uint8_t unknown660[11];
uint8_t unknownMask66B[22];
uint8_t unknown681[3];
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 unknownMask6AF[11];
uint8_t unknownMask6BA[16];
uint8_t unknown6CA[13];
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 unlockedTrails[7];
uint8_t unlockedPvp[5];
uint8_t unknownMask71B[28];
uint8_t unknownMask737[18];
uint8_t unknownMask72D[28];
uint8_t unknownMask749[18];
uint8_t unknown749[23];
};

2
src/servers/sapphire_zone/Event/EventHelper.cpp
View file

@ -24,7 +24,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
std::string name = questInfo->id;
std::size_t pos = name.find_first_of( "_" );
return questInfo->name.substr( 0, pos );
return name.substr( 0, pos );
}
case Event::EventHandler::EventHandlerType::CustomTalk:
{

2
src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
View file

@ -146,7 +146,7 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::G
auto param1 = inPacket.getValAt< uint16_t >( 0x24 );
auto param2 = inPacket.getValAt< uint16_t >( 0x26 );
std::string eventName = Event::getEventName( eventId );
std::string eventName = "onEnterTerritory";
std::string objName = Event::getEventName( eventId );