From c6e208cdfeaa2486a37067dcfc0db4afdf40c038 Mon Sep 17 00:00:00 2001 From: Vahagn Tovmasian Date: Tue, 27 Aug 2019 22:42:15 -0700 Subject: [PATCH] Populating Config Values - Populates config values for new configuration system. --- .../airbending/combo/Twister.java | 2 +- .../abilities/air/AirAgilityConfig.java | 4 +- .../configs/abilities/air/AirBlastConfig.java | 22 +-- .../configs/abilities/air/AirBurstConfig.java | 18 +-- .../abilities/air/AirSaturationConfig.java | 2 +- .../abilities/air/AirScooterConfig.java | 10 +- .../abilities/air/AirShieldConfig.java | 16 +-- .../configs/abilities/air/AirSpoutConfig.java | 4 +- .../abilities/air/AirStreamConfig.java | 16 +-- .../abilities/air/AirSuctionConfig.java | 18 +-- .../configs/abilities/air/AirSweepConfig.java | 16 +-- .../configs/abilities/air/AirSwipeConfig.java | 32 ++--- .../configs/abilities/air/FlightConfig.java | 6 +- .../abilities/air/SuffocateConfig.java | 32 ++--- .../configs/abilities/air/TornadoConfig.java | 16 +-- .../configs/abilities/air/TwisterConfig.java | 20 +-- .../abilities/avatar/AvatarStateConfig.java | 16 +-- .../abilities/chi/AcrobatStanceConfig.java | 6 +- .../abilities/chi/AcrobaticsConfig.java | 2 +- .../abilities/chi/ChiAgilityConfig.java | 4 +- .../abilities/chi/ChiSaturationConfig.java | 2 +- .../configs/abilities/chi/HighJumpConfig.java | 4 +- .../abilities/chi/ImmobilizeConfig.java | 4 +- .../configs/abilities/chi/ParalyzeConfig.java | 4 +- .../abilities/chi/QuickStrikeConfig.java | 6 +- .../abilities/chi/RapidPunchConfig.java | 8 +- .../abilities/chi/SmokescreenConfig.java | 6 +- .../abilities/chi/SwiftKickConfig.java | 6 +- .../abilities/chi/WarriorStanceConfig.java | 4 +- .../abilities/earth/CatapultConfig.java | 8 +- .../abilities/earth/CollapseConfig.java | 18 +-- .../abilities/earth/DensityShiftConfig.java | 2 +- .../abilities/earth/EarthArmorConfig.java | 12 +- .../abilities/earth/EarthBlastConfig.java | 18 +-- .../abilities/earth/EarthDomeConfig.java | 8 +- .../abilities/earth/EarthGrabConfig.java | 12 +- .../abilities/earth/EarthPillarsConfig.java | 10 +- .../abilities/earth/EarthSmashConfig.java | 54 +++---- .../abilities/earth/EarthTunnelConfig.java | 16 +-- .../abilities/earth/ExtractionConfig.java | 8 +- .../abilities/earth/LavaFlowConfig.java | 50 +++---- .../abilities/earth/MetalClipsConfig.java | 22 +-- .../abilities/earth/RaiseEarthConfig.java | 22 +-- .../abilities/earth/ShockwaveConfig.java | 24 ++-- .../configs/abilities/fire/BlazeConfig.java | 16 +-- .../abilities/fire/CombustionConfig.java | 12 +- .../abilities/fire/FireBlastConfig.java | 36 ++--- .../abilities/fire/FireBurstConfig.java | 20 +-- .../configs/abilities/fire/FireJetConfig.java | 6 +- .../abilities/water/BloodbendingConfig.java | 8 +- .../abilities/water/FastSwimConfig.java | 2 +- .../abilities/water/HealingWatersConfig.java | 12 +- .../abilities/water/IceBlastConfig.java | 18 +-- .../abilities/water/IceBulletConfig.java | 18 +-- .../abilities/water/IceSpikeConfig.java | 70 ++++----- .../abilities/water/IceWaveConfig.java | 10 +- .../abilities/water/OctopusFormConfig.java | 26 ++-- .../abilities/water/PhaseChangeConfig.java | 14 +- .../configs/abilities/water/SurgeConfig.java | 28 ++-- .../abilities/water/TorrentConfig.java | 48 +++---- .../abilities/water/WaterBubbleConfig.java | 6 +- .../water/WaterManipulationConfig.java | 18 +-- .../abilities/water/WaterSpoutConfig.java | 28 ++-- .../properties/EarthPropertiesConfig.java | 134 +++++++++++++++++- .../properties/FirePropertiesConfig.java | 4 +- .../properties/WaterPropertiesConfig.java | 69 ++++++++- .../projectkorra/firebending/FireJet.java | 11 +- 67 files changed, 695 insertions(+), 509 deletions(-) diff --git a/src/com/projectkorra/projectkorra/airbending/combo/Twister.java b/src/com/projectkorra/projectkorra/airbending/combo/Twister.java index a5063833..ab673db4 100644 --- a/src/com/projectkorra/projectkorra/airbending/combo/Twister.java +++ b/src/com/projectkorra/projectkorra/airbending/combo/Twister.java @@ -71,7 +71,7 @@ public class Twister extends AirAbility implements ComboAbility { if (this.bPlayer.isAvatarState()) { this.cooldown = 0; - this.damage = config.AvatarState_Damage; + this.damage = config.AvatarState_Height; this.range = config.AvatarState_Range; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java index f6660d3e..bfdfd74b 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java @@ -4,8 +4,8 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirAgilityConfig extends AbilityConfig { - public final int JumpPower = 0; - public final int SpeedPower = 0; + public final int JumpPower = 2; + public final int SpeedPower = 3; public AirAgilityConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java index b8948578..c70855cf 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java @@ -4,23 +4,23 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirBlastConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int AnimationParticleAmount = 0; - public final int SelectionParticleAmount = 0; - public final double PushFactor_Self = 0; - public final double PushFactor_Others = 0; - public final double Speed = 0; - public final double Range = 0; - public final double SelectionRange = 0; - public final double Radius = 0; + public final long Cooldown = 500; + public final int AnimationParticleAmount = 5; + public final int SelectionParticleAmount = 5; + public final double PushFactor_Self = 2.5; + public final double PushFactor_Others = 2.5; + public final double Speed = 25; + public final double Range = 20; + public final double SelectionRange = 10; + public final double Radius = 1.5; public final boolean CanFlickLevers = true; public final boolean CanOpenDoors = true; public final boolean CanPushButtons = true; public final boolean CanCoolLava = true; - public final double AvatarState_PushFactor_Self = 0; - public final double AvatarState_PushFactor_Others = 0; + public final double AvatarState_PushFactor_Self = 3.0; + public final double AvatarState_PushFactor_Others = 3.0; public AirBlastConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java index 69ea4867..fb938b15 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java @@ -5,17 +5,17 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirBurstConfig extends AbilityConfig { public final long Cooldown = 0; - public final long ChargeTime = 0; - public final double FallHeightThreshold = 0; - public final double PushFactor = 0; + public final long ChargeTime = 1750; + public final double FallHeightThreshold = 15; + public final double PushFactor = 2.0; public final double Damage = 0; - public final double AnglePhi = 0; - public final double AngleTheta = 0; - public final int ChargeParticles = 0; - public final double ParticlePercentage = 0; + public final double AnglePhi = 10; + public final double AngleTheta = 10; + public final int ChargeParticles = 10; + public final double ParticlePercentage = 50; - public final long AvatarState_ChargeTime = 0; - public final double AvatarState_Damage = 0; + public final long AvatarState_ChargeTime = 500; + public final double AvatarState_Damage = 4; public AirBurstConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java index 870b48f5..16c1da80 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java @@ -4,7 +4,7 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirSaturationConfig extends AbilityConfig { - public final double ExhaustionFactor = 0; + public final double ExhaustionFactor = 0.5; public AirSaturationConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java index b6b594d8..1d9323e2 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java @@ -4,12 +4,12 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirScooterConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Speed = 0; - public final double Interval = 0; - public final double Radius = 0; + public final long Cooldown = 5000; + public final double Speed = .7; + public final double Interval = 100; + public final double Radius = 1; public final long Duration = 0; - public final double MaxHeightFromGround = 0; + public final double MaxHeightFromGround = 7; public final boolean ShowSitting = true; public AirScooterConfig() { diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java index de325e16..c934c7cc 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java @@ -4,14 +4,14 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirShieldConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double MaxRadius = 0; - public final double InitialRadius = 0; - public final long Duration = 0; - public final double Speed = 0; - public final int Streams = 0; - public final int AnimationParticleAmount = 0; - public final boolean DynamicCooldown = true; + public final long Cooldown = 7000; + public final double MaxRadius = 5; + public final double InitialRadius = 1; + public final long Duration = 10000; + public final double Speed = 25; + public final int Streams = 5; + public final int AnimationParticleAmount = 5; + public final boolean DynamicCooldown = false; public final boolean AvatarState_Toggle = true; diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java index 7fa05674..06ef96bd 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java @@ -6,8 +6,8 @@ public class AirSpoutConfig extends AbilityConfig { public final long Cooldown = 0; public final long Duration = 0; - public final long Interval = 0; - public final double Height = 0; + public final long Interval = 100; + public final double Height = 15; public final double AvatarState_Height = 0; diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java index 246d0495..b85c3342 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java @@ -4,16 +4,16 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirStreamConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Range = 0; - public final double Speed = 0; + public final long Cooldown = 7000; + public final double Range = 30; + public final double Speed = 0.5; - public final double EntityCarryHeight = 0; - public final long EntityCarryDuration = 0; + public final double EntityCarryHeight = 15; + public final long EntityCarryDuration = 5000; - public final double AvatarState_Range = 0; - public final double AvatarState_EntityCarryHeight = 0; - public final long AvatarState_EntityCarryDuration = 0; + public final double AvatarState_Range = 40; + public final double AvatarState_EntityCarryHeight = 40; + public final long AvatarState_EntityCarryDuration = 20000; public AirStreamConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java index ebd7cd9f..cb2a0bb6 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java @@ -4,16 +4,16 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirSuctionConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int AnimationParticleAmount = 0; - public final int SelectionParticleAmount = 0; - public final double PushFactor = 0; - public final double Speed = 0; - public final double Range = 0; - public final double SelectionRange = 0; - public final double Radius = 0; + public final long Cooldown = 500; + public final int AnimationParticleAmount = 5; + public final int SelectionParticleAmount = 5; + public final double PushFactor = 2.5; + public final double Speed = 25; + public final double Range = 20; + public final double SelectionRange = 10; + public final double Radius = 1.5; - public final double AvatarState_PushFactor = 0; + public final double AvatarState_PushFactor = 3.5; public AirSuctionConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java index 409fa4fb..b0d5eb7b 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java @@ -4,15 +4,15 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirSweepConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Damage = 0; - public final double Range = 0; - public final double Speed = 0; - public final double Knockback = 0; + public final long Cooldown = 5000; + public final double Damage = 4; + public final double Range = 20; + public final double Speed = 1.5; + public final double Knockback = 3.5; - public final double AvatarState_Damage = 0; - public final double AvatarState_Range = 0; - public final double AvatarState_Knockback = 0; + public final double AvatarState_Damage = 6; + public final double AvatarState_Range = 25; + public final double AvatarState_Knockback = 5.0; public AirSweepConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java index 598290e3..d484e129 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java @@ -4,23 +4,23 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AirSwipeConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int AnimationParticleAmount = 0; - public final int Arc = 0; - public final int StepSize = 0; - public final long MaxChargeTime = 0; - public final double Damage = 0; - public final double PushFactor = 0; - public final double Speed = 0; - public final double Range = 0; - public final double Radius = 0; - public final double MaxChargeFactor = 0; + public final long Cooldown = 1250; + public final int AnimationParticleAmount = 2; + public final int Arc = 16; + public final int StepSize = 4; + public final long MaxChargeTime = 2500; + public final double Damage = 2; + public final double PushFactor = .5; + public final double Speed = 25; + public final double Range = 15; + public final double Radius = 1.5; + public final double MaxChargeFactor = 3; - public final long AvatarState_Cooldown = 0; - public final double AvatarState_Damage = 0; - public final double AvatarState_PushFactor = 0; - public final double AvatarState_Range = 0; - public final double AvatarState_Radius = 0; + public final long AvatarState_Cooldown = 700; + public final double AvatarState_Damage = 3; + public final double AvatarState_PushFactor = 1.0; + public final double AvatarState_Range = 20; + public final double AvatarState_Radius = 2; public AirSwipeConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java index a298ad9b..3e065228 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java @@ -4,9 +4,9 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class FlightConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; - public final double BaseSpeed = 0; + public final long Cooldown = 30000; + public final long Duration = 25000; + public final double BaseSpeed = 1.25; public FlightConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java index 6b4a1f41..6c5a8c95 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java @@ -6,27 +6,27 @@ public class SuffocateConfig extends AbilityConfig { public final long Cooldown = 0; public final boolean RequireConstantAim = true; - public final double ConstantAimRadius = 0; + public final double ConstantAimRadius = 3; public final boolean CanSuffocateUndead = false; - public final int AnimationParticleAmount = 0; + public final int AnimationParticleAmount = 1; public final double AnimationSpeed = 0; - public final long ChargeTime = 0; - public final double Range = 0; - public final double AnimationRadius = 0; - public final double Damage = 0; - public final double DamageInitialDelay = 0; - public final double DamageInterval = 0; - public final int SlownessPotency = 0; - public final double SlownessInitialDelay = 0; - public final double SlownessInterval = 0; - public final int BlindnessPotency = 0; - public final double BlindnessInitialDelay = 0; - public final double BlindnessInterval = 0; + public final long ChargeTime = 500; + public final double Range = 20; + public final double AnimationRadius = 2.0; + public final double Damage = 2; + public final double DamageInitialDelay = 2; + public final double DamageInterval = 1; + public final int SlownessPotency = 1; + public final double SlownessInitialDelay = .5; + public final double SlownessInterval = 1.25; + public final int BlindnessPotency = 30; + public final double BlindnessInitialDelay = 2; + public final double BlindnessInterval = 1.5; public final long AvatarState_Cooldown = 0; public final long AvatarState_ChargeTime = 0; - public final double AvatarState_Damage = 0; - public final double AvatarState_Range = 0; + public final double AvatarState_Damage = 2; + public final double AvatarState_Range = 20; public SuffocateConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java index f19f2c61..15bd435d 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java @@ -4,14 +4,14 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class TornadoConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; - public final double Range = 0; - public final double Height = 0; - public final double PlayerPushFactor = 0; - public final double NpcPushFactor = 0; - public final double Radius = 0; - public final double Speed = 0; + public final long Cooldown = 5000; + public final long Duration = 10000; + public final double Range = 15; + public final double Height = 15; + public final double PlayerPushFactor = 1.0; + public final double NpcPushFactor = 1.0; + public final double Radius = 10; + public final double Speed = 1; public TornadoConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java index c23b61f9..6ab21db9 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java @@ -4,17 +4,17 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class TwisterConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Range = 0; - public final double Speed = 0; - public final double Height = 0; - public final double Radius = 0; - public final double DegreesPerParticle = 0; - public final double HeightPerParticle = 0; - public final long RemoveDelay = 0; + public final long Cooldown = 7500; + public final double Range = 30; + public final double Speed = 25; + public final double Height = 15; + public final double Radius = 10; + public final double DegreesPerParticle = 7; + public final double HeightPerParticle = 1.25; + public final long RemoveDelay = 1000; - public final double AvatarState_Damage = 0; - public final double AvatarState_Range = 0; + public final double AvatarState_Height = 15; + public final double AvatarState_Range = 40; public TwisterConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java index d3d28d88..0fcee3b8 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java @@ -6,26 +6,26 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AvatarStateConfig extends AbilityConfig { - public final double PowerMultiplier = 0; + public final double PowerMultiplier = 2.0; - public final long Duration = 0; - public final long Cooldown = 0; + public final long Duration = 20000; + public final long Cooldown = 300000; public final boolean RegenerationEnabled = true; - public final int RegenerationPower = 0; + public final int RegenerationPower = 2; public final boolean SpeedEnabled = true; - public final int SpeedPower = 0; + public final int SpeedPower = 3; public final boolean ResistanceEnabled = true; - public final int ResistancePower = 0; + public final int ResistancePower = 3; public final boolean FireResistanceEnabled = true; public final boolean PlaySound = true; public final Sound SoundType = Sound.BLOCK_ANVIL_LAND; - public final float SoundVolume = 0; - public final float SoundPitch = 0; + public final float SoundVolume = 1F; + public final float SoundPitch = 1.5F; public AvatarStateConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java index 14896ea2..9f52ed4f 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java @@ -6,9 +6,9 @@ public class AcrobatStanceConfig extends AbilityConfig { public final long Cooldown = 0; public final long Duration = 0; - public final int Speed = 0; - public final int Jump = 0; - public final double ChiBlockBoost = 0; + public final int Speed = 2; + public final int Jump = 1; + public final double ChiBlockBoost = 50; public final double ParalyzeChanceDecrease = 0; public AcrobatStanceConfig() { diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java index cc4ed613..b18f6b56 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java @@ -4,7 +4,7 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class AcrobaticsConfig extends AbilityConfig { - public final double FallReductionFactor = 0; + public final double FallReductionFactor = 0.75; public AcrobaticsConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java index f51a840e..dc38caea 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java @@ -4,8 +4,8 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class ChiAgilityConfig extends AbilityConfig { - public final int JumpPower = 0; - public final int SpeedPower = 0; + public final int JumpPower = 2; + public final int SpeedPower = 2; public ChiAgilityConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java index c8ff581b..fffe630d 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java @@ -4,7 +4,7 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class ChiSaturationConfig extends AbilityConfig { - public final double ExhaustionFactor = 0; + public final double ExhaustionFactor = .5; public ChiSaturationConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java index d385b76d..d77478e8 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java @@ -4,8 +4,8 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class HighJumpConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Height = 0; + public final long Cooldown = 500; + public final double Height = 1.2; public HighJumpConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java index 5a2c4e0f..bc1ee2e9 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java @@ -4,8 +4,8 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class ImmobilizeConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long ParalyzeDuration = 0; + public final long Cooldown = 10000; + public final long ParalyzeDuration = 4000; public ImmobilizeConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java index e3fcc9ac..31b896b8 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java @@ -4,8 +4,8 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class ParalyzeConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; + public final long Cooldown = 7000; + public final long Duration = 2000; public ParalyzeConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java index 01b3e291..419b405a 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java @@ -4,9 +4,9 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class QuickStrikeConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Damage = 0; - public final double ChiBlockChance = 0; + public final long Cooldown = 1000; + public final double Damage = 2; + public final double ChiBlockChance = 35; public QuickStrikeConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java index b9ae59b9..1769fdc7 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java @@ -4,10 +4,10 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class RapidPunchConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Interval = 0; - public final double DamagePerPunch = 0; - public final int TotalPunches = 0; + public final long Cooldown = 3500; + public final long Interval = 500; + public final double DamagePerPunch = 2; + public final int TotalPunches = 3; public RapidPunchConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java index 6841ea0a..7569624a 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java @@ -4,9 +4,9 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class SmokescreenConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int Duration = 0; - public final double Radius = 0; + public final long Cooldown = 5000; + public final int Duration = 3000; + public final double Radius = 3; public SmokescreenConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java index e4688afd..1c2127ad 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java @@ -4,9 +4,9 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class SwiftKickConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Damage = 0; - public final double ChiBlockChance = 0; + public final long Cooldown = 2500; + public final double Damage = 2; + public final double ChiBlockChance = 75; public SwiftKickConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java index 73c2e3fe..9bfccad7 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java @@ -6,8 +6,8 @@ public class WarriorStanceConfig extends AbilityConfig { public final long Cooldown = 0; public final long Duration = 0; - public final int Strength = 0; - public final int Resistance = 0; + public final int Strength = 1; + public final int Resistance = -1; public WarriorStanceConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java index 97fa45d3..e583a7dd 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java @@ -4,12 +4,12 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class CatapultConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double StageTimeMult = 0; + public final long Cooldown = 5000; + public final double StageTimeMult = 2.5; public final boolean CancelWithAngle = true; - public final double Angle = 0; + public final double Angle = 20; - public final long AvatarState_Cooldown = 0; + public final long AvatarState_Cooldown = 2500; public CatapultConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java index a38ceafb..992e9c62 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java @@ -4,8 +4,8 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class CollapseConfig extends AbilityConfig { - public final int SelectRange = 0; - public final double Speed = 0; + public final int SelectRange = 20; + public final double Speed = 8; public final ColumnConfig ColumnConfig = new ColumnConfig(); @@ -13,20 +13,20 @@ public class CollapseConfig extends AbilityConfig { public static class ColumnConfig { - public final long Cooldown = 0; - public final int Height = 0; + public final long Cooldown = 1000; + public final int Height = 10; - public final int AvatarState_Height = 0; + public final int AvatarState_Height = 15; } public static class WallConfig { - public final long Cooldown = 0; - public final int Height = 0; - public final double Radius = 0; + public final long Cooldown = 4500; + public final int Height = 8; + public final double Radius = 10; - public final int AvatarState_Height = 0; + public final int AvatarState_Height = 12; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java index 839866c5..d191c3bb 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java @@ -4,7 +4,7 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class DensityShiftConfig extends AbilityConfig { - public final long Duration = 0; + public final long Duration = 500; public DensityShiftConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java index ab10147a..eb1f2b6a 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java @@ -4,13 +4,13 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthArmorConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long MaxDuration = 0; - public final double SelectRange = 0; - public final int GoldHearts = 0; + public final long Cooldown = 10000; + public final long MaxDuration = 7500; + public final double SelectRange = 15; + public final int GoldHearts = 4; - public final long AvatarState_Cooldown = 0; - public final int AvatarState_GoldHearts = 0; + public final long AvatarState_Cooldown = 3000; + public final int AvatarState_GoldHearts = 8; public EarthArmorConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java index 1c529efe..2d527b44 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java @@ -4,18 +4,18 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthBlastConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double DeflectRange = 0; - public final double CollisionRadius = 0; - public final double Range = 0; - public final double Damage = 0; - public final double Speed = 0; + public final long Cooldown = 500; + public final double DeflectRange = 25; + public final double CollisionRadius = 1.5; + public final double Range = 30; + public final double Damage = 2; + public final double Speed = 25; public final boolean CanHitSelf = true; - public final double PushFactor = 0; - public final double SelectRange = 0; + public final double PushFactor = .5; + public final double SelectRange = 20; public final long AvatarState_Cooldown = 0; - public final double AvatarState_Damage = 0; + public final double AvatarState_Damage = 5; public EarthBlastConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java index 57f7e4fa..7650dd9a 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java @@ -4,10 +4,10 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthDomeConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int Height = 0; - public final double Radius = 0; - public final double Range = 0; + public final long Cooldown = 5000; + public final int Height = 5; + public final double Radius = 4; + public final double Range = 25; public EarthDomeConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java index 17a37f18..35c7ac4e 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java @@ -4,12 +4,12 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthGrabConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Range = 0; - public final double DragSpeed = 0; - public final double DamageThreshold = 0; - public final double TrapHP = 0; - public final long TrapHitInterval = 0; + public final long Cooldown = 4500; + public final double Range = 30; + public final double DragSpeed = 1.0; + public final double DamageThreshold = 4; + public final double TrapHP = 3; + public final long TrapHitInterval = 250; public EarthGrabConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java index 9db05532..d5071b63 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java @@ -4,12 +4,12 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthPillarsConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Radius = 0; - public final double Knockup = 0; - public final double Damage = 0; + public final long Cooldown = 3500; + public final double Radius = 15; + public final double Knockup = 1.2; + public final double Damage = 4; public final boolean DealsDamage = true; - public final double FallHeightThreshold = 0; + public final double FallHeightThreshold = 15; public EarthPillarsConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java index cd5366e6..c79cb0f8 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java @@ -4,25 +4,25 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthSmashConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long ChargeTime = 0; - public final long Duration = 0; - public final int RequiredBendableBlocks = 0; - public final int MaxBlocksToPassThrough = 0; - public final double Damage = 0; - public final double Knockback = 0; - public final double Knockup = 0; - public final double SelectRange = 0; - public final long LiftAnimationInterval = 0; - public final double ShootRange = 0; - public final long ShootAnimationInterval = 0; + public final long Cooldown = 3000; + public final long ChargeTime = 2000; + public final long Duration = 10000; + public final int RequiredBendableBlocks = 10; + public final int MaxBlocksToPassThrough = 3; + public final double Damage = 4; + public final double Knockback = 1.0; + public final double Knockup = 0.15; + public final double SelectRange = 15; + public final long LiftAnimationInterval = 25; + public final double ShootRange = 35; + public final long ShootAnimationInterval = 25; - public final long AvatarState_Cooldown = 0; - public final long AvatarState_ChargeTime = 0; - public final double AvatarState_SelectRange = 0; - public final double AvatarState_Damage = 0; - public final double AvatarState_Knockback = 0; - public final double AvatarState_ShootRange = 0; + public final long AvatarState_Cooldown = 1000; + public final long AvatarState_ChargeTime = 500; + public final double AvatarState_SelectRange = 15; + public final double AvatarState_Damage = 8; + public final double AvatarState_Knockback = 2.0; + public final double AvatarState_ShootRange = 35; public final FlightConfig FlightConfig = new FlightConfig(); @@ -32,13 +32,13 @@ public class EarthSmashConfig extends AbilityConfig { public final boolean Enabled = true; - public final double Speed = 0; - public final long Duration = 0; - public final long AnimationInterval = 0; - public final double DetectionRadius = 0; + public final double Speed = .72; + public final long Duration = 5000; + public final long AnimationInterval = 25; + public final double DetectionRadius = 3; - public final double AvatarState_Speed = 0; - public final long AvatarState_Duration = 0; + public final double AvatarState_Speed = .9; + public final long AvatarState_Duration = 20000; } @@ -46,10 +46,10 @@ public class EarthSmashConfig extends AbilityConfig { public final boolean Enabled = true; - public final double Range = 0; - public final double DetectionRadius = 0; + public final double Range = 8; + public final double DetectionRadius = 4; - public final double AvatarState_Range = 0; + public final double AvatarState_Range = 15; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java index ae83552f..4e97f409 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java @@ -4,18 +4,18 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class EarthTunnelConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Interval = 0; - public final double MaxRadius = 0; - public final double Range = 0; - public final double InitialRadius = 0; - public final int BlocksPerInterval = 0; + public final long Cooldown = 3000; + public final long Interval = 100; + public final double MaxRadius = 4; + public final double Range = 15; + public final double InitialRadius = 1; + public final int BlocksPerInterval = 3; public final boolean Revert = true; - public final long RevertCheckTime = 0; + public final long RevertCheckTime = 30000; public final boolean DropLootIfNotRevert = true; public final boolean IgnoreOres = true; - public final double AvatarState_MaxRadius = 0; + public final double AvatarState_MaxRadius = 8; public EarthTunnelConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java index 2e870e2e..80cf52c8 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java @@ -4,10 +4,10 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class ExtractionConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int SelectRange = 0; - public final int DoubleLootChance = 0; - public final int TripleLootChance = 0; + public final long Cooldown = 2000; + public final int SelectRange = 15; + public final int DoubleLootChance = 25; + public final int TripleLootChance = 15; public ExtractionConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java index d238a327..3ccc8989 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java @@ -6,34 +6,34 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class LavaFlowConfig extends AbilityConfig { - public final long ShiftCooldown = 0; - public final long ClickLavaCooldown = 0; - public final long ClickLandCooldown = 0; - public final Material RevertMaterial = Material.STONE; - public final double ShiftPlatformRadius = 0; - public final double ShiftRadius = 0; - public final double ShiftFlowSpeed = 0; - public final double ShiftRemoveSpeed = 0; - public final long ShiftCleanupDelay = 0; - public final double ParticleDensity = 0; - public final double ClickRange = 0; - public final double ClickRadius = 0; - public final long ClickLavaStartDelay = 0; - public final long ClickLandStartDelay = 0; - public final long ClickLavaCleanupDelay = 0; - public final long ClickLandCleanupDelay = 0; - public final double ClickLavaCreateSpeed = 0; - public final double ClickLandCreateSpeed = 0; - public final int UpwardFlow = 0; - public final int DownwardFlow = 0; + public final long ShiftCooldown = 10000; + public final long ClickLavaCooldown = 10000; + public final long ClickLandCooldown = 1500; + public final Material RevertMaterial = Material.MAGMA_BLOCK; + public final double ShiftPlatformRadius = 3; + public final double ShiftRadius = 15; + public final double ShiftFlowSpeed = .2; + public final double ShiftRemoveSpeed = .5; + public final long ShiftCleanupDelay = 7000; + public final double ParticleDensity = 2; + public final double ClickRange = 20; + public final double ClickRadius = 5; + public final long ClickLavaStartDelay = 750; + public final long ClickLandStartDelay = 400; + public final long ClickLavaCleanupDelay = 3500; + public final long ClickLandCleanupDelay = 14000; + public final double ClickLavaCreateSpeed = .045; + public final double ClickLandCreateSpeed = .5; + public final int UpwardFlow = 2; + public final int DownwardFlow = 2; public final boolean AllowNaturalFlow = true; - public final long AvatarState_ShiftCooldown = 0; - public final long AvatarState_ClickLavaCooldown = 0; + public final long AvatarState_ShiftCooldown = 2500; + public final long AvatarState_ClickLavaCooldown = 1000; public final long AvatarState_ClickLandCooldown = 0; - public final double AvatarState_ShiftPlatformRadius = 0; - public final double AvatarState_ShiftRadius = 0; - public final double AvatarState_ClickRadius = 0; + public final double AvatarState_ShiftPlatformRadius = 10; + public final double AvatarState_ShiftRadius = 25; + public final double AvatarState_ClickRadius = 20; public LavaFlowConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java index 61f2a292..b57ff955 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java @@ -4,14 +4,14 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class MetalClipsConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; - public final double Range = 0; - public final double Damage = 0; + public final long Cooldown = 3000; + public final long Duration = 7500; + public final double Range = 20; + public final double Damage = 1; public final boolean ThrowEnabled = true; - public final long AvatarState_Cooldown = 0; - public final double AvatarState_Range = 0; + public final long AvatarState_Cooldown = 1000; + public final double AvatarState_Range = 20; public final CrushConfig CrushConfig = new CrushConfig(); @@ -19,18 +19,18 @@ public class MetalClipsConfig extends AbilityConfig { public static class CrushConfig { - public final long Cooldown = 0; - public final double Damage = 0; + public final long Cooldown = 2000; + public final double Damage = 2; - public final double AvatarState_Damage = 0; + public final double AvatarState_Damage = 4; } public static class MagnetConfig { public final long Cooldown = 0; - public final double Range = 0; - public final double Speed = 0; + public final double Range = 20; + public final double Speed = .5; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java index 4ec847c3..021ed0b4 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java @@ -10,24 +10,24 @@ public class RaiseEarthConfig extends AbilityConfig { public static class ColumnConfig { - public final long Cooldown = 0; - public final int Height = 0; - public final double Speed = 0; - public final double SelectRange = 0; + public final long Cooldown = 1000; + public final int Height = 8; + public final double Speed = 8; + public final double SelectRange = 15; - public final int AvatarState_Height = 0; + public final int AvatarState_Height = 12; } public static class WallConfig { - public final long Cooldown = 0; - public final int Height = 0; - public final int Width = 0; - public final int SelectRange = 0; + public final long Cooldown = 3500; + public final int Height = 6; + public final int Width = 6; + public final int SelectRange = 15; - public final int AvatarState_Height = 0; - public final int AvatarState_Width = 0; + public final int AvatarState_Height = 50; + public final int AvatarState_Width = 50; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java index d57d3098..6bd6a082 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java @@ -4,19 +4,19 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class ShockwaveConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long ChargeTime = 0; - public final double FallThreshold = 0; - public final double Range = 0; - public final double Damage = 0; - public final double Knockback = 0; - public final double Angle = 0; + public final long Cooldown = 4000; + public final long ChargeTime = 2500; + public final double FallThreshold = 15; + public final double Range = 20; + public final double Damage = 4; + public final double Knockback = 1.2; + public final double Angle = 40; - public final long AvatarState_Cooldown = 0; - public final long AvatarState_ChargeTime = 0; - public final double AvatarState_Range = 0; - public final double AvatarState_Damage = 0; - public final double AvatarState_Knockback = 0; + public final long AvatarState_Cooldown = 1000; + public final long AvatarState_ChargeTime = 500; + public final double AvatarState_Range = 40; + public final double AvatarState_Damage = 6; + public final double AvatarState_Knockback = 2.0; public ShockwaveConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java index 390b0cbb..65b71317 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java @@ -4,20 +4,20 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class BlazeConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int Arc = 0; - public final double Range = 0; - public final double Speed = 0; + public final long Cooldown = 1200; + public final int Arc = 14; + public final double Range = 15; + public final double Speed = 15; public final RingConfig RingConfig = new RingConfig(); public static class RingConfig { - public final long Cooldown = 0; - public final int Range = 0; - public final double Angle = 0; + public final long Cooldown = 3000; + public final int Range = 12; + public final double Angle = 10; - public final int AvatarState_Range = 0; + public final int AvatarState_Range = 30; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java index acf0760e..0ebc9ec2 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java @@ -4,12 +4,12 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class CombustionConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double Damage = 0; - public final double Range = 0; - public final double Radius = 0; - public final double Speed = 0; - public final float ExplosivePower = 0; + public final long Cooldown = 3000; + public final double Damage = 6; + public final double Range = 40; + public final double Radius = 1.5; + public final double Speed = 40; + public final float ExplosivePower = 1.2F; public final boolean BreakBlocks = true; public CombustionConfig() { diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java index ace1aa45..a4bbce51 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java @@ -4,35 +4,35 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class FireBlastConfig extends AbilityConfig { - public final long Cooldown = 0; + public final long Cooldown = 1000; public final boolean Dissipate = true; - public final double Damage = 0; - public final double Range = 0; - public final double Speed = 0; - public final double CollisionRadius = 0; - public final double FireTicks = 0; + public final double Damage = 2; + public final double Range = 25; + public final double Speed = 25; + public final double CollisionRadius = 1.5; + public final double FireTicks = 1; public final double Knockback = 0; - public final double FlameParticleRadius = 0; - public final double SmokeParticleRadius = 0; + public final double FlameParticleRadius = 1.0; + public final double SmokeParticleRadius = 1.0; public final ChargedConfig ChargedConfig = new ChargedConfig(); public static class ChargedConfig { - public final long Cooldown = 0; - public final long ChargeTime = 0; + public final long Cooldown = 3000; + public final long ChargeTime = 1500; public final boolean Dissipate = true; public final boolean DamageBlocks = true; - public final double CollisionRadius = 0; - public final double Damage = 0; - public final double Range = 0; - public final double DamageRadius = 0; - public final double ExplosionRadius = 0; - public final double FireTicks = 0; + public final double CollisionRadius = 2; + public final double Damage = 4; + public final double Range = 30; + public final double DamageRadius = 2; + public final double ExplosionRadius = 2; + public final double FireTicks = 2; - public final long AvatarState_ChargeTime = 0; - public final double AvatarState_Damage = 0; + public final long AvatarState_ChargeTime = 500; + public final double AvatarState_Damage = 5; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java index 5d693da3..6adc1abf 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java @@ -4,18 +4,18 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class FireBurstConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long ChargeTime = 0; + public final long Cooldown = 4500; + public final long ChargeTime = 2500; public final boolean Ignite = true; - public final double Damage = 0; - public final double Range = 0; - public final double AngleTheta = 0; - public final double AnglePhi = 0; - public final double ParticlesPercentage = 0; + public final double Damage = 4; + public final double Range = 20; + public final double AngleTheta = 10; + public final double AnglePhi = 10; + public final double ParticlesPercentage = 5; - public final long AvatarState_Cooldown = 0; - public final long AvatarState_ChargeTime = 0; - public final double AvatarState_Damage = 0; + public final long AvatarState_Cooldown = 2000; + public final long AvatarState_ChargeTime = 1000; + public final double AvatarState_Damage = 6; public FireBurstConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java index 17c74387..d815c938 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java @@ -4,9 +4,9 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class FireJetConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; - public final double Speed = 0; + public final long Cooldown = 5000; + public final long Duration = 4000; + public final double Speed = .7; public final boolean ShowGliding = true; public final boolean AvatarState_Toggle = true; diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java index 7fbbd650..2a0a3516 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java @@ -4,10 +4,10 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class BloodbendingConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; - public final double Range = 0; - public final double Knockback = 0; + public final long Cooldown = 10000; + public final long Duration = 8000; + public final double Range = 15; + public final double Knockback = .9; public final boolean CanOnlyBeUsedAtNight = true; public final boolean CanBeUsedOnUndeadMobs = false; diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java index d355e12f..2bfe9386 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java @@ -6,7 +6,7 @@ public class FastSwimConfig extends AbilityConfig { public final long Cooldown = 0; public final long Duration = 0; - public final double SpeedFactor = 0; + public final double SpeedFactor = 0.7; public FastSwimConfig() { super(true, "", null); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java index c02c5777..2410abfb 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java @@ -4,12 +4,12 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class HealingWatersConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Duration = 0; - public final long Interval = 0; - public final long ChargeTime = 0; - public final double Range = 0; - public final int PotionPotency = 0; + public final long Cooldown = 1500; + public final long Duration = 1000; + public final long Interval = 50; + public final long ChargeTime = 250; + public final double Range = 5; + public final int PotionPotency = 2; public final boolean EnableParticles = true; public HealingWatersConfig() { diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java index 846918d3..ea0230bb 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java @@ -4,17 +4,17 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class IceBlastConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long Interval = 0; - public final double CollisionRadius = 0; - public final double Range = 0; - public final double Damage = 0; - public final double DeflectRange = 0; + public final long Cooldown = 3000; + public final long Interval = 50; + public final double CollisionRadius = 1.5; + public final double Range = 25; + public final double Damage = 3; + public final double DeflectRange = 15; public final boolean AllowSnow = true; - public final long AvatarState_Cooldown = 0; - public final double AvatarState_Damage = 0; - public final double AvatarState_Range = 0; + public final long AvatarState_Cooldown = 500; + public final double AvatarState_Damage = 3; + public final double AvatarState_Range = 25; public IceBlastConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java index 492dc254..3039fc3a 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java @@ -4,16 +4,16 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class IceBulletConfig extends AbilityConfig { - public final long Cooldown = 0; - public final long ShotCooldown = 0; - public final long ShootTime = 0; - public final double Range = 0; - public final double Radius = 0; - public final double Damage = 0; - public final int MaxShots = 0; - public final double AnimationSpeed = 0; + public final long Cooldown = 6000; + public final long ShotCooldown = 100; + public final long ShootTime = 4000; + public final double Range = 30; + public final double Radius = 4; + public final double Damage = 2; + public final int MaxShots = 40; + public final double AnimationSpeed = 25; - public final long AvatarState_Cooldown = 0; + public final long AvatarState_Cooldown = 3000; public IceBulletConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java index 20e69419..6c804a19 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java @@ -4,24 +4,24 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class IceSpikeConfig extends AbilityConfig { - public final long Cooldown = 0;// - public final int Height = 0;// - public final double Damage = 0;// - public final double Range = 0;// - public final double Speed = 0;// - public final double Push = 0;// + public final long Cooldown = 2000;// + public final int Height = 3;// + public final double Damage = 2;// + public final double Range = 20;// + public final double Speed = 25;// + public final double Push = .5;// - public final long SlowCooldown = 0; - public final int SlowPower = 0; - public final int SlowDuration = 0; + public final long SlowCooldown = 2000; + public final int SlowPower = 1; + public final int SlowDuration = 1000; - public final double AvatarState_Damage = 0; - public final double AvatarState_Range = 0; - public final int AvatarState_Height = 0; - public final double AvatarState_Push = 0; + public final double AvatarState_Damage = 3; + public final double AvatarState_Range = 20; + public final int AvatarState_Height = 3; + public final double AvatarState_Push = 1; - public final int AvatarState_SlowPower = 0; - public final int AvatarState_SlowDuration = 0; + public final int AvatarState_SlowPower = 2; + public final int AvatarState_SlowDuration = 2000; public final BlastConfig BlastConfig = new BlastConfig(); @@ -29,36 +29,36 @@ public class IceSpikeConfig extends AbilityConfig { public static class BlastConfig { - public final long Cooldown = 0; - public final long Interval = 0; - public final double Damage = 0; - public final double Range = 0; - public final double CollisionRadius = 0; - public final double DeflectRange = 0; + public final long Cooldown = 1000; + public final long Interval = 100; + public final double Damage = 2; + public final double Range = 25; + public final double CollisionRadius = 1.5; + public final double DeflectRange = 15; - public final double ProjectileRange = 0; + public final double ProjectileRange = 25; - public final long SlowCooldown = 0; - public final int SlowPotency = 0; - public final int SlowDuration = 0; + public final long SlowCooldown = 1000; + public final int SlowPotency = 1; + public final int SlowDuration = 500; - public final double AvatarState_Damage = 0; - public final double AvatarState_Range = 0; + public final double AvatarState_Damage = 3; + public final double AvatarState_Range = 20; - public final int AvatarState_SlowPotency = 0; - public final int AvatarState_SlowDuration = 0; + public final int AvatarState_SlowPotency = 2; + public final int AvatarState_SlowDuration = 2000; } public static class FieldConfig { - public final long Cooldown = 0; - public final double Damage = 0; - public final double Radius = 0; - public final double Knockup = 0; + public final long Cooldown = 3000; + public final double Damage = 4; + public final double Radius = 9; + public final double Knockup = .5; - public final double AvatarState_Damage = 0; - public final double AvatarState_Radius = 0; + public final double AvatarState_Damage = 5; + public final double AvatarState_Radius = 20; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java index 23cf73e6..0aef8165 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java @@ -4,14 +4,14 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class IceWaveConfig extends AbilityConfig { - public final long Cooldown = 0; + public final long Cooldown = 5000; - public final double ThawRadius = 0; - public final double Damage = 0; + public final double ThawRadius = 30; + public final double Damage = 2; public final boolean RevertSphere = true; - public final long RevertSphereTime = 0; + public final long RevertSphereTime = 5000; - public final double AvatarState_Damage = 0; + public final double AvatarState_Damage = 5; public IceWaveConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java index f22ededd..47c6ad25 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java @@ -4,21 +4,21 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class OctopusFormConfig extends AbilityConfig { - public final long Cooldown = 0; + public final long Cooldown = 3500; public final long Duration = 0; - public final long FormDelay = 0; - public final double SelectionRange = 0; - public final double Damage = 0; - public final double AttackRange = 0; - public final long UsageCooldown = 0; - public final double Knockback = 0; - public final double Radius = 0; - public final double AngleIncrement = 0; + public final long FormDelay = 500; + public final double SelectionRange = 15; + public final double Damage = 2; + public final double AttackRange = 3; + public final long UsageCooldown = 200; + public final double Knockback = .3; + public final double Radius = 5; + public final double AngleIncrement = 10; - public final double AvatarState_Damage = 0; - public final double AvatarState_AttackRange = 0; - public final double AvatarState_Knockback = 0; - public final double AvatarState_Radius = 0; + public final double AvatarState_Damage = 4; + public final double AvatarState_AttackRange = 3; + public final double AvatarState_Knockback = 2; + public final double AvatarState_Radius = 5; public OctopusFormConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java index e8467004..2c41ef5e 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java @@ -4,7 +4,7 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class PhaseChangeConfig extends AbilityConfig { - public final double SourceRange = 0; + public final double SourceRange = 30; public final FreezeConfig FreezeConfig = new FreezeConfig(); @@ -12,18 +12,18 @@ public class PhaseChangeConfig extends AbilityConfig { public static class FreezeConfig { - public final long Cooldown = 0; - public final int Depth = 0; - public final double ControlRadius = 0; - public final int Radius = 0; + public final long Cooldown = 500; + public final int Depth = 1; + public final double ControlRadius = 5; + public final int Radius = 4; } public static class MeltConfig { public final long Cooldown = 0; - public final double Speed = 0; - public final int Radius = 0; + public final double Speed = 300; + public final int Radius = 15; public final boolean AllowFlow = true; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java index 56fd49fa..5314abc2 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java @@ -10,29 +10,29 @@ public class SurgeConfig extends AbilityConfig { public static class SurgeWaveConfig { - public final long Cooldown = 0; - public final long Interval = 0; - public final double Radius = 0; - public final double Knockback = 0; - public final double Knockup = 0; - public final double MaxFreezeRadius = 0; - public final long IceRevertTime = 0; - public final double Range = 0; - public final double SelectRange = 0; + public final long Cooldown = 3500; + public final long Interval = 100; + public final double Radius = 3; + public final double Knockback = 1.0; + public final double Knockup = .68; + public final double MaxFreezeRadius = 3; + public final long IceRevertTime = 10000; + public final double Range = 20; + public final double SelectRange = 10; - public final double AvatarState_Radius = 0; + public final double AvatarState_Radius = 8; } public static class SurgeWallConfig { public final long Cooldown = 0; - public final long Interval = 0; + public final long Interval = 100; public final long Duration = 0; - public final double Range = 0; - public final double Radius = 0; + public final double Range = 3; + public final double Radius = 4; - public final double AvatarState_Radius = 0; + public final double AvatarState_Radius = 6; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java index f4c2f363..3d47bb9a 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java @@ -4,38 +4,38 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class TorrentConfig extends AbilityConfig { - public final long Cooldown = 0; - public final int MaxLayer = 0; - public final double Knockback = 0; - public final double Angle = 0; - public final double Radius = 0; - public final double Knockup = 0; - public final long Interval = 0; - public final double InitialDamage = 0; - public final double SuccessiveDamage = 0; - public final int MaxHits = 0; - public final double DeflectDamage = 0; - public final double Range = 0; - public final double SelectRange = 0; + public final long Cooldown = 3500; + public final int MaxLayer = 3; + public final double Knockback = .25; + public final double Angle = 10; + public final double Radius = 3; + public final double Knockup = .5; + public final long Interval = 100; + public final double InitialDamage = 3; + public final double SuccessiveDamage = 1; + public final int MaxHits = 4; + public final double DeflectDamage = 3; + public final double Range = 25; + public final double SelectRange = 15; public final boolean Revert = true; - public final long RevertTime = 0; + public final long RevertTime = 5000; - public final double AvatarState_Knockback = 0; - public final double AvatarState_InitialDamage = 0; - public final double AvatarState_SuccessiveDamage = 0; - public final int AvatarState_MaxHits = 0; + public final double AvatarState_Knockback = 3; + public final double AvatarState_InitialDamage = 4; + public final double AvatarState_SuccessiveDamage = 4; + public final int AvatarState_MaxHits = 10; public final TorrentWaveConfig WaveConfig = new TorrentWaveConfig(); public static class TorrentWaveConfig { - public final long Cooldown = 0; - public final long Interval = 0; - public final double Height = 0; - public final double Radius = 0; - public final double Knockback = 0; - public final double GrowSpeed = 0; + public final long Cooldown = 7500; + public final long Interval = 100; + public final double Height = 1; + public final double Radius = 25; + public final double Knockback = 2.0; + public final double GrowSpeed = 25; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java index b54e4af7..55cd571b 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java @@ -4,9 +4,9 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class WaterBubbleConfig extends AbilityConfig { - public final long ClickDuration = 0; - public final double Radius = 0; - public final double Speed = 0; + public final long ClickDuration = 1000; + public final double Radius = 6; + public final double Speed = 10; public final boolean MustStartAboveWater = true; public WaterBubbleConfig() { diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java index 07e10eff..5ad6b40c 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java @@ -4,16 +4,16 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class WaterManipulationConfig extends AbilityConfig { - public final long Cooldown = 0; - public final double SelectRange = 0; - public final double CollisionRadius = 0; - public final double Range = 0; - public final double Knockback = 0; - public final double Damage = 0; - public final double Speed = 0; - public final double DeflectRange = 0; + public final long Cooldown = 3500; + public final double SelectRange = 20; + public final double CollisionRadius = 1.5; + public final double Range = 25; + public final double Knockback = .2; + public final double Damage = 2; + public final double Speed = 25; + public final double DeflectRange = 15; - public final double AvatarState_Damage = 0; + public final double AvatarState_Damage = 4; public WaterManipulationConfig() { super(true, "", ""); diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java index 7f6f37b5..80bc7c3c 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java @@ -4,29 +4,29 @@ import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConf public class WaterSpoutConfig extends AbilityConfig { - public final long Cooldown = 0; - public final boolean UseParticles = true; + public final long Cooldown = 100; + public final boolean UseParticles = false; public final boolean EnableBlockSpiral = true; - public final double Height = 0; + public final double Height = 16; public final long Duration = 0; - public final long Interval = 0; + public final long Interval = 50; public final WaterSpoutWaveConfig WaveConfig = new WaterSpoutWaveConfig(); public static class WaterSpoutWaveConfig { public final boolean Enabled = true; - public final long Cooldown = 0; - public final boolean AllowPlantSource = true; - public final double Radius = 0; - public final double WaveRadius = 0; - public final double AnimationSpeed = 0; - public final double SelectRange = 0; - public final double Speed = 0; - public final long ChargeTime = 0; - public final long FlightDuration = 0; + public final long Cooldown = 5500; + public final boolean AllowPlantSource = false; + public final double Radius = 3; + public final double WaveRadius = 3; + public final double AnimationSpeed = 25; + public final double SelectRange = 5; + public final double Speed = .65; + public final long ChargeTime = 400; + public final long FlightDuration = 4000; - public final long AvatarState_FlightDuration = 0; + public final long AvatarState_FlightDuration = 20000; } diff --git a/src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java index 991baaca..5bd4d285 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java @@ -9,7 +9,114 @@ public class EarthPropertiesConfig implements Config { public final String Description = ""; - public final Material[] EarthBlocks = {}; + public final Material[] EarthBlocks = { + Material.GRASS_BLOCK, + Material.COBBLESTONE, + Material.COBBLESTONE_SLAB, + Material.COBBLESTONE_STAIRS, + Material.COBBLESTONE_WALL, + Material.GRASS_PATH, + Material.DIRT, + Material.PODZOL, + Material.COARSE_DIRT, + Material.GRAVEL, + Material.OBSIDIAN, + Material.STONE, + Material.ANDESITE, + Material.POLISHED_ANDESITE, + Material.GRANITE, + Material.POLISHED_GRANITE, + Material.DIORITE, + Material.POLISHED_DIORITE, + Material.STONE_BRICKS, + Material.STONE_BRICK_SLAB, + Material.STONE_BRICK_STAIRS, + Material.MOSSY_STONE_BRICKS, + Material.CRACKED_STONE_BRICKS, + Material.CHISELED_STONE_BRICKS, + Material.MOSSY_COBBLESTONE, + Material.MOSSY_COBBLESTONE_WALL, + Material.TERRACOTTA, + Material.BLACK_GLAZED_TERRACOTTA, + Material.BLACK_TERRACOTTA, + Material.BLUE_GLAZED_TERRACOTTA, + Material.BLUE_TERRACOTTA, + Material.BROWN_GLAZED_TERRACOTTA, + Material.BROWN_TERRACOTTA, + Material.CYAN_GLAZED_TERRACOTTA, + Material.CYAN_TERRACOTTA, + Material.GRAY_GLAZED_TERRACOTTA, + Material.GRAY_TERRACOTTA, + Material.GREEN_GLAZED_TERRACOTTA, + Material.GREEN_TERRACOTTA, + Material.LIGHT_BLUE_GLAZED_TERRACOTTA, + Material.LIGHT_BLUE_TERRACOTTA, + Material.LIGHT_GRAY_GLAZED_TERRACOTTA, + Material.LIGHT_GRAY_TERRACOTTA, + Material.LIME_GLAZED_TERRACOTTA, + Material.LIME_TERRACOTTA, + Material.MAGENTA_GLAZED_TERRACOTTA, + Material.MAGENTA_TERRACOTTA, + Material.ORANGE_GLAZED_TERRACOTTA, + Material.ORANGE_TERRACOTTA, + Material.PINK_GLAZED_TERRACOTTA, + Material.PINK_TERRACOTTA, + Material.PURPLE_GLAZED_TERRACOTTA, + Material.PURPLE_TERRACOTTA, + Material.RED_GLAZED_TERRACOTTA, + Material.RED_TERRACOTTA, + Material.WHITE_GLAZED_TERRACOTTA, + Material.WHITE_TERRACOTTA, + Material.YELLOW_GLAZED_TERRACOTTA, + Material.YELLOW_TERRACOTTA, + Material.BLACK_CONCRETE, + Material.BLUE_CONCRETE, + Material.BROWN_CONCRETE, + Material.CYAN_CONCRETE, + Material.GRAY_CONCRETE, + Material.GREEN_CONCRETE, + Material.LIGHT_BLUE_CONCRETE, + Material.LIGHT_GRAY_CONCRETE, + Material.LIME_CONCRETE, + Material.MAGENTA_CONCRETE, + Material.ORANGE_CONCRETE, + Material.PINK_CONCRETE, + Material.PURPLE_CONCRETE, + Material.RED_CONCRETE, + Material.WHITE_CONCRETE, + Material.YELLOW_CONCRETE, + Material.SANDSTONE, + Material.SANDSTONE_SLAB, + Material.SANDSTONE_STAIRS, + Material.CHISELED_SANDSTONE, + Material.RED_SANDSTONE, + Material.RED_SANDSTONE_SLAB, + Material.RED_SANDSTONE_STAIRS, + Material.CHISELED_RED_SANDSTONE, + Material.BRICKS, + Material.BRICK_SLAB, + Material.BRICK_STAIRS, + Material.CLAY, + Material.END_STONE, + Material.END_STONE_BRICKS, + Material.NETHER_BRICKS, + Material.NETHER_BRICK_FENCE, + Material.NETHER_BRICK_SLAB, + Material.NETHER_BRICK_STAIRS, + Material.RED_NETHER_BRICKS, + Material.NETHERRACK, + Material.DIAMOND_ORE, + Material.EMERALD_ORE, + Material.LAPIS_ORE, + Material.COAL_ORE, + Material.COAL_BLOCK, + Material.REDSTONE_ORE, + Material.QUARTZ_BLOCK, + Material.QUARTZ_PILLAR, + Material.QUARTZ_SLAB, + Material.QUARTZ_STAIRS, + Material.NETHER_QUARTZ_ORE + }; public final boolean RevertEarthbending = true; public final long RevertCheckTime = 0; @@ -23,14 +130,35 @@ public class EarthPropertiesConfig implements Config { public final float SoundVolume = 0; public final float SoundPitch = 0; - public final Material[] MetalBlocks = {}; + public final Material[] MetalBlocks = { + Material.IRON_BARS, + Material.IRON_BLOCK, + Material.ANVIL, + Material.CHIPPED_ANVIL, + Material.DAMAGED_ANVIL, + Material.IRON_ORE, + Material.CAULDRON, + Material.HOPPER, + Material.RAIL, + Material.ACTIVATOR_RAIL, + Material.POWERED_RAIL, + Material.DETECTOR_RAIL, + Material.IRON_DOOR, + Material.IRON_TRAPDOOR, + Material.DAYLIGHT_DETECTOR, + Material.GOLD_BLOCK, + Material.GOLD_ORE + }; public final double MetalPowerFactor = 0; public final Sound MetalSoundType = Sound.ENTITY_IRON_GOLEM_HURT; public final float MetalSoundVolume = 0; public final float MetalSoundPitch = 0; - public final Material[] SandBlocks = {}; + public final Material[] SandBlocks = { + Material.SAND, + Material.RED_SAND + }; public final Sound SandSoundType = Sound.BLOCK_SAND_BREAK; public final float SandSoundVolume = 0; diff --git a/src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java index 9201bada..045ffa0b 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java @@ -13,8 +13,8 @@ public class FirePropertiesConfig implements Config { public final long RevertTicks = 0; public final double DayFactor = 0; - public final String DayMessage = ""; - public final String NightMessage = ""; + public final String DayMessage = "You feel your firebending become more powerful as the sun rises"; + public final String NightMessage = "You feel your power diminish as the sun sets"; public final ParticleEffect Particles = ParticleEffect.FLAME; diff --git a/src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java index 27a6ead7..460362ad 100644 --- a/src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java +++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java @@ -9,12 +9,17 @@ public class WaterPropertiesConfig implements Config { public final String Description = ""; - public final Material[] WaterBlocks = {}; + public final Material[] WaterBlocks = { + Material.WATER, + Material.SEAGRASS, + Material.TALL_SEAGRASS, + Material.KELP_PLANT + }; - public final double NightFactor = 0; + public final double NightFactor = 1.25; - public final String DayMessage = ""; - public final String NightMessage = ""; + public final String DayMessage = "You feel your power diminish as the moon sets"; + public final String NightMessage = "You feel your waterbending become more powerful as the moon rises"; public final boolean DynamicSourcing = true; @@ -27,7 +32,12 @@ public class WaterPropertiesConfig implements Config { public final float SoundVolume = 0; public final float SoundPitch = 0; - public final Material[] IceBlocks = {}; + public final Material[] IceBlocks = { + Material.ICE, + Material.BLUE_ICE, + Material.FROSTED_ICE, + Material.PACKED_ICE + }; public final boolean FreezePlayerHead = true; public final boolean FreezePlayerFeet = true; @@ -36,9 +46,54 @@ public class WaterPropertiesConfig implements Config { public final float IceSoundVolume = 0; public final float IceSoundPitch = 0; - public final Material[] SnowBlocks = {}; + public final Material[] SnowBlocks = { + Material.SNOW_BLOCK, + Material.SNOW + }; - public final Material[] PlantBlocks = {}; + public final Material[] PlantBlocks = { + Material.GRASS, + Material.TALL_GRASS, + Material.FERN, + Material.LARGE_FERN, + Material.ORANGE_TULIP, + Material.PINK_TULIP, + Material.RED_TULIP, + Material.WHITE_TULIP, + Material.LILAC, + Material.ROSE_BUSH, + Material.PEONY, + Material.POPPY, + Material.DANDELION, + Material.OXEYE_DAISY, + Material.AZURE_BLUET, + Material.SUNFLOWER, + Material.LILY_PAD, + Material.BLUE_ORCHID, + Material.ALLIUM, + Material.SUGAR_CANE, + Material.VINE, + Material.BROWN_MUSHROOM, + Material.BROWN_MUSHROOM_BLOCK, + Material.RED_MUSHROOM, + Material.RED_MUSHROOM_BLOCK, + Material.ACACIA_LEAVES, + Material.ACACIA_SAPLING, + Material.BIRCH_LEAVES, + Material.BIRCH_SAPLING, + Material.DARK_OAK_LEAVES, + Material.DARK_OAK_SAPLING, + Material.OAK_LEAVES, + Material.OAK_SAPLING, + Material.SPRUCE_LEAVES, + Material.SPRUCE_SAPLING, + Material.JUNGLE_LEAVES, + Material.JUNGLE_SAPLING, + Material.CHORUS_PLANT, + Material.CHORUS_FRUIT, + Material.CACTUS + + }; public final Sound PlantSoundType = Sound.BLOCK_GRASS_STEP; public final float PlantSoundVolume = 0; diff --git a/src/com/projectkorra/projectkorra/firebending/FireJet.java b/src/com/projectkorra/projectkorra/firebending/FireJet.java index f7f0e4f8..6e9d235a 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireJet.java +++ b/src/com/projectkorra/projectkorra/firebending/FireJet.java @@ -74,10 +74,9 @@ public class FireJet extends FireAbility { this.time = System.currentTimeMillis(); this.start(); - if (this.showGliding) { - this.previousGlidingState = player.isGliding(); - player.setGliding(true); - } + + this.previousGlidingState = player.isGliding(); + this.bPlayer.addCooldown(this); } } @@ -108,6 +107,10 @@ public class FireJet extends FireAbility { final Vector velocity = this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.speed * timefactor); this.player.setVelocity(velocity); this.player.setFallDistance(0); + + if (this.showGliding) { + player.setGliding(true); + } } }