Merge pull request #4070 from wowsims/apl

Update hunter SV advanced APL
wowsims · Dec 2, 2023 · e326eaf · e326eaf
2 parents dac6877 + 2c3d83a
commit e326eaf
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
@@ -974,43 +974,43 @@ dps_results: {
 dps_results: {
  key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-FullBuffs-LongMultiTarget"
  value: {
-  dps: 20805.46913
-  tps: 21146.86295
+  dps: 20149.03802
+  tps: 20319.58535
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7673.73577
-  tps: 6678.30553
+  dps: 7739.69999
+  tps: 6751.73331
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9033.39524
-  tps: 7872.30977
+  dps: 9017.30232
+  tps: 7856.16408
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-NoBuffs-LongMultiTarget"
  value: {
-  dps: 11127.46461
-  tps: 12244.98551
+  dps: 10466.05932
+  tps: 11547.97439
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3852.22419
-  tps: 3533.24561
+  dps: 3933.31377
+  tps: 3612.25168
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-p1_sv-Basic-sv_advanced-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4783.39388
-  tps: 4385.25304
+  dps: 4848.84425
+  tps: 4448.7804
  }
 }
 dps_results: {
@@ -1100,43 +1100,43 @@ dps_results: {
 dps_results: {
  key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-FullBuffs-LongMultiTarget"
  value: {
-  dps: 20919.74866
-  tps: 21198.13783
+  dps: 20279.19292
+  tps: 20389.06726
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7717.59411
-  tps: 6665.29867
+  dps: 7792.00246
+  tps: 6749.02253
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9099.35634
-  tps: 7869.81526
+  dps: 9099.28167
+  tps: 7869.87002
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-NoBuffs-LongMultiTarget"
  value: {
-  dps: 11197.64507
-  tps: 12302.2452
+  dps: 10507.53265
+  tps: 11565.82034
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3877.99349
-  tps: 3537.19207
+  dps: 3958.60189
+  tps: 3618.87902
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-p1_sv-Basic-sv_advanced-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4821.09836
-  tps: 4399.4616
+  dps: 4895.3864
+  tps: 4471.19964
  }
 }
 dps_results: {

diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
@@ -13,7 +13,7 @@ character_stats_results: {
   final_stats: 221
   final_stats: 0
   final_stats: 5504.84
-  final_stats: 469.94995
+  final_stats: 469.94994
   final_stats: 2072.9756
   final_stats: 221
   final_stats: 94

diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results
@@ -13,7 +13,7 @@ character_stats_results: {
   final_stats: 264
   final_stats: 0
   final_stats: 5996.3904
-  final_stats: 418.94995
+  final_stats: 418.94994
   final_stats: 2218.9399
   final_stats: 264
   final_stats: 94

diff --git a/ui/hunter/apls/sv_advanced.apl.json b/ui/hunter/apls/sv_advanced.apl.json
@@ -8,17 +8,21 @@
     ],
     "priorityList": [
         {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},"castSpell":{"spellId":{"itemId":20520}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"30%"}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}},
-        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":61006}}}},
+        {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"20%"}}}},"castSpell":{"spellId":{"itemId":20520}}}},
+        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":61847}}}}},{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}}]}},"castSpell":{"spellId":{"spellId":61847}}}},
+        {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":34074}}}}},{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"5%"}}}}]}},"castSpell":{"spellId":{"spellId":34074}}}},
+        {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":61006}}},"rhs":{"const":{"val":"250ms"}}}}]}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":61006}}}}}},
+        {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":61006}}},"castSpell":{"spellId":{"spellId":61006}}}},
+        {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":60053}}},"rhs":{"const":{"val":"500ms"}}}}]}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":60053}}}}}},
         {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":60053}}}}},"castSpell":{"spellId":{"spellId":60053}}}},
         {"action":{"condition":{"dotIsActive":{"spellId":{"spellId":60053}}},"castSpell":{"spellId":{"spellId":60052}}}},
         {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49067}}}}},"castSpell":{"spellId":{"spellId":49067,"tag":1}}}},
-        {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":63672}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":63672}}}]}},"castSpell":{"spellId":{"spellId":63672}}}},
+        {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":63672}}},"castSpell":{"spellId":{"spellId":63672}}}},
         {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49001}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":49001}}}},
-        {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49048}}},"rhs":{"const":{"val":"0.2s"}}}},{"spellCanCast":{"spellId":{"spellId":49048}}}]}},"castSpell":{"spellId":{"spellId":49048}}}},
-        {"hide":true,"action":{"castSpell":{"spellId":{"spellId":49048}}}},
+        {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49050}}},"rhs":{"const":{"val":"250ms"}}}}]}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":49050}}}}}},
+        {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":49050}}},"castSpell":{"spellId":{"spellId":49050}}}},
+        {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":49048}}},"rhs":{"const":{"val":"200ms"}}}}]}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":49048}}}}}},
+        {"action":{"condition":{"spellIsReady":{"spellId":{"spellId":49048}}},"castSpell":{"spellId":{"spellId":49048}}}},
         {"action":{"castSpell":{"spellId":{"spellId":49052}}}}
     ]
 }