From 7b46abf732669cf4f298446a9e96f84460d403fb Mon Sep 17 00:00:00 2001 From: B1G-FUNGUS Date: Mon, 4 Oct 2021 09:38:27 -0700 Subject: [PATCH] Forgot to save --- .../quidproquo/rituals/BatSpewRitual.java | 2 +- .../quidproquo/rituals/HardPenorRitual.java | 24 +++++++++---------- .../quidproquo/rituals/SoftPenorRitual.java | 13 ++++------ .../quidproquo/rituals/SummoningRitual.java | 3 +-- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java index 542d8a2..d843a73 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/BatSpewRitual.java @@ -21,7 +21,7 @@ public class BatSpewRitual extends Ritual { @Override public void execute(Player caster, Player target, Location location) { for (int i = 0; i < 20; i++) { - target.getWorld().spawnEntity(target.getLocation(), EntityType.CHICKEN); + target.getWorld().spawnEntity(target.getLocation(), EntityType.BAT); } } diff --git a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java index ed868b5..bca8e44 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/HardPenorRitual.java @@ -1,5 +1,4 @@ package top.penowl.quidproquo.rituals; -//TODO TEST import org.bukkit.Location; import org.bukkit.Material; @@ -12,17 +11,19 @@ public class HardPenorRitual extends Ritual { @Override public void setup() { - addIngredient(Material.COBBLESTONE, 500); - addIngredient(Material.BONE, 10); + addIngredient(Material.COBBLESTONE, 1); + addIngredient(Material.BONE, 1); + addIngredient(Material.REDSTONE, 16); + addIngredient(Material.WHEAT, 32); + backfire = 0.10; name = "erection"; } @Override public void execute(Player caster, Player target, Location location) { Block shaft = caster.getLocation().getBlock(); - Block ball1 = shaft.getRelative(2, -1, 0); - Block ball2 = shaft.getRelative(-2,-1,0); - //TODO USE ELEGANT MATHEMATICS INSTEAD OF SCUFFED IF STATEMENTS + Block ball1 = shaft.getRelative(2, 0, -1); + Block ball2 = shaft.getRelative(-2, 0, -1); for(int d = 0; d < 8; d ++) { int x = 0; if(d < 3) x = 1; @@ -30,24 +31,23 @@ public class HardPenorRitual extends Ritual { int z = 0; if(d % 3 == 0) z = 1; if(d % 3 == 1) z = -1; - for(int y = 0; y < 15; y++) { + for(int y = 0; y < 12; y++) { Block changingBlock = shaft.getRelative(x,y,z); if(changingBlock.getType() == Material.AIR) - changingBlock.setType(Material.COBBLESTONE); + changingBlock.setType(Material.SAND); } } for(int x = 0; x < 3; x ++) { for(int y = 0; y < 3; y ++) { for(int z = 0; z < 3; z ++) { Block changingBlock1 = ball1.getRelative(x,y,z); - Block changingBlock2 = ball2.getRelative(x,y,z); + Block changingBlock2 = ball2.getRelative(x*-1,y,z); if(changingBlock1.getType() == Material.AIR) - changingBlock1.setType(Material.COBBLESTONE); + changingBlock1.setType(Material.SAND); if(changingBlock2.getType() == Material.AIR) - changingBlock1.setType(Material.COBBLESTONE); + changingBlock2.setType(Material.SAND); } } } } - } \ No newline at end of file diff --git a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java index 25e105b..8ceca7f 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SoftPenorRitual.java @@ -1,7 +1,5 @@ package top.penowl.quidproquo.rituals; -//TODO TEST THE PENOR -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -13,11 +11,10 @@ public class SoftPenorRitual extends Ritual { @Override public void setup() { - /* addIngredient(Material.DIRT, 500); - addIngredient(Material.BONE, 20); - addIngredient(Material.REDSTONE, 15); - addIngredient(Material.WHEAT, 15); */ - addIngredient(Material.MOSSY_COBBLESTONE, 1); + addIngredient(Material.SAND, 1); + addIngredient(Material.BONE, 1); + addIngredient(Material.REDSTONE, 16); + addIngredient(Material.WHEAT, 32); backfire = 0.10; name = "disfunction"; } @@ -53,4 +50,4 @@ public class SoftPenorRitual extends Ritual { } } } -} +} \ No newline at end of file diff --git a/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java b/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java index ff7ab67..27198fd 100644 --- a/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java +++ b/src/main/java/top/penowl/quidproquo/rituals/SummoningRitual.java @@ -2,7 +2,6 @@ package top.penowl.quidproquo.rituals; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -28,4 +27,4 @@ public class SummoningRitual extends Ritual { location.getWorld().createExplosion(location, 5F); } -} +} \ No newline at end of file