pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oopsies

Browse Source
This commit is contained in:
nytmyr
2024-10-31 23:21:42 -05:00
parent 4aa7a18b4f
commit 8b5112a616
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+6 -10
View File
@@ -87,7 +87,7 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm
SetGuardFlag(false); SetGuardFlag(false);
SetHoldFlag(false); SetHoldFlag(false);
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true); SetCombatRoundForAlerts(false);
SetAttackingFlag(false); SetAttackingFlag(false);
SetPullFlag(false); SetPullFlag(false);
SetPullingFlag(false); SetPullingFlag(false);
@@ -211,7 +211,7 @@ Bot::Bot(
SetGuardFlag(false); SetGuardFlag(false);
SetHoldFlag(false); SetHoldFlag(false);
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true); SetCombatRoundForAlerts(false);
SetAttackingFlag(false); SetAttackingFlag(false);
SetPullFlag(false); SetPullFlag(false);
SetPullingFlag(false); SetPullingFlag(false);
@@ -2106,7 +2106,6 @@ void Bot::AI_Process()
// ATTACKING FLAG (HATE VALIDATION) // ATTACKING FLAG (HATE VALIDATION)
if (GetAttackingFlag() && tar->CheckAggro(this)) { if (GetAttackingFlag() && tar->CheckAggro(this)) {
SetCombatRoundForAlerts(true);
SetAttackingFlag(false); SetAttackingFlag(false);
} }
@@ -2277,7 +2276,7 @@ void Bot::AI_Process()
} }
else { // Out-of-combat behavior else { // Out-of-combat behavior
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true); SetCombatRoundForAlerts(false);
SetAttackingFlag(false); SetAttackingFlag(false);
if (!bot_owner->GetBotPulling()) { if (!bot_owner->GetBotPulling()) {
@@ -2422,7 +2421,6 @@ bool Bot::TryAutoDefend(Client* bot_owner, float leash_distance) {
AddToHateList(hater, 1); AddToHateList(hater, 1);
SetTarget(hater); SetTarget(hater);
SetAttackingFlag(); SetAttackingFlag();
SetCombatRoundForAlerts();
if (HasPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) { if (HasPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
GetPet()->AddToHateList(hater, 1); GetPet()->AddToHateList(hater, 1);
@@ -2884,7 +2882,7 @@ bool Bot::IsValidTarget(
SetTarget(nullptr); SetTarget(nullptr);
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true); SetCombatRoundForAlerts(false);
SetAttackingFlag(false); SetAttackingFlag(false);
if (PULLING_BOT) { if (PULLING_BOT) {
@@ -2918,7 +2916,6 @@ Mob* Bot::GetBotTarget(Client* bot_owner)
WipeHateList(); WipeHateList();
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true);
SetAttackingFlag(false); SetAttackingFlag(false);
if (PULLING_BOT) { if (PULLING_BOT) {
@@ -3137,7 +3134,6 @@ void Bot::SetOwnerTarget(Client* bot_owner) {
} }
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true);
SetAttackingFlag(false); SetAttackingFlag(false);
SetPullFlag(false); SetPullFlag(false);
SetPullingFlag(false); SetPullingFlag(false);
@@ -3152,7 +3148,6 @@ void Bot::SetOwnerTarget(Client* bot_owner) {
WipeHateList(); WipeHateList();
AddToHateList(attack_target, 1); AddToHateList(attack_target, 1);
SetTarget(attack_target); SetTarget(attack_target);
SetCombatRoundForAlerts();
SetAttackingFlag(); SetAttackingFlag();
if (GetPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) { if (GetPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
GetPet()->WipeHateList(); GetPet()->WipeHateList();
@@ -3165,7 +3160,7 @@ void Bot::SetOwnerTarget(Client* bot_owner) {
void Bot::BotPullerProcess(Client* bot_owner, Raid* raid) { void Bot::BotPullerProcess(Client* bot_owner, Raid* raid) {
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(true); SetCombatRoundForAlerts(false);
SetAttackingFlag(false); SetAttackingFlag(false);
SetPullFlag(false); SetPullFlag(false);
SetPullingFlag(false); SetPullingFlag(false);
@@ -4915,6 +4910,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) {
if (!botpiercer || (botpiercer->ItemType != EQ::item::ItemType1HPiercing)) { if (!botpiercer || (botpiercer->ItemType != EQ::item::ItemType1HPiercing)) {
if (!GetCombatRoundForAlerts()) { if (!GetCombatRoundForAlerts()) {
SetCombatRoundForAlerts();
BotGroupSay(this, "I can't backstab with this weapon!"); BotGroupSay(this, "I can't backstab with this weapon!");
} }
zone/bot.h
+1 -1
View File
@@ -1105,7 +1105,7 @@ private:
int32 GenerateBaseManaPoints(); int32 GenerateBaseManaPoints();
void GenerateSpecialAttacks(); void GenerateSpecialAttacks();
void SetBotID(uint32 botID); void SetBotID(uint32 botID);
void SetCombatRoundForAlerts(bool flag = true) { m_combat_round_alert_flag; } void SetCombatRoundForAlerts(bool flag = true) { m_combat_round_alert_flag = flag; }
void SetAttackingFlag(bool flag = true) { m_attacking_flag = flag; } void SetAttackingFlag(bool flag = true) { m_attacking_flag = flag; }
void SetPullingFlag(bool flag = true) { m_pulling_flag = flag; } void SetPullingFlag(bool flag = true) { m_pulling_flag = flag; }
void SetReturningFlag(bool flag = true) { m_returning_flag = flag; } void SetReturningFlag(bool flag = true) { m_returning_flag = flag; }
zone/spells.cpp
+2 -2
View File
@@ -2560,9 +2560,9 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
float range = spells[spell_id].range + GetRangeDistTargetSizeMod(spell_target); float range = spells[spell_id].range + GetRangeDistTargetSizeMod(spell_target);
if ( if (
( (
(IsClient() && CastToClient()->TGB()) || (IsBot() && RuleB(Bots, EnableBotTGB) (IsClient() && CastToClient()->TGB()) || (IsBot() && RuleB(Bots, EnableBotTGB))
) && ) &&
IsTGBCompatibleSpell(spell_id) && IsGroupSpell(spell_id)) IsTGBCompatibleSpell(spell_id) && IsGroupSpell(spell_id)
) { ) {
range = spells[spell_id].aoe_range; range = spells[spell_id].aoe_range;
} }