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

Add back prepull Mastery for secondary trinket swaps during swapped prepull #1307

Merged
merged 5 commits into from
Jan 16, 2025
Merged

Add back prepull Mastery for secondary trinket swaps during swapped prepull #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bff6a6
Add ItemSwap tests to Elemental
1337LutZ Jan 16, 2025
4b648f6
Merge branch 'feature/add-trinket-swapping' of https://github.com/wow…
1337LutZ Jan 16, 2025
add91e3
Merge branch 'master' into feature/add-trinket-swapping
1337LutZ Jan 16, 2025
77608e5
Add back prepull mastery for static secondary trinket swaps
1337LutZ Jan 16, 2025
bb8dc87
Add character != nil check to APL
1337LutZ Jan 16, 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
2 changes: 1 addition & 1 deletion proto/warlock.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ message WarlockOptions {

Summon summon = 1;
bool detonate_seed = 2;
int32 prepull_mastery = 3 [deprecated=true]; // Use Item Swap sets instead
int32 prepull_mastery = 3; // Used for static Mastery Item Swap sets
int32 prepull_post_snapshot_mana = 4 [deprecated=true]; // Use Item Swap sets instead
bool use_item_swap_bonus_stats = 5;
}
Expand Down
2 changes: 1 addition & 1 deletion sim/core/apl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (unit *Unit) newAPLRotation(config *proto.APLRotation) *APLRotation {
}

// If user has Item Swapping enabled and hasn't swapped back to the main set do it here.
if character.ItemSwap.IsEnabled() {
if character != nil && character.ItemSwap.IsEnabled() {
var hasMainSwap bool
for _, prepullAction := range rotation.allPrepullActions() {
if action, ok := prepullAction.impl.(*APLActionItemSwap); ok {
Expand Down
Loading
Loading