Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Achievements: Implemented CRITERIA_TYPE_UPGRADE_GARRISON_BUILDING

Browse Source
This commit is contained in:
Shauren
2021-06-05 01:06:02 +02:00
parent dd9913d7e3
commit d1ef8f28b0
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Achievements/CriteriaHandler.cpp
View File

@@ -519,6 +519,7 @@ void CriteriaHandler::UpdateCriteria(CriteriaTypes type, uint64 miscValue1 /*= 0
case CRITERIA_TYPE_WIN_ARENA: // This also behaves like CRITERIA_TYPE_WIN_RATED_ARENA
case CRITERIA_TYPE_ON_LOGIN:
case CRITERIA_TYPE_PLACE_GARRISON_BUILDING:
case CRITERIA_TYPE_UPGRADE_GARRISON_BUILDING:
case CRITERIA_TYPE_OWN_BATTLE_PET_COUNT:
case CRITERIA_TYPE_HONOR_LEVEL_REACHED:
case CRITERIA_TYPE_PRESTIGE_REACHED:
@@ -770,7 +771,6 @@ void CriteriaHandler::UpdateCriteria(CriteriaTypes type, uint64 miscValue1 /*= 0
case CRITERIA_TYPE_ENTER_AREA:
case CRITERIA_TYPE_LEAVE_AREA:
case CRITERIA_TYPE_COMPLETE_DUNGEON_ENCOUNTER:
case CRITERIA_TYPE_UPGRADE_GARRISON_BUILDING:
case CRITERIA_TYPE_CONSTRUCT_GARRISON_BUILDING:
case CRITERIA_TYPE_UPGRADE_GARRISON:
case CRITERIA_TYPE_START_GARRISON_MISSION:

2
src/server/game/Garrison/Garrison.cpp
View File

@@ -494,6 +494,8 @@ void Garrison::ActivateBuilding(uint32 garrPlotInstanceId)
WorldPackets::Garrison::GarrisonBuildingActivated buildingActivated;
buildingActivated.GarrPlotInstanceID = garrPlotInstanceId;
_owner->SendDirectMessage(buildingActivated.Write());
_owner->UpdateCriteria(CRITERIA_TYPE_UPGRADE_GARRISON_BUILDING, plot->BuildingInfo.PacketInfo->GarrBuildingID);
}
}
}

11
src/server/game/Garrison/Garrison.h
View File

@@ -33,7 +33,9 @@ struct GarrSiteLevelEntry;
enum GarrisonType
{
GARRISON_TYPE_GARRISON = 2,
GARRISON_TYPE_CLASS_ORDER = 3
GARRISON_TYPE_CLASS_ORDER = 3,
GARRISON_TYPE_WAR_CAMPAIGN = 9,
GARRISON_TYPE_COVENANT = 111
};
enum GarrisonFactionIndex
@@ -54,8 +56,11 @@ enum GarrisonFollowerFlags
enum GarrisonFollowerType
{
FOLLOWER_TYPE_GARRISON = 1,
FOLLOWER_TYPE_SHIPYARD = 2
FOLLOWER_TYPE_GARRISON = 1,
FOLLOWER_TYPE_SHIPYARD = 2,
FOLLOWER_TYPE_CLASS_ORDER = 4,
FOLLOWER_TYPE_WAR_CAMPAIGN = 11,
FOLLOWER_TYPE_COVENANT = 123
};
enum GarrisonAbilityFlags