[Feature] Raid buffs & debuffs

assets/database/db.json

@@ -18071,7 +18071,6 @@
 {"id":770,"name":"Faerie Fire","icon":"spell_nature_faeriefire","hasBuff":true},
 {"id":779,"name":"Swipe","icon":"inv_misc_monsterclaw_03"},
 {"id":879,"name":"Exorcism","icon":"spell_holy_excorcism_02"},
-{"id":1130,"name":"Hunter's Mark","icon":"ability_hunter_snipershot","hasBuff":true},
 {"id":1459,"name":"Arcane Brilliance","icon":"spell_holy_magicalsentry","hasBuff":true},
 {"id":1463,"name":"Incanter's Ward","icon":"spell_shadow_detectlesserinvisibility","hasBuff":true},
 {"id":1490,"name":"Curse of the Elements","icon":"warlock_curse_shadow","hasBuff":true},

proto/common.proto

@@ -550,52 +550,39 @@ message IndividualBuffs {
 }
 
 message Debuffs {
-	// 8% spell damage
-	bool curse_of_elements = 1;
-	bool ebon_plaguebringer = 2;
-	bool earth_and_moon = 3;
-	bool master_poisoner = 4;
-	bool fire_breath = 5;
-	bool lightning_breath = 6;
-
-	// 5% spell crit
-	bool critical_mass = 7;
-	bool shadow_and_flame = 8;
-
-	// 30% bleed damage
-	bool blood_frenzy = 9;
-	bool hemorrhage = 10;
-	bool mangle = 11;
-	bool stampede = 12;
-
-	// Major armor
-	bool expose_armor = 13;
-	bool sunder_armor = 14;
-	bool faerie_fire = 15;
-	bool corrosive_spit = 16;
-
-	// 4% physical dmg
-	bool savage_combat = 17;
-	bool brittle_bones = 18;
-	bool acid_spit = 19;
-
-	// -dmg %
-	bool curse_of_weakness = 20;
-	bool demoralizing_roar = 21;
-	bool demoralizing_shout = 22;
-	bool vindication = 23;
-	bool scarlet_fever = 24;
-	bool demoralizing_screech = 25;
-	bool keg_smask = 32;
-
-	// -attack speed
-	bool thunder_clap = 26;
-	bool frost_fever = 27;
-	bool infected_wounds = 28;
-	bool judgements_of_the_just = 29;
-	bool dust_cloud = 30;
-	bool earth_shock = 31;
-}
+
+	// –10% Physical damage dealt for 30s
+	// Physical‐damage‐dealt sources:
+	// Scarlet Fever, Thrash, Demoralizing Roar, Demoralizing Screech, Keg Smash,
+	//   Hammer of the Righteous, Earth Shock, Curse of Enfeeblement, Thunder Clap
+	bool weakened_blows = 1;
+
+	// +4% Physical damage taken for 30s
+	// Gore, Stampede, Acid Spit, Ravage, Judgments of the Bold, Colossus Smash
+	bool physical_vulnerability = 2;
+
+	// –4% Armor for 30s, stacks 3 times
+	// Faerie Fire, Tear Armor, Dust Cloud, Expose Armor, Sunder Armor
+	bool weakened_armor = 3;
+
+	//Healing reduction
+	//Widow Venom, Monstrous Bite, Rising Sun Kick, Wound Poison, Mortal Strike, Wild Strike
+	bool mortal_wounds = 4;
+
+	// Spell‐damage‐taken sources:
+	bool fire_breath              = 5;
+	bool lightning_breath         = 6;
+	bool master_poisoner          = 7;
+	bool curse_of_elements        = 8;
+
+	// Casting‐speed‐reduction sources:
+	bool necrotic_strike          = 9;
+	bool lava_breath              = 10;
+	bool spore_cloud              = 11;
+	bool slow                     = 12;
+	bool mind_numbing_poison      = 13;
+	bool curse_of_enfeeblement = 14;
+  }
 
 message ConsumesSpec {
 	int32 prepot_id = 1;

sim/core/armor_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/wowsims/mop/sim/core/stats"
 )
 
