From 044d7e52075aef9dc9ee768a8bbd726b426dd992 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Mon, 6 May 2019 16:40:11 -0400 Subject: [PATCH] More changes. --- .../npc/populace/PopulaceBlackMarketeer.lua | 6 +- .../npc/populace/PopulaceCompanyOfficer.lua | 2 +- .../npc/populace/PopulaceCompanyWarp.lua | 8 +- .../populace/PopulaceSpecialEventCryer.lua | 4 +- .../npc/populace/shop/PopulaceGuildShop.lua | 3 +- .../populace/shop/PopulaceShopSalesman.lua | 2 +- data/scripts/player.lua | 74 +++++++++---------- data/scripts/shop.lua | 10 +-- 8 files changed, 53 insertions(+), 56 deletions(-) diff --git a/data/scripts/base/chara/npc/populace/PopulaceBlackMarketeer.lua b/data/scripts/base/chara/npc/populace/PopulaceBlackMarketeer.lua index cc506739..26bfbece 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceBlackMarketeer.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceBlackMarketeer.lua @@ -68,7 +68,7 @@ function onEventStarted(player, npc, triggerName) callClientFunction(player, "eventTalkWelcome", player); - if player:GetInventory(INVENTORY_NORMAL):HasItem(commemorativeCoin) and playerGC > 0 then + if player:GetItemPackage(INVENTORY_NORMAL):HasItem(commemorativeCoin) and playerGC > 0 then -- Checks for player having a commemorative coin, show window trade option if so. coinChoice = callClientFunction(player, "eventSellItemAsk", player, commemorativeCoin, commemorativeCoinValue); if coinChoice == 1 then @@ -76,8 +76,8 @@ function onEventStarted(player, npc, triggerName) elseif coinChoice == 2 then -- You trade for . player:SendGameMessage(player, GetWorldMaster(), 25071, MESSAGE_TYPE_SYSTEM, commemorativeCoin, 1, playerGCSeal, 1, 1, commemorativeCoinValue); - player:GetInventory(INVENTORY_NORMAL):RemoveItem(commemorativeCoin, 1); - player:getInventory(INVENTORY_CURRENCY):addItem(playerGCSeal, 25000, 1) + player:GetItemPackage(INVENTORY_NORMAL):RemoveItem(commemorativeCoin, 1); + player:GetItemPackage(INVENTORY_CURRENCY):addItem(playerGCSeal, 25000, 1) -- TODO: Add handling for checking GC seals limit and not going over it end else diff --git a/data/scripts/base/chara/npc/populace/PopulaceCompanyOfficer.lua b/data/scripts/base/chara/npc/populace/PopulaceCompanyOfficer.lua index 9197354e..33ed752d 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceCompanyOfficer.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceCompanyOfficer.lua @@ -50,7 +50,7 @@ function onEventStarted(player, npc, triggerName) if playerGC == gcOfficer[npcId] then callClientFunction(player, "eventTalkWelcome"); if playerCurrentRank < currentRankCap then - if player:GetInventory(INVENTORY_CURRENCY):HasItem(playerGCSeal, playerRankUpCost) then + if player:GetItemPackage(INVENTORY_CURRENCY):HasItem(playerGCSeal, playerRankUpCost) then -- Show Promotion window, allow paying local choice = callClientFunction(player, "eventTalkJoined", playerCurrentRank, playerNextRank, true, true); diff --git a/data/scripts/base/chara/npc/populace/PopulaceCompanyWarp.lua b/data/scripts/base/chara/npc/populace/PopulaceCompanyWarp.lua index 9a5481b9..3fd8e34a 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceCompanyWarp.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceCompanyWarp.lua @@ -69,8 +69,6 @@ aethernet = } } - - function init(npc) return false, false, 0, 0; end @@ -86,19 +84,19 @@ function onEventStarted(player, npc, triggerName) if city == 1 then - if player:GetInventory(INVENTORY_KEYITEMS):HasItem(passLimsa) then + if player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(passLimsa) then passCheck = 1; else if passCheck == 0 then callClientFunction(player, "eventTalkWelcome", player); end end; elseif city == 2 then - if player:GetInventory(INVENTORY_KEYITEMS):HasItem(passGrid) then + if player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(passGrid) then passCheck = 1; else if passCheck == 0 then callClientFunction(player, "eventTalkWelcome", player); end end; elseif city == 3 then - if player:GetInventory(INVENTORY_KEYITEMS):HasItem(passUldah) then + if player:GetItemPackage(INVENTORY_KEYITEMS):HasItem(passUldah) then passCheck = 1; else if passCheck == 0 then callClientFunction(player, "eventTalkWelcome", player); end diff --git a/data/scripts/base/chara/npc/populace/PopulaceSpecialEventCryer.lua b/data/scripts/base/chara/npc/populace/PopulaceSpecialEventCryer.lua index d4a8c29b..e7221be1 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceSpecialEventCryer.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceSpecialEventCryer.lua @@ -64,7 +64,7 @@ function onEventStarted(player, npc, triggerName) player:SendMessage(0x20, "", "You pretend to hand over four over-aspected crystals."); callClientFunction(player, "eventTalkCrystalExchange2", player, npcGC); - local invCheck = player:GetInventory(INVENTORY_CURRENCY):AddItem(npcGCSeal, 1000, 1); + local invCheck = player:GetItemPackage(INVENTORY_CURRENCY):AddItem(npcGCSeal, 1000, 1); if invCheck == INV_ERROR_SUCCESS then player:SendGameMessage(player, GetWorldMaster(), 25071, MESSAGE_TYPE_SYSTEM, crystal, 1, npcGCSeal, 1, 4, 1000); end @@ -73,7 +73,7 @@ function onEventStarted(player, npc, triggerName) --callClientFunction(player, "eventTalkCsOverflow", player, npcGC); callClientFunction(player, "eventTalkCrystalExchange2", player, npcGC); - local invCheck = player:GetInventory(INVENTORY_CURRENCY):AddItem(npcGCSeal, 3000, 1); + local invCheck = player:GetItemPackage(INVENTORY_CURRENCY):AddItem(npcGCSeal, 3000, 1); if invCheck == INV_ERROR_SUCCESS then player:SendGameMessage(player, GetWorldMaster(), 25071, MESSAGE_TYPE_SYSTEM, cluster, 1, npcGCSeal, 1, 1, 3000); end diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua index ed6466b6..6c03a449 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua @@ -17,7 +17,6 @@ guildExplain(npcId, player) -- Guild Mark tutorial dialo --]] - require ("global") require ("shop") @@ -79,7 +78,7 @@ function onEventStarted(player, npc) end; processGuildShop(player, shopPack, shopCurrency); elseif (choice == 121) then -- Exchange marks for Gil. 1 mark = 4 gil - local markAmount = player:GetInventory(INVENTORY_CURRENCY):GetItemQuantity(shopCurrency); + local markAmount = player:GetItemPackage(INVENTORY_CURRENCY):GetItemQuantity(shopCurrency); purchaseItem(player, INVENTORY_CURRENCY, gilCurrency, markAmount*4, 1, markAmount, shopCurrency); end diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua index 26039572..a4ef74cc 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua @@ -264,7 +264,7 @@ function openSellMenu(player) break; else if sellState == 1 then - itemToSell = player:GetInventory(INVENTORY_NORMAL):GetItemAtSlot(sellItemSlot-1); + itemToSell = player:GetItemPackage(INVENTORY_NORMAL):GetItemAtSlot(sellItemSlot-1); gItemSellId = itemToSell.itemId; gItemQuality = itemToSell.quality; gItemPrice = GetItemGamedata(gItemSellId); diff --git a/data/scripts/player.lua b/data/scripts/player.lua index 4fdbddd7..156119d0 100644 --- a/data/scripts/player.lua +++ b/data/scripts/player.lua @@ -82,26 +82,26 @@ function initClassItems(player) --DoW 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}); 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}); 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}); 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}); 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}); --DoM 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}); 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}); --DoH @@ -125,50 +125,50 @@ end function initRaceItems(player) if (player.playerWork.tribe == 1) then --Hyur Midlander Male - player:GetInventory(0):AddItem(8040001); - player:GetInventory(0):AddItem(8060001); + player:GetItemPackage(0):AddItem(8040001); + player:GetItemPackage(0):AddItem(8060001); elseif (player.playerWork.tribe == 2) then --Hyur Midlander Female - player:GetInventory(0):AddItem(8040002); - player:GetInventory(0):AddItem(8060002); + player:GetItemPackage(0):AddItem(8040002); + player:GetItemPackage(0):AddItem(8060002); elseif (player.playerWork.tribe == 3) then --Hyur Highlander Male - player:GetInventory(0):AddItem(8040003); - player:GetInventory(0):AddItem(8060003); + player:GetItemPackage(0):AddItem(8040003); + player:GetItemPackage(0):AddItem(8060003); elseif (player.playerWork.tribe == 4) then --Elezen Wildwood Male - player:GetInventory(0):AddItem(8040004); - player:GetInventory(0):AddItem(8060004); + player:GetItemPackage(0):AddItem(8040004); + player:GetItemPackage(0):AddItem(8060004); elseif (player.playerWork.tribe == 5) then --Elezen Wildwood Female - player:GetInventory(0):AddItem(8040006); - player:GetInventory(0):AddItem(8060006); + player:GetItemPackage(0):AddItem(8040006); + player:GetItemPackage(0):AddItem(8060006); elseif (player.playerWork.tribe == 6) then --Elezen Duskwight Male - player:GetInventory(0):AddItem(8040005); - player:GetInventory(0):AddItem(8060005); + player:GetItemPackage(0):AddItem(8040005); + player:GetItemPackage(0):AddItem(8060005); elseif (player.playerWork.tribe == 7) then --Elezen Duskwight Female - player:GetInventory(0):AddItem(8040007); - player:GetInventory(0):AddItem(8060007); + player:GetItemPackage(0):AddItem(8040007); + player:GetItemPackage(0):AddItem(8060007); elseif (player.playerWork.tribe == 8) then --Lalafell Plainsfolk Male - player:GetInventory(0):AddItem(8040008); - player:GetInventory(0):AddItem(8060008); + player:GetItemPackage(0):AddItem(8040008); + player:GetItemPackage(0):AddItem(8060008); elseif (player.playerWork.tribe == 9) then --Lalafell Plainsfolk Female - player:GetInventory(0):AddItem(8040010); - player:GetInventory(0):AddItem(8060010); + player:GetItemPackage(0):AddItem(8040010); + player:GetItemPackage(0):AddItem(8060010); elseif (player.playerWork.tribe == 10) then --Lalafell Dunesfolk Male - player:GetInventory(0):AddItem(8040009); - player:GetInventory(0):AddItem(8060009); + player:GetItemPackage(0):AddItem(8040009); + player:GetItemPackage(0):AddItem(8060009); elseif (player.playerWork.tribe == 11) then --Lalafell Dunesfolk Female - player:GetInventory(0):AddItem(8040011); - player:GetInventory(0):AddItem(8060011); + player:GetItemPackage(0):AddItem(8040011); + player:GetItemPackage(0):AddItem(8060011); elseif (player.playerWork.tribe == 12) then --Miqo'te Seekers of the Sun - player:GetInventory(0):AddItem(8040012); - player:GetInventory(0):AddItem(8060012); + player:GetItemPackage(0):AddItem(8040012); + player:GetItemPackage(0):AddItem(8060012); elseif (player.playerWork.tribe == 13) then --Miqo'te Seekers of the Moon - player:GetInventory(0):AddItem(8040013); - player:GetInventory(0):AddItem(8060013); + player:GetItemPackage(0):AddItem(8040013); + player:GetItemPackage(0):AddItem(8060013); elseif (player.playerWork.tribe == 14) then --Roegadyn Sea Wolf - player:GetInventory(0):AddItem(8040014); - player:GetInventory(0):AddItem(8060014); + player:GetItemPackage(0):AddItem(8040014); + player:GetItemPackage(0):AddItem(8060014); elseif (player.playerWork.tribe == 15) then --Roegadyn Hellsguard - player:GetInventory(0):AddItem(8040015); - player:GetInventory(0):AddItem(8060015); + player:GetItemPackage(0):AddItem(8040015); + player:GetItemPackage(0):AddItem(8060015); end player:GetEquipment():SetEquipment({9, 11},{5,6}); diff --git a/data/scripts/shop.lua b/data/scripts/shop.lua index acaf3f93..d0df39b8 100644 --- a/data/scripts/shop.lua +++ b/data/scripts/shop.lua @@ -9,8 +9,8 @@ function purchaseItem(player, location, itemId, quantity, quality, price, curren local worldMaster = GetWorldMaster(); local invCheck = -1; - if (player:GetInventory(INVENTORY_CURRENCY):HasItem(currency, price)) then - invCheck = player:GetInventory(location):AddItem(itemId, quantity, quality); + if (player:GetItemPackage(INVENTORY_CURRENCY):HasItem(currency, price)) then + invCheck = player:GetItemPackage(location):AddItem(itemId, quantity, quality); if (invCheck == INV_ERROR_FULL) then -- Your inventory is full. @@ -21,7 +21,7 @@ function purchaseItem(player, location, itemId, quantity, quality, price, curren elseif (invCheck == INV_ERROR_SYSTEM_ERROR) then player:SendMessage(0x20, "", "[DEBUG] Server Error on adding item."); elseif (invCheck == INV_ERROR_SUCCESS) then - player:GetInventory(INVENTORY_CURRENCY):removeItem(currency, price); + player:GetItemPackage(INVENTORY_CURRENCY):removeItem(currency, price); if (currency == 1000001) then -- If Gil -- You purchase for gil. @@ -48,8 +48,8 @@ function sellItem(player, itemId, quantity, quality, itemPrice, slot, currency) local worldMaster = GetWorldMaster(); local cost = quantity * itemPrice; - player:GetInventory(INVENTORY_CURRENCY):AddItem(currency, cost); - player:GetInventory(INVENTORY_NORMAL):RemoveItemAtSlot(slot, quantity); + player:GetItemPackage(INVENTORY_CURRENCY):AddItem(currency, cost); + player:GetItemPackage(INVENTORY_NORMAL):RemoveItemAtSlot(slot, quantity); -- You sell for gil. player:SendGameMessage(player, worldMaster, 25075, MESSAGE_TYPE_SYSTEM, itemId, quality, quantity, cost); end \ No newline at end of file