fix: disable OH weapon imbue without OH

Tereneckla · Feb 7, 2024 · d6d6912 · d6d6912
1 parent 56445d1
commit d6d6912
Showing 1 changed file with 62 additions and 60 deletions.
diff --git a/sim/core/consumes.go b/sim/core/consumes.go
@@ -595,78 +595,80 @@ func applyConsumeEffects(agent Agent) {
 	}
 
 	switch consumes.WeaponMain {
-	case proto.WeaponImbue_ImbueAdamantiteSharpeningStone:
-		character.PseudoStats.BonusDamage += 12
-		if character.Class != proto.Class_ClassHunter {
+		case proto.WeaponImbue_ImbueAdamantiteSharpeningStone:
+			character.PseudoStats.BonusDamage += 12
+			if character.Class != proto.Class_ClassHunter {
+				character.AddStats(stats.Stats{
+					stats.MeleeCrit: 14,
+				})
+			}
+
+		case proto.WeaponImbue_ImbueAdamantiteWeightStone:
+			character.PseudoStats.BonusDamage += 12
 			character.AddStats(stats.Stats{
 				stats.MeleeCrit: 14,
 			})
-		}
 
-	case proto.WeaponImbue_ImbueAdamantiteWeightStone:
-		character.PseudoStats.BonusDamage += 12
-		character.AddStats(stats.Stats{
-			stats.MeleeCrit: 14,
-		})
-
-	case proto.WeaponImbue_ImbueElementalSharpeningStone:
-		character.AddStat(stats.MeleeCrit, 28)
+		case proto.WeaponImbue_ImbueElementalSharpeningStone:
+			character.AddStat(stats.MeleeCrit, 28)
 
-	case proto.WeaponImbue_ImbueBrilliantManaOil:
-		character.AddStats(stats.Stats{
-			stats.MP5:        12,
-			stats.SpellPower: 13,
-		})
+		case proto.WeaponImbue_ImbueBrilliantManaOil:
+			character.AddStats(stats.Stats{
+				stats.MP5:        12,
+				stats.SpellPower: 13,
+			})
 
-	case proto.WeaponImbue_ImbueBrilliantWizardOil:
-		character.AddStats(stats.Stats{
-			stats.SpellCrit:  14,
-			stats.MeleeCrit:  14,
-			stats.SpellPower: 36,
-		})
+		case proto.WeaponImbue_ImbueBrilliantWizardOil:
+			character.AddStats(stats.Stats{
+				stats.SpellCrit:  14,
+				stats.MeleeCrit:  14,
+				stats.SpellPower: 36,
+			})
 
-	case proto.WeaponImbue_ImbueSuperiorWizardOil:
-		character.AddStat(stats.SpellPower, 42)
+		case proto.WeaponImbue_ImbueSuperiorWizardOil:
+			character.AddStat(stats.SpellPower, 42)
 
-	case proto.WeaponImbue_ImbueSuperiorManaOil:
-		character.AddStat(stats.MP5, 14)
-	}
-	switch consumes.WeaponOff {
-	case proto.WeaponImbue_ImbueAdamantiteSharpeningStone:
-		character.PseudoStats.BonusDamage += 12
-		if character.Class != proto.Class_ClassHunter {
+		case proto.WeaponImbue_ImbueSuperiorManaOil:
+			character.AddStat(stats.MP5, 14)
+		}
+	if character.GetOHWeapon() != nil {
+		switch consumes.WeaponOff {
+		case proto.WeaponImbue_ImbueAdamantiteSharpeningStone:
+			character.PseudoStats.BonusDamage += 12
+			if character.Class != proto.Class_ClassHunter {
+				character.AddStats(stats.Stats{
+					stats.MeleeCrit: 14,
+				})
+			}
+
+		case proto.WeaponImbue_ImbueAdamantiteWeightStone:
+			character.PseudoStats.BonusDamage += 12
 			character.AddStats(stats.Stats{
 				stats.MeleeCrit: 14,
 			})
+
+		case proto.WeaponImbue_ImbueElementalSharpeningStone:
+			character.AddStat(stats.MeleeCrit, 28)
+
+		case proto.WeaponImbue_ImbueBrilliantManaOil:
+			character.AddStats(stats.Stats{
+				stats.MP5:        12,
+				stats.SpellPower: 13,
+			})
+
+		case proto.WeaponImbue_ImbueBrilliantWizardOil:
+			character.AddStats(stats.Stats{
+				stats.SpellCrit:  14,
+				stats.MeleeCrit:  14,
+				stats.SpellPower: 36,
+			})
+
+		case proto.WeaponImbue_ImbueSuperiorWizardOil:
+			character.AddStat(stats.SpellPower, 42)
+
+		case proto.WeaponImbue_ImbueSuperiorManaOil:
+			character.AddStat(stats.MP5, 14)
 		}
-
-	case proto.WeaponImbue_ImbueAdamantiteWeightStone:
-		character.PseudoStats.BonusDamage += 12
-		character.AddStats(stats.Stats{
-			stats.MeleeCrit: 14,
-		})
-
-	case proto.WeaponImbue_ImbueElementalSharpeningStone:
-		character.AddStat(stats.MeleeCrit, 28)
-
-	case proto.WeaponImbue_ImbueBrilliantManaOil:
-		character.AddStats(stats.Stats{
-			stats.MP5:        12,
-			stats.SpellPower: 13,
-		})
-
-	case proto.WeaponImbue_ImbueBrilliantWizardOil:
-		character.AddStats(stats.Stats{
-			stats.SpellCrit:  14,
-			stats.MeleeCrit:  14,
-			stats.SpellPower: 36,
-		})
-
-	case proto.WeaponImbue_ImbueSuperiorWizardOil:
-		character.AddStat(stats.SpellPower, 42)
-
-	case proto.WeaponImbue_ImbueSuperiorManaOil:
-		character.AddStat(stats.MP5, 14)
 	}
 
 	registerPotionCD(agent, consumes)