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

fixes pvp sets #62

Merged
merged 1 commit into from
Dec 30, 2024
Merged

fixes pvp sets #62

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
12 changes: 6 additions & 6 deletions sim/mage/TestP1Mage.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ dps_results: {
}
}
dps_results: {
key: "TestP1Mage-Phase1-AllItems-Champion'sRegalia"
key: "TestP1Mage-Phase1-AllItems-Champion'sArcanum"
value: {
dps: 479.60128
tps: 355.60874
dps: 512.72564
tps: 379.31583
}
}
dps_results: {
Expand Down Expand Up @@ -146,10 +146,10 @@ dps_results: {
}
}
dps_results: {
key: "TestP1Mage-Phase1-AllItems-LieutenantCommander'sRegalia"
key: "TestP1Mage-Phase1-AllItems-LieutenantCommander'sArcanum"
value: {
dps: 479.60128
tps: 355.60874
dps: 512.72564
tps: 379.31583
}
}
dps_results: {
Expand Down
12 changes: 6 additions & 6 deletions sim/mage/item_sets_pvp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
)

///////////////////////////////////////////////////////////////////////////
// SoD Phase 4 Item Sets
// Clasic Phase 2
///////////////////////////////////////////////////////////////////////////

var ItemSetChampionsRegalia = core.NewItemSet(core.ItemSet{
Name: "Champion's Regalia",
var ItemSetChampionsArcanum = core.NewItemSet(core.ItemSet{
Name: "Champion's Arcanum",
Bonuses: map[int32]core.ApplyEffect{
// Increases damage and healing done by magical spells and effects by up to 23.
2: func(agent core.Agent) {
Expand All @@ -29,8 +29,8 @@ var ItemSetChampionsRegalia = core.NewItemSet(core.ItemSet{
},
})

var ItemSetLieutenantCommandersRegalia = core.NewItemSet(core.ItemSet{
Name: "Lieutenant Commander's Regalia",
var ItemSetLieutenantCommandersArcanum = core.NewItemSet(core.ItemSet{
Name: "Lieutenant Commander's Arcanum",
Bonuses: map[int32]core.ApplyEffect{
// Increases damage and healing done by magical spells and effects by up to 23.
2: func(agent core.Agent) {
Expand All @@ -50,7 +50,7 @@ var ItemSetLieutenantCommandersRegalia = core.NewItemSet(core.ItemSet{
})

///////////////////////////////////////////////////////////////////////////
// SoD Phase 4 Item Sets
// Phase 3 Items
///////////////////////////////////////////////////////////////////////////

var ItemSetWarlordsRegalia = core.NewItemSet(core.ItemSet{
Expand Down
26 changes: 20 additions & 6 deletions sim/rogue/dps_rogue/TestCombatDaggers.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ dps_results: {
}
}
dps_results: {
key: "TestCombatDaggers-Phase5-AllItems-Champion'sVestments"
key: "TestCombatDaggers-Phase5-AllItems-Champion'sGuard"
value: {
dps: 896.12446
tps: 636.24837
dps: 951.86163
tps: 675.82176
}
}
dps_results: {
Expand All @@ -132,10 +132,17 @@ dps_results: {
}
}
dps_results: {
key: "TestCombatDaggers-Phase5-AllItems-LieutenantCommander'sVestments"
key: "TestCombatDaggers-Phase5-AllItems-FieldMarshal'sVestments"
value: {
dps: 896.12446
tps: 636.24837
dps: 980.51726
tps: 696.16726
}
}
dps_results: {
key: "TestCombatDaggers-Phase5-AllItems-LieutenantCommander'sGuard"
value: {
dps: 951.86163
tps: 675.82176
}
}
dps_results: {
Expand All @@ -152,6 +159,13 @@ dps_results: {
tps: 677.12471
}
}
dps_results: {
key: "TestCombatDaggers-Phase5-AllItems-Warlord'sVestments"
value: {
dps: 980.51726
tps: 696.16726
}
}
dps_results: {
key: "TestCombatDaggers-Phase5-Average-Default"
value: {
Expand Down
26 changes: 20 additions & 6 deletions sim/rogue/dps_rogue/TestCombatSinisterStrike.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ dps_results: {
}
}
dps_results: {
key: "TestCombatSinisterStrike-Phase5-AllItems-Champion'sVestments"
key: "TestCombatSinisterStrike-Phase5-AllItems-Champion'sGuard"
value: {
dps: 919.47147
tps: 652.82474
dps: 965.37804
tps: 685.41841
}
}
dps_results: {
Expand All @@ -132,10 +132,17 @@ dps_results: {
}
}
dps_results: {
key: "TestCombatSinisterStrike-Phase5-AllItems-LieutenantCommander'sVestments"
key: "TestCombatSinisterStrike-Phase5-AllItems-FieldMarshal'sVestments"
value: {
dps: 919.47147
tps: 652.82474
dps: 1018.98979
tps: 723.48275
}
}
dps_results: {
key: "TestCombatSinisterStrike-Phase5-AllItems-LieutenantCommander'sGuard"
value: {
dps: 965.37804
tps: 685.41841
}
}
dps_results: {
Expand All @@ -152,6 +159,13 @@ dps_results: {
tps: 711.48551
}
}
dps_results: {
key: "TestCombatSinisterStrike-Phase5-AllItems-Warlord'sVestments"
value: {
dps: 1018.98979
tps: 723.48275
}
}
dps_results: {
key: "TestCombatSinisterStrike-Phase5-Average-Default"
value: {
Expand Down
54 changes: 50 additions & 4 deletions sim/rogue/items_sets_pvp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
// Classic Phase 2
///////////////////////////////////////////////////////////////////////////

var ItemSetChampionsVestments = core.NewItemSet(core.ItemSet{
Name: "Champion's Vestments",
var ItemSetChampionsGuard = core.NewItemSet(core.ItemSet{
Name: "Champion's Guard",
Bonuses: map[int32]core.ApplyEffect{
// +40 Attack Power.
2: func(agent core.Agent) {
Expand All @@ -32,8 +32,8 @@ var ItemSetChampionsVestments = core.NewItemSet(core.ItemSet{
},
})

var ItemSetLieutenantCommandersVestments = core.NewItemSet(core.ItemSet{
Name: "Lieutenant Commander's Vestments",
var ItemSetLieutenantCommandersGuard = core.NewItemSet(core.ItemSet{
Name: "Lieutenant Commander's Guard",
Bonuses: map[int32]core.ApplyEffect{
// +40 Attack Power.
2: func(agent core.Agent) {
Expand All @@ -54,3 +54,49 @@ var ItemSetLieutenantCommandersVestments = core.NewItemSet(core.ItemSet{
},
},
})

var ItemSetWarlordsVestments = core.NewItemSet(core.ItemSet{
Name: "Warlord's Vestments",
Bonuses: map[int32]core.ApplyEffect{
// +20 Stamina.
2: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStat(stats.Stamina, 20)
},
// Reduces the cooldown of your Gouge ability by 1 sec.
4: func(agent core.Agent) {
// Nothing to do
},
// +40 Attack Power.
6: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStats(stats.Stats{
stats.AttackPower: 40,
stats.RangedAttackPower: 40,
})
},
},
})

var ItemSetFieldMarshalsVestments = core.NewItemSet(core.ItemSet{
Name: "Field Marshal's Vestments",
Bonuses: map[int32]core.ApplyEffect{
// +20 Stamina.
2: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStat(stats.Stamina, 20)
},
// Reduces the cooldown of your Gouge ability by 1 sec.
4: func(agent core.Agent) {
// Nothing to do
},
// +40 Attack Power.
6: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStats(stats.Stats{
stats.AttackPower: 40,
stats.RangedAttackPower: 40,
})
},
},
})
26 changes: 20 additions & 6 deletions sim/warrior/dps_warrior/TestP1DPSWarrior.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ dps_results: {
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Champion'sBattlegear"
key: "TestP1DPSWarrior-Phase1-AllItems-Champion'sBattlearmor"
value: {
dps: 1197.18775
tps: 1047.39886
dps: 1281.15573
tps: 1120.66888
}
}
dps_results: {
Expand All @@ -139,10 +139,17 @@ dps_results: {
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-LieutenantCommander'sBattlegear"
key: "TestP1DPSWarrior-Phase1-AllItems-FieldMarshal'sBattlegear"
value: {
dps: 1197.18775
tps: 1047.39886
dps: 1351.18502
tps: 1181.04309
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-LieutenantCommander'sBattlearmor"
value: {
dps: 1281.15573
tps: 1120.66888
}
}
dps_results: {
Expand All @@ -152,6 +159,13 @@ dps_results: {
tps: 1198.43317
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-AllItems-Warlord'sBattlegear"
value: {
dps: 1351.18502
tps: 1181.04309
}
}
dps_results: {
key: "TestP1DPSWarrior-Phase1-Average-Default"
value: {
Expand Down
54 changes: 50 additions & 4 deletions sim/warrior/item_sets_pvp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
// Classic Phase 2
///////////////////////////////////////////////////////////////////////////

var ItemSetChampionsBattlegear = core.NewItemSet(core.ItemSet{
Name: "Champion's Battlegear",
var ItemSetChampionsBattlearmor = core.NewItemSet(core.ItemSet{
Name: "Champion's Battlearmor",
Bonuses: map[int32]core.ApplyEffect{
// +40 Attack Power.
2: func(agent core.Agent) {
Expand All @@ -32,8 +32,8 @@ var ItemSetChampionsBattlegear = core.NewItemSet(core.ItemSet{
},
})

var ItemSetLieutenantCommandersBattlegear = core.NewItemSet(core.ItemSet{
Name: "Lieutenant Commander's Battlegear",
var ItemSetLieutenantCommandersBattlearmor = core.NewItemSet(core.ItemSet{
Name: "Lieutenant Commander's Battlearmor",
Bonuses: map[int32]core.ApplyEffect{
// +40 Attack Power.
2: func(agent core.Agent) {
Expand All @@ -54,3 +54,49 @@ var ItemSetLieutenantCommandersBattlegear = core.NewItemSet(core.ItemSet{
},
},
})

var ItemSetWarlordsBattlegear = core.NewItemSet(core.ItemSet{
Name: "Warlord's Battlegear",
Bonuses: map[int32]core.ApplyEffect{
// +20 Stamina.
2: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStat(stats.Stamina, 20)
},
// Reduces the cooldown of your Intercept ability by 5 sec.
4: func(agent core.Agent) {
// Nothing to do
},
// +40 Attack Power.
6: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStats(stats.Stats{
stats.AttackPower: 40,
stats.RangedAttackPower: 40,
})
},
},
})

var ItemSetFieldMarshalsBattlegear = core.NewItemSet(core.ItemSet{
Name: "Field Marshal's Battlegear",
Bonuses: map[int32]core.ApplyEffect{
// +20 Stamina.
2: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStat(stats.Stamina, 20)
},
// Reduces the cooldown of your Intercept ability by 5 sec.
4: func(agent core.Agent) {
// Nothing to do
},
// +40 Attack Power.
6: func(agent core.Agent) {
c := agent.GetCharacter()
c.AddStats(stats.Stats{
stats.AttackPower: 40,
stats.RangedAttackPower: 40,
})
},
},
})
Loading
Loading