Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move skill target time to ai_v temp #3953

Merged
merged 2 commits into from
Jan 17, 2025
Merged

chore: move skill target time to ai_v temp #3953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c85c58
chore: move skill target time to ai_v temp
alisonrag Jan 16, 2025
a2ce34e
Merge branch 'master' into chore/move-target-time-to-temp
alisonrag Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions src/AI/Attack.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ sub process {
return;
}
}

if ($stage == MOVING_TO_ATTACK) {
# Check for hidden monsters
if (($target->{statuses}->{EFFECTSTATE_BURROW} || $target->{statuses}->{EFFECTSTATE_HIDING}) && $config{avoidHiddenMonsters}) {
Expand Down Expand Up @@ -161,7 +161,7 @@ sub process {
}
}
}

if ($stage == ATTACKING) {
if (AI::args->{suspended}) {
$args->{ai_attack_giveup}{time} += time - $args->{suspended};
Expand All @@ -173,7 +173,7 @@ sub process {
$args->{ai_attack_giveup}{time} += time - $args->{move_start};
undef $args->{unstuck}{time};
undef $args->{move_start};

} elsif ($args->{avoiding}) {
$args->{ai_attack_giveup}{time} = time;
undef $args->{avoiding};
Expand Down Expand Up @@ -294,7 +294,7 @@ sub finishAttacking {

sub find_kite_position {
my ($args, $inAdvance, $target, $realMyPos, $realMonsterPos, $noAttackMethodFallback_runFromTarget) = @_;

my $maxDistance;
if (!$noAttackMethodFallback_runFromTarget && defined $args->{attackMethod}{type} && defined $args->{attackMethod}{maxDistance}) {
$maxDistance = $args->{attackMethod}{maxDistance};
Expand Down Expand Up @@ -357,16 +357,16 @@ sub main {

my $realMyPos = calcPosFromPathfinding($field, $char);
my $realMonsterPos = calcPosFromPathfinding($field, $target);

my $realMonsterDist = blockDistance($realMyPos, $realMonsterPos);
my $clientDist = getClientDist($realMyPos, $realMonsterPos);

my $failed_to_attack_packet_recv = 0;

if (!exists $args->{temporary_extra_range} || !defined $args->{temporary_extra_range}) {
$args->{temporary_extra_range} = 0;
}

if (exists $target->{movetoattack_pos} && exists $char->{movetoattack_pos}) {
$failed_to_attack_packet_recv = 1;
$args->{temporary_extra_range} = 0;
Expand All @@ -380,23 +380,23 @@ sub main {
$args->{ai_attack_giveup}{time} = time;
debug "Update attack giveup time\n", "ai_attack", 2;
}

my $hitYou = ($args->{dmgToYou_last} != $target->{dmgToYou} || $args->{missedYou_last} != $target->{missedYou});
my $youHitTarget = ($args->{dmgFromYou_last} != $target->{dmgFromYou});

$args->{dmgToYou_last} = $target->{dmgToYou};
$args->{missedYou_last} = $target->{missedYou};
$args->{dmgFromYou_last} = $target->{dmgFromYou};
$args->{missedFromYou_last} = $target->{missedFromYou};

$args->{lastSkillTime} = $char->{last_skill_time};

Benchmark::end("ai_attack (part 1.1)") if DEBUG;
Benchmark::begin("ai_attack (part 1.2)") if DEBUG;

# Determine what combo skill to use
delete $args->{attackMethod};

my $i = 0;
while (exists $config{"attackComboSlot_$i"}) {
next unless (defined $config{"attackComboSlot_$i"});
Expand Down Expand Up @@ -448,17 +448,17 @@ sub main {
my $skill = new Skill(auto => $config{"attackSkillSlot_$i"});
next unless ($skill);
next unless ($skill->getOwnerType == Skill::OWNER_CHAR);

my $handle = $skill->getHandle();

next unless (checkSelfCondition("attackSkillSlot_$i"));
next unless ((!$config{"attackSkillSlot_$i"."_maxUses"} || $target->{skillUses}{$handle} < $config{"attackSkillSlot_$i"."_maxUses"}));
next unless ((!$config{"attackSkillSlot_$i"."_maxAttempts"} || $args->{attackSkillSlot_attempts}{$i} < $config{"attackSkillSlot_$i"."_maxAttempts"}));
next unless ((!$config{"attackSkillSlot_$i"."_monsters"} || existsInList($config{"attackSkillSlot_$i"."_monsters"}, $target->{'name'}) || existsInList($config{"attackSkillSlot_$i"."_monsters"}, $target->{nameID})));
next unless ((!$config{"attackSkillSlot_$i"."_notMonsters"} || !(existsInList($config{"attackSkillSlot_$i"."_notMonsters"}, $target->{'name'}) ||existsInList($config{"attackSkillSlot_$i"."_notMonsters"}, $target->{nameID}))));
next unless ((!$config{"attackSkillSlot_$i"."_previousDamage"} || inRange($target->{dmgTo}, $config{"attackSkillSlot_$i"."_previousDamage"})));
next unless (checkMonsterCondition("attackSkillSlot_${i}_target", $target));

$args->{attackMethod}{type} = "skill";
$args->{attackMethod}{skillSlot} = $i;
$args->{attackMethod}{distance} = $config{"attackSkillSlot_$i"."_dist"};
Expand All @@ -482,11 +482,11 @@ sub main {
if (defined $args->{attackMethod}{type} && exists $args->{ai_attack_failed_give_up} && defined $args->{ai_attack_failed_give_up}{time}) {
debug "Deleting ai_attack_failed_give_up time.\n";
delete $args->{ai_attack_failed_give_up}{time};

}

$args->{attackMethod}{maxDistance} += $args->{temporary_extra_range};

# -2: undefined attackMethod
# -1: No LOS
# 0: out of range
Expand All @@ -499,7 +499,7 @@ sub main {
}

my $canAttack_fail_string = (($canAttack == -2) ? "No Method" : (($canAttack == -1) ? "No LOS" : (($canAttack == 0) ? "No Range" : "OK")));

# Here we check if the monster which we are waiting to get closer to us is in fact close enough
# If it is close enough delete the ai_attack_failed_waitForAgressive_give_up keys and loop attack logic
if (
Expand All @@ -512,7 +512,7 @@ sub main {
debug "Deleting ai_attack_failed_waitForAgressive_give_up time.\n";
delete $args->{ai_attack_failed_waitForAgressive_give_up}{time};
}

# Here we check if we have finished moving to the meeting position to attack our target, only checks this if attackWaitApproachFinish is set to 1 in config
# If so sets sentApproach to 0
if ($args->{sentApproach}) {
Expand All @@ -534,7 +534,7 @@ sub main {
}
}
}

my $found_action = 0;
my $failed_runFromTarget = 0;
my $hitTarget_when_not_possible = 0;
Expand All @@ -553,7 +553,7 @@ sub main {
$failed_runFromTarget = 1;
}
}

# Here, if runFromTarget is active, and we can't attack right now (eg. all skills in cooldown) we check if the target mob is closer to us than the minimun distance specified in runFromTarget_noAttackMethodFallback_minStep
# If so try to kite it using maxdistance of runFromTarget_noAttackMethodFallback_attackMaxDist
if (
Expand Down Expand Up @@ -583,7 +583,7 @@ sub main {
giveUp($args, $ID, 0);
}
}

if ($canAttack == 0 && $youHitTarget) {
debug TF("[%s] We were able to hit target even though it is out of range or LOS, accepting and continuing. (you %s (%d %d), target %s (%d %d) [(%d %d) -> (%d %d)], distance %d, maxDistance %d, dmgFromYou %d)\n", $canAttack_fail_string, $char, $realMyPos->{x}, $realMyPos->{y}, $target, $realMonsterPos->{x}, $realMonsterPos->{y}, $target->{pos}{x}, $target->{pos}{y}, $target->{pos_to}{x}, $target->{pos_to}{y}, $realMonsterDist, $args->{attackMethod}{maxDistance}, $target->{dmgFromYou}), 'ai_attack';
if ($clientDist > $args->{attackMethod}{maxDistance} && $clientDist <= ($args->{attackMethod}{maxDistance} + 1) && $args->{temporary_extra_range} == 0) {
Expand All @@ -604,7 +604,7 @@ sub main {
delete $args->{ai_attack_failed_waitForAgressive_give_up}{time};;
}
}

# Here we decide what to do when a mob we have already hit is no longer in range or we have no LOS to it
# We also check if we have waited too long for the monster which we are waiting to get closer to us to approach
# TODO: Maybe we should separate this into 2 sections, one for out of range and another for no LOS - low priority
Expand Down Expand Up @@ -649,12 +649,12 @@ sub main {
$args->{move_start} = time;
$args->{monsterLastMoveTime} = $target->{time_move};
$args->{sentApproach} = 1;

my $sendAttackWithMove = 0;
if ($config{"attackSendAttackWithMove"} && $args->{attackMethod}{type} eq "weapon") {
$sendAttackWithMove = 1;
}

$char->route(
undef,
@{$pos}{qw(x y)},
Expand Down Expand Up @@ -719,8 +719,8 @@ sub main {
delete $args->{attackMethod};

$ai_v{"attackSkillSlot_${slot}_time"} = time;
$ai_v{"attackSkillSlot_${slot}_target_time"}{$ID} = time;
$ai_v{temp}{"attackSkillSlot_${slot}_target_time"}{$ID} = time;

$args->{attackSkillSlot_attempts}{$slot}++;

ai_setSuspend(0);
Expand Down Expand Up @@ -751,7 +751,7 @@ sub main {
delete $args->{attackMethod};

$ai_v{"attackComboSlot_${slot}_time"} = time;
$ai_v{"attackComboSlot_${slot}_target_time"}{$ID} = time;
$ai_v{temp}{"attackComboSlot_${slot}_target_time"}{$ID} = time;

my $skill = Skill->new(auto => $config{"attackComboSlot_$slot"});
my $skill_lvl = $config{"attackComboSlot_${slot}_lvl"} || $char->getSkillLevel($skill);
Expand All @@ -770,7 +770,7 @@ sub main {
}

}

if (!$found_action && $config{tankMode}) {
if ($args->{dmgTo_last} != $target->{dmgTo}) {
$args->{ai_attack_giveup}{time} = time;
Expand Down
2 changes: 1 addition & 1 deletion src/AI/CoreLogic.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3027,7 +3027,7 @@ sub processMonsterSkillUse {
my $target = $config{"${prefix}_isSelfSkill"} ? $char : $monster;
ai_skillUse2($skill, $lvl, $maxCastTime, $minCastTime, $target, $prefix);
$ai_v{$prefix . "_time"} = time;
$ai_v{$prefix . "_target_time"}{$monsterID} = time;
$ai_v{temp}{$prefix . "_target_time"}{$monsterID} = time;
last;
}
}
Expand Down
Loading
Loading