Skip to content

Commit

Permalink
Core/Garrisons Fixes (#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
@soulfrost @Traesh
soulfrost authored and Traesh committed Aug 19, 2018
1 parent 5f45885 commit 093f3c6
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 75 deletions.
71 changes: 34 additions & 37 deletions src/server/game/Garrison/Garrison.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#include "ScriptMgr.h"
#include "VehicleDefines.h"

Garrison::Garrison(Player* owner) : _owner(owner), _siteLevel(nullptr), _followerActivationsRemainingToday(1)
Garrison::Garrison(Player* owner) : _garrisonType(), _owner(owner), _siteLevel(nullptr), _followerActivationsRemainingToday(1)
{
_timers[GUPDATE_MISSIONS_DISTRIBUTION].SetInterval(MINUTE*IN_MILLISECONDS);
_timers[GUPDATE_MISSIONS_DISTRIBUTION].SetInterval(MINUTE * IN_MILLISECONDS);
}

bool Garrison::Create(uint32 garrSiteId)
Expand All @@ -56,12 +56,12 @@ bool Garrison::Create(uint32 garrSiteId)
void Garrison::Update(uint32 const diff)
{
// Update the different timers
for (uint8 i = 0; i < GUPDATE_COUNT; ++i)
for (auto& _timer : _timers)
{
if (_timers[i].GetCurrent() >= 0)
_timers[i].Update(diff);
if (_timer.GetCurrent() >= 0)
_timer.Update(diff);
else
_timers[i].SetCurrent(0);
_timer.SetCurrent(0);
}

if (_timers[GUPDATE_MISSIONS_DISTRIBUTION].Passed())
Expand Down Expand Up @@ -314,7 +314,7 @@ void Garrison::SaveToDB(SQLTransaction& trans)

void Garrison::DeleteFromDB(SQLTransaction& trans)
{
Garrison::DeleteFromDB(trans, _owner->GetGUID().GetCounter(), GetType());
DeleteFromDB(trans, _owner->GetGUID().GetCounter(), GetType());
}

void Garrison::DeleteFromDB(SQLTransaction& trans, ObjectGuid::LowType guid, GarrisonType garrType)
Expand Down Expand Up @@ -391,7 +391,7 @@ void Garrison::AI_Destroy()
void Garrison::AddFollower(uint32 garrFollowerId)
{
WorldPackets::Garrison::GarrisonAddFollowerResult addFollowerResult;
addFollowerResult.GarrTypeID = (int32)_garrisonType;
addFollowerResult.GarrTypeID = _garrisonType;
GarrFollowerEntry const* followerEntry = sGarrFollowerStore.LookupEntry(garrFollowerId);
if (_followerIds.count(garrFollowerId) || !followerEntry)
{
Expand All @@ -409,12 +409,7 @@ void Garrison::AddFollower(uint32 garrFollowerId)
follower.PacketInfo.FollowerLevel = followerEntry->FollowerLevel;
follower.PacketInfo.ItemLevelWeapon = followerEntry->ItemLevelWeapon;
follower.PacketInfo.ItemLevelArmor = followerEntry->ItemLevelArmor;
follower.PacketInfo.Xp = 0;
follower.PacketInfo.CurrentBuildingID = 0;
follower.PacketInfo.CurrentMissionID = 0;
follower.PacketInfo.AbilityID = sGarrisonMgr.RollFollowerAbilities(garrFollowerId, followerEntry, follower.PacketInfo.Quality, GetFaction(), true);
follower.PacketInfo.FollowerStatus = 0;

addFollowerResult.Follower = follower.PacketInfo;
_owner->SendDirectMessage(addFollowerResult.Write());

Expand Down Expand Up @@ -483,11 +478,7 @@ void Garrison::AddMission(uint32 garrMissionId)
mission.PacketInfo.MissionRecID = garrMissionId;
mission.PacketInfo.OfferTime = time(nullptr);
mission.PacketInfo.OfferDuration = missionEntry->OfferTime;
mission.PacketInfo.StartTime = time_t(2254525440);
mission.PacketInfo.TravelDuration = missionEntry->TravelTime;
mission.PacketInfo.MissionDuration = missionEntry->Duration;
mission.PacketInfo.MissionState = 0;
mission.PacketInfo.SuccessChance = 0;
mission.PacketInfo.MissionState = GarrisonMission::State::Offered;
mission.PacketInfo.Unknown2 = 1;

// TODO : Generate rewards for mission
Expand All @@ -504,7 +495,7 @@ void Garrison::AddMission(uint32 garrMissionId)
WorldPackets::Garrison::GarrisonAddMissionResult garrisonAddMissionResult;
garrisonAddMissionResult.GarrType = GetType();
garrisonAddMissionResult.Result = GarrisonMission::Result::Success;
garrisonAddMissionResult.State = GarrisonMission::State::Available;
garrisonAddMissionResult.State = GarrisonMission::State::Offered;
garrisonAddMissionResult.Mission = mission.PacketInfo;
garrisonAddMissionResult.Rewards = mission.Rewards;
garrisonAddMissionResult.BonusRewards = mission.BonusRewards;
Expand Down Expand Up @@ -541,7 +532,7 @@ void Garrison::DeleteMission(uint64 dbId)

std::vector<Garrison::Follower*> Garrison::GetMissionFollowers(uint32 garrMissionId)
{
std::vector<Garrison::Follower*> missionFollowers;
std::vector<Follower*> missionFollowers;
for (auto followerItr : _followers)
if (followerItr.second.PacketInfo.CurrentMissionID == garrMissionId)
missionFollowers.push_back(&followerItr.second);
Expand All @@ -564,7 +555,7 @@ std::pair<std::vector<GarrMissionEntry const*>, std::vector<double>> Garrison::G

uint32 const maxFollowerlevel = GetMaxFollowerLevel();
uint32 const activeFolowerCount = GetActiveFollowersCount();
uint32 const averageFollowerILevel = GetAverageFollowerILevel();
//uint32 const averageFollowerILevel = GetAverageFollowerILevel();

for (uint32 i = 0; i < sGarrMissionStore.GetNumRows(); ++i)
{
Expand All @@ -589,8 +580,8 @@ std::pair<std::vector<GarrMissionEntry const*>, std::vector<double>> Garrison::G
if (missionEntry->RequiredFollowersCount > activeFolowerCount)
continue;

if (missionEntry->RequiredItemLevel > averageFollowerILevel)
continue;
//if (missionEntry->RequiredItemLevel > averageFollowerILevel)
// continue;

uint32 requiredClass = sGarrisonMgr.GetClassByMissionType(missionEntry->MissionType);
if (requiredClass != CLASS_NONE && requiredClass != _owner->getClass())
Expand All @@ -601,7 +592,7 @@ std::pair<std::vector<GarrMissionEntry const*>, std::vector<double>> Garrison::G
continue;

double weight = 100.0;
if (missionEntry->Flags & GarrisonMission::Flags::Rare)
if (missionEntry->Flags & GarrisonMission::Flags::isRare)
weight = 25.0;

availableMissions.push_back(missionEntry);
Expand All @@ -614,12 +605,10 @@ std::pair<std::vector<GarrMissionEntry const*>, std::vector<double>> Garrison::G
void Garrison::GenerateMissions()
{
uint32 maxMissionCount = ceil(GetActiveFollowersCount() * GARRISON_MISSION_DISTRIB_FOLLOWER_COEFF);

if (GetMissions().size() >= maxMissionCount)
return;

uint32 missionToAddCount = urand(0, maxMissionCount - GetMissions().size());

if (!missionToAddCount)
return;

Expand Down Expand Up @@ -653,31 +642,40 @@ void Garrison::StartMission(uint32 garrMissionId, std::vector<uint64 /*DbID*/> F
if (!missionEntry)
return SendStartMissionResult(false);

Garrison::Mission* mission = GetMissionByID(missionEntry->ID);
Mission* mission = GetMissionByID(missionEntry->ID);
if (!mission)
return SendStartMissionResult(false);

if (missionEntry->CurrencyCost && !_owner->HasCurrency(missionEntry->CurrencyID, missionEntry->CurrencyCost))
return SendStartMissionResult(false); // GARRISON_ERROR_NOT_ENOUGH_CURRENCY

mission->PacketInfo.TravelDuration = missionEntry->TravelTime;
mission->PacketInfo.MissionDuration = missionEntry->Duration;
mission->PacketInfo.StartTime = time(nullptr);
mission->PacketInfo.MissionState = GarrisonMission::State::InProgress;
mission->PacketInfo.SuccessChance = sGarrisonMgr.GetMissionSuccessChance(this, mission->PacketInfo.MissionRecID);

for (uint64 followerDbID : Followers)
{
Garrison::Follower* follower = GetFollower(followerDbID);

Follower* follower = GetFollower(followerDbID);
if (!follower)
return SendStartMissionResult(false);

if (follower->PacketInfo.CurrentMissionID != 0 || follower->PacketInfo.CurrentBuildingID != 0)
return SendStartMissionResult(false);

if (follower->PacketInfo.FollowerStatus == FOLLOWER_STATUS_INACTIVE)
return SendStartMissionResult(false);

follower->PacketInfo.CurrentMissionID = missionEntry->ID;
}

_owner->ModifyCurrency(missionEntry->CurrencyID, -static_cast<int32>(missionEntry->CurrencyCost));

SendStartMissionResult(true, mission, &Followers);
}

void Garrison::SendStartMissionResult(bool success, Garrison::Mission* mission /*= nullptr*/, std::vector<uint64 /*DbID*/>* Followers /*= nullptr*/)
void Garrison::SendStartMissionResult(bool success, Mission* mission /*= nullptr*/, std::vector<uint64 /*DbID*/>* Followers /*= nullptr*/)
{
WorldPackets::Garrison::GarrisonStartMissionResult garrisonStartMissionResult;

Expand All @@ -701,7 +699,7 @@ void Garrison::CompleteMission(uint32 garrMissionId)
if (!missionEntry)
return;

Garrison::Mission* mission = GetMissionByID(missionEntry->ID);
Mission* mission = GetMissionByID(missionEntry->ID);
if (!mission)
return;

Expand All @@ -710,12 +708,11 @@ void Garrison::CompleteMission(uint32 garrMissionId)

if (canComplete)
{
std::vector<Garrison::Follower*> followers = GetMissionFollowers(missionEntry->ID);
if (followers.empty())
if (GetMissionFollowers(missionEntry->ID).empty())
return;

success = roll_chance_i(mission->PacketInfo.SuccessChance);
mission->PacketInfo.MissionState = success ? GarrisonMission::State::CompleteSuccess : GarrisonMission::State::CompleteFailed;
mission->PacketInfo.MissionState = success ? GarrisonMission::State::Completed : GarrisonMission::State::Reward2Claimed;
}

WorldPackets::Garrison::GarrisonCompleteMissionResult garrisonCompleteMissionResult;
Expand All @@ -731,7 +728,7 @@ void Garrison::CalculateMissonBonusRoll(uint32 garrMissionId)
if (!missionEntry)
return;

Garrison::Mission* mission = GetMissionByID(missionEntry->ID);
Mission* mission = GetMissionByID(missionEntry->ID);
if (!mission)
return;

Expand Down Expand Up @@ -767,8 +764,8 @@ void Garrison::RewardMission(Mission* mission, bool withOvermaxReward)

if (reward.FollowerXP)
{
std::vector<Garrison::Follower*> followers = GetMissionFollowers(mission->PacketInfo.MissionRecID);
for (Garrison::Follower* follower : followers)
std::vector<Follower*> followers = GetMissionFollowers(mission->PacketInfo.MissionRecID);
for (Follower* follower : followers)
follower->EarnXP(GetOwner(), reward.FollowerXP);
}

Expand Down
21 changes: 13 additions & 8 deletions src/server/game/Garrison/GarrisonConstants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ enum GarrisonSite
GARRISON_SITE_CLASS_HALL_HORDE = 163,
};

enum GarrisonType
enum GarrisonType : int32
{
GARRISON_TYPE_NONE = 0,
GARRISON_TYPE_GARRISON = 2,
Expand Down Expand Up @@ -212,10 +212,13 @@ namespace GarrisonMission
{
enum State
{
Available = 0,
InProgress = 1,
CompleteSuccess = 2,
CompleteFailed = 5
Offered = 0,
InProgress = 1,
Completed = 2,
OvermaxRewardPending = 3,
Reward1Claimed = 4,
Reward2Claimed = 5,
Reward3Claimed = 6,
};

enum Type
Expand Down Expand Up @@ -284,9 +287,11 @@ namespace GarrisonMission

enum Flags
{
Rare = 0x01,
Unk2 = 0x02,
Exhausting = 0x04
isRare = 0x01,
isElite = 0x02,
appliesFatigue = 0x04,
alwaysFail = 0x08,
isZoneSupport = 0x10,
};

enum BonusRollResults
Expand Down
8 changes: 4 additions & 4 deletions src/server/game/Garrison/GarrisonMgr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,9 @@ uint32 GarrisonMgr::GetClassByMissionType(uint32 missionType)
case GarrisonMission::Type::ArtifactPriest: return CLASS_PRIEST;
case GarrisonMission::Type::ArtifactDeathKnight: return CLASS_DEATH_KNIGHT;
case GarrisonMission::Type::ArtifactWarrior: return CLASS_WARRIOR;
default:
return CLASS_NONE;
}

return CLASS_NONE;
}

uint32 GarrisonMgr::GetFactionByMissionType(uint32 missionType)
Expand All @@ -773,9 +773,9 @@ uint32 GarrisonMgr::GetFactionByMissionType(uint32 missionType)
{
case GarrisonMission::Type::ZoneSupportAlliance: return TEAM_ALLIANCE;
case GarrisonMission::Type::ZoneSupportHorde: return TEAM_HORDE;
default:
return TEAM_OTHER;
}

return TEAM_OTHER;
}

void GarrisonMgr::InitializeDbIdSequences()
Expand Down
14 changes: 7 additions & 7 deletions src/server/game/Garrison/WodGarrison/WodGarrison.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,7 @@ bool WodGarrison::IsAllowedArea(AreaTableEntry const* area) const
break;
}

if (area->Flags[1] & AREA_FLAG_GARRISON && area->ContinentID == MAP_DRAENOR)
return true;

return false;
return area->Flags[1] & AREA_FLAG_GARRISON && area->ContinentID == MAP_DRAENOR;
}

std::vector<WodGarrison::Plot*> WodGarrison::GetPlots()
Expand Down Expand Up @@ -466,6 +463,11 @@ void WodGarrison::ActivateBuilding(uint32 garrPlotInstanceId)
}
}

std::unordered_set<uint32> const& WodGarrison::GetKnownBuildings() const
{
return _knownBuildings;
}

void WodGarrison::SendBuildingLandmarks(Player* receiver) const
{
WorldPackets::Garrison::GarrisonBuildingLandmarks buildingLandmarks;
Expand Down Expand Up @@ -508,13 +510,11 @@ GarrisonError WodGarrison::CheckBuildingPlacement(uint32 garrPlotInstanceId, uin
else // Building is built as a quest reward
return GARRISON_ERROR_INVALID_BUILDINGID;

// Check all plots to find if we already have this building
GarrBuildingEntry const* existingBuilding;
for (auto const& p : _plots)
{
if (p.second.BuildingInfo.PacketInfo)
{
existingBuilding = sGarrBuildingStore.AssertEntry(p.second.BuildingInfo.PacketInfo->GarrBuildingID);
GarrBuildingEntry const* existingBuilding = sGarrBuildingStore.AssertEntry(p.second.BuildingInfo.PacketInfo->GarrBuildingID);
if (existingBuilding->BuildingType == building->BuildingType)
if (p.first != garrPlotInstanceId || existingBuilding->UpgradeLevel + 1 != building->UpgradeLevel) // check if its an upgrade in same plot
return GARRISON_ERROR_BUILDING_EXISTS;
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Garrison/WodGarrison/WodGarrison.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class TC_GAME_API WodGarrison : public Garrison
void PlaceBuilding(uint32 garrPlotInstanceId, uint32 garrBuildingId);
void CancelBuildingConstruction(uint32 garrPlotInstanceId);
void ActivateBuilding(uint32 garrPlotInstanceId);
std::unordered_set<uint32 /*garrBuildingId*/> const& GetKnownBuildings() const { return _knownBuildings; }
std::unordered_set<uint32 /*garrBuildingId*/> const& GetKnownBuildings() const;

void SendBuildingLandmarks(Player* receiver) const;

Expand Down
4 changes: 2 additions & 2 deletions src/server/game/Server/Packets/GarrisonPackets.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,10 @@ WorldPacket const* WorldPackets::Garrison::GarrisonAddMissionResult::Write()
_worldPacket << uint32(Rewards.size());
_worldPacket << uint32(BonusRewards.size());

for (WorldPackets::Garrison::GarrisonMissionReward const& missionRewardItem : Rewards)
for (GarrisonMissionReward const& missionRewardItem : Rewards)
_worldPacket << missionRewardItem;

for (WorldPackets::Garrison::GarrisonMissionReward const& missionRewardItem : BonusRewards)
for (GarrisonMissionReward const& missionRewardItem : BonusRewards)
_worldPacket << missionRewardItem;

_worldPacket.WriteBit(Success);
Expand Down
Loading

0 comments on commit 093f3c6

Please sign in to comment.