PR Feedback round 1

Author: 1337LutZ

assets/database/db.bin

@@ -2633,9 +2633,9 @@ dps_results: {
 dps_results: {
  key: "TestBrewmaster-AllItems-TyrannicalPrimalDiamond"
  value: {
-  dps: 52227.77932
-  tps: 52227.77932
-  hps: 2605.6522
+  dps: 52167.46184
+  tps: 52167.46184
+  hps: 2597.71199
  }
 }
 dps_results: {

assets/database/db.json

@@ -17,7 +17,7 @@ func (monk *Monk) registerTouchOfDeath() {
 		ActionID:       actionID,
 		SpellSchool:    core.SpellSchoolPhysical,
 		ProcMask:       core.ProcMaskMeleeMHSpecial,
-		Flags:          core.SpellFlagMeleeMetrics | core.SpellFlagCannotBeDodged | core.SpellFlagIgnoreArmor | core.SpellFlagIgnoreAttackerModifiers | core.SpellFlagIgnoreTargetModifiers | SpellFlagBuilder | core.SpellFlagAPL,
+		Flags:          core.SpellFlagMeleeMetrics | core.SpellFlagCannotBeDodged | core.SpellFlagIgnoreArmor | core.SpellFlagIgnoreModifiers | SpellFlagBuilder | core.SpellFlagAPL,
 		ClassSpellMask: MonkSpellTouchOfDeath,
 		MaxRange:       core.MaxMeleeRange,
 

assets/database/leftover_db.bin

@@ -2577,9 +2577,9 @@ dps_results: {
 dps_results: {
  key: "TestWindwalker-AllItems-TyrannicalPrimalDiamond"
  value: {
-  dps: 71325.3688
-  tps: 66136.76805
-  hps: 4895.42423
+  dps: 71196.71566
+  tps: 66022.8776
+  hps: 4879.00789
  }
 }
 dps_results: {

assets/database/leftover_db.json

@@ -71,6 +71,10 @@ func MapBonusStatIndexToStat(index int) (proto.Stat, bool) {
 		return proto.Stat_StatRangedAttackPower, true
 	case 41, 42, 45: // SpellHealing, SpellDamage, or SpellPower
 		return proto.Stat_StatSpellPower, true
+	case 47: // SpellPenetration
+		return proto.Stat_StatPvpPowerRating, true
+	case 35: // ResilienceRating
+		return proto.Stat_StatPvpResilienceRating, true
 	case 50: // ExtraArmor maps to BonusArmor (green armor)
 		return proto.Stat_StatBonusArmor, true
 	case 43: // ManaRegeneration
@@ -215,6 +219,11 @@ type EnchantMetaType struct {
 }
 
 var SpellSchoolToStat = map[SpellSchool]proto.Stat{
+	FIRE:     -1,
+	ARCANE:   -1,
+	NATURE:   -1,
+	FROST:    -1,
+	SHADOW:   -1,
 	PHYSICAL: proto.Stat_StatArmor,
 }
 var MapInventoryTypeToEnchantMetaType = map[InventoryTypeFlag]EnchantMetaType{
@@ -340,7 +349,7 @@ var RatingModToStat = map[RatingModType]proto.Stat{
 	RATING_MOD_MULTISTRIKE:  -1,
 	RATING_MOD_READINESS:    -1,
 	RATING_MOD_SPEED:        -1,
-	RATING_MOD_RESILIENCE:   -1,
+	RATING_MOD_RESILIENCE:   proto.Stat_StatPvpResilienceRating,
 	RATING_MOD_LEECH:        -1,
 	RATING_MOD_HASTE_MELEE:  proto.Stat_StatHasteRating,
 	RATING_MOD_HASTE_RANGED: proto.Stat_StatHasteRating,

sim/monk/brewmaster/TestBrewmaster.results

@@ -59,6 +59,7 @@ export class Individual60UEPExporter<SpecType extends Spec> extends IndividualEx
 		[Stat.StatAttackPower]: 'attackPower',
 		[Stat.StatMasteryRating]: 'masteryRating',
 		[Stat.StatExpertiseRating]: 'expertiseRating',
+		// TODO: Change PVP Resilience and Power once 60U exists for MoP
 		[Stat.StatPvpResilienceRating]: 'pvpResilienceRating',
 		[Stat.StatPvpPowerRating]: 'pvpPowerRating',
 		[Stat.StatMana]: 'mana',

sim/monk/touch_of_death.go

@@ -65,8 +65,9 @@ export class IndividualPawnEPExporter<SpecType extends Spec> extends IndividualE
 		[Stat.StatRangedAttackPower]: 'Ap',
 		[Stat.StatDodgeRating]: 'DodgeRating',
 		[Stat.StatParryRating]: 'ParryRating',
-		[Stat.StatPvpResilienceRating]: 'pvpResilienceRating',
-		[Stat.StatPvpPowerRating]: 'pvpPowerRating',
+		// TODO: Change PVP Resilience and Power once Pawn exists for MoP
+		[Stat.StatPvpResilienceRating]: 'ResilienceRating',
+		[Stat.StatPvpPowerRating]: 'PVPPowerRating',
 		[Stat.StatHealth]: 'Health',
 		[Stat.StatBonusArmor]: 'Armor2',
 	};