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

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
Show Stats 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); itemId = callClientFunction(player, "selectStoreItem", nil, categoryChoice);
if (itemId ~= nil) then if (itemId ~= nil) then
player:GetInventory(INVENTORY_NORMAL):RemoveItem(itemId, 1); player:GetItemPackage(INVENTORY_NORMAL):RemoveItem(itemId, 1);
end end
elseif (storageChoice == 2) then elseif (storageChoice == 2) then
@ -44,7 +44,7 @@ function onEventStarted(player, npc, triggerName)
itemId = callClientFunction(player, "selectReceiveItem", nil, categoryChoice); itemId = callClientFunction(player, "selectReceiveItem", nil, categoryChoice);
if (itemId ~= nil) then if (itemId ~= nil) then
player:GetInventory(INVENTORY_NORMAL):AddItem(itemId, 1); player:GetItemPackage(INVENTORY_NORMAL):AddItem(itemId, 1);
end end
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); --callClientFunction(player, "eventAfterChocoboName", player);
local curLevel = 20; -- TODO: pull from character 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; local hasChocobo = player.hasChocobo;
if (player.isGM and hasChocobo == false) then -- Let GMs auto have the issuance for debugging 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:SendGameMessage(player, GetWorldMaster(), 25248, 0x20, 2001007);
player:SendDataPacket("attention", GetWorldMaster(), "", 25248, 2001007); player:SendDataPacket("attention", GetWorldMaster(), "", 25248, 2001007);
if (player:GetInventory(INVENTORY_KEYITEMS):HasItem(2001007) == false) then if (player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(2001007) == false) then
player:GetInventory(INVENTORY_KEYITEMS):AddItem(2001007); player:GetItemPackage(INVENTORY_KEYITEMS):AddItem(2001007);
end end
player:GetInventory(INVENTORY_KEYITEMS):RemoveItem(gcIssuances[npc:GetActorClassId()], 1); player:GetItemPackage(INVENTORY_KEYITEMS):RemoveItem(gcIssuances[npc:GetActorClassId()], 1);
player:EndEvent(); player:EndEvent();
return; 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)); 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); player:SendMessage(0x20, "", "Player tried to deliver " .. quantity .. " " .. pickedItem);
-- TODO: Add error handling for capped seals, no-long-available-to-deliver, etc -- TODO: Add error handling for capped seals, no-long-available-to-deliver, etc

74
data/scripts/battlenpc.lua
View File

