From 65e0f5c8e1cc034725fa50c4c53d4d25faf3db91 Mon Sep 17 00:00:00 2001 From: blm95 Date: Wed, 10 Sep 2014 10:30:34 -0400 Subject: [PATCH 1/6] Small changes to Esk0r/TC-Crew's Vayne --- Marksman/Vayne.cs | 130 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 116 insertions(+), 14 deletions(-) diff --git a/Marksman/Vayne.cs b/Marksman/Vayne.cs index ff5d055..b86d1fe 100644 --- a/Marksman/Vayne.cs +++ b/Marksman/Vayne.cs @@ -13,6 +13,9 @@ internal class Vayne : Champion { public Spell E; public Spell Q; + public string[] interrupt; + public string[] notarget; + public string[] gapcloser; public Vayne() { @@ -22,22 +25,22 @@ public Vayne() E = new Spell(SpellSlot.E, float.MaxValue); E.SetTargetted(0.25f, 2200f); - - AntiGapcloser.OnEnemyGapcloser += AntiGapcloser_OnEnemyGapcloser; - Interrupter.OnPosibleToInterrupt += Interrupter_OnPosibleToInterrupt; + Obj_AI_Base.OnProcessSpellCast += Game_ProcessSpell; + //AntiGapcloser.OnEnemyGapcloser += AntiGapcloser_OnEnemyGapcloser; + //Interrupter.OnPosibleToInterrupt += Interrupter_OnPosibleToInterrupt; } - public void AntiGapcloser_OnEnemyGapcloser(ActiveGapcloser gapcloser) - { - if (E.IsReady() && gapcloser.Sender.IsValidTarget(E.Range)) - E.CastOnUnit(gapcloser.Sender); - } + //public void AntiGapcloser_OnEnemyGapcloser(ActiveGapcloser gapcloser) + //{ + // if (E.IsReady() && gapcloser.Sender.IsValidTarget(E.Range)) + // E.CastOnUnit(gapcloser.Sender); + //} - public void Interrupter_OnPosibleToInterrupt(Obj_AI_Base unit, InterruptableSpell spell) - { - if (GetValue("UseEInterrupt") && unit.IsValidTarget(550f)) - E.Cast(unit); - } + //public void Interrupter_OnPosibleToInterrupt(Obj_AI_Base unit, InterruptableSpell spell) + //{ + // if (GetValue("UseEInterrupt") && unit.IsValidTarget(550f)) + // E.Cast(unit); + //} public override void Game_OnGameUpdate(EventArgs args) { @@ -77,12 +80,111 @@ public override void ComboMenu(Menu config) public override void MiscMenu(Menu config) { + config.AddItem( new MenuItem("UseET" + Id, "Use E (Toggle)").SetValue( new KeyBind("T".ToCharArray()[0], KeyBindType.Toggle))); config.AddItem(new MenuItem("UseEInterrupt" + Id, "Use E To Interrupt").SetValue(true)); config.AddItem( new MenuItem("PushDistance" + Id, "E Push Distance").SetValue(new Slider(425, 475, 300))); + config.AddItem(new MenuItem("UseEaa", "Use E after auto").SetValue(new KeyBind("G".ToCharArray()[0], KeyBindType.Press))); + config.AddSubMenu(new Menu("Gapcloser List", "gap")); + config.AddSubMenu(new Menu("Gapcloser List 2", "gap2")); + config.AddSubMenu(new Menu("Interrupt List", "int")); + gapcloser = new[] + { + "AkaliShadowDance", "Headbutt", "DianaTeleport", "IreliaGatotsu", "JaxLeapStrike", "JayceToTheSkies", + "MaokaiUnstableGrowth", "MonkeyKingNimbus", "Pantheon_LeapBash", "PoppyHeroicCharge", "QuinnE", + "XenZhaoSweep", "blindmonkqtwo", "FizzPiercingStrike", "RengarLeap" + }; + notarget = new[] + { + "AatroxQ", "GragasE", "GravesMove", "HecarimUlt", "JarvanIVDragonStrike", "JarvanIVCataclysm", "KhazixE", + "khazixelong", "LeblancSlide", "LeblancSlideM", "LeonaZenithBlade", "UFSlash", "RenektonSliceAndDice", + "SejuaniArcticAssault", "ShenShadowDash", "RocketJump", "slashCast" + }; + interrupt = new[] + { + "KatarinaR", "GalioIdolOfDurand", "Crowstorm", "Drain", "AbsoluteZero", "ShenStandUnited", "UrgotSwap2", + "AlZaharNetherGrasp", "FallenOne", "Pantheon_GrandSkyfall_Jump", "VarusQ", "CaitlynAceintheHole", + "MissFortuneBulletTime", "InfiniteDuress", "LucianR" + }; + for (int i=0; i().Active) + { + if (args.SData.Name.ToLower().Contains("attack")) + { + if (menu.Item("UseEaa").GetValue().Active) + { + E.Cast(t); + } + + if (orbwalker.ActiveMode.ToString() == "Combo" && menu.Item("UseQC").GetValue()) + { + var after = ObjectManager.Player.Position + + Normalize(Game.CursorPos - ObjectManager.Player.Position)*300; + var disafter = Vector3.DistanceSquared(after, t.Position); + if (disafter < 630*630 && disafter > 100*100) + { + Q.Cast(Game.CursorPos); + } + if (Vector3.DistanceSquared(t.Position, ObjectManager.Player.Position) > 630*630 && + disafter < 630*630) + { + Q.Cast(Game.CursorPos); + } + } + + } + } + + if (args.SData.Name == "VayneCondemnMissile") + { + Orbwalking.ResetAutoAttackTimer(); + } + } + + if (menu.Item("UseEInterrupt").GetValue() && hero.IsValidTarget(550f)) + { + if (interrupt.Any(str => str.Contains(args.SData.Name))) + { + E.Cast(hero); + } + } + + if (gapcloser.Any(str => str.Contains(args.SData.Name)) && args.Target == ObjectManager.Player && hero.IsValidTarget(550f) && menu.Item(args.SData.Name).GetValue()) + { + E.Cast(hero); + } + + if (notarget.Any(str => str.Contains(args.SData.Name)) && Vector3.Distance(args.End, ObjectManager.Player.Position) <= 300 && hero.IsValidTarget(550f) && menu.Item(args.SData.Name).GetValue()) + { + E.Cast(hero); + } + } + + public static Vector3 Normalize(Vector3 A) + { + double distance = Math.Sqrt(A.X * A.X + A.Y * A.Y); + return new Vector3(new Vector2((float) (A.X / distance)), (float) (A.Y / distance)); } } -} \ No newline at end of file +} From f160227367c689d270e758066b201a76a929d158 Mon Sep 17 00:00:00 2001 From: blm95 Date: Wed, 10 Sep 2014 10:34:49 -0400 Subject: [PATCH 2/6] Update Vayne.cs --- Marksman/Vayne.cs | 50 ++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/Marksman/Vayne.cs b/Marksman/Vayne.cs index b86d1fe..61e3b33 100644 --- a/Marksman/Vayne.cs +++ b/Marksman/Vayne.cs @@ -26,22 +26,8 @@ public Vayne() E.SetTargetted(0.25f, 2200f); Obj_AI_Base.OnProcessSpellCast += Game_ProcessSpell; - //AntiGapcloser.OnEnemyGapcloser += AntiGapcloser_OnEnemyGapcloser; - //Interrupter.OnPosibleToInterrupt += Interrupter_OnPosibleToInterrupt; } - //public void AntiGapcloser_OnEnemyGapcloser(ActiveGapcloser gapcloser) - //{ - // if (E.IsReady() && gapcloser.Sender.IsValidTarget(E.Range)) - // E.CastOnUnit(gapcloser.Sender); - //} - - //public void Interrupter_OnPosibleToInterrupt(Obj_AI_Base unit, InterruptableSpell spell) - //{ - // if (GetValue("UseEInterrupt") && unit.IsValidTarget(550f)) - // E.Cast(unit); - //} - public override void Game_OnGameUpdate(EventArgs args) { if ((!E.IsReady()) || @@ -128,33 +114,31 @@ public static void Game_ProcessSpell(Obj_AI_Base hero, GameObjectProcessSpellCas var t = SimpleTs.GetTarget(550, SimpleTs.DamageType.Physical); if (hero.IsMe) { - if (menu.Item("UseEaa").GetValue().Active) + if (args.SData.Name.ToLower().Contains("attack")) { - if (args.SData.Name.ToLower().Contains("attack")) + if (menu.Item("UseEaa").GetValue().Active) + { + E.Cast(t); + } + + if (orbwalker.ActiveMode.ToString() == "Combo" && menu.Item("UseQC").GetValue()) { - if (menu.Item("UseEaa").GetValue().Active) + var after = ObjectManager.Player.Position + + Normalize(Game.CursorPos - ObjectManager.Player.Position)*300; + var disafter = Vector3.DistanceSquared(after, t.Position); + if (disafter < 630*630 && disafter > 100*100) { - E.Cast(t); + Q.Cast(Game.CursorPos); } - - if (orbwalker.ActiveMode.ToString() == "Combo" && menu.Item("UseQC").GetValue()) + if (Vector3.DistanceSquared(t.Position, ObjectManager.Player.Position) > 630*630 && + disafter < 630*630) { - var after = ObjectManager.Player.Position + - Normalize(Game.CursorPos - ObjectManager.Player.Position)*300; - var disafter = Vector3.DistanceSquared(after, t.Position); - if (disafter < 630*630 && disafter > 100*100) - { - Q.Cast(Game.CursorPos); - } - if (Vector3.DistanceSquared(t.Position, ObjectManager.Player.Position) > 630*630 && - disafter < 630*630) - { - Q.Cast(Game.CursorPos); - } + Q.Cast(Game.CursorPos); } - } + } + if (args.SData.Name == "VayneCondemnMissile") { From 2051eb71f1216b6bb7dbcc4f4a0c30f4ac7f0dad Mon Sep 17 00:00:00 2001 From: blm95 Date: Wed, 10 Sep 2014 10:36:32 -0400 Subject: [PATCH 3/6] Update Vayne.cs --- Marksman/Vayne.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marksman/Vayne.cs b/Marksman/Vayne.cs index 61e3b33..515bc97 100644 --- a/Marksman/Vayne.cs +++ b/Marksman/Vayne.cs @@ -97,7 +97,7 @@ public override void MiscMenu(Menu config) }; for (int i=0; i Date: Wed, 10 Sep 2014 10:38:08 -0400 Subject: [PATCH 4/6] Update Vayne.cs --- Marksman/Vayne.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marksman/Vayne.cs b/Marksman/Vayne.cs index 515bc97..eb1a9a9 100644 --- a/Marksman/Vayne.cs +++ b/Marksman/Vayne.cs @@ -97,7 +97,7 @@ public override void MiscMenu(Menu config) }; for (int i=0; i() && hero.IsValidTarget(550f)) + if (menu.Item("UseEInterrupt").GetValue() && hero.IsValidTarget(550f) && menu.Item(args.SData.Name).GetValue()) { if (interrupt.Any(str => str.Contains(args.SData.Name))) { From 06e45efbc43e35bbc0e60dbd81b3e85f7724fa3d Mon Sep 17 00:00:00 2001 From: blm95 Date: Wed, 10 Sep 2014 10:38:58 -0400 Subject: [PATCH 5/6] Update Vayne.cs --- Marksman/Vayne.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marksman/Vayne.cs b/Marksman/Vayne.cs index eb1a9a9..9b7ac6b 100644 --- a/Marksman/Vayne.cs +++ b/Marksman/Vayne.cs @@ -126,7 +126,7 @@ public static void Game_ProcessSpell(Obj_AI_Base hero, GameObjectProcessSpellCas var after = ObjectManager.Player.Position + Normalize(Game.CursorPos - ObjectManager.Player.Position)*300; var disafter = Vector3.DistanceSquared(after, t.Position); - if (disafter < 630*630 && disafter > 100*100) + if (disafter < 630*630 && disafter > 175*175) { Q.Cast(Game.CursorPos); } From e5d5df1c4a9c774175c900a395aefcb9355b477a Mon Sep 17 00:00:00 2001 From: blm95 Date: Wed, 10 Sep 2014 10:44:38 -0400 Subject: [PATCH 6/6] Update Vayne.cs --- Marksman/Vayne.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marksman/Vayne.cs b/Marksman/Vayne.cs index 9b7ac6b..f9c7627 100644 --- a/Marksman/Vayne.cs +++ b/Marksman/Vayne.cs @@ -97,7 +97,7 @@ public override void MiscMenu(Menu config) }; for (int i=0; i