diff --git a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs index 95f6346e..d9ba21ef 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs @@ -87,9 +87,15 @@ namespace FFXIVClassic_Map_Server.actors.chara.player return null; } - public bool AddItem(uint itemId) - { - return AddItem(itemId, 1, 1); + public bool AddItem(uint itemId) + { + return AddItem(itemId, 1, 1); + } + + public void AddItem(uint[] itemId) + { + for (int i = 0; i < itemId.Length; i++) + AddItem(itemId[i]); } public bool AddItem(uint itemId, int quantity) diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua index bc70c0a7..20e2f789 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua @@ -112,7 +112,7 @@ function processNormalShop(player, choice) else player:SendMessage(0x20, "", "Player sold a thing at slot " .. tostring(sellResult).."."); - itemToSell = player:GetInventory(0x00):GetItemBySlot(sellResult.slot); + itemToSell = player:GetInventory(0x00):GetItemAtSlot(sellResult.slot); gItemTOSell = GetItemGamedata(itemToSell.itemId); player:GetInventory(0x63):AddItem(shopInfo.shopCurrancy, gItemTOSell.sellPrice); diff --git a/data/scripts/commands/EquipCommand.lua b/data/scripts/commands/EquipCommand.lua index 966939ac..c9894c91 100644 --- a/data/scripts/commands/EquipCommand.lua +++ b/data/scripts/commands/EquipCommand.lua @@ -58,7 +58,7 @@ function onEventStarted(player, actor, triggerName, invActionInfo, param1, param --Equip Item if (invActionInfo ~= nil) then - item = player:GetInventory(0):GetItemBySlot(invActionInfo.slot); + item = player:GetInventory(0):GetItemAtSlot(invActionInfo.slot); equipItem(player, equipSlot, item); player:SendAppearance(); --Unequip Item diff --git a/sql/server_zones_privateareas.sql b/sql/server_zones_privateareas.sql index ddddee1a..429a3334 100644 --- a/sql/server_zones_privateareas.sql +++ b/sql/server_zones_privateareas.sql @@ -4,11 +4,10 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 7/9/2017 7:11:12 PM +Date: 9/9/2017 4:27:43 PM */ SET FOREIGN_KEY_CHECKS=0; -SET AUTOCOMMIT=0; -- ---------------------------- -- Table structure for server_zones_privateareas -- ---------------------------- @@ -22,7 +21,7 @@ CREATE TABLE `server_zones_privateareas` ( `nightMusic` smallint(6) unsigned DEFAULT '0', `battleMusic` smallint(6) unsigned DEFAULT '0', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=latin1; -- ---------------------------- -- Records @@ -33,4 +32,5 @@ INSERT INTO `server_zones_privateareas` VALUES ('4', '133', '/Area/PrivateArea/P INSERT INTO `server_zones_privateareas` VALUES ('5', '155', '/Area/PrivateArea/PrivateAreaMasterPast', 'PrivateAreaMasterPast', '1', '51', '0', '0'); INSERT INTO `server_zones_privateareas` VALUES ('6', '155', '/Area/PrivateArea/PrivateAreaMasterPast', 'PrivateAreaMasterPast', '2', '40', '0', '0'); INSERT INTO `server_zones_privateareas` VALUES ('8', '175', '/Area/PrivateArea/PrivateAreaMasterPast', 'PrivateAreaMasterPast', '3', '66', '0', '0'); -COMMIT; \ No newline at end of file +INSERT INTO `server_zones_privateareas` VALUES ('9', '175', '/Area/PrivateArea/PrivateAreaMasterPast', 'PrivateAreaMasterPast', '4', '40', '0', '0'); +INSERT INTO `server_zones_privateareas` VALUES ('10', '180', '/Area/PrivateArea/PrivateAreaMasterBranch', 'PrivateAreaMasterMarket', '102', '48', '48', '48');