Merge branch 'master' into feature/remove-resistances

Author: 1337LutZ

proto/hunter.proto

@@ -91,55 +91,55 @@ enum HunterStingType {
 }
 
 message HunterOptions {
-	enum Ammo {
-		AmmoNone = 0;
-		IcebladeArrow = 1;
-		SaroniteRazorheads = 2;
-		TerrorshaftArrow = 3;
-		TimelessArrow = 4;
-		MysteriousArrow = 5;
-		AdamantiteStinger = 6;
-		BlackflightArrow = 7;
-	}
-	Ammo ammo = 1;
-
 	enum PetType {
-		PetNone = 0;
-		Bat = 1;
-		Bear = 2;
-		BirdOfPrey = 3;
-		Boar = 4;
-		CarrionBird = 5;
-		Cat = 6;
-		Chimaera = 7;
-		CoreHound = 8;
-		Crab = 9;
-		Crocolisk = 10;
-		Devilsaur = 11;
-		Dragonhawk = 12;
-		Gorilla = 13;
-		Hyena = 14;
-		Moth = 15;
-		NetherRay = 16;
-		Raptor = 17;
-		Ravager = 18;
-		Rhino = 19;
-		Scorpid = 20;
-		Serpent = 21;
-		Silithid = 22;
-		Spider = 23;
-		SpiritBeast = 24;
-		SporeBat = 25;
-		Tallstrider = 26;
-		Turtle = 27;
-		WarpStalker = 28;
-		Wasp = 29;
-		WindSerpent = 30;
-		Wolf = 31;
-		Worm = 32;
-		ShaleSpider = 33;
-		Fox = 34;
+		PetNone        = 0;
+		Bat            = 1;
+		Bear           = 2;
+		BirdOfPrey     = 3;
+		Boar           = 4;
+		CarrionBird    = 5;
+		Cat            = 6;
+		Chimaera       = 7;
+		CoreHound      = 8;
+		Crab           = 9;
+		Crocolisk      = 10;
+		Devilsaur      = 11;
+		Dragonhawk     = 12;
+		Gorilla        = 13;
+		Hyena          = 14;
+		Moth           = 15;
+		NetherRay      = 16;
+		Raptor         = 17;
+		Ravager        = 18;
+		Rhino          = 19;
+		Scorpid        = 20;
+		Serpent        = 21;
+		Silithid       = 22;
+		Spider         = 23;
+		SpiritBeast    = 24;
+		SporeBat       = 25;
+		Tallstrider    = 26;
+		Turtle         = 27;
+		WarpStalker    = 28;
+		Wasp           = 29;
+		WindSerpent    = 30;
+		Wolf           = 31;
+		Worm           = 32;
+		ShaleSpider    = 33;
+		Fox            = 34;
+
+		// new additions in MoP
+		Goat           = 35;
+		Porcupine      = 36;
+		Monkey         = 37;
+		Basilisk       = 38;
+		Crane          = 39;
+		Dog            = 40;
+		Beetle         = 41;
+		Quilen         = 42;
+		WaterStrider   = 43;
 	}
+
 	PetType pet_type = 2;
 
 	PetSpec pet_spec = 3;
@@ -201,21 +201,10 @@ message SurvivalHunter {
 		RotationType type = 9;
 		HunterStingType sting = 5;
 
-		bool trap_weave = 1;
-
-		// Switch to Aspect of the Viper when mana goes below this percent.
-		double viper_start_mana_percent = 6;
-		// Switch back to Aspect of the Hawk when mana goes above this percent.
-		double viper_stop_mana_percent = 7;
-
-		// Allow use of Explosive Shot Rank 3 during LNL procs.
-		bool allow_explosive_shot_downrank = 10;
-
 		bool multi_dot_serpent_sting = 11;
 	}
 	message Options {
 		HunterOptions class_options = 1;
-		double sniper_training_uptime = 2;
 	}
 	Options options = 1;
 }

sim/core/TestProtoVersioning.results

