add bot checks to tryheadshot / tryassassinate

This commit is contained in:
nytmyr
2024-12-12 22:07:54 -06:00
parent 94717ee459
commit 5457d14d85
2 changed files with 4 additions and 3 deletions
+1
View File
@@ -6446,6 +6446,7 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac
} }
else { else {
int ass = TryAssassinate(defender, hit.skill); int ass = TryAssassinate(defender, hit.skill);
if (ass > 0) { if (ass > 0) {
hit.damage_done = ass; hit.damage_done = ass;
} }
+3 -3
View File
@@ -2453,7 +2453,7 @@ int Mob::TryHeadShot(Mob *defender, EQ::skills::SkillType skillInUse)
// Only works on YOUR target. // Only works on YOUR target.
if ( if (
defender && defender &&
!defender->IsClient() && !defender->IsOfClientBot() &&
skillInUse == EQ::skills::SkillArchery && skillInUse == EQ::skills::SkillArchery &&
GetTarget() == defender && GetTarget() == defender &&
(defender->GetBodyType() == BodyType::Humanoid || !RuleB(Combat, HeadshotOnlyHumanoids)) && (defender->GetBodyType() == BodyType::Humanoid || !RuleB(Combat, HeadshotOnlyHumanoids)) &&
@@ -2466,7 +2466,7 @@ int Mob::TryHeadShot(Mob *defender, EQ::skills::SkillType skillInUse)
if (HeadShot_Dmg && HeadShot_Level && (defender->GetLevel() <= HeadShot_Level)) { if (HeadShot_Dmg && HeadShot_Level && (defender->GetLevel() <= HeadShot_Level)) {
int chance = GetDEX(); int chance = GetDEX();
chance = 100 * chance / (chance + 3500); chance = 100 * chance / (chance + 3500);
if (IsClient() || IsBot()) { if (IsOfClientBot()) {
chance += GetHeroicDEX() / 25; chance += GetHeroicDEX() / 25;
} }
chance *= 10; chance *= 10;
@@ -2490,7 +2490,7 @@ int Mob::TryAssassinate(Mob *defender, EQ::skills::SkillType skillInUse)
{ {
if ( if (
defender && defender &&
!defender->IsClient() && !defender->IsOfClientBot() &&
GetLevel() >= RuleI(Combat, AssassinateLevelRequirement) && GetLevel() >= RuleI(Combat, AssassinateLevelRequirement) &&
(skillInUse == EQ::skills::SkillBackstab || skillInUse == EQ::skills::SkillThrowing) && (skillInUse == EQ::skills::SkillBackstab || skillInUse == EQ::skills::SkillThrowing) &&
(defender->GetBodyType() == BodyType::Humanoid || !RuleB(Combat, AssassinateOnlyHumanoids)) && (defender->GetBodyType() == BodyType::Humanoid || !RuleB(Combat, AssassinateOnlyHumanoids)) &&