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

Core/Achievements: Update CriteriaType enum

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/0a83f748766c49775d76412d2b98bb9b9dc8c4df)
This commit is contained in:
hondacrx
2021-09-09 14:49:19 -04:00
parent 7a5671ce22
commit c9b8f09fbc
51 changed files with 848 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/AuctionHandler.cs
+4 -4
View File
@@ -137,7 +137,7 @@ namespace Game
{
if (success)
{
GetPlayer().UpdateCriteria(CriteriaTypes.WonAuctions, 1);
GetPlayer().UpdateCriteria(CriteriaType.AuctionsWon, 1);
SendAuctionCommandResult(0, AuctionCommand.PlaceBid, AuctionResult.Ok, throttle.DelayUntilNext);
}
else
@@ -435,7 +435,7 @@ namespace Game
{
if (success)
{
GetPlayer().UpdateCriteria(CriteriaTypes.HighestAuctionBid, placeBid.BidAmount);
GetPlayer().UpdateCriteria(CriteriaType.HighestAuctionBid, placeBid.BidAmount);
SendAuctionCommandResult(placeBid.AuctionID, AuctionCommand.PlaceBid, AuctionResult.Ok, throttle.DelayUntilNext);
}
else
@@ -740,7 +740,7 @@ namespace Game
{
if (success)
{
GetPlayer().UpdateCriteria(CriteriaTypes.CreateAuction, 1);
GetPlayer().UpdateCriteria(CriteriaType.ItemsPostedAtAuction, 1);
SendAuctionCommandResult(auctionId, AuctionCommand.SellItem, AuctionResult.Ok, throttle.DelayUntilNext);
}
else
@@ -886,7 +886,7 @@ namespace Game
{
if (success)
{
GetPlayer().UpdateCriteria(CriteriaTypes.CreateAuction, 1);
GetPlayer().UpdateCriteria(CriteriaType.ItemsPostedAtAuction, 1);
SendAuctionCommandResult(auctionId, AuctionCommand.SellItem, AuctionResult.Ok, throttle.DelayUntilNext);
}
else
Source/Game/Handlers/BankHandler.cs
+1 -1
View File
@@ -140,7 +140,7 @@ namespace Game
GetPlayer().SetBankBagSlotCount((byte)slot);
GetPlayer().ModifyMoney(-price);
GetPlayer().UpdateCriteria(CriteriaTypes.BuyBankSlot);
GetPlayer().UpdateCriteria(CriteriaType.BankSlotsPurchased);
}
public void SendShowBank(ObjectGuid guid)
Source/Game/Handlers/CharacterHandler.cs
+5 -2
View File
@@ -1033,6 +1033,9 @@ namespace Game
m_playerLoading.Clear();
// Handle Login-Achievements (should be handled after loading)
_player.UpdateCriteria(CriteriaType.Login, 1);
Global.ScriptMgr.OnPlayerLogin(pCurrChar);
}
@@ -1357,7 +1360,7 @@ namespace Game
SendPacket(new BarberShopResult(BarberShopResult.ResultEnum.Success));
_player.ModifyMoney(-cost);
_player.UpdateCriteria(CriteriaTypes.GoldSpentAtBarber, (ulong)cost);
_player.UpdateCriteria(CriteriaType.MoneySpentAtBarberShop, (ulong)cost);
if (_player.GetNativeSex() != (Gender)packet.NewSex)
{
@@ -1368,7 +1371,7 @@ namespace Game
_player.SetCustomizations(packet.Customizations);
_player.UpdateCriteria(CriteriaTypes.VisitBarberShop, 1);
_player.UpdateCriteria(CriteriaType.GotHaircut, 1);
_player.SetStandState(UnitStandStateType.Stand);
Source/Game/Handlers/ChatHandler.cs
+1 -1
View File
@@ -593,7 +593,7 @@ namespace Game
Unit unit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Target);
GetPlayer().UpdateCriteria(CriteriaTypes.DoEmote, (uint)packet.EmoteID, 0, 0, unit);
GetPlayer().UpdateCriteria(CriteriaType.DoEmote, (uint)packet.EmoteID, 0, 0, unit);
// Send scripted event call
if (unit)
Source/Game/Handlers/GroupHandler.cs
+2 -2
View File
@@ -394,10 +394,10 @@ namespace Game
switch (packet.RollType)
{
case RollType.Need:
GetPlayer().UpdateCriteria(CriteriaTypes.RollNeed, 1);
GetPlayer().UpdateCriteria(CriteriaType.RollAnyNeed, 1);
break;
case RollType.Greed:
GetPlayer().UpdateCriteria(CriteriaTypes.RollGreed, 1);
GetPlayer().UpdateCriteria(CriteriaType.RollAnyGreed, 1);
break;
}
}
Source/Game/Handlers/ItemHandler.cs
+3 -3
View File
@@ -450,8 +450,8 @@ namespace Game
return;
}
_player.UpdateCriteria(CriteriaTypes.MoneyFromVendors, money);
_player.UpdateCriteria(CriteriaTypes.SoldItemToVendor, 1);
_player.UpdateCriteria(CriteriaType.MoneyEarnedFromSales, money);
_player.UpdateCriteria(CriteriaType.SellItemsToVendors, 1);
if (packet.Amount < pItem.GetCount()) // need split items
{
@@ -1062,7 +1062,7 @@ namespace Game
if (entry != null)
{
GetBattlePetMgr().AddPet(entry.Id, entry.CreatureID, BattlePetMgr.RollPetBreed(entry.Id), BattlePetMgr.GetDefaultPetQuality(entry.Id));
_player.UpdateCriteria(CriteriaTypes.OwnBattlePetCount);
_player.UpdateCriteria(CriteriaType.UniquePetsOwned);
}
GetPlayer().DestroyItem(item.GetBagSlot(), item.GetSlot(), true);
Source/Game/Handlers/LootHandler.cs
+8 -8
View File
@@ -104,9 +104,9 @@ namespace Game
foreach (var resultValue in aeResult.GetByOrder())
{
player.SendNewItem(resultValue.item, resultValue.count, false, false, true);
player.UpdateCriteria(CriteriaTypes.LootItem, resultValue.item.GetEntry(), resultValue.count);
player.UpdateCriteria(CriteriaTypes.LootType, resultValue.item.GetEntry(), resultValue.count, (ulong)resultValue.lootType);
player.UpdateCriteria(CriteriaTypes.LootAnyItem, resultValue.item.GetEntry(), resultValue.count);
player.UpdateCriteria(CriteriaType.LootItem, resultValue.item.GetEntry(), resultValue.count);
player.UpdateCriteria(CriteriaType.GetLootByType, resultValue.item.GetEntry(), resultValue.count, (ulong)resultValue.lootType);
player.UpdateCriteria(CriteriaType.LootAnyItem, resultValue.item.GetEntry(), resultValue.count);
}
}
}
@@ -202,7 +202,7 @@ namespace Game
ulong goldMod = MathFunctions.CalculatePct(goldPerPlayer, pl.GetTotalAuraModifierByMiscValue(AuraType.ModMoneyGain, 1));
pl.ModifyMoney((long)(goldPerPlayer + goldMod));
pl.UpdateCriteria(CriteriaTypes.LootMoney, goldPerPlayer);
pl.UpdateCriteria(CriteriaType.MoneyLootedFromCreatures, goldPerPlayer);
LootMoneyNotify packet = new();
packet.Money = goldPerPlayer;
@@ -216,7 +216,7 @@ namespace Game
ulong goldMod = MathFunctions.CalculatePct(loot.gold, player.GetTotalAuraModifierByMiscValue(AuraType.ModMoneyGain, 1));
player.ModifyMoney((long)(loot.gold + goldMod));
player.UpdateCriteria(CriteriaTypes.LootMoney, loot.gold);
player.UpdateCriteria(CriteriaType.MoneyLootedFromCreatures, loot.gold);
LootMoneyNotify packet = new();
packet.Money = loot.gold;
@@ -551,9 +551,9 @@ namespace Game
foreach (var resultValue in aeResult.GetByOrder())
{
target.SendNewItem(resultValue.item, resultValue.count, false, false, true);
target.UpdateCriteria(CriteriaTypes.LootItem, resultValue.item.GetEntry(), resultValue.count);
target.UpdateCriteria(CriteriaTypes.LootType, resultValue.item.GetEntry(), resultValue.count, (ulong)resultValue.lootType);
target.UpdateCriteria(CriteriaTypes.LootAnyItem, resultValue.item.GetEntry(), resultValue.count);
target.UpdateCriteria(CriteriaType.LootItem, resultValue.item.GetEntry(), resultValue.count);
target.UpdateCriteria(CriteriaType.GetLootByType, resultValue.item.GetEntry(), resultValue.count, (ulong)resultValue.lootType);
target.UpdateCriteria(CriteriaType.LootAnyItem, resultValue.item.GetEntry(), resultValue.count);
}
}
Source/Game/Handlers/MailHandler.cs
+1 -1
View File
@@ -266,7 +266,7 @@ namespace Game
player.SendMailResult(0, MailResponseType.Send, MailResponseResult.Ok);
player.ModifyMoney(-reqmoney);
player.UpdateCriteria(CriteriaTypes.GoldSpentForMail, cost);
player.UpdateCriteria(CriteriaType.MoneySpentOnPostage, cost);
bool needItemDelay = false;
Source/Game/Handlers/QuestHandler.cs
+1 -1
View File
@@ -472,7 +472,7 @@ namespace Game
GetPlayer().SetQuestSlot(packet.Entry, 0);
GetPlayer().UpdateCriteria(CriteriaTypes.QuestAbandoned, 1);
GetPlayer().UpdateCriteria(CriteriaType.AbandonAnyQuest, 1);
}
}
Source/Game/Handlers/SpellHandler.cs
+1 -1
View File
@@ -264,7 +264,7 @@ namespace Game
if (go.GetAI().GossipHello(GetPlayer()))
return;
GetPlayer().UpdateCriteria(CriteriaTypes.UseGameobject, go.GetEntry());
GetPlayer().UpdateCriteria(CriteriaType.UseGameobject, go.GetEntry());
}
}