Skip to content

Commit 5de36c1

Browse files
committed
Update InitialWarrior.lua
fixup warrior Initial; good to go for Exile's Reach.
1 parent 8ef5ec8 commit 5de36c1

File tree

1 file changed

+33
-30
lines changed

1 file changed

+33
-30
lines changed

Diff for: Rotations/Warrior/Initial/InitialWarrior.lua

+33-30
Original file line numberDiff line numberDiff line change
@@ -151,39 +151,42 @@ local function runRotation()
151151
--- In Combat - Interrupts ---
152152
------------------------------
153153
-- Start Attack
154-
if mode.mover == 1 and spell.known.charge() then
155-
if cast.able.charge("target") and br.getDistance("player", "target") >= 8 and br.getDistance("player", "target") <= 25 then
154+
if mode.mover == 1 and cast.able.charge("target") then
155+
if br.getDistance("player", "target") >= 8 and br.getDistance("player", "target") <= 25 then
156156
if cast.charge("target") then ui.debug("Casting Charge") return true end
157157
end
158158
end
159-
-- actions=auto_attack
160-
if not cast.auto.autoAttack() and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
161-
if cast.autoAttack() then ui.debug("Casting Auto Attack") return true end
162-
end
163-
-- Execute
164-
if unit.hp("target") < 20 and spell.known.execute() and cast.able.execute and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
165-
if cast.execute() then ui.debug("Casting Execute") return true end
166-
end
167-
-- Victory Rush
168-
if spell.known.victoryRush() and cast.able.victoryRush and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
169-
if cast.victoryRush() then ui.debug("Casting Victory Rush") return true end
170-
end
171-
-- Shield Slam
172-
if spell.known.shieldSlam() and cast.able.shieldSlam and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
173-
if cast.shieldSlam() then ui.debug("Casting Shield Slam") return true end
174-
end
175-
-- WhirlWind
176-
if spell.known.whirlwind() and cast.able.whirlwind() and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
177-
if cast.whirlwind() then ui.debug("Casting Whirlwind") return true end
178-
end
179-
-- Slam
180-
if spell.known.slam() and cast.able.slam() and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
181-
if cast.slam() then ui.debug("Casting Slam") return true end
182-
end
183-
--Pummel Interrupt
184-
if br.canInterrupt() then
185-
if spell.known.pummel() and cast.able.pummel() and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
186-
if cast.pummel() then ui.debug("Casting Pummel") return true end
159+
160+
if unit.distance("target") <= 6 then
161+
162+
if unit.hp("target") < 20 and cast.able.execute() then
163+
if cast.execute() then ui.debug("Casting Execute") return true end
164+
end
165+
-- actions=auto_attack
166+
if not cast.auto.autoAttack() and unit.exists(units.dyn5) and unit.distance(units.dyn5) < 5 then
167+
if cast.autoAttack() then ui.debug("Casting Auto Attack") return true end
168+
end
169+
-- Victory Rush
170+
if cast.able.victoryRush() then
171+
if cast.victoryRush() then ui.debug("Casting Victory Rush") return true end
172+
end
173+
-- Shield Slam
174+
if cast.able.shieldSlam() then
175+
if cast.shieldSlam() then ui.debug("Casting Shield Slam") return true end
176+
end
177+
-- WhirlWind
178+
if cast.able.whirlwind() then
179+
if cast.whirlwind() then ui.debug("Casting Whirlwind") return true end
180+
end
181+
-- Slam
182+
if cast.able.slam() then
183+
if cast.slam() then ui.debug("Casting Slam") return true end
184+
end
185+
--Pummel Interrupt
186+
if br.canInterrupt() then
187+
if cast.able.pummel() then
188+
if cast.pummel() then ui.debug("Casting Pummel") return true end
189+
end
187190
end
188191
end
189192
end -- End In Combat Rotation

0 commit comments

Comments
 (0)