Merge pull request #1097 from hillerstorm/fix_block_scope

Fix block scoping for item version variable
wowsims · Oct 12, 2024 · e2b7ad5 · e2b7ad5
2 parents 5ca8f7f + d32bcbc
commit e2b7ad5
Show file tree

Hide file tree

Showing 25 changed files with 222 additions and 221 deletions.
diff --git a/sim/common/cata/other_effects.go b/sim/common/cata/other_effects.go
@@ -787,7 +787,8 @@ func init() {
 		})
 	}
 
-	for _, version := range []ItemVersion{ItemVersionLFR, ItemVersionNormal, ItemVersionHeroic} {
+	for _, v := range []ItemVersion{ItemVersionLFR, ItemVersionNormal, ItemVersionHeroic} {
+		version := v // Gotta scope this for the closure
 		labelSuffix := []string{" (LFR)", "", " (Heroic)"}[version]
 
 		vialItemID := []int32{77979, 77207, 77999}[version]

diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results
@@ -246,16 +246,16 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-Bone-LinkFetish-77210"
  value: {
-  dps: 14875.16264
-  tps: 72825.57421
+  dps: 14807.38889
+  tps: 72463.03183
   hps: 3614.08661
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bone-LinkFetish-77982"
  value: {
-  dps: 14803.45203
-  tps: 72443.56311
+  dps: 14672.50601
+  tps: 71722.91824
   hps: 3614.08661
  }
 }
@@ -406,16 +406,16 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 14091.9106
-  tps: 68359.48266
+  dps: 14038.02105
+  tps: 68069.36641
   hps: 3614.08661
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 14077.2182
-  tps: 68280.50825
+  dps: 13977.21837
+  tps: 67742.63664
   hps: 3614.08661
  }
 }
@@ -1942,16 +1942,16 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-VialofShadows-77207"
  value: {
-  dps: 14263.69015
-  tps: 69591.74484
+  dps: 14214.46851
+  tps: 69325.83438
   hps: 3614.08661
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-VialofShadows-77979"
  value: {
-  dps: 14282.212
-  tps: 69581.04965
+  dps: 14189.98117
+  tps: 69084.02585
   hps: 3614.08661
  }
 }

diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results
@@ -238,16 +238,16 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-Bone-LinkFetish-77210"
  value: {
-  dps: 40124.47609
-  tps: 37917.02514
+  dps: 40021.81348
+  tps: 37814.36252
   hps: 506.11588
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bone-LinkFetish-77982"
  value: {
-  dps: 39952.81756
-  tps: 37757.20893
+  dps: 39755.3019
+  tps: 37559.69327
   hps: 506.88858
  }
 }
@@ -398,16 +398,16 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 38017.28694
-  tps: 35888.20402
+  dps: 37964.91383
+  tps: 35835.8309
   hps: 506.11588
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 37942.18621
-  tps: 35813.10328
+  dps: 37844.36212
+  tps: 35715.27919
   hps: 506.11588
  }
 }
@@ -1942,16 +1942,16 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-VialofShadows-77207"
  value: {
-  dps: 38252.19824
-  tps: 36080.74432
+  dps: 38197.01157
+  tps: 36025.55765
   hps: 506.11588
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-VialofShadows-77979"
  value: {
-  dps: 38224.63628
-  tps: 36061.37321
+  dps: 38120.22082
+  tps: 35956.95775
   hps: 507.66127
  }
 }

diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results
@@ -246,16 +246,16 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-AllItems-Bone-LinkFetish-77210"
  value: {
-  dps: 39628.93605
-  tps: 29827.33837
+  dps: 39517.34096
+  tps: 29715.74329
   hps: 628.42635
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Bone-LinkFetish-77982"
  value: {
-  dps: 39429.86268
-  tps: 29684.65295
+  dps: 39206.15106
+  tps: 29460.94133
   hps: 628.42635
  }
 }
@@ -406,16 +406,16 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 37600.37561
-  tps: 28287.75024
+  dps: 37526.96589
+  tps: 28214.34053
   hps: 628.42635
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 37547.44988
-  tps: 28230.80932
+  dps: 37411.33942
+  tps: 28094.69885
   hps: 628.42635
  }
 }
@@ -1941,16 +1941,16 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-AllItems-VialofShadows-77207"
  value: {
-  dps: 37938.28976
-  tps: 28436.98777
+  dps: 37882.04528
+  tps: 28380.74329
   hps: 628.42635
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-VialofShadows-77979"
  value: {
-  dps: 37831.32101
-  tps: 28392.04085
+  dps: 37722.2398
+  tps: 28282.95964
   hps: 628.42635
  }
 }

diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
@@ -354,15 +354,15 @@ dps_results: {
 dps_results: {
  key: "TestBalance-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 28342.24591
-  tps: 28340.09751
+  dps: 28305.58988
+  tps: 28303.44148
  }
 }
 dps_results: {
  key: "TestBalance-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 27959.27818
-  tps: 27958.35825
+  dps: 27895.3433
+  tps: 27894.42337
  }
 }
 dps_results: {

diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
@@ -221,15 +221,15 @@ dps_results: {
 dps_results: {
  key: "TestFeral-AllItems-Bone-LinkFetish-77210"
  value: {
-  dps: 27245.33216
-  tps: 38845.54284
+  dps: 27120.02454
+  tps: 38689.58284
  }
 }
 dps_results: {
  key: "TestFeral-AllItems-Bone-LinkFetish-77982"
  value: {
-  dps: 27135.7745
-  tps: 38441.44383
+  dps: 26898.80709
+  tps: 38123.71123
  }
 }
 dps_results: {
@@ -354,15 +354,15 @@ dps_results: {
 dps_results: {
  key: "TestFeral-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 25485.51678
-  tps: 36406.02053
+  dps: 25480.35072
+  tps: 36380.19023
  }
 }
 dps_results: {
  key: "TestFeral-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 25480.64776
-  tps: 36385.70227
+  dps: 25472.08793
+  tps: 36342.90314
  }
 }
 dps_results: {
@@ -1707,15 +1707,15 @@ dps_results: {
 dps_results: {
  key: "TestFeral-AllItems-VialofShadows-77207"
  value: {
-  dps: 27849.93311
-  tps: 39229.18821
+  dps: 27779.8327
+  tps: 39127.99166
  }
 }
 dps_results: {
  key: "TestFeral-AllItems-VialofShadows-77979"
  value: {
-  dps: 27616.26549
-  tps: 39384.92951
+  dps: 27481.69067
+  tps: 39185.27416
  }
 }
 dps_results: {

diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results
@@ -214,15 +214,15 @@ dps_results: {
 dps_results: {
  key: "TestGuardian-AllItems-Bone-LinkFetish-77210"
  value: {
-  dps: 8727.71952
-  tps: 43700.73761
+  dps: 8630.69473
+  tps: 43215.61363
  }
 }
 dps_results: {
  key: "TestGuardian-AllItems-Bone-LinkFetish-77982"
  value: {
-  dps: 8724.83687
-  tps: 43686.65103
+  dps: 8543.01354
+  tps: 42777.53435
  }
 }
 dps_results: {
@@ -347,15 +347,15 @@ dps_results: {
 dps_results: {
  key: "TestGuardian-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 8031.38578
-  tps: 40219.64246
+  dps: 8005.95564
+  tps: 40092.49176
  }
 }
 dps_results: {
  key: "TestGuardian-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 7970.28548
-  tps: 39914.32534
+  dps: 7922.27042
+  tps: 39674.25002
  }
 }
 dps_results: {
@@ -1707,15 +1707,15 @@ dps_results: {
 dps_results: {
  key: "TestGuardian-AllItems-VialofShadows-77207"
  value: {
-  dps: 8729.23207
-  tps: 43710.05848
+  dps: 8667.6242
+  tps: 43402.01912
  }
 }
 dps_results: {
  key: "TestGuardian-AllItems-VialofShadows-77979"
  value: {
-  dps: 8674.52025
-  tps: 43436.16148
+  dps: 8558.46296
+  tps: 42855.87501
  }
 }
 dps_results: {

diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results
@@ -242,15 +242,15 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-Bone-LinkFetish-77210"
  value: {
-  dps: 21615.22872
-  tps: 18395.87466
+  dps: 21533.27613
+  tps: 18313.92206
  }
 }
 dps_results: {
  key: "TestBM-AllItems-Bone-LinkFetish-77982"
  value: {
-  dps: 21541.91451
-  tps: 18303.74242
+  dps: 21387.59006
+  tps: 18149.41797
  }
 }
 dps_results: {
@@ -382,15 +382,15 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-CunningoftheCruel-77208"
  value: {
-  dps: 21099.01866
-  tps: 17849.05422
+  dps: 21074.31734
+  tps: 17824.3529
  }
 }
 dps_results: {
  key: "TestBM-AllItems-CunningoftheCruel-77980"
  value: {
-  dps: 21085.69866
-  tps: 17835.6508
+  dps: 21041.95694
+  tps: 17791.90909
  }
 }
 dps_results: {
@@ -1721,15 +1721,15 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-VialofShadows-77207"
  value: {
-  dps: 22515.93058
-  tps: 19084.65771
+  dps: 22468.44859
+  tps: 19037.17573
  }
 }
 dps_results: {
  key: "TestBM-AllItems-VialofShadows-77979"
  value: {
-  dps: 22395.92376
-  tps: 18973.32924
+  dps: 22306.26164
+  tps: 18883.66712
  }
 }
 dps_results: {