PenguinOwl/QuidProQuo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hitritual

Browse Source
This commit is contained in:
Edith Boles 2021-10-01 17:53:46 -07:00
parent 18c9b40605
commit c54f2a354b
9 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/top/penowl/quidproquo/QuidProQuo.java
View File

@ -39,6 +39,7 @@ public class QuidProQuo extends JavaPlugin {
rituals.add(new AnvilRitual()); rituals.add(new AnvilRitual());
rituals.add(new FillerRitual()); rituals.add(new FillerRitual());
rituals.add(new LavaRitual()); rituals.add(new LavaRitual());
rituals.add(new HitRitual());
// run ritual setup scripts // run ritual setup scripts
for (Ritual ritual : rituals) { for (Ritual ritual : rituals) {

5
src/main/java/top/penowl/quidproquo/rituals/AnvilRitual.java
View File

@ -12,8 +12,9 @@ public class AnvilRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.ANVIL, 1); addIngredient(Material.ANVIL, 1);
addIngredient(Material.ENDER_PEARL, 2); addIngredient(Material.ENDER_PEARL, 1);
addIngredient(Material.ROTTEN_FLESH, 32); addIngredient(Material.ROTTEN_FLESH, 1);
addIngredient(Material.WHEAT, 32);
name = "anviling"; name = "anviling";
health = 5; health = 5;
backfire = 0.5; backfire = 0.5;

5
src/main/java/top/penowl/quidproquo/rituals/FeedingRitual.java
View File

@ -2,7 +2,6 @@ package top.penowl.quidproquo.rituals;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import top.penowl.quidproquo.Ritual; import top.penowl.quidproquo.Ritual;
@ -11,8 +10,8 @@ public class FeedingRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addSacrifice(EntityType.PIG, 1); addIngredient(Material.WOOD_HOE, 1);
addIngredient(Material.WOOD_SWORD, 1); addIngredient(Material.WHEAT, 16);
health = 1; health = 1;
name = "feeding"; name = "feeding";
} }

3
src/main/java/top/penowl/quidproquo/rituals/FillerRitual.java
View File

@ -15,8 +15,9 @@ public class FillerRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.LOG, 64); addIngredient(Material.LOG, 1);
addSacrifice(EntityType.PIG, 1); addSacrifice(EntityType.PIG, 1);
addIngredient(Material.WHEAT, 128);
name = "trolling"; name = "trolling";
health = 2; health = 2;
backfire = 0.2; backfire = 0.2;

3
src/main/java/top/penowl/quidproquo/rituals/GetLuckyRitual.java
View File

@ -11,8 +11,9 @@ public class GetLuckyRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.GOLD_BLOCK, 3); addIngredient(Material.GOLD_BLOCK, 1);
addIngredient(Material.TNT, 1); addIngredient(Material.TNT, 1);
addIngredient(Material.WHEAT, 256);
health = 3; health = 3;
lightning = true; lightning = true;
name = "daring"; name = "daring";

5
src/main/java/top/penowl/quidproquo/rituals/HealRitual.java
View File

@ -10,13 +10,14 @@ public class HealRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.REDSTONE, 9); addIngredient(Material.REDSTONE, 1);
addIngredient(Material.WHEAT, 16);
name = "healing"; name = "healing";
} }
@Override @Override
public void execute(Player caster, Player target, Location location) { public void execute(Player caster, Player target, Location location) {
caster.setHealth(Math.min(caster.getMaxHealth(), caster.getHealth()+2.0)); caster.setHealth(Math.min(caster.getMaxHealth(), caster.getHealth()+8.0));
} }
} }

8
src/main/java/top/penowl/quidproquo/rituals/HitRitual.java
View File

@ -11,14 +11,16 @@ public class HitRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.IRON_SWORD, 1); addIngredient(Material.IRON_SWORD, 1);
addIngredient(Material.HAY_BLOCK, 1); addIngredient(Material.IRON_INGOT, 1);
addIngredient(Material.WHEAT, 9);
name = "shadow hit"; name = "shadow hit";
health = 2; health = 1;
} }
@Override @Override
public void execute(Player caster, Player target, Location location) { public void execute(Player caster, Player target, Location location) {
target.playSound(target.getLocation(), Sound.SUCCESSFUL_HIT, 1, 1); target.playSound(target.getLocation(), Sound.HURT_FLESH, 1, 1);
//target.damage(1.0);
} }
} }

4
src/main/java/top/penowl/quidproquo/rituals/LavaRitual.java
View File

@ -12,13 +12,13 @@ public class LavaRitual extends Ritual {
addIngredient(Material.LAVA_BUCKET, 1); addIngredient(Material.LAVA_BUCKET, 1);
addIngredient(Material.DIAMOND, 1); addIngredient(Material.DIAMOND, 1);
addIngredient(Material.WHEAT, 64); addIngredient(Material.WHEAT, 64);
backfire = 0.50; backfire = 0.10;
name = "combustion"; name = "combustion";
} }
@Override @Override
public void execute(Player caster, Player target, Location location) { public void execute(Player caster, Player target, Location location) {
target.setFireTicks(60); target.setFireTicks(250);
} }
} }

5
src/main/java/top/penowl/quidproquo/rituals/SnowmanRitual.java
View File

@ -12,8 +12,9 @@ public class SnowmanRitual extends Ritual {
@Override @Override
public void setup() { public void setup() {
addIngredient(Material.STICK, 64); addIngredient(Material.STICK, 64);
addIngredient(Material.DIAMOND, 2); addIngredient(Material.DIAMOND, 1);
addSacrifice(EntityType.SHEEP, 3); addSacrifice(EntityType.SHEEP, 1);
addIngredient(Material.WHEAT, 32);
health = 10; health = 10;
name = "snowing"; name = "snowing";
} }