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

Refactoring of BNetServer

Browse Source
This commit is contained in:
hondacrx
2020-07-12 00:06:43 -04:00
parent 4164384b72
commit 581d077acd
318 changed files with 2046 additions and 4694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+3 -3
View File
@@ -23,7 +23,7 @@ using Game.DataStorage;
using Game.Groups;
using Game.Loots;
using Game.Maps;
using Game.Network.Packets;
using Game.Networking.Packets;
using Game.Spells;
using System;
using System.Collections.Generic;
@@ -2561,9 +2561,9 @@ namespace Game.Entities
return vCount.count;
}
public override string GetName(LocaleConstant locale = LocaleConstant.enUS)
public override string GetName(Locale locale = Locale.enUS)
{
if (locale != LocaleConstant.enUS)
if (locale != Locale.enUS)
{
CreatureLocale cl = Global.ObjectMgr.GetCreatureLocale(GetEntry());
if (cl != null)
Source/Game/Entities/Creature/CreatureData.cs
+5 -5
View File
@@ -20,7 +20,7 @@ using Framework.Constants;
using System;
using System.Collections.Generic;
using Framework.Dynamic;
using Game.Network.Packets;
using Game.Networking.Packets;
namespace Game.Entities
{
@@ -309,10 +309,10 @@ namespace Game.Entities
public class CreatureLocale
{
public StringArray Name = new StringArray((int)LocaleConstant.Total);
public StringArray NameAlt = new StringArray((int)LocaleConstant.Total);
public StringArray Title = new StringArray((int)LocaleConstant.Total);
public StringArray TitleAlt = new StringArray((int)LocaleConstant.Total);
public StringArray Name = new StringArray((int)Locale.Total);
public StringArray NameAlt = new StringArray((int)Locale.Total);
public StringArray Title = new StringArray((int)Locale.Total);
public StringArray TitleAlt = new StringArray((int)Locale.Total);
}
public struct EquipmentItem
Source/Game/Entities/Creature/Gossip.cs
+22 -22
View File
@@ -21,7 +21,7 @@ using Framework.GameMath;
using Game.Conditions;
using Game.DataStorage;
using Game.Entities;
using Game.Network.Packets;
using Game.Networking.Packets;
using Game.Spells;
using System.Collections.Generic;
@@ -103,7 +103,7 @@ namespace Game.Misc
strBoxText = item.BoxText;
// Check need of localization.
if (GetLocale() != LocaleConstant.enUS)
if (GetLocale() != Locale.enUS)
{
if (optionBroadcastText == null)
{
@@ -181,8 +181,8 @@ namespace Game.Misc
public void SetMenuId(uint menu_id) { _menuId = menu_id; }
public uint GetMenuId() { return _menuId; }
public void SetLocale(LocaleConstant locale) { _locale = locale; }
LocaleConstant GetLocale() { return _locale; }
public void SetLocale(Locale locale) { _locale = locale; }
Locale GetLocale() { return _locale; }
public int GetMenuItemCount()
{
@@ -212,7 +212,7 @@ namespace Game.Misc
Dictionary<uint, GossipMenuItem> _menuItems = new Dictionary<uint, GossipMenuItem>();
Dictionary<uint, GossipMenuItemData> _menuItemData = new Dictionary<uint, GossipMenuItemData>();
uint _menuId;
LocaleConstant _locale;
Locale _locale;
}
public class InteractionData
@@ -284,8 +284,8 @@ namespace Game.Misc
text.Repeatable = quest.IsRepeatable();
text.QuestTitle = quest.LogTitle;
LocaleConstant locale = _session.GetSessionDbLocaleIndex();
if (locale != LocaleConstant.enUS)
Locale locale = _session.GetSessionDbLocaleIndex();
if (locale != Locale.enUS)
{
QuestTemplateLocale localeData = Global.ObjectMgr.GetQuestLocale(quest.Id);
if (localeData != null)
@@ -319,8 +319,8 @@ namespace Game.Misc
packet.Id = pointOfInterest.Id;
packet.Name = pointOfInterest.Name;
LocaleConstant locale = _session.GetSessionDbLocaleIndex();
if (locale != LocaleConstant.enUS)
Locale locale = _session.GetSessionDbLocaleIndex();
if (locale != Locale.enUS)
{
PointOfInterestLocale localeData = Global.ObjectMgr.GetPointOfInterestLocale(id);
if (localeData != null)
@@ -338,7 +338,7 @@ namespace Game.Misc
public void SendQuestGiverQuestListMessage(WorldObject questgiver)
{
ObjectGuid guid = questgiver.GetGUID();
LocaleConstant localeConstant = _session.GetSessionDbLocaleIndex();
Locale localeConstant = _session.GetSessionDbLocaleIndex();
QuestGiverQuestListMessage questList = new QuestGiverQuestListMessage();
questList.QuestGiverGUID = guid;
@@ -350,7 +350,7 @@ namespace Game.Misc
questList.GreetEmoteType = questGreeting.EmoteType;
questList.Greeting = questGreeting.Text;
if (localeConstant != LocaleConstant.enUS)
if (localeConstant != Locale.enUS)
{
QuestGreetingLocale questGreetingLocale = Global.ObjectMgr.GetQuestGreetingLocale(questgiver.GetTypeId(), questgiver.GetEntry());
if (questGreetingLocale != null)
@@ -368,7 +368,7 @@ namespace Game.Misc
{
string title = quest.LogTitle;
if (localeConstant != LocaleConstant.enUS)
if (localeConstant != Locale.enUS)
{
QuestTemplateLocale localeData = Global.ObjectMgr.GetQuestLocale(quest.Id);
if (localeData != null)
@@ -412,8 +412,8 @@ namespace Game.Misc
packet.PortraitTurnInText = quest.PortraitTurnInText;
packet.PortraitTurnInName = quest.PortraitTurnInName;
LocaleConstant locale = _session.GetSessionDbLocaleIndex();
if (locale != LocaleConstant.enUS)
Locale locale = _session.GetSessionDbLocaleIndex();
if (locale != Locale.enUS)
{
QuestTemplateLocale localeData = Global.ObjectMgr.GetQuestLocale(quest.Id);
if (localeData != null)
@@ -479,8 +479,8 @@ namespace Game.Misc
QueryQuestInfoResponse queryQuestInfoResponse = quest.QueryData;
LocaleConstant loc = _session.GetSessionDbLocaleIndex();
if (loc != LocaleConstant.enUS)
Locale loc = _session.GetSessionDbLocaleIndex();
if (loc != Locale.enUS)
{
QuestTemplateLocale questTemplateLocale = Global.ObjectMgr.GetQuestLocale(queryQuestInfoResponse.QuestID);
if (questTemplateLocale != null)
@@ -519,8 +519,8 @@ namespace Game.Misc
packet.PortraitTurnInText = quest.PortraitTurnInText;
packet.PortraitTurnInName = quest.PortraitTurnInName;
LocaleConstant locale = _session.GetSessionDbLocaleIndex();
if (locale != LocaleConstant.enUS)
Locale locale = _session.GetSessionDbLocaleIndex();
if (locale != Locale.enUS)
{
QuestTemplateLocale localeData = Global.ObjectMgr.GetQuestLocale(quest.Id);
if (localeData != null)
@@ -583,8 +583,8 @@ namespace Game.Misc
packet.QuestTitle = quest.LogTitle;
packet.CompletionText = quest.RequestItemsText;
LocaleConstant locale = _session.GetSessionDbLocaleIndex();
if (locale != LocaleConstant.enUS)
Locale locale = _session.GetSessionDbLocaleIndex();
if (locale != Locale.enUS)
{
QuestTemplateLocale localeData = Global.ObjectMgr.GetQuestLocale(quest.Id);
if (localeData != null)
@@ -747,7 +747,7 @@ namespace Game.Misc
public class PageTextLocale
{
public StringArray Text = new StringArray((int)LocaleConstant.Total);
public StringArray Text = new StringArray((int)Locale.Total);
}
public class GossipMenuItems
@@ -781,7 +781,7 @@ namespace Game.Misc
public class PointOfInterestLocale
{
public StringArray Name = new StringArray((int)LocaleConstant.Total);
public StringArray Name = new StringArray((int)Locale.Total);
}
public class GossipMenus
Source/Game/Entities/Creature/Trainer.cs
+7 -7
View File
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using Framework.Constants;
using Game.Network.Packets;
using Game.Networking.Packets;
using Game.Spells;
namespace Game.Entities
@@ -26,10 +26,10 @@ namespace Game.Entities
_type = type;
_spells = spells;
_greeting[(int)LocaleConstant.enUS] = greeting;
_greeting[(int)Locale.enUS] = greeting;
}
public void SendSpells(Creature npc, Player player, LocaleConstant locale)
public void SendSpells(Creature npc, Player player, Locale locale)
{
float reputationDiscount = player.GetReputationPriceDiscount(npc);
@@ -171,15 +171,15 @@ namespace Game.Entities
player.SendPacket(trainerBuyFailed);
}
string GetGreeting(LocaleConstant locale)
string GetGreeting(Locale locale)
{
if (_greeting[(int)locale].IsEmpty())
return _greeting[(int)LocaleConstant.enUS];
return _greeting[(int)Locale.enUS];
return _greeting[(int)locale];
}
public void AddGreetingLocale(LocaleConstant locale, string greeting)
public void AddGreetingLocale(Locale locale, string greeting)
{
_greeting[(int)locale] = greeting;
}
@@ -187,6 +187,6 @@ namespace Game.Entities
uint _id;
TrainerType _type;
List<TrainerSpell> _spells;
Array<string> _greeting = new Array<string>((int)LocaleConstant.Total);
Array<string> _greeting = new Array<string>((int)Locale.Total);
}
}