rename InitUI -> PlayerSetup, AddStatusEffect -> EffectResult

src/common/Network/PacketDef/Ipcs.h

@@ -51,7 +51,7 @@ namespace Sapphire::Network::Packets
     ActorFreeSpawn = 0x0191,
     InitZone = 0x019A,
 
-    AddStatusEffect = 0x0141,
+    EffectResult = 0x0141,
     ActorControl142 = 0x0142,
     ActorControl143 = 0x0143,
     ActorControl144 = 0x0144,
@@ -137,7 +137,7 @@ namespace Sapphire::Network::Packets
     ObjectDespawn = 0x0182, // updated 4.5
     UpdateClassInfo = 0x0183, // updated 4.5
     SilentSetClassJob = 0x0184, // updated 4.5 - seems to be the case, not sure if it's actually used for anything
-    InitUI = 0x0185, // updated 4.5
+    PlayerSetup = 0x0185, // updated 4.5
     PlayerStats = 0x0186, // updated 4.5
     ActorOwner = 0x0187, // updated 4.5
     PlayerStateFlags = 0x0188, // updated 4.5

src/common/Network/PacketDef/Zone/ServerZoneDef.h

@@ -305,7 +305,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server
   * add a status effect
   */
-  struct FFXIVIpcAddStatusEffect : FFXIVIpcBasePacket< AddStatusEffect >
+  struct FFXIVIpcEffectResult : FFXIVIpcBasePacket< EffectResult >
   {
     uint32_t unknown;
     uint32_t actor_id;
@@ -793,7 +793,7 @@ namespace Sapphire::Network::Packets::Server
   * Structural representation of the packet sent by the server to initialize
   * the client UI upon initial connection.
   */
-  struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
+  struct FFXIVIpcPlayerSetup : FFXIVIpcBasePacket< PlayerSetup >
   {
     // plain C types for a bit until the packet is actually fixed.
     // makes conversion between different editors easier.

src/world/Actor/Chara.cpp

@@ -457,7 +457,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf
   pEffect->applyStatus();
   m_statusEffectMap[ nextSlot ] = pEffect;
 
-  auto statusEffectAdd = makeZonePacket< FFXIVIpcAddStatusEffect >( getId() );
+  auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() );
 
   statusEffectAdd->data().actor_id = pEffect->getTargetActorId();
   statusEffectAdd->data().actor_id1 = pEffect->getSrcActorId();

src/world/Actor/Player.cpp

@@ -25,7 +25,7 @@
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 #include "Network/PacketWrappers/ActorControlPacket144.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
 #include "Network/PacketWrappers/ModelEquipPacket.h"
@@ -1717,7 +1717,7 @@ void Sapphire::Entity::Player::sendZonePackets()
     }
     queuePacket( contentFinderList );
 
-    queuePacket( std::make_shared< InitUIPacket >( *this ) );
+    queuePacket( std::make_shared< PlayerSetupPacket >( *this ) );
 
     auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() );
     classInfoPacket->data().classId = static_cast< uint8_t >( getClass() );

src/world/Actor/PlayerEvent.cpp

@@ -4,7 +4,7 @@
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/EventStartPacket.h"
 #include "Network/PacketWrappers/EventPlayPacket.h"

src/world/Actor/PlayerSql.cpp

@@ -10,7 +10,7 @@
 #include <Database/DatabaseDef.h>
 
 #include "Network/GameConnection.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 
 #include "Manager/TerritoryMgr.h"
 #include "Territory/Zone.h"

src/world/Manager/DebugCommandMgr.cpp

@@ -18,7 +18,7 @@
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PlayerSpawnPacket.h"
 #include "Network/GameConnection.h"
 #include "Script/ScriptMgr.h"
@@ -237,7 +237,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
   else if( subCommand == "discovery_reset" )
   {
     player.resetDiscovery();
-    player.queuePacket( std::make_shared< InitUIPacket >( player ) );
+    player.queuePacket( std::make_shared< PlayerSetupPacket >( player ) );
   }
   else if( subCommand == "classjob" )
   {

src/world/Network/GameConnection.cpp

@@ -10,7 +10,7 @@
 
 #include "Territory/Zone.h"
 
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 
 #include "Manager/DebugCommandMgr.h"
 

src/world/Network/Handlers/ClientTriggerHandler.cpp

@@ -15,7 +15,7 @@
 #include "Network/GameConnection.h"
 
 #include "Network/PacketWrappers/ExaminePacket.h"
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"

src/world/Network/Handlers/GMCommandHandlers.cpp

@@ -17,7 +17,7 @@
 #include "Territory/Zone.h"
 #include "Territory/InstanceContent.h"
 
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"

src/world/Network/Handlers/PacketHandlers.cpp

@@ -21,7 +21,7 @@
 #include "Territory/ZonePosition.h"
 #include "Territory/House.h"
 
-#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/PacketWrappers/PlayerSetupPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"

src/world/Network/PacketWrappers/PlayerSetupPacket.h

@@ -10,14 +10,14 @@ namespace Sapphire::Network::Packets::Server
 {
 
   /**
-  * @brief The Client UI Initialization packet. This must be sent to the client
+  * @brief The Client Player Initialization packet. This must be sent to the client
   * once upon connection to configure the UI.
   */
-  class InitUIPacket : public ZoneChannelPacket< FFXIVIpcInitUI >
+  class PlayerSetupPacket : public ZoneChannelPacket< FFXIVIpcPlayerSetup >
   {
   public:
-    InitUIPacket( Entity::Player& player ) :
+    PlayerSetupPacket( Entity::Player& player ) :
-      ZoneChannelPacket< FFXIVIpcInitUI >( player.getId(), player.getId() )
+      ZoneChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() )
     {
       initialize( player );
     };