From dd6556139c73dc3c7905234677cb19a0d78ba28c Mon Sep 17 00:00:00 2001 From: noil Date: Tue, 2 Nov 2021 20:50:28 -0400 Subject: [PATCH] CrystalAura: Place between swap value --- .../seppuku/impl/module/combat/CrystalAuraModule.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java index c59ac2f..c1897ad 100644 --- a/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java +++ b/src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java @@ -48,7 +48,7 @@ public final class CrystalAuraModule extends Module { public final Value attackDelay = new Value("AttackDelay", new String[]{"AttackDelay", "AttackDel", "Del"}, "The delay to attack in milliseconds", 50.0f, 0.0f, 500.0f, 1.0f); public final Value attackRadius = new Value("AttackRadius", new String[]{"ARange", "HitRange", "AttackDistance", "AttackRange", "ARadius"}, "The maximum range to attack crystals", 4.0f, 0.0f, 7.0f, 0.1f); public final Value attackMaxDistance = new Value("AttackMaxDistance", new String[]{"AMaxRange", "MaxAttackRange", "AMaxRadius", "AMD", "AMR"}, "Range around the enemy crystals will be attacked", 8.0f, 1.0f, 20.0f, 1.0f); - public final Value attackWhenEmpty = new Value("AttackWhenEmpty", new String[]{"AWhenEmpty"}, "Continue to attack other crystals when we don't have any left", false); + public final Value attackWhenEmpty = new Value("AttackWhenEmpty", new String[]{"AWhenEmpty"}, "Continue to attack other crystals when we don't have any left", true); public final Value place = new Value("Place", new String[]{"AutoPlace"}, "Automatically place crystals", true); public final Value placeRapid = new Value("PlaceRapid", new String[]{"RapidPlace"}, "Remove place delay", true); public final Value placeSpread = new Value("PlaceSpread", new String[]{"SpreadPlace"}, "Spread crystals around target by swapping place positions each time (toggle on if target is running)", false); @@ -57,6 +57,7 @@ public final class CrystalAuraModule extends Module { public final Value placeRadius = new Value("PlaceRadius", new String[]{"Radius", "PR", "PlaceRange", "Range"}, "The radius in blocks around the player to attempt placing in", 5.5f, 1.0f, 7.0f, 0.5f); public final Value placeMaxDistance = new Value("PlaceMaxDistance", new String[]{"BlockDistance", "MaxBlockDistance", "PMBD", "MBD", "PBD", "BD"}, "Range around the enemy crystals will be placed (1.3 - 2.5 for feet place)", 1.3f, 1.3f, 16.0f, 0.1f); public final Value placeLocalDistance = new Value("PlaceLocalDistance", new String[]{"LocalDistance", "PLD", "LD"}, "Enemy must be within this range to start placing", 8.0f, 1.0f, 20.0f, 0.5f); + public final Value placeBetweenSwap = new Value("PlaceBetweenSwap", new String[]{"PBetweenSwap"}, "Continue to place during item-swapping (HotbarRefill, etc)", false); public final Value minDamage = new Value("MinDamage", new String[]{"MinDamage", "Min", "MinDmg"}, "The minimum explosion damage calculated to place down a crystal", 1.5f, 0.0f, 20.0f, 0.5f); public final Value offHand = new Value("Offhand", new String[]{"Hand", "otherhand", "off"}, "Use crystals in the off-hand instead of holding them with the main-hand", false); public final Value predict = new Value("Predict", new String[]{"P", "Pre"}, "Predict crystal spawns to attack faster.", true); @@ -219,7 +220,9 @@ public final class CrystalAuraModule extends Module { } } } else { - this.currentPlacePosition = null; + if (!this.placeBetweenSwap.getValue()) { + this.currentPlacePosition = null; + } if (!this.attackWhenEmpty.getValue()) { this.currentAttackEntity = null; }