pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 20:08:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Missing p_item, s_item in CombatRangeInput

Browse Source
This commit is contained in:
nytmyr
2025-01-24 12:45:20 -06:00
parent cec1dbda94
commit f8ff6794c1
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+8 -7
View File
@@ -2291,12 +2291,17 @@ void Bot::AI_Process()
bool behind_mob = BehindMob(tar, GetX(), GetY());
uint8 stop_melee_level = GetStopMeleeLevel();
tar_distance = sqrt(tar_distance); // sqrt this for future calculations
// Item variables
const EQ::ItemInstance* p_item = GetBotItem(EQ::invslot::slotPrimary);
const EQ::ItemInstance* s_item = GetBotItem(EQ::invslot::slotSecondary);
CombatRangeInput input = {
.target = tar,
.target_distance = tar_distance,
.behind_mob = behind_mob,
.stop_melee_level = stop_melee_level
.stop_melee_level = stop_melee_level,
.p_item = p_item,
.s_item = s_item
};
CombatRangeOutput o = EvaluateCombatRange(input);
@@ -2307,10 +2312,6 @@ void Bot::AI_Process()
float melee_distance = o.melee_distance;
float melee_distance_max = o.melee_distance_max;
// Item variables
const EQ::ItemInstance* p_item = GetBotItem(EQ::invslot::slotPrimary);
const EQ::ItemInstance* s_item = GetBotItem(EQ::invslot::slotSecondary);
// PULLING FLAG (ACTIONABLE RANGE)
if (GetPullingFlag()) {
@@ -3088,8 +3089,8 @@ CombatRangeOutput Bot::EvaluateCombatRange(const CombatRangeInput& input) {
if (!RuleB(Bots, UseFlatNormalMeleeRange)) {
bool is_two_hander = input.p_item && input.p_item->GetItem()->IsType2HWeapon();
bool is_shield = input.s_item && input.s_item->GetItem()->IsTypeShield();
bool is_two_hander = input.p_item && input.p_item->GetItem()->IsType2HWeapon();
bool is_shield = input.s_item && input.s_item->GetItem()->IsTypeShield();
bool is_backstab_weapon = input.p_item && input.p_item->GetItemBackstabDamage();
switch (GetClass()) {
zone/bot_structs.h
+8 -8
View File
@@ -128,19 +128,19 @@ struct BotSpellTypesByClass_Struct {
};
struct CombatRangeInput {
Mob* target;
float target_distance;
bool behind_mob;
uint8 stop_melee_level;
Mob* target;
float target_distance;
bool behind_mob;
uint8 stop_melee_level;
const EQ::ItemInstance* p_item;
const EQ::ItemInstance* s_item;
};
struct CombatRangeOutput {
bool at_combat_range = false;
float melee_distance_min = 0.0f;
float melee_distance = 0.0f;
float melee_distance_max = 0.0f;
bool at_combat_range = false;
float melee_distance_min = 0.0f;
float melee_distance = 0.0f;
float melee_distance_max = 0.0f;
};
#endif // BOT_STRUCTS