From e9ea93c5127e2eb8cf430d8fe8116eea76a34135 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 30 May 2022 15:02:56 -0400 Subject: [PATCH] Update inkeeper content Port From (https://github.com/TrinityCore/TrinityCore/commit/e811387bdeced20f363f1ed7bfd4346b602af8e2) --- Source/Game/Entities/Player/Player.cs | 2 +- Source/Scripts/World/NpcInnkeeper.cs | 80 +++------------------------ Source/Scripts/World/NpcSpecial.cs | 16 +++--- 3 files changed, 16 insertions(+), 82 deletions(-) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 32508e0c3..317a98b36 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -7875,7 +7875,7 @@ namespace Game.Entities //Helpers public void AddGossipItem(GossipOptionIcon icon, string message, uint sender, uint action) { PlayerTalkClass.GetGossipMenu().AddMenuItem(-1, icon, message, sender, action, "", 0); } - public void ADD_GOSSIP_ITEM_DB(uint menuId, uint menuItemId, uint sender, uint action) { PlayerTalkClass.GetGossipMenu().AddMenuItem(menuId, menuItemId, sender, action); } + public void AddGossipItem(uint menuId, uint menuItemId, uint sender, uint action) { PlayerTalkClass.GetGossipMenu().AddMenuItem(menuId, menuItemId, sender, action); } public void ADD_GOSSIP_ITEM_EXTENDED(GossipOptionIcon icon, string message, uint sender, uint action, string boxmessage, uint boxmoney, bool coded) { PlayerTalkClass.GetGossipMenu().AddMenuItem(-1, icon, message, sender, action, boxmessage, boxmoney, coded); } // This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32), b - npc guid(uint64) diff --git a/Source/Scripts/World/NpcInnkeeper.cs b/Source/Scripts/World/NpcInnkeeper.cs index 58abe224d..2152e0380 100644 --- a/Source/Scripts/World/NpcInnkeeper.cs +++ b/Source/Scripts/World/NpcInnkeeper.cs @@ -30,20 +30,8 @@ namespace Scripts.World.NpcInnkeeper struct Gossip { - public const string LocaleTrickOrTreat0 = "Trick or Treat!"; - public const string LocaleTrickOrTreat2 = "Des bonbons ou des blagues!"; - public const string LocaleTrickOrTreat3 = "Süßes oder Saures!"; - public const string LocaleTrickOrTreat6 = "¡Truco o trato!"; - - public const string LocaleInnkeeper0 = "Make this inn my home."; - public const string LocaleInnkeeper2 = "Faites de cette auberge votre foyer."; - public const string LocaleInnkeeper3 = "Ich möchte dieses Gasthaus zu meinem Heimatort machen."; - public const string LocaleInnkeeper6 = "Fija tu hogar en esta taberna."; - - public const string LocaleVendor0 = "I want to browse your goods."; - public const string LocaleVendor2 = "Je voudrais regarder vos articles."; - public const string LocaleVendor3 = "Ich sehe mich nur mal um."; - public const string LocaleVendor6 = "Quiero ver tus mercancías."; + public const uint MenuId = 9733; + public const uint MenuEventId = 342; } [Script] @@ -54,70 +42,16 @@ namespace Scripts.World.NpcInnkeeper public override bool OnGossipHello(Player player) { if (Global.GameEventMgr.IsHolidayActive(HolidayIds.HallowsEnd) && !player.HasAura(SpellIds.TrickOrTreated)) - { - string localizedEntry; - switch (player.GetSession().GetSessionDbcLocale()) - { - case Locale.frFR: - localizedEntry = Gossip.LocaleTrickOrTreat2; - break; - case Locale.deDE: - localizedEntry = Gossip.LocaleTrickOrTreat3; - break; - case Locale.esES: - localizedEntry = Gossip.LocaleTrickOrTreat6; - break; - case Locale.enUS: - default: - localizedEntry = Gossip.LocaleTrickOrTreat0; - break; - } - player.AddGossipItem(GossipOptionIcon.None, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); - } + player.AddGossipItem(Gossip.MenuEventId, 0, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); if (me.IsQuestGiver()) + player.PrepareQuestMenu(me.GetGUID()); - if (me.IsVendor()) - { - string localizedEntry; - switch (player.GetSession().GetSessionDbcLocale()) - { - case Locale.frFR: - localizedEntry = Gossip.LocaleVendor2; - break; - case Locale.deDE: - localizedEntry = Gossip.LocaleVendor3; - break; - case Locale.esES: - localizedEntry = Gossip.LocaleVendor6; - break; - case Locale.enUS: - default: localizedEntry = Gossip.LocaleVendor0; - break; - } - player.AddGossipItem(GossipOptionIcon.Vendor, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionTrade); - } + if (me.IsVendor()) + player.AddGossipItem(Gossip.MenuId, 2, eTradeskill.GossipSenderMain, eTradeskill.GossipActionTrade); if (me.IsInnkeeper()) - { - string localizedEntry; - switch (player.GetSession().GetSessionDbcLocale()) - { - case Locale.frFR: - localizedEntry = Gossip.LocaleInnkeeper2; - break; - case Locale.deDE: - localizedEntry = Gossip.LocaleInnkeeper3; - break; - case Locale.esES: - localizedEntry = Gossip.LocaleInnkeeper6; - break; - case Locale.enUS: - default: localizedEntry = Gossip.LocaleInnkeeper0; - break; - } - player.AddGossipItem(GossipOptionIcon.Binder, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInn); - } + player.AddGossipItem(Gossip.MenuId, 1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInn); player.TalkedToCreature(me.GetEntry(), me.GetGUID()); player.SendGossipMenu(player.GetGossipTextId(me), me.GetGUID()); diff --git a/Source/Scripts/World/NpcSpecial.cs b/Source/Scripts/World/NpcSpecial.cs index fd740844b..9be4f8313 100644 --- a/Source/Scripts/World/NpcSpecial.cs +++ b/Source/Scripts/World/NpcSpecial.cs @@ -1353,14 +1353,14 @@ namespace Scripts.World.NpcSpecial { if (player == me.ToTempSummon().GetSummoner()) { - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole2, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole3, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 3); - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole4, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 4); - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 5); + player.AddGossipItem(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); + player.AddGossipItem(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole2, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); + player.AddGossipItem(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole3, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 3); + player.AddGossipItem(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole4, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 4); + player.AddGossipItem(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 5); if (_showUnderground) - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole6, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 6); + player.AddGossipItem(GossipMenus.MenuIdWormhole, GossipMenus.OptionIdWormhole6, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 6); player.SendGossipMenu(TextIds.Wormhole, me.GetGUID()); } @@ -1417,12 +1417,12 @@ namespace Scripts.World.NpcSpecial { if (player.HasPlayerFlag(PlayerFlags.NoXPGain)) // not gaining XP { - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdXpOnOff, GossipMenus.OptionIdXpOn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); + player.AddGossipItem(GossipMenus.MenuIdXpOnOff, GossipMenus.OptionIdXpOn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.SendGossipMenu(TextIds.XpOnOff, me.GetGUID()); } else // currently gaining XP { - player.ADD_GOSSIP_ITEM_DB(GossipMenus.MenuIdXpOnOff, GossipMenus.OptionIdXpOff, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); + player.AddGossipItem(GossipMenus.MenuIdXpOnOff, GossipMenus.OptionIdXpOff, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); player.SendGossipMenu(TextIds.XpOnOff, me.GetGUID()); } return true;