Skip to content

Commit

Permalink
Remove coalesced regret, allow warchief's sun thieves in the grasslands
Browse files Browse the repository at this point in the history
  • Loading branch information
@FelixPflaum
FelixPflaum committed Nov 21, 2024
1 parent 605290b commit ca318a4
Show file tree
Hide file tree
Showing 20 changed files with 197 additions and 210 deletions.
9 changes: 4 additions & 5 deletions proto/common.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,10 @@ enum ZanzaBuff {

message MiscConsumes {
bool bogling_root = 1;
bool elixir_of_coalesced_regret = 2;
bool juju_ember = 3;
bool juju_chill = 4;
bool juju_escape = 5;
bool juju_flurry = 6;
bool juju_ember = 2;
bool juju_chill = 3;
bool juju_escape = 4;
bool juju_flurry = 5;
}

message PetMiscConsumes {
Expand Down
2 changes: 1 addition & 1 deletion sim/core/buffs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2143,7 +2143,7 @@ func ApplySongflowerSerenade(unit *Unit) {
}

func ApplyWarchiefsBuffs(unit *Unit, buffs *proto.IndividualBuffs, isAlliance bool, isHorde bool) {
if buffs.WarchiefsBlessing && isHorde {
if buffs.WarchiefsBlessing /* && isHorde */ {
ApplyWarchiefsBlessing(unit, "WarchiefsBuff")
}
}
Expand Down
10 changes: 0 additions & 10 deletions sim/core/consumes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,16 +611,6 @@ func applyMiscConsumes(character *Character, miscConsumes *proto.MiscConsumes) {
character.PseudoStats.BonusPhysicalDamage += 1
}

if miscConsumes.ElixirOfCoalescedRegret {
character.AddStats(stats.Stats{
stats.Stamina: 1,
stats.Agility: 1,
stats.Strength: 1,
stats.Intellect: 1,
stats.Spirit: 1,
})
}

if miscConsumes.JujuEmber {
character.AddStat(stats.FireResistance, 15)
}
Expand Down
8 changes: 4 additions & 4 deletions sim/druid/balance/TestBalance.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ dps_results: {
dps_results: {
key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 514.55703
tps: 750.86219
dps: 520.28089
tps: 758.25771
}
}
dps_results: {
key: "TestBalance-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 403.21466
tps: 416.06733
dps: 409.77009
tps: 422.72601
}
}
dps_results: {
Expand Down
24 changes: 12 additions & 12 deletions sim/druid/feral/TestFeral.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ dps_results: {
dps_results: {
key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 402.37416
tps: 518.26188
dps: 405.3226
tps: 520.99922
}
}
dps_results: {
key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 381.0503
tps: 282.21897
dps: 384.24199
tps: 284.53209
}
}
dps_results: {
Expand Down Expand Up @@ -148,15 +148,15 @@ dps_results: {
dps_results: {
key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 402.37416
tps: 518.26188
dps: 405.3226
tps: 520.99922
}
}
dps_results: {
key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 381.0503
tps: 282.21897
dps: 384.24199
tps: 284.53209
}
}
dps_results: {
Expand Down Expand Up @@ -190,15 +190,15 @@ dps_results: {
dps_results: {
key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 402.37416
tps: 518.26188
dps: 405.3226
tps: 520.99922
}
}
dps_results: {
key: "TestFeral-Phase5-Lvl60-Settings-NightElf-blank-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 381.0503
tps: 282.21897
dps: 384.24199
tps: 284.53209
}
}
dps_results: {
Expand Down
24 changes: 12 additions & 12 deletions sim/hunter/TestBM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,22 @@ dps_results: {
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 859.33765
tps: 874.55169
dps: 938.88875
tps: 912.66402
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 598.76357
tps: 279.15801
dps: 667.23482
tps: 313.89596
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_melee-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 627.58942
tps: 276.35825
dps: 701.09983
tps: 319.47299
}
}
dps_results: {
Expand All @@ -148,22 +148,22 @@ dps_results: {
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 747.70435
tps: 718.10614
dps: 787.77778
tps: 681.30603
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 660.88371
tps: 342.06625
dps: 698.66246
tps: 339.611
}
}
dps_results: {
key: "TestBM-Phase2-Lvl40-Settings-NightElf-placeholder-Basic-p2_ranged_bm-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 701.0324
tps: 342.51098
dps: 734.58089
tps: 336.78729
}
}
dps_results: {
Expand Down
6 changes: 3 additions & 3 deletions sim/hunter/TestMM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,21 @@ dps_results: {
key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 419.37663
tps: 579.53896
tps: 579.42693
}
}
dps_results: {
key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 274.78179
tps: 282.80957
tps: 282.80397
}
}
dps_results: {
key: "TestMM-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_ranged-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 266.84113
tps: 276.58129
tps: 276.55328
}
}
dps_results: {
Expand Down
12 changes: 6 additions & 6 deletions sim/hunter/TestSV.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,22 @@ dps_results: {
dps_results: {
key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 1267.77882
tps: 1879.29945
dps: 1324.90663
tps: 1909.48506
}
}
dps_results: {
key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 426.59025
tps: 362.74026
dps: 459.93206
tps: 397.14761
}
}
dps_results: {
key: "TestSV-Phase4-Lvl60-Settings-Dwarf-placeholder-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 425.95885
tps: 351.13112
dps: 460.26913
tps: 394.30809
}
}
dps_results: {
Expand Down
10 changes: 5 additions & 5 deletions sim/mage/TestArcane.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,22 @@ dps_results: {
dps_results: {
key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 371.87485
tps: 653.94848
dps: 371.0616
tps: 648.00894
}
}
dps_results: {
key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 371.87485
tps: 385.97853
dps: 371.0616
tps: 384.90897
}
}
dps_results: {
key: "TestArcane-Phase5-Lvl60-Settings-Gnome-blank-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 388.44813
tps: 404.37983
tps: 404.27494
}
}
dps_results: {
Expand Down
12 changes: 6 additions & 6 deletions sim/mage/TestFire.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,22 @@ dps_results: {
dps_results: {
key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 328.52541
tps: 562.21997
dps: 336.04823
tps: 563.87387
}
}
dps_results: {
key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 328.52541
tps: 246.5804
dps: 336.04823
tps: 251.66577
}
}
dps_results: {
key: "TestFire-Phase5-Lvl60-Settings-Gnome-blank-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 414.68439
tps: 302.05357
dps: 414.69838
tps: 302.05805
}
}
dps_results: {
Expand Down
10 changes: 5 additions & 5 deletions sim/mage/TestFrost.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,22 @@ dps_results: {
dps_results: {
key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
value: {
dps: 397.37884
tps: 587.62691
dps: 399.58783
tps: 587.87827
}
}
dps_results: {
key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
value: {
dps: 397.37884
tps: 317.79797
dps: 399.58783
tps: 318.94962
}
}
dps_results: {
key: "TestFrost-Phase5-Lvl60-Settings-Gnome-blank-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
value: {
dps: 400.34254
tps: 323.00782
tps: 322.31659
}
}
dps_results: {
Expand Down
Loading

0 comments on commit ca318a4

Please sign in to comment.