Skip to content

Commit

Permalink
Merge branch 'dragonflight' of https://github.com/simulationcraft/simc
Browse files Browse the repository at this point in the history
…into dragonflight
  • Loading branch information
Hinalover committed Jun 29, 2023
2 parents 2b0629e + b655f95 commit b1994f9
Show file tree
Hide file tree
Showing 39 changed files with 1,486 additions and 1,423 deletions.
231 changes: 118 additions & 113 deletions SpellDataDump/allspells_ptr.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SpellDataDump/build_info_ptr.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SimulationCraft 1010-01 for World of Warcraft 10.1.0.50000 Live (hotfix 2023-06-28/50000, git build dragonflight 03109ff)
SimulationCraft 1010-01 for World of Warcraft 10.1.0.50000 Live (hotfix 2023-06-28/50000, git build dragonflight b6a200c)
2 changes: 1 addition & 1 deletion SpellDataDump/druid_ptr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5011,7 +5011,7 @@ Effects :
Affected Spells: Frenzied Regeneration (22842)
Family Flags: 62
#20 (id=1080082) : Apply Aura (6) | Apply Flat Modifier w/ Label (219): Spell Effect 1 (3)
Base Value: -10 | Scaled Value: -10 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 2672 (Label) | Target: Self (1)
Base Value: -5 | Scaled Value: -5 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 2672 (Label) | Target: Self (1)
#21 (id=1081594) : Apply Aura (6) | Apply Flat Modifier w/ Label (219): Spell Effect 2 (12)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Misc Value: 12 | Misc Value 2: 2672 (Label) | Target: Self (1)
Description : Restoration Druid core passive
Expand Down
2 changes: 1 addition & 1 deletion SpellDataDump/evoker_ptr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ Effects :
Affected Spells: Emerald Blossom (355913), Verdant Embrace (360995), Living Flame (361469), Expunge (365585), Cauterizing Flame (374251)
Family Flags: 10, 24, 52, 57, 61
#14 (id=1081590) : Apply Aura (6) | Apply Flat Modifier w/ Label (219): Spell Effect 1 (3)
Base Value: -10 | Scaled Value: -10 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 2672 (Label) | Target: Self (1)
Base Value: -5 | Scaled Value: -5 | PvP Coefficient: 1.00000 | Misc Value: 3 | Misc Value 2: 2672 (Label) | Target: Self (1)
#15 (id=1081591) : Apply Aura (6) | Apply Flat Modifier w/ Label (219): Spell Effect 2 (12)
Base Value: 10 | Scaled Value: 10 | PvP Coefficient: 1.00000 | Misc Value: 12 | Misc Value 2: 2672 (Label) | Target: Self (1)
#16 (id=1082253) : Apply Aura (6) | Apply Flat Modifier w/ Label (219): Spell Max Stacks (37)
Expand Down
53 changes: 10 additions & 43 deletions SpellDataDump/mage_ptr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ Up to $s2 Icicles can be stored. Any excess Icicles gained will be automatically

Increases the damage of Frozen Orb, Blizzard, and Comet Storm by $321684s1%.

Increases the damage of Ice Lance, Glacial Spike, Ebonbolt and Ray of Frost by $321684s2%.][]
Increases the damage of Ice Lance, Glacial Spike, and Ray of Frost by $321684s2%.][]

Name : Clearcasting (id=79684) [Spell Family (3), Passive]
Class : Arcane Mage
Expand Down Expand Up @@ -4618,7 +4618,7 @@ Effects :
Description : Reduces the cooldown of Fire Blast by $s3 sec and increases the maximum number of charges by $s1.

Name : Frozen Touch (id=205030) [Spell Family (3), Passive]
Talent Entry : Frost [tree=spec, row=6, col=2, max_rank=1, req_points=8, select_idx=100]
Talent Entry : Frost [tree=spec, row=6, col=2, max_rank=1, req_points=8]
Class : Mage
School : Frost
Spell Type : None
Expand Down Expand Up @@ -6424,7 +6424,7 @@ Description : Deals $s1 Holy Damage to enemies within $A1.
Heals $s2 to allies within $A1.

Name : Ebonbolt (id=257537) [Spell Family (3)]
Talent Entry : Frost [tree=spec, row=6, col=2, max_rank=1, req_points=8, select_idx=200]
Talent Entry : Frost [tree=spec, row=6, col=2, max_rank=1, req_points=8]
Class : Mage
School : Frost
Spell Type : Magic
Expand Down Expand Up @@ -10326,7 +10326,6 @@ Description : $@spelldesc327489
Tooltip : Your next Hot Streak, Brain Freeze or Clearcasting will not be consumed.

Name : Slick Ice (id=327508) [Spell Family (3), Passive]
Class : Mage
School : Physical
Spell Type : None
Proc Chance : 101%
Expand All @@ -10346,41 +10345,7 @@ Effects :
Base Value: 75 | Scaled Value: 75 | PvP Coefficient: 1.00000 | Trigger Spell: 327511 | Target: Self (1)
Description : While Icy Veins is active, each Frostbolt you cast reduces the cast time of Frostbolt by $327509s1% and increases its damage by $327509s2%, stacking up to $327509u times.

Name : Slick Ice (id=327509) [Spell Family (3)]
Class : Mage
School : Physical
Spell Type : None
Duration : 60 seconds
Stacks : 10 maximum
Proc Chance : 101%
Triggered by : Slick Ice (327511)
Attributes : ........ ........ ........ ........ ........ ........ ........ ........
: ........ x....... ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ..x..... ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........
: Include In Advanced Combat Log (72), Do Not Display Duration (170)
Effects :
#1 (id=819012) : Apply Aura (6) | Add Percent Modifier (108): Spell Cast Time (10)
Base Value: -2 | Scaled Value: -2 | PvP Coefficient: 1.00000 | Misc Value: 10 | Target: Self (1)
Affected Spells: Frostbolt (116)
Family Flags: 57
#2 (id=819013) : Apply Aura (6) | Add Percent Modifier (108): Spell Global Cooldown (21)
Base Value: -2 | Scaled Value: -2 | PvP Coefficient: 1.00000 | Misc Value: 21 | Target: Self (1)
Affected Spells: Frostbolt (116)
Family Flags: 57
#3 (id=874424) : Apply Aura (6) | Add Percent Modifier (108): Spell Direct Amount (0)
Base Value: 3 | Scaled Value: 3 | PvP Coefficient: 1.00000 | Target: Self (1)
Affected Spells: Frostbolt (116), Frostbolt (228597)
Family Flags: 5
Description : $@spelldesc327508
Tooltip : Cast time of Frostbolt reduced by $s1% and its damage is increased by $s2%.

Name : Slick Ice (id=327511) [Spell Family (3), Hidden]
Class : Mage
School : Physical
Spell Type : None
Duration : 60 seconds
Expand Down Expand Up @@ -12769,14 +12734,14 @@ Attributes : ......x. ........ ........ ........ ........ ........ .....
Effects :
#1 (id=1013390) : Apply Aura (6) | Proc Trigger Spell (42): Slick Ice
Base Value: 75 | Scaled Value: 75 | PvP Coefficient: 1.00000 | Trigger Spell: 382151 | Target: Self (1)
Description : While Icy Veins is active, each Frostbolt you cast reduces the cast time of Frostbolt by $327509s1% and increases its damage by $327509s2%, stacking up to $327509u times.
Description : While Icy Veins is active, each Frostbolt you cast reduces the cast time of Frostbolt by $382148s1% and increases its damage by $382148s2%, stacking up to $382148u times.

Name : Slick Ice (id=382148) [Spell Family (3)]
Class : Mage
School : Frost
Spell Type : None
Duration : 60 seconds
Stacks : 10 maximum
Stacks : 5 maximum
Proc Chance : 101%
Triggered by : Slick Ice (382151)
Attributes : ........ ........ ........ ........ ........ ........ ........ ........
Expand All @@ -12790,11 +12755,11 @@ Attributes : ........ ........ ........ ........ ........ ........ .....
: Include In Advanced Combat Log (72), Do Not Display Duration (170)
Effects :
#1 (id=1013394) : Apply Aura (6) | Add Percent Modifier (108): Spell Cast Time (10)
Base Value: -2 | Scaled Value: -2 | PvP Coefficient: 1.00000 | Misc Value: 10 | Target: Self (1)
Base Value: -4 | Scaled Value: -4 | PvP Coefficient: 1.00000 | Misc Value: 10 | Target: Self (1)
Affected Spells: Frostbolt (116)
Family Flags: 57
#2 (id=1013395) : Apply Aura (6) | Add Percent Modifier (108): Spell Global Cooldown (21)
Base Value: -2 | Scaled Value: -2 | PvP Coefficient: 1.00000 | Misc Value: 21 | Target: Self (1)
Base Value: -4 | Scaled Value: -4 | PvP Coefficient: 1.00000 | Misc Value: 21 | Target: Self (1)
Affected Spells: Frostbolt (116)
Family Flags: 57
#3 (id=1013397) : Apply Aura (6) | Add Percent Modifier (108): Spell Direct Amount (0)
Expand Down Expand Up @@ -16126,7 +16091,9 @@ Effects :
Family Flags: 9
#2 (id=1090103) : Apply Aura (6) | Dummy (4)
Base Value: 45 | Scaled Value: 45 | PvP Coefficient: 1.00000 | Target: Self (1)
Description : Cone of Cold's cooldown is increased to $s2 sec and resets the cooldown of Frozen Orb and Comet Storm. In addition, Cone of Cold applies Winter's Chill to all enemies hit.
#3 (id=1093835) : Dummy (3)
Base Value: 3 | Scaled Value: 3 | PvP Coefficient: 1.00000
Description : Cone of Cold's cooldown is increased to $s2 sec and if Cone of Cold hits $s3 or more enemies it resets the cooldown of Frozen Orb and Comet Storm. In addition, Cone of Cold applies Winter's Chill to all enemies hit.

Cone of Cold's cooldown can no longer be reduced by your cooldown reduction effects.

Expand Down
Loading

0 comments on commit b1994f9

Please sign in to comment.