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

Add sod p4 pvp sets, Dungeon set 2, hide more old sets #819

Merged
merged 5 commits into from
Jun 25, 2024
Merged

Add sod p4 pvp sets, Dungeon set 2, hide more old sets #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee30ae5
add sod pvp sets, hide more old sets
kayla-glick Jun 25, 2024
e42e26b
Merge branch 'master' into p4/gear
kayla-glick Jun 25, 2024
5fec1d7
add updated dungeon set 2 bonuses
kayla-glick Jun 25, 2024
08c4ca2
Merge branch 'p4/gear' of https://github.com/wowsims/sod into p4/gear
kayla-glick Jun 25, 2024
39e94e3
run make items, update tests
kayla-glick Jun 25, 2024
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
Binary file modified assets/database/db.bin
View file
Open in desktop
Binary file not shown.
385 changes: 282 additions & 103 deletions assets/database/db.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/database/leftover_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,8 +1559,8 @@
{"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down
14 changes: 0 additions & 14 deletions sim/druid/balance/TestBalance.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,13 +726,6 @@ dps_results: {
tps: 511.61449
}
}
dps_results: {
key: "TestBalance-Lvl60-AllItems-Champion'sSanctuary"
value: {
dps: 529.21204
tps: 544.40014
}
}
dps_results: {
key: "TestBalance-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
value: {
Expand Down Expand Up @@ -796,13 +789,6 @@ dps_results: {
tps: 511.61449
}
}
dps_results: {
key: "TestBalance-Lvl60-AllItems-LieutenantCommander'sSanctuary"
value: {
dps: 529.21204
tps: 544.40014
}
}
dps_results: {
key: "TestBalance-Lvl60-AllItems-LostWorshipper'sArmor"
value: {
Expand Down
16 changes: 0 additions & 16 deletions sim/druid/feral/TestFeral.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,14 +1272,6 @@ dps_results: {
hps: 14.10425
}
}
dps_results: {
key: "TestFeral-Lvl60-AllItems-Champion'sSanctuary"
value: {
dps: 995.64413
tps: 737.70804
hps: 14.10629
}
}
dps_results: {
key: "TestFeral-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
value: {
Expand Down Expand Up @@ -1352,14 +1344,6 @@ dps_results: {
hps: 14.10425
}
}
dps_results: {
key: "TestFeral-Lvl60-AllItems-LieutenantCommander'sSanctuary"
value: {
dps: 995.64413
tps: 737.70804
hps: 14.10629
}
}
dps_results: {
key: "TestFeral-Lvl60-AllItems-LostWorshipper'sArmor"
value: {
Expand Down
14 changes: 14 additions & 0 deletions sim/hunter/TestBM.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ stat_weights_results: {
weights: 0
}
}
dps_results: {
key: "TestBM-Lvl25-AllItems-BeastmasterArmor"
value: {
dps: 290.9345
tps: 159.83538
}
}
dps_results: {
key: "TestBM-Lvl25-Average-Default"
value: {
Expand Down Expand Up @@ -292,6 +299,13 @@ dps_results: {
tps: 99.37226
}
}
dps_results: {
key: "TestBM-Lvl40-AllItems-BeastmasterArmor"
value: {
dps: 483.49882
tps: 206.46067
}
}
dps_results: {
key: "TestBM-Lvl40-AllItems-SignetofBeasts-209823"
value: {
Expand Down
14 changes: 14 additions & 0 deletions sim/hunter/TestMM.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ stat_weights_results: {
weights: 0
}
}
dps_results: {
key: "TestMM-Lvl25-AllItems-BeastmasterArmor"
value: {
dps: 279.94285
tps: 165.51647
}
}
dps_results: {
key: "TestMM-Lvl25-Average-Default"
value: {
Expand Down Expand Up @@ -292,6 +299,13 @@ dps_results: {
tps: 99.87364
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-BeastmasterArmor"
value: {
dps: 308.90492
tps: 159.5114
}
}
dps_results: {
key: "TestMM-Lvl40-AllItems-SignetofBeasts-209823"
value: {
Expand Down
14 changes: 14 additions & 0 deletions sim/hunter/TestSV.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ stat_weights_results: {
weights: 0
}
}
dps_results: {
key: "TestSV-Lvl25-AllItems-BeastmasterArmor"
value: {
dps: 283.13205
tps: 159.82171
}
}
dps_results: {
key: "TestSV-Lvl25-Average-Default"
value: {
Expand Down Expand Up @@ -292,6 +299,13 @@ dps_results: {
tps: 97.98074
}
}
dps_results: {
key: "TestSV-Lvl40-AllItems-BeastmasterArmor"
value: {
dps: 401.48622
tps: 235.57609
}
}
dps_results: {
key: "TestSV-Lvl40-AllItems-SignetofBeasts-209823"
value: {
Expand Down
55 changes: 0 additions & 55 deletions sim/hunter/item_sets.go
View file
Open in desktop

This file was deleted.

78 changes: 78 additions & 0 deletions sim/hunter/item_sets_pve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package hunter

import (
"github.com/wowsims/sod/sim/core"
"github.com/wowsims/sod/sim/core/stats"
)

///////////////////////////////////////////////////////////////////////////
// SoD Phase 3 Item Sets
///////////////////////////////////////////////////////////////////////////

var ItemSetDreadHuntersChain = core.NewItemSet(core.ItemSet{
Name: "Dread Hunter's Chain",
Bonuses: map[int32]core.ApplyEffect{
2: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStat(stats.AttackPower, 20)
c.AddStat(stats.RangedAttackPower, 20)
},
3: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddBonusRangedCritRating(2)
},
},
})

///////////////////////////////////////////////////////////////////////////
// SoD Phase 4 Item Sets
///////////////////////////////////////////////////////////////////////////

var ItemSetBeastmasterArmor = core.NewItemSet(core.ItemSet{
Name: "Beastmaster Armor",
Bonuses: map[int32]core.ApplyEffect{
// +40 Attack Power.
2: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStats(stats.Stats{
stats.AttackPower: 40,
stats.RangedAttackPower: 40,
})
},
// Your melee and ranged autoattacks have a 6% chance to energize you for 300 mana.
4: func(agent core.Agent) {
c := agent.GetCharacter()
actionID := core.ActionID{SpellID: 450577}
manaMetrics := c.NewManaMetrics(actionID)

core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{
ActionID: actionID,
Name: "S03 - Mana Proc on Cast - Beaststalker Armor",
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskWhiteHit,
ProcChance: 0.06,
Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
if c.HasManaBar() {
c.AddMana(sim, 300, manaMetrics)
}
},
})
},
// +8 All Resistances.
6: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStats(stats.Stats{
stats.ArcaneResistance: 8,
stats.FireResistance: 8,
stats.FrostResistance: 8,
stats.NatureResistance: 8,
stats.ShadowResistance: 8,
})
},
// +200 Armor.
8: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStat(stats.Armor, 200)
},
},
})
Loading
Loading