From 22a96ad00f327996dc9092ea0b81a640bdb6e7e2 Mon Sep 17 00:00:00 2001 From: claywar Date: Thu, 23 Jan 2025 13:20:13 -0500 Subject: [PATCH] Create menuType enum to support CLuaBaseEntity::sendMenu() parameter --- scripts/commands/ah.lua | 2 +- scripts/enum/menu_type.lua | 9 +++++++++ scripts/globals/moghouse.lua | 2 +- scripts/globals/shop.lua | 6 +++--- scripts/specs/core/CBaseEntity.lua | 2 +- .../zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua | 2 +- scripts/zones/Al_Zahbi/npcs/Goyuyu.lua | 2 +- scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua | 2 +- scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua | 2 +- scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua | 2 +- scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua | 2 +- scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua | 2 +- scripts/zones/Kazham/npcs/Cha_Chalco.lua | 2 +- scripts/zones/Kazham/npcs/Cophi_Ricuub.lua | 2 +- scripts/zones/Kazham/npcs/Nomad_Moogle.lua | 2 +- scripts/zones/Kazham/npcs/Sulo_Mouzho.lua | 2 +- scripts/zones/Lower_Jeuno/npcs/Auction_Counter.lua | 2 +- scripts/zones/Mhaura/npcs/Nomad_Moogle.lua | 2 +- scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua | 2 +- scripts/zones/Nashmau/npcs/Momoroon.lua | 2 +- scripts/zones/Nashmau/npcs/Nomad_Moogle.lua | 2 +- scripts/zones/Nashmau/npcs/Pupuroon.lua | 2 +- scripts/zones/Norg/npcs/Agatsum.lua | 2 +- scripts/zones/Norg/npcs/Atrevaux.lua | 2 +- scripts/zones/Norg/npcs/Gofufu.lua | 2 +- scripts/zones/Norg/npcs/Nomad_Moogle.lua | 2 +- scripts/zones/Norg/npcs/Zoldba.lua | 2 +- scripts/zones/Port_Jeuno/npcs/Basmus.lua | 2 +- scripts/zones/Port_Jeuno/npcs/Kouang.lua | 2 +- scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua | 2 +- scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua | 2 +- scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua | 2 +- scripts/zones/Rabao/npcs/Cavalgrinne.lua | 2 +- scripts/zones/Rabao/npcs/Hyesun.lua | 2 +- scripts/zones/Rabao/npcs/Nomad_Moogle.lua | 2 +- scripts/zones/Rabao/npcs/Smiling_Rat.lua | 2 +- scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua | 2 +- scripts/zones/Selbina/npcs/Nomad_Moogle.lua | 2 +- .../zones/Southern_San_dOria/npcs/Auction_Counter.lua | 2 +- scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua | 2 +- .../zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua | 2 +- scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua | 2 +- scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua | 2 +- scripts/zones/Upper_Jeuno/npcs/Indika.lua | 2 +- scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua | 2 +- scripts/zones/Upper_Jeuno/npcs/Ulesa.lua | 2 +- scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua | 2 +- scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua | 2 +- scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua | 2 +- scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua | 2 +- src/map/lua/lua_baseentity.cpp | 2 +- 51 files changed, 61 insertions(+), 52 deletions(-) create mode 100644 scripts/enum/menu_type.lua diff --git a/scripts/commands/ah.lua b/scripts/commands/ah.lua index 50e806d0224..b7a2b57cd33 100644 --- a/scripts/commands/ah.lua +++ b/scripts/commands/ah.lua @@ -12,7 +12,7 @@ commandObj.cmdprops = } commandObj.onTrigger = function(player) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return commandObj diff --git a/scripts/enum/menu_type.lua b/scripts/enum/menu_type.lua new file mode 100644 index 00000000000..55092fdff06 --- /dev/null +++ b/scripts/enum/menu_type.lua @@ -0,0 +1,9 @@ +xi = xi or {} + +---@enum xi.menuType +xi.menuType = +{ + MOOGLE = 1, + SHOP = 2, + AUCTION = 3, +} diff --git a/scripts/globals/moghouse.lua b/scripts/globals/moghouse.lua index c30c0a96110..d621eec6b9b 100644 --- a/scripts/globals/moghouse.lua +++ b/scripts/globals/moghouse.lua @@ -265,7 +265,7 @@ xi.moghouse.moogleTrigger = function(player, npc) end end - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end end diff --git a/scripts/globals/shop.lua b/scripts/globals/shop.lua index dd70cc7494e..8b2e59c8b56 100644 --- a/scripts/globals/shop.lua +++ b/scripts/globals/shop.lua @@ -42,7 +42,7 @@ xi.shop = player:addShopItem(stock[i], stock[i + 1] * priceMultiplier) end - player:sendMenu(2) + player:sendMenu(xi.menuType.SHOP) end, -- send general guild shop dialog to player (Added on June 2014 QoL) @@ -57,7 +57,7 @@ xi.shop = player:addShopItem(stock[i], stock[i + 1], guildSkillId, stock[i + 2]) end - player:sendMenu(2) + player:sendMenu(xi.menuType.SHOP) end, -- send curio vendor moogle shop shop dialog to player @@ -74,7 +74,7 @@ xi.shop = end end - player:sendMenu(2) + player:sendMenu(xi.menuType.SHOP) end, -- send nation shop dialog to player diff --git a/scripts/specs/core/CBaseEntity.lua b/scripts/specs/core/CBaseEntity.lua index b044984d8d5..f1e7a7291d0 100644 --- a/scripts/specs/core/CBaseEntity.lua +++ b/scripts/specs/core/CBaseEntity.lua @@ -605,7 +605,7 @@ end function CBaseEntity:changeMusic(blockID, musicTrackID) end ----@param menu integer +---@param menu xi.menuType ---@return nil function CBaseEntity:sendMenu(menu) end diff --git a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua index af8e6feba52..0f274e05bcd 100644 --- a/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua +++ b/scripts/zones/Aht_Urhgan_Whitegate/npcs/Auction_Counter.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua b/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua index 31b64642cef..147eead36a5 100644 --- a/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua +++ b/scripts/zones/Al_Zahbi/npcs/Goyuyu.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua b/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua index 1316f1c966c..67a6255e6bf 100644 --- a/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua +++ b/scripts/zones/Al_Zahbi/npcs/Sojan-Tamjan.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua b/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua index 37a44615fe5..dcafca1664c 100644 --- a/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua +++ b/scripts/zones/Al_Zahbi/npcs/Yando-Memondo.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua b/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua index b21be86092d..a3394c92b01 100644 --- a/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua +++ b/scripts/zones/Bastok_Markets/npcs/Auction_Counter.lua @@ -12,7 +12,7 @@ end entity.onTrigger = function(player, npc) xi.tutorial.onAuctionTrigger(player) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua b/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua index bd5a6b7ed4a..7a7bad34bf9 100644 --- a/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua +++ b/scripts/zones/Bastok_Mines/npcs/Auction_Counter.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua b/scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua index 7bf6b2f81c4..a85c4a5bc33 100644 --- a/scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua +++ b/scripts/zones/Eastern_Adoulin/npcs/Auction_Counter.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Kazham/npcs/Cha_Chalco.lua b/scripts/zones/Kazham/npcs/Cha_Chalco.lua index 433e8ef2330..5f63b67b6b0 100644 --- a/scripts/zones/Kazham/npcs/Cha_Chalco.lua +++ b/scripts/zones/Kazham/npcs/Cha_Chalco.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Kazham/npcs/Cophi_Ricuub.lua b/scripts/zones/Kazham/npcs/Cophi_Ricuub.lua index 38ec453953b..0dfca594877 100644 --- a/scripts/zones/Kazham/npcs/Cophi_Ricuub.lua +++ b/scripts/zones/Kazham/npcs/Cophi_Ricuub.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Kazham/npcs/Nomad_Moogle.lua b/scripts/zones/Kazham/npcs/Nomad_Moogle.lua index 87afb963a13..c3fc9549431 100644 --- a/scripts/zones/Kazham/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Kazham/npcs/Nomad_Moogle.lua @@ -12,7 +12,7 @@ end entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Kazham/npcs/Sulo_Mouzho.lua b/scripts/zones/Kazham/npcs/Sulo_Mouzho.lua index ed50cbb0d75..25ff8fa76a4 100644 --- a/scripts/zones/Kazham/npcs/Sulo_Mouzho.lua +++ b/scripts/zones/Kazham/npcs/Sulo_Mouzho.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Lower_Jeuno/npcs/Auction_Counter.lua b/scripts/zones/Lower_Jeuno/npcs/Auction_Counter.lua index a44c65543b8..3e4b8eefaa9 100644 --- a/scripts/zones/Lower_Jeuno/npcs/Auction_Counter.lua +++ b/scripts/zones/Lower_Jeuno/npcs/Auction_Counter.lua @@ -9,7 +9,7 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Mhaura/npcs/Nomad_Moogle.lua b/scripts/zones/Mhaura/npcs/Nomad_Moogle.lua index 78f929404f8..c43d54834a7 100644 --- a/scripts/zones/Mhaura/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Mhaura/npcs/Nomad_Moogle.lua @@ -12,7 +12,7 @@ end entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end entity.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua b/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua index c5c625fb7d8..22d332d9767 100644 --- a/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua +++ b/scripts/zones/Mog_Garden/npcs/Green_Thumb_Moogle.lua @@ -31,7 +31,7 @@ entity.onEventFinish = function(player, csid, option, npc) end -- Show the mog house menu - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) elseif csid == 1016 and option == 0xFFE00FF then -- Buy/Sell Things local stock = diff --git a/scripts/zones/Nashmau/npcs/Momoroon.lua b/scripts/zones/Nashmau/npcs/Momoroon.lua index ef405602475..feca449ee5f 100644 --- a/scripts/zones/Nashmau/npcs/Momoroon.lua +++ b/scripts/zones/Nashmau/npcs/Momoroon.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua b/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua index ae63dfa8040..e2acfec18c1 100644 --- a/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Nashmau/npcs/Nomad_Moogle.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end return entity diff --git a/scripts/zones/Nashmau/npcs/Pupuroon.lua b/scripts/zones/Nashmau/npcs/Pupuroon.lua index 73c3d0e02f6..eb4711a4af7 100644 --- a/scripts/zones/Nashmau/npcs/Pupuroon.lua +++ b/scripts/zones/Nashmau/npcs/Pupuroon.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Norg/npcs/Agatsum.lua b/scripts/zones/Norg/npcs/Agatsum.lua index 3e60069f3de..4d4b969ef55 100644 --- a/scripts/zones/Norg/npcs/Agatsum.lua +++ b/scripts/zones/Norg/npcs/Agatsum.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Norg/npcs/Atrevaux.lua b/scripts/zones/Norg/npcs/Atrevaux.lua index 55216fef457..7383843cc28 100644 --- a/scripts/zones/Norg/npcs/Atrevaux.lua +++ b/scripts/zones/Norg/npcs/Atrevaux.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Norg/npcs/Gofufu.lua b/scripts/zones/Norg/npcs/Gofufu.lua index a87024ced04..56581d64dd7 100644 --- a/scripts/zones/Norg/npcs/Gofufu.lua +++ b/scripts/zones/Norg/npcs/Gofufu.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Norg/npcs/Nomad_Moogle.lua b/scripts/zones/Norg/npcs/Nomad_Moogle.lua index 9adf3cb93b3..10a7669b666 100644 --- a/scripts/zones/Norg/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Norg/npcs/Nomad_Moogle.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end return entity diff --git a/scripts/zones/Norg/npcs/Zoldba.lua b/scripts/zones/Norg/npcs/Zoldba.lua index d4edd231354..7a2fe182c7b 100644 --- a/scripts/zones/Norg/npcs/Zoldba.lua +++ b/scripts/zones/Norg/npcs/Zoldba.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Basmus.lua b/scripts/zones/Port_Jeuno/npcs/Basmus.lua index 61766fb89df..69c5221ad30 100644 --- a/scripts/zones/Port_Jeuno/npcs/Basmus.lua +++ b/scripts/zones/Port_Jeuno/npcs/Basmus.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Kouang.lua b/scripts/zones/Port_Jeuno/npcs/Kouang.lua index 25f8c82a60c..d5679d79a14 100644 --- a/scripts/zones/Port_Jeuno/npcs/Kouang.lua +++ b/scripts/zones/Port_Jeuno/npcs/Kouang.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua b/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua index 419916fddce..fa2e0e7f549 100644 --- a/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua +++ b/scripts/zones/Port_Jeuno/npcs/Rilve-Hitolve.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua b/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua index a59f8fd6ca1..f08fe5ee928 100644 --- a/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua +++ b/scripts/zones/Port_Jeuno/npcs/Sapladrepoin.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua b/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua index 8f28a64fb1f..abc7c4b817e 100644 --- a/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua +++ b/scripts/zones/Port_San_dOria/npcs/Auction_Counter.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Rabao/npcs/Cavalgrinne.lua b/scripts/zones/Rabao/npcs/Cavalgrinne.lua index 9a0d425fae5..daab636fd81 100644 --- a/scripts/zones/Rabao/npcs/Cavalgrinne.lua +++ b/scripts/zones/Rabao/npcs/Cavalgrinne.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Rabao/npcs/Hyesun.lua b/scripts/zones/Rabao/npcs/Hyesun.lua index 5c0e0494fd6..b61dcae3beb 100644 --- a/scripts/zones/Rabao/npcs/Hyesun.lua +++ b/scripts/zones/Rabao/npcs/Hyesun.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Rabao/npcs/Nomad_Moogle.lua b/scripts/zones/Rabao/npcs/Nomad_Moogle.lua index 6b0225060a1..ba4d146ab78 100644 --- a/scripts/zones/Rabao/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Rabao/npcs/Nomad_Moogle.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end return entity diff --git a/scripts/zones/Rabao/npcs/Smiling_Rat.lua b/scripts/zones/Rabao/npcs/Smiling_Rat.lua index 70b9d027c4a..e4edc5bc60c 100644 --- a/scripts/zones/Rabao/npcs/Smiling_Rat.lua +++ b/scripts/zones/Rabao/npcs/Smiling_Rat.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua b/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua index 04051c98177..e22953f11b5 100644 --- a/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua +++ b/scripts/zones/RuLude_Gardens/npcs/Auction_Counter.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Selbina/npcs/Nomad_Moogle.lua b/scripts/zones/Selbina/npcs/Nomad_Moogle.lua index 59542fd012c..e9900d13969 100644 --- a/scripts/zones/Selbina/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Selbina/npcs/Nomad_Moogle.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end return entity diff --git a/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua b/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua index b9ca9f42a96..8faf7220310 100644 --- a/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua +++ b/scripts/zones/Southern_San_dOria/npcs/Auction_Counter.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) xi.tutorial.onAuctionTrigger(player) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua b/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua index ff023fa9207..b10f6f408fd 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Eliot.lua @@ -8,7 +8,7 @@ local entity = {} entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) then - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) -- TODO: Else 10916 end end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua b/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua index 2a2a797d162..1d664c304f3 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Ferocious_Artisan.lua @@ -8,7 +8,7 @@ local entity = {} entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) then - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) -- TODO: Else 10917 end end diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua b/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua index 91d807e5ac5..eccbd07c84d 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Nomad_Moogle.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) player:showText(npc, ID.text.NOMAD_MOOGLE_DIALOG) - player:sendMenu(1) + player:sendMenu(xi.menuType.MOOGLE) end return entity diff --git a/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua b/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua index df48c78b5bf..4fd88cf2ea8 100644 --- a/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua +++ b/scripts/zones/Tavnazian_Safehold/npcs/Senvaleget.lua @@ -8,7 +8,7 @@ local entity = {} entity.onTrigger = function(player, npc) if player:hasCompletedMission(xi.mission.log_id.COP, xi.mission.id.cop.DARKNESS_NAMED) then - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) -- Else 10918 end end diff --git a/scripts/zones/Upper_Jeuno/npcs/Indika.lua b/scripts/zones/Upper_Jeuno/npcs/Indika.lua index b793d9151eb..4eabea1faa5 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Indika.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Indika.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua b/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua index 97efe24b7c8..a550ae6b7f8 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Shama_Pikholo.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua b/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua index 6153d1a73d7..49bff3d2b10 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Ulesa.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua b/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua index 3899504617a..03af45003f8 100644 --- a/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua +++ b/scripts/zones/Upper_Jeuno/npcs/Wise_Wolf.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua b/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua index fe4a310889d..5b590d99dbc 100644 --- a/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua +++ b/scripts/zones/Western_Adoulin/npcs/Auction_Counter.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua b/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua index 05d60152de9..93e367b5c7b 100644 --- a/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua +++ b/scripts/zones/Windurst_Walls/npcs/Auction_Counter.lua @@ -6,7 +6,7 @@ local entity = {} entity.onTrigger = function(player, npc) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua b/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua index 1b564ff97f7..aceea083da9 100644 --- a/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua +++ b/scripts/zones/Windurst_Woods/npcs/Auction_Counter.lua @@ -9,7 +9,7 @@ local entity = {} entity.onTrigger = function(player, npc) xi.tutorial.onAuctionTrigger(player) - player:sendMenu(3) + player:sendMenu(xi.menuType.AUCTION) end return entity diff --git a/src/map/lua/lua_baseentity.cpp b/src/map/lua/lua_baseentity.cpp index 8b4deaea1c7..ab61c571dd1 100644 --- a/src/map/lua/lua_baseentity.cpp +++ b/src/map/lua/lua_baseentity.cpp @@ -2393,7 +2393,7 @@ void CLuaBaseEntity::changeMusic(uint16 blockID, uint16 musicTrackID) /************************************************************************ * Function: sendMenu() * Purpose : Sends a menu to the PC (Ex: Auction, Mog House, Shop) - * Example : player:sendMenu(3) + * Example : player:sendMenu(xi.menuType.AUCTION) ************************************************************************/ void CLuaBaseEntity::sendMenu(uint32 menu)