Skip to content

Commit

Permalink
Merge branch 'master' into feature/apl-aura-sets
Browse files Browse the repository at this point in the history 
 Changes to be committed:
	modified:   sim/death_knight/unholy/TestUnholy.results
  • Loading branch information
@NerdEgghead
NerdEgghead committed Nov 6, 2024
2 parents a7320dc + f8ec572 commit 37c437e
Show file tree
Hide file tree
Showing 41 changed files with 6,051 additions and 1,842 deletions.
18 changes: 15 additions & 3 deletions sim/common/cata/stat_bonus_cds.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ func init() {
shared.NewStrengthActive(64689, 1520, time.Second*20, time.Minute*2) // Bloodthirsty Gladiator's Badge of Victory
shared.NewStrengthActive(62464, 1605, time.Second*20, time.Minute*2) // Impatience of Youth (Alliance)
shared.NewStrengthActive(62469, 1605, time.Second*20, time.Minute*2) // Impatience of Youth (Horde)
shared.NewStrengthActive(61034, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Victory
shared.NewStrengthActive(61034, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Victory - 365
shared.NewStrengthActive(70519, 1794, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Victory - 371
shared.NewStrengthActive(70400, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Victory - 384
shared.NewStrengthActive(72450, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Victory - 390
shared.NewStrengthActive(73496, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Victory
shared.NewStrengthActive(69002, 1277, time.Second*15, time.Minute) // Essence of the Eternal Flame
shared.NewStrengthActive(77987, 2029, time.Second*15, time.Second*90) // Rotting Skull 384 - Not available to players
shared.NewStrengthActive(77116, 2290, time.Second*15, time.Second*90) // Rotting Skull 397 - Valor Points
Expand All @@ -43,7 +47,11 @@ func init() {
shared.NewAgilityActive(62468, 1605, time.Second*20, time.Minute*2) // Unsolvable Riddle (Alliance)
shared.NewAgilityActive(62463, 1605, time.Second*20, time.Minute*2) // Unsolvable Riddle (Horde)
shared.NewAgilityActive(68709, 1605, time.Second*20, time.Minute*2) // Unsolvable Riddle (No Faction)
shared.NewAgilityActive(61033, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Conquest
shared.NewAgilityActive(61033, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Conquest - 365
shared.NewAgilityActive(70517, 1794, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Conquest - 371
shared.NewAgilityActive(70399, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Conquest - 384
shared.NewAgilityActive(72304, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Conquest - 390
shared.NewAgilityActive(73648, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Conquest
shared.NewAgilityActive(69001, 1277, time.Second*15, time.Minute) // Ancient Petrified Seed
shared.NewAgilityActive(77984, 2029, time.Second*15, time.Second*90) // Kiroptyric Sigil 384 - Not available to players
shared.NewAgilityActive(77113, 2290, time.Second*15, time.Second*90) // Kiroptyric Sigil 397 - Valor Points
Expand Down Expand Up @@ -72,7 +80,11 @@ func init() {
shared.NewSpellPowerActive(52353, 1425, time.Second*20, time.Minute*2) // Figurine - Jeweled Serpent
shared.NewSpellPowerActive(64688, 1520, time.Second*20, time.Minute*2) // Bloodthirsty Gladiator's Badge of Dominance
shared.NewSpellPowerActive(58183, 1926, time.Second*20, time.Minute*2) // Soul Casket
shared.NewSpellPowerActive(61035, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Dominance
shared.NewSpellPowerActive(61035, 1605, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Dominance - 365
shared.NewSpellPowerActive(70518, 1794, time.Second*20, time.Minute*2) // Vicious Gladiator's Badge of Dominance - 371
shared.NewSpellPowerActive(70401, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Dominance - 384
shared.NewSpellPowerActive(72448, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Dominance - 390
shared.NewSpellPowerActive(73498, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Dominance
shared.NewSpellPowerActive(77985, 2029, time.Second*15, time.Second*90) // Bottled Wishes 384 - Not available to players
shared.NewSpellPowerActive(77114, 2290, time.Second*15, time.Second*90) // Bottled Wishes 397 - Valor Points
shared.NewSpellPowerActive(78005, 2585, time.Second*15, time.Second*90) // Bottled Wishes 410 - Not available to players
Expand Down
168 changes: 162 additions & 6 deletions sim/common/cata/stat_bonus_procs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,39 +843,195 @@ func init() {
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Dominance",
Name: "Vicious Gladiator's Insignia of Dominance - 365",
ID: 61045,
AuraID: 85027,
Bonus: stats.Stats{stats.SpellPower: 963},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskSpellDamage | core.ProcMaskSpellHealing,
ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.25,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Dominance - 371",
ID: 70578,
AuraID: 99719,
Bonus: stats.Stats{stats.SpellPower: 1077},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.25,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Ruthless Gladiator's Insignia of Dominance - 384",
ID: 70402,
AuraID: 99742,
Bonus: stats.Stats{stats.SpellPower: 1218},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.25,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Ruthless Gladiator's Insignia of Dominance - 390",
ID: 72449,
AuraID: 102435,
Bonus: stats.Stats{stats.SpellPower: 1287},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.25,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Victory",
Name: "Cataclysmic Gladiator's Insignia of Dominance",
ID: 73497,
AuraID: 105137,
Bonus: stats.Stats{stats.SpellPower: 1452},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskSpellHealing | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.25,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Victory - 365",
ID: 61046,
AuraID: 85032,
Bonus: stats.Stats{stats.Strength: 963},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Victory - 371",
ID: 70579,
AuraID: 99721,
Bonus: stats.Stats{stats.Strength: 1077},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Ruthless Gladiator's Insignia of Victory - 384",
ID: 70403,
AuraID: 99746,
Bonus: stats.Stats{stats.Strength: 1218},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Conquest",
Name: "Ruthless Gladiator's Insignia of Victory - 390",
ID: 72455,
AuraID: 102432,
Bonus: stats.Stats{stats.Strength: 1287},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Cataclysmic Gladiator's Insignia of Victory",
ID: 73491,
AuraID: 105139,
Bonus: stats.Stats{stats.Strength: 1452},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt | core.CallbackOnHealDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Conquest - 365",
ID: 61047,
AuraID: 85022,
Bonus: stats.Stats{stats.Agility: 963},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Vicious Gladiator's Insignia of Conquest - 371",
ID: 70577,
AuraID: 99717,
Bonus: stats.Stats{stats.Agility: 1077},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Ruthless Gladiator's Insignia of Conquest - 384",
ID: 70404,
AuraID: 99748,
Bonus: stats.Stats{stats.Agility: 1218},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Ruthless Gladiator's Insignia of Conquest - 390",
ID: 72309,
AuraID: 102439,
Bonus: stats.Stats{stats.Agility: 1287},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
})

shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
Name: "Cataclysmic Gladiator's Insignia of Conquest",
ID: 73643,
AuraID: 105135,
Bonus: stats.Stats{stats.Agility: 1452},
Duration: time.Second * 20,
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskDirect | core.ProcMaskProc,
Outcome: core.OutcomeLanded,
ProcChance: 0.15,
ICD: time.Second * 55,
Expand Down
Loading

0 comments on commit 37c437e

Please sign in to comment.