From b8a2b3428918927e31a3a0dd6e8c975931e7a6ca Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 1 May 2016 06:48:13 +0100 Subject: [PATCH 1/8] Config changes Minor config changes. Buff's water's select range, lowered fire ticks, things like that. --- .../configuration/ConfigManager.java | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index 9913753e..fd54d99e 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -393,7 +393,7 @@ public class ConfigManager { config.addDefault("Properties.HorizontalCollisionPhysics.Enabled", true); config.addDefault("Properties.HorizontalCollisionPhysics.DamageOnBarrierBlock", false); config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageMinimumDistance", 5.0); - config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageCap", 6.0); + config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageCap", 5.0); config.addDefault("Properties.RegionProtection.AllowHarmlessAbilities", true); config.addDefault("Properties.RegionProtection.RespectWorldGuard", true); @@ -407,7 +407,7 @@ public class ConfigManager { config.addDefault("Properties.RegionProtection.CacheBlockTime", 5000); config.addDefault("Properties.Air.CanBendWithWeapons", false); - config.addDefault("Properties.Air.Particles", "cloud"); + config.addDefault("Properties.Air.Particles", "spell"); config.addDefault("Properties.Air.PlaySound", true); config.addDefault("Properties.Water.CanBendWithWeapons", true); @@ -415,7 +415,7 @@ public class ConfigManager { config.addDefault("Properties.Water.PlantBlocks", plantBlocks); config.addDefault("Properties.Water.SnowBlocks", snowBlocks); config.addDefault("Properties.Water.NightFactor", 1.5); - config.addDefault("Properties.Water.FullMoonFactor", 2.0); + config.addDefault("Properties.Water.FullMoonFactor", 1.75); config.addDefault("Properties.Water.PlaySound", true); config.addDefault("Properties.Earth.RevertEarthbending", true); @@ -444,7 +444,7 @@ public class ConfigManager { config.addDefault("Abilities.Avatar.AvatarState.Enabled", true); config.addDefault("Abilities.Avatar.AvatarState.Cooldown", 7200000); config.addDefault("Abilities.Avatar.AvatarState.Duration", 480000); - config.addDefault("Abilities.Avatar.AvatarState.PowerMultiplier", 5); + config.addDefault("Abilities.Avatar.AvatarState.PowerMultiplier", 3.5); config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Regeneration.Enabled", true); config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Regeneration.Power", 3); config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Speed.Enabled", true); @@ -501,7 +501,7 @@ public class ConfigManager { config.addDefault("Abilities.Air.AirShield.IsAvatarStateToggle", true); config.addDefault("Abilities.Air.AirSpout.Enabled", true); - config.addDefault("Abilities.Air.AirSpout.Height", 20); + config.addDefault("Abilities.Air.AirSpout.Height", 16); config.addDefault("Abilities.Air.AirSpout.Interval", 100); config.addDefault("Abilities.Air.AirSuction.Enabled", true); @@ -516,14 +516,14 @@ public class ConfigManager { config.addDefault("Abilities.Air.AirSwipe.Enabled", true); config.addDefault("Abilities.Air.AirSwipe.Damage", 2); - config.addDefault("Abilities.Air.AirSwipe.Range", 16); + config.addDefault("Abilities.Air.AirSwipe.Range", 14); config.addDefault("Abilities.Air.AirSwipe.Radius", 2); config.addDefault("Abilities.Air.AirSwipe.Push", 0.5); - config.addDefault("Abilities.Air.AirSwipe.Arc", 20); + config.addDefault("Abilities.Air.AirSwipe.Arc", 16); config.addDefault("Abilities.Air.AirSwipe.Speed", 25); config.addDefault("Abilities.Air.AirSwipe.Cooldown", 1500); config.addDefault("Abilities.Air.AirSwipe.ChargeFactor", 3); - config.addDefault("Abilities.Air.AirSwipe.MaxChargeTime", 3000); + config.addDefault("Abilities.Air.AirSwipe.MaxChargeTime", 2500); config.addDefault("Abilities.Air.AirSwipe.Particles", 3); config.addDefault("Abilities.Air.AirSwipe.StepSize", 4); @@ -554,7 +554,7 @@ public class ConfigManager { config.addDefault("Abilities.Air.Tornado.Enabled", true); config.addDefault("Abilities.Air.Tornado.Radius", 10); - config.addDefault("Abilities.Air.Tornado.Height", 25); + config.addDefault("Abilities.Air.Tornado.Height", 20); config.addDefault("Abilities.Air.Tornado.Range", 25); config.addDefault("Abilities.Air.Tornado.Speed", 1); config.addDefault("Abilities.Air.Tornado.NpcPushFactor", 1); @@ -644,21 +644,21 @@ public class ConfigManager { config.addDefault("Abilities.Water.OctopusForm.AngleIncrement", 45); config.addDefault("Abilities.Water.PhaseChange.Enabled", true); - config.addDefault("Abilities.Water.PhaseChange.Range", 20); - config.addDefault("Abilities.Water.PhaseChange.Radius", 5); + config.addDefault("Abilities.Water.PhaseChange.Range", 16); + config.addDefault("Abilities.Water.PhaseChange.Radius", 4); config.addDefault("Abilities.Water.PhaseChange.Freeze.Cooldown", 0); config.addDefault("Abilities.Water.PhaseChange.Melt.Cooldown", 0); config.addDefault("Abilities.Water.PlantArmor.Enabled", true); config.addDefault("Abilities.Water.PlantArmor.Duration", 7500); config.addDefault("Abilities.Water.PlantArmor.Resistance", 1); - config.addDefault("Abilities.Water.PlantArmor.Cooldown", 10000); + config.addDefault("Abilities.Water.PlantArmor.Cooldown", 15000); config.addDefault("Abilities.Water.PlantArmor.Range", 10); config.addDefault("Abilities.Water.Surge.Enabled", true); config.addDefault("Abilities.Water.Surge.Wave.Radius", 3); config.addDefault("Abilities.Water.Surge.Wave.Range", 20); - config.addDefault("Abilities.Water.Surge.Wave.SelectRange", 7); + config.addDefault("Abilities.Water.Surge.Wave.SelectRange", 12); config.addDefault("Abilities.Water.Surge.Wave.HorizontalPush", 1); config.addDefault("Abilities.Water.Surge.Wave.VerticalPush", 0.2); config.addDefault("Abilities.Water.Surge.Wave.MaxFreezeRadius", 7); @@ -671,7 +671,7 @@ public class ConfigManager { config.addDefault("Abilities.Water.Torrent.Enabled", true); config.addDefault("Abilities.Water.Torrent.Range", 25); - config.addDefault("Abilities.Water.Torrent.SelectRange", 10); + config.addDefault("Abilities.Water.Torrent.SelectRange", 16); config.addDefault("Abilities.Water.Torrent.InitialDamage", 3); config.addDefault("Abilities.Water.Torrent.DeflectDamage", 1); config.addDefault("Abilities.Water.Torrent.SuccessiveDamage", 1); @@ -683,7 +683,7 @@ public class ConfigManager { config.addDefault("Abilities.Water.Torrent.MaxUpwardForce", 0.2); config.addDefault("Abilities.Water.Torrent.Interval", 30); config.addDefault("Abilities.Water.Torrent.Cooldown", 0); - config.addDefault("Abilities.Water.Torrent.Wave.Radius", 15); + config.addDefault("Abilities.Water.Torrent.Wave.Radius", 12); config.addDefault("Abilities.Water.Torrent.Wave.Knockback", 1.5); config.addDefault("Abilities.Water.Torrent.Wave.Height", 1); config.addDefault("Abilities.Water.Torrent.Wave.GrowSpeed", 0.5); @@ -695,12 +695,12 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterArms.Enabled", true); config.addDefault("Abilities.Water.WaterArms.Arms.InitialLength", 4); - config.addDefault("Abilities.Water.WaterArms.Arms.SourceGrabRange", 4); + config.addDefault("Abilities.Water.WaterArms.Arms.SourceGrabRange", 12); config.addDefault("Abilities.Water.WaterArms.Arms.MaxAttacks", 10); config.addDefault("Abilities.Water.WaterArms.Arms.MaxAlternateUsage", 50); - config.addDefault("Abilities.Water.WaterArms.Arms.MaxIceShots", 5); + config.addDefault("Abilities.Water.WaterArms.Arms.MaxIceShots", 8); config.addDefault("Abilities.Water.WaterArms.Arms.Cooldown", 20000); - config.addDefault("Abilities.Water.WaterArms.Arms.AllowPlantSource", true); + config.addDefault("Abilities.Water.WaterArms.Arms.AllowPlantSource", false); config.addDefault("Abilities.Water.WaterArms.Arms.Lightning.Enabled", true); config.addDefault("Abilities.Water.WaterArms.Arms.Lightning.Damage", Double.valueOf(10.0)); @@ -724,12 +724,12 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterArms.Whip.Grapple.RespectRegions", false); - config.addDefault("Abilities.Water.WaterArms.Whip.Grab.HoldTime", 4500); + config.addDefault("Abilities.Water.WaterArms.Whip.Grab.HoldTime", 3500); config.addDefault("Abilities.Water.WaterArms.Freeze.Range", 20); config.addDefault("Abilities.Water.WaterArms.Freeze.Damage", 2); - config.addDefault("Abilities.Water.WaterArms.Spear.Range", 40); + config.addDefault("Abilities.Water.WaterArms.Spear.Range", 30); config.addDefault("Abilities.Water.WaterArms.Spear.Damage", 3); config.addDefault("Abilities.Water.WaterArms.Spear.DamageEnabled", true); config.addDefault("Abilities.Water.WaterArms.Spear.Sphere", 2); @@ -744,12 +744,12 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Duration.FullMoon", 12000); config.addDefault("Abilities.Water.WaterBubble.Enabled", true); - config.addDefault("Abilities.Water.WaterBubble.Radius", 7); + config.addDefault("Abilities.Water.WaterBubble.Radius", 6); config.addDefault("Abilities.Water.WaterManipulation.Enabled", true); config.addDefault("Abilities.Water.WaterManipulation.Damage", 3.0); - config.addDefault("Abilities.Water.WaterManipulation.Range", 30); - config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 10); + config.addDefault("Abilities.Water.WaterManipulation.Range", 25); + config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 16); config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 2); config.addDefault("Abilities.Water.WaterManipulation.DeflectRange", 3); config.addDefault("Abilities.Water.WaterManipulation.Speed", 35); @@ -757,9 +757,9 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterManipulation.Cooldown", 1000); config.addDefault("Abilities.Water.WaterSpout.Enabled", true); - config.addDefault("Abilities.Water.WaterSpout.Height", 20); + config.addDefault("Abilities.Water.WaterSpout.Height", 16); config.addDefault("Abilities.Water.WaterSpout.Interval", 50); - config.addDefault("Abilities.Water.WaterSpout.BlockSpiral", false); + config.addDefault("Abilities.Water.WaterSpout.BlockSpiral", true); config.addDefault("Abilities.Water.WaterSpout.Particles", false); config.addDefault("Abilities.Water.WaterSpout.Wave.Particles", false); config.addDefault("Abilities.Water.WaterSpout.Wave.Enabled", true); @@ -771,10 +771,10 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterSpout.Wave.ChargeTime", 500); config.addDefault("Abilities.Water.WaterSpout.Wave.FlightTime", 2500); config.addDefault("Abilities.Water.WaterSpout.Wave.Speed", 1.3); - config.addDefault("Abilities.Water.WaterSpout.Wave.Cooldown", 4500); + config.addDefault("Abilities.Water.WaterSpout.Wave.Cooldown", 6000); config.addDefault("Abilities.Water.WaterCombo.IceWave.Enabled", true); - config.addDefault("Abilities.Water.WaterCombo.IceWave.Damage", 4); + config.addDefault("Abilities.Water.WaterCombo.IceWave.Damage", 3); config.addDefault("Abilities.Water.WaterCombo.IceWave.Cooldown", 6000); config.addDefault("Abilities.Water.WaterCombo.IceWave.ThawRadius", 10); config.addDefault("Abilities.Water.WaterCombo.IceBullet.Enabled", true); @@ -804,7 +804,7 @@ public class ConfigManager { config.addDefault("Abilities.Earth.Collapse.Wall.Cooldown", 500); config.addDefault("Abilities.Earth.EarthArmor.Enabled", true); - config.addDefault("Abilities.Earth.EarthArmor.SelectRange", 7); + config.addDefault("Abilities.Earth.EarthArmor.SelectRange", 10); config.addDefault("Abilities.Earth.EarthArmor.Duration", 10000); config.addDefault("Abilities.Earth.EarthArmor.Strength", 2); config.addDefault("Abilities.Earth.EarthArmor.Cooldown", 17500); @@ -822,7 +822,7 @@ public class ConfigManager { config.addDefault("Abilities.Earth.EarthBlast.CollisionRadius", 2); config.addDefault("Abilities.Earth.EarthGrab.Enabled", true); - config.addDefault("Abilities.Earth.EarthGrab.SelectRange", 8); + config.addDefault("Abilities.Earth.EarthGrab.SelectRange", 14); config.addDefault("Abilities.Earth.EarthGrab.Height", 6); config.addDefault("Abilities.Earth.EarthGrab.Cooldown", 500); @@ -836,8 +836,8 @@ public class ConfigManager { config.addDefault("Abilities.Earth.Extraction.Enabled", true); config.addDefault("Abilities.Earth.Extraction.SelectRange", 5); config.addDefault("Abilities.Earth.Extraction.Cooldown", 500); - config.addDefault("Abilities.Earth.Extraction.TripleLootChance", 15); - config.addDefault("Abilities.Earth.Extraction.DoubleLootChance", 40); + config.addDefault("Abilities.Earth.Extraction.TripleLootChance", 10); + config.addDefault("Abilities.Earth.Extraction.DoubleLootChance", 30); config.addDefault("Abilities.Earth.LavaFlow.Enabled", true); config.addDefault("Abilities.Earth.LavaFlow.ShiftCooldown", 20000); @@ -865,12 +865,12 @@ public class ConfigManager { config.addDefault("Abilities.Earth.EarthSmash.Enabled", true); config.addDefault("Abilities.Earth.EarthSmash.AllowGrab", true); config.addDefault("Abilities.Earth.EarthSmash.AllowFlight", true); - config.addDefault("Abilities.Earth.EarthSmash.GrabRange", 10); - config.addDefault("Abilities.Earth.EarthSmash.SelectRange", 10); + config.addDefault("Abilities.Earth.EarthSmash.GrabRange", 16); + config.addDefault("Abilities.Earth.EarthSmash.SelectRange", 12); config.addDefault("Abilities.Earth.EarthSmash.ChargeTime", 1500); - config.addDefault("Abilities.Earth.EarthSmash.Cooldown", 2500); - config.addDefault("Abilities.Earth.EarthSmash.ShootRange", 30); - config.addDefault("Abilities.Earth.EarthSmash.Damage", 6); + config.addDefault("Abilities.Earth.EarthSmash.Cooldown", 3000); + config.addDefault("Abilities.Earth.EarthSmash.ShootRange", 25); + config.addDefault("Abilities.Earth.EarthSmash.Damage", 5); config.addDefault("Abilities.Earth.EarthSmash.Knockback", 3.5); config.addDefault("Abilities.Earth.EarthSmash.Knockup", 0.15); config.addDefault("Abilities.Earth.EarthSmash.FlightSpeed", 0.72); @@ -895,7 +895,7 @@ public class ConfigManager { config.addDefault("Abilities.Earth.MetalClips.ThrowEnabled", false); config.addDefault("Abilities.Earth.RaiseEarth.Enabled", true); - config.addDefault("Abilities.Earth.RaiseEarth.Speed", 8); + config.addDefault("Abilities.Earth.RaiseEarth.Speed", 10); config.addDefault("Abilities.Earth.RaiseEarth.Column.SelectRange", 20); config.addDefault("Abilities.Earth.RaiseEarth.Column.Height", 6); config.addDefault("Abilities.Earth.RaiseEarth.Column.Cooldown", 500); @@ -905,16 +905,16 @@ public class ConfigManager { config.addDefault("Abilities.Earth.RaiseEarth.Wall.Cooldown", 500); config.addDefault("Abilities.Earth.Shockwave.Enabled", true); - config.addDefault("Abilities.Earth.Shockwave.FallThreshold", 10); + config.addDefault("Abilities.Earth.Shockwave.FallThreshold", 12); config.addDefault("Abilities.Earth.Shockwave.ChargeTime", 2500); - config.addDefault("Abilities.Earth.Shockwave.Cooldown", 1500); + config.addDefault("Abilities.Earth.Shockwave.Cooldown", 6000); config.addDefault("Abilities.Earth.Shockwave.Damage", 4); config.addDefault("Abilities.Earth.Shockwave.Knockback", 1.1); config.addDefault("Abilities.Earth.Shockwave.Range", 15); config.addDefault("Abilities.Earth.Shockwave.Angle", 40); config.addDefault("Abilities.Earth.SandSpout.Enabled", true); - config.addDefault("Abilities.Earth.SandSpout.Height", 9); + config.addDefault("Abilities.Earth.SandSpout.Height", 10); config.addDefault("Abilities.Earth.SandSpout.BlindnessTime", 10); config.addDefault("Abilities.Earth.SandSpout.SpoutDamage", 1); config.addDefault("Abilities.Earth.SandSpout.Spiral", false); @@ -927,19 +927,19 @@ public class ConfigManager { config.addDefault("Abilities.Earth.Tremorsense.Cooldown", 1000); config.addDefault("Abilities.Fire.Blaze.Enabled", true); - config.addDefault("Abilities.Fire.Blaze.Arc", 16); + config.addDefault("Abilities.Fire.Blaze.Arc", 14); config.addDefault("Abilities.Fire.Blaze.Range", 7); config.addDefault("Abilities.Fire.Blaze.Speed", 15); config.addDefault("Abilities.Fire.Blaze.Cooldown", 500); config.addDefault("Abilities.Fire.Blaze.Ring.Range", 7); config.addDefault("Abilities.Fire.Blaze.Ring.Angle", 10); - config.addDefault("Abilities.Fire.Blaze.Ring.Cooldown", 500); + config.addDefault("Abilities.Fire.Blaze.Ring.Cooldown", 1000); config.addDefault("Abilities.Fire.Combustion.Enabled", true); config.addDefault("Abilities.Fire.Combustion.Cooldown", 10000); config.addDefault("Abilities.Fire.Combustion.BreakBlocks", false); config.addDefault("Abilities.Fire.Combustion.Power", 1.0); - config.addDefault("Abilities.Fire.Combustion.Damage", 5); + config.addDefault("Abilities.Fire.Combustion.Damage", 4); config.addDefault("Abilities.Fire.Combustion.Radius", 4); config.addDefault("Abilities.Fire.Combustion.Range", 35); config.addDefault("Abilities.Fire.Combustion.Speed", 25); @@ -952,7 +952,7 @@ public class ConfigManager { config.addDefault("Abilities.Fire.FireBlast.Damage", 3); config.addDefault("Abilities.Fire.FireBlast.Cooldown", 1500); config.addDefault("Abilities.Fire.FireBlast.Dissipate", false); - config.addDefault("Abilities.Fire.FireBlast.FireTicks", 2); + config.addDefault("Abilities.Fire.FireBlast.FireTicks", 0); config.addDefault("Abilities.Fire.FireBlast.SmokeParticleRadius", 0.3); config.addDefault("Abilities.Fire.FireBlast.FlameParticleRadius", 0.275); config.addDefault("Abilities.Fire.FireBlast.Charged.ChargeTime", 3000); @@ -962,13 +962,13 @@ public class ConfigManager { config.addDefault("Abilities.Fire.FireBlast.Charged.DamageBlocks", true); config.addDefault("Abilities.Fire.FireBlast.Charged.ExplosionRadius", 1); config.addDefault("Abilities.Fire.FireBlast.Charged.Range", 20); - config.addDefault("Abilities.Fire.FireBlast.Charged.FireTicks", 4); + config.addDefault("Abilities.Fire.FireBlast.Charged.FireTicks", 0); config.addDefault("Abilities.Fire.FireBurst.Enabled", true); config.addDefault("Abilities.Fire.FireBurst.Damage", 2); config.addDefault("Abilities.Fire.FireBurst.ChargeTime", 3500); config.addDefault("Abilities.Fire.FireBurst.Cooldown", 0); - config.addDefault("Abilities.Fire.FireBurst.Range", 15); + config.addDefault("Abilities.Fire.FireBurst.Range", 14); config.addDefault("Abilities.Fire.FireBurst.AnglePhi", 10); config.addDefault("Abilities.Fire.FireBurst.AngleTheta", 10); config.addDefault("Abilities.Fire.FireBurst.ParticlesPercentage", 5); @@ -985,7 +985,7 @@ public class ConfigManager { config.addDefault("Abilities.Fire.FireShield.Duration", 1000); config.addDefault("Abilities.Fire.FireShield.Cooldown", 500); config.addDefault("Abilities.Fire.FireShield.Interval", 100); - config.addDefault("Abilities.Fire.FireShield.FireTicks", 4); + config.addDefault("Abilities.Fire.FireShield.FireTicks", 2); config.addDefault("Abilities.Fire.HeatControl.Enabled", true); config.addDefault("Abilities.Fire.HeatControl.Extinguish.Range", 20); @@ -1003,7 +1003,7 @@ public class ConfigManager { config.addDefault("Abilities.Fire.Illumination.Cooldown", 500); config.addDefault("Abilities.Fire.Lightning.Enabled", true); - config.addDefault("Abilities.Fire.Lightning.Damage", 6.0); + config.addDefault("Abilities.Fire.Lightning.Damage", 4.0); config.addDefault("Abilities.Fire.Lightning.Range", 20.0); config.addDefault("Abilities.Fire.Lightning.ChargeTime", 2500); config.addDefault("Abilities.Fire.Lightning.Cooldown", 500); @@ -1021,7 +1021,7 @@ public class ConfigManager { config.addDefault("Abilities.Fire.Lightning.ArcOnIce", false); config.addDefault("Abilities.Fire.WallOfFire.Enabled", true); - config.addDefault("Abilities.Fire.WallOfFire.Range", 4); + config.addDefault("Abilities.Fire.WallOfFire.Range", 3); config.addDefault("Abilities.Fire.WallOfFire.Height", 4); config.addDefault("Abilities.Fire.WallOfFire.Width", 4); config.addDefault("Abilities.Fire.WallOfFire.Duration", 5000); @@ -1029,18 +1029,18 @@ public class ConfigManager { config.addDefault("Abilities.Fire.WallOfFire.Cooldown", 11000); config.addDefault("Abilities.Fire.WallOfFire.Interval", 250); config.addDefault("Abilities.Fire.WallOfFire.DamageInterval", 500); - config.addDefault("Abilities.Fire.WallOfFire.FireTicks", 2); + config.addDefault("Abilities.Fire.WallOfFire.FireTicks", 0); config.addDefault("Abilities.Fire.WallOfFire.MaxAngle", 50); 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); + config.addDefault("Abilities.Fire.FireCombo.FireKick.Cooldown", 6000); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Enabled", true); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Range", 7); 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.FireSpin.Cooldown", 5000); 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); @@ -1060,25 +1060,25 @@ public class ConfigManager { config.addDefault("Abilities.Chi.Passive.FallReductionFactor", 0.5); config.addDefault("Abilities.Chi.Passive.Speed", 1); config.addDefault("Abilities.Chi.Passive.Jump", 1); - config.addDefault("Abilities.Chi.Passive.BlockChi.Chance", 35); + config.addDefault("Abilities.Chi.Passive.BlockChi.Chance", 25); config.addDefault("Abilities.Chi.Passive.BlockChi.Duration", 1000); config.addDefault("Abilities.Chi.ChiCombo.Immobilize.Enabled", true); - config.addDefault("Abilities.Chi.ChiCombo.Immobilize.ParalyzeDuration", 4000); + config.addDefault("Abilities.Chi.ChiCombo.Immobilize.ParalyzeDuration", 3500); config.addDefault("Abilities.Chi.ChiCombo.Immobilize.Cooldown", 15000); config.addDefault("Abilities.Chi.AcrobatStance.Enabled", true); - config.addDefault("Abilities.Chi.AcrobatStance.ChiBlockBoost", 5); + config.addDefault("Abilities.Chi.AcrobatStance.ChiBlockBoost", 3); config.addDefault("Abilities.Chi.AcrobatStance.Speed", 1); config.addDefault("Abilities.Chi.AcrobatStance.Jump", 1); config.addDefault("Abilities.Chi.HighJump.Enabled", true); - config.addDefault("Abilities.Chi.HighJump.Height", 1); + config.addDefault("Abilities.Chi.HighJump.Height", 1.3); config.addDefault("Abilities.Chi.HighJump.Cooldown", 3000); config.addDefault("Abilities.Chi.Paralyze.Enabled", true); config.addDefault("Abilities.Chi.Paralyze.Cooldown", 10000); - config.addDefault("Abilities.Chi.Paralyze.Duration", 2000); + config.addDefault("Abilities.Chi.Paralyze.Duration", 1500); config.addDefault("Abilities.Chi.RapidPunch.Enabled", true); config.addDefault("Abilities.Chi.RapidPunch.Damage", 1); @@ -1091,7 +1091,7 @@ public class ConfigManager { config.addDefault("Abilities.Chi.Smokescreen.Radius", 4); config.addDefault("Abilities.Chi.Smokescreen.Duration", 12); - config.addDefault("Abilities.Chi.WarriorStance.Enabled", true); + config.addDefault("Abilities.Chi.WarriorStance.Enabled", false); config.addDefault("Abilities.Chi.WarriorStance.Strength", 0); config.addDefault("Abilities.Chi.WarriorStance.Resistance", -1); From 8ee81c9c0e3194fb841bd25b22ad175bf8179337 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 1 May 2016 07:03:35 +0100 Subject: [PATCH 2/8] Fix catapult cooldown and adds cobblestone to default earthblocks list --- .../projectkorra/projectkorra/configuration/ConfigManager.java | 2 ++ src/com/projectkorra/projectkorra/earthbending/Catapult.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index fd54d99e..04b76689 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -340,6 +340,7 @@ public class ConfigManager { earthBlocks.add("DIAMOND_ORE"); earthBlocks.add("NETHERRACK"); earthBlocks.add("QUARTZ_ORE"); + earthBlocks.add("COBBLESTONE"); ArrayList metalBlocks = new ArrayList(); metalBlocks.add("IRON_BLOCK"); @@ -793,6 +794,7 @@ public class ConfigManager { config.addDefault("Abilities.Earth.Catapult.Length", 6); config.addDefault("Abilities.Earth.Catapult.Push", 4); config.addDefault("Abilities.Earth.Catapult.ShiftModifier", 2); + config.addDefault("Abilities.Earth.Catapult.Cooldown", 1500); config.addDefault("Abilities.Earth.Collapse.Enabled", true); config.addDefault("Abilities.Earth.Collapse.SelectRange", 20); diff --git a/src/com/projectkorra/projectkorra/earthbending/Catapult.java b/src/com/projectkorra/projectkorra/earthbending/Catapult.java index f04116e2..b6de9ed5 100644 --- a/src/com/projectkorra/projectkorra/earthbending/Catapult.java +++ b/src/com/projectkorra/projectkorra/earthbending/Catapult.java @@ -81,7 +81,7 @@ public class Catapult extends EarthAbility { this.push = getConfig().getDouble("Abilities.Earth.Catapult.Push"); this.shiftModifier = getConfig().getDouble("Abilities.Earth.Catapult.ShiftModifier"); this.distance = 0; - this.cooldown = 0; + this.cooldown = getConfig().getLong("Abilities.Earth.Catapult.Cooldown"); this.catapult = false; this.moving = false; this.flying = false; From 8b3b3c9739ff4dd3acd0f97b39e47f05198364af Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 1 May 2016 08:13:53 +0100 Subject: [PATCH 3/8] Fixes SwiftKick Fixes SwiftKick being able to be used when player hasn't / isn't jumping --- src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java index b31578cd..b0ddbcb8 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java +++ b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java @@ -5,6 +5,7 @@ import com.projectkorra.projectkorra.ability.ChiAbility; import com.projectkorra.projectkorra.util.DamageHandler; import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -33,6 +34,9 @@ public class SwiftKick extends ChiAbility { remove(); return; } + if (player.getLocation().subtract(0, 0.5, 0).getBlock().getType() != Material.AIR) { + return; + } DamageHandler.damageEntity(target, damage, this); if (target instanceof Player && ChiPassive.willChiBlock(player, (Player) target)) { ChiPassive.blockChi((Player) target); From e4f8b0e1bca6bfbf427ba0858582698068d968f8 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 1 May 2016 08:17:14 +0100 Subject: [PATCH 4/8] Fixes Immobilize cooldown --- src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java index b0ddbcb8..de692025 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java +++ b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java @@ -23,7 +23,7 @@ public class SwiftKick extends ChiAbility { } this.damage = getConfig().getInt("Abilities.Chi.SwiftKick.Damage"); this.blockChance = getConfig().getInt("Abilities.Chi.ChiCombo.ChiBlockChance"); - this.cooldown = getConfig().getInt("Abilities.Chi.ChiCombo.Cooldown"); + this.cooldown = getConfig().getInt("Abilities.Chi.ChiCombo.Immobilize.Cooldown"); this.target = GeneralMethods.getTargetedEntity(player, 4); start(); } From 014fbbc638a121477a892fe22a0502e996542ca5 Mon Sep 17 00:00:00 2001 From: Loony Date: Sun, 1 May 2016 08:44:38 +0100 Subject: [PATCH 5/8] Fixes Immobilize permission Fixes Immobilize ChiCombo not being default permission --- src/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugin.yml b/src/plugin.yml index 9f91d4ac..532f5794 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -173,7 +173,7 @@ permissions: bending.ability.AcrobatStance: true bending.ability.QuickStrike: true bending.ability.SwiftKick: true - bending.ability.ChiCombo: true + bending.ability.Immobilize.ChiCombo: true bending.chi.passive: true bending.avatar: default: false From 713860f7e8185eff9630d3a583977ad6c4347cd4 Mon Sep 17 00:00:00 2001 From: Loony Date: Sun, 1 May 2016 10:02:29 +0100 Subject: [PATCH 6/8] Fixes SwiftKick cooldown not respecting config --- src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java index de692025..24767129 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java +++ b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java @@ -23,7 +23,7 @@ public class SwiftKick extends ChiAbility { } this.damage = getConfig().getInt("Abilities.Chi.SwiftKick.Damage"); this.blockChance = getConfig().getInt("Abilities.Chi.ChiCombo.ChiBlockChance"); - this.cooldown = getConfig().getInt("Abilities.Chi.ChiCombo.Immobilize.Cooldown"); + this.cooldown = getConfig().getInt("Abilities.Chi.SwiftKick.Cooldown"); this.target = GeneralMethods.getTargetedEntity(player, 4); start(); } From 45154e7774e0b86666b8138f34d72e0103e803c6 Mon Sep 17 00:00:00 2001 From: Loony Date: Sun, 1 May 2016 10:06:01 +0100 Subject: [PATCH 7/8] Fixes SwiftKick getting ChiBlockChance from config --- src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java index 24767129..0fbff854 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java +++ b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java @@ -22,7 +22,7 @@ public class SwiftKick extends ChiAbility { return; } this.damage = getConfig().getInt("Abilities.Chi.SwiftKick.Damage"); - this.blockChance = getConfig().getInt("Abilities.Chi.ChiCombo.ChiBlockChance"); + this.blockChance = getConfig().getInt("Abilities.Chi.SwiftKick.ChiBlockChance"); this.cooldown = getConfig().getInt("Abilities.Chi.SwiftKick.Cooldown"); this.target = GeneralMethods.getTargetedEntity(player, 4); start(); From 0a7981de1e4d4f86b50fdf93f477618ed75626f6 Mon Sep 17 00:00:00 2001 From: Loony Date: Sun, 1 May 2016 11:51:36 +0100 Subject: [PATCH 8/8] Fixes Immobilize cooldown activating if target = null --- src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java b/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java index fec423e3..014b6301 100644 --- a/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java +++ b/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java @@ -37,10 +37,13 @@ public class ChiCombo extends ChiAbility implements ComboAbility { if (ability.equalsIgnoreCase("Immobilize")) { this.cooldown = getConfig().getLong("Abilities.Chi.ChiCombo.Immobilize.Cooldown"); this.duration = getConfig().getLong("Abilities.Chi.ChiCombo.Immobilize.ParalyzeDuration"); + target = GeneralMethods.getTargetedEntity(player, 5); if (!bPlayer.canBendIgnoreBinds(this)) { return; + } if (target == null){ + remove(); + return; } else { - target = GeneralMethods.getTargetedEntity(player, 5); paralyze(target, duration); start(); bPlayer.addCooldown(this); @@ -69,6 +72,7 @@ public class ChiCombo extends ChiAbility implements ComboAbility { */ public static boolean isParalyzed(Player player) { return isParalyzed((Entity) player); + } /**