Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Gossip: Update GossipOptionIcon enum

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5c287929b216bf6d3818d77f507beb8dfb617a43)
This commit is contained in:
hondacrx
2021-10-03 13:15:39 -04:00
parent e1aa4334d2
commit dc021efd8a
4 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/GossipConst.cs
+46 -22
View File
@@ -45,28 +45,52 @@ namespace Framework.Constants
public enum GossipOptionIcon public enum GossipOptionIcon
{ {
Chat = 0, // White Chat Bubble None = 0, // White chat bubble. Default
Vendor = 1, // Brown Bag Vendor = 1, // Brown bag
Taxi = 2, // Flightmarker (Paperplane) TaxiNode = 2, // White wing
Trainer = 3, // Brown Book (Trainer) Trainer = 3, // Brown book
Interact1 = 4, // Golden Interaction Wheel SpiritHealer = 4, // Golden interaction wheel (with red center)
Interact2 = 5, // Golden Interaction Wheel Binder = 5, // Golden interaction wheel
MoneyBag = 6, // Brown Bag (With Gold Coin In Lower Corner) Banker = 6, // Brown bag (with gold coin in lower corner)
Talk = 7, // White Chat Bubble (With "..." Inside) PetitionVendor = 7, // White chat bubble (with "..." inside)
Tabard = 8, // White Tabard TabardVendor = 8, // White tabard
Battle = 9, // Two Crossed Swords BattleMaster = 9, // Two crossed swords
Dot = 10, // Yellow Dot/Point Auctioneer = 10, // Stack of gold coins
Chat11 = 11, // White Chat Bubble TalentMaster = 11, // White chat bubble
Chat12 = 12, // White Chat Bubble StableMaster = 12, // White chat bubble
Chat13 = 13, // White Chat Bubble PetSpecializationMaster = 13, // White chat bubble
Unk14 = 14, // Invalid - Do Not Use GuildBanker = 14, // White chat bubble
Unk15 = 15, // Invalid - Do Not Use SpellClick = 15, // White chat bubble
Chat16 = 16, // White Chat Bubble DisableXPGain = 16, // White chat bubble
Chat17 = 17, // White Chat Bubble EnableXPGain = 17, // White chat bubble
Chat18 = 18, // White Chat Bubble Mailbox = 18, // White chat bubble
Chat19 = 19, // White Chat Bubble WorldPVPQueue = 19, // White chat bubble
Chat20 = 20, // White Chat Bubble DungeonFinder = 20, // White chat bubble
Chat21 = 21, // transmogrifier? ArtifactRespec = 21, // White chat bubble
CemeterySelect = 22, // White chat bubble
SpecializationMaster = 23, // White chat bubble
GlyphMaster = 24, // White chat bubble
ScenarioQueue = 25, // White chat bubble
GarrisonArchitect = 26, // White chat bubble
GarrisonMission = 27, // White chat bubble
GarrisonShipment = 28, // Brown document
GarrisonTradeskill = 29, // White chat bubble
GarrisonRecruitment = 30, // White chat bubble
AdventureMap = 31, // White chat bubble
GarrisonTalent = 32, // White chat bubble
ContributionCollector = 33, // White chat bubble
Transmogrify = 34, // Purple helm
AzeriteRespec = 35, // White chat bubble
IslandsQueue = 36, // White chat bubble
UIItemInteraction = 37, // White chat bubble
WorldMap = 38, // White chat bubble
Unk39 = 39, //
ChromieTime = 40, // White chat bubble
Unk41 = 41, //
RuneforgeCrafting = 42, // White chat bubble
GuideRecruiter = 43, // White chat bubble
RuneforgeUpgrading = 44, // White chat bubble
CovenantRenown = 45, // White chat bubble
Max Max
} }
Source/Game/Globals/ObjectManager.cs
+1 -1
View File
@@ -631,7 +631,7 @@ namespace Game
if (gMenuItem.OptionIcon >= GossipOptionIcon.Max) if (gMenuItem.OptionIcon >= GossipOptionIcon.Max)
{ {
Log.outError(LogFilter.Sql, $"Table gossip_menu_option for MenuId {gMenuItem.MenuId}, OptionIndex {gMenuItem.OptionIndex} has unknown icon id {gMenuItem.OptionIcon}. Replacing with GossipOptionIcon.Chat"); Log.outError(LogFilter.Sql, $"Table gossip_menu_option for MenuId {gMenuItem.MenuId}, OptionIndex {gMenuItem.OptionIndex} has unknown icon id {gMenuItem.OptionIcon}. Replacing with GossipOptionIcon.Chat");
gMenuItem.OptionIcon = GossipOptionIcon.Chat; gMenuItem.OptionIcon = GossipOptionIcon.None;
} }
if (gMenuItem.OptionBroadcastTextId != 0) if (gMenuItem.OptionBroadcastTextId != 0)
Source/Scripts/World/GameObject.cs
+13 -13
View File
@@ -607,8 +607,8 @@ namespace Scripts.World.GameObjects
if (me.GetGoType() == GameObjectTypes.QuestGiver) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ if (me.GetGoType() == GameObjectTypes.QuestGiver) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
player.PrepareQuestMenu(me.GetGUID()); /* return true*/ player.PrepareQuestMenu(me.GetGUID()); /* return true*/
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipFelCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipFelCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipFelCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipFelCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
player.SendGossipMenu(GossipConst.GossipFelCrystalforgeText, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipFelCrystalforgeText, me.GetGUID());
@@ -623,17 +623,17 @@ namespace Scripts.World.GameObjects
{ {
case eTradeskill.GossipActionInfoDef: case eTradeskill.GossipActionInfoDef:
player.CastSpell(player, SpellIds.Create1FlaskOfBeast, false); player.CastSpell(player, SpellIds.Create1FlaskOfBeast, false);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipFelCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipFelCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2);
player.SendGossipMenu(GossipConst.GossipFelCrystalforgeItemTextReturn, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipFelCrystalforgeItemTextReturn, me.GetGUID());
break; break;
case eTradeskill.GossipActionInfoDef + 1: case eTradeskill.GossipActionInfoDef + 1:
player.CastSpell(player, SpellIds.Create5FlaskOfBeast, false); player.CastSpell(player, SpellIds.Create5FlaskOfBeast, false);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipFelCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipFelCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2);
player.SendGossipMenu(GossipConst.GossipFelCrystalforgeItemTextReturn, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipFelCrystalforgeItemTextReturn, me.GetGUID());
break; break;
case eTradeskill.GossipActionInfoDef + 2: case eTradeskill.GossipActionInfoDef + 2:
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipFelCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipFelCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipFelCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipFelCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
player.SendGossipMenu(GossipConst.GossipFelCrystalforgeText, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipFelCrystalforgeText, me.GetGUID());
break; break;
} }
@@ -651,8 +651,8 @@ namespace Scripts.World.GameObjects
if (me.GetGoType() == GameObjectTypes.QuestGiver) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ if (me.GetGoType() == GameObjectTypes.QuestGiver) /* != GAMEOBJECT_TYPE_QUESTGIVER) */
player.PrepareQuestMenu(me.GetGUID()); /* return true*/ player.PrepareQuestMenu(me.GetGUID()); /* return true*/
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipBashirCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipBashirCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipBashirCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipBashirCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeText, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeText, me.GetGUID());
@@ -667,17 +667,17 @@ namespace Scripts.World.GameObjects
{ {
case eTradeskill.GossipActionInfoDef: case eTradeskill.GossipActionInfoDef:
player.CastSpell(player, SpellIds.Create1FlaskOfSorcerer, false); player.CastSpell(player, SpellIds.Create1FlaskOfSorcerer, false);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipBashirCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipBashirCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2);
player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeItemTextReturn, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeItemTextReturn, me.GetGUID());
break; break;
case eTradeskill.GossipActionInfoDef + 1: case eTradeskill.GossipActionInfoDef + 1:
player.CastSpell(player, SpellIds.Create5FlaskOfSorcerer, false); player.CastSpell(player, SpellIds.Create5FlaskOfSorcerer, false);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipBashirCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipBashirCrystalforgeItemReturn, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 2);
player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeItemTextReturn, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeItemTextReturn, me.GetGUID());
break; break;
case eTradeskill.GossipActionInfoDef + 2: case eTradeskill.GossipActionInfoDef + 2:
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipBashirCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipBashirCrystalforgeItem1, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef);
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipBashirCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipBashirCrystalforgeItem5, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeText, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipBashirCrystalforgeText, me.GetGUID());
break; break;
} }
@@ -909,7 +909,7 @@ namespace Scripts.World.GameObjects
QuestStatus status = player.GetQuestStatus(QuestIds.DoingYourDuty); QuestStatus status = player.GetQuestStatus(QuestIds.DoingYourDuty);
if (status == QuestStatus.Incomplete || status == QuestStatus.Complete || status == QuestStatus.Rewarded) if (status == QuestStatus.Incomplete || status == QuestStatus.Complete || status == QuestStatus.Rewarded)
{ {
player.AddGossipItem(GossipOptionIcon.Chat, GossipConst.GossipUseOuthouse, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.AddGossipItem(GossipOptionIcon.None, GossipConst.GossipUseOuthouse, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
player.SendGossipMenu(GossipConst.GossipOuthouseVacant, me.GetGUID()); player.SendGossipMenu(GossipConst.GossipOuthouseVacant, me.GetGUID());
} }
else else
Source/Scripts/World/NpcInnkeeper.cs
+2 -2
View File
@@ -72,7 +72,7 @@ namespace Scripts.World.NpcInnkeeper
localizedEntry = Gossip.LocaleTrickOrTreat0; localizedEntry = Gossip.LocaleTrickOrTreat0;
break; break;
} }
player.AddGossipItem(GossipOptionIcon.Chat, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1); player.AddGossipItem(GossipOptionIcon.None, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInfoDef + 1);
} }
if (me.IsQuestGiver()) if (me.IsQuestGiver())
@@ -116,7 +116,7 @@ namespace Scripts.World.NpcInnkeeper
default: localizedEntry = Gossip.LocaleInnkeeper0; default: localizedEntry = Gossip.LocaleInnkeeper0;
break; break;
} }
player.AddGossipItem(GossipOptionIcon.Interact1, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInn); player.AddGossipItem(GossipOptionIcon.Binder, localizedEntry, eTradeskill.GossipSenderMain, eTradeskill.GossipActionInn);
} }
player.TalkedToCreature(me.GetEntry(), me.GetGUID()); player.TalkedToCreature(me.GetEntry(), me.GetGUID());