-func TestSunderArmorStacks(t *testing.T) {
+func TestWeakenedArmorStacks(t *testing.T) {
 	sim := Simulation{}
 	baseArmor := 11977.0
 	target := Unit{
@@ -24,7 +24,7 @@ func TestSunderArmorStacks(t *testing.T) {
 		t.Fatalf("Armor value for target should be %f but found %f", 11977.0, target.Armor())
 	}
 	stacks := int32(1)
-	sunderAura := SunderArmorAura(&target)
+	sunderAura := WeakenedArmorAura(&target)
 	sunderAura.Activate(&sim)
 	sunderAura.SetStacks(&sim, stacks)
 	tolerance := 0.001
@@ -38,96 +38,6 @@ func TestSunderArmorStacks(t *testing.T) {
 	}
 }
 
-func TestAcidSpitStacks(t *testing.T) {
-	sim := Simulation{}
-	baseArmor := 11977.0
-	target := Unit{
-		Type:         EnemyUnit,
-		Index:        0,
-		Level:        88,
-		auraTracker:  newAuraTracker(),
-		initialStats: stats.Stats{stats.Armor: baseArmor},
-		PseudoStats:  stats.NewPseudoStats(),
-		Metrics:      NewUnitMetrics(),
-	}
-	target.stats = target.initialStats
-	expectedArmor := baseArmor
-	if target.Armor() != expectedArmor {
-		t.Fatalf("Armor value for target should be %f but found %f", 11977.0, target.Armor())
-	}
-	stacks := int32(1)
-	corrosiveSpitAura := CorrosiveSpitAura(&target)
-	corrosiveSpitAura.Activate(&sim)
-	corrosiveSpitAura.SetStacks(&sim, stacks)
-	tolerance := 0.001
-	for stacks <= 3 {
-		expectedArmor = baseArmor * (1.0 - float64(stacks)*0.04)
-		if !WithinToleranceFloat64(expectedArmor, target.Armor(), tolerance) {
-			t.Fatalf("Armor value for target should be %f but found %f", expectedArmor, target.Armor())
-		}
-		stacks++
-		corrosiveSpitAura.AddStack(&sim)
-	}
-}
-
-func TestExposeArmor(t *testing.T) {
-	sim := Simulation{}
-	baseArmor := 11977.0
-	target := Unit{
-		Type:         EnemyUnit,
-		Index:        0,
-		Level:        88,
-		auraTracker:  newAuraTracker(),
-		initialStats: stats.Stats{stats.Armor: baseArmor},
-		PseudoStats:  stats.NewPseudoStats(),
-		Metrics:      NewUnitMetrics(),
-	}
-	target.stats = target.initialStats
-	expectedArmor := baseArmor
-	if target.Armor() != expectedArmor {
-		t.Fatalf("Armor value for target should be %f but found %f", 11977.0, target.Armor())
-	}
-	exposeAura := ExposeArmorAura(&target, false)
-	exposeAura.Activate(&sim)
-	tolerance := 0.001
-	expectedArmor = baseArmor * (1.0 - 0.12)
-	if !WithinToleranceFloat64(expectedArmor, target.Armor(), tolerance) {
-		t.Fatalf("Armor value for target should be %f but found %f", expectedArmor, target.Armor())
-	}
-}
-
-func TestMajorArmorReductionAurasDoNotStack(t *testing.T) {
-	sim := Simulation{}
-	baseArmor := 11977.0
-	target := Unit{
-		Type:         EnemyUnit,
-		Index:        0,
-		Level:        88,
-		auraTracker:  newAuraTracker(),
-		initialStats: stats.Stats{stats.Armor: baseArmor},
-		PseudoStats:  stats.NewPseudoStats(),
-		Metrics:      NewUnitMetrics(),
-	}
-	target.stats = target.initialStats
-	expectedArmor := baseArmor
-	if target.Armor() != expectedArmor {
-		t.Fatalf("Armor value for target should be %f but found %f", 11977.0, target.Armor())
-	}
-	corrosiveSpitAura := CorrosiveSpitAura(&target)
-	corrosiveSpitAura.Activate(&sim)
-	corrosiveSpitAura.SetStacks(&sim, 3)
-	tolerance := 0.001
-	expectedArmor = baseArmor * (1.0 - 0.12)
-	if !WithinToleranceFloat64(expectedArmor, target.Armor(), tolerance) {
-		t.Fatalf("Armor value for target should be %f but found %f", expectedArmor, target.Armor())
-	}
-	exposeArmorAura := ExposeArmorAura(&target, false)
-	exposeArmorAura.Activate(&sim)
-	if !WithinToleranceFloat64(expectedArmor, target.Armor(), tolerance) {
-		t.Fatalf("Armor value for target should be %f but found %f", expectedArmor, target.Armor())
-	}
-}
-
 func TestDamageReductionFromArmor(t *testing.T) {
 	sim := Simulation{}
 	baseArmor := 11977.0
@@ -154,28 +64,19 @@ func TestDamageReductionFromArmor(t *testing.T) {
 	}
 
 	// Major
-	corrosiveSpitAura := CorrosiveSpitAura(&target)
-	corrosiveSpitAura.Activate(&sim)
-	corrosiveSpitAura.SetStacks(&sim, 3)
+	weakenedArmorAura := WeakenedArmorAura(&target)
+	weakenedArmorAura.Activate(&sim)
+	weakenedArmorAura.SetStacks(&sim, 3)
 	expectedDamageReduction = 0.287895
 	if !WithinToleranceFloat64(1-expectedDamageReduction, attackTable.GetArmorDamageModifier(spell), tolerance) {
 		t.Fatalf("Expected major armor modifier to result in %f damage reduction got %f", expectedDamageReduction, 1-attackTable.GetArmorDamageModifier(spell))
 	}
-	corrosiveSpitAura.Deactivate(&sim)
-
-	// Major
-	faerieFireAura := FaerieFireAura(&target)
-	faerieFireAura.Activate(&sim)
-	faerieFireAura.SetStacks(&sim, 3)
-	expectedDamageReduction = 0.287895
-	if !WithinToleranceFloat64(1-expectedDamageReduction, attackTable.GetArmorDamageModifier(spell), tolerance) {
-		t.Fatalf("Expected major & minor armor modifier to result in %f damage reduction got %f", expectedDamageReduction, 1-attackTable.GetArmorDamageModifier(spell))
-	}
+	weakenedArmorAura.Deactivate(&sim)
 
 	// Major Multi
 	shatteringThrowAura := ShatteringThrowAura(&target, attacker.UnitIndex)
 	shatteringThrowAura.Activate(&sim)
-	expectedDamageReduction = 0.244387
+	expectedDamageReduction = 0.268757
 	if !WithinToleranceFloat64(1-expectedDamageReduction, attackTable.GetArmorDamageModifier(spell), tolerance) {
 		t.Fatalf("Expected major & shattering modifier to result in %f damage reduction got %f", expectedDamageReduction, 1-attackTable.GetArmorDamageModifier(spell))
 	}