From f8a9bfa05f42a94d0a02d8f64375eddb185acf68 Mon Sep 17 00:00:00 2001 From: Edith Boles Date: Sun, 10 Oct 2021 23:17:42 -0700 Subject: [PATCH] Rebalance and new ritual pt 2 --- .../quidproquo/rituals/AirliftRitual.java | 2 +- .../quidproquo/rituals/AntimatterRitual.java | 2 +- .../quidproquo/rituals/AnvilRitual.java | 2 +- .../quidproquo/rituals/BatSpewRitual.java | 2 +- .../quidproquo/rituals/ChickenSpewRitual.java | 2 +- .../quidproquo/rituals/ChugJugRitual.java | 2 +- .../quidproquo/rituals/ChunkBegoneRitual.java | 2 +- .../quidproquo/rituals/CreeperHissRitual.java | 2 +- .../quidproquo/rituals/DragonRitual.java | 2 +- .../quidproquo/rituals/FillerRitual.java | 2 +- .../penowl/quidproquo/rituals/GBJRitual.java | 2 +- .../quidproquo/rituals/HasteRitual.java | 2 +- .../quidproquo/rituals/HerobrineRitual.java | 2 +- .../quidproquo/rituals/KickingRitual.java | 2 +- .../penowl/quidproquo/rituals/LavaRitual.java | 2 +- .../quidproquo/rituals/PissingRitual.java | 2 +- .../quidproquo/rituals/RSpawnEggRitual.java | 2 +- .../quidproquo/rituals/RandomItemRitual.java | 2 +- .../quidproquo/rituals/SnowmanRitual.java | 2 +- .../quidproquo/rituals/SoftPenorRitual.java | 2 +- .../quidproquo/rituals/SummoningRitual.java | 2 +- .../quidproquo/rituals/WitherRitual.java | 2 +- .../quidproquo/rituals/WooshRitual.java | 32 +++++++++++++++++++ 23 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 src/main/java/top/penowl/quidproquo/rituals/WooshRitual.java diff --git a/src/main/java/top/penowl/quidproquo/rituals/AirliftRitual.java b/src/main/java/top/penowl/quidproquo/rituals/AirliftRitual.java index d2e8f40..ca38972 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/AirliftRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/AirliftRitual.java @@ -21,7 +21,7 @@ public class AirliftRitual extends Ritual { addIngredient(Material.STONE, 1); addIngredient(Material.SAPLING, 1); addSacrifice(EntityType.CHICKEN, 1); - addIngredient(Material.WHEAT, 64*2); + addIngredient(Material.WHEAT, 64*3); name = "raising"; description = "Raises the chunk."; health = 3; diff --git a/src/main/java/top/penowl/quidproquo/rituals/AntimatterRitual.java b/src/main/java/top/penowl/quidproquo/rituals/AntimatterRitual.java index 00966b1..4068648 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/AntimatterRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/AntimatterRitual.java @@ -12,7 +12,7 @@ public class AntimatterRitual extends Ritual { @Override public void setup() { addIngredient(Material.OBSIDIAN, 1); - addIngredient(Material.WHEAT, 64*1); + addIngredient(Material.WHEAT, 64*3); addIngredient(Material.ENDER_PEARL, 1); addIngredient(Material.GOLDEN_CARROT, 1); name = "antimatter"; diff --git a/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java b/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java index 66a31e8..bf16216 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java @@ -15,7 +15,7 @@ public class AnvilRitual extends Ritual { addIngredient(Material.ANVIL, 1); addIngredient(Material.ARROW, 1); addIngredient(Material.ROTTEN_FLESH, 1); - addIngredient(Material.WHEAT, 16); + addIngredient(Material.WHEAT, 32); name = "anviling"; health = 4; backfire = 0.3; diff --git a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java index 050200f..a8f395e 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java @@ -11,7 +11,7 @@ public class BatSpewRitual extends Ritual { @Override public void setup() { - addIngredient(Material.WHEAT, 20); + addIngredient(Material.WHEAT, 32); addIngredient(Material.IRON_PICKAXE, 1); addSacrifice(EntityType.CHICKEN, 1); name = "bat spew"; diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java index 89fc1db..0775ff9 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChickenSpewRitual.java @@ -11,7 +11,7 @@ public class ChickenSpewRitual extends Ritual { @Override public void setup() { - addIngredient(Material.WHEAT, 16); + addIngredient(Material.WHEAT, 32); addIngredient(Material.DIAMOND_HOE, 1); addSacrifice(EntityType.CHICKEN, 1); health = 3; diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java index 8afc47e..98845cf 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChugJugRitual.java @@ -17,7 +17,7 @@ public class ChugJugRitual extends Ritual { addIngredient(Material.GLASS_BOTTLE, 1); addIngredient(Material.REDSTONE, 1); addIngredient(Material.GLOWSTONE_DUST, 1); - addIngredient(Material.WHEAT, 64*1); + addIngredient(Material.WHEAT, 64*4); addSacrifice(EntityType.WITCH, 1); health = 10; name = "chug jug"; diff --git a/src/main/java/top/penowl/quidproquo/rituals/ChunkBegoneRitual.java b/src/main/java/top/penowl/quidproquo/rituals/ChunkBegoneRitual.java index 35c3703..658f531 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/ChunkBegoneRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/ChunkBegoneRitual.java @@ -12,7 +12,7 @@ public class ChunkBegoneRitual extends Ritual { @Override public void setup() { addIngredient(Material.OBSIDIAN, 64); - addIngredient(Material.WHEAT, 64*4); + addIngredient(Material.WHEAT, 64*12); addIngredient(Material.ENDER_PEARL, 16); addIngredient(Material.GOLDEN_APPLE, 1); name = "chunk begone"; diff --git a/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java b/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java index 1e770bb..526e988 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/CreeperHissRitual.java @@ -13,7 +13,7 @@ public class CreeperHissRitual extends Ritual { public void setup() { addIngredient(Material.SULPHUR, 1); addIngredient(Material.REDSTONE, 1); - addIngredient(Material.WHEAT, 8); + addIngredient(Material.WHEAT, 16); name = "creeper hissing"; health = 1; notify = false; diff --git a/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java b/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java index 2fa4374..b6f8685 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/DragonRitual.java @@ -12,7 +12,7 @@ public class DragonRitual extends Ritual { @Override public void setup() { addIngredient(Material.ENDER_PEARL, 16); - addIngredient(Material.WHEAT, 64*9*2); + addIngredient(Material.WHEAT, 64*9*3); addSacrifice(EntityType.CHICKEN, 2); addSacrifice(EntityType.ENDERMAN, 1); addIngredient(Material.EGG, 64); diff --git a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java index b0ca32f..285ae61 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java @@ -15,7 +15,7 @@ public class FillerRitual extends Ritual { public void setup() { addIngredient(Material.LOG, 1); addSacrifice(EntityType.PIG, 1); - addIngredient(Material.WHEAT, 24); + addIngredient(Material.WHEAT, 32); name = "trolling"; health = 2; backfire = 0.2; diff --git a/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java b/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java index 8097d70..3eceff7 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/GBJRitual.java @@ -14,7 +14,7 @@ public class GBJRitual extends Ritual { addIngredient(Material.IRON_INGOT, 6); addIngredient(Material.STONE, 1); addIngredient(Material.OBSIDIAN, 1); - addIngredient(Material.WHEAT, 64*2); + addIngredient(Material.WHEAT, 64*3); name = "caging"; health = 5; backfire = 0.2; diff --git a/src/main/java/top/penowl/quidproquo/rituals/HasteRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HasteRitual.java index bcd57bb..cd248f4 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HasteRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HasteRitual.java @@ -15,7 +15,7 @@ public class HasteRitual extends Ritual { @Override public void setup() { addIngredient(Material.IRON_PICKAXE, 1); - addIngredient(Material.WHEAT, 32); + addIngredient(Material.WHEAT, 64); addIngredient(Material.REDSTONE, 16); addIngredient(Material.DIAMOND, 1); health = 8; diff --git a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java index 856e848..eeba85c 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HerobrineRitual.java @@ -20,7 +20,7 @@ public class HerobrineRitual extends Ritual { @Override public void setup() { - addIngredient(Material.WHEAT, 64); + addIngredient(Material.WHEAT, 64*3); addIngredient(Material.DIAMOND, 1); addIngredient(Material.ROTTEN_FLESH, 16); addIngredient(Material.REDSTONE_BLOCK, 1); diff --git a/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java index 7a67226..faa3791 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/KickingRitual.java @@ -16,7 +16,7 @@ public class KickingRitual extends Ritual { addIngredient(Material.IRON_BOOTS, 1); health = 3; name = "kicking"; - backfire = 0.4; + backfire = 0.3; description = "ADMIN ABUSE!"; } diff --git a/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java b/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java index a5a32da..1ac7e90 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java @@ -11,7 +11,7 @@ public class LavaRitual extends Ritual { public void setup() { addIngredient(Material.LAVA_BUCKET, 1); addIngredient(Material.DIAMOND, 1); - addIngredient(Material.WHEAT, 16); + addIngredient(Material.WHEAT, 32); backfire = 0.20; name = "combustion"; description = "Light your enemy on fire for a short period."; diff --git a/src/main/java/top/penowl/quidproquo/rituals/PissingRitual.java b/src/main/java/top/penowl/quidproquo/rituals/PissingRitual.java index c1e8712..ac0a608 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/PissingRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/PissingRitual.java @@ -19,7 +19,7 @@ public class PissingRitual extends Ritual { health = 2; name = "pissing"; description = "Make your foe piss their pants."; - backfire = 0.25; + backfire = 0.15; } @Override diff --git a/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java b/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java index 2d86063..e348c9a 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/RSpawnEggRitual.java @@ -26,7 +26,7 @@ public class RSpawnEggRitual extends Ritual { @Override public void setup() { addIngredient(Material.EGG, 16); - addIngredient(Material.WHEAT, 32); + addIngredient(Material.WHEAT, 64); name = "egging"; health = 4; description = "Summon a random spawn egg."; diff --git a/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java b/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java index 94449ac..47ce9e8 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/RandomItemRitual.java @@ -19,7 +19,7 @@ public class RandomItemRitual extends Ritual { addIngredient(Material.GOLD_INGOT, 3); addIngredient(Material.REDSTONE, 2); addIngredient(Material.DIAMOND, 1); - addIngredient(Material.WHEAT, 8); + addIngredient(Material.WHEAT, 16); health = 2; name = "itemization"; notify = false; diff --git a/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java index 897879a..c642401 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java @@ -14,7 +14,7 @@ public class SnowmanRitual extends Ritual { addIngredient(Material.STICK, 32); addIngredient(Material.DIAMOND, 1); addSacrifice(EntityType.SHEEP, 1); - addIngredient(Material.WHEAT, 16); + addIngredient(Material.WHEAT, 32); health = 4; name = "snowing"; description = "Cause a snowman invasion at the location of your enemy."; diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java index 8601978..acdd775 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java @@ -14,7 +14,7 @@ public class SoftPenorRitual extends Ritual { addIngredient(Material.SAND, 1); addIngredient(Material.BONE, 4); addIngredient(Material.REDSTONE, 16); - addIngredient(Material.WHEAT, 32); + addIngredient(Material.WHEAT, 64); backfire = 0.10; name = "disfunction"; description = "Encase your enemy in a sand penor."; diff --git a/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java index 1ce8e6e..02750d9 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java @@ -15,7 +15,7 @@ public class SummoningRitual extends Ritual { public void setup() { addIngredient(Material.ENDER_PEARL, 1); addIngredient(Material.COMPASS, 1); - addIngredient(Material.WHEAT, 64+32); + addIngredient(Material.WHEAT, 64*2); health = 6; name = "summoning"; backfire = 0.15; diff --git a/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java b/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java index bfbeb01..9b1865d 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/WitherRitual.java @@ -12,7 +12,7 @@ public class WitherRitual extends Ritual { @Override public void setup() { addIngredient(Material.BONE, 16); - addIngredient(Material.WHEAT, 64*9); + addIngredient(Material.WHEAT, 64*10); addSacrifice(EntityType.SKELETON, 1); addIngredient(Material.FLOWER_POT_ITEM, 1); addIngredient(Material.SAND, 1); diff --git a/src/main/java/top/penowl/quidproquo/rituals/WooshRitual.java b/src/main/java/top/penowl/quidproquo/rituals/WooshRitual.java new file mode 100644 index 0000000..097d2e5 --- /dev/null +++ b/src/main/java/top/penowl/quidproquo/rituals/WooshRitual.java @@ -0,0 +1,32 @@ +package top.penowl.quidproquo.rituals; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.entity.Player; + +import top.penowl.quidproquo.Ritual; + +public class WooshRitual extends Ritual { + + @Override + public void setup() { + addIngredient(Material.WORKBENCH, 1); + addIngredient(Material.WHEAT, 8); + addIngredient(Material.SEEDS, 1); + addIngredient(Material.STICK, 1); + name = "wooshing"; + description = "Teleport yourself to highest block."; + health = 1; + notify = false; + } + + @Override + public void execute(Player caster, Player target, Location location) { + int y = 255; + while (location.getBlock().getRelative(0, y, 0).getType() != Material.AIR) { + y--; + } + caster.teleport(location.getBlock().getRelative(0, y + 1, 0).getLocation()); + } + +}