Merge branch 'master' into shaman

wowsims · Feb 8, 2024 · 684042d · 684042d
2 parents af2da86 + 47dd615
commit 684042d
Show file tree

Hide file tree

Showing 36 changed files with 807 additions and 427 deletions.
diff --git a/proto/common.proto b/proto/common.proto
@@ -304,6 +304,7 @@ enum AgilityElixir {
 	ElixirOfGreaterAgility = 2;
 	ElixirOfLesserAgility = 3;
 	ScrollOfAgility = 4;
+	ElixirOfAgility = 5;
 }
 
 enum ManaRegenElixir {

diff --git a/proto/druid.proto b/proto/druid.proto
@@ -74,6 +74,7 @@ enum DruidRune {
 	RuneLegsSavageRoar      	  = 407988;
 	RuneLegsLifebloom       	  = 409824;
 	RuneLegsSkullBash       	  = 410176;
+	RuneBeltEclipse       	      = 408248;
 }
 
 message BalanceDruid {

diff --git a/sim/_hunter/explosive_trap.go b/sim/_hunter/explosive_trap.go
diff --git a/sim/_hunter/steady_shot.go b/sim/_hunter/steady_shot.go
diff --git a/sim/common/sod/melee_items.go b/sim/common/sod/melee_items.go
@@ -114,10 +114,12 @@ func init() {
 			Duration: time.Second * 10,
 			OnGain: func(aura *core.Aura, sim *core.Simulation) {
 				character.MultiplyAttackSpeed(sim, 1.1)
+				character.MultiplyRangedSpeed(sim, 1.1)
 				character.PseudoStats.ThreatMultiplier *= 1.2
 			},
 			OnExpire: func(aura *core.Aura, sim *core.Simulation) {
 				character.MultiplyAttackSpeed(sim, 1.0/1.1)
+				character.MultiplyRangedSpeed(sim, 1.0/1.1)
 				character.PseudoStats.ThreatMultiplier /= 1.2
 			},
 		})
@@ -203,10 +205,12 @@ func init() {
 			ActionID: core.ActionID{SpellID: 437349},
 			Duration: time.Second * 10,
 			OnGain: func(aura *core.Aura, sim *core.Simulation) {
-				character.AddStatDynamic(sim, stats.MeleeHaste, 20)
+				character.MultiplyAttackSpeed(sim, 1.2)
+				character.MultiplyRangedSpeed(sim, 1.2)
 			},
 			OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-				character.AddStatDynamic(sim, stats.MeleeHaste, -20)
+				character.MultiplyAttackSpeed(sim, 1.0/1.2)
+				character.MultiplyRangedSpeed(sim, 1.0/1.2)
 			},
 		})
 

diff --git a/sim/common/sod/melee_sets.go b/sim/common/sod/melee_sets.go
@@ -75,6 +75,7 @@ var ItemSetStormshroud = core.NewItemSet(core.ItemSet{
 		},
 		4: func(a core.Agent) {
 			a.GetCharacter().AddStat(stats.AttackPower, 14)
+			a.GetCharacter().AddStat(stats.RangedAttackPower, 14)
 		},
 	},
 })
diff --git a/sim/core/buffs.go b/sim/core/buffs.go
@@ -670,6 +670,7 @@ func applyBuffEffects(agent Agent, raidBuffs *proto.RaidBuffs, partyBuffs *proto
 		// TODO: character.AddStat(stats.RangedCrit, 2 * CritRatingPerCritChance)
 		character.AddStat(stats.SpellHit, 3*SpellHitRatingPerHitChance)
 		character.AddStat(stats.AttackPower, 20)
+		character.AddStat(stats.RangedAttackPower, 20)
 		character.AddStat(stats.SpellPower, 25)
 	}
 

diff --git a/sim/core/consumes.go b/sim/core/consumes.go
@@ -105,6 +105,10 @@ func applyConsumeEffects(agent Agent, partyBuffs *proto.PartyBuffs) {
 			character.AddStats(stats.Stats{
 				stats.Agility: 25,
 			})
+		case proto.AgilityElixir_ElixirOfAgility:
+			character.AddStats(stats.Stats{
+				stats.Agility: 15,
+			})
 		case proto.AgilityElixir_ElixirOfLesserAgility:
 			character.AddStats(stats.Stats{
 				stats.Agility: 8,
@@ -183,8 +187,9 @@ func applyConsumeEffects(agent Agent, partyBuffs *proto.PartyBuffs) {
 		switch consumes.EnchantedSigil {
 		case proto.EnchantedSigil_InnovationSigil:
 			character.AddStats(stats.Stats{
-				stats.AttackPower: 20,
-				stats.SpellPower:  20,
+				stats.AttackPower:       20,
+				stats.RangedAttackPower: 20,
+				stats.SpellPower:        20,
 			})
 		}
 	}

diff --git a/sim/core/racials.go b/sim/core/racials.go
@@ -116,10 +116,12 @@ func applyRaceEffects(agent Agent) {
 			OnGain: func(aura *Aura, sim *Simulation) {
 				character.MultiplyCastSpeed(1.2)
 				character.MultiplyAttackSpeed(sim, 1.2)
+				character.MultiplyRangedSpeed(sim, 1.2)
 			},
 			OnExpire: func(aura *Aura, sim *Simulation) {
 				character.MultiplyCastSpeed(1 / 1.2)
 				character.MultiplyAttackSpeed(sim, 1/1.2)
+				character.MultiplyRangedSpeed(sim, 1/1.2)
 			},
 		})
 

diff --git a/sim/druid/druid.go b/sim/druid/druid.go
@@ -14,6 +14,12 @@ const (
 
 var TalentTreeSizes = [3]int{16, 16, 15}
 
+const (
+	SpellCode_DruidWrath int32 = iota
+	SpellCode_DruidStarfire
+	SpellCode_DruidStarsurge
+)
+
 type Druid struct {
 	core.Character
 	SelfBuffs
@@ -72,6 +78,7 @@ type Druid struct {
 	ClearcastingAura         *core.Aura
 	DemoralizingRoarAuras    core.AuraArray
 	EnrageAura               *core.Aura
+	EclipseAura              *core.Aura
 	FaerieFireAuras          core.AuraArray
 	FrenziedRegenerationAura *core.Aura
 	FuryOfStormrageAura      *core.Aura
@@ -82,6 +89,8 @@ type Druid struct {
 	SurvivalInstinctsAura    *core.Aura
 	TigersFuryAura           *core.Aura
 	SavageRoarAura           *core.Aura
+	SolarEclipseProcAura     *core.Aura
+	LunarEclipseProcAura     *core.Aura
 	WildStrikesBuffAura      *core.Aura
 
 	BleedCategories core.ExclusiveCategoryArray