Merge pull request #1763 from psiven/master

ProtWar Sets and ProtPal Updates
wowsims · Nov 19, 2022 · 0644297 · 0644297
2 parents b355e60 + e969e23
commit 0644297
Show file tree

Hide file tree

Showing 13 changed files with 657 additions and 454 deletions.
diff --git a/proto/paladin.proto b/proto/paladin.proto
@@ -214,6 +214,7 @@ message ProtectionPaladin {
  message Rotation {
  bool hammer_first = 1;
  bool use_custom_prio = 2;
+ bool squeeze_holy_wrath = 4;
 
  enum SpellOption {
  NoSpell = 0;

diff --git a/sim/core/health.go b/sim/core/health.go
@@ -144,17 +144,18 @@ func (character *Character) applyHealingModel(healingModel *proto.HealingModel)
 
  character.RegisterResetEffect(func(sim *Simulation) {
  // Hack since we don't have OnHealingReceived aura handlers yet.
- ardentDefenderAura := character.GetAura("Ardent Defender")
+ //ardentDefenderAura := character.GetAura("Ardent Defender")
  willOfTheNecropolisAura := character.GetAura("Will of The Necropolis")
 
  StartPeriodicAction(sim, PeriodicActionOptions{
  Period: cadence,
  OnAction: func(sim *Simulation) {
  character.GainHealth(sim, healPerTick, healthMetrics)
 
- if ardentDefenderAura != nil && character.CurrentHealthPercent() >= 0.35 {
- ardentDefenderAura.Deactivate(sim)
- }
+ // Might use this again in the future to track "absorb" metrics but currently disabled
+ //if ardentDefenderAura != nil && character.CurrentHealthPercent() >= 0.35 {
+ // ardentDefenderAura.Deactivate(sim)
+ //}
 
  if willOfTheNecropolisAura != nil && character.CurrentHealthPercent() > 0.35 {
  willOfTheNecropolisAura.Deactivate(sim)
@@ -168,6 +169,7 @@ func (character *Character) GetPresimOptions(playerConfig *proto.Player) *Presim
  healingModel := playerConfig.HealingModel
  if healingModel == nil || healingModel.Hps != 0 || healingModel.CadenceSeconds == 0 {
  // If Hps is not 0, then we don't need to run the presim.
+ // Tank sims should always have nonzero Cadence set, even if disabled
  return nil
  }
  return &PresimOptions{