Move reforging up to apply before enchants

wowsims · Feb 29, 2024 · 7d8f3c0 · 7d8f3c0
1 parent 2391c00
commit 7d8f3c0
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/sim/core/database.go b/sim/core/database.go
@@ -271,6 +271,14 @@ func NewItem(itemSpec ItemSpec) Item {
 		panic(fmt.Sprintf("No item with id: %d", itemSpec.ID))
 	}
 
+	if itemSpec.Reforging != nil {
+		if validateReforging(&item, *itemSpec.Reforging) {
+			item.Reforging = itemSpec.Reforging
+		} else {
+			panic(fmt.Sprintf("When validating reforging for item %d, the stat reforging for %s to %s could not be validated", itemSpec.ID, itemSpec.Reforging.FromStat.String(), itemSpec.Reforging.ToStat.String()))
+		}
+	}
+
 	if itemSpec.Enchant != 0 {
 		if enchant, ok := EnchantsByEffectID[itemSpec.Enchant]; ok {
 			item.Enchant = enchant
@@ -280,14 +288,6 @@ func NewItem(itemSpec ItemSpec) Item {
 		// }
 	}
 
-	if itemSpec.Reforging != nil {
-		if validateReforging(&item, *itemSpec.Reforging) {
-			item.Reforging = itemSpec.Reforging
-		} else {
-			panic(fmt.Sprintf("When validating reforging for item %d, the stat reforging for %s to %s could not be validated", itemSpec.ID, itemSpec.Reforging.FromStat.String(), itemSpec.Reforging.ToStat.String()))
-		}
-	}
-
 	if len(itemSpec.Gems) > 0 {
 		// Need to do this to account for possible extra gem sockets.
 		numGems := len(item.GemSockets)