Merge pull request #108 from wowsims/guardian

NerdEgghead · web-flow · commit 4fbef2231ae0 · 2025-05-25T15:06:47.000-07:00
Rage bar configuration refactor
diff --git a/sim/core/rage.go b/sim/core/rage.go
@@ -8,6 +8,7 @@ import (
 
 const MaxRage = 100.0
 const ThreatPerRageGained = 5
+const BaseRageHitFactor = 1.75
 
 type rageBar struct {
 	unit *Unit
@@ -25,8 +26,8 @@ type rageBar struct {
 }
 
 type RageBarOptions struct {
-	StartingRage  float64
-	BaseHitFactor float64
+	StartingRage       float64
+	BaseRageMultiplier float64
 }
 
 func (unit *Unit) EnableRageBar(options RageBarOptions) {
@@ -81,7 +82,7 @@ func (unit *Unit) EnableRageBar(options RageBarOptions) {
 	unit.rageBar = rageBar{
 		unit:              unit,
 		startingRage:      max(0, min(options.StartingRage, MaxRage)),
-		startingHitFactor: options.BaseHitFactor,
+		startingHitFactor: BaseRageHitFactor * options.BaseRageMultiplier,
 		RageRefundMetrics: unit.NewRageMetrics(ActionID{OtherID: proto.OtherAction_OtherActionRefund}),
 	}
 }
diff --git a/sim/druid/feral/feral.go b/sim/druid/feral/feral.go
@@ -52,7 +52,7 @@ func NewFeralDruid(character *core.Character, options *proto.Player) *FeralDruid
 		MaxEnergy:      100.0,
 		UnitClass:      proto.Class_ClassDruid,
 	})
-	cat.EnableRageBar(core.RageBarOptions{BaseHitFactor: 4.34})
+	cat.EnableRageBar(core.RageBarOptions{BaseRageMultiplier: 2.5})
 
 	cat.EnableAutoAttacks(cat, core.AutoAttackOptions{
 		// Base paw weapon.
diff --git a/sim/druid/guardian/tank.go b/sim/druid/guardian/tank.go
@@ -34,8 +34,8 @@ func NewGuardianDruid(character *core.Character, options *proto.Player) *Guardia
 	}
 
 	bear.EnableRageBar(core.RageBarOptions{
-		StartingRage:  bear.Options.StartingRage,
-		BaseHitFactor: 4.34,
+		StartingRage:       bear.Options.StartingRage,
+		BaseRageMultiplier: 2.5,
 	})
 	bear.EnableAutoAttacks(bear, core.AutoAttackOptions{
 		// Base paw weapon.
diff --git a/sim/warrior/arms/arms.go b/sim/warrior/arms/arms.go
@@ -47,8 +47,8 @@ func NewArmsWarrior(character *core.Character, options *proto.Player) *ArmsWarri
 	}
 
 	rbo := core.RageBarOptions{
-		StartingRage:  armsOptions.ClassOptions.StartingRage,
-		BaseHitFactor: 1.75,
+		StartingRage:       armsOptions.ClassOptions.StartingRage,
+		BaseRageMultiplier: 1,
 	}
 	war.EnableRageBar(rbo)
 
diff --git a/sim/warrior/fury/fury.go b/sim/warrior/fury/fury.go
@@ -41,8 +41,8 @@ func NewFuryWarrior(character *core.Character, options *proto.Player) *FuryWarri
 	}
 
 	rbo := core.RageBarOptions{
-		StartingRage:  furyOptions.ClassOptions.StartingRage,
-		BaseHitFactor: 1.75,
+		StartingRage:       furyOptions.ClassOptions.StartingRage,
+		BaseRageMultiplier: 1,
 	}
 
 	war.PrecisionKnown = true
diff --git a/sim/warrior/protection/protection.go b/sim/warrior/protection/protection.go
@@ -41,8 +41,8 @@ func NewProtectionWarrior(character *core.Character, options *proto.Player) *Pro
 	}
 
 	rbo := core.RageBarOptions{
-		StartingRage:  protOptions.ClassOptions.StartingRage,
-		BaseHitFactor: 1.75,
+		StartingRage:       protOptions.ClassOptions.StartingRage,
+		BaseRageMultiplier: 1,
 	}
 
 	war.EnableRageBar(rbo)

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`const MaxRage = 100.0`
`10`	`10`	`const ThreatPerRageGained = 5`
	`11`	`+const BaseRageHitFactor = 1.75`
`11`	`12`
`12`	`13`	`type rageBar struct {`
`13`	`14`	`unit *Unit`
`@@ -25,8 +26,8 @@ type rageBar struct {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`type RageBarOptions struct {`
`28`		`- StartingRage float64`
`29`		`- BaseHitFactor float64`
	`29`	`+ StartingRage float64`
	`30`	`+ BaseRageMultiplier float64`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`func (unit *Unit) EnableRageBar(options RageBarOptions) {`
`@@ -81,7 +82,7 @@ func (unit *Unit) EnableRageBar(options RageBarOptions) {`
`81`	`82`	`unit.rageBar = rageBar{`
`82`	`83`	`unit: unit,`
`83`	`84`	`startingRage: max(0, min(options.StartingRage, MaxRage)),`
`84`		`- startingHitFactor: options.BaseHitFactor,`
	`85`	`+ startingHitFactor: BaseRageHitFactor * options.BaseRageMultiplier,`
`85`	`86`	`RageRefundMetrics: unit.NewRageMetrics(ActionID{OtherID: proto.OtherAction_OtherActionRefund}),`
`86`	`87`	`}`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ func NewArmsWarrior(character core.Character, options proto.Player) *ArmsWarri`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`rbo := core.RageBarOptions{`
`50`		`- StartingRage: armsOptions.ClassOptions.StartingRage,`
`51`		`- BaseHitFactor: 1.75,`
	`50`	`+ StartingRage: armsOptions.ClassOptions.StartingRage,`
	`51`	`+ BaseRageMultiplier: 1,`
`52`	`52`	`}`
`53`	`53`	`war.EnableRageBar(rbo)`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ func NewFuryWarrior(character core.Character, options proto.Player) *FuryWarri`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`rbo := core.RageBarOptions{`
`44`		`- StartingRage: furyOptions.ClassOptions.StartingRage,`
`45`		`- BaseHitFactor: 1.75,`
	`44`	`+ StartingRage: furyOptions.ClassOptions.StartingRage,`
	`45`	`+ BaseRageMultiplier: 1,`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`war.PrecisionKnown = true`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ func NewProtectionWarrior(character core.Character, options proto.Player) *Pro`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`rbo := core.RageBarOptions{`
`44`		`- StartingRage: protOptions.ClassOptions.StartingRage,`
`45`		`- BaseHitFactor: 1.75,`
	`44`	`+ StartingRage: protOptions.ClassOptions.StartingRage,`
	`45`	`+ BaseRageMultiplier: 1,`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`war.EnableRageBar(rbo)`