Merge pull request #572 from wowsims/gnome-racial

Add gnome weapon specialization
wowsims · May 29, 2024 · f6b86c6 · f6b86c6
2 parents d2fa8c8 + ed2868b
commit f6b86c6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/sim/core/character.go b/sim/core/character.go
@@ -597,7 +597,13 @@ func (character *Character) GetProcMaskForItem(itemID int32) ProcMask {
 
 func (character *Character) GetProcMaskForTypes(weaponTypes ...proto.WeaponType) ProcMask {
 	return character.getProcMaskFor(func(weapon *Item) bool {
-		return weapon == nil || slices.Contains(weaponTypes, weapon.WeaponType)
+		return weapon != nil && slices.Contains(weaponTypes, weapon.WeaponType)
+	})
+}
+
+func (character *Character) GetProcMaskForTypesAndHand(twohand bool, weaponTypes ...proto.WeaponType) ProcMask {
+	return character.getProcMaskFor(func(weapon *Item) bool {
+		return weapon != nil && (weapon.HandType == proto.HandType_HandTypeTwoHand) == twohand && slices.Contains(weaponTypes, weapon.WeaponType)
 	})
 }
 

diff --git a/sim/core/racials.go b/sim/core/racials.go
@@ -118,6 +118,8 @@ func applyRaceEffects(agent Agent) {
 	case proto.Race_RaceGnome:
 		character.PseudoStats.ReducedArcaneHitTakenChance += 0.02
 		character.MultiplyStat(stats.Mana, 1.05)
+		applyOneHandWeaponSpecialization(character, 3*ExpertisePerQuarterPercentReduction,
+			proto.WeaponType_WeaponTypeSword, proto.WeaponType_WeaponTypeDagger)
 	case proto.Race_RaceHuman:
 		character.MultiplyStat(stats.Spirit, 1.03)
 		applyWeaponSpecialization(character, 3*ExpertisePerQuarterPercentReduction,
@@ -249,3 +251,17 @@ func applyWeaponSpecialization(character *Character, expertiseBonus float64, wea
 		})
 	}
 }
+
+func applyOneHandWeaponSpecialization(character *Character, expertiseBonus float64, weaponTypes ...proto.WeaponType) {
+	mask := character.GetProcMaskForTypesAndHand(false, weaponTypes...)
+
+	if mask == ProcMaskMelee || (mask == ProcMaskMeleeMH && !character.HasOHWeapon()) {
+		character.AddStat(stats.Expertise, expertiseBonus)
+	} else {
+		character.OnSpellRegistered(func(spell *Spell) {
+			if spell.ProcMask.Matches(mask) {
+				spell.BonusExpertiseRating += expertiseBonus
+			}
+		})
+	}
+}