mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Code Activity

Merge pull request #547 from JeidoUran/stuff

Browse source 
ActorControl, OpCode and NpcSpawn findings. Also added worldId to Examine and PlayerSpawn
This commit is contained in:
Mordred 2019-04-18 07:56:54 +02:00 • committed by GitHub
commit a03bcd6bfc
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,7 @@ enum ActorControlType : uint16_t
TreasureScreenMsg = 0x57, TreasureScreenMsg = 0x57,
SetOwnerId = 0x59, SetOwnerId = 0x59,
ItemRepairMsg = 0x5C, ItemRepairMsg = 0x5C,
BluActionLearn = 0x63, // Displays "Action Learned!" animation. Only used for visual, doesn't actually unlock it. param1: actionId. param2: 0 = text only, 1 = text+animation. Verification needed
DirectorInit = 0x64, DirectorInit = 0x64,
DirectorClear = 0x65, DirectorClear = 0x65,
@ -287,6 +288,8 @@ enum ActorControlType : uint16_t
SetDutyActionHud = 0x5E9, // disable/enable SetDutyActionHud = 0x5E9, // disable/enable
SetDutyActionActive = 0x5EA, SetDutyActionActive = 0x5EA,
SetDutyActionRemaining = 0x5EB, SetDutyActionRemaining = 0x5EB,
EurekaStep = 0x73A, // alters the progress of the player on Eureka (is used for all the eureka zones)
}; };
enum ClientTriggerType enum ClientTriggerType

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

@ -182,6 +182,7 @@ namespace Sapphire::Network::Packets
Mount = 0x01E8, // updated 4.5 Mount = 0x01E8, // updated 4.5
DirectorVars = 0x01EA, // updated 4.5 DirectorVars = 0x01EA, // updated 4.5
DirectorPopUp = 0x01F5, // display dialogue pop-ups in duties and FATEs, for example, Teraflare's countdown
CFAvailableContents = 0xF1FD, // updated 4.2 CFAvailableContents = 0xF1FD, // updated 4.2

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

@ -610,7 +610,8 @@ namespace Sapphire::Network::Packets::Server
uint8_t mountFeet; uint8_t mountFeet;
uint8_t mountColor; uint8_t mountColor;
uint8_t scale; uint8_t scale;
uint32_t u29b; uint16_t elementalLevel; // Eureka
uint16_t element; // Eureka
uint32_t u30b; uint32_t u30b;
Common::StatusEffect effect[30]; Common::StatusEffect effect[30];
Common::FFXIVARR_POSITION3 pos; Common::FFXIVARR_POSITION3 pos;
@ -1039,7 +1040,9 @@ namespace Sapphire::Network::Packets::Server
char padding1[8]; char padding1[8];
uint64_t mainWeaponModel; uint64_t mainWeaponModel;
uint64_t secWeaponModel; uint64_t secWeaponModel;
char unknown2[16]; uint8_t unknown2;
uint16_t worldId;
char unknown3[12];
struct ItemData struct ItemData
{ {
uint32_t catalogId; uint32_t catalogId;

2
src/world/Network/PacketWrappers/ExaminePacket.h
View file

@ -49,6 +49,8 @@ namespace Sapphire::Network::Packets::Server
m_data.mainWeaponModel = pTarget->getModelMainWeapon(); m_data.mainWeaponModel = pTarget->getModelMainWeapon();
m_data.secWeaponModel = pTarget->getModelSubWeapon(); m_data.secWeaponModel = pTarget->getModelSubWeapon();
m_data.worldId = 67; // TODO: world id from server
memcpy( m_data.look, pTarget->getLookArray(), sizeof( m_data.look ) ); memcpy( m_data.look, pTarget->getLookArray(), sizeof( m_data.look ) );
m_data.models[ Common::GearModelSlot::ModelHead ] = pTarget->getModelForSlot( Common::GearModelSlot::ModelHead ); m_data.models[ Common::GearModelSlot::ModelHead ] = pTarget->getModelForSlot( Common::GearModelSlot::ModelHead );

4
src/world/Network/PacketWrappers/PlayerSpawnPacket.h
View file

@ -31,6 +31,10 @@ namespace Sapphire::Network::Packets::Server
m_data.classJob = static_cast< uint8_t >( player.getClass() ); m_data.classJob = static_cast< uint8_t >( player.getClass() );
//m_data.status = static_cast< uint8_t >( pPlayer->getStatus() ); //m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
// TODO: world id from server
m_data.currentWorldId = 67;
m_data.homeWorldId = 67;
m_data.hPCurr = player.getHp(); m_data.hPCurr = player.getHp();
m_data.mPCurr = player.getMp(); m_data.mPCurr = player.getMp();
m_data.tPCurr = player.getTp(); m_data.tPCurr = player.getTp();