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

Chaotic heal #563

Merged
merged 2 commits into from
Jan 12, 2025
Merged

Chaotic heal #563

merged 2 commits into from
Jan 12, 2025

Conversation

LTS-FFXIV
Copy link
Member

This pull request includes several changes to the RotationSolver.Basic project, focusing on improving the logic for handling abilities and statuses, as well as adding new configurations and conditions. The most important changes include updates to the BasicRotations for healers and melee classes, adjustments to configuration settings, and enhancements to the data center and helper methods.

Updates to Basic Rotations:

  • BasicRotations/Healer/SGE_Default.cs: Modified the ChoiceEukrasia method to reset the Eukrasia aim if the last GCD was performed ([BasicRotations/Healer/SGE_Default.csL256-R256](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-048922cde007c3a11c8a1edea2742248b0c16ceb8806c7c8f14c6e2fbd612898L256-R256)).
  • BasicRotations/Melee/MNK_Default.cs: Added the MasterfulBlitzUse enum and related configuration for using abilities as soon as they are available ([[1]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-c8f54622438b0935ab3c9c0d37c4ef394d8a28f6a371bdf821005760f98f7ca3R20-R26), [[2]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-c8f54622438b0935ab3c9c0d37c4ef394d8a28f6a371bdf821005760f98f7ca3R42-R44)). Enhanced the EmergencyAbility and GeneralGCD methods to handle ability usage based on the new MasterfulBlitzUse setting ([[3]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-c8f54622438b0935ab3c9c0d37c4ef394d8a28f6a371bdf821005760f98f7ca3L94-R115), [[4]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-c8f54622438b0935ab3c9c0d37c4ef394d8a28f6a371bdf821005760f98f7ca3L242-R279), [[5]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-c8f54622438b0935ab3c9c0d37c4ef394d8a28f6a371bdf821005760f98f7ca3R296-R298)).

Configuration Adjustments:

  • RotationSolver.Basic/Configuration/Configs.cs: Renamed configuration fields isLastAbilityTimer and isFirstAbilityTimer to IsLastAbilityTimer and IsFirstAbilityTimer respectively ([[1]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-8146c07f057c08a985ecf11930f19a1ce5444efc69fcc45f0edd4e6c341dbe16L385-R390), [[2]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-8146c07f057c08a985ecf11930f19a1ce5444efc69fcc45f0edd4e6c341dbe16R481-R484)).

Enhancements to Data Center:

  • RotationSolver.Basic/DataCenter.cs: Added properties to check if the player is in an alliance raid and other specific duties ([[1]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-2c3e758beb8d040501567ca05ffcedd46534840df24596c1119e971896e8eb42R107-R118), [[2]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-2c3e758beb8d040501567ca05ffcedd46534840df24596c1119e971896e8eb42R127-R128)). Updated lists for party members, alliance members, and other targets to use empty arrays instead of new instances ([[3]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-2c3e758beb8d040501567ca05ffcedd46534840df24596c1119e971896e8eb42L325-R345), [[4]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-2c3e758beb8d040501567ca05ffcedd46534840df24596c1119e971896e8eb42L341-R355)).

Helper Method Improvements:

  • RotationSolver.Basic/Helpers/ObjectHelper.cs: Renamed IsAlliance method to IsAllianceMember and added a check for focus targets being treated as party members ([[1]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-44cc6e98dcd8c3d2aa47210ec76d800058560df9bbff9ce225b3116c47ddc1fcL85-R86), [[2]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-44cc6e98dcd8c3d2aa47210ec76d800058560df9bbff9ce225b3116c47ddc1fcL247-R251), [[3]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-44cc6e98dcd8c3d2aa47210ec76d800058560df9bbff9ce225b3116c47ddc1fcR271-R281), [[4]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-44cc6e98dcd8c3d2aa47210ec76d800058560df9bbff9ce225b3116c47ddc1fcL304-R312), [[5]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-44cc6e98dcd8c3d2aa47210ec76d800058560df9bbff9ce225b3116c47ddc1fcL337-R345)).

Other Notable Changes:

  • RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs: Adjusted logic to determine if the party is full and added a description for checking if the player is in an alliance raid ([[1]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-dcfd2506d1ce54221fa2d12787392346547585e896b48e48de6d5fa8be631af4L87-R87), [[2]](https://github.com/FFXIV-CombatReborn/RotationSolverReborn/pull/563/files#diff-dcfd2506d1ce54221fa2d12787392346547585e896b48e48de6d5fa8be631af4R294-R299)).

- Modified `IsLastGCD` in `SGE_Default.cs` to check with `true` to correct duplicate casts
- Added config option in `Configs.cs` for focus-targeted players.
- Enhanced `DataCenter.cs` with new duty check properties/methods.
- Updated `ObjectHelper.cs` with new using directive, alliance check,
  focus target method, and fully qualified `ObjectKind`.
- Simplified `ModifyPepsisPvE` in `SageRotation.cs`.
- Added alliance raid and duty checks in `CustomRotation_OtherInfo.cs`.
- Updated `RotationConfigWindow.cs` with new UI text elements for
  status information.
Introduced a new enum `MasterfulBlitzUse` and a configuration
property `MBAbilities` to control Masterful Blitz usage logic.
Refactored related logic and updated `TheForbiddenChakraPvE`
usage. Renamed `IsAlliance` to `IsAllianceMember` for clarity
and updated relevant methods and properties. Corrected property
names for consistency and adjusted full party logic to consider
8 or 9 members.
@LTS-FFXIV LTS-FFXIV merged commit 551cf9a into main Jan 12, 2025
@LTS-FFXIV LTS-FFXIV deleted the chaoticHeal branch January 15, 2025 13:44
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.

1 participant