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

Changed scripts still referencing GetInventory to GetItemPackage.

Browse Source
This commit is contained in:
Filip Maj
2019-05-06 16:33:18 -04:00
parent f038b525c6
commit c1fdad2156
4 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/scripts/base/chara/npc/object/ObjectItemStorage.lua
View File

@@ -31,7 +31,7 @@ function onEventStarted(player, npc, triggerName)
itemId = callClientFunction(player, "selectStoreItem", nil, categoryChoice);
if (itemId ~= nil) then
player:GetInventory(INVENTORY_NORMAL):RemoveItem(itemId, 1);
player:GetItemPackage(INVENTORY_NORMAL):RemoveItem(itemId, 1);
end
elseif (storageChoice == 2) then
@@ -44,7 +44,7 @@ function onEventStarted(player, npc, triggerName)
itemId = callClientFunction(player, "selectReceiveItem", nil, categoryChoice);
if (itemId ~= nil) then
player:GetInventory(INVENTORY_NORMAL):AddItem(itemId, 1);
player:GetItemPackage(INVENTORY_NORMAL):AddItem(itemId, 1);
end
end

8
data/scripts/base/chara/npc/populace/PopulaceChocoboLender.lua
View File

@@ -46,7 +46,7 @@ function onEventStarted(player, npc, triggerName)
--callClientFunction(player, "eventAfterChocoboName", player);
local curLevel = 20; -- TODO: pull from character
local hasIssuance = player:GetInventory(INVENTORY_KEYITEMS):HasItem(gcIssuances[npc:GetActorClassId()]);
local hasIssuance = player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(gcIssuances[npc:GetActorClassId()]);
local hasChocobo = player.hasChocobo;
if (player.isGM and hasChocobo == false) then -- Let GMs auto have the issuance for debugging
@@ -78,11 +78,11 @@ function onEventStarted(player, npc, triggerName)
player:SendGameMessage(player, GetWorldMaster(), 25248, 0x20, 2001007);
player:SendDataPacket("attention", GetWorldMaster(), "", 25248, 2001007);
if (player:GetInventory(INVENTORY_KEYITEMS):HasItem(2001007) == false) then
player:GetInventory(INVENTORY_KEYITEMS):AddItem(2001007);
if (player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(2001007) == false) then
player:GetItemPackage(INVENTORY_KEYITEMS):AddItem(2001007);
end
player:GetInventory(INVENTORY_KEYITEMS):RemoveItem(gcIssuances[npc:GetActorClassId()], 1);
player:GetItemPackage(INVENTORY_KEYITEMS):RemoveItem(gcIssuances[npc:GetActorClassId()], 1);
player:EndEvent();
return;

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

@@ -370,7 +370,7 @@ function deliveryMenuOpen(player, npc, itemId, price, hqPrice, supplyType)
player:SendMessage(0x20, "", "Type7Param: " .. tostring(Type7Param.slot));
--]]
pickedItem = GetItemGamedata(player:GetInventory(INVENTORY_NORMAL):GetItemAtSlot(Type7Param.slot).itemId).name;
pickedItem = GetItemGamedata(player:GetItemPackage(INVENTORY_NORMAL):GetItemAtSlot(Type7Param.slot).itemId).name;
player:SendMessage(0x20, "", "Player tried to deliver " .. quantity .. " " .. pickedItem);
-- TODO: Add error handling for capped seals, no-long-available-to-deliver, etc