@ -81,26 +81,26 @@ function initClassItems(player)
--DoW --DoW
if (player.charaWork.parameterSave.state_mainSkill[0] == 2) then --PUG if (player.charaWork.parameterSave.state_mainSkill[0] == 2) then --PUG
player:GetInventory(0):AddItem({4020001, 8030701, 8050728, 8080601, 8090307}); player:GetItemPackage(0):AddItem({4020001, 8030701, 8050728, 8080601, 8090307});
player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4});
elseif (player.charaWork.parameterSave.state_mainSkill[0] == 3) then --GLA elseif (player.charaWork.parameterSave.state_mainSkill[0] == 3) then --GLA
player:GetInventory(0):AddItem({4030010, 8031120, 8050245, 8080601, 8090307}); player:GetItemPackage(0):AddItem({4030010, 8031120, 8050245, 8080601, 8090307});
player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4});
elseif (player.charaWork.parameterSave.state_mainSkill[0] == 4) then --MRD elseif (player.charaWork.parameterSave.state_mainSkill[0] == 4) then --MRD
player:GetInventory(0):AddItem({4040001, 8011001, 8050621, 8070346, 8090307}); player:GetItemPackage(0):AddItem({4040001, 8011001, 8050621, 8070346, 8090307});
player:GetEquipment():SetEquipment({0, 8, 12, 13, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 8, 12, 13, 15},{0, 1, 2, 3, 4});
elseif (player.charaWork.parameterSave.state_mainSkill[0] == 7) then --ARC elseif (player.charaWork.parameterSave.state_mainSkill[0] == 7) then --ARC
player:GetInventory(0):AddItem({4070001, 8030601, 8050622, 8080601, 8090307}); player:GetItemPackage(0):AddItem({4070001, 8030601, 8050622, 8080601, 8090307});
player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4});
elseif (player.charaWork.parameterSave.state_mainSkill[0] == 8) then --LNC elseif (player.charaWork.parameterSave.state_mainSkill[0] == 8) then --LNC
player:GetInventory(0):AddItem({4080201, 8030801, 8051015, 8080501, 8090307}); player:GetItemPackage(0):AddItem({4080201, 8030801, 8051015, 8080501, 8090307});
player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4});
--DoM --DoM
elseif (player.charaWork.parameterSave.state_mainSkill[0] == 22) then --THM elseif (player.charaWork.parameterSave.state_mainSkill[0] == 22) then --THM
player:GetInventory(0):AddItem({5020001, 8030245, 8050346, 8080346, 8090208}); player:GetItemPackage(0):AddItem({5020001, 8030245, 8050346, 8080346, 8090208});
player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4});
elseif (player.charaWork.parameterSave.state_mainSkill[0] == 23) then --CNJ elseif (player.charaWork.parameterSave.state_mainSkill[0] == 23) then --CNJ
player:GetInventory(0):AddItem({5030101, 8030445, 8050031, 8080246, 8090208}); player:GetItemPackage(0):AddItem({5030101, 8030445, 8050031, 8080246, 8090208});
player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4}); player:GetEquipment():SetEquipment({0, 10, 12, 14, 15},{0, 1, 2, 3, 4});
--DoH --DoH
@ -124,50 +124,50 @@ end
function initRaceItems(player) function initRaceItems(player)
if (player.playerWork.tribe == 1) then --Hyur Midlander Male if (player.playerWork.tribe == 1) then --Hyur Midlander Male
player:GetInventory(0):AddItem(8040001); player:GetItemPackage(0):AddItem(8040001);
player:GetInventory(0):AddItem(8060001); player:GetItemPackage(0):AddItem(8060001);
elseif (player.playerWork.tribe == 2) then --Hyur Midlander Female elseif (player.playerWork.tribe == 2) then --Hyur Midlander Female
player:GetInventory(0):AddItem(8040002); player:GetItemPackage(0):AddItem(8040002);
player:GetInventory(0):AddItem(8060002); player:GetItemPackage(0):AddItem(8060002);
elseif (player.playerWork.tribe == 3) then --Hyur Highlander Male elseif (player.playerWork.tribe == 3) then --Hyur Highlander Male
player:GetInventory(0):AddItem(8040003); player:GetItemPackage(0):AddItem(8040003);
player:GetInventory(0):AddItem(8060003); player:GetItemPackage(0):AddItem(8060003);
elseif (player.playerWork.tribe == 4) then --Elezen Wildwood Male elseif (player.playerWork.tribe == 4) then --Elezen Wildwood Male
player:GetInventory(0):AddItem(8040004); player:GetItemPackage(0):AddItem(8040004);
player:GetInventory(0):AddItem(8060004); player:GetItemPackage(0):AddItem(8060004);
elseif (player.playerWork.tribe == 5) then --Elezen Wildwood Female elseif (player.playerWork.tribe == 5) then --Elezen Wildwood Female
player:GetInventory(0):AddItem(8040006); player:GetItemPackage(0):AddItem(8040006);
player:GetInventory(0):AddItem(8060006); player:GetItemPackage(0):AddItem(8060006);
elseif (player.playerWork.tribe == 6) then --Elezen Duskwight Male elseif (player.playerWork.tribe == 6) then --Elezen Duskwight Male
player:GetInventory(0):AddItem(8040005); player:GetItemPackage(0):AddItem(8040005);
player:GetInventory(0):AddItem(8060005); player:GetItemPackage(0):AddItem(8060005);
elseif (player.playerWork.tribe == 7) then --Elezen Duskwight Female elseif (player.playerWork.tribe == 7) then --Elezen Duskwight Female
player:GetInventory(0):AddItem(8040007); player:GetItemPackage(0):AddItem(8040007);
player:GetInventory(0):AddItem(8060007); player:GetItemPackage(0):AddItem(8060007);
elseif (player.playerWork.tribe == 8) then --Lalafell Plainsfolk Male elseif (player.playerWork.tribe == 8) then --Lalafell Plainsfolk Male
player:GetInventory(0):AddItem(8040008); player:GetItemPackage(0):AddItem(8040008);
player:GetInventory(0):AddItem(8060008); player:GetItemPackage(0):AddItem(8060008);
elseif (player.playerWork.tribe == 9) then --Lalafell Plainsfolk Female elseif (player.playerWork.tribe == 9) then --Lalafell Plainsfolk Female
player:GetInventory(0):AddItem(8040010); player:GetItemPackage(0):AddItem(8040010);
player:GetInventory(0):AddItem(8060010); player:GetItemPackage(0):AddItem(8060010);
elseif (player.playerWork.tribe == 10) then --Lalafell Dunesfolk Male elseif (player.playerWork.tribe == 10) then --Lalafell Dunesfolk Male
player:GetInventory(0):AddItem(8040009); player:GetItemPackage(0):AddItem(8040009);
player:GetInventory(0):AddItem(8060009); player:GetItemPackage(0):AddItem(8060009);
elseif (player.playerWork.tribe == 11) then --Lalafell Dunesfolk Female elseif (player.playerWork.tribe == 11) then --Lalafell Dunesfolk Female
player:GetInventory(0):AddItem(8040011); player:GetItemPackage(0):AddItem(8040011);
player:GetInventory(0):AddItem(8060011); player:GetItemPackage(0):AddItem(8060011);
elseif (player.playerWork.tribe == 12) then --Miqo'te Seekers of the Sun elseif (player.playerWork.tribe == 12) then --Miqo'te Seekers of the Sun
player:GetInventory(0):AddItem(8040012); player:GetItemPackage(0):AddItem(8040012);
player:GetInventory(0):AddItem(8060012); player:GetItemPackage(0):AddItem(8060012);
elseif (player.playerWork.tribe == 13) then --Miqo'te Seekers of the Moon elseif (player.playerWork.tribe == 13) then --Miqo'te Seekers of the Moon
player:GetInventory(0):AddItem(8040013); player:GetItemPackage(0):AddItem(8040013);
player:GetInventory(0):AddItem(8060013); player:GetItemPackage(0):AddItem(8060013);
elseif (player.playerWork.tribe == 14) then --Roegadyn Sea Wolf elseif (player.playerWork.tribe == 14) then --Roegadyn Sea Wolf
player:GetInventory(0):AddItem(8040014); player:GetItemPackage(0):AddItem(8040014);
player:GetInventory(0):AddItem(8060014); player:GetItemPackage(0):AddItem(8060014);
elseif (player.playerWork.tribe == 15) then --Roegadyn Hellsguard elseif (player.playerWork.tribe == 15) then --Roegadyn Hellsguard
player:GetInventory(0):AddItem(8040015); player:GetItemPackage(0):AddItem(8040015);
player:GetInventory(0):AddItem(8060015); player:GetItemPackage(0):AddItem(8060015);
end end
player:GetEquipment():SetEquipment({9, 11},{5,6}); player:GetEquipment():SetEquipment({9, 11},{5,6});