diff --git a/sim/common/sod/item_effects/phase_4.go b/sim/common/sod/item_effects/phase_4.go index 9e90293ec9..d17dd796d3 100644 --- a/sim/common/sod/item_effects/phase_4.go +++ b/sim/common/sod/item_effects/phase_4.go @@ -77,10 +77,12 @@ func init() { return } + duration := time.Second * 15 + aura := character.RegisterAura(core.Aura{ ActionID: core.ActionID{ItemID: WoodcarvedMoonstalker}, Label: "Woodcarved Moonstalker", - Duration: time.Second * 15, + Duration: duration, OnGain: func(aura *core.Aura, sim *core.Simulation) { character.AddStatDynamic(sim, stats.Strength, 60) }, @@ -96,9 +98,13 @@ func init() { Cast: core.CastConfig{ CD: core.Cooldown{ - Timer: character.GetOffensiveTrinketCD(), + Timer: character.NewTimer(), Duration: time.Second * 90, }, + SharedCD: core.Cooldown{ + Timer: character.GetOffensiveTrinketCD(), + Duration: duration, + }, }, ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { diff --git a/sim/core/consumes.go b/sim/core/consumes.go index 9db3188e76..1a8645346c 100644 --- a/sim/core/consumes.go +++ b/sim/core/consumes.go @@ -1009,7 +1009,7 @@ func makePotionActivation(potionType proto.Potions, character *Character, potion // Mark as 'Encounter Only' so that users are forced to select the generic Potion // placeholder action instead of specific potion spells, in APL prepull. This // prevents a mismatch between Consumes and Rotation settings. - mcd.Spell.Flags |= SpellFlagEncounterOnly | SpellFlagPotion + mcd.Spell.Flags |= SpellFlagEncounterOnly | SpellFlagPotion | SpellFlagCastTimeNoGCD oldApplyEffects := mcd.Spell.ApplyEffects mcd.Spell.ApplyEffects = func(sim *Simulation, target *Unit, spell *Spell) { oldApplyEffects(sim, target, spell) diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results index 5ea6d32a34..f222f76bba 100644 --- a/sim/druid/feral/TestFeral.results +++ b/sim/druid/feral/TestFeral.results @@ -148,10 +148,10 @@ character_stats_results: { character_stats_results: { key: "TestFeral-Lvl60-CharacterStats-Default" value: { - final_stats: 612.48 - final_stats: 409.97 - final_stats: 478.17 - final_stats: 287.76 + final_stats: 549.12 + final_stats: 416.57 + final_stats: 492.085 + final_stats: 289.08 final_stats: 205.7 final_stats: 0 final_stats: 0 @@ -161,36 +161,36 @@ character_stats_results: { final_stats: 0 final_stats: 0 final_stats: 41.25 - final_stats: 4 - final_stats: 32.60559 + final_stats: 5 + final_stats: 34.62764 final_stats: 0 final_stats: 0 - final_stats: 3122.93 - final_stats: 4 - final_stats: 47.3985 + final_stats: 2934.81 + final_stats: 5 + final_stats: 49.7285 final_stats: 0 final_stats: 0 final_stats: 0 - final_stats: 7280.4 + final_stats: 7300.2 final_stats: 0 final_stats: 0 - final_stats: 2389.94 - final_stats: 859 + final_stats: 2436.14 + final_stats: 791 final_stats: 0 final_stats: 5 final_stats: 0 - final_stats: 25.3985 + final_stats: 25.7285 final_stats: 5 final_stats: 0 - final_stats: 6703.935 + final_stats: 6850.0425 final_stats: 27 - final_stats: 141 + final_stats: 216 final_stats: 60 final_stats: 70 final_stats: 60 final_stats: 384 - final_stats: 44 - final_stats: 23 + final_stats: 0 + final_stats: 0 final_stats: 358 } } @@ -344,8 +344,9 @@ stat_weights_results: { stat_weights_results: { key: "TestFeral-Lvl60-StatWeights-Default" value: { - weights: 1.96998 - weights: 2.14399 + weights: 2.22065 + weights: 2.52859 + weights: 0 weights: 0 weights: 0 weights: 0 @@ -360,10 +361,9 @@ stat_weights_results: { weights: 0 weights: 0 weights: 0 + weights: 0.84116 weights: 0 - weights: 0.74621 - weights: 28.39404 - weights: 24.36576 + weights: 27.01037 weights: 0 weights: 0 weights: 0 @@ -1251,357 +1251,357 @@ dps_results: { dps_results: { key: "TestFeral-Lvl60-AllItems-BloodGuard'sCracklingLeather" value: { - dps: 1589.08596 - tps: 1149.03605 + dps: 1451.1908 + tps: 1060.08059 } } dps_results: { key: "TestFeral-Lvl60-AllItems-BloodGuard'sLeather" value: { - dps: 1670.28486 - tps: 1207.24147 + dps: 1497.12618 + tps: 1092.10058 } } dps_results: { key: "TestFeral-Lvl60-AllItems-BloodGuard'sRestoredLeather" value: { - dps: 1527.0314 - tps: 1103.96602 + dps: 1409.84038 + tps: 1030.02452 } } dps_results: { key: "TestFeral-Lvl60-AllItems-CoagulateBloodguard'sLeathers" value: { - dps: 2227.13087 - tps: 1599.1611 + dps: 2198.57004 + tps: 1582.96056 } } dps_results: { key: "TestFeral-Lvl60-AllItems-EmeraldDreamkeeperGarb" value: { - dps: 1534.81675 - tps: 1109.49362 + dps: 1415.1454 + tps: 1034.06453 } } dps_results: { key: "TestFeral-Lvl60-AllItems-EmeraldLeathers" value: { - dps: 1661.61881 - tps: 1201.08857 + dps: 1488.89174 + tps: 1086.24349 } } dps_results: { key: "TestFeral-Lvl60-AllItems-EmeraldWatcherVestments" value: { - dps: 1543.68835 - tps: 1115.87753 + dps: 1425.19179 + tps: 1041.14663 } } dps_results: { key: "TestFeral-Lvl60-AllItems-ExiledProphet'sRaiment" value: { - dps: 2088.41129 - tps: 1505.02174 + dps: 2044.56857 + tps: 1479.60405 } } dps_results: { key: "TestFeral-Lvl60-AllItems-FeralheartRaiment" value: { - dps: 1537.36272 - tps: 1106.32167 + dps: 1534.962 + tps: 1118.06993 } } dps_results: { key: "TestFeral-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather" value: { - dps: 1589.08596 - tps: 1149.03605 + dps: 1451.1908 + tps: 1060.08059 } } dps_results: { key: "TestFeral-Lvl60-AllItems-Knight-Lieutenant'sLeather" value: { - dps: 1670.28486 - tps: 1207.24147 + dps: 1497.12618 + tps: 1092.10058 } } dps_results: { key: "TestFeral-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather" value: { - dps: 1527.0314 - tps: 1103.96602 + dps: 1409.84038 + tps: 1030.02452 } } dps_results: { key: "TestFeral-Lvl60-AllItems-LostWorshipper'sArmor" value: { - dps: 2164.22267 - tps: 1559.83903 + dps: 2109.72747 + tps: 1526.16996 } } dps_results: { key: "TestFeral-Lvl60-Average-Default" value: { - dps: 3503.09036 - tps: 2504.88956 + dps: 3915.6936 + tps: 2803.85726 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 17518.48596 - tps: 12637.39734 + dps: 2648.75244 + tps: 2167.444 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 2315.41457 - tps: 1654.66426 + dps: 2648.75244 + tps: 1896.24215 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 2430.54515 - tps: 1734.33809 + dps: 2823.84949 + tps: 2017.19419 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 8029.67328 - tps: 5864.42556 + dps: 1354.39986 + tps: 1116.22052 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 1262.94614 - tps: 906.6982 + dps: 1354.39986 + tps: 970.04212 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 1364.12894 - tps: 977.84419 + dps: 1573.58211 + tps: 1124.43028 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 17518.48596 - tps: 12637.39734 + dps: 2648.75244 + tps: 2167.444 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 2315.41457 - tps: 1654.66426 + dps: 2648.75244 + tps: 1896.24215 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 2430.54515 - tps: 1734.33809 + dps: 2823.84949 + tps: 2017.19419 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 8029.67328 - tps: 5864.42556 + dps: 1354.39986 + tps: 1116.22052 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 1262.94614 - tps: 906.6982 + dps: 1354.39986 + tps: 970.04212 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 1364.12894 - tps: 977.84419 + dps: 1573.58211 + tps: 1124.43028 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 17518.48596 - tps: 12637.39734 + dps: 2648.75244 + tps: 2167.444 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 2315.41457 - tps: 1654.66426 + dps: 2648.75244 + tps: 1896.24215 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 2430.54515 - tps: 1734.33809 + dps: 2823.84949 + tps: 2017.19419 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 8029.67328 - tps: 5864.42556 + dps: 1354.39986 + tps: 1116.22052 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 1262.94614 - tps: 906.6982 + dps: 1354.39986 + tps: 970.04212 } } dps_results: { key: "TestFeral-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 1364.12894 - tps: 977.84419 + dps: 1573.58211 + tps: 1124.43028 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 18533.19475 - tps: 13368.18113 + dps: 2783.53836 + tps: 2267.45666 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 2435.16109 - tps: 1740.09729 + dps: 2783.53836 + tps: 1992.31826 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 2556.0985 - tps: 1823.47019 + dps: 2974.84101 + tps: 2124.40494 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 7989.15437 - tps: 5837.2228 + dps: 1350.19924 + tps: 1116.289 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 1260.11249 - tps: 904.70748 + dps: 1350.19924 + tps: 967.12704 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 1363.30078 - tps: 977.2562 + dps: 1568.31961 + tps: 1120.6939 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 18533.19475 - tps: 13368.18113 + dps: 2783.53836 + tps: 2267.45666 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 2435.16109 - tps: 1740.09729 + dps: 2783.53836 + tps: 1992.31826 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 2556.0985 - tps: 1823.47019 + dps: 2974.84101 + tps: 2124.40494 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 7989.15437 - tps: 5837.2228 + dps: 1350.19924 + tps: 1116.289 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 1260.11249 - tps: 904.70748 + dps: 1350.19924 + tps: 967.12704 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Default-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 1363.30078 - tps: 977.2562 + dps: 1568.31961 + tps: 1120.6939 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 18533.19475 - tps: 13368.18113 + dps: 2783.53836 + tps: 2267.45666 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 2435.16109 - tps: 1740.09729 + dps: 2783.53836 + tps: 1992.31826 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 2556.0985 - tps: 1823.47019 + dps: 2974.84101 + tps: 2124.40494 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget" value: { - dps: 7989.15437 - tps: 5837.2228 + dps: 1350.19924 + tps: 1116.289 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget" value: { - dps: 1260.11249 - tps: 904.70748 + dps: 1350.19924 + tps: 967.12704 } } dps_results: { key: "TestFeral-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget" value: { - dps: 1363.30078 - tps: 977.2562 + dps: 1568.31961 + tps: 1120.6939 } } dps_results: { key: "TestFeral-Lvl60-SwitchInFrontOfTarget-Default" value: { - dps: 2666.66011 - tps: 1896.34764 + dps: 3006.00799 + tps: 2147.62603 } } diff --git a/ui/enhancement_shaman/apls/phase_4.apl.json b/ui/enhancement_shaman/apls/phase_4.apl.json index efd2dafba8..f0b18c7567 100644 --- a/ui/enhancement_shaman/apls/phase_4.apl.json +++ b/ui/enhancement_shaman/apls/phase_4.apl.json @@ -16,8 +16,8 @@ {"action":{"castSpell":{"spellId":{"spellId":440580}}}}, {"action":{"autocastOtherCooldowns":{}}}, {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}},"castSpell":{"spellId":{"spellId":425336}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":408505}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":408490}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":408505}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":15208,"rank":10}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":408490}}},"rhs":{"const":{"val":"100ms"}}}}}},"castSpell":{"spellId":{"spellId":408490}}}}, + {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"autoTimeToNext":{"autoType":"Melee"}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":15208,"rank":10}}},"rhs":{"const":{"val":"100ms"}}}}}},"castSpell":{"spellId":{"spellId":15208,"rank":10}}}}, {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraNumStacks":{"auraId":{"spellId":408505}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"2"}}}}]}},"castSpell":{"spellId":{"spellId":10605,"rank":4}}}}, {"action":{"castSpell":{"spellId":{"spellId":26297}}}}, {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"55%"}}}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, diff --git a/ui/feral_druid/apls/phase_4.apl.json b/ui/feral_druid/apls/phase_4.apl.json index cd2ed82611..4640264174 100644 --- a/ui/feral_druid/apls/phase_4.apl.json +++ b/ui/feral_druid/apls/phase_4.apl.json @@ -1,27 +1,25 @@ { "type": "TypeAPL", "prepullActions": [ - {"action":{"activateAura":{"auraId":{"spellId":768}}},"doAtValue":{"const":{"val":"-10s"}}}, {"action":{"activateAura":{"auraId":{"spellId":407988}}},"doAtValue":{"const":{"val":"-8s"}}} ], "priorityList": [ {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":768}}}}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"currentMana":{}},"rhs":{"const":{"val":"1500.0"}}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentMana":{}},"rhs":{"currentManaPercent":{}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9904,"rank":4}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"gcdIsReady":{}}]}},"castSpell":{"spellId":{"itemId":12662}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpMul","lhs":{"const":{"val":"2.0"}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9904,"rank":4}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"gcdIsReady":{}},{"not":{"val":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9904,"rank":4}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":29166}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"not":{"val":{"or":{"vals":[{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}},{"and":{"vals":[{"spellIsKnown":{"spellId":{"otherId":"OtherActionPotion"}}},{"spellIsReady":{"spellId":{"otherId":"OtherActionPotion"}}}]}}]}}}}]}},"castSpell":{"spellId":{"spellId":29166}}}}, - {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9904,"rank":4}}},"rhs":{"const":{"val":"20.2"}}}}}}]}},{"and":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":417141}}},{"spellIsKnown":{"spellId":{"spellId":417141}}}]}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}]}}]}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}}]}},"castSpell":{"spellId":{"spellId":768}}}}, - {"action":{"autocastOtherCooldowns":{}}}, - {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":9907,"rank":4}}}}},"castSpell":{"spellId":{"spellId":17392,"rank":4}}}}, - {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20"}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"40"}}}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":407988}}}}},"castSpell":{"spellId":{"spellId":407988}}}}, - {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"numberTargets":{}},"rhs":{"const":{"val":"3"}}}},"castSpell":{"spellId":{"spellId":411128}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"math":{"op":"OpAdd","lhs":{"currentMana":{}},"rhs":{"const":{"val":"1500.0"}}}},"rhs":{"math":{"op":"OpDiv","lhs":{"currentMana":{}},"rhs":{"currentManaPercent":{}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}}]}},"castSpell":{"spellId":{"itemId":12662}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpMul","lhs":{"const":{"val":"2.0"}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"not":{"val":{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}}, + {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"40%"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}},{"cmp":{"op":"OpGt","lhs":{"currentMana":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":29166}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"not":{"val":{"or":{"vals":[{"and":{"vals":[{"spellIsKnown":{"spellId":{"itemId":12662}}},{"spellIsReady":{"spellId":{"itemId":12662}}}]}},{"and":{"vals":[{"spellIsKnown":{"spellId":{"otherId":"OtherActionPotion"}}},{"spellIsReady":{"spellId":{"otherId":"OtherActionPotion"}}}]}}]}}}}]}},"castSpell":{"spellId":{"spellId":29166}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"or":{"vals":[{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"math":{"op":"OpSub","lhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}},"rhs":{"const":{"val":"20.2"}}}}}}]}},{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":417141}}},{"auraIsActive":{"auraId":{"spellId":417141}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":768}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417045}}}}},{"or":{"vals":[{"not":{"val":{"energyThreshold":{"threshold":-59}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"not":{"val":{"energyThreshold":{"threshold":-39}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, + {"action":{"condition":{"or":{"vals":[{"not":{"val":{"energyThreshold":{"threshold":-79}}}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"gcdTimeToReady":{}}}},{"not":{"val":{"energyThreshold":{"threshold":-59}}}}]}}]}},"castSpell":{"spellId":{"spellId":417045}}}}, + {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":417045}}},"autocastOtherCooldowns":{}}}, {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":409828}}}}},"castSpell":{"spellId":{"spellId":409828}}}}, {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":16870}}},{"auraIsActiveWithReactionTime":{"auraId":{"spellId":16870}}}]}},"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407988}}},"rhs":{"const":{"val":"7s"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9896,"rank":6}}}}}]}},"castSpell":{"spellId":{"spellId":9896,"rank":6}}}}, - {"hide":true,"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},"castSpell":{"spellId":{"spellId":31018}}}}, + {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9896,"rank":6}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}},{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":407988}}},"rhs":{"const":{"val":"8.0"}}}},{"auraIsKnown":{"auraId":{"spellId":455873}}}]}}]}},"castSpell":{"spellId":{"spellId":9896,"rank":6}}}}, + {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9904,"rank":4}}}}},"castSpell":{"spellId":{"spellId":9904,"rank":4}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"cmp":{"op":"OpLt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.00"}}}},{"cmp":{"op":"OpGe","lhs":{"math":{"op":"OpAdd","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20.2"}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}}}}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpAdd","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"20.2"}}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCurrentCost":{"spellId":{"spellId":409828}}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":9830,"rank":5}}}}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}}, + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":455873}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5.0"}}}},{"auraIsActive":{"auraId":{"spellId":407988}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":417141}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"53.0"}}}}]}},"castSpell":{"spellId":{"spellId":31018}}}}, {"action":{"castSpell":{"spellId":{"spellId":9830,"rank":5}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":9904,"rank":4}}}}}]}},"castSpell":{"spellId":{"spellId":9904,"rank":4}}}}, - {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":414684}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.52s"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":414684}}}}}]}},"castSpell":{"spellId":{"spellId":414684}}}}, - {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02s"}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}} + {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":17061,"rank":5}}},{"cmp":{"op":"OpGe","lhs":{"currentMana":{}},"rhs":{"spellCurrentCost":{"spellId":{"spellId":768}}}}},{"cmp":{"op":"OpGt","lhs":{"timeToEnergyTick":{}},"rhs":{"const":{"val":"1.02"}}}}]}},"castSpell":{"spellId":{"spellId":409828}}}} ] } diff --git a/ui/feral_druid/gear_sets/phase_4.gear.json b/ui/feral_druid/gear_sets/phase_4.gear.json index 1146c9bbb8..b1d108ca15 100644 --- a/ui/feral_druid/gear_sets/phase_4.gear.json +++ b/ui/feral_druid/gear_sets/phase_4.gear.json @@ -1,21 +1,21 @@ { "items": [ {"id":226659,"enchant":7124,"rune":417145}, - {"id":19491}, + {"id":228685}, {"id":226665,"enchant":7328}, - {"id":228102,"enchant":849,"rune":439510}, + {"id":228290,"enchant":7564,"rune":439510}, {"id":226661,"enchant":1891,"rune":407977}, - {"id":226788,"enchant":1885,"rune":414719}, - {"id":226664,"enchant":927,"rune":407995}, - {"id":226789,"rune":417141}, - {"id":226666,"enchant":1506,"rune":407988}, + {"id":226662,"enchant":1885,"rune":414719}, + {"id":228257,"enchant":927,"rune":407995}, + {"id":226660,"rune":417141}, + {"id":226666,"enchant":1505,"rune":407988}, {"id":226663,"enchant":1887,"rune":417046}, - {"id":228080,"rune":442896}, + {"id":228286,"rune":442896}, {"id":228261,"rune":453622}, - {"id":228089}, {"id":228078}, + {"id":228089}, {"id":227683,"enchant":1900}, {}, - {"id":228181} + {"id":22397} ] }