Merge pull request #1333 from wowsims/release/p4-item-upgrades

[RELEASE] Phase 4 - Item Upgrades

Author: 1337LutZ

assets/database/db.bin

@@ -3235,219 +3235,219 @@ dps_results: {
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-p4-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 684505.48831
-  tps: 3.82689868727e+06
-  dtps: 1.6170308259e+06
-  hps: 182649.8653
+  dps: 937286.15166
+  tps: 4.87859268011e+06
+  dtps: 1.19221827561e+06
+  hps: 235201.27936
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 159230.28877
-  tps: 949556.78591
-  dtps: 83862.38609
-  hps: 95198.78843
+  dps: 211153.55221
+  tps: 1.20123832145e+06
+  dtps: 61410.61368
+  hps: 94381.16507
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-DefaultTalents-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-DefaultTalents-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 169652.06558
-  tps: 971946.69939
-  dtps: 82812.30595
-  hps: 99438.22347
+  dps: 223576.74965
+  tps: 1.22278703327e+06
+  dtps: 62107.67872
+  hps: 97899.19167
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-p4-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 526799.23247
-  tps: 2.95974630194e+06
-  dtps: 1.8165233137e+06
-  hps: 133976.95109
+  dps: 714075.80907
+  tps: 3.78986209106e+06
+  dtps: 1.35559634715e+06
+  hps: 173717.4033
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 124987.37325
-  tps: 744362.43356
-  dtps: 83846.7015
-  hps: 78857.96932
+  dps: 179595.46438
+  tps: 1.03374112642e+06
+  dtps: 62983.97158
+  hps: 79095.62177
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-DefaultTalents-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-DefaultTalents-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 127259.07927
-  tps: 742569.03683
-  dtps: 85286.54936
-  hps: 80911.46898
+  dps: 170113.00584
+  tps: 963060.99024
+  dtps: 65338.53561
+  hps: 76814.04487
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-p4-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 4.4363890088e+06
-  tps: 2.626867801279e+07
-  dtps: 1.60966052595e+06
-  hps: 152134.32379
+  dps: 5.79458776217e+06
+  tps: 3.259157583689e+07
+  dtps: 1.18860878376e+06
+  hps: 194843.3229
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 154589.75059
-  tps: 931328.24863
-  dtps: 81368.56151
-  hps: 82365.4687
+  dps: 206761.37892
+  tps: 1.18559589393e+06
+  dtps: 60162.14976
+  hps: 89645.59745
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-RC-example-build-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-RC-example-build-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 162374.26539
-  tps: 924613.50928
-  dtps: 76465.83332
-  hps: 90285.07851
+  dps: 213398.17205
+  tps: 1.15780210948e+06
+  dtps: 58062.88628
+  hps: 94382.95824
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-p4-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 3.59509646043e+06
-  tps: 2.109800752227e+07
-  dtps: 1.65760755854e+06
-  hps: 112776.75661
+  dps: 4.63912222163e+06
+  tps: 2.615282605038e+07
+  dtps: 1.23058416197e+06
+  hps: 147349.3889
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 130520.20648
-  tps: 787681.57778
-  dtps: 83361.84818
-  hps: 64807.50434
+  dps: 173474.33217
+  tps: 1.00444118359e+06
+  dtps: 61814.08543
+  hps: 71017.01741
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-p2-RC-example-build-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-p4-RC-example-build-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 126801.95039
-  tps: 747413.40961
-  dtps: 80673.75465
-  hps: 69555.05861
+  dps: 160911.21933
+  tps: 906813.78549
+  dtps: 60064.1858
+  hps: 71848.25847
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Worgen-p4-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 686681.90458
-  tps: 3.84979516579e+06
-  dtps: 1.61703072173e+06
-  hps: 182738.74539
+  dps: 942230.9785
+  tps: 4.92480786555e+06
+  dtps: 1.19222361168e+06
+  hps: 235397.82172
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-DefaultTalents-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 159539.33314
-  tps: 953664.37155
-  dtps: 83867.43631
-  hps: 95427.79836
+  dps: 211002.81072
+  tps: 1.20640861168e+06
+  dtps: 61525.13051
+  hps: 94522.2992
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-DefaultTalents-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-DefaultTalents-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 168516.27729
-  tps: 971265.49036
-  dtps: 82739.97148
-  hps: 99497.68218
+  dps: 222872.00937
+  tps: 1.2266727322e+06
+  dtps: 62107.67872
+  hps: 97859.55972
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Worgen-p4-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 528601.49628
-  tps: 2.98057953649e+06
-  dtps: 1.81652908215e+06
-  hps: 134146.04649
+  dps: 716647.63455
+  tps: 3.81439344247e+06
+  dtps: 1.35588768665e+06
+  hps: 173927.36053
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-DefaultTalents-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 124170.20866
-  tps: 742011.73814
-  dtps: 84109.64206
-  hps: 78667.37559
+  dps: 179861.14725
+  tps: 1.0394666975e+06
+  dtps: 63241.24124
+  hps: 79718.82373
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-DefaultTalents-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-DefaultTalents-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 125421.37398
-  tps: 736570.01458
-  dtps: 85465.99345
-  hps: 80418.47235
+  dps: 169921.1105
+  tps: 967704.03117
+  dtps: 65320.25404
+  hps: 77067.76621
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Worgen-p4-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 4.4689417572e+06
-  tps: 2.653005403646e+07
-  dtps: 1.61005590227e+06
-  hps: 152391.72933
+  dps: 5.81040683994e+06
+  tps: 3.283307699101e+07
+  dtps: 1.18914595303e+06
+  hps: 194937.23274
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-RC-example-build-Basic-sha-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 154943.17219
-  tps: 935507.22736
-  dtps: 81265.10147
-  hps: 82418.6754
+  dps: 207506.81595
+  tps: 1.19239811683e+06
+  dtps: 60119.87618
+  hps: 89748.34212
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-RC-example-build-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-RC-example-build-Basic-sha-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 162104.28024
-  tps: 927300.59567
-  dtps: 76465.83332
-  hps: 90293.47836
+  dps: 214274.31358
+  tps: 1.16988030906e+06
+  dtps: 58062.88628
+  hps: 94494.83429
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
+ key: "TestBlood-Settings-Worgen-p4-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 3.63833384512e+06
-  tps: 2.125029498393e+07
-  dtps: 1.65775072949e+06
-  hps: 113390.85549
+  dps: 4.587024048e+06
+  tps: 2.627515756342e+07
+  dtps: 1.2312398168e+06
+  hps: 147222.21178
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-RC-example-build-Basic-sha-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 129714.8761
-  tps: 785694.76039
-  dtps: 83504.87024
-  hps: 65079.81788
+  dps: 174620.84657
+  tps: 1.0128326072e+06
+  dtps: 61709.55241
+  hps: 71250.51714
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Worgen-p2-RC-example-build-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
+ key: "TestBlood-Settings-Worgen-p4-RC-example-build-Basic-sha-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 126967.52662
-  tps: 750611.76205
-  dtps: 80673.75465
-  hps: 69533.96379
+  dps: 161173.29951
+  tps: 912045.64318
+  dtps: 60064.1858
+  hps: 71965.11094
  }
 }
 dps_results: {

assets/database/db.json

@@ -24,7 +24,7 @@ func TestBlood(t *testing.T) {
 			Race:       proto.Race_RaceOrc,
 			OtherRaces: []proto.Race{proto.Race_RaceWorgen},
 
-			GearSet: core.GetGearSet("../../../ui/death_knight/blood/gear_sets", "p2"),
+			GearSet: core.GetGearSet("../../../ui/death_knight/blood/gear_sets", "p4"),
 
 			Talents: BloodTalents,
 			Glyphs:  BloodDefaultGlyphs,