[Skills] Make Tracking Skill Configurable (#1784)

Added 1 rule per class that defines tracking distance multiplier for that class
Kept the defaults of 12 for ranger, 10 for druid, and 7 for bard

Created 1 method for determining class tracking distance multiplier
Created 1 method for determining if a class can track, based on multiplier

Updated tracking logic to use these methods to determine whether a tracking
packet should and can be sent or not.
This commit is contained in:
mmcgarvey
2021-12-23 14:57:53 -05:00
committed by GitHub
parent 8c78a19c95
commit 4fbb98a5f7
5 changed files with 70 additions and 10 deletions
+43
View File
@@ -10869,3 +10869,46 @@ uint16 Client::LearnDisciplines(uint8 min_level, uint8 max_level)
return learned_disciplines;
}
uint16 Client::GetClassTrackingDistanceMultiplier(uint16 class_) {
switch (class_) {
case WARRIOR:
return RuleI(Character, WarriorTrackingDistanceMultiplier);
case CLERIC:
return RuleI(Character, ClericTrackingDistanceMultiplier);
case PALADIN:
return RuleI(Character, PaladinTrackingDistanceMultiplier);
case RANGER:
return RuleI(Character, RangerTrackingDistanceMultiplier);
case SHADOWKNIGHT:
return RuleI(Character, ShadowKnightTrackingDistanceMultiplier);
case DRUID:
return RuleI(Character, DruidTrackingDistanceMultiplier);
case MONK:
return RuleI(Character, MonkTrackingDistanceMultiplier);
case BARD:
return RuleI(Character, BardTrackingDistanceMultiplier);
case ROGUE:
return RuleI(Character, RogueTrackingDistanceMultiplier);
case SHAMAN:
return RuleI(Character, ShamanTrackingDistanceMultiplier);
case NECROMANCER:
return RuleI(Character, NecromancerTrackingDistanceMultiplier);
case WIZARD:
return RuleI(Character, WizardTrackingDistanceMultiplier);
case MAGICIAN:
return RuleI(Character, MagicianTrackingDistanceMultiplier);
case ENCHANTER:
return RuleI(Character, EnchanterTrackingDistanceMultiplier);
case BEASTLORD:
return RuleI(Character, BeastlordTrackingDistanceMultiplier);
case BERSERKER:
return RuleI(Character, BerserkerTrackingDistanceMultiplier);
default:
return 0;
}
}
bool Client::CanThisClassTrack() {
return (GetClassTrackingDistanceMultiplier(GetClass()) > 0) ? true : false;
}
+5
View File
@@ -810,6 +810,11 @@ public:
uint16 ScribeSpells(uint8 min_level, uint8 max_level);
uint16 LearnDisciplines(uint8 min_level, uint8 max_level);
// Configurable Tracking Skill
uint16 GetClassTrackingDistanceMultiplier(uint16 class_);
bool CanThisClassTrack();
// defer save used when bulk saving
void UnscribeSpell(int slot, bool update_client = true, bool defer_save = false);
void UnscribeSpellAll(bool update_client = true);
+4 -4
View File
@@ -14064,8 +14064,9 @@ void Client::Handle_OP_TGB(const EQApplicationPacket *app)
void Client::Handle_OP_Track(const EQApplicationPacket *app)
{
if (GetClass() != RANGER && GetClass() != DRUID && GetClass() != BARD)
if (!CanThisClassTrack()) {
return;
}
if (GetSkill(EQ::skills::SkillTracking) == 0)
SetSkill(EQ::skills::SkillTracking, 1);
@@ -14080,10 +14081,9 @@ void Client::Handle_OP_Track(const EQApplicationPacket *app)
void Client::Handle_OP_TrackTarget(const EQApplicationPacket *app)
{
int PlayerClass = GetClass();
if ((PlayerClass != RANGER) && (PlayerClass != DRUID) && (PlayerClass != BARD))
if (!CanThisClassTrack()) {
return;
}
if (app->size != sizeof(TrackTarget_Struct))
{
+2 -6
View File
@@ -3561,12 +3561,8 @@ bool EntityList::MakeTrackPacket(Client *client)
uint32 distance = 0;
float MobDistance;
if (client->GetClass() == DRUID)
distance = (client->GetSkill(EQ::skills::SkillTracking) * 10);
else if (client->GetClass() == RANGER)
distance = (client->GetSkill(EQ::skills::SkillTracking) * 12);
else if (client->GetClass() == BARD)
distance = (client->GetSkill(EQ::skills::SkillTracking) * 7);
distance = (client->GetSkill(EQ::skills::SkillTracking) * client->GetClassTrackingDistanceMultiplier(client->GetClass()));
if (distance <= 0)
return false;
if (distance < 300)