Core/PacketIO: Updated to 11.0.0
Port From (https://github.com/TrinityCore/TrinityCore/commit/e59eef5432c7b70679d33f4911c88d0f7d75fd39)
This commit is contained in:
+29
-11
@@ -103,7 +103,7 @@ namespace Game
|
||||
AreaGroupID = fields.Read<uint>(100);
|
||||
LimitTime = fields.Read<uint>(101);
|
||||
AllowableRaces = new(fields.Read<ulong>(102));
|
||||
TreasurePickerID = fields.Read<int>(103);
|
||||
ResetByScheduler = fields.Read<bool>(103);
|
||||
Expansion = fields.Read<int>(104);
|
||||
ManagedWorldStateID = fields.Read<int>(105);
|
||||
QuestSessionBonus = fields.Read<int>(106);
|
||||
@@ -301,7 +301,7 @@ namespace Game
|
||||
}
|
||||
}
|
||||
|
||||
void LoadConditionalConditionalQuestDescription(SQLFields fields)
|
||||
public void LoadConditionalConditionalQuestDescription(SQLFields fields)
|
||||
{
|
||||
Locale locale = fields.Read<string>(4).ToEnum<Locale>();
|
||||
if (!WorldConfig.GetBoolValue(WorldCfg.LoadLocales) && locale != SharedConst.DefaultLocale)
|
||||
@@ -325,7 +325,7 @@ namespace Game
|
||||
ObjectManager.AddLocaleString(fields.Read<string>(3), locale, text.Text);
|
||||
}
|
||||
|
||||
void LoadConditionalConditionalRequestItemsText(SQLFields fields)
|
||||
public void LoadConditionalConditionalRequestItemsText(SQLFields fields)
|
||||
{
|
||||
Locale locale = fields.Read<string>(4).ToEnum<Locale>();
|
||||
if (!WorldConfig.GetBoolValue(WorldCfg.LoadLocales) && locale != SharedConst.DefaultLocale)
|
||||
@@ -350,7 +350,7 @@ namespace Game
|
||||
ObjectManager.AddLocaleString(fields.Read<string>(3), locale, text.Text);
|
||||
}
|
||||
|
||||
void LoadConditionalConditionalOfferRewardText(SQLFields fields)
|
||||
public void LoadConditionalConditionalOfferRewardText(SQLFields fields)
|
||||
{
|
||||
Locale locale = fields.Read<string>(4).ToEnum<Locale>();
|
||||
if (!WorldConfig.GetBoolValue(WorldCfg.LoadLocales) && locale != SharedConst.DefaultLocale)
|
||||
@@ -375,7 +375,7 @@ namespace Game
|
||||
ObjectManager.AddLocaleString(fields.Read<string>(3), locale, text.Text);
|
||||
}
|
||||
|
||||
void LoadConditionalConditionalQuestCompletionLog(SQLFields fields)
|
||||
public void LoadConditionalConditionalQuestCompletionLog(SQLFields fields)
|
||||
{
|
||||
Locale locale = fields.Read<string>(4).ToEnum<Locale>();
|
||||
if (!WorldConfig.GetBoolValue(WorldCfg.LoadLocales) && locale != SharedConst.DefaultLocale)
|
||||
@@ -400,6 +400,11 @@ namespace Game
|
||||
ObjectManager.AddLocaleString(fields.Read<string>(3), locale, text.Text);
|
||||
}
|
||||
|
||||
public void LoadTreasurePickers(SQLFields fields)
|
||||
{
|
||||
TreasurePickerID.Add(fields.Read<int>(1));
|
||||
}
|
||||
|
||||
public uint XPValue(Player player)
|
||||
{
|
||||
return XPValue(player, ContentTuningId, RewardXPDifficulty, RewardXPMultiplier, Expansion);
|
||||
@@ -497,6 +502,17 @@ namespace Game
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool IsMeta()
|
||||
{
|
||||
var questInfo = CliDB.QuestInfoStorage.LookupByKey(QuestInfoID);
|
||||
if (questInfo != null)
|
||||
return (questInfo.Modifiers & 0x800) != 0;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool IsResetByScheduler() { return ResetByScheduler; }
|
||||
|
||||
public void BuildQuestRewards(QuestRewards rewards, Player player)
|
||||
{
|
||||
rewards.ChoiceItemCount = GetRewChoiceItemsCount();
|
||||
@@ -521,7 +537,7 @@ namespace Game
|
||||
rewards.SpellCompletionID = RewardSpell;
|
||||
rewards.SkillLineID = RewardSkillId;
|
||||
rewards.NumSkillUps = RewardSkillPoints;
|
||||
rewards.TreasurePickerID = (uint)TreasurePickerID;
|
||||
rewards.TreasurePickerID = TreasurePickerID;
|
||||
|
||||
for (int i = 0; i < SharedConst.QuestRewardChoicesCount; ++i)
|
||||
{
|
||||
@@ -533,8 +549,8 @@ namespace Game
|
||||
|
||||
for (int i = 0; i < SharedConst.QuestRewardItemCount; ++i)
|
||||
{
|
||||
rewards.ItemID[i] = RewardItemId[i];
|
||||
rewards.ItemQty[i] = RewardItemCount[i];
|
||||
rewards.Items[i].ItemID = RewardItemId[i];
|
||||
rewards.Items[i].ItemQty = RewardItemCount[i];
|
||||
}
|
||||
|
||||
for (int i = 0; i < SharedConst.QuestRewardReputationsCount; ++i)
|
||||
@@ -547,8 +563,8 @@ namespace Game
|
||||
|
||||
for (int i = 0; i < SharedConst.QuestRewardCurrencyCount; ++i)
|
||||
{
|
||||
rewards.CurrencyID[i] = RewardCurrencyId[i];
|
||||
rewards.CurrencyQty[i] = RewardCurrencyCount[i];
|
||||
rewards.Currencies[i].CurrencyID = RewardCurrencyId[i];
|
||||
rewards.Currencies[i].CurrencyQty = RewardCurrencyCount[i];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -783,6 +799,7 @@ namespace Game
|
||||
response.Info.CompleteSoundKitID = SoundTurnIn;
|
||||
response.Info.AreaGroupID = AreaGroupID;
|
||||
response.Info.TimeAllowed = LimitTime;
|
||||
response.Info.ResetByScheduler = IsResetByScheduler();
|
||||
|
||||
response.Write();
|
||||
return response;
|
||||
@@ -894,7 +911,7 @@ namespace Game
|
||||
public uint AreaGroupID;
|
||||
public long LimitTime;
|
||||
public RaceMask<ulong> AllowableRaces { get; set; }
|
||||
public int TreasurePickerID;
|
||||
public List<int> TreasurePickerID = new();
|
||||
public int Expansion;
|
||||
public int ManagedWorldStateID;
|
||||
public int QuestSessionBonus;
|
||||
@@ -908,6 +925,7 @@ namespace Game
|
||||
public string PortraitTurnInText = "";
|
||||
public string PortraitTurnInName = "";
|
||||
public string QuestCompletionLog = "";
|
||||
public bool ResetByScheduler;
|
||||
|
||||
// quest_description_conditional
|
||||
public List<QuestConditionalText> ConditionalQuestDescription = new();
|
||||
|
||||
Reference in New Issue
Block a user