Remove resistances

Author: 1337LutZ

assets/database/db.bin

@@ -197,7 +197,7 @@ message TargetedActionMetrics {
 	// # of times this action was a critical tick on a target.
 	int32 crit_ticks = 6;
 
-	// # of times this action was a Miss or Resist.
+	// # of times this action was a Miss.
 	int32 misses = 7;
 
 	// # of times this action was a Dodge.

assets/database/db.json

@@ -188,7 +188,7 @@ enum Profession {
 // the Go Stats array to be larger than the size of the Stat enum proto, but the
 // shared indices between the two must exactly match.
 //
-// NextIndex: 27;
+// NextIndex: 22;
 enum Stat {
 	// Primary attributes ("main stat")
 	StatStrength = 0;
@@ -210,22 +210,17 @@ enum Stat {
 	StatAttackPower = 12;
 	StatRangedAttackPower = 13;
 	StatSpellPower = 14;
-	StatSpellPenetration = 15;
-	StatResilienceRating = 16;
-	StatArcaneResistance = 17;
-	StatFireResistance = 18;
-	StatFrostResistance = 19;
-	StatNatureResistance = 20;
-	StatShadowResistance = 21;
-	StatArmor = 22; // "white armor" that fully scales with all multipliers
-	StatBonusArmor = 23; // "green armor" that does not scale
+	StatPvpResilienceRating = 15;
+	StatPvpPowerRating = 16;
+	StatArmor = 17; // "white armor" that fully scales with all multipliers
+	StatBonusArmor = 18; // "green armor" that does not scale
 
 	// Composite stats that are built up from the above gear stats + buffs.
 	// These still belong in the Stat enum because they can be present on
 	// some enchants and because the base values need to be stored for NPCs.
-	StatHealth = 24;
-	StatMana = 25;
-	StatMP5 = 26;
+	StatHealth = 19;
+	StatMana = 20;
+	StatMP5 = 21;
 
 	// DO NOT add new stats here without discussing it first; new stats come
 	// with a performance penalty.
@@ -871,4 +866,4 @@ enum LogLevel {
 	Error = 2;
 
 	Undefined = -1;
-}
+}

assets/database/leftover_db.bin

@@ -131,21 +131,4 @@ func init() {
 	// PARRY
 	shared.NewParryActive(55881, 1260, time.Second*10, time.Minute) // Impetuous Query
 	shared.NewParryActive(56406, 1425, time.Second*10, time.Minute) // Impetuous Query (Heroic)
-
-	// RESI
-	shared.CreateDefensiveStatActive(62466, time.Second*10, time.Minute, stats.Stats{ // Mirror of Broken Images (Alliance)
-		stats.ArcaneResistance: 400,
-		stats.FrostResistance:  400,
-		stats.FireResistance:   400,
-		stats.ShadowResistance: 400,
-		stats.NatureResistance: 400,
-	})
-
-	shared.CreateDefensiveStatActive(62471, time.Second*10, time.Minute, stats.Stats{ // Mirror of Broken Images (Horde)
-		stats.ArcaneResistance: 400,
-		stats.FrostResistance:  400,
-		stats.FireResistance:   400,
-		stats.ShadowResistance: 400,
-		stats.NatureResistance: 400,
-	})
 }

assets/database/leftover_db.json

@@ -59,25 +59,25 @@ func TestDamageReductionFromArmor(t *testing.T) {
 	expectedDamageReduction := 0.349334
 	attackTable := NewAttackTable(&attacker, &target)
 	tolerance := 0.0001
-	if !WithinToleranceFloat64(1-expectedDamageReduction, attackTable.GetArmorDamageModifier(spell), tolerance) {
-		t.Fatalf("Expected no armor modifiers to result in %f damage reduction got %f", expectedDamageReduction, 1-attackTable.GetArmorDamageModifier(spell))
+	if !WithinToleranceFloat64(1-expectedDamageReduction, attackTable.getArmorDamageModifier(spell), tolerance) {
+		t.Fatalf("Expected no armor modifiers to result in %f damage reduction got %f", expectedDamageReduction, 1-attackTable.getArmorDamageModifier(spell))
 	}
 
 	// Major
 	weakenedArmorAura := WeakenedArmorAura(&target)
 	weakenedArmorAura.Activate(&sim)
 	weakenedArmorAura.SetStacks(&sim, 3)
 	expectedDamageReduction = 0.320864
-	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))
+	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))
 	}
 	weakenedArmorAura.Deactivate(&sim)
 
 	// Major Multi
 	shatteringThrowAura := ShatteringThrowAura(&target, attacker.UnitIndex)
 	shatteringThrowAura.Activate(&sim)
 	expectedDamageReduction = 0.300459
-	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))
+	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))
 	}
 }

proto/api.proto

@@ -238,7 +238,7 @@ func (aura *StatBuffAura) CanProc(sim *Simulation) bool {
 func (aura *StatBuffAura) InferCDType() CooldownType {
 	cdType := CooldownTypeUnknown
 
-	if aura.BuffsMatchingStat([]stats.Stat{stats.Armor, stats.BlockPercent, stats.DodgeRating, stats.ParryRating, stats.Health, stats.ArcaneResistance, stats.FireResistance, stats.FrostResistance, stats.NatureResistance, stats.ShadowResistance}) {
+	if aura.BuffsMatchingStat([]stats.Stat{stats.Armor, stats.BlockPercent, stats.DodgeRating, stats.ParryRating, stats.Health}) {
 		cdType |= CooldownTypeSurvival
 	} else {
 		cdType |= CooldownTypeDPS

proto/common.proto

@@ -20,8 +20,6 @@ const DefaultAttackPowerPerDPS = 14.0
 // Updated based on formulas supplied by InDebt on WoWSims Discord
 const EnemyAutoAttackAPCoefficient = 1.0 / (14.0 * 177.0)
 
-const AverageMagicPartialResistMultiplier = 0.94
-
 // IDs for items used in core
 // const ()