[script] [combat-trainer] Don't face/engage when using Innocence #5792

bishoprook · 2022-05-05T21:17:20Z

Adds a new is_engaging_allowed? gamestate which is honored by preventing any action that would require a face or engage. This prevents empaths from breaking Innocence (e.g. when manipulating and/or using GS)

Adds a new `is_engaging_allowed?` gamestate which is honored by preventing any action that would require a `face` or `engage`. This prevents empaths from breaking Innocence (e.g. when manipulating and/or using GS)

rpherbig · 2022-05-06T00:42:02Z

combat-trainer.lic

@@ -2507,7 +2508,7 @@ class TrainerProcess
      waitrt?
      fix_standing
    when /^Tactics$/i
-      bput($tactics_actions.sample, 'roundtime', 'There is nothing else', 'Face what', 'You must be closer', 'You must be standing', 'Strangely, you don\'t feel like fighting right now', 'flying too high for you to attack') unless game_state.npcs.empty?
+      bput($tactics_actions.sample, 'roundtime', 'There is nothing else', 'Face what', 'You must be closer', 'You must be standing', 'Strangely, you don\'t feel like fighting right now', 'flying too high for you to attack') unless game_state.npcs.empty? || !game_state.is_engaging_allowed?


I'm not super familiar with Innocence (I just read its entry on elanthipedia), so maybe this is a dumb question. Why would someone using Innocence also be training Tactics?

It's fair, there are a couple "should never happen" examples here -- see also training Astrology, since Innocence is an empath signature spell. However, it also felt like is_engaging_allowed? could potentially be broader than whether or not you have Innocence cast, so I tried to cover pretty much any case that would lead to a face or engage command being issued. If that doesn't make sense I could also see this being restricted to only cases that would actually happen for an empath using the spell.

rpherbig · 2022-05-06T00:44:51Z

combat-trainer.lic

@@ -2230,6 +2230,7 @@ class AbilityProcess
    timer = game_state.cooldown_timers['Battle Cry']
    return unless !timer || (Time.now - timer).to_i > @battle_cry_cooldown
    return unless game_state.npcs.length > 0
+    return unless game_state.is_engaging_allowed?


Battle cries are Bardic. Would a Bard ever be using Innocence?

rpherbig · 2022-05-06T00:45:44Z

combat-trainer.lic

@@ -2762,6 +2763,7 @@ class TrainerProcess
    return if game_state.npcs.empty?
    return if fail_count > @analyze_retry_count
    return if DRSkill.getxp('Tactics') >= @combat_training_abilities_target
+    return unless game_state.is_engaging_allowed?


I'm not super familiar with Innocence (I just read its entry on elanthipedia), so maybe this is a dumb question. Why would someone using Innocence also be using Analyze?

Misconfiguration? It should be safe to return here regardless, as the two are mutually exclusive.

rpherbig · 2022-05-06T00:47:02Z

combat-trainer.lic

@@ -3407,7 +3411,7 @@ class AttackProcess
  end

  def dance(game_state)
-    if game_state.npcs.empty?
+    if game_state.npcs.empty? || !game_state.is_engaging_allowed?


Do dance actions break Innocence? If not, should this check be moved to line 3420?

Yes, the engage on line 3416 will break Innocence. Any face or engage will. (But for whatever reason, support won't, and implicitly facing the next target with a target bob etc won't...)

But dance commands like weave and circle require you to be at pole range or closer, which is incompatible with Innocence which keeps enemies entirely disengaged if it works.

rpherbig · 2022-05-06T00:48:00Z

combat-trainer.lic

@@ -2567,7 +2568,7 @@ class TrainerProcess
    when /^Collect$/i
      game_state.sheath_whirlwind_offhand
      retreat
-      put('engage') unless game_state.npcs.empty? || game_state.retreating?
+      put('engage') unless game_state.npcs.empty? || game_state.retreating? || !game_state.is_engaging_allowed?


What do you think about making a function on game_state (engage?) that encapsulates this repeated set of conditionals? See lines 2621, 2812, 3358, etc.

Yeah, I thought about that. Also considered making is_engaging_allowed? defined as "not cast Innocence and not retreating"

There are some cases where we'll completely skip some actions when retreating that we should be able to do while using Innocence, so they're not quite the same thing, but there is a lot of repeat/overlap.

Maybe it would make sense to also include game_state.npcs.empty? in the check too. In that case, it doesn't hurt anything to issue a face or engage command but it's still pointless.

This could also address a number of the other concerns. "Why would an empath..." "Why would someone using Innocence..."

Generalizes more to "prevent us from issuing a face or engage command when it would be either bad or wrong"

MahtraDR · 2022-05-06T06:46:05Z

How about treating Innocence like we treat Absolution? Currently the undead argument triggers checks for Absolution, and prevents attacks without the spell cast. It seems consistent to keep that workflow? The it's a more deliberate action on the part of the user, setting the argument in their hunting_info section like we would construct or undead and not just "Oh, is Innocence up?"

`is_engaging_allowed?` is now `can_engage?` and covers Innocence, retreating, and whether there are enemies in the room.

bishoprook · 2022-05-06T14:19:08Z

The it's a more deliberate action on the part of the user, setting the argument in their hunting_info section like we would construct or undead and not just "Oh, is Innocence up?"

That makes a lot of sense. When I'm defining the hunt I should know that I plan to be using Innocence and I don't want to be dancing to break it.

Instead of checking that the Innocence spell is up, allows the hunt to be defined with an innocence-mode toggle.

combat-trainer.lic

`can_face?` strictly covers Innocence and no targets. `can_engage?` also includes retreating state. For battle cries and tactics where we only try to face, not engage, uses the less restrictive.

bishoprook · 2022-05-10T02:49:17Z

Any other thoughts here?

MahtraDR · 2022-05-10T03:49:31Z

Any other thoughts here?

If you can clean/resolve any pending comments, and if it's in a place to be re-reviewed, tag us for review?

rpherbig · 2022-05-10T20:03:04Z

combat-trainer.lic

@@ -3407,7 +3409,7 @@ class AttackProcess
  end

  def dance(game_state)
-    if game_state.npcs.empty?
+    unless game_state.can_engage?


Minor, but I'd prefer to swap the two branches so we can use if instead of unless here

Sorry following up on this one. What do you mean? I'll fix the code and get this merged as there's interest from a couple others.

if game_state.can_engage? line 3415... else pause 1 end

@rpherbig Is it good now?

combat-trainer.lic

rpherbig

Only minor comments

Co-authored-by: Robert Herbig <[email protected]>

combat-trainer.lic

MahtraDR · 2022-06-30T09:10:49Z

combat-trainer.lic

@@ -2762,6 +2763,7 @@ class TrainerProcess
    return if game_state.npcs.empty?
    return if fail_count > @analyze_retry_count
    return if DRSkill.getxp('Tactics') >= @combat_training_abilities_target
+    return unless game_state.is_engaging_allowed?


Misconfiguration? It should be safe to return here regardless, as the two are mutually exclusive.

MahtraDR · 2022-06-30T09:26:11Z

combat-trainer.lic

@@ -3407,7 +3409,7 @@ class AttackProcess
  end

  def dance(game_state)
-    if game_state.npcs.empty?
+    unless game_state.can_engage?


@rpherbig Is it good now?

combat-trainer.lic

MahtraDR · 2022-07-01T19:59:22Z

I'll smoke test this today and if no errors, will merge.

Combat-trainer: don't face/engage with Innocence

1717ab7

Adds a new `is_engaging_allowed?` gamestate which is honored by preventing any action that would require a `face` or `engage`. This prevents empaths from breaking Innocence (e.g. when manipulating and/or using GS)

bishoprook changed the title ~~Combat-trainer: don't face/engage with Innocence~~ [script] [combat-trainer] Don't face/engage when using Innocence May 5, 2022

MahtraDR requested a review from rpherbig May 6, 2022 00:07

rpherbig reviewed May 6, 2022

View reviewed changes

Generalized can_engage? to more conditions

6440959

`is_engaging_allowed?` is now `can_engage?` and covers Innocence, retreating, and whether there are enemies in the room.

Made innocence-mode argument

350b553

Instead of checking that the Innocence spell is up, allows the hunt to be defined with an innocence-mode toggle.

bishoprook commented May 6, 2022

View reviewed changes

combat-trainer.lic Outdated Show resolved Hide resolved

bishoprook commented May 6, 2022

View reviewed changes

combat-trainer.lic Show resolved Hide resolved

bishoprook commented May 6, 2022

View reviewed changes

combat-trainer.lic Outdated Show resolved Hide resolved

Added can_face? and made cross-section smaller

8620d83

`can_face?` strictly covers Innocence and no targets. `can_engage?` also includes retreating state. For battle cries and tactics where we only try to face, not engage, uses the less restrictive.

MahtraDR requested a review from rpherbig May 10, 2022 08:40

rpherbig reviewed May 10, 2022

View reviewed changes

combat-trainer.lic Outdated Show resolved Hide resolved

rpherbig approved these changes May 10, 2022

View reviewed changes

MahtraDR and others added 2 commits June 19, 2022 01:20

Update combat-trainer.lic

7f5419f

Co-authored-by: Robert Herbig <[email protected]>

Changing def dance

8a2123a

MahtraDR reviewed Jun 30, 2022

View reviewed changes

combat-trainer.lic Outdated Show resolved Hide resolved

Update combat-trainer.lic

7e88895

rpherbig approved these changes Jul 1, 2022

View reviewed changes

Merge branch 'master' into combat-trainer-no-break-innocence

45064d7

MahtraDR added 2 commits October 31, 2024 13:59

Cleanup

f7d03ad

Rubocop

8cd9be2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[script] [combat-trainer] Don't face/engage when using Innocence #5792

[script] [combat-trainer] Don't face/engage when using Innocence #5792

bishoprook commented May 5, 2022

rpherbig May 6, 2022

bishoprook May 6, 2022

rpherbig May 6, 2022

rpherbig May 6, 2022

MahtraDR Jun 30, 2022

rpherbig May 6, 2022

bishoprook May 6, 2022

rpherbig May 6, 2022 •

edited

Loading

bishoprook May 6, 2022

bishoprook May 6, 2022

MahtraDR commented May 6, 2022 •

edited

Loading

bishoprook commented May 6, 2022

bishoprook commented May 10, 2022

MahtraDR commented May 10, 2022

rpherbig May 10, 2022

MahtraDR Jun 18, 2022

rpherbig Jun 18, 2022

MahtraDR Jun 30, 2022

rpherbig left a comment

MahtraDR Jun 30, 2022

MahtraDR Jun 30, 2022

MahtraDR commented Jul 1, 2022

[script] [combat-trainer] Don't face/engage when using Innocence #5792

Are you sure you want to change the base?

[script] [combat-trainer] Don't face/engage when using Innocence #5792

Conversation

bishoprook commented May 5, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rpherbig May 6, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MahtraDR commented May 6, 2022 • edited Loading

bishoprook commented May 6, 2022

bishoprook commented May 10, 2022

MahtraDR commented May 10, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rpherbig left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MahtraDR commented Jul 1, 2022

rpherbig May 6, 2022 •

edited

Loading

MahtraDR commented May 6, 2022 •

edited

Loading