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

Core/Conditions: Implemented new condition type CONDITION_BATTLE_PET_COUNT to check how many copies of a battle pet are collected

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b5a67cf17dbf18369a2a3370d9d45ca6c56e8cc7)
This commit is contained in:
hondacrx
2022-05-04 10:31:48 -04:00
parent a4dfc261a4
commit 1a2251e58d
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/ConditionConst.cs
+1
View File
@@ -72,6 +72,7 @@ namespace Framework.Constants
Gamemaster = 50, // canBeGM 0 0 true if player is gamemaster (or can be gamemaster)
ObjectEntryGuid = 51, // TypeID entry guid true if object is type TypeID and the entry is 0 or matches entry of the object or matches guid of the object
TypeMask = 52, // TypeMask 0 0 true if object is type object's TypeMask matches provided TypeMask
BattlePetCount = 53, // SpecieId count ComparisonType true if player has `count` of battle pet species
Max
}
Source/Game/Conditions/Condition.cs
+7
View File
@@ -393,6 +393,12 @@ namespace Game.Conditions
}
break;
}
case ConditionTypes.BattlePetCount:
{
if (player != null)
condMeets = MathFunctions.CompareValues((ComparisionType)ConditionValue3, player.GetSession().GetBattlePetMgr().GetPetCount(CliDB.BattlePetSpeciesStorage.LookupByKey(ConditionValue1), player.GetGUID()), ConditionValue2);
break;
}
default:
condMeets = false;
break;
@@ -503,6 +509,7 @@ namespace Game.Conditions
break;
case ConditionTypes.DailyQuestDone:
case ConditionTypes.ObjectiveProgress:
case ConditionTypes.BattlePetCount:
mask |= GridMapTypeMask.Player;
break;
default:
Source/Game/Conditions/ConditionManager.cs
+17
View File
@@ -1724,6 +1724,23 @@ namespace Game
return false;
}
break;
case ConditionTypes.BattlePetCount:
if (!CliDB.BattlePetSpeciesStorage.ContainsKey(cond.ConditionValue1))
{
Log.outError(LogFilter.Sql, $"{cond.ToString(true)} has non existing BattlePet SpeciesId in value1 ({cond.ConditionValue1}), skipped.");
return false;
}
if (cond.ConditionValue2 > SharedConst.DefaultMaxBattlePetsPerSpecies)
{
Log.outError(LogFilter.Sql, $"{cond.ToString(true)} has invalid (greater than {SharedConst.DefaultMaxBattlePetsPerSpecies}) value2 ({cond.ConditionValue2}), skipped.");
return false;
}
if (cond.ConditionValue3 >= (uint)ComparisionType.Max)
{
Log.outError(LogFilter.Sql, $"{cond.ToString(true)} has invalid ComparisionType ({cond.ConditionValue3}), skipped.");
return false;
}
break;
default:
Log.outError(LogFilter.Sql, $"{cond.ToString()} Invalid ConditionType in `condition` table, ignoring.");
return false;