Skip to content

Commit

Permalink
Merge branch 'thewarwithin' of github.com:simulationcraft/simc into t…
Browse files Browse the repository at this point in the history 
…hewarwithin
  • Loading branch information
@HawkCorrigan
HawkCorrigan committed Oct 11, 2024
2 parents 9d4434b + 6969e5e commit cb8dc2a
Show file tree
Hide file tree
Showing 15 changed files with 9,059 additions and 96 deletions.
6 changes: 4 additions & 2 deletions ActionPriorityLists/druid_balance.simc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,12 @@ actions.pre_cd+=/potion,if=variable.cd_condition
actions.pre_cd+=/use_item,slot=trinket1,if=!trinket.1.is.spymasters_web&!trinket.1.is.imperfect_ascendancy_serum&!trinket.1.is.treacherous_transmitter&(variable.on_use_trinket=1|variable.on_use_trinket=3)&variable.cd_condition
actions.pre_cd+=/use_item,slot=trinket2,if=!trinket.2.is.spymasters_web&!trinket.2.is.imperfect_ascendancy_serum&!trinket.2.is.treacherous_transmitter&variable.on_use_trinket=2&variable.cd_condition

actions.st=wrath,if=variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)
actions.st+=/starfire,if=!variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)
actions.st=wrath,if=variable.enter_lunar&variable.eclipse&variable.eclipse_remains<cast_time
actions.st+=/starfire,if=!variable.enter_lunar&variable.eclipse&variable.eclipse_remains<cast_time
actions.st+=/sunfire,target_if=remains<3
actions.st+=/moonfire,target_if=remains<3&(!talent.treants_of_the_moon|cooldown.force_of_nature.remains>3&!buff.harmony_of_the_grove.up)
actions.st+=/wrath,if=variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)
actions.st+=/starfire,if=!variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)
actions.st+=/call_action_list,name=pre_cd
actions.st+=/celestial_alignment,if=variable.cd_condition
actions.st+=/incarnation,if=variable.cd_condition
Expand Down
60 changes: 30 additions & 30 deletions SpellDataDump/allspells.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194067,9 +194067,9 @@ Attributes : Is Ability (4), Passive (6)
Effects :
#1 (id=724663) : Apply Aura (6) | Dummy (4)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Target: Self (1)
#2 (id=724664) : Apply Aura (6) | Unknown(382)
#2 (id=724664) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Misc Value: 1 | Target: Self (1)
#3 (id=724665) : Apply Aura (6) | Unknown(382)
#3 (id=724665) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Misc Value: 28 | Target: Self (1)
Description : Increases pet health by $s1%.

