diff --git a/src/com/projectkorra/projectkorra/ability/util/ComboManager.java b/src/com/projectkorra/projectkorra/ability/util/ComboManager.java index b8ccb35c..892861d6 100644 --- a/src/com/projectkorra/projectkorra/ability/util/ComboManager.java +++ b/src/com/projectkorra/projectkorra/ability/util/ComboManager.java @@ -31,114 +31,140 @@ public class ComboManager { private static final HashMap INSTRUCTIONS = new HashMap<>(); public ComboManager() { - ArrayList fireKick = new ArrayList<>(); - fireKick.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); - fireKick.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); - fireKick.add(new AbilityInformation("FireBlast", ClickType.SHIFT_DOWN)); - fireKick.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("FireKick", new ComboAbilityInfo("FireKick", fireKick, FireCombo.class)); - DESCRIPTIONS.put("FireKick", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.FireKick.Description")); - INSTRUCTIONS.put("FireKick", "FireBlast > FireBlast > (Hold Shift) > FireBlast."); + COMBO_ABILITIES.clear(); + DESCRIPTIONS.clear(); + INSTRUCTIONS.clear(); + + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.FireCombo.FireKick.Enabled")) { + ArrayList fireKick = new ArrayList<>(); + fireKick.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); + fireKick.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); + fireKick.add(new AbilityInformation("FireBlast", ClickType.SHIFT_DOWN)); + fireKick.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("FireKick", new ComboAbilityInfo("FireKick", fireKick, FireCombo.class)); + DESCRIPTIONS.put("FireKick", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.FireKick.Description")); + INSTRUCTIONS.put("FireKick", "FireBlast > FireBlast > (Hold Shift) > FireBlast."); + } - ArrayList fireSpin = new ArrayList<>(); - fireSpin.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); - fireSpin.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); - fireSpin.add(new AbilityInformation("FireShield", ClickType.LEFT_CLICK)); - fireSpin.add(new AbilityInformation("FireShield", ClickType.SHIFT_DOWN)); - fireSpin.add(new AbilityInformation("FireShield", ClickType.SHIFT_UP)); - COMBO_ABILITIES.put("FireSpin", new ComboAbilityInfo("FireSpin", fireSpin, FireCombo.class)); - DESCRIPTIONS.put("FireSpin", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.FireSpin.Description")); - INSTRUCTIONS.put("FireSpin", "FireBlast > FireBlast > FireShield > (Tap Shift)."); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.FireCombo.FireSpin.Enabled")) { + ArrayList fireSpin = new ArrayList<>(); + fireSpin.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); + fireSpin.add(new AbilityInformation("FireBlast", ClickType.LEFT_CLICK)); + fireSpin.add(new AbilityInformation("FireShield", ClickType.LEFT_CLICK)); + fireSpin.add(new AbilityInformation("FireShield", ClickType.SHIFT_DOWN)); + fireSpin.add(new AbilityInformation("FireShield", ClickType.SHIFT_UP)); + COMBO_ABILITIES.put("FireSpin", new ComboAbilityInfo("FireSpin", fireSpin, FireCombo.class)); + DESCRIPTIONS.put("FireSpin", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.FireSpin.Description")); + INSTRUCTIONS.put("FireSpin", "FireBlast > FireBlast > FireShield > (Tap Shift)."); + } - ArrayList jetBlast = new ArrayList<>(); - jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); - jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); - jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); - jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); - jetBlast.add(new AbilityInformation("FireShield", ClickType.SHIFT_DOWN)); - jetBlast.add(new AbilityInformation("FireShield", ClickType.SHIFT_UP)); - jetBlast.add(new AbilityInformation("FireJet", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("JetBlast", new ComboAbilityInfo("JetBlast", jetBlast, FireCombo.class)); - DESCRIPTIONS.put("JetBlast", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.JetBlast.Description")); - INSTRUCTIONS.put("JetBlast", "FireJet (Tap Shift) > FireJet (Tap Shift) > FireShield (Tap Shift) > FireJet."); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.FireCombo.JetBlast.Enabled")) { + ArrayList jetBlast = new ArrayList<>(); + jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); + jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); + jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); + jetBlast.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); + jetBlast.add(new AbilityInformation("FireShield", ClickType.SHIFT_DOWN)); + jetBlast.add(new AbilityInformation("FireShield", ClickType.SHIFT_UP)); + jetBlast.add(new AbilityInformation("FireJet", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("JetBlast", new ComboAbilityInfo("JetBlast", jetBlast, FireCombo.class)); + DESCRIPTIONS.put("JetBlast", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.JetBlast.Description")); + INSTRUCTIONS.put("JetBlast", "FireJet (Tap Shift) > FireJet (Tap Shift) > FireShield (Tap Shift) > FireJet."); + } - ArrayList jetBlaze = new ArrayList<>(); - jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); - jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); - jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); - jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); - jetBlaze.add(new AbilityInformation("Blaze", ClickType.SHIFT_DOWN)); - jetBlaze.add(new AbilityInformation("Blaze", ClickType.SHIFT_UP)); - jetBlaze.add(new AbilityInformation("FireJet", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("JetBlaze", new ComboAbilityInfo("JetBlaze", jetBlaze, FireCombo.class)); - DESCRIPTIONS.put("JetBlaze", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.JetBlaze.Description")); - INSTRUCTIONS.put("JetBlaze", "FireJet (Tap Shift) > FireJet (Tap Shift) > Blaze (Tap Shift) > FireJet."); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.FireCombo.JetBlaze.Enabled")) { + ArrayList jetBlaze = new ArrayList<>(); + jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); + jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); + jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_DOWN)); + jetBlaze.add(new AbilityInformation("FireJet", ClickType.SHIFT_UP)); + jetBlaze.add(new AbilityInformation("Blaze", ClickType.SHIFT_DOWN)); + jetBlaze.add(new AbilityInformation("Blaze", ClickType.SHIFT_UP)); + jetBlaze.add(new AbilityInformation("FireJet", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("JetBlaze", new ComboAbilityInfo("JetBlaze", jetBlaze, FireCombo.class)); + DESCRIPTIONS.put("JetBlaze", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.JetBlaze.Description")); + INSTRUCTIONS.put("JetBlaze", "FireJet (Tap Shift) > FireJet (Tap Shift) > Blaze (Tap Shift) > FireJet."); + } - ArrayList fireWheel = new ArrayList<>(); - fireWheel.add(new AbilityInformation("FireShield", ClickType.SHIFT_DOWN)); - fireWheel.add(new AbilityInformation("FireShield", ClickType.RIGHT_CLICK_BLOCK)); - fireWheel.add(new AbilityInformation("FireShield", ClickType.RIGHT_CLICK_BLOCK)); - fireWheel.add(new AbilityInformation("Blaze", ClickType.SHIFT_UP)); - COMBO_ABILITIES.put("FireWheel", new ComboAbilityInfo("FireWheel", fireWheel, FireCombo.class)); - DESCRIPTIONS.put("FireWheel", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.FireWheel.Description")); - INSTRUCTIONS.put("FireWheel", "FireShield (Hold Shift) > Right Click a block in front of you twice > Switch to Blaze > Release Shift."); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Fire.FireCombo.FireWheel.Enabled")) { + ArrayList fireWheel = new ArrayList<>(); + fireWheel.add(new AbilityInformation("FireShield", ClickType.SHIFT_DOWN)); + fireWheel.add(new AbilityInformation("FireShield", ClickType.RIGHT_CLICK_BLOCK)); + fireWheel.add(new AbilityInformation("FireShield", ClickType.RIGHT_CLICK_BLOCK)); + fireWheel.add(new AbilityInformation("Blaze", ClickType.SHIFT_UP)); + COMBO_ABILITIES.put("FireWheel", new ComboAbilityInfo("FireWheel", fireWheel, FireCombo.class)); + DESCRIPTIONS.put("FireWheel", ConfigManager.languageConfig.get().getString("Abilities.Fire.Combo.FireWheel.Description")); + INSTRUCTIONS.put("FireWheel", "FireShield (Hold Shift) > Right Click a block in front of you twice > Switch to Blaze > Release Shift."); + } - ArrayList twister = new ArrayList(); - twister.add(new AbilityInformation("AirShield", ClickType.SHIFT_DOWN)); - twister.add(new AbilityInformation("AirShield", ClickType.SHIFT_UP)); - twister.add(new AbilityInformation("Tornado", ClickType.SHIFT_DOWN)); - twister.add(new AbilityInformation("AirBlast", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("Twister", new ComboAbilityInfo("Twister", twister, AirCombo.class)); - DESCRIPTIONS.put("Twister", ConfigManager.languageConfig.get().getString("Abilities.Air.Combo.Twister.Description")); - INSTRUCTIONS.put("Twister", "AirShield (Tap Shift) > Tornado (Hold Shift) > AirBlast (Left Click)"); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Air.AirCombo.Twister.Enabled")) { + ArrayList twister = new ArrayList(); + twister.add(new AbilityInformation("AirShield", ClickType.SHIFT_DOWN)); + twister.add(new AbilityInformation("AirShield", ClickType.SHIFT_UP)); + twister.add(new AbilityInformation("Tornado", ClickType.SHIFT_DOWN)); + twister.add(new AbilityInformation("AirBlast", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("Twister", new ComboAbilityInfo("Twister", twister, AirCombo.class)); + DESCRIPTIONS.put("Twister", ConfigManager.languageConfig.get().getString("Abilities.Air.Combo.Twister.Description")); + INSTRUCTIONS.put("Twister", "AirShield (Tap Shift) > Tornado (Hold Shift) > AirBlast (Left Click)"); + } - ArrayList airStream = new ArrayList<>(); - airStream.add(new AbilityInformation("AirShield", ClickType.SHIFT_DOWN)); - airStream.add(new AbilityInformation("AirSuction", ClickType.LEFT_CLICK)); - airStream.add(new AbilityInformation("AirBlast", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("AirStream", new ComboAbilityInfo("AirStream", airStream, AirCombo.class)); - DESCRIPTIONS.put("AirStream", ConfigManager.languageConfig.get().getString("Abilities.Air.Combo.AirStream.Description")); - INSTRUCTIONS.put("AirStream", "AirShield (Hold Shift) > AirSuction (Left Click) > AirBlast (Left Click)"); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Air.AirCombo.AirStream.Enabled")) { + ArrayList airStream = new ArrayList<>(); + airStream.add(new AbilityInformation("AirShield", ClickType.SHIFT_DOWN)); + airStream.add(new AbilityInformation("AirSuction", ClickType.LEFT_CLICK)); + airStream.add(new AbilityInformation("AirBlast", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("AirStream", new ComboAbilityInfo("AirStream", airStream, AirCombo.class)); + DESCRIPTIONS.put("AirStream", ConfigManager.languageConfig.get().getString("Abilities.Air.Combo.AirStream.Description")); + INSTRUCTIONS.put("AirStream", "AirShield (Hold Shift) > AirSuction (Left Click) > AirBlast (Left Click)"); + } - ArrayList airSweep = new ArrayList<>(); - airSweep.add(new AbilityInformation("AirSwipe", ClickType.LEFT_CLICK)); - airSweep.add(new AbilityInformation("AirSwipe", ClickType.LEFT_CLICK)); - airSweep.add(new AbilityInformation("AirBurst", ClickType.SHIFT_DOWN)); - airSweep.add(new AbilityInformation("AirBurst", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("AirSweep", new ComboAbilityInfo("AirSweep", airSweep, AirCombo.class)); - DESCRIPTIONS.put("AirSweep", ConfigManager.languageConfig.get().getString("Abilities.Air.Combo.AirSweep.Description")); - INSTRUCTIONS.put("AirSweep", "AirSwipe (Left Click) > AirSwipe (Left Click) > AirBurst (Hold Shift) > AirBurst (Left Click)"); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Air.AirCombo.AirSweep.Enabled")) { + ArrayList airSweep = new ArrayList<>(); + airSweep.add(new AbilityInformation("AirSwipe", ClickType.LEFT_CLICK)); + airSweep.add(new AbilityInformation("AirSwipe", ClickType.LEFT_CLICK)); + airSweep.add(new AbilityInformation("AirBurst", ClickType.SHIFT_DOWN)); + airSweep.add(new AbilityInformation("AirBurst", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("AirSweep", new ComboAbilityInfo("AirSweep", airSweep, AirCombo.class)); + DESCRIPTIONS.put("AirSweep", ConfigManager.languageConfig.get().getString("Abilities.Air.Combo.AirSweep.Description")); + INSTRUCTIONS.put("AirSweep", "AirSwipe (Left Click) > AirSwipe (Left Click) > AirBurst (Hold Shift) > AirBurst (Left Click)"); + } - ArrayList iceWave = new ArrayList<>(); - iceWave.add(new AbilityInformation("WaterSpout", ClickType.SHIFT_UP)); - iceWave.add(new AbilityInformation("PhaseChange", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("IceWave", new ComboAbilityInfo("IceWave", iceWave, WaterCombo.class)); - DESCRIPTIONS.put("IceWave", ConfigManager.languageConfig.get().getString("Abilities.Water.Combo.IceWave.Description")); - INSTRUCTIONS.put("IceWave", "Create a WaterSpout Wave > PhaseChange (Left Click)"); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Water.WaterCombo.IceWave.Enabled")) { + ArrayList iceWave = new ArrayList<>(); + iceWave.add(new AbilityInformation("WaterSpout", ClickType.SHIFT_UP)); + iceWave.add(new AbilityInformation("PhaseChange", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("IceWave", new ComboAbilityInfo("IceWave", iceWave, WaterCombo.class)); + DESCRIPTIONS.put("IceWave", ConfigManager.languageConfig.get().getString("Abilities.Water.Combo.IceWave.Description")); + INSTRUCTIONS.put("IceWave", "Create a WaterSpout Wave > PhaseChange (Left Click)"); + } - ArrayList iceBullet = new ArrayList<>(); - iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_DOWN)); - iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_UP)); - iceBullet.add(new AbilityInformation("IceBlast", ClickType.SHIFT_DOWN)); - COMBO_ABILITIES.put("IceBullet", new ComboAbilityInfo("IceBullet", iceBullet, WaterCombo.class)); - DESCRIPTIONS.put("IceBullet", ConfigManager.languageConfig.get().getString("Abilities.Water.Combo.IceBullet.Description")); - INSTRUCTIONS.put("IceBullet", "WaterBubble (Tap Shift) > IceBlast (Hold Shift) > Wait for ice to Form > Then alternate between Left and Right click with IceBlast"); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Water.WaterCombo.IceBullet.Enabled")) { + ArrayList iceBullet = new ArrayList<>(); + iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_DOWN)); + iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_UP)); + iceBullet.add(new AbilityInformation("IceBlast", ClickType.SHIFT_DOWN)); + COMBO_ABILITIES.put("IceBullet", new ComboAbilityInfo("IceBullet", iceBullet, WaterCombo.class)); + DESCRIPTIONS.put("IceBullet", ConfigManager.languageConfig.get().getString("Abilities.Water.Combo.IceBullet.Description")); + INSTRUCTIONS.put("IceBullet", "WaterBubble (Tap Shift) > IceBlast (Hold Shift) > Wait for ice to Form > Then alternate between Left and Right click with IceBlast"); - ArrayList iceBulletLeft = new ArrayList<>(); - iceBulletLeft.add(new AbilityInformation("IceBlast", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("IceBulletLeftClick", new ComboAbilityInfo("IceBulletLeftClick", iceBulletLeft, WaterCombo.class)); - ArrayList iceBulletRight = new ArrayList<>(); - iceBulletRight.add(new AbilityInformation("IceBlast", ClickType.RIGHT_CLICK_BLOCK)); - COMBO_ABILITIES.put("IceBulletRightClick", new ComboAbilityInfo("IceBulletRightClick", iceBulletRight, WaterCombo.class)); + ArrayList iceBulletLeft = new ArrayList<>(); + iceBulletLeft.add(new AbilityInformation("IceBlast", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("IceBulletLeftClick", new ComboAbilityInfo("IceBulletLeftClick", iceBulletLeft, WaterCombo.class)); + ArrayList iceBulletRight = new ArrayList<>(); + iceBulletRight.add(new AbilityInformation("IceBlast", ClickType.RIGHT_CLICK_BLOCK)); + COMBO_ABILITIES.put("IceBulletRightClick", new ComboAbilityInfo("IceBulletRightClick", iceBulletRight, WaterCombo.class)); + } - ArrayList immobilize = new ArrayList<>(); - immobilize.add(new AbilityInformation("QuickStrike", ClickType.LEFT_CLICK)); - immobilize.add(new AbilityInformation("SwiftKick", ClickType.LEFT_CLICK)); - immobilize.add(new AbilityInformation("QuickStrike", ClickType.LEFT_CLICK)); - immobilize.add(new AbilityInformation("QuickStrike", ClickType.LEFT_CLICK)); - COMBO_ABILITIES.put("Immobilize", new ComboAbilityInfo("Immobilize", immobilize, ChiCombo.class)); - DESCRIPTIONS.put("Immobilize", ConfigManager.languageConfig.get().getString("Abilities.Chi.Combo.Immobilize.Description")); - INSTRUCTIONS.put("Immobilize", "QuickStrike (Left Click) > SwiftKick (Left Click) > QuickStrike (Left Click) > QuickStrike (Left Click)"); + if (ConfigManager.defaultConfig.get().getBoolean("Abilities.Chi.ChiCombo.Immobilize.Enabled")) { + ArrayList immobilize = new ArrayList<>(); + immobilize.add(new AbilityInformation("QuickStrike", ClickType.LEFT_CLICK)); + immobilize.add(new AbilityInformation("SwiftKick", ClickType.LEFT_CLICK)); + immobilize.add(new AbilityInformation("QuickStrike", ClickType.LEFT_CLICK)); + immobilize.add(new AbilityInformation("QuickStrike", ClickType.LEFT_CLICK)); + COMBO_ABILITIES.put("Immobilize", new ComboAbilityInfo("Immobilize", immobilize, ChiCombo.class)); + DESCRIPTIONS.put("Immobilize", ConfigManager.languageConfig.get().getString("Abilities.Chi.Combo.Immobilize.Description")); + INSTRUCTIONS.put("Immobilize", "QuickStrike (Left Click) > SwiftKick (Left Click) > QuickStrike (Left Click) > QuickStrike (Left Click)"); + } startCleanupTask(); } diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index bd5a718e..c612d321 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -562,7 +562,7 @@ public class ConfigManager { config.addDefault("Abilities.Air.Tornado.NpcPushFactor", 1); config.addDefault("Abilities.Air.Tornado.PlayerPushFactor", 1); - config.addDefault("Abilities.Air.AirCombo.Enabled", true); + config.addDefault("Abilities.Air.AirCombo.Twister.Enabled", true); config.addDefault("Abilities.Air.AirCombo.Twister.Speed", 0.35); config.addDefault("Abilities.Air.AirCombo.Twister.Range", 16); config.addDefault("Abilities.Air.AirCombo.Twister.Height", 8); @@ -571,11 +571,13 @@ public class ConfigManager { config.addDefault("Abilities.Air.AirCombo.Twister.Cooldown", 10000); config.addDefault("Abilities.Air.AirCombo.Twister.DegreesPerParticle", 7); config.addDefault("Abilities.Air.AirCombo.Twister.HeightPerParticle", 1.25); + config.addDefault("Abilities.Air.AirCombo.AirStream.Enabled", true); config.addDefault("Abilities.Air.AirCombo.AirStream.Speed", 0.5); config.addDefault("Abilities.Air.AirCombo.AirStream.Range", 40); config.addDefault("Abilities.Air.AirCombo.AirStream.EntityDuration", 4000); config.addDefault("Abilities.Air.AirCombo.AirStream.EntityHeight", 14); config.addDefault("Abilities.Air.AirCombo.AirStream.Cooldown", 7000); + config.addDefault("Abilities.Air.AirCombo.AirSweep.Enabled", true); config.addDefault("Abilities.Air.AirCombo.AirSweep.Speed", 1.4); config.addDefault("Abilities.Air.AirCombo.AirSweep.Range", 14); config.addDefault("Abilities.Air.AirCombo.AirSweep.Damage", 3); @@ -770,9 +772,10 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterSpout.Wave.Speed", 1.3); config.addDefault("Abilities.Water.WaterSpout.Wave.Cooldown", 4500); - config.addDefault("Abilities.Water.WaterCombo.Enabled", true); + config.addDefault("Abilities.Water.WaterCombo.IceWave.Enabled", true); config.addDefault("Abilities.Water.WaterCombo.IceWave.Damage", 4); config.addDefault("Abilities.Water.WaterCombo.IceWave.Cooldown", 6000); + config.addDefault("Abilities.Water.WaterCombo.IceBullet.Enabled", true); config.addDefault("Abilities.Water.WaterCombo.IceBullet.Damage", 2); config.addDefault("Abilities.Water.WaterCombo.IceBullet.Radius", 2.5); config.addDefault("Abilities.Water.WaterCombo.IceBullet.Range", 12); @@ -919,8 +922,6 @@ public class ConfigManager { config.addDefault("Abilities.Earth.Tremorsense.Radius", 5); config.addDefault("Abilities.Earth.Tremorsense.LightThreshold", 7); config.addDefault("Abilities.Earth.Tremorsense.Cooldown", 1000); - - config.addDefault("Abilities.Earth.EarthCombo.Enabled", true); config.addDefault("Abilities.Fire.Blaze.Enabled", true); config.addDefault("Abilities.Fire.Blaze.Arc", 16); @@ -1028,7 +1029,7 @@ public class ConfigManager { config.addDefault("Abilities.Fire.WallOfFire.FireTicks", 2); config.addDefault("Abilities.Fire.WallOfFire.MaxAngle", 50); - config.addDefault("Abilities.Fire.FireCombo.Enabled", true); + config.addDefault("Abilities.Fire.FireCombo.FireKick.Enabled", true); config.addDefault("Abilities.Fire.FireCombo.FireKick.Range", 7.0); config.addDefault("Abilities.Fire.FireCombo.FireKick.Damage", 3.0); config.addDefault("Abilities.Fire.FireCombo.FireKick.Cooldown", 5500); @@ -1036,13 +1037,16 @@ public class ConfigManager { config.addDefault("Abilities.Fire.FireCombo.FireSpin.Damage", 3.0); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Knockback", 3.0); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Cooldown", 4500); + config.addDefault("Abilities.Fire.FireCombo.FireWheel.Enabled", true); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Range", 20.0); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Damage", 4.0); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Speed", 0.55); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Cooldown", 6000); config.addDefault("Abilities.Fire.FireCombo.FireWheel.FireTicks", 2.5); + config.addDefault("Abilities.Fire.FireCombo.JetBlast.Enabled", true); config.addDefault("Abilities.Fire.FireCombo.JetBlast.Speed", 1.2); config.addDefault("Abilities.Fire.FireCombo.JetBlast.Cooldown", 6000); + config.addDefault("Abilities.Fire.FireCombo.JetBlaze.Enabled", true); config.addDefault("Abilities.Fire.FireCombo.JetBlaze.Speed", 1.1); config.addDefault("Abilities.Fire.FireCombo.JetBlaze.Damage", 4); config.addDefault("Abilities.Fire.FireCombo.JetBlaze.Cooldown", 6000); @@ -1054,7 +1058,7 @@ public class ConfigManager { config.addDefault("Abilities.Chi.Passive.BlockChi.Chance", 35); config.addDefault("Abilities.Chi.Passive.BlockChi.Duration", 1000); - config.addDefault("Abilities.Chi.ChiCombo.Enabled", true); + config.addDefault("Abilities.Chi.ChiCombo.Immobilize.Enabled", true); config.addDefault("Abilities.Chi.ChiCombo.Immobilize.ParalyzeDuration", 4000); config.addDefault("Abilities.Chi.ChiCombo.Immobilize.Cooldown", 15000);