mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-20 03:37:48 +00:00
Code Activity

More GetInventory changes.

Browse source
This commit is contained in:
Filip Maj 2019-05-06 16:43:39 -04:00
parent 044d7e5207
commit b955c38a2a
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/scripts/commands/gm/delcurrency.lua
View file

@ -26,7 +26,7 @@ function onTrigger(player, argc, currency, qty, name, lastName)
currency = tonumber(currency) or nil; currency = tonumber(currency) or nil;
qty = tonumber(qty) or 1; qty = tonumber(qty) or 1;
local removed = player:GetInventory(INVENTORY_CURRENCY):RemoveItem(currency, qty); local removed = player:GetItemPackage(INVENTORY_CURRENCY):RemoveItem(currency, qty);
local messageID = MESSAGE_TYPE_SYSTEM_ERROR; local messageID = MESSAGE_TYPE_SYSTEM_ERROR;
local message = "Attempting to remove currency" -- "unable to remove currency"; local message = "Attempting to remove currency" -- "unable to remove currency";

2
data/scripts/commands/gm/delitem.lua
View file

@ -39,7 +39,7 @@ function onTrigger(player, argc, item, qty, location, name, lastName)
location = INVENTORY_NORMAL; location = INVENTORY_NORMAL;
end; end;
local removed = player:GetInventory(location):RemoveItem(item, qty); local removed = player:GetItemPackage(location):RemoveItem(item, qty);
if removed then -- RemoveItem() currently returns nothing for verification, this statement can't work if removed then -- RemoveItem() currently returns nothing for verification, this statement can't work
message = string.format("Removed item %u of kind %u to %s", item, location, player:GetName()); message = string.format("Removed item %u of kind %u to %s", item, location, player:GetName());

2
data/scripts/commands/gm/delkeyitem.lua
View file

@ -27,7 +27,7 @@ function onTrigger(player, argc, keyitem, qty, name, lastName)
qty = tonumber(qty) or 1; qty = tonumber(qty) or 1;
local location = INVENTORY_KEYITEMS; local location = INVENTORY_KEYITEMS;
local removed = player:GetInventory(location):RemoveItem(keyitem, qty); local removed = player:GetItemPackage(location):RemoveItem(keyitem, qty);
local messageID = MESSAGE_TYPE_SYSTEM_ERROR; local messageID = MESSAGE_TYPE_SYSTEM_ERROR;
local message = "Attempting to remove keyitem" -- "unable to remove keyitem"; local message = "Attempting to remove keyitem" -- "unable to remove keyitem";

2
data/scripts/commands/gm/givekeyitem.lua
View file

@ -27,7 +27,7 @@ function onTrigger(player, argc, keyitem, name, lastName)
qty = 1; qty = 1;
location = INVENTORY_KEYITEMS; location = INVENTORY_KEYITEMS;
local added = player:GetInventory(location):AddItem(keyitem, qty, 1); local added = player:GetItemPackage(location):AddItem(keyitem, qty, 1);
local messageID = MESSAGE_TYPE_SYSTEM_ERROR; local messageID = MESSAGE_TYPE_SYSTEM_ERROR;
local message = "unable to add keyitem"; local message = "unable to add keyitem";

4
data/scripts/gcseals.lua
View file

@ -35,7 +35,7 @@ function GetGCSeals(player, company)
company = tonumber(company); company = tonumber(company);
if company ~= nil and company > 0 and company < 4 then if company ~= nil and company > 0 and company < 4 then
return player:GetInventory(INVENTORY_CURRENCY):GetItemQuantity(companySeal[tonumber(company)]); return player:GetItemPackage(INVENTORY_CURRENCY):GetItemQuantity(companySeal[tonumber(company)]);
else else
return -1; return -1;
end end
@ -52,7 +52,7 @@ function AddGCSeals(player, company, amount)
if currentAmount ~= -1 then if currentAmount ~= -1 then
if amount then if amount then
if currentAmount + amount <= maxAmount then if currentAmount + amount <= maxAmount then
invCheck = player:GetInventory(INVENTORY_CURRENCY):AddItem(companySeal[company], amount, 1); invCheck = player:GetItemPackage(INVENTORY_CURRENCY):AddItem(companySeal[company], amount, 1);
if invCheck == INV_ERROR_SUCCESS then if invCheck == INV_ERROR_SUCCESS then
return INV_ERROR_SUCCESS; return INV_ERROR_SUCCESS;
end end

4
data/scripts/unique/fst0Town01a/PopulaceStandard/serpent_lieutenant_marette.lua
View file

@ -4,9 +4,9 @@ function onEventStarted(player, npc)
Spl = GetStaticActor("Spl000"); Spl = GetStaticActor("Spl000");
magickedPrism = 3020615; magickedPrism = 3020615;
if not player:GetInventory(INVENTORY_NORMAL):HasItem(magickedPrism) then if not player:GetItemPackage(INVENTORY_NORMAL):HasItem(magickedPrism) then
callClientFunction(player, "delegateEvent", player, Spl, "processEventELNAURE", 2); callClientFunction(player, "delegateEvent", player, Spl, "processEventELNAURE", 2);
local invCheck = player:GetInventory(INVENTORY_NORMAL):AddItem(magickedPrism, 10, 1); local invCheck = player:GetItemPackage(INVENTORY_NORMAL):AddItem(magickedPrism, 10, 1);
if invCheck == INV_ERROR_SUCCESS then if invCheck == INV_ERROR_SUCCESS then
player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, magickedPrism, 10); player:SendGameMessage(player, GetWorldMaster(), 25246, MESSAGE_TYPE_SYSTEM, magickedPrism, 10);
end end