Expand Down Expand Up @@ -346946,16 +346946,16 @@ Attributes : Passive (6), Do Not Display (Spellbook, Aura Icon, Combat Log
Effects :
#1 (id=1020827) : Apply Aura (6) | Modify Max Health% (133)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Target: Self (1)
#2 (id=1174067) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x1a0 | Target: Self (1)
#3 (id=1174068) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x4364 | Target: Self (1)
#4 (id=1174069) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x1a1 | Target: Self (1)
#5 (id=1174070) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x744 | Target: Self (1)
#6 (id=1174071) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x747 | Target: Self (1)
#2 (id=1174067) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 416 | Target: Self (1)
#3 (id=1174068) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 17252 | Target: Self (1)
#4 (id=1174069) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 417 | Target: Self (1)
#5 (id=1174070) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 1860 | Target: Self (1)
#6 (id=1174071) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 1863 | Target: Self (1)
Description : Increases you and your pets' maximum health by $s1%.

Name : Desperate Pact (id=386619) [Spell Family (5), Passive, Hidden]
Expand Down Expand Up @@ -414255,8 +414255,8 @@ Labels : 16: Class Spells
Attributes : Passive (6), Not In Spellbook (143), Do Not Log on Learn (355)
:
Effects :
#1 (id=1113274) : Apply Aura (6) | Unknown(382)
Base Value: 30 | Scaled Value: 30 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0xd6c7 | Target: Self (1)
#1 (id=1113274) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 30 | Scaled Value: 30 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 54983 | Target: Self (1)
Description : $?a137013[Your Force of Nature treants generate ${$429217m1/10} Astral Power every $429217t1 sec.][Your Grove Guardians' healing is increased by $s1%.]

Name : Sunstrider's Flourish (id=429216)
Expand Down Expand Up @@ -414357,8 +414357,8 @@ Labels : 16: Class Spells
Attributes : Passive (6), Not In Spellbook (143), Do Not Log on Learn (355)
:
Effects :
#1 (id=1113301) : Apply Aura (6) | Unknown(382)
Base Value: 100 | Scaled Value: 100 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x1958e | Target: Self (1)
#1 (id=1113301) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 100 | Scaled Value: 100 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 103822 | Target: Self (1)
Description : $?a137013[Your Force of Nature treants have 50% increased health.][Your Grove Guardians' Nourish and Swiftmend spells also apply a Minor Cenarion Ward that heals the target for $429222o1 over $429222d the next time they take damage.]

Name : Rezan's Fury (id=429228) [Passive, Hidden]
Expand Down Expand Up @@ -415198,8 +415198,8 @@ Effects :
Family Flags: 120
#2 (id=1124695) : Apply Aura (6) | Dummy (4)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Target: Self (1)
#3 (id=1124696) : Apply Aura (6) | Unknown(382)
Base Value: 40 | Scaled Value: 40 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x59 | Target: Self (1)
#3 (id=1124696) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 40 | Scaled Value: 40 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 89 | Target: Self (1)
#4 (id=1131611) : Apply Aura (6) | Dummy (4)
Base Value: 50 | Scaled Value: 50 | PvP Coefficient: 1.00000 | Target: Self (1)
#5 (id=1160404) : Apply Aura (6) | Dummy (4)
Expand Down Expand Up @@ -467168,18 +467168,18 @@ Labels : 16: Class Spells
Attributes : Passive (6), Do Not Display (Spellbook, Aura Icon, Combat Log) (7)
:
Effects :
#1 (id=1158978) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x21288 | Target: Self (1)
#2 (id=1173917) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 0x21288 | Target: Self (1)
#3 (id=1173918) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 0x373dc | Target: Self (1)
#4 (id=1173919) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x373dc | Target: Self (1)
#5 (id=1173920) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 0x373dd | Target: Self (1)
#6 (id=1173921) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x373dd | Target: Self (1)
#1 (id=1158978) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 135816 | Target: Self (1)
#2 (id=1173917) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 135816 | Target: Self (1)
#3 (id=1173918) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 226268 | Target: Self (1)
#4 (id=1173919) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 226268 | Target: Self (1)
#5 (id=1173920) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 226269 | Target: Self (1)
#6 (id=1173921) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 226269 | Target: Self (1)
Description : Increases Vilefiend damage by $s1% and your Vilefiend's Bile Spit now applies Wicked Maw.

Name : Lifeless Necrotic Relic (id=455511)
Expand Down
8 changes: 4 additions & 4 deletions SpellDataDump/druid.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17962,8 +17962,8 @@ Labels : 16: Class Spells
Attributes : Passive (6), Not In Spellbook (143), Do Not Log on Learn (355)
:
Effects :
#1 (id=1113274) : Apply Aura (6) | Unknown(382)
Base Value: 30 | Scaled Value: 30 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0xd6c7 | Target: Self (1)
#1 (id=1113274) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 30 | Scaled Value: 30 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 54983 | Target: Self (1)
Description : $?a137013[Your Force of Nature treants generate ${$429217m1/10} Astral Power every $429217t1 sec.][Your Grove Guardians' healing is increased by $s1%.]

Name : Bounteous Bloom (id=429217) [Spell Family (7), Hidden]
Expand Down Expand Up @@ -18019,8 +18019,8 @@ Labels : 16: Class Spells
Attributes : Passive (6), Not In Spellbook (143), Do Not Log on Learn (355)
:
Effects :
#1 (id=1113301) : Apply Aura (6) | Unknown(382)
Base Value: 100 | Scaled Value: 100 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x1958e | Target: Self (1)
#1 (id=1113301) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 100 | Scaled Value: 100 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 103822 | Target: Self (1)
Description : $?a137013[Your Force of Nature treants have 50% increased health.][Your Grove Guardians' Nourish and Swiftmend spells also apply a Minor Cenarion Ward that heals the target for $429222o1 over $429222d the next time they take damage.]

Name : Expansiveness (id=429399) [Spell Family (7), Passive]
Expand Down
4 changes: 2 additions & 2 deletions SpellDataDump/nonclass.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120381,9 +120381,9 @@ Attributes : Is Ability (4), Passive (6)
Effects :
#1 (id=724663) : Apply Aura (6) | Dummy (4)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Target: Self (1)
#2 (id=724664) : Apply Aura (6) | Unknown(382)
#2 (id=724664) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Misc Value: 1 | Target: Self (1)
#3 (id=724665) : Apply Aura (6) | Unknown(382)
#3 (id=724665) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Misc Value: 28 | Target: Self (1)
Description : Increases pet health by $s1%.

Expand Down
48 changes: 24 additions & 24 deletions SpellDataDump/warlock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10210,16 +10210,16 @@ Attributes : Passive (6), Do Not Display (Spellbook, Aura Icon, Combat Log
Effects :
#1 (id=1020827) : Apply Aura (6) | Modify Max Health% (133)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Target: Self (1)
#2 (id=1174067) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x1a0 | Target: Self (1)
#3 (id=1174068) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x4364 | Target: Self (1)
#4 (id=1174069) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x1a1 | Target: Self (1)
#5 (id=1174070) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x744 | Target: Self (1)
#6 (id=1174071) : Apply Aura (6) | Unknown(382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 0x747 | Target: Self (1)
#2 (id=1174067) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 416 | Target: Self (1)
#3 (id=1174068) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 17252 | Target: Self (1)
#4 (id=1174069) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 417 | Target: Self (1)
#5 (id=1174070) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 1860 | Target: Self (1)
#6 (id=1174071) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 5 | Scaled Value: 5 | PvP Coefficient: 1.00000 | Misc Value: 1 | Misc Value 2: 1863 | Target: Self (1)
Description : Increases you and your pets' maximum health by $s1%.

Name : Desperate Pact (id=386619) [Spell Family (5), Passive, Hidden]
Expand Down Expand Up @@ -14014,8 +14014,8 @@ Effects :
Family Flags: 120
#2 (id=1124695) : Apply Aura (6) | Dummy (4)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Target: Self (1)
#3 (id=1124696) : Apply Aura (6) | Unknown(382)
Base Value: 40 | Scaled Value: 40 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x59 | Target: Self (1)
#3 (id=1124696) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 40 | Scaled Value: 40 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 89 | Target: Self (1)
#4 (id=1131611) : Apply Aura (6) | Dummy (4)
Base Value: 50 | Scaled Value: 50 | PvP Coefficient: 1.00000 | Target: Self (1)
#5 (id=1160404) : Apply Aura (6) | Dummy (4)
Expand Down Expand Up @@ -16570,18 +16570,18 @@ Labels : 16: Class Spells
Attributes : Passive (6), Do Not Display (Spellbook, Aura Icon, Combat Log) (7)
:
Effects :
#1 (id=1158978) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x21288 | Target: Self (1)
#2 (id=1173917) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 0x21288 | Target: Self (1)
#3 (id=1173918) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 0x373dc | Target: Self (1)
#4 (id=1173919) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x373dc | Target: Self (1)
#5 (id=1173920) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 0x373dd | Target: Self (1)
#6 (id=1173921) : Apply Aura (6) | Unknown(382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 0x373dd | Target: Self (1)
#1 (id=1158978) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 135816 | Target: Self (1)
#2 (id=1173917) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 135816 | Target: Self (1)
#3 (id=1173918) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 226268 | Target: Self (1)
#4 (id=1173919) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 226268 | Target: Self (1)
#5 (id=1173920) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 2 | Misc Value 2: 226269 | Target: Self (1)
#6 (id=1173921) : Apply Aura (6) | Modify Pet Stat (382)
Base Value: 20 | Scaled Value: 20 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 226269 | Target: Self (1)
Description : Increases Vilefiend damage by $s1% and your Vilefiend's Bile Spit now applies Wicked Maw.

Name : Fiendish Oblation (id=455569) [Spell Family (5), Passive]
Expand Down
6 changes: 4 additions & 2 deletions engine/class_modules/apl/balance_apl.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ def->add_action( "warrior_of_elune,if=talent.lunar_calling|!talent.lunar_calling
def->add_action( "run_action_list,name=aoe,if=spell_targets>1" );
def->add_action( "run_action_list,name=st" );

st->add_action( "wrath,if=variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)" );
st->add_action( "starfire,if=!variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)" );
st->add_action( "wrath,if=variable.enter_lunar&variable.eclipse&variable.eclipse_remains<cast_time" );
st->add_action( "starfire,if=!variable.enter_lunar&variable.eclipse&variable.eclipse_remains<cast_time" );
st->add_action( "sunfire,target_if=remains<3" );
st->add_action( "moonfire,target_if=remains<3&(!talent.treants_of_the_moon|cooldown.force_of_nature.remains>3&!buff.harmony_of_the_grove.up)" );
st->add_action( "wrath,if=variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)" );
st->add_action( "starfire,if=!variable.enter_lunar&(!variable.eclipse|variable.eclipse_remains<cast_time)" );
st->add_action( "call_action_list,name=pre_cd" );
st->add_action( "celestial_alignment,if=variable.cd_condition" );
st->add_action( "incarnation,if=variable.cd_condition" );
Expand Down
Loading

0 comments on commit cb8dc2a

Please sign in to comment.