mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 17:57:47 +00:00
Code Activity

Merge branch 'develop' of https://github.com/SapphireServer/Sapphire into develop

Browse source
This commit is contained in:
NotAdam 2019-11-01 18:13:23 +11:00
commit dc81999485
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/Network/CommonActorControl.h
View file

@ -24,6 +24,9 @@ namespace Sapphire::Network::ActorControl
SetStatus = 0x02, SetStatus = 0x02,
CastStart = 0x03, CastStart = 0x03,
ToggleAggro = 0x04, ToggleAggro = 0x04,
/*!
* param1 = ClassJob ID
*/
ClassJobChange = 0x05, ClassJobChange = 0x05,
DefeatMsg = 0x06, DefeatMsg = 0x06,
GainExpMsg = 0x07, GainExpMsg = 0x07,
@ -372,6 +375,12 @@ namespace Sapphire::Network::ActorControl
EmoteReq = 0x1F4, EmoteReq = 0x1F4,
EmoteCancel = 0x1F6, EmoteCancel = 0x1F6,
PersistentEmoteCancel = 0x1F7, PersistentEmoteCancel = 0x1F7,
/*!
* param2 = pose ID
* 0 = idle pose 0 (just standing)
* 1 = idle pose 1
* 2-4 = idle poses 2-4
*/
PoseChange = 0x1F9, PoseChange = 0x1F9,
PoseReapply = 0x1FA, PoseReapply = 0x1FA,
PoseCancel = 0x1FB, PoseCancel = 0x1FB,

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

@ -111,8 +111,8 @@ namespace Sapphire::Network::Packets
MailLetterNotification = 0x013A, // updated 5.0 MailLetterNotification = 0x013A, // updated 5.0
MarketBoardItemListingCount = 0x013B, // updated 5.0 MarketBoardItemListingCount = 0x013B, // updated 5.0
MarketBoardItemListing = 0x013C, // updated 5.0 MarketBoardItemListing = 0x036A, // updated 5.1
MarketBoardItemListingHistory = 0x012A, // updated 4.5 MarketBoardItemListingHistory = 0x0194, // updated 5.1
MarketBoardSearchResult = 0x0139, // updated 4.5 MarketBoardSearchResult = 0x0139, // updated 4.5
CharaFreeCompanyTag = 0x013B, // updated 4.5 CharaFreeCompanyTag = 0x013B, // updated 4.5

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

@ -322,15 +322,7 @@ namespace Sapphire::Network::Packets::Server
bool hq; bool hq;
uint8_t materiaCount; uint8_t materiaCount;
uint8_t onMannequin; uint8_t onMannequin;
/** Common::Town marketCity;
* 0x01 Limsa Lominsa
* 0x02 Gridania
* 0x03 Ul'dah
* 0x04 Ishgard
* 0x07 Kugane
* 0x0A Crystarium
*/
uint8_t retainerCity;
uint16_t dyeId; uint16_t dyeId;
uint16_t padding3; uint16_t padding3;
uint32_t padding4; uint32_t padding4;