Merge pull request #652 from ncberman/hunter_TNT

Implemented TNT rune for hunters
wowsims · Apr 11, 2024 · 07d9c55 · 07d9c55
2 parents bad6ee4 + 45f6976
commit 07d9c55
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/assets/database/db.json b/assets/database/db.json
@@ -9952,6 +9952,7 @@
 {"id":427717,"name":"Engrave Bracers - Unstable Affliction","icon":"spell_shadow_unstableaffliction_3","class":8,"type":6,"requiresLevel":1},
 {"id":427726,"name":"Engrave Bracers - Immolation Aura","icon":"spell_fire_felimmolation","class":8,"type":6,"requiresLevel":1},
 {"id":427733,"name":"Engrave Bracers - Summon Felguard","icon":"spell_shadow_summonfelguard","class":8,"type":6,"requiresLevel":1},
+{"id":428717,"name":"Engrave Bracers - T.N.T.","icon":"inv_misc_bomb_05","class":2,"type":6,"requiresLevel":1},
 {"id":428726,"name":"Engrave Bracers - Focus Fire","icon":"inv_weapon_crossbow_19","class":2,"type":6,"requiresLevel":1},
 {"id":428738,"name":"Engrave Helm - Advanced Warding","icon":"spell_arcane_arcaneresilience","class":3,"type":1,"requiresLevel":1},
 {"id":428739,"name":"Engrave Helm - Deep Freeze","icon":"ability_mage_deepfreeze","class":3,"type":1,"requiresLevel":1},

diff --git a/proto/hunter.proto b/proto/hunter.proto
@@ -132,6 +132,7 @@ enum HunterRune {
 
 	RuneBracersFocusFire				= 428726;
 	RuneBracersRaptorFury				= 415358;
+	RuneBracersTNT						= 428717;
 }
 
 message Hunter {

diff --git a/sim/hunter/explosive_shot.go b/sim/hunter/explosive_shot.go
@@ -52,7 +52,7 @@ func (hunter *Hunter) registerExplosiveShotSpell(timer *core.Timer) {
 
 		CritDamageBonus: hunter.mortalShots(),
 
-		DamageMultiplier: 1,
+		DamageMultiplier: hunter.tntDamageMultiplier(),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{
@@ -94,4 +94,4 @@ func (hunter *Hunter) registerExplosiveShotSpell(timer *core.Timer) {
 			})
 		},
 	})
-}
+}
diff --git a/sim/hunter/explosive_trap.go b/sim/hunter/explosive_trap.go
@@ -43,7 +43,7 @@ func (hunter *Hunter) getExplosiveTrapConfig(rank int, timer *core.Timer) core.S
 			IgnoreHaste: true, // Hunter GCD is locked at 1.5s
 		},
 
-		DamageMultiplier: 1 + 0.15*float64(hunter.Talents.CleverTraps),
+		DamageMultiplier: (1 + 0.15*float64(hunter.Talents.CleverTraps)) * hunter.tntDamageMultiplier(),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{

diff --git a/sim/hunter/immolation_trap.go b/sim/hunter/immolation_trap.go
@@ -40,7 +40,7 @@ func (hunter *Hunter) getImmolationTrapConfig(rank int, timer *core.Timer) core.
 			IgnoreHaste: true, // Hunter GCD is locked at 1.5s
 		},
 
-		DamageMultiplier: 1 + 0.15*float64(hunter.Talents.CleverTraps),
+		DamageMultiplier: (1 + 0.15*float64(hunter.Talents.CleverTraps)) * hunter.tntDamageMultiplier(),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{

diff --git a/sim/hunter/runes.go b/sim/hunter/runes.go
@@ -224,3 +224,10 @@ func (hunter *Hunter) applyRaptorFury() {
 		MaxStacks: 5,
 	})
 }
+
+func (hunter *Hunter) tntDamageMultiplier() float64 {
+	if hunter.HasRune(proto.HunterRune_RuneBracersTNT) {
+		return 1.1
+	}
+	return 1.0
+}
diff --git a/tools/database/rune_overrides.go b/tools/database/rune_overrides.go
@@ -13,7 +13,6 @@ var RuneOverrides []*proto.UIRune
 var UnimplementedRuneOverrides = []int32{
 	// Hunter
 	415405, // Rapid Killing
-	428717, // T.N.T.
 
 	// Paladin
 	429133, // Improved Sanctuary