Skip to content

Commit

Permalink
Fix DB generation errors + mp5 regex (#4238)
Browse files Browse the repository at this point in the history 
* fix DB generation errors + mp5 regex

* update tests
  • Loading branch information
@kayla-glick
kayla-glick authored Mar 23, 2024
1 parent 7080047 commit 5630790
Show file tree
Hide file tree
Showing 31 changed files with 1,031 additions and 1,015 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
985 changes: 495 additions & 490 deletions assets/database/db.json
View file

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions assets/database/leftover_db.json
View file

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion sim/core/apl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,17 @@ func (rot *APLRotation) getStats() *proto.APLStats {

// Returns all action objects as an unstructured list. Used for easily finding specific actions.
func (rot *APLRotation) allAPLActions() []*APLAction {
return Flatten(MapSlice(rot.priorityList, func(action *APLAction) []*APLAction { return action.GetAllActions() }))
if rot == nil || rot.priorityList == nil {
return []*APLAction{}
}

return Flatten(MapSlice(rot.priorityList, func(action *APLAction) []*APLAction {
// Check if action is nil before calling GetAllActions
if action == nil {
return []*APLAction{}
}
return action.GetAllActions()
}))
}

// Returns all action objects from the prepull as an unstructured list. Used for easily finding specific actions.
Expand Down
16 changes: 8 additions & 8 deletions sim/druid/balance/TestBalance.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ dps_results: {
dps_results: {
key: "TestBalance-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 7664.36359
tps: 7441.23202
dps: 7686.25843
tps: 7463.11309
hps: 93.97352
}
}
dps_results: {
key: "TestBalance-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 7664.36359
tps: 7441.23202
dps: 7686.25843
tps: 7463.03305
hps: 93.97352
}
}
Expand Down Expand Up @@ -735,8 +735,8 @@ dps_results: {
dps_results: {
key: "TestBalance-AllItems-ShinyShardoftheGods"
value: {
dps: 7664.19206
tps: 7441.06048
dps: 7686.04479
tps: 7462.71574
}
}
dps_results: {
Expand Down Expand Up @@ -931,8 +931,8 @@ dps_results: {
dps_results: {
key: "TestBalance-AllItems-WingedTalisman-37844"
value: {
dps: 7805.52953
tps: 7573.35991
dps: 7827.38226
tps: 7595.48915
}
}
dps_results: {
Expand Down
8 changes: 4 additions & 4 deletions sim/druid/balance/TestBalancePhase3.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ dps_results: {
key: "TestBalancePhase3-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 10899.2661
tps: 10617.88774
tps: 10615.45208
hps: 100.88622
}
}
dps_results: {
key: "TestBalancePhase3-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 10899.2661
tps: 10617.88774
tps: 10615.11851
hps: 100.88622
}
}
Expand Down Expand Up @@ -736,7 +736,7 @@ dps_results: {
key: "TestBalancePhase3-AllItems-ShinyShardoftheGods"
value: {
dps: 10897.8371
tps: 10620.0108
tps: 10616.88347
}
}
dps_results: {
Expand Down Expand Up @@ -932,7 +932,7 @@ dps_results: {
key: "TestBalancePhase3-AllItems-WingedTalisman-37844"
value: {
dps: 11063.73427
tps: 10775.53674
tps: 10774.42461
}
}
dps_results: {
Expand Down
16 changes: 8 additions & 8 deletions sim/hunter/TestBM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ dps_results: {
dps_results: {
key: "TestBM-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 6251.14993
tps: 4203.17379
dps: 6289.01118
tps: 4231.08416
hps: 92.16151
}
}
dps_results: {
key: "TestBM-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 6251.14993
tps: 4203.17379
dps: 6301.09043
tps: 4241.86592
hps: 92.16151
}
}
Expand Down Expand Up @@ -666,8 +666,8 @@ dps_results: {
dps_results: {
key: "TestBM-AllItems-ShinyShardoftheGods"
value: {
dps: 6251.49513
tps: 4203.56528
dps: 6309.7663
tps: 4250.96497
}
}
dps_results: {
Expand Down Expand Up @@ -862,8 +862,8 @@ dps_results: {
dps_results: {
key: "TestBM-AllItems-WingedTalisman-37844"
value: {
dps: 6251.49513
tps: 4203.56528
dps: 6269.21037
tps: 4214.99145
}
}
dps_results: {
Expand Down
16 changes: 8 additions & 8 deletions sim/hunter/TestMM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ dps_results: {
dps_results: {
key: "TestMM-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 7064.87473
tps: 6158.16398
dps: 7122.08999
tps: 6206.89863
hps: 91.55526
}
}
dps_results: {
key: "TestMM-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 7064.87473
tps: 6158.16398
dps: 7124.12431
tps: 6208.71872
hps: 91.55526
}
}
Expand Down Expand Up @@ -666,8 +666,8 @@ dps_results: {
dps_results: {
key: "TestMM-AllItems-ShinyShardoftheGods"
value: {
dps: 7064.94744
tps: 6158.19186
dps: 7128.54958
tps: 6212.50872
}
}
dps_results: {
Expand Down Expand Up @@ -862,8 +862,8 @@ dps_results: {
dps_results: {
key: "TestMM-AllItems-WingedTalisman-37844"
value: {
dps: 7064.94744
tps: 6158.19186
dps: 7086.15162
tps: 6176.19538
}
}
dps_results: {
Expand Down
8 changes: 4 additions & 4 deletions sim/hunter/TestSV.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ dps_results: {
key: "TestSV-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 7324.96457
tps: 6286.47937
tps: 6284.93981
hps: 91.06638
}
}
dps_results: {
key: "TestSV-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 7324.96457
tps: 6286.47937
tps: 6284.74835
hps: 91.06638
}
}
Expand Down Expand Up @@ -667,7 +667,7 @@ dps_results: {
key: "TestSV-AllItems-ShinyShardoftheGods"
value: {
dps: 7323.92705
tps: 6285.49887
tps: 6283.53866
}
}
dps_results: {
Expand Down Expand Up @@ -863,7 +863,7 @@ dps_results: {
key: "TestSV-AllItems-WingedTalisman-37844"
value: {
dps: 7323.92705
tps: 6285.49887
tps: 6284.74961
}
}
dps_results: {
Expand Down
20 changes: 10 additions & 10 deletions sim/mage/TestArcane.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ dps_results: {
dps_results: {
key: "TestArcane-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 10462.93274
tps: 6411.06675
hps: 102.38829
dps: 10525.83303
tps: 6443.6152
hps: 102.06041
}
}
dps_results: {
key: "TestArcane-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 10462.93274
tps: 6411.06675
hps: 102.38829
dps: 10528.39559
tps: 6443.35784
hps: 102.18626
}
}
dps_results: {
Expand Down Expand Up @@ -588,8 +588,8 @@ dps_results: {
dps_results: {
key: "TestArcane-AllItems-ShinyShardoftheGods"
value: {
dps: 10464.8865
tps: 6412.28106
dps: 10526.43098
tps: 6439.34353
}
}
dps_results: {
Expand Down Expand Up @@ -756,8 +756,8 @@ dps_results: {
dps_results: {
key: "TestArcane-AllItems-WingedTalisman-37844"
value: {
dps: 10602.47405
tps: 6494.83359
dps: 10636.76611
tps: 6509.40077
}
}
dps_results: {
Expand Down
20 changes: 10 additions & 10 deletions sim/mage/TestFire.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ dps_results: {
dps_results: {
key: "TestFire-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 10244.33663
tps: 8260.20663
hps: 100.32759
dps: 10341.65878
tps: 8321.64089
hps: 100.72983
}
}
dps_results: {
key: "TestFire-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 10244.33663
tps: 8260.20663
hps: 100.32759
dps: 10354.52283
tps: 8330.48942
hps: 100.72983
}
}
dps_results: {
Expand Down Expand Up @@ -588,8 +588,8 @@ dps_results: {
dps_results: {
key: "TestFire-AllItems-ShinyShardoftheGods"
value: {
dps: 10246.50661
tps: 8262.01821
dps: 10373.60969
tps: 8343.34209
}
}
dps_results: {
Expand Down Expand Up @@ -756,8 +756,8 @@ dps_results: {
dps_results: {
key: "TestFire-AllItems-WingedTalisman-37844"
value: {
dps: 10416.67628
tps: 8398.15395
dps: 10461.62002
tps: 8430.29578
}
}
dps_results: {
Expand Down
20 changes: 10 additions & 10 deletions sim/mage/TestFrost.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ dps_results: {
dps_results: {
key: "TestFrost-AllItems-BaubleofTrueBlood-50354"
value: {
dps: 7652.00052
tps: 6227.57151
hps: 92.573
dps: 7652.18634
tps: 6224.86082
hps: 92.49356
}
}
dps_results: {
key: "TestFrost-AllItems-BaubleofTrueBlood-50726"
value: {
dps: 7652.00052
tps: 6227.57151
hps: 92.573
dps: 7652.18634
tps: 6224.62123
hps: 92.49356
}
}
dps_results: {
Expand Down Expand Up @@ -588,8 +588,8 @@ dps_results: {
dps_results: {
key: "TestFrost-AllItems-ShinyShardoftheGods"
value: {
dps: 7652.51748
tps: 6228.1685
dps: 7652.83765
tps: 6225.26138
}
}
dps_results: {
Expand Down Expand Up @@ -756,8 +756,8 @@ dps_results: {
dps_results: {
key: "TestFrost-AllItems-WingedTalisman-37844"
value: {
dps: 7755.11162
tps: 6320.25051
dps: 7755.43991
tps: 6318.87169
}
}
dps_results: {
Expand Down
Loading

0 comments on commit 5630790

Please sign in to comment.