Skip to content

Commit

Permalink
fix: import latest scripts from SimulationCraft (#1042)
Browse files Browse the repository at this point in the history
* fix: support health.pct from SimulationCraft profiles

* fix: import scripts from SimC master from 2021-10-08

Import updated scripts from SimulationCraft master branch from
2021-10-08 for:
  - Druid (balance)
  - Mage (arcane, fire)
  - Priest (shadow)
  - Warlock (demonology)
  • Loading branch information
johnnylam88 committed Oct 11, 2021
1 parent f388bed commit 5afb9ee
Show file tree
Hide file tree
Showing 7 changed files with 248 additions and 169 deletions.
16 changes: 8 additions & 8 deletions src/scripts/ovale_druid.ts

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/scripts/ovale_hunter.ts
Expand Up @@ -144,8 +144,8 @@ AddFunction beast_masterystshortcdactions
unless spell(kill_shot)
{
#wailing_arrow,if=cooldown.resonating_arrow.remains<gcd&(!talent.explosive_shot|buff.bloodlust.up)|!covenant.kyrian|cooldown.resonating_arrow.remains|target.time_to_die<5
if spellcooldown(resonating_arrow) < gcd() and { not hastalent(explosive_shot_talent) or buffpresent(bloodlust) } or not iscovenant("kyrian") or spellcooldown(resonating_arrow) > 0 or target.timetodie() < 5 spell(wailing_arrow)
#wailing_arrow,if=cooldown.resonating_arrow.remains<gcd&(!talent.explosive_shot|buff.bloodlust.up)|!covenant.kyrian|target.time_to_die<5
if spellcooldown(resonating_arrow) < gcd() and { not hastalent(explosive_shot_talent) or buffpresent(bloodlust) } or not iscovenant("kyrian") or target.timetodie() < 5 spell(wailing_arrow)
unless { spellcooldown(bestial_wrath) < 12 * charges(barbed_shot count=0) + gcd() and hastalent(scent_of_blood_talent_beast_mastery) or spellfullrecharge(barbed_shot) < gcd() and spellcooldown(bestial_wrath) > 0 or target.timetodie() < 9 } and spell(barbed_shot)
{
Expand Down Expand Up @@ -192,7 +192,7 @@ AddFunction beast_masterystcdactions
#wild_spirits,if=!raid_event.adds.exists|!raid_event.adds.up&raid_event.adds.duration+raid_event.adds.in<20|raid_event.adds.up&raid_event.adds.remains>19
if not never(raid_event_adds_exists) or not never(raid_event_adds_exists) and 10 + 600 < 20 or never(raid_event_adds_exists) and 0 > 19 spell(wild_spirits)
unless spell(flayed_shot) or spell(kill_shot) or { spellcooldown(resonating_arrow) < gcd() and { not hastalent(explosive_shot_talent) or buffpresent(bloodlust) } or not iscovenant("kyrian") or spellcooldown(resonating_arrow) > 0 or target.timetodie() < 5 } and spell(wailing_arrow) or { spellcooldown(bestial_wrath) < 12 * charges(barbed_shot count=0) + gcd() and hastalent(scent_of_blood_talent_beast_mastery) or spellfullrecharge(barbed_shot) < gcd() and spellcooldown(bestial_wrath) > 0 or target.timetodie() < 9 } and spell(barbed_shot) or focus() + focuscastingregen(death_chakram) < maxfocus() and spell(death_chakram)
unless spell(flayed_shot) or spell(kill_shot) or { spellcooldown(resonating_arrow) < gcd() and { not hastalent(explosive_shot_talent) or buffpresent(bloodlust) } or not iscovenant("kyrian") or target.timetodie() < 5 } and spell(wailing_arrow) or { spellcooldown(bestial_wrath) < 12 * charges(barbed_shot count=0) + gcd() and hastalent(scent_of_blood_talent_beast_mastery) or spellfullrecharge(barbed_shot) < gcd() and spellcooldown(bestial_wrath) > 0 or target.timetodie() < 9 } and spell(barbed_shot) or focus() + focuscastingregen(death_chakram) < maxfocus() and spell(death_chakram)
{
#stampede,if=buff.aspect_of_the_wild.up|target.time_to_die<15
if buffpresent(aspect_of_the_wild) or target.timetodie() < 15 spell(stampede)
Expand All @@ -214,7 +214,7 @@ AddFunction beast_masterystcdactions
AddFunction beast_masterystcdpostconditions
{
{ pet.buffpresent(frenzy_buff) and pet.buffremaining(frenzy_buff) <= gcd() or buffpresent(wild_spirits) and charges(barbed_shot count=0) > 1.4 and runeforge(fragments_of_the_elder_antlers_runeforge) } and spell(barbed_shot) or runeforge(soulforge_embers_runeforge) and buffremaining(tar_trap) < gcd() and spellcooldown(flare) < gcd() and spell(tar_trap) or buffpresent(tar_trap) and runeforge(soulforge_embers_runeforge) and spell(flare) or spell(bloodshed) or spell(flayed_shot) or spell(kill_shot) or { spellcooldown(resonating_arrow) < gcd() and { not hastalent(explosive_shot_talent) or buffpresent(bloodlust) } or not iscovenant("kyrian") or spellcooldown(resonating_arrow) > 0 or target.timetodie() < 5 } and spell(wailing_arrow) or { spellcooldown(bestial_wrath) < 12 * charges(barbed_shot count=0) + gcd() and hastalent(scent_of_blood_talent_beast_mastery) or spellfullrecharge(barbed_shot) < gcd() and spellcooldown(bestial_wrath) > 0 or target.timetodie() < 9 } and spell(barbed_shot) or focus() + focuscastingregen(death_chakram) < maxfocus() and spell(death_chakram) or spell(a_murder_of_crows) or { buffpresent(bestial_wrath) or target.timetodie() < 10 } and { not never(raid_event_adds_exists) or not never(raid_event_adds_exists) and { 10 + 600 < 20 or 0 == 1 } or never(raid_event_adds_exists) and 0 > 19 } and spell(resonating_arrow) or { spellcooldown(wild_spirits) > 15 or iscovenant("kyrian") and { spellcooldown(resonating_arrow) < 5 or spellcooldown(resonating_arrow) > 20 } or target.timetodie() < 15 or not iscovenant("night_fae") and not iscovenant("kyrian") } and { not never(raid_event_adds_exists) or not never(raid_event_adds_exists) and { 10 + 600 < 20 or 0 == 1 } or never(raid_event_adds_exists) and 0 > 19 } and spell(bestial_wrath) or spell(chimaera_shot) or spell(kill_command) or { buffexpires(bestial_wrath) or target.timetodie() < 5 } and spell(bag_of_tricks) or spell(dire_beast) or { focus() - powercost(cobra_shot) + focusregenrate() * { spellcooldown(kill_command) - 1 } > powercost(kill_command) or spellcooldown(kill_command) > 1 + gcd() or { buffpresent(bestial_wrath) or buffpresent(nesingwarys_trapping_apparatus_buff) } and not runeforge(qapla_eredun_war_order_runeforge) or target.timetodie() < 3 } and spell(cobra_shot) or { buffpresent(wild_spirits) or charges(barbed_shot count=0) > 1.2 and conduit(bloodletting_conduit) } and spell(barbed_shot) or { runeforge(soulforge_embers_runeforge) or runeforge(nessingwarys_trapping_apparatus_runeforge) } and spell(tar_trap) or runeforge(nessingwarys_trapping_apparatus_runeforge) and spell(freezing_trap)
{ pet.buffpresent(frenzy_buff) and pet.buffremaining(frenzy_buff) <= gcd() or buffpresent(wild_spirits) and charges(barbed_shot count=0) > 1.4 and runeforge(fragments_of_the_elder_antlers_runeforge) } and spell(barbed_shot) or runeforge(soulforge_embers_runeforge) and buffremaining(tar_trap) < gcd() and spellcooldown(flare) < gcd() and spell(tar_trap) or buffpresent(tar_trap) and runeforge(soulforge_embers_runeforge) and spell(flare) or spell(bloodshed) or spell(flayed_shot) or spell(kill_shot) or { spellcooldown(resonating_arrow) < gcd() and { not hastalent(explosive_shot_talent) or buffpresent(bloodlust) } or not iscovenant("kyrian") or target.timetodie() < 5 } and spell(wailing_arrow) or { spellcooldown(bestial_wrath) < 12 * charges(barbed_shot count=0) + gcd() and hastalent(scent_of_blood_talent_beast_mastery) or spellfullrecharge(barbed_shot) < gcd() and spellcooldown(bestial_wrath) > 0 or target.timetodie() < 9 } and spell(barbed_shot) or focus() + focuscastingregen(death_chakram) < maxfocus() and spell(death_chakram) or spell(a_murder_of_crows) or { buffpresent(bestial_wrath) or target.timetodie() < 10 } and { not never(raid_event_adds_exists) or not never(raid_event_adds_exists) and { 10 + 600 < 20 or 0 == 1 } or never(raid_event_adds_exists) and 0 > 19 } and spell(resonating_arrow) or { spellcooldown(wild_spirits) > 15 or iscovenant("kyrian") and { spellcooldown(resonating_arrow) < 5 or spellcooldown(resonating_arrow) > 20 } or target.timetodie() < 15 or not iscovenant("night_fae") and not iscovenant("kyrian") } and { not never(raid_event_adds_exists) or not never(raid_event_adds_exists) and { 10 + 600 < 20 or 0 == 1 } or never(raid_event_adds_exists) and 0 > 19 } and spell(bestial_wrath) or spell(chimaera_shot) or spell(kill_command) or { buffexpires(bestial_wrath) or target.timetodie() < 5 } and spell(bag_of_tricks) or spell(dire_beast) or { focus() - powercost(cobra_shot) + focusregenrate() * { spellcooldown(kill_command) - 1 } > powercost(kill_command) or spellcooldown(kill_command) > 1 + gcd() or { buffpresent(bestial_wrath) or buffpresent(nesingwarys_trapping_apparatus_buff) } and not runeforge(qapla_eredun_war_order_runeforge) or target.timetodie() < 3 } and spell(cobra_shot) or { buffpresent(wild_spirits) or charges(barbed_shot count=0) > 1.2 and conduit(bloodletting_conduit) } and spell(barbed_shot) or { runeforge(soulforge_embers_runeforge) or runeforge(nessingwarys_trapping_apparatus_runeforge) } and spell(tar_trap) or runeforge(nessingwarys_trapping_apparatus_runeforge) and spell(freezing_trap)
}
### actions.precombat
Expand Down

0 comments on commit 5afb9ee

Please sign in to comment.