zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-27 12:56:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into develop

Browse source 
Fix Excruciate removign status from enemy rather than caster
This commit is contained in:
Yogurt 2019-06-05 19:28:02 -07:00
commit f2e34174c4
272 changed files with 8223 additions and 2425 deletions
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;
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 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;
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
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;
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 message = "Attempting to remove keyitem" -- "unable to remove keyitem";

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

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

3
data/scripts/commands/gm/giveitem.lua
View file

@ -46,8 +46,7 @@ function onTrigger(player, argc, item, qty, location, name, lastName)
location = INVENTORY_NORMAL;
end;
local invCheck = player:getInventory(location):AddItem(item, qty, 1);
local invCheck = player:getItemPackage(location):addItem(item, qty, 1);
if (invCheck == INV_ERROR_FULL) then
-- Your inventory is full.

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

@ -27,7 +27,7 @@ function onTrigger(player, argc, keyitem, name, lastName)
qty = 1;
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 message = "unable to add keyitem";