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

Core/DataStores: Fixed db2 structures after 7.3.5

Browse Source
This commit is contained in:
hondacrx
2018-03-13 15:43:03 -04:00
parent 2199e07955
commit 0ab3b8e8cd
97 changed files with 3139 additions and 1707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Achievements/AchievementManager.cs
+4 -4
View File
@@ -69,7 +69,7 @@ namespace Game.Achievements
return false;
}
if (achievement.MapID != -1 && referencePlayer.GetMapId() != achievement.MapID)
if (achievement.InstanceID != -1 && referencePlayer.GetMapId() != achievement.InstanceID)
{
Log.outTrace(LogFilter.Achievement, "CanUpdateCriteriaTree: (Id: {0} Type {1} Achievement {2}) Wrong map",
criteria.ID, criteria.Entry.Type, achievement.Id);
@@ -157,14 +157,14 @@ namespace Game.Achievements
// Oddly, the target count is NOT contained in the achievement, but in each individual criteria
if (entry.Flags.HasAnyFlag(AchievementFlags.Summ))
{
ulong progress = 0;
long progress = 0;
CriteriaManager.WalkCriteriaTree(tree, criteriaTree =>
{
if (criteriaTree.Criteria != null)
{
CriteriaProgress criteriaProgress = this.GetCriteriaProgress(criteriaTree.Criteria);
if (criteriaProgress != null)
progress += criteriaProgress.Counter;
progress += (long)criteriaProgress.Counter;
}
});
return progress >= tree.Entry.Amount;
@@ -1092,7 +1092,7 @@ namespace Game.Achievements
// Once Bitten, Twice Shy (10 player) - Icecrown Citadel
AchievementRecord achievement1 = CliDB.AchievementStorage.LookupByKey(4539);
if (achievement1 != null)
achievement1.MapID = 631; // Correct map requirement (currently has Ulduar); 6.0.3 note - it STILL has ulduar requirement
achievement1.InstanceID = 631; // Correct map requirement (currently has Ulduar); 6.0.3 note - it STILL has ulduar requirement
Log.outInfo(LogFilter.ServerLoading, "Loaded {0} achievement references in {1} ms.", count, Time.GetMSTimeDiffToNow(oldMSTime));
}
Source/Game/Achievements/CriteriaHandler.cs
+3 -3
View File
@@ -1181,7 +1181,7 @@ namespace Game.Achievements
if (reqType == 0)
return true;
uint reqValue = tree.Entry.Asset[0];
uint reqValue = tree.Entry.Asset;
switch ((CriteriaAdditionalCondition)reqType)
{
case CriteriaAdditionalCondition.ItemLevel: // 3
@@ -1485,8 +1485,8 @@ namespace Game.Achievements
Dictionary<uint, ScenarioStepRecord> scenarioCriteriaTreeIds = new Dictionary<uint, ScenarioStepRecord>();
foreach (ScenarioStepRecord scenarioStep in CliDB.ScenarioStepStorage.Values)
{
if (scenarioStep.CriteriaTreeID != 0)
scenarioCriteriaTreeIds[scenarioStep.CriteriaTreeID] = scenarioStep;
if (scenarioStep.CriteriaTreeId != 0)
scenarioCriteriaTreeIds[scenarioStep.CriteriaTreeId] = scenarioStep;
}
Dictionary<uint /*criteriaTreeID*/, QuestObjective> questObjectiveCriteriaTreeIds = new Dictionary<uint, QuestObjective>();