Merge pull request #13 from wowsims/RogueRipOut

Rogue Rip Out

proto/rogue.proto

@@ -62,55 +62,8 @@ message RogueTalents {
 	bool premeditation = 51;
 }
 
-enum RogueRune {
-	RogueRuneNone = 0;
-
-	// Helm
-	RuneFocusedAttacks			= 432256;
-	RuneCombatPotency			= 432259;
-	RuneHonorAmongThieves		= 432264;
-
-	// Cloak
-	RuneFanOfKnives				= 409240;
-	RuneCrimsonTempest			= 412096;
-	RuneBlunderbuss				= 436564;
-
-	// Chest
-	RuneQuickDraw				= 398196;
-	RuneDeadlyBrew				= 399965;
-	RuneJustAFleshWound			= 400014;
-	RuneSlaughterFromTheShadows	= 424925;
-
-	// Bracers
-	RuneCutToTheChase			= 432271;
-	RuneUnfairAdvantage			= 432273;
-	RuneCarnage					= 432276;
-
-	// Gloves
-	RuneMutilate				= 399956;
-	RuneShadowstrike			= 399985;
-	RuneSaberSlash				= 424785;
-	RuneMainGauche				= 424919;
-	RuneCutthroat				= 462708;
-
-	// Waist
-	RuneShurikenToss			= 399986;
-	RuneShadowstep				= 400101;
-	RunePoisonedKnife			= 425012;
-
-	// Legs
-	RuneEnvenom					= 399963;
-	RuneBetweenTheEyes			= 400009;
-	RuneBladeDance				= 400012;
-
-	// Boots
-	RuneRollingWithThePunches	= 400016;
-	RuneWaylay					= 408700;
-	RuneMasterOfSubtlety		= 425096;
-}
-
 message RogueOptions {
-	int32 HonorAmongThievesCritRate = 1;
+
 }
 
 message Rogue {

sim/rogue/ambush.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/wowsims/classic/sim/core"
-	"github.com/wowsims/classic/sim/core/proto"
 )
 
 func (rogue *Rogue) registerAmbushSpell() {
@@ -22,9 +21,6 @@ func (rogue *Rogue) registerAmbushSpell() {
 		60: 11269,
 	}[rogue.Level]
 
-	// waylay := rogue.HasRune(proto.RogueRune_RuneWaylay)
-	hasCutthroatRune := rogue.HasRune(proto.RogueRune_RuneCutthroat)
-
 	damageMultiplier := 2.5 * []float64{1, 1.04, 1.08, 1.12, 1.16, 1.2}[rogue.Talents.Opportunity]
 
 	rogue.Ambush = rogue.RegisterSpell(core.SpellConfig{
@@ -49,7 +45,7 @@ func (rogue *Rogue) registerAmbushSpell() {
 			if !rogue.HasDagger(core.MainHand) {
 				return false
 			}
-			if hasCutthroatRune && (rogue.CutthroatProcAura.IsActive() || rogue.IsStealthed()) {
+			if rogue.IsStealthed() {
 				return true
 			}
 			return !rogue.PseudoStats.InFrontOfTarget && rogue.IsStealthed()
@@ -65,20 +61,13 @@ func (rogue *Rogue) registerAmbushSpell() {
 			baseDamage := (flatDamageBonus + spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()))
 
 			result := spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeSpecialNoBlockDodgeParry)
-			if hasCutthroatRune && rogue.CutthroatProcAura.IsActive() {
-				rogue.CutthroatProcAura.Deactivate(sim)
-			}
+
 			if result.Landed() {
 				rogue.AddComboPoints(sim, 1, target, spell.ComboPointMetrics())
-				/** Currently does not apply to bosses due to being a slow
-				if waylay {
-					rogue.WaylayAuras.Get(target).Activate(sim)
-				} */
 			} else {
 				spell.IssueRefund(sim)
 			}
 		},
 
-		RelatedAuras: []core.AuraArray{rogue.WaylayAuras},
 	})
 }

sim/rogue/backstab.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"github.com/wowsims/classic/sim/core"
-	"github.com/wowsims/classic/sim/core/proto"
 )
 
 func (rogue *Rogue) registerBackstabSpell() {
@@ -22,9 +21,6 @@ func (rogue *Rogue) registerBackstabSpell() {
 		60: core.TernaryInt32(core.IncludeAQ, 25300, 11281),
 	}[rogue.Level]
 
-	// waylay := rogue.HasRune(proto.RogueRune_RuneWaylay)
-	hasCutthroatRune := rogue.HasRune(proto.RogueRune_RuneCutthroat)
-
 	damageMultiplier := 1.5 * []float64{1, 1.04, 1.08, 1.12, 1.16, 1.2}[rogue.Talents.Opportunity]
 
 	rogue.Backstab = rogue.RegisterSpell(core.SpellConfig{
@@ -49,7 +45,7 @@ func (rogue *Rogue) registerBackstabSpell() {
 			if !rogue.HasDagger(core.MainHand) {
 				return false
 			}
-			return hasCutthroatRune || !rogue.PseudoStats.InFrontOfTarget
+			return !rogue.PseudoStats.InFrontOfTarget
 		},
 
 		BonusCritRating: 10 * core.CritRatingPerCritChance * float64(rogue.Talents.ImprovedBackstab),
@@ -67,18 +63,9 @@ func (rogue *Rogue) registerBackstabSpell() {
 
 			if result.Landed() {
 				rogue.AddComboPoints(sim, 1, target, spell.ComboPointMetrics())
-				if hasCutthroatRune {
-					rogue.rollCutthroat(sim)
-				}
-				/** Currently does not apply to bosses due to being a slow
-				if waylay {
-					rogue.WaylayAuras.Get(target).Activate(sim)
-				} */
 			} else {
 				spell.IssueRefund(sim)
 			}
 		},
-
-		RelatedAuras: []core.AuraArray{rogue.WaylayAuras},
 	})
 }