@@ -1201,7 +1201,7 @@ func StormLashAura(character *Character, actionTag int32) *Aura {
 		}
 
 		baseMultiplierExtension := getStormLashSpellOverride(spell)
-		ap := Ternary(spell.IsMelee(), stormlashSpell.MeleeAttackPower(), stormlashSpell.RangedAttackPower())
+		ap := Ternary(spell.IsRanged(), stormlashSpell.RangedAttackPower(), stormlashSpell.MeleeAttackPower())
 		sp := stormlashSpell.SpellPower()
 		scaledAP := ap * 0.2
 		scaledSP := sp * 0.3

sim/core/buffs.go

@@ -181,6 +181,7 @@ const (
 	SpellFlagPassiveSpell                                  // Indicates this spell is applied/cast as a result of another spell
 	SpellFlagSupressDoTApply                               // If present this spell will not apply dots (Used for DTR dot supression)
 	SpellFlagSwapped                                       // Indicates that this spell is not useable because it is from a currently swapped item
+	SpellFlagRanged
 
 	// Used to let agents categorize their spells.
 	SpellFlagAgentReserved1

sim/core/flags.go

@@ -494,6 +494,10 @@ func (spell *Spell) TargetDamageMultiplier(sim *Simulation, attackTable *AttackT
 		multiplier *= attackTable.Defender.PseudoStats.PeriodicPhysicalDamageTakenMultiplier
 	}
 
+	if spell.Flags.Matches(SpellFlagRanged) {
+		multiplier *= attackTable.RangedDamageTakenMulitplier
+	}
+
 	if attackTable.DamageDoneByCasterMultiplier != nil {
 		multiplier *= attackTable.DamageDoneByCasterMultiplier(sim, spell, attackTable)
 	}

sim/core/spell_result.go

@@ -215,13 +215,13 @@ type AttackTable struct {
 	MeleeCritSuppression float64
 	SpellCritSuppression float64
 
-	DamageDealtMultiplier  float64 // attacker buff, applied in applyAttackerModifiers()
-	DamageTakenMultiplier  float64 // defender debuff, applied in applyTargetModifiers()
-	HealingDealtMultiplier float64
-	IgnoreArmor            bool    // Ignore defender's armor for specifically this attacker's attacks
-	ArmorIgnoreFactor      float64 // Percentage of armor to ignore for this attacker's attacks
-	BonusSpellCritPercent  float64 // Analagous to Defender.PseudoStats.BonusSpellCritPercentTaken, but only for this attacker specifically
-
+	DamageDealtMultiplier       float64 // attacker buff, applied in applyAttackerModifiers()
+	DamageTakenMultiplier       float64 // defender debuff, applied in applyTargetModifiers()
+	HealingDealtMultiplier      float64
+	IgnoreArmor                 bool    // Ignore defender's armor for specifically this attacker's attacks
+	ArmorIgnoreFactor           float64 // Percentage of armor to ignore for this attacker's attacks
+	BonusSpellCritPercent       float64 // Analagous to Defender.PseudoStats.BonusSpellCritPercentTaken, but only for this attacker specifically
+	RangedDamageTakenMulitplier float64
 	// This is for "Apply Aura: Mod Damage Done By Caster" effects.
 	// If set, the damage taken multiplier is multiplied by the callbacks result.
 	DamageDoneByCasterMultiplier DynamicDamageDoneByCaster
@@ -236,9 +236,10 @@ func NewAttackTable(attacker *Unit, defender *Unit) *AttackTable {
 		Attacker: attacker,
 		Defender: defender,
 
-		DamageDealtMultiplier:  1,
-		DamageTakenMultiplier:  1,
-		HealingDealtMultiplier: 1,
+		DamageDealtMultiplier:       1,
+		DamageTakenMultiplier:       1,
+		RangedDamageTakenMulitplier: 1,
+		HealingDealtMultiplier:      1,
 	}
 
 	if defender.Type == EnemyUnit {