[Feral Bear] Initial implementation

assets/database/leftover_db.json

@@ -72,8 +72,8 @@
 {"effectId":66,"spellId":7455,"name":"Enchant Bracer - Minor Stamina","icon":"trade_engraving","type":6,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":66,"itemId":6376,"spellId":7455,"name":"Enchant Boots - Minor Stamina","icon":"inv_misc_note_01","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":66,"spellId":7455,"name":"Enchant Shield - Minor Stamina","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":242,"spellId":7747,"name":"Enchant Chest - Lesser Health","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":243,"itemId":6344,"spellId":7456,"name":"Enchant Bracer - Minor Spirit","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":246,"itemId":6346,"spellId":7773,"name":"Enchant Chest - Lesser Mana","icon":"inv_misc_note_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -86,8 +86,8 @@
 {"effectId":254,"spellId":7850,"name":"Enchant Chest - Health","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":255,"itemId":6375,"spellId":7851,"name":"Enchant Bracer - Lesser Spirit","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":255,"itemId":11167,"spellId":7851,"name":"Enchant Boots - Lesser Spirit","icon":"inv_misc_note_01","type":10,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":255,"spellId":7851,"name":"Enchant Shield - Lesser Spirit","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":255,"itemId":11038,"spellId":7851,"name":"Enchant 2H Weapon - Lesser Spirit","icon":"inv_misc_note_01","type":13,"enchantType":1,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":255,"spellId":7851,"name":"Enchant Shield - Lesser Spirit","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":256,"spellId":7852,"name":"Enchant Cloak - Lesser Fire Resistance","icon":"trade_engraving","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0],"quality":1},
 {"effectId":463,"itemId":7967,"spellId":9782,"name":"Mithril Shield Spike","icon":"inv_misc_armorkit_02","stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":464,"itemId":7969,"spellId":7215,"name":"Mithril Spurs","icon":"ability_rogue_sprint","type":10,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -154,8 +154,8 @@
 {"effectId":929,"itemId":16217,"spellId":13827,"name":"Enchant Shield - Greater Stamina","icon":"inv_misc_note_01","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"itemId":11226,"spellId":13927,"name":"Enchant Gloves - Riding Skill","icon":"inv_misc_note_01","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13928,"name":"Enchant Gloves - Minor Haste","icon":"trade_engraving","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"itemId":22552,"spellId":27967,"name":"Enchant Weapon - Major Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","icon":"trade_engraving","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1704,"itemId":12645,"spellId":16624,"name":"Thorium Shield Spike","icon":"inv_misc_armorkit_20","stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},

assets/locales/en/translation.json

@@ -1572,14 +1572,6 @@
 					"label": "Totem Remaining Time",
 					"tooltip": "Returns the amount of time remaining until the totem will expire."
 				},
-				"cat_excess_energy": {
-					"label": "Excess Energy",
-					"tooltip": "Returns the amount of excess energy available, after subtracting energy that will be needed to maintain DoTs."
-				},
-				"cat_new_savage_roar_duration": {
-					"label": "New Savage Roar Duration",
-					"tooltip": "Returns duration of savage roar based on current combo points"
-				},
 				"warlock_assigned_curse_is_active": {
 					"label": "Assigned Curse Is Active",
 					"tooltip": "Returns true is assigned curse is active on target"
@@ -1823,6 +1815,33 @@
 						"label": "Maintain Faerie Fire",
 						"tooltip": "Use Faerie Fire (Feral) whenever it is not active on the target."
 					}
+				},
+				"feral_bear": {
+					"maul_rage_threshold": {
+						"label": "Maul Rage Threshold",
+						"tooltip": "Use Maul when current Rage is at or above this value."
+					},
+					"swipe_usage": {
+						"label": "Swipe Usage",
+						"tooltip": "When to use Swipe in the rotation.",
+						"values": {
+							"never": "Never",
+							"with_enough_ap": "With Enough AP",
+							"spam": "Spam"
+						}
+					},
+					"swipe_ap_threshold": {
+						"label": "Swipe AP Threshold",
+						"tooltip": "Minimum Attack Power required before Swipe is used in the rotation."
+					},
+					"maintain_demo_roar": {
+						"label": "Maintain Demo Roar",
+						"tooltip": "Keep Demoralizing Roar active on the primary target."
+					},
+					"maintain_faerie_fire": {
+						"label": "Maintain Faerie Fire",
+						"tooltip": "Use Faerie Fire (Feral) whenever it is not active on the target."
+					}
 				}
 			},
 			"guardian": {

proto/apl.proto

@@ -88,6 +88,7 @@ message APLAction {
 
         // Class or Spec-specific actions
         APLActionCatOptimalRotationAction cat_optimal_rotation_action = 18;
+        APLActionBearOptimalRotationAction bear_optimal_rotation_action = 30;
         APLActionGuardianHotwDpsRotation guardian_hotw_dps_rotation = 27;
 		APLActionCastWarlockAssignedCurse cast_warlock_assigned_curse = 29;
 
@@ -223,9 +224,7 @@ message APLValue {
 
         // Class or Spec-specific values
         APLValueTotemRemainingTime totem_remaining_time = 49;
-        APLValueCatExcessEnergy cat_excess_energy = 52;
-        APLValueCatNewSavageRoarDuration cat_new_savage_roar_duration = 61;
-		APLValueWarlockAssignedCurseIsActive warlock_assigned_curse_is_active = 59;
+APLValueWarlockAssignedCurseIsActive warlock_assigned_curse_is_active = 59;
 		APLValueWarlockIsAssignedCurse warlock_is_assigned_curse = 129;
         APLValueCurrentEclipsePhase druid_current_eclipse_phase = 70;
 		APLValueProtectionPaladinDamageTakenLastGlobal protection_paladin_damage_taken_last_global = 100;
@@ -376,6 +375,14 @@ message APLActionCatOptimalRotationAction {
     bool maintain_faerie_fire = 8;
 }
 
+message APLActionBearOptimalRotationAction {
+    bool maintain_faerie_fire = 1;
+    bool maintain_demoralizing_roar = 2;
+    int32 maul_rage_threshold = 3;
+    FeralBearDruid.Rotation.SwipeUsage swipe_usage = 4;
+    int32 swipe_ap_threshold = 5;
+}
+
 message APLActionGuardianHotwDpsRotation {
     enum Strategy {
         Caster = 0;
@@ -751,8 +758,6 @@ message APLValueTotemRemainingTime {
     ShamanTotems.TotemType totem_type = 1;
 	bool include_reaction_time = 2;
 }
-message APLValueCatExcessEnergy {}
-message APLValueCatNewSavageRoarDuration {}
 message APLValueWarlockAssignedCurseIsActive {
 	UnitReference target_unit = 1;
 }

proto/common.proto

@@ -25,7 +25,7 @@ message ProtoVersion {
 	// protos need to define an api_version field so that the UI code knows
 	// to up-convert these protos to the new format whenever api_version is
 	// missing (0) or lower than current_version_number.
-	option (current_version_number) = 11;
+	option (current_version_number) = 12;
 
 	// The actual field value is only used within unit tests.
 	int32 saved_version_number = 1;
@@ -511,6 +511,15 @@ message PartyBuffs {
 
 	// Mitigation buffs
 	TristateEffect commanding_shout = 33;
+
+	// Resistance aura/totems/aspect
+	bool frost_resistance_aura = 38;
+	bool frost_resistance_totem = 39;
+	bool nature_resistance_totem = 40;
+	bool fire_resistance_totem = 41;
+	bool fire_resistance_aura = 42;
+	bool shadow_resistance_aura = 43;
+	bool aspect_of_the_wild = 44;
 }
 
 // These are usually individual actions taken by other Characters.

proto/druid.proto

@@ -119,16 +119,22 @@ message FeralCatDruid {
 
 message FeralBearDruid {
   message Rotation {
-		bool maintain_faerie_fire = 1;
-		bool maintain_demoralizing_roar = 2;
-		double demo_time = 3;
-		double pulverize_time = 4;
-		bool prepull_stampede = 5;
+    bool maintain_faerie_fire = 1;
+    bool maintain_demoralizing_roar = 2;
+    int32 maul_rage_threshold = 3;
+
+    enum SwipeUsage {
+      SwipeUsage_Never = 0;
+      SwipeUsage_WithEnoughAP = 1;
+      SwipeUsage_Spam = 2;
+    }
+    SwipeUsage swipe_usage = 4;
+    int32 swipe_ap_threshold = 5;
   }
 
   message Options {
     DruidOptions class_options = 1;
-    Class symbiosis_target = 2;
+    double starting_rage = 2;
   }
   Options options = 3;
 }

schemas/translation.schema.json

@@ -5408,32 +5408,6 @@
 									"additionalProperties": false,
 									"required": ["label", "tooltip"]
 								},
-								"cat_excess_energy": {
-									"type": "object",
-									"properties": {
-										"label": {
-											"type": "string"
-										},
-										"tooltip": {
-											"type": "string"
-										}
-									},
-									"additionalProperties": false,
-									"required": ["label", "tooltip"]
-								},
-								"cat_new_savage_roar_duration": {
-									"type": "object",
-									"properties": {
-										"label": {
-											"type": "string"
-										},
-										"tooltip": {
-											"type": "string"
-										}
-									},
-									"additionalProperties": false,
-									"required": ["label", "tooltip"]
-								},
 								"warlock_assigned_curse_is_active": {
 									"type": "object",
 									"properties": {
@@ -5679,8 +5653,6 @@
 								"sequence_is_ready",
 								"sequence_time_to_ready",
 								"totem_remaining_time",
-								"cat_excess_energy",
-								"cat_new_savage_roar_duration",
 								"warlock_assigned_curse_is_active",
 								"warlock_is_assigned_curse",
 								"protection_paladin_damage_taken_last_global",
@@ -6370,10 +6342,60 @@
 									},
 									"additionalProperties": false,
 									"required": ["finishing_move", "biteweave", "ripweave", "rip_min_combo_points", "bite_min_combo_points", "mangle_trick", "rake_trick", "maintain_faerie_fire"]
+								},
+								"feral_bear": {
+									"type": "object",
+									"properties": {
+										"maul_rage_threshold": {
+											"type": "object",
+											"properties": {"label": {"type": "string"}, "tooltip": {"type": "string"}},
+											"additionalProperties": false,
+											"required": ["label", "tooltip"]
+										},
+										"swipe_usage": {
+											"type": "object",
+											"properties": {
+												"label": {"type": "string"},
+												"tooltip": {"type": "string"},
+												"values": {
+													"type": "object",
+													"properties": {
+														"never": {"type": "string"},
+														"with_enough_ap": {"type": "string"},
+														"spam": {"type": "string"}
+													},
+													"additionalProperties": false,
+													"required": ["never", "with_enough_ap", "spam"]
+												}
+											},
+											"additionalProperties": false,
+											"required": ["label", "tooltip", "values"]
+										},
+										"swipe_ap_threshold": {
+											"type": "object",
+											"properties": {"label": {"type": "string"}, "tooltip": {"type": "string"}},
+											"additionalProperties": false,
+											"required": ["label", "tooltip"]
+										},
+										"maintain_demo_roar": {
+											"type": "object",
+											"properties": {"label": {"type": "string"}, "tooltip": {"type": "string"}},
+											"additionalProperties": false,
+											"required": ["label", "tooltip"]
+										},
+										"maintain_faerie_fire": {
+											"type": "object",
+											"properties": {"label": {"type": "string"}, "tooltip": {"type": "string"}},
+											"additionalProperties": false,
+											"required": ["label", "tooltip"]
+										}
+									},
+									"additionalProperties": false,
+									"required": ["maul_rage_threshold", "swipe_usage", "swipe_ap_threshold", "maintain_demo_roar", "maintain_faerie_fire"]
 								}
 							},
 							"additionalProperties": false,
-							"required": ["feral_cat"]
+							"required": ["feral_cat", "feral_bear"]
 						},
 						"guardian": {
 							"type": "object",

sim/common/tbc/enchants.go

@@ -141,6 +141,16 @@ func init() {
 		})
 	})
 
+	// Savage Guard - +10 Nature Resistance (item 22635)
+	core.NewEnchantEffect(2681, func(agent core.Agent) {
+		agent.GetCharacter().AddStat(stats.NatureResistance, 10)
+	})
+
+	// Ice Guard - +10 Frost Resistance (item 22636)
+	core.NewEnchantEffect(2682, func(agent core.Agent) {
+		agent.GetCharacter().AddStat(stats.FrostResistance, 10)
+	})
+
 	// Scopes
 	core.NewEnchantEffect(2523, func(agent core.Agent) {
 		character := agent.GetCharacter()

sim/common/tbc/items_trinkets.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/wowsims/tbc/sim/core"
+	"github.com/wowsims/tbc/sim/core/proto"
 	"github.com/wowsims/tbc/sim/core/stats"
 )
 
@@ -893,4 +894,50 @@ func init() {
 			BuffAura: aura,
 		})
 	})
+
+	// Mark of the Champion (physical): +150 AP vs Undead and Demons.
+	core.NewItemEffect(23206, func(agent core.Agent) {
+		character := agent.GetCharacter()
+		bonus := stats.Stats{stats.AttackPower: 150, stats.RangedAttackPower: 150}
+		aura := core.MakePermanent(character.RegisterAura(core.Aura{
+			Label:    "Mark of the Champion (Physical)",
+			ActionID: core.ActionID{ItemID: 23206},
+		})).
+			ApplyOnGain(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Add(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Add(bonus)
+				}
+			}).
+			ApplyOnExpire(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Subtract(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Subtract(bonus)
+				}
+			})
+		character.ItemSwap.RegisterProc(23206, aura)
+	})
+
+	// Mark of the Champion (spell): +85 spell damage vs Undead and Demons.
+	core.NewItemEffect(23207, func(agent core.Agent) {
+		character := agent.GetCharacter()
+		bonus := stats.Stats{stats.SpellDamage: 85}
+		aura := core.MakePermanent(character.RegisterAura(core.Aura{
+			Label:    "Mark of the Champion (Spell)",
+			ActionID: core.ActionID{ItemID: 23207},
+		})).
+			ApplyOnGain(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Add(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Add(bonus)
+				}
+			}).
+			ApplyOnExpire(func(_ *core.Aura, _ *core.Simulation) {
+				for _, at := range character.AttackTables {
+					at.MobTypeBonusStats[proto.MobType_MobTypeUndead] = at.MobTypeBonusStats[proto.MobType_MobTypeUndead].Subtract(bonus)
+					at.MobTypeBonusStats[proto.MobType_MobTypeDemon] = at.MobTypeBonusStats[proto.MobType_MobTypeDemon].Subtract(bonus)
+				}
+			})
+		character.ItemSwap.RegisterProc(23207, aura)
+	})
 }