Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vigo/rogueSets #2933

Merged
merged 1 commit into from
Apr 14, 2023
Merged

vigo/rogueSets #2933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions sim/rogue/ambush.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ func (rogue *Rogue) registerAmbushSpell() {
return !rogue.PseudoStats.InFrontOfTarget && rogue.GetMHWeapon().WeaponType == proto.WeaponType_WeaponTypeDagger
},

BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(ItemSetVanCleefs, 4), 5*core.CritRatingPerCritChance, 0) +
[]float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance +
BonusCritRating: []float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance +
25*core.CritRatingPerCritChance*float64(rogue.Talents.ImprovedAmbush),
// All of these use "Apply Aura: Modifies Damage/Healing Done", and stack additively.
DamageMultiplier: 2.75 * (1 +
Expand Down
4 changes: 2 additions & 2 deletions sim/rogue/backstab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (rogue *Rogue) registerBackstabSpell() {
return !rogue.PseudoStats.InFrontOfTarget && rogue.GetMHWeapon().WeaponType == proto.WeaponType_WeaponTypeDagger
},

BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(ItemSetVanCleefs, 4), 5*core.CritRatingPerCritChance, 0) +
BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(Tier9, 4), 5*core.CritRatingPerCritChance, 0) +
[]float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance +
10*core.CritRatingPerCritChance*float64(rogue.Talents.PuncturingWounds),
// All of these use "Apply Aura: Modifies Damage/Healing Done", and stack additively (up to 142%).
Expand All @@ -40,7 +40,7 @@ func (rogue *Rogue) registerBackstabSpell() {
0.03*float64(rogue.Talents.Aggression) +
0.05*float64(rogue.Talents.BladeTwisting) +
core.TernaryFloat64(rogue.Talents.SurpriseAttacks, 0.1, 0) +
core.TernaryFloat64(rogue.HasSetBonus(ItemSetSlayers, 4), 0.06, 0)) *
core.TernaryFloat64(rogue.HasSetBonus(Tier6, 4), 0.06, 0)) *
(1 + 0.02*float64(rogue.Talents.SinisterCalling)),
CritMultiplier: rogue.MeleeCritMultiplier(true),
ThreatMultiplier: 1,
Expand Down
3 changes: 1 addition & 2 deletions sim/rogue/ghostly_strike.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ func (rogue *Rogue) registerGhostlyStrikeSpell() {
IgnoreHaste: true,
},

BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(ItemSetVanCleefs, 4), 5*core.CritRatingPerCritChance, 0) +
[]float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance,
BonusCritRating: []float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables] * core.CritRatingPerCritChance,

DamageMultiplier: core.TernaryFloat64(rogue.HasDagger(core.MainHand), 1.8, 1.25) * core.TernaryFloat64(hasGlyph, 1.4, 1) * (1 + 0.02*float64(rogue.Talents.FindWeakness)),
CritMultiplier: rogue.MeleeCritMultiplier(true),
Expand Down
4 changes: 2 additions & 2 deletions sim/rogue/hemorrhage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ func (rogue *Rogue) registerHemorrhageSpell() {
IgnoreHaste: true,
},

BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(ItemSetVanCleefs, 4), 5*core.CritRatingPerCritChance, 0) +
BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(Tier9, 4), 5*core.CritRatingPerCritChance, 0) +
[]float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance,

DamageMultiplier: core.TernaryFloat64(rogue.HasDagger(core.MainHand), 1.6, 1.1) * (1 +
0.02*float64(rogue.Talents.FindWeakness) +
core.TernaryFloat64(rogue.HasSetBonus(ItemSetSlayers, 4), 0.06, 0)) *
core.TernaryFloat64(rogue.HasSetBonus(Tier6, 4), 0.06, 0)) *
(1 + 0.02*float64(rogue.Talents.SinisterCalling)),
CritMultiplier: rogue.MeleeCritMultiplier(true),
ThreatMultiplier: 1,
Expand Down
41 changes: 21 additions & 20 deletions sim/rogue/items.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/wowsims/wotlk/sim/core/stats"
)

var ItemSetGladiatorsVestments = core.NewItemSet(core.ItemSet{
var Arena = core.NewItemSet(core.ItemSet{
Name: "Gladiator's Vestments",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
Expand All @@ -21,8 +21,23 @@ var ItemSetGladiatorsVestments = core.NewItemSet(core.ItemSet{
},
})

var ItemSetVanCleefs = core.NewItemSet(core.ItemSet{
Name: "VanCleef's Battlegear",
var Tier10 = core.NewItemSet(core.ItemSet{
Name: "Shadowblade's Battlegear",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
// Your Tricks of the Trade now grants you 15 energy instead of costing energy.
// Handled in tricks_of_the_trade.go.
},
4: func(agent core.Agent) {
// Gives your melee finishing moves a 13% chance to add 3 combo points to your target.
// Handled in the finishing move effect applier
},
},
})

var Tier9 = core.NewItemSet(core.ItemSet{
Name: "VanCleef's Battlegear",
AlternativeName: "Garona's Battlegear",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
// Your Rupture ability has a chance each time it deals damage to reduce the cost of your next ability by 40 energy.
Expand Down Expand Up @@ -88,7 +103,7 @@ var ItemSetVanCleefs = core.NewItemSet(core.ItemSet{
},
})

var ItemSetTerrorblade = core.NewItemSet(core.ItemSet{
var Tier8 = core.NewItemSet(core.ItemSet{
Name: "Terrorblade Battlegear",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
Expand All @@ -102,21 +117,7 @@ var ItemSetTerrorblade = core.NewItemSet(core.ItemSet{
},
})

var ItemSetShadowblades = core.NewItemSet(core.ItemSet{
Name: "Shadowblade's Battlegear",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
// Your Tricks of the Trade now grants you 15 energy instead of costing energy.
// Handled in tricks_of_the_trade.go.
},
4: func(agent core.Agent) {
// Gives your melee finishing moves a 13% chance to add 3 combo points to your target.
// Handled in the finishing move effect applier
},
},
})

var ItemSetBonescythe = core.NewItemSet(core.ItemSet{
var Tier7 = core.NewItemSet(core.ItemSet{
Name: "Bonescythe Battlegear",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
Expand All @@ -130,7 +131,7 @@ var ItemSetBonescythe = core.NewItemSet(core.ItemSet{
},
})

var ItemSetSlayers = core.NewItemSet(core.ItemSet{
var Tier6 = core.NewItemSet(core.ItemSet{
Name: "Slayer's Armor",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
Expand Down
4 changes: 2 additions & 2 deletions sim/rogue/mutilate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ func (rogue *Rogue) newMutilateHitSpell(isMH bool) *core.Spell {
ProcMask: procMask,
Flags: core.SpellFlagMeleeMetrics | SpellFlagBuilder | SpellFlagColdBlooded,

BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(ItemSetVanCleefs, 4), 5*core.CritRatingPerCritChance, 0) +
BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(Tier9, 4), 5*core.CritRatingPerCritChance, 0) +
[]float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance +
5*core.CritRatingPerCritChance*float64(rogue.Talents.PuncturingWounds),

DamageMultiplierAdditive: 1 +
0.1*float64(rogue.Talents.Opportunity) +
0.02*float64(rogue.Talents.FindWeakness) +
core.TernaryFloat64(rogue.HasSetBonus(ItemSetSlayers, 4), 0.06, 0),
core.TernaryFloat64(rogue.HasSetBonus(Tier6, 4), 0.06, 0),
DamageMultiplier: 1 *
core.TernaryFloat64(isMH, 1, rogue.dwsMultiplier()),
CritMultiplier: rogue.MeleeCritMultiplier(true),
Expand Down
2 changes: 1 addition & 1 deletion sim/rogue/poisons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (rogue *Rogue) registerPoisonAuras() {

func (rogue *Rogue) registerDeadlyPoisonSpell() {
var energyMetrics *core.ResourceMetrics
if rogue.HasSetBonus(ItemSetTerrorblade, 2) {
if rogue.HasSetBonus(Tier8, 2) {
energyMetrics = rogue.NewEnergyMetrics(core.ActionID{SpellID: 64913})
}

Expand Down
2 changes: 1 addition & 1 deletion sim/rogue/rogue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func NewRogue(character core.Character, options *proto.Player) *Rogue {
if rogue.HasMajorGlyph(proto.RogueMajorGlyph_GlyphOfVigor) {
maxEnergy += 10
}
if rogue.HasSetBonus(ItemSetGladiatorsVestments, 4) {
if rogue.HasSetBonus(Arena, 4) {
maxEnergy += 10
}
rogue.maxEnergy = maxEnergy
Expand Down
4 changes: 2 additions & 2 deletions sim/rogue/rupture.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ func (rogue *Rogue) registerRupture() {
DamageMultiplier: 1 +
0.15*float64(rogue.Talents.BloodSpatter) +
0.02*float64(rogue.Talents.FindWeakness) +
core.TernaryFloat64(rogue.HasSetBonus(ItemSetBonescythe, 2), 0.1, 0) +
core.TernaryFloat64(rogue.HasSetBonus(ItemSetTerrorblade, 4), 0.2, 0) +
core.TernaryFloat64(rogue.HasSetBonus(Tier7, 2), 0.1, 0) +
core.TernaryFloat64(rogue.HasSetBonus(Tier8, 4), 0.2, 0) +
0.1*float64(rogue.Talents.SerratedBlades),
CritMultiplier: rogue.MeleeCritMultiplier(false),
ThreatMultiplier: 1,
Expand Down
4 changes: 2 additions & 2 deletions sim/rogue/sinister_strike.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ func (rogue *Rogue) registerSinisterStrikeSpell() {
IgnoreHaste: true,
},

BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(ItemSetVanCleefs, 4), 5*core.CritRatingPerCritChance, 0) +
BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(Tier9, 4), 5*core.CritRatingPerCritChance, 0) +
[]float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance,
DamageMultiplier: 1 +
0.02*float64(rogue.Talents.FindWeakness) +
0.03*float64(rogue.Talents.Aggression) +
0.05*float64(rogue.Talents.BladeTwisting) +
core.TernaryFloat64(rogue.Talents.SurpriseAttacks, 0.1, 0) +
core.TernaryFloat64(rogue.HasSetBonus(ItemSetSlayers, 4), 0.06, 0),
core.TernaryFloat64(rogue.HasSetBonus(Tier6, 4), 0.06, 0),
CritMultiplier: rogue.MeleeCritMultiplier(true),
ThreatMultiplier: 1,

Expand Down
2 changes: 1 addition & 1 deletion sim/rogue/slice_and_dice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (rogue *Rogue) registerSliceAndDice() {
}

hasteBonus := 1.4
if rogue.HasSetBonus(ItemSetSlayers, 2) {
if rogue.HasSetBonus(Tier6, 2) {
hasteBonus += 0.05
}
inverseHasteBonus := 1.0 / hasteBonus
Expand Down
4 changes: 2 additions & 2 deletions sim/rogue/talents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (rogue *Rogue) makeFinishingMoveEffectApplier() func(sim *core.Simulation,
ruthlessnessMetrics := rogue.NewComboPointMetrics(core.ActionID{SpellID: 14161})
relentlessStrikesMetrics := rogue.NewEnergyMetrics(core.ActionID{SpellID: getRelentlessStrikesSpellID(rogue.Talents.RelentlessStrikes)})
var mayhemMetrics *core.ResourceMetrics
if rogue.HasSetBonus(ItemSetShadowblades, 4) {
if rogue.HasSetBonus(Tier10, 4) {
mayhemMetrics = rogue.NewComboPointMetrics(core.ActionID{SpellID: 70802})
}

Expand All @@ -96,7 +96,7 @@ func (rogue *Rogue) makeFinishingMoveEffectApplier() func(sim *core.Simulation,
}

func (rogue *Rogue) makeCostModifier() func(baseCost float64) float64 {
if rogue.HasSetBonus(ItemSetBonescythe, 4) {
if rogue.HasSetBonus(Tier7, 4) {
return func(baseCost float64) float64 {
return math.RoundToEven(0.95 * baseCost)
}
Expand Down
2 changes: 1 addition & 1 deletion sim/rogue/tricks_of_the_trade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
func (rogue *Rogue) registerTricksOfTheTradeSpell() {
actionID := core.ActionID{SpellID: 57934}
energyMetrics := rogue.NewEnergyMetrics(actionID)
hasShadowblades := rogue.HasSetBonus(ItemSetShadowblades, 2)
hasShadowblades := rogue.HasSetBonus(Tier10, 2)
energyCost := 15 - 5*float64(rogue.Talents.FilthyTricks)

hasGlyph := rogue.HasMajorGlyph(proto.RogueMajorGlyph_GlyphOfTricksOfTheTrade)
Expand Down