Skip to content

Commit ffa66d2

Browse files
committed
fix(Assassination): Fixed Kingsbane not suggesting on it's own
correct some minor logic typos
1 parent 2c7b45a commit ffa66d2

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

HeroRotation_Rogue/Assassination.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ local function Vanish ()
563563
end
564564

565565
-- # Don't Vanish if deathstalker's mark isn't up and we're at a finish condition
566-
if S.DeathStalkersMark:IsAvailable() and Target:BuffDown(S.DeathStalkersMarkDebuff) and ComboPoints >= EffectiveCPSpend then
566+
if S.DeathStalkersMark:IsAvailable() and Target:DebuffDown(S.DeathStalkersMarkDebuff) and ComboPoints >= EffectiveCPSpend then
567567
return
568568
end
569569

@@ -826,7 +826,7 @@ local function ShivUsage ()
826826
if not S.Deathmark:AnyDebuffUp() and not S.Kingsbane:IsAvailable() and ShivCondition and (Target:DebuffUp(S.CrimsonTempest) or S.AmplifyingPoison:IsAvailable())
827827
and (((num(S.LightweightShiv:IsAvailable()) + 1) - S.Shiv:ChargesFractional()) * 30 < S.Deathmark:CooldownRemains()) then
828828
if Cast(S.Shiv, Settings.Assassination.GCDasOffGCD.Shiv) then
829-
return "Cast Shiv"
829+
return "Cast Shiv (Fallback)"
830830
end
831831
end
832832

@@ -835,7 +835,7 @@ local function ShivUsage ()
835835
if not S.Kingsbane:IsAvailable() and not S.ArterialPrecision:IsAvailable() and ShivCondition
836836
and (not S.CrimsonTempest:IsAvailable() or SingleTarget or Target:DebuffUp(S.CrimsonTempest)) then
837837
if Cast(S.Shiv, Settings.Assassination.GCDasOffGCD.Shiv) then
838-
return "Cast Shiv"
838+
return "Cast Shiv (No KB)"
839839
end
840840
end
841841

@@ -919,8 +919,8 @@ local function CDs ()
919919
-- &(cooldown.deathmark.remains>=50-15*set_bonus.tww3_fatebound_4pc|dot.deathmark.ticking)|fight_remains<=15
920920
if S.Kingsbane:IsReady() then
921921
if (Target:DebuffUp(S.ShivDebuff) or S.Shiv:CooldownRemains() < 6) and (Player:BuffUp(S.Envenom) or MeleeEnemies10yCount > 1)
922-
and (S.Deathmark:CooldownRemains() >= 50 - 15*BoolToInt(TWW3FateboundHasTier4PC) or Target:DebuffUp(S.Deathmark)
923-
or (DeathmarkCondition and S.Deathmark:IsReady())) or HL.BossFilteredFightRemains("<=", 15) then
922+
and (S.Deathmark:CooldownRemains() >= 50 - 15*BoolToInt(TWW3FateboundHasTier4PC) or Target:DebuffUp(S.Deathmark))
923+
or HL.BossFilteredFightRemains("<=", 15) then
924924
if Cast(S.Kingsbane, Settings.Assassination.GCDasOffGCD.Kingsbane) then
925925
return "Cast Kingsbane"
926926
end
@@ -970,7 +970,7 @@ local function CDs ()
970970
-- actions.cds+=/cold_blood,use_off_gcd=1,if=(buff.fatebound_coin_tails.stack>0&buff.fatebound_coin_heads.stack>0)
971971
-- |debuff.shiv.up&(cooldown.deathmark.remains>50&!set_bonus.tww3_fatebound_4pc|dot.kingsbane.ticking
972972
-- &set_bonus.tww3_fatebound_4pc|!talent.inevitabile_end&effective_combo_points>=variable.effective_spend_cp)
973-
if S.ColdBlood:IsReady() and Player:DebuffDown(S.ColdBlood) then
973+
if S.ColdBlood:IsReady() and Player:BuffDown(S.ColdBlood) then
974974
if (Player:BuffStack(S.FateboundCoinTails) > 0 and Player:BuffStack(S.FateboundCoinHeads) > 0)
975975
or Target:DebuffUp(S.ShivDebuff) and (S.Deathmark:CooldownRemains() > 50 and not TWW3FateboundHasTier4PC
976976
or Target:DebuffUp(S.Kingsbane) and TWW3FateboundHasTier4PC or not S.InevitabileEnd:IsAvailable() and ComboPoints >= EffectiveCPSpend) then

0 commit comments

Comments
 (0)