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.

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

[script][combat-trainer] QOL improvement to use of collect #7056

Merged
merged 6 commits into from
Jan 15, 2025

Conversation

mdr55
Copy link
Contributor

@mdr55 mdr55 commented Jan 15, 2025

Mask the use of collect if we have a loaded weapon. Its likely that the RT from collect will result in the weapon switch window being exceeded and wasting the load & aim time already invested. Given collect is less time critical and not directly combat related, suggest its ok to drop it in preference to losing an aim slot.

Comment on lines 2958 to 2966
if !game_state.loaded then
game_state.sheath_whirlwind_offhand
DRC.retreat
game_state.engage unless game_state.npcs.empty? || game_state.retreating?
DRC.collect(@forage_item)
waitrt?
game_state.wield_whirlwind_offhand
DRC.kick_pile?
end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if !game_state.loaded then
game_state.sheath_whirlwind_offhand
DRC.retreat
game_state.engage unless game_state.npcs.empty? || game_state.retreating?
DRC.collect(@forage_item)
waitrt?
game_state.wield_whirlwind_offhand
DRC.kick_pile?
end
return unless game_state.loaded
game_state.sheath_whirlwind_offhand
DRC.retreat
game_state.engage unless game_state.npcs.empty? || game_state.retreating?
DRC.collect(@forage_item)
waitrt?
game_state.wield_whirlwind_offhand
DRC.kick_pile?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, with the correct indentation, of course...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, looks much cleaner now

@MahtraDR MahtraDR merged commit 64c1218 into elanthia-online:main Jan 15, 2025
2 checks passed
@MahtraDR
Copy link
Collaborator

Thanks!

@mdr55 mdr55 deleted the combat-trainer-mask-collect branch January 15, 2025 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants