TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47 from nathank33/master

Browse source 
FireCombo Fixes and Changes
This commit is contained in:
MistPhizzle 2014-10-05 18:38:09 -04:00
commit d1f26305fc
3 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/projectkorra/ProjectKorra/ConfigManager.java
View file

@ -540,16 +540,16 @@ public class ConfigManager {
config.addDefault("Abilities.Fire.WallOfFire.Interval", 500); config.addDefault("Abilities.Fire.WallOfFire.Interval", 500);
config.addDefault("Abilities.Fire.FireCombo.Enabled", true); config.addDefault("Abilities.Fire.FireCombo.Enabled", true);
config.addDefault("Abilities.Fire.FireCombo.FireKick.Range", 6.0); config.addDefault("Abilities.Fire.FireCombo.FireKick.Range", 7.0);
config.addDefault("Abilities.Fire.FireCombo.FireKick.Damage", 3.0); config.addDefault("Abilities.Fire.FireCombo.FireKick.Damage", 3.0);
config.addDefault("Abilities.Fire.FireCombo.FireKick.Cooldown", 1000); config.addDefault("Abilities.Fire.FireCombo.FireKick.Cooldown", 1000);
config.addDefault("Abilities.Fire.FireCombo.FireSpin.Range", 4.5); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Range", 5.5);
config.addDefault("Abilities.Fire.FireCombo.FireSpin.Damage", 3.0); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Damage", 3.0);
config.addDefault("Abilities.Fire.FireCombo.FireSpin.Knockback", 2.0); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Knockback", 2.4);
config.addDefault("Abilities.Fire.FireCombo.FireSpin.Cooldown", 2000); config.addDefault("Abilities.Fire.FireCombo.FireSpin.Cooldown", 2000);
config.addDefault("Abilities.Fire.FireCombo.FireWheel.Range", 20.0); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Range", 20.0);
config.addDefault("Abilities.Fire.FireCombo.FireWheel.Damage", 4.0); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Damage", 4.0);
config.addDefault("Abilities.Fire.FireCombo.FireWheel.Speed", 0.5); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Speed", 0.55);
config.addDefault("Abilities.Fire.FireCombo.FireWheel.Cooldown", 200); config.addDefault("Abilities.Fire.FireCombo.FireWheel.Cooldown", 200);
config.addDefault("Abilities.Fire.FireCombo.JetBlast.Speed", 1.2); config.addDefault("Abilities.Fire.FireCombo.JetBlast.Speed", 1.2);
config.addDefault("Abilities.Fire.FireCombo.JetBlast.Cooldown", 6000); config.addDefault("Abilities.Fire.FireCombo.JetBlast.Cooldown", 6000);

7
src/com/projectkorra/ProjectKorra/firebending/FireCombo.java
View file

@ -8,6 +8,7 @@ import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -284,8 +285,8 @@ public class FireCombo
fs.setCollides(false); fs.setCollides(false);
fs.runTaskTimer(ProjectKorra.plugin, 0, 1L); fs.runTaskTimer(ProjectKorra.plugin, 0, 1L);
tasks.add(fs); tasks.add(fs);
if(progressCounter % 5 == 0) if(progressCounter % 4 == 0)
player.getWorld().playSound(player.getLocation(), Sound.WITHER_SHOOT, 3, 1F); player.getWorld().playSound(player.getLocation(), Sound.FIZZ, 1, 0F);
} }
} }
else if(ability.equalsIgnoreCase("FireWheel")) else if(ability.equalsIgnoreCase("FireWheel"))
@ -475,7 +476,7 @@ public class FireCombo
public void run() public void run()
{ {
Block block = currentLoc.getBlock(); Block block = currentLoc.getBlock();
if(block.getType() != Material.AIR && !Methods.isPlant(block)){ if(block.getRelative(BlockFace.UP).getType() != Material.AIR && !Methods.isPlant(block)){
remove(); remove();
return; return;
} }

23
src/config.yml
View file

@ -401,6 +401,29 @@ Abilities:
Damage: 2 Damage: 2
Cooldown: 7500 Cooldown: 7500
Interval: 500 Interval: 500
FireCombo:
Enabled: true
FireKick:
Range: 7.0
Damage: 3.0
Cooldown: 1000
FireSpin:
Range: 5.5
Damage: 3.0
Knockback: 2.4
Cooldown: 2000
FireWheel:
Range: 20.0
Damage: 4.0
Speed: 0.55
Cooldown: 200
JetBlast:
Speed: 1.2
Cooldown: 6000
JetBlaze:
Speed: 1.1
Damage: 3
Cooldown: 6000
Chi: Chi:
Passive: Passive:
FallReductionFactor: 0.5 FallReductionFactor: 0.5