Core/Achievements: Implemented CRITERIA_TYPE_UPGRADE_GARRISON_BUILDING
Port From (https://github.com/TrinityCore/TrinityCore/commit/d1ef8f28b01507286a6f876913c3242d0743ebef)
This commit is contained in:
@@ -36,7 +36,10 @@ namespace Framework.Constants
|
||||
public enum GarrisonFollowerType
|
||||
{
|
||||
Garrison = 1,
|
||||
Shipyard = 2
|
||||
Shipyard = 2,
|
||||
ClassOrder = 4,
|
||||
WarCampaign = 11,
|
||||
Covenant = 123
|
||||
}
|
||||
|
||||
public enum GarrisonAbilityFlags : ushort
|
||||
@@ -159,6 +162,8 @@ namespace Framework.Constants
|
||||
public enum GarrisonType
|
||||
{
|
||||
Garrison = 2,
|
||||
ClassOrder = 3
|
||||
ClassOrder = 3,
|
||||
WarCampaign = 9,
|
||||
Covenant = 111
|
||||
}
|
||||
}
|
||||
|
||||
@@ -138,6 +138,7 @@ namespace Game.Achievements
|
||||
case CriteriaTypes.WinArena: // This also behaves like ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA
|
||||
case CriteriaTypes.OnLogin:
|
||||
case CriteriaTypes.PlaceGarrisonBuilding:
|
||||
case CriteriaTypes.UpgradeGarrisonBuilding:
|
||||
case CriteriaTypes.OwnBattlePetCount:
|
||||
case CriteriaTypes.HonorLevelReached:
|
||||
case CriteriaTypes.PrestigeReached:
|
||||
@@ -399,7 +400,6 @@ namespace Game.Achievements
|
||||
case CriteriaTypes.EnterArea:
|
||||
case CriteriaTypes.LeaveArea:
|
||||
case CriteriaTypes.CompleteDungeonEncounter:
|
||||
case CriteriaTypes.UpgradeGarrisonBuilding:
|
||||
case CriteriaTypes.ConstructGarrisonBuilding:
|
||||
case CriteriaTypes.UpgradeGarrison:
|
||||
case CriteriaTypes.StartGarrisonMission:
|
||||
@@ -1761,7 +1761,7 @@ namespace Game.Achievements
|
||||
return false;
|
||||
break;
|
||||
case CriteriaAdditionalCondition.Mentor: // 123
|
||||
if (!referencePlayer.HasPlayerFlag(PlayerFlags.Mentor))
|
||||
if (!referencePlayer.HasPlayerFlag(PlayerFlags.Timewalking))
|
||||
return false;
|
||||
break;
|
||||
case CriteriaAdditionalCondition.GarrisonLevelAbove: // 126
|
||||
|
||||
@@ -476,6 +476,8 @@ namespace Game.Garrisons
|
||||
GarrisonBuildingActivated buildingActivated = new();
|
||||
buildingActivated.GarrPlotInstanceID = garrPlotInstanceId;
|
||||
_owner.SendPacket(buildingActivated);
|
||||
|
||||
_owner.UpdateCriteria(CriteriaTypes.UpgradeGarrisonBuilding, plot.BuildingInfo.PacketInfo.Value.GarrBuildingID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user