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

Fixed issues Jorge found.

Browse Source
This commit is contained in:
Filip Maj 2017-09-09 16:30:29 -04:00
parent 16e99040e0
commit a309e651da
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,12 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
return AddItem(itemId, 1, 1); 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) public bool AddItem(uint itemId, int quantity)
{ {
return AddItem(itemId, quantity, 1); return AddItem(itemId, quantity, 1);

2
data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua
View File

@ -112,7 +112,7 @@ function processNormalShop(player, choice)
else else
player:SendMessage(0x20, "", "Player sold a thing at slot " .. tostring(sellResult).."."); 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); gItemTOSell = GetItemGamedata(itemToSell.itemId);
player:GetInventory(0x63):AddItem(shopInfo.shopCurrancy, gItemTOSell.sellPrice); player:GetInventory(0x63):AddItem(shopInfo.shopCurrancy, gItemTOSell.sellPrice);

2
data/scripts/commands/EquipCommand.lua
View File

@ -58,7 +58,7 @@ function onEventStarted(player, actor, triggerName, invActionInfo, param1, param
--Equip Item --Equip Item
if (invActionInfo ~= nil) then if (invActionInfo ~= nil) then
item = player:GetInventory(0):GetItemBySlot(invActionInfo.slot); item = player:GetInventory(0):GetItemAtSlot(invActionInfo.slot);
equipItem(player, equipSlot, item); equipItem(player, equipSlot, item);
player:SendAppearance(); player:SendAppearance();
--Unequip Item --Unequip Item

8
sql/server_zones_privateareas.sql
View File

@ -4,11 +4,10 @@ Source Host: localhost
Source Database: ffxiv_server Source Database: ffxiv_server
Target Host: localhost Target Host: localhost
Target Database: ffxiv_server 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 FOREIGN_KEY_CHECKS=0;
SET AUTOCOMMIT=0;
-- ---------------------------- -- ----------------------------
-- Table structure for server_zones_privateareas -- Table structure for server_zones_privateareas
-- ---------------------------- -- ----------------------------
@ -22,7 +21,7 @@ CREATE TABLE `server_zones_privateareas` (
`nightMusic` smallint(6) unsigned DEFAULT '0', `nightMusic` smallint(6) unsigned DEFAULT '0',
`battleMusic` smallint(6) unsigned DEFAULT '0', `battleMusic` smallint(6) unsigned DEFAULT '0',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1; ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
-- ---------------------------- -- ----------------------------
-- Records -- 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 ('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 ('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'); INSERT INTO `server_zones_privateareas` VALUES ('8', '175', '/Area/PrivateArea/PrivateAreaMasterPast', 'PrivateAreaMasterPast', '3', '66', '0', '0');
COMMIT; 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');