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

Merge pull request #477 from NotAdam/develop

Browse source 
some 4.5 fixes for housing
This commit is contained in:
Mordred 2019-01-10 16:57:18 +01:00 • committed by GitHub
commit dd381b16d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 205 additions and 215 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/schema/schema.sql
View file

@ -576,10 +576,10 @@ CREATE TABLE `zonepositions` (
CREATE TABLE `landplaceditems` ( CREATE TABLE `landplaceditems` (
`ItemId` INT(20) UNSIGNED NOT NULL, `ItemId` INT(20) UNSIGNED NOT NULL,
`PosX` INT(10) NOT NULL, `PosX` FLOAT NOT NULL,
`PosY` INT(10) NOT NULL, `PosY` FLOAT NOT NULL,
`PosZ` INT(10) NOT NULL, `PosZ` FLOAT NOT NULL,
`Rotation` INT(10) NOT NULL, `Rotation` FLOAT NOT NULL,
PRIMARY KEY (`ItemId`) PRIMARY KEY (`ItemId`)
) )
COLLATE='latin1_swedish_ci' ENGINE=InnoDB; COLLATE='latin1_swedish_ci' ENGINE=InnoDB;

5
src/common/Common.h
View file

@ -855,8 +855,9 @@ namespace Sapphire::Common
struct HousingObject struct HousingObject
{ {
uint32_t itemId; uint32_t itemId;
uint16_t itemRotation; uint32_t padding; // was itemrotation + unknown/pad, looks unused now
Common::FFXIVARR_POSITION3_U16 pos; float rotation;
Common::FFXIVARR_POSITION3 pos;
}; };
enum HouseSize : uint8_t enum HouseSize : uint8_t

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

@ -482,10 +482,8 @@ struct FFXIVIpcPlayerSpawn :
{ {
uint16_t title; uint16_t title;
uint16_t u1b; uint16_t u1b;
uint8_t u2b; uint16_t currentWorldId;
uint8_t u2ab; uint16_t homeWorldId;
uint8_t u3a;
uint8_t u3b;
uint8_t gmRank; uint8_t gmRank;
uint8_t u3c; uint8_t u3c;
@ -783,8 +781,8 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
unsigned int fishCaught; unsigned int fishCaught;
unsigned int useBaitCatalogId; unsigned int useBaitCatalogId;
unsigned int unknown28; unsigned int unknown28;
unsigned __int16 unknownPvp2C; uint16_t unknownPvp2C;
unsigned __int16 unknown3; uint16_t unknown3;
unsigned int pvpFrontlineOverallCampaigns; unsigned int pvpFrontlineOverallCampaigns;
unsigned int unknownTimestamp34; unsigned int unknownTimestamp34;
unsigned int unknownTimestamp38; unsigned int unknownTimestamp38;
@ -793,123 +791,123 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
unsigned int unknown44; unsigned int unknown44;
float companionTimePassed; float companionTimePassed;
unsigned int unknown4C; unsigned int unknown4C;
unsigned __int16 unknown50; uint16_t unknown50;
unsigned __int16 unknownPvp52[4]; uint16_t unknownPvp52[4];
unsigned __int16 playerCommendations; uint16_t playerCommendations;
unsigned __int16 unknown5C; uint16_t unknown5C;
unsigned __int16 unknown5E; uint16_t unknown5E;
unsigned __int16 pvpFrontlineWeeklyCampaigns; uint16_t pvpFrontlineWeeklyCampaigns;
unsigned __int16 enhancedAnimaGlassProgress; uint16_t enhancedAnimaGlassProgress;
unsigned __int16 unknown64[4]; uint16_t unknown64[4];
unsigned __int16 pvpRivalWingsTotalMatches; uint16_t pvpRivalWingsTotalMatches;
unsigned __int16 pvpRivalWingsTotalVictories; uint16_t pvpRivalWingsTotalVictories;
unsigned __int16 pvpRivalWingsWeeklyMatches; uint16_t pvpRivalWingsWeeklyMatches;
unsigned __int16 pvpRivalWingsWeeklyVictories; uint16_t pvpRivalWingsWeeklyVictories;
unsigned __int8 maxLevel; uint8_t maxLevel;
unsigned __int8 expansion; uint8_t expansion;
unsigned __int8 unknown76; uint8_t unknown76;
unsigned __int8 race; uint8_t race;
unsigned __int8 tribe; uint8_t tribe;
unsigned __int8 gender; uint8_t gender;
unsigned __int8 currentJob; uint8_t currentJob;
unsigned __int8 currentClass; uint8_t currentClass;
unsigned __int8 deity; uint8_t deity;
unsigned __int8 namedayMonth; uint8_t namedayMonth;
unsigned __int8 namedayDay; uint8_t namedayDay;
unsigned __int8 cityState; uint8_t cityState;
unsigned __int8 homepoint; uint8_t homepoint;
unsigned __int8 unknown81; uint8_t unknown81;
unsigned __int8 petHotBar; uint8_t petHotBar;
unsigned __int8 companionRank; uint8_t companionRank;
unsigned __int8 companionStars; uint8_t companionStars;
unsigned __int8 companionSp; uint8_t companionSp;
unsigned __int8 companionUnk86; uint8_t companionUnk86;
unsigned __int8 companionColor; uint8_t companionColor;
unsigned __int8 companionFavoFeed; uint8_t companionFavoFeed;
unsigned __int8 unknown89; uint8_t unknown89;
unsigned __int8 unknown8A[4]; uint8_t unknown8A[4];
unsigned __int8 hasRelicBook; uint8_t hasRelicBook;
unsigned __int8 relicBookId; uint8_t relicBookId;
unsigned __int8 unknown90[4]; uint8_t unknown90[4];
unsigned __int8 craftingMasterMask; uint8_t craftingMasterMask;
unsigned __int8 unknown95[10]; uint8_t unknown95[10];
unsigned __int8 unknown9F[2]; uint8_t unknown9F[2];
unsigned __int8 unknownA1[3]; uint8_t unknownA1[3];
unsigned int exp[26]; unsigned int exp[26];
unsigned int unknown108; unsigned int unknown108;
unsigned int pvpTotalExp; unsigned int pvpTotalExp;
unsigned int unknownPvp110; unsigned int unknownPvp110;
unsigned int pvpExp; unsigned int pvpExp;
unsigned int pvpFrontlineOverallRanks[3]; unsigned int pvpFrontlineOverallRanks[3];
unsigned __int16 levels[26]; uint16_t levels[26];
unsigned int exploratoryMissionNextTimestamp; unsigned int exploratoryMissionNextTimestamp;
unsigned __int16 unknown15C[9]; uint16_t unknown15C[9];
unsigned __int16 fishingRecordsFish[26]; uint16_t fishingRecordsFish[26];
unsigned __int16 fishingRecordsFishWeight[26]; uint16_t fishingRecordsFishWeight[26];
unsigned __int16 beastExp[11]; uint16_t beastExp[11];
unsigned __int16 unknown1EA[5]; uint16_t unknown1EA[5];
unsigned __int16 pvpFrontlineWeeklyRanks[3]; uint16_t pvpFrontlineWeeklyRanks[3];
unsigned __int16 unknownMask1FA[3]; uint16_t unknownMask1FA[3];
unsigned __int8 companionName[21]; uint8_t companionName[21];
unsigned __int8 companionDefRank; uint8_t companionDefRank;
unsigned __int8 companionAttRank; uint8_t companionAttRank;
unsigned __int8 companionHealRank; uint8_t companionHealRank;
unsigned __int8 mountGuideMask[17]; uint8_t mountGuideMask[17];
char name[32]; char name[32];
unsigned __int8 unknownOword[15]; uint8_t unknownOword[15];
unsigned __int8 unlockBitmask[64]; uint8_t unlockBitmask[64];
unsigned __int8 aetheryte[17]; uint8_t aetheryte[17];
unsigned __int8 unknown258; uint8_t unknown258;
unsigned __int8 chocoboTaxiMask[8]; uint8_t chocoboTaxiMask[8];
unsigned __int8 unknown11111[118]; uint8_t unknown11111[118];
unsigned __int8 companionBardingMask[9]; uint8_t companionBardingMask[9];
unsigned __int8 companionEquippedHead; uint8_t companionEquippedHead;
unsigned __int8 companionEquippedBody; uint8_t companionEquippedBody;
unsigned __int8 companionEquippedLegs; uint8_t companionEquippedLegs;
unsigned __int8 unknown519[4]; uint8_t unknown519[4];
unsigned __int8 unknownMask51D[11]; uint8_t unknownMask51D[11];
unsigned __int8 fishingGuideMask[89]; uint8_t fishingGuideMask[89];
unsigned __int8 fishingSpotVisited[25]; uint8_t fishingSpotVisited[25];
unsigned __int8 unknown59A[15]; uint8_t unknown59A[15];
unsigned __int8 unknown5A9[2]; uint8_t unknown5A9[2];
unsigned __int8 unknownPvp5AB[2]; uint8_t unknownPvp5AB[2];
unsigned __int8 beastRank[11]; uint8_t beastRank[11];
unsigned __int8 pose; uint8_t pose;
unsigned __int8 weaponPose; uint8_t weaponPose;
unsigned __int8 unknownMask5C4[3]; uint8_t unknownMask5C4[3];
unsigned __int8 unknown5C9[2]; uint8_t unknown5C9[2];
unsigned __int8 challengeLogComplete[9]; uint8_t challengeLogComplete[9];
unsigned __int8 unknownMask5DD[28]; uint8_t unknownMask5DD[28];
unsigned __int8 tripleTriadCards[30]; uint8_t tripleTriadCards[30];
unsigned __int8 unknownMask673[10]; uint8_t unknownMask673[10];
unsigned __int8 unknown5B9[11]; uint8_t unknown5B9[11];
unsigned __int8 unknown5D4[11]; uint8_t unknown5D4[11];
unsigned __int8 unknown694[3]; uint8_t unknown694[3];
unsigned __int8 pvpLevel; uint8_t pvpLevel;
unsigned __int8 unknown67D; uint8_t unknown67D;
unsigned __int8 howto[34]; uint8_t howto[34];
unsigned __int8 minions[42]; uint8_t minions[42];
unsigned __int8 watchedCutscenes[118]; uint8_t watchedCutscenes[118];
unsigned __int8 discovery[421]; uint8_t discovery[421];
unsigned __int8 relicCompletion[12]; uint8_t relicCompletion[12];
unsigned __int8 sightseeingMask[26]; uint8_t sightseeingMask[26];
unsigned __int8 huntingMarkMask[55]; uint8_t huntingMarkMask[55];
unsigned __int8 aetherCurrentMask[22]; uint8_t aetherCurrentMask[22];
unsigned __int8 orchestrionMask[40]; uint8_t orchestrionMask[40];
unsigned __int8 hallOfNoviceCompleteMask[3]; uint8_t hallOfNoviceCompleteMask[3];
unsigned __int8 animaCompletion[11]; uint8_t animaCompletion[11];
unsigned __int8 unknown6CD[16]; uint8_t unknown6CD[16];
unsigned __int8 unknownMask6DB[11]; uint8_t unknownMask6DB[11];
unsigned __int8 unlockedRaids[28]; uint8_t unlockedRaids[28];
unsigned __int8 unlockedDungeons[18]; uint8_t unlockedDungeons[18];
unsigned __int8 unlockedGuildhests[10]; uint8_t unlockedGuildhests[10];
unsigned __int8 unlockedTrials[8]; uint8_t unlockedTrials[8];
unsigned __int8 unlockedPvp[5]; uint8_t unlockedPvp[5];
unsigned __int8 clearedRaids[28]; uint8_t clearedRaids[28];
unsigned __int8 clearedDungeons[18]; uint8_t clearedDungeons[18];
unsigned __int8 clearedGuildhests[10]; uint8_t clearedGuildhests[10];
unsigned __int8 clearedTrials[8]; uint8_t clearedTrials[8];
unsigned __int8 clearedPvp[5]; uint8_t clearedPvp[5];
}; };
@ -1695,7 +1693,7 @@ struct FFXIVIpcHousingObjectMove : FFXIVIpcBasePacket< HousingObjectMove >
uint16_t itemRotation; uint16_t itemRotation;
uint8_t objectArray; uint8_t objectArray;
uint8_t landId; uint8_t landId;
Common::FFXIVARR_POSITION3_U16 pos; Common::FFXIVARR_POSITION3 pos;
uint16_t unknown1; uint16_t unknown1;
uint16_t unknown2; uint16_t unknown2;
uint16_t unknown3; uint16_t unknown3;
@ -1726,7 +1724,7 @@ struct FFXIVIpcHousingInternalObjectSpawn : FFXIVIpcBasePacket< HousingInternalO
uint8_t unk2; uint8_t unk2;
uint8_t pad2; uint8_t pad2;
uint16_t rotation; uint16_t rotation;
Common::FFXIVARR_POSITION3_U16 pos; Common::FFXIVARR_POSITION3 pos;
}; };
struct FFXIVIpcHousingIndoorInitialize : FFXIVIpcBasePacket< HousingIndoorInitialize > struct FFXIVIpcHousingIndoorInitialize : FFXIVIpcBasePacket< HousingIndoorInitialize >

2
src/tools/exd_struct_gen/main.cpp
View file

@ -45,7 +45,7 @@ std::vector< std::string > cppKeyWords
}; };
//std::string datLocation( "/home/mordred/sqpack" ); //std::string datLocation( "/home/mordred/sqpack" );
std::string datLocation( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" ); std::string datLocation( "/mnt/c/Program Files (x86)/Steam/steamapps/common/FINAL FANTASY XIV Online/game/sqpack" );
std::map< uint8_t, std::string > g_typeMap; std::map< uint8_t, std::string > g_typeMap;

8
src/world/Inventory/HousingItem.cpp
View file

@ -8,22 +8,22 @@ Sapphire::Inventory::HousingItem::HousingItem( uint64_t uId, uint32_t catalogId,
m_reservedFlag = 1092616192; // wat? m_reservedFlag = 1092616192; // wat?
} }
uint16_t Sapphire::Inventory::HousingItem::getRot() const float Sapphire::Inventory::HousingItem::getRot() const
{ {
return m_rotation; return m_rotation;
} }
void Sapphire::Inventory::HousingItem::setRot( uint16_t rot ) void Sapphire::Inventory::HousingItem::setRot( float rot )
{ {
m_rotation = rot; m_rotation = rot;
} }
Sapphire::Common::FFXIVARR_POSITION3_U16 Sapphire::Inventory::HousingItem::getPos() const Sapphire::Common::FFXIVARR_POSITION3 Sapphire::Inventory::HousingItem::getPos() const
{ {
return m_position; return m_position;
} }
void Sapphire::Inventory::HousingItem::setPos( Sapphire::Common::FFXIVARR_POSITION3_U16 pos ) void Sapphire::Inventory::HousingItem::setPos( Sapphire::Common::FFXIVARR_POSITION3 pos )
{ {
m_position = pos; m_position = pos;
} }

12
src/world/Inventory/HousingItem.h
View file

@ -11,15 +11,15 @@ namespace Sapphire::Inventory
HousingItem( uint64_t uId, uint32_t catalogId, FrameworkPtr pFw ); HousingItem( uint64_t uId, uint32_t catalogId, FrameworkPtr pFw );
virtual ~HousingItem() = default; virtual ~HousingItem() = default;
void setRot( uint16_t rot ); void setRot( float rot );
uint16_t getRot() const; float getRot() const;
void setPos( Common::FFXIVARR_POSITION3_U16 pos ); void setPos( Common::FFXIVARR_POSITION3 pos );
Common::FFXIVARR_POSITION3_U16 getPos() const; Common::FFXIVARR_POSITION3 getPos() const;
private: private:
Common::FFXIVARR_POSITION3_U16 m_position; Common::FFXIVARR_POSITION3 m_position;
uint16_t m_rotation; float m_rotation;
}; };
} }

18
src/world/Inventory/ItemContainer.cpp
View file

@ -9,7 +9,7 @@
#include "Forwards.h" #include "Forwards.h"
#include "ItemContainer.h" #include "ItemContainer.h"
Sapphire::ItemContainer::ItemContainer( uint16_t storageId, uint16_t maxSize, const std::string& tableName, Sapphire::ItemContainer::ItemContainer( uint16_t storageId, uint8_t maxSize, const std::string& tableName,
bool isMultiStorage, FrameworkPtr pFw, bool isPersistentStorage ) : bool isMultiStorage, FrameworkPtr pFw, bool isPersistentStorage ) :
m_id( storageId ), m_id( storageId ),
m_size( maxSize ), m_size( maxSize ),
@ -31,15 +31,15 @@ uint16_t Sapphire::ItemContainer::getId() const
return m_id; return m_id;
} }
uint16_t Sapphire::ItemContainer::getEntryCount() const uint8_t Sapphire::ItemContainer::getEntryCount() const
{ {
return static_cast< uint16_t >( m_itemMap.size() ); return static_cast< uint8_t >( m_itemMap.size() );
} }
void Sapphire::ItemContainer::removeItem( uint16_t slotId, bool removeFromDb ) void Sapphire::ItemContainer::removeItem( uint8_t slotId, bool removeFromDb )
{ {
auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pDb = m_pFw->get< Db::DbWorkerPool< Db::ZoneDbConnection > >();
ItemMap::iterator it = m_itemMap.find( slotId ); auto it = m_itemMap.find( slotId );
if( it != m_itemMap.end() ) if( it != m_itemMap.end() )
{ {
@ -66,7 +66,7 @@ const Sapphire::ItemMap& Sapphire::ItemContainer::getItemMap() const
return m_itemMap; return m_itemMap;
} }
int16_t Sapphire::ItemContainer::getFreeSlot() int8_t Sapphire::ItemContainer::getFreeSlot()
{ {
for( uint16_t slotId = 0; slotId < m_size; slotId++ ) for( uint16_t slotId = 0; slotId < m_size; slotId++ )
{ {
@ -78,7 +78,7 @@ int16_t Sapphire::ItemContainer::getFreeSlot()
return -1; return -1;
} }
Sapphire::ItemPtr Sapphire::ItemContainer::getItem( uint16_t slotId ) Sapphire::ItemPtr Sapphire::ItemContainer::getItem( uint8_t slotId )
{ {
if( ( slotId > m_size ) ) if( ( slotId > m_size ) )
@ -90,7 +90,7 @@ Sapphire::ItemPtr Sapphire::ItemContainer::getItem( uint16_t slotId )
return m_itemMap[ slotId ]; return m_itemMap[ slotId ];
} }
void Sapphire::ItemContainer::setItem( uint16_t slotId, ItemPtr pItem ) void Sapphire::ItemContainer::setItem( uint8_t slotId, ItemPtr pItem )
{ {
if( slotId > m_size ) if( slotId > m_size )
return; return;
@ -98,7 +98,7 @@ void Sapphire::ItemContainer::setItem( uint16_t slotId, ItemPtr pItem )
m_itemMap[ slotId ] = pItem; m_itemMap[ slotId ] = pItem;
} }
uint16_t Sapphire::ItemContainer::getMaxSize() const uint8_t Sapphire::ItemContainer::getMaxSize() const
{ {
return m_size; return m_size;
} }

18
src/world/Inventory/ItemContainer.h
View file

@ -8,34 +8,34 @@
namespace Sapphire namespace Sapphire
{ {
using ItemMap = std::map< uint16_t, ItemPtr >; using ItemMap = std::map< uint8_t, ItemPtr >;
class ItemContainer class ItemContainer
{ {
public: public:
ItemContainer( uint16_t storageId, uint16_t maxSize, const std::string& tableName, bool isMultiStorage, ItemContainer( uint16_t storageId, uint8_t maxSize, const std::string& tableName, bool isMultiStorage,
FrameworkPtr pFw, bool isPersistentStorage = true ); FrameworkPtr pFw, bool isPersistentStorage = true );
~ItemContainer(); ~ItemContainer();
uint16_t getId() const; uint16_t getId() const;
uint16_t getEntryCount() const; uint8_t getEntryCount() const;
void removeItem( uint16_t slotId, bool removeFromDb = true ); void removeItem( uint8_t slotId, bool removeFromDb = true );
ItemMap& getItemMap(); ItemMap& getItemMap();
const ItemMap& getItemMap() const; const ItemMap& getItemMap() const;
ItemPtr getItem( uint16_t slotId ); ItemPtr getItem( uint8_t slotId );
void setItem( uint16_t slotId, ItemPtr item ); void setItem( uint8_t slotId, ItemPtr item );
int16_t getFreeSlot(); int8_t getFreeSlot();
uint16_t getMaxSize() const; uint8_t getMaxSize() const;
std::string getTableName() const; std::string getTableName() const;
@ -45,7 +45,7 @@ namespace Sapphire
private: private:
uint16_t m_id; uint16_t m_id;
uint16_t m_size; uint8_t m_size;
std::string m_tableName; std::string m_tableName;
bool m_bMultiStorage; bool m_bMultiStorage;
FrameworkPtr m_pFw; FrameworkPtr m_pFw;

105
src/world/Manager/HousingMgr.cpp
View file

@ -139,19 +139,25 @@ bool Sapphire::World::Manager::HousingMgr::loadEstateInventories()
if( isPlacedItemsInventory( static_cast< Common::InventoryType >( containerId ) ) ) if( isPlacedItemsInventory( static_cast< Common::InventoryType >( containerId ) ) )
{ {
item->setPos( { item->setPos( {
res->getUInt16( "PosX" ), res->getFloat( "PosX" ),
res->getUInt16( "PosY" ), res->getFloat( "PosY" ),
res->getUInt16( "PosZ" ) res->getFloat( "PosZ" )
} ); } );
item->setRot( res->getUInt16( "Rotation" ) ); item->setRot( res->getFloat( "Rotation" ) );
} }
ContainerIdToContainerMap& estateInv = m_estateInventories[ ident ]; ContainerIdToContainerMap& estateInv = m_estateInventories[ ident ];
// check if containerId exists, it always should - if it doesn't, something went wrong // check if containerId exists, it always should - if it doesn't, something went wrong
auto container = estateInv.find( containerId ); auto container = estateInv.find( containerId );
assert( container != estateInv.end() ); if( container == estateInv.end() )
{
Logger::warn( "Skipping item#{0} for ident#{1} - container#{2} doesn't exist for estate.",
itemId, ident, containerId );
continue;
}
container->second->setItem( slot, item ); container->second->setItem( slot, item );
@ -854,12 +860,12 @@ void Sapphire::World::Manager::HousingMgr::sendEstateInventory( Entity::Player&
return; return;
auto& containers = getEstateInventory( targetLand->getLandIdent() ); auto& containers = getEstateInventory( targetLand->getLandIdent() );
auto needle = containers.find( inventoryType ); auto it = containers.find( inventoryType );
if( needle == containers.end() ) if( it == containers.end() )
return; return;
auto invMgr = framework()->get< Manager::InventoryMgr >(); auto invMgr = framework()->get< Manager::InventoryMgr >();
invMgr->sendInventoryContainer( player, needle->second ); invMgr->sendInventoryContainer( player, it->second );
} }
const Sapphire::World::Manager::HousingMgr::LandSetLandCacheMap& const Sapphire::World::Manager::HousingMgr::LandSetLandCacheMap&
@ -1007,13 +1013,8 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
return; return;
// set params // set params
item->setPos( { item->setPos( pos );
Util::floatToUInt16( pos.x ), item->setRot( rotation );
Util::floatToUInt16( pos.y ),
Util::floatToUInt16( pos.z )
} );
item->setRot( Util::floatToUInt16Rot( rotation ) );
} }
else else
{ {
@ -1084,11 +1085,11 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
{ {
for( auto houseContainer : m_internalStoreroomContainers ) for( auto houseContainer : m_internalStoreroomContainers )
{ {
auto needle = containers.find( houseContainer ); auto it = containers.find( houseContainer );
if( needle == containers.end() ) if( it == containers.end() )
continue; continue;
auto container = needle->second; auto container = it->second;
auto freeSlot = container->getFreeSlot(); auto freeSlot = container->getFreeSlot();
if( freeSlot == -1 ) if( freeSlot == -1 )
{ {
@ -1156,11 +1157,11 @@ bool Sapphire::World::Manager::HousingMgr::placeInteriorItem( Entity::Player& pl
uint8_t containerIdx = 0; uint8_t containerIdx = 0;
for( auto containerId : m_internalPlacedItemContainers ) for( auto containerId : m_internalPlacedItemContainers )
{ {
auto needle = containers.find( containerId ); auto it = containers.find( containerId );
if( needle == containers.end() ) if( it == containers.end() )
continue; continue;
auto container = needle->second; auto container = it->second;
auto freeSlot = container->getFreeSlot(); auto freeSlot = container->getFreeSlot();
if( freeSlot == -1 ) if( freeSlot == -1 )
{ {
@ -1192,7 +1193,7 @@ Sapphire::Common::HousingObject Sapphire::World::Manager::HousingMgr::getYardObj
Sapphire::Common::HousingObject obj {}; Sapphire::Common::HousingObject obj {};
obj.pos = item->getPos(); obj.pos = item->getPos();
obj.itemRotation = item->getRot(); obj.rotation = item->getRot();
obj.itemId = item->getAdditionalData(); obj.itemId = item->getAdditionalData();
return obj; return obj;
@ -1271,23 +1272,18 @@ bool Sapphire::World::Manager::HousingMgr::moveInternalItem( Entity::Player& pla
auto& containers = getEstateInventory( ident ); auto& containers = getEstateInventory( ident );
auto needle = containers.find( containerId ); auto it = containers.find( containerId );
if( needle == containers.end() ) if( it == containers.end() )
return false; return false;
auto container = needle->second; auto container = it->second;
auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slotIdx ) ); auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slotIdx ) );
if( !item ) if( !item )
return false; return false;
item->setPos( { item->setPos( pos );
Util::floatToUInt16( pos.x ), item->setRot( rot );
Util::floatToUInt16( pos.y ),
Util::floatToUInt16( pos.z )
} );
item->setRot( Util::floatToUInt16Rot( rot ) );
// save // save
auto invMgr = framework()->get< InventoryMgr >(); auto invMgr = framework()->get< InventoryMgr >();
@ -1314,23 +1310,18 @@ bool Sapphire::World::Manager::HousingMgr::moveExternalItem( Entity::Player& pla
return false; return false;
auto& containers = getEstateInventory( ident ); auto& containers = getEstateInventory( ident );
auto needle = containers.find( InventoryType::HousingExteriorPlacedItems ); auto it = containers.find( InventoryType::HousingExteriorPlacedItems );
if( needle == containers.end() ) if( it == containers.end() )
return false; return false;
auto container = needle->second; auto container = it->second;
auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slot ) ); auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slot ) );
if( !item ) if( !item )
return false; return false;
item->setPos( { item->setPos( pos );
Util::floatToUInt16( pos.x ), item->setRot( rot );
Util::floatToUInt16( pos.y ),
Util::floatToUInt16( pos.z )
} );
item->setRot( Util::floatToUInt16Rot( rot ) );
auto invMgr = framework()->get< InventoryMgr >(); auto invMgr = framework()->get< InventoryMgr >();
invMgr->updateHousingItemPosition( item ); invMgr->updateHousingItemPosition( item );
@ -1403,11 +1394,11 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
// eg, remove a permit and reuse it elsewhere // eg, remove a permit and reuse it elsewhere
// I'm not going to bother fixing it for now, but worth noting for future reference // I'm not going to bother fixing it for now, but worth noting for future reference
auto needle = containers.find( containerId ); auto it = containers.find( containerId );
if( needle == containers.end() ) if( it == containers.end() )
return false; return false;
auto container = needle->second; auto container = it->second;
auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slotId ) ); auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( container->getItem( slotId ) );
if( !item ) if( !item )
@ -1470,11 +1461,11 @@ bool Sapphire::World::Manager::HousingMgr::removeExternalItem( Entity::Player& p
{ {
auto& containers = getEstateInventory( land.getLandIdent() ); auto& containers = getEstateInventory( land.getLandIdent() );
auto needle = containers.find( containerType ); auto it = containers.find( containerType );
if( needle == containers.end() ) if( it == containers.end() )
return false; return false;
auto& sourceContainer = needle->second; auto& sourceContainer = it->second;
auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( sourceContainer->getItem( slotId ) ); auto item = std::dynamic_pointer_cast< Inventory::HousingItem >( sourceContainer->getItem( slotId ) );
if( !item ) if( !item )
@ -1531,11 +1522,11 @@ Sapphire::ItemContainerPtr Sapphire::World::Manager::HousingMgr::getFreeEstateIn
for( auto bag : bagList ) for( auto bag : bagList )
{ {
auto needle = estateContainers.find( bag ); auto it = estateContainers.find( bag );
if( needle == estateContainers.end() ) if( it == estateContainers.end() )
continue; continue;
auto container = needle->second; auto container = it->second;
auto freeSlot = container->getFreeSlot(); auto freeSlot = container->getFreeSlot();
@ -1563,13 +1554,13 @@ void Sapphire::World::Manager::HousingMgr::reqEstateExteriorRemodel( Sapphire::E
return; return;
auto& inv = getEstateInventory( land->getLandIdent() ); auto& inv = getEstateInventory( land->getLandIdent() );
auto needle = inv.find( InventoryType::HousingExteriorAppearance ); auto it = inv.find( InventoryType::HousingExteriorAppearance );
if( needle == inv.end() ) if( it == inv.end() )
return; return;
auto invMgr = framework()->get< InventoryMgr >(); auto invMgr = framework()->get< InventoryMgr >();
invMgr->sendInventoryContainer( player, needle->second ); invMgr->sendInventoryContainer( player, it->second );
auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot ); auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateExternalAppearanceUI, plot );
player.queuePacket( pkt ); player.queuePacket( pkt );
@ -1593,13 +1584,13 @@ void Sapphire::World::Manager::HousingMgr::reqEstateInteriorRemodel( Sapphire::E
return; return;
auto& inv = getEstateInventory( land->getLandIdent() ); auto& inv = getEstateInventory( land->getLandIdent() );
auto needle = inv.find( InventoryType::HousingInteriorAppearance ); auto it = inv.find( InventoryType::HousingInteriorAppearance );
if( needle == inv.end() ) if( it == inv.end() )
return; return;
auto invMgr = framework()->get< InventoryMgr >(); auto invMgr = framework()->get< InventoryMgr >();
invMgr->sendInventoryContainer( player, needle->second ); invMgr->sendInventoryContainer( player, it->second );
auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI ); auto pkt = Server::makeActorControl143( player.getId(), Network::ActorControl::ShowEstateInternalAppearanceUI );
player.queuePacket( pkt ); player.queuePacket( pkt );

6
src/world/Territory/Housing/HousingInteriorTerritory.cpp
View file

@ -196,13 +196,13 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::spawnHousing
void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousingObjectPosition( Entity::Player& sourcePlayer, void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousingObjectPosition( Entity::Player& sourcePlayer,
uint16_t slot, uint16_t slot,
Common::FFXIVARR_POSITION3_U16 pos, Common::FFXIVARR_POSITION3 pos,
uint16_t rot ) uint16_t rot )
{ {
auto& obj = m_housingObjects[ slot ]; auto& obj = m_housingObjects[ slot ];
obj.pos = pos; obj.pos = pos;
obj.itemRotation = rot; obj.rotation = rot;
// todo: how does this update on other clients? // todo: how does this update on other clients?
@ -213,7 +213,7 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::updateHousin
auto moveObjPkt = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() ); auto moveObjPkt = makeZonePacket< Server::FFXIVIpcHousingObjectMove >( player.second->getId() );
moveObjPkt->data().itemRotation = obj.itemRotation; moveObjPkt->data().itemRotation = obj.rotation;
moveObjPkt->data().pos = obj.pos; moveObjPkt->data().pos = obj.pos;
// todo: how does this work when an item is in a slot >50 or u8 max? my guess is landid is the container index, but not sure... // todo: how does this work when an item is in a slot >50 or u8 max? my guess is landid is the container index, but not sure...

2
src/world/Territory/Housing/HousingInteriorTerritory.h
View file

@ -29,7 +29,7 @@ namespace Sapphire::World::Territory::Housing
void spawnHousingObject( uint8_t containerIdx, uint16_t slot, uint16_t containerType, void spawnHousingObject( uint8_t containerIdx, uint16_t slot, uint16_t containerType,
Inventory::HousingItemPtr item ); Inventory::HousingItemPtr item );
void updateHousingObjectPosition( void updateHousingObjectPosition(
Entity::Player& sourcePlayer, uint16_t slot, Sapphire::Common::FFXIVARR_POSITION3_U16 pos, uint16_t rot ); Entity::Player& sourcePlayer, uint16_t slot, Sapphire::Common::FFXIVARR_POSITION3 pos, uint16_t rot );
void removeHousingObject( uint16_t slot ); void removeHousingObject( uint16_t slot );
private: private:

4
src/world/Territory/HousingZone.cpp
View file

@ -353,7 +353,7 @@ void Sapphire::HousingZone::spawnYardObject( uint8_t landId, uint16_t slotId, In
Common::HousingObject obj {}; Common::HousingObject obj {};
obj.itemId = item.getAdditionalData(); obj.itemId = item.getAdditionalData();
obj.itemRotation = item.getRot(); obj.rotation = item.getRot();
obj.pos = item.getPos(); obj.pos = item.getPos();
@ -383,7 +383,7 @@ void Sapphire::HousingZone::updateYardObjectPos( Entity::Player& sourcePlayer, u
auto& obj = m_yardObjects[ yardMapIndex ][ offset ]; auto& obj = m_yardObjects[ yardMapIndex ][ offset ];
obj.itemRotation = item.getRot(); obj.rotation = item.getRot();
obj.pos = item.getPos(); obj.pos = item.getPos();
for( const auto& player : m_playerMap ) for( const auto& player : m_playerMap )