Merge pull request #859 from wowsims/p4/general

Updates for Druid, Warlock, Shaman
wowsims · Jul 5, 2024 · d9a9202 · d9a9202
2 parents 4478c09 + e64b147
commit d9a9202
Show file tree

Hide file tree

Showing 33 changed files with 11,652 additions and 11,438 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
diff --git a/proto/common.proto b/proto/common.proto
@@ -196,6 +196,7 @@ enum WeaponType {
 	WeaponTypeSword = 9;
 }
 
+// NextIndex: 16
 enum WeaponSkill {
 	WeaponSkillUnknown = 0;
 	WeaponSkillAxes = 1;
@@ -212,6 +213,7 @@ enum WeaponSkill {
 	WeaponSkillBows = 12;
 	WeaponSkillCrossbows = 13;
 	WeaponSkillGuns = 14;
+	WeaponSkillFeralCombat = 15;
 }
 
 enum HandType {

diff --git a/sim/common/sod/item_effects/phase_4.go b/sim/common/sod/item_effects/phase_4.go
@@ -8,6 +8,7 @@ import (
 )
 
 const (
+	CraftOfTheShadows      = 227280
 	SulfurasHandOfRagnaros = 227683 // 17182
 	DukesDomain            = 227915
 	AccursedChalice        = 228078
@@ -222,5 +223,19 @@ func init() {
 		})
 	})
 
+	///////////////////////////////////////////////////////////////////////////
+	//                                 Other
+	///////////////////////////////////////////////////////////////////////////
+
+	// https://www.wowhead.com/classic/item=227280/craft-of-the-shadows
+	// Equip: Increases your maximum Energy by 10.
+	core.NewItemEffect(CraftOfTheShadows, func(agent core.Agent) {
+		character := agent.GetCharacter()
+
+		if character.HasEnergyBar() {
+			character.EnableEnergyBar(character.MaxEnergy() + 10)
+		}
+	})
+
 	core.AddEffectsToTest = true
 }
diff --git a/sim/core/character.go b/sim/core/character.go
@@ -284,6 +284,7 @@ func (character *Character) applyWeaponSkills() {
 		character.PseudoStats.BowsSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillBows)]
 		character.PseudoStats.CrossbowsSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillCrossbows)]
 		character.PseudoStats.GunsSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillGuns)]
+		character.PseudoStats.FeralCombatSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillFeralCombat)]
 	}
 }
 

diff --git a/sim/core/energy.go b/sim/core/energy.go
@@ -126,6 +126,10 @@ func (eb *energyBar) CurrentEnergy() float64 {
 	return eb.currentEnergy
 }
 
+func (eb *energyBar) MaxEnergy() float64 {
+	return eb.maxEnergy
+}
+
 func (eb *energyBar) NextEnergyTickAt() time.Duration {
 	return eb.nextEnergyTick
 }

diff --git a/sim/core/stats/stats.go b/sim/core/stats/stats.go
@@ -89,6 +89,7 @@ const (
 	WeaponSkillBows
 	WeaponSkillCrossbows
 	WeaponSkillGuns
+	WeaponSkillFeralCombat
 
 	WeaponSkillLen
 )
@@ -424,14 +425,16 @@ type PseudoStats struct {
 	TwoHandedAxesSkill   float64
 	PolearmsSkill        float64
 	StavesSkill          float64
-	FeralCombatSkill     float64
 
 	// Ranged Skills
 	BowsSkill      float64
 	CrossbowsSkill float64
 	GunsSkill      float64
 	ThrownSkill    float64
 
+	// Special Feral Weapon Skill
+	FeralCombatSkill float64
+
 	///////////////////////////////////////////////////
 	// Effects that apply when this unit is the target.
 	///////////////////////////////////////////////////
@@ -509,12 +512,13 @@ func NewPseudoStats() PseudoStats {
 		TwoHandedAxesSkill:     0,
 		PolearmsSkill:          0,
 		StavesSkill:            0,
-		FeralCombatSkill:       0,
 
 		BowsSkill:      0,
 		GunsSkill:      0,
 		CrossbowsSkill: 0,
 		ThrownSkill:    0,
+
+		FeralCombatSkill: 0,
 	}
 }
 

diff --git a/sim/druid/_maul.go b/sim/druid/_maul.go
@@ -6,10 +6,11 @@ import (
 
 func (druid *Druid) registerMaulSpell() {
 	flatBaseDamage := 578.0
-	if druid.Ranged().ID == 23198 { // Idol of Brutality
-		flatBaseDamage += 50
-	} else if druid.Ranged().ID == 38365 { // Idol of Perspicacious Attacks
-		flatBaseDamage += 120
+	rageCost := 15 - float64(druid.Talents.Ferocity)
+
+	switch druid.Ranged().ID {
+	case IdolOfBrutality:
+		rageCost -= 3
 	}
 
 	druid.Maul = druid.RegisterSpell(Bear, core.SpellConfig{
@@ -20,7 +21,7 @@ func (druid *Druid) registerMaulSpell() {
 		Flags:       SpellFlagOmen | core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete,
 
 		RageCost: core.RageCostOptions{
-			Cost:   15 - float64(druid.Talents.Ferocity),
+			Cost:   rageCost,
 			Refund: 0.8,
 		},
 

diff --git a/sim/druid/druid.go b/sim/druid/druid.go
@@ -72,7 +72,7 @@ type Druid struct {
 	Sunfire              *DruidSpell
 	SunfireCat           *DruidSpell
 	SurvivalInstincts    *DruidSpell
-	SwipeBear            []*DruidSpell
+	SwipeBear            *DruidSpell
 	SwipeCat             *DruidSpell
 	TigersFury           *DruidSpell
 	Typhoon              *DruidSpell