cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Inventory class to ItemPackage to reflect client naming.

Browse Source
This commit is contained in:
Filip Maj 2018-04-07 14:48:43 -04:00
parent 8aeaee1b19
commit 0b13b590a0
7 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FFXIVClassic Map Server/Database.cs
View File

@ -1075,12 +1075,12 @@ namespace FFXIVClassic_Map_Server
} }
} }
player.GetItemPackage(Inventory.NORMAL).InitList(GetItemPackage(player, 0, Inventory.NORMAL)); player.GetItemPackage(ItemPackage.NORMAL).InitList(GetItemPackage(player, 0, ItemPackage.NORMAL));
player.GetItemPackage(Inventory.KEYITEMS).InitList(GetItemPackage(player, 0, Inventory.KEYITEMS)); player.GetItemPackage(ItemPackage.KEYITEMS).InitList(GetItemPackage(player, 0, ItemPackage.KEYITEMS));
player.GetItemPackage(Inventory.CURRENCY_CRYSTALS).InitList(GetItemPackage(player, 0, Inventory.CURRENCY_CRYSTALS)); player.GetItemPackage(ItemPackage.CURRENCY_CRYSTALS).InitList(GetItemPackage(player, 0, ItemPackage.CURRENCY_CRYSTALS));
player.GetItemPackage(Inventory.BAZAAR).InitList(GetBazaar(player)); player.GetItemPackage(ItemPackage.BAZAAR).InitList(GetBazaar(player));
player.GetItemPackage(Inventory.MELDREQUEST).InitList(GetItemPackage(player, 0, Inventory.MELDREQUEST)); player.GetItemPackage(ItemPackage.MELDREQUEST).InitList(GetItemPackage(player, 0, ItemPackage.MELDREQUEST));
player.GetItemPackage(Inventory.LOOT).InitList(GetItemPackage(player, 0, Inventory.LOOT)); player.GetItemPackage(ItemPackage.LOOT).InitList(GetItemPackage(player, 0, ItemPackage.LOOT));
player.GetEquipment().SetEquipment(GetEquipment(player, player.charaWork.parameterSave.state_mainSkill[0])); player.GetEquipment().SetEquipment(GetEquipment(player, player.charaWork.parameterSave.state_mainSkill[0]));
} }
@ -1123,7 +1123,7 @@ namespace FFXIVClassic_Map_Server
{ {
ushort equipSlot = reader.GetUInt16(0); ushort equipSlot = reader.GetUInt16(0);
ulong uniqueItemId = reader.GetUInt16(1); ulong uniqueItemId = reader.GetUInt16(1);
InventoryItem item = player.GetItemPackage(Inventory.NORMAL).GetItemByUniqueId(uniqueItemId); InventoryItem item = player.GetItemPackage(ItemPackage.NORMAL).GetItemByUniqueId(uniqueItemId);
equipment[equipSlot] = item; equipment[equipSlot] = item;
} }
} }

24
FFXIVClassic Map Server/WorldManager.cs
View File

@ -1064,7 +1064,7 @@ namespace FFXIVClassic_Map_Server
{ {
itemToBuy.ChangeQuantity(-quantity); itemToBuy.ChangeQuantity(-quantity);
buyer.AddItem(itemToBuy.itemId, quantity, itemToBuy.quality); buyer.AddItem(itemToBuy.itemId, quantity, itemToBuy.quality);
buyer.GetItemPackage(Inventory.CURRENCY_CRYSTALS).RemoveItem(1000001, cost); buyer.GetItemPackage(ItemPackage.CURRENCY_CRYSTALS).RemoveItem(1000001, cost);
} }
if (itemToBuy.quantity == 0) if (itemToBuy.quantity == 0)
@ -1085,7 +1085,7 @@ namespace FFXIVClassic_Map_Server
if (reward.GetBazaarMode() == InventoryItem.TYPE_SEEK_ITEM) if (reward.GetBazaarMode() == InventoryItem.TYPE_SEEK_ITEM)
{ {
InventoryItem seekBazaar = bazaar.GetItemPackage(Inventory.BAZAAR).GetItemAttachedTo(reward); InventoryItem seekBazaar = bazaar.GetItemPackage(ItemPackage.BAZAAR).GetItemAttachedTo(reward);
bazaar.RemoveItem(reward, rewardQuantity); bazaar.RemoveItem(reward, rewardQuantity);
bazaar.RemoveItem(seekBazaar, seekQuantity); bazaar.RemoveItem(seekBazaar, seekQuantity);
bazaar.AddItem(seekBazaar); bazaar.AddItem(seekBazaar);
@ -1117,18 +1117,18 @@ namespace FFXIVClassic_Map_Server
{ {
reward.SetDealingAttached(bazaarMode, seek.uniqueId); reward.SetDealingAttached(bazaarMode, seek.uniqueId);
seek.SetHasAttached(true); seek.SetHasAttached(true);
player.GetItemPackage(Inventory.BAZAAR).StartSendUpdate(); player.GetItemPackage(ItemPackage.BAZAAR).StartSendUpdate();
player.GetItemPackage(Inventory.BAZAAR).AddItem(reward); player.GetItemPackage(ItemPackage.BAZAAR).AddItem(reward);
player.GetItemPackage(Inventory.BAZAAR).AddItem(seek); player.GetItemPackage(ItemPackage.BAZAAR).AddItem(seek);
reward.SetAttachedIndex(Inventory.BAZAAR, seek.slot); reward.SetAttachedIndex(ItemPackage.BAZAAR, seek.slot);
player.GetItemPackage(Inventory.BAZAAR).DoneSendUpdate(); player.GetItemPackage(ItemPackage.BAZAAR).DoneSendUpdate();
} }
else else
{ {
reward.SetDealing(bazaarMode, seekAmount); reward.SetDealing(bazaarMode, seekAmount);
player.GetItemPackage(Inventory.BAZAAR).StartSendUpdate(); player.GetItemPackage(ItemPackage.BAZAAR).StartSendUpdate();
player.GetItemPackage(Inventory.BAZAAR).AddItem(reward); player.GetItemPackage(ItemPackage.BAZAAR).AddItem(reward);
player.GetItemPackage(Inventory.BAZAAR).DoneSendUpdate(); player.GetItemPackage(ItemPackage.BAZAAR).DoneSendUpdate();
} }
} }
@ -1146,13 +1146,13 @@ namespace FFXIVClassic_Map_Server
Database.ClearBazaarEntry(player, rewardRef); Database.ClearBazaarEntry(player, rewardRef);
player.GetItemPackage(Inventory.BAZAAR).RemoveItem(rewardRef); player.GetItemPackage(ItemPackage.BAZAAR).RemoveItem(rewardRef);
bool isSelling = rewardRef.IsSelling(); bool isSelling = rewardRef.IsSelling();
rewardRef.SetNormal(); rewardRef.SetNormal();
if (seekRef != null) if (seekRef != null)
player.GetItemPackage(Inventory.BAZAAR).RemoveItem(seekRef); player.GetItemPackage(ItemPackage.BAZAAR).RemoveItem(seekRef);
player.AddItem(rewardRef); player.AddItem(rewardRef);

12
FFXIVClassic Map Server/actors/chara/Character.cs
View File

@ -61,7 +61,7 @@ namespace FFXIVClassic_Map_Server.Actors
public ContentGroup currentContentGroup = null; public ContentGroup currentContentGroup = null;
//Inventory //Inventory
protected Dictionary<ushort, Inventory> itemPackages = new Dictionary<ushort, Inventory>(); protected Dictionary<ushort, ItemPackage> itemPackages = new Dictionary<ushort, ItemPackage>();
protected Equipment equipment; protected Equipment equipment;
public Character(uint actorID) public Character(uint actorID)
@ -265,7 +265,7 @@ namespace FFXIVClassic_Map_Server.Actors
return null; return null;
} }
public Inventory GetItemPackage(ushort package) public ItemPackage GetItemPackage(ushort package)
{ {
if (itemPackages.ContainsKey(package)) if (itemPackages.ContainsKey(package))
return itemPackages[package]; return itemPackages[package];
@ -278,15 +278,15 @@ namespace FFXIVClassic_Map_Server.Actors
ItemData data = Server.GetItemGamedata(catalogID); ItemData data = Server.GetItemGamedata(catalogID);
if (data == null) if (data == null)
return Inventory.NORMAL; return ItemPackage.NORMAL;
else else
{ {
if (data.IsMoney()) if (data.IsMoney())
return Inventory.CURRENCY_CRYSTALS; return ItemPackage.CURRENCY_CRYSTALS;
else if (data.IsImportant()) else if (data.IsImportant())
return Inventory.KEYITEMS; return ItemPackage.KEYITEMS;
else else
return Inventory.NORMAL; return ItemPackage.NORMAL;
} }
} }

12
FFXIVClassic Map Server/actors/chara/npc/Retainer.cs
View File

@ -26,13 +26,13 @@ namespace FFXIVClassic_Map_Server.actors.chara.npc
this.ownerPlayer = player; this.ownerPlayer = player;
this.actorName = String.Format("_rtnre{0:x7}", actorId); this.actorName = String.Format("_rtnre{0:x7}", actorId);
itemPackages[Inventory.NORMAL] = new Inventory(this, MAXSIZE_INVENTORY_NORMAL, Inventory.NORMAL); itemPackages[ItemPackage.NORMAL] = new ItemPackage(this, MAXSIZE_INVENTORY_NORMAL, ItemPackage.NORMAL);
itemPackages[Inventory.CURRENCY_CRYSTALS] = new Inventory(this, MAXSIZE_INVENTORY_CURRANCY, Inventory.CURRENCY_CRYSTALS); itemPackages[ItemPackage.CURRENCY_CRYSTALS] = new ItemPackage(this, MAXSIZE_INVENTORY_CURRANCY, ItemPackage.CURRENCY_CRYSTALS);
itemPackages[Inventory.BAZAAR] = new Inventory(this, MAXSIZE_INVENTORY_BAZAAR, Inventory.BAZAAR); itemPackages[ItemPackage.BAZAAR] = new ItemPackage(this, MAXSIZE_INVENTORY_BAZAAR, ItemPackage.BAZAAR);
itemPackages[Inventory.NORMAL].InitList(Database.GetInventory(this, Inventory.NORMAL)); itemPackages[ItemPackage.NORMAL].InitList(Database.GetInventory(this, ItemPackage.NORMAL));
itemPackages[Inventory.CURRENCY_CRYSTALS].InitList(Database.GetInventory(this, Inventory.CURRENCY_CRYSTALS)); itemPackages[ItemPackage.CURRENCY_CRYSTALS].InitList(Database.GetInventory(this, ItemPackage.CURRENCY_CRYSTALS));
itemPackages[Inventory.BAZAAR].InitList(Database.GetInventory(this, Inventory.BAZAAR)); itemPackages[ItemPackage.BAZAAR].InitList(Database.GetInventory(this, ItemPackage.BAZAAR));
} }
public uint GetRetainerId() public uint GetRetainerId()

6
FFXIVClassic Map Server/actors/chara/player/Equipment.cs
View File

@ -30,11 +30,11 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
private ushort inventoryCapacity; private ushort inventoryCapacity;
private ushort inventoryCode; private ushort inventoryCode;
private InventoryItem[] list; private InventoryItem[] list;
private Inventory normalInventory; private ItemPackage normalInventory;
private bool writeToDB = true; private bool writeToDB = true;
public Equipment(Player ownerPlayer, Inventory normalInventory, ushort capacity, ushort code) public Equipment(Player ownerPlayer, ItemPackage normalInventory, ushort capacity, ushort code)
{ {
owner = ownerPlayer; owner = ownerPlayer;
inventoryCapacity = capacity; inventoryCapacity = capacity;
@ -63,7 +63,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
} }
} }
toPlayer.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, 0x23, Inventory.EQUIPMENT_OTHERPLAYER)); toPlayer.QueuePacket(InventorySetBeginPacket.BuildPacket(owner.actorId, 0x23, ItemPackage.EQUIPMENT_OTHERPLAYER));
int currentIndex = 0; int currentIndex = 0;
while (true) while (true)

5
FFXIVClassic Map Server/actors/chara/player/Inventory.cs
View File

@ -11,7 +11,7 @@ using System.Linq;
namespace FFXIVClassic_Map_Server.actors.chara.player namespace FFXIVClassic_Map_Server.actors.chara.player
{ {
class Inventory class ItemPackage
{ {
public const ushort NORMAL = 0; //Max 0xC8 public const ushort NORMAL = 0; //Max 0xC8
public const ushort UNKNOWN = 1; //Max 0x96 public const ushort UNKNOWN = 1; //Max 0x96
@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
private int endOfListIndex = 0; private int endOfListIndex = 0;
public Inventory(Character ownerPlayer, ushort capacity, ushort code, bool temporary = false) public ItemPackage(Character ownerPlayer, ushort capacity, ushort code, bool temporary = false)
{ {
owner = ownerPlayer; owner = ownerPlayer;
itemPackageCapacity = capacity; itemPackageCapacity = capacity;
@ -704,7 +704,6 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
#endregion #endregion
public int GetCount() public int GetCount()
{ {
return endOfListIndex; return endOfListIndex;

52
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@ -105,7 +105,7 @@ namespace FFXIVClassic_Map_Server.Actors
//Trading //Trading
private Player otherTrader = null; private Player otherTrader = null;
private Inventory myOfferings; private ItemPackage myOfferings;
private bool isTradeAccepted = false; private bool isTradeAccepted = false;
private bool isTradeLocked = false; private bool isTradeLocked = false;
@ -164,14 +164,14 @@ namespace FFXIVClassic_Map_Server.Actors
moveSpeeds[2] = SetActorSpeedPacket.DEFAULT_RUN; moveSpeeds[2] = SetActorSpeedPacket.DEFAULT_RUN;
moveSpeeds[3] = SetActorSpeedPacket.DEFAULT_ACTIVE; moveSpeeds[3] = SetActorSpeedPacket.DEFAULT_ACTIVE;
itemPackages[Inventory.NORMAL] = new Inventory(this, MAXSIZE_INVENTORY_NORMAL, Inventory.NORMAL); itemPackages[ItemPackage.NORMAL] = new ItemPackage(this, MAXSIZE_INVENTORY_NORMAL, ItemPackage.NORMAL);
itemPackages[Inventory.KEYITEMS] = new Inventory(this, MAXSIZE_INVENTORY_KEYITEMS, Inventory.KEYITEMS); itemPackages[ItemPackage.KEYITEMS] = new ItemPackage(this, MAXSIZE_INVENTORY_KEYITEMS, ItemPackage.KEYITEMS);
itemPackages[Inventory.CURRENCY_CRYSTALS] = new Inventory(this, MAXSIZE_INVENTORY_CURRANCY, Inventory.CURRENCY_CRYSTALS); itemPackages[ItemPackage.CURRENCY_CRYSTALS] = new ItemPackage(this, MAXSIZE_INVENTORY_CURRANCY, ItemPackage.CURRENCY_CRYSTALS);
itemPackages[Inventory.MELDREQUEST] = new Inventory(this, MAXSIZE_INVENTORY_MELDREQUEST, Inventory.MELDREQUEST); itemPackages[ItemPackage.MELDREQUEST] = new ItemPackage(this, MAXSIZE_INVENTORY_MELDREQUEST, ItemPackage.MELDREQUEST);
itemPackages[Inventory.BAZAAR] = new Inventory(this, MAXSIZE_INVENTORY_BAZAAR, Inventory.BAZAAR); itemPackages[ItemPackage.BAZAAR] = new ItemPackage(this, MAXSIZE_INVENTORY_BAZAAR, ItemPackage.BAZAAR);
itemPackages[Inventory.LOOT] = new Inventory(this, MAXSIZE_INVENTORY_LOOT, Inventory.LOOT); itemPackages[ItemPackage.LOOT] = new ItemPackage(this, MAXSIZE_INVENTORY_LOOT, ItemPackage.LOOT);
equipment = new Equipment(this, itemPackages[Inventory.NORMAL], MAXSIZE_INVENTORY_EQUIPMENT, Inventory.EQUIPMENT); equipment = new Equipment(this, itemPackages[ItemPackage.NORMAL], MAXSIZE_INVENTORY_EQUIPMENT, ItemPackage.EQUIPMENT);
//Set the Skill level caps of all FFXIV (classes)skills to 50 //Set the Skill level caps of all FFXIV (classes)skills to 50
for (int i = 0; i < charaWork.battleSave.skillLevelCap.Length; i++) for (int i = 0; i < charaWork.battleSave.skillLevelCap.Length; i++)
@ -552,12 +552,12 @@ namespace FFXIVClassic_Map_Server.Actors
#region Inventory & Equipment #region Inventory & Equipment
QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId, true)); QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId, true));
itemPackages[Inventory.NORMAL].SendFullInventory(this); itemPackages[ItemPackage.NORMAL].SendFullInventory(this);
itemPackages[Inventory.CURRENCY_CRYSTALS].SendFullInventory(this); itemPackages[ItemPackage.CURRENCY_CRYSTALS].SendFullInventory(this);
itemPackages[Inventory.KEYITEMS].SendFullInventory(this); itemPackages[ItemPackage.KEYITEMS].SendFullInventory(this);
itemPackages[Inventory.BAZAAR].SendFullInventory(this); itemPackages[ItemPackage.BAZAAR].SendFullInventory(this);
itemPackages[Inventory.MELDREQUEST].SendFullInventory(this); itemPackages[ItemPackage.MELDREQUEST].SendFullInventory(this);
itemPackages[Inventory.LOOT].SendFullInventory(this); itemPackages[ItemPackage.LOOT].SendFullInventory(this);
equipment.SendFullEquipment(false); equipment.SendFullEquipment(false);
playerSession.QueuePacket(InventoryEndChangePacket.BuildPacket(actorId)); playerSession.QueuePacket(InventoryEndChangePacket.BuildPacket(actorId));
#endregion #endregion
@ -1094,9 +1094,9 @@ namespace FFXIVClassic_Map_Server.Actors
public void CheckBazaarFlags(bool noUpdate = false) public void CheckBazaarFlags(bool noUpdate = false)
{ {
bool isDealing = false, isRepairing = false, seekingItem = false; bool isDealing = false, isRepairing = false, seekingItem = false;
lock (GetItemPackage(Inventory.BAZAAR)) lock (GetItemPackage(ItemPackage.BAZAAR))
{ {
foreach (InventoryItem item in GetItemPackage(Inventory.BAZAAR).GetRawList()) foreach (InventoryItem item in GetItemPackage(ItemPackage.BAZAAR).GetRawList())
{ {
if (item == null) if (item == null)
break; break;
@ -1130,9 +1130,9 @@ namespace FFXIVClassic_Map_Server.Actors
doUpdate = true; doUpdate = true;
} }
if (charaWork.eventTemp.bazaarMateria != (GetItemPackage(Inventory.MELDREQUEST).GetCount() != 0)) if (charaWork.eventTemp.bazaarMateria != (GetItemPackage(ItemPackage.MELDREQUEST).GetCount() != 0))
{ {
charaWork.eventTemp.bazaarMateria = GetItemPackage(Inventory.MELDREQUEST).GetCount() != 0; charaWork.eventTemp.bazaarMateria = GetItemPackage(ItemPackage.MELDREQUEST).GetCount() != 0;
propPacketUtil.AddProperty("charaWork.eventTemp.bazaarMateria"); propPacketUtil.AddProperty("charaWork.eventTemp.bazaarMateria");
doUpdate = true; doUpdate = true;
} }
@ -1144,7 +1144,7 @@ namespace FFXIVClassic_Map_Server.Actors
public int GetCurrentGil() public int GetCurrentGil()
{ {
if (HasItem(1000001)) if (HasItem(1000001))
return GetItemPackage(Inventory.CURRENCY_CRYSTALS).GetItemByCatelogId(1000001).quantity; return GetItemPackage(ItemPackage.CURRENCY_CRYSTALS).GetItemByCatelogId(1000001).quantity;
else else
return 0; return 0;
} }
@ -1661,7 +1661,7 @@ namespace FFXIVClassic_Map_Server.Actors
public void SendMyTradeToPlayer(Player player) public void SendMyTradeToPlayer(Player player)
{ {
Inventory tradeInventory = new Inventory(this, 4, Inventory.TRADE); ItemPackage tradeInventory = new ItemPackage(this, 4, ItemPackage.TRADE);
player.QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId, true)); player.QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId, true));
tradeInventory.SendFullInventory(player); tradeInventory.SendFullInventory(player);
player.QueuePacket(InventoryEndChangePacket.BuildPacket(actorId)); player.QueuePacket(InventoryEndChangePacket.BuildPacket(actorId));
@ -1892,8 +1892,8 @@ namespace FFXIVClassic_Map_Server.Actors
public void StartTradeTransaction(Player otherPlayer) public void StartTradeTransaction(Player otherPlayer)
{ {
myOfferings = new Inventory(this, 4, Inventory.TRADE, true); myOfferings = new ItemPackage(this, 4, ItemPackage.TRADE, true);
Inventory otherPlayerOfferings = new Inventory(otherPlayer, 4, Inventory.TRADE, true); ItemPackage otherPlayerOfferings = new ItemPackage(otherPlayer, 4, ItemPackage.TRADE, true);
myOfferings.StartSendUpdate(); myOfferings.StartSendUpdate();
myOfferings.SendUpdatePackets(this); myOfferings.SendUpdatePackets(this);
@ -1909,7 +1909,7 @@ namespace FFXIVClassic_Map_Server.Actors
return otherTrader; return otherTrader;
} }
public Inventory GetTradeOfferings() public ItemPackage GetTradeOfferings()
{ {
return myOfferings; return myOfferings;
} }
@ -1929,7 +1929,7 @@ namespace FFXIVClassic_Map_Server.Actors
if (!IsTrading()) if (!IsTrading())
return; return;
InventoryItem mine = itemPackages[Inventory.NORMAL].GetItemAtSlot(linkedSlot); InventoryItem mine = itemPackages[ItemPackage.NORMAL].GetItemAtSlot(linkedSlot);
InventoryItem tradeItem = new InventoryItem(mine, slot); InventoryItem tradeItem = new InventoryItem(mine, slot);
@ -1989,7 +1989,7 @@ namespace FFXIVClassic_Map_Server.Actors
public void Test() public void Test()
{ {
QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId)); QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId));
QueuePacket(InventorySetBeginPacket.BuildPacket(actorId, 4, Inventory.TRADE)); QueuePacket(InventorySetBeginPacket.BuildPacket(actorId, 4, ItemPackage.TRADE));
QueuePacket(InventoryRemoveX01Packet.BuildPacket(actorId, 1)); QueuePacket(InventoryRemoveX01Packet.BuildPacket(actorId, 1));
@ -1999,7 +1999,7 @@ namespace FFXIVClassic_Map_Server.Actors
public void Test2() public void Test2()
{ {
QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId)); QueuePacket(InventoryBeginChangePacket.BuildPacket(actorId));
QueuePacket(InventorySetBeginPacket.BuildPacket(actorId, 4, Inventory.TRADE)); QueuePacket(InventorySetBeginPacket.BuildPacket(actorId, 4, ItemPackage.TRADE));
QueuePacket(EquipmentListX01Packet.BuildPacket(actorId, 1, 1)); QueuePacket(EquipmentListX01Packet.BuildPacket(actorId, 1, 1));