From 15a4b57643a6fb72c05ceae6df555e96bbadcffb Mon Sep 17 00:00:00 2001
From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:49:12 -0700
Subject: [PATCH] improve berserk stuff
---
src/main/java/net/serenas/shitmod/berserkEffect.java | 5 +++--
src/main/java/net/serenas/shitmod/berserkerTotem.java | 9 +++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/serenas/shitmod/berserkEffect.java b/src/main/java/net/serenas/shitmod/berserkEffect.java
index fb329a9..7110276 100644
--- a/src/main/java/net/serenas/shitmod/berserkEffect.java
+++ b/src/main/java/net/serenas/shitmod/berserkEffect.java
@@ -24,8 +24,9 @@ public class berserkEffect extends StatusEffect{
@Override
public void applyUpdateEffect(LivingEntity entity, int amplifier) {
if (entity instanceof PlayerEntity) {
- ((PlayerEntity) entity).damage(DamageSource.MAGIC, (0.25f));
- ((PlayerEntity) entity).addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 2, amplifier*2, true, false, false));
+ ((PlayerEntity) entity).damage(DamageSource.MAGIC, (0.5f));
+ ((PlayerEntity) entity).addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 2, amplifier*2, false, false, false));
+ ((PlayerEntity) entity).addStatusEffect(new StatusEffectInstance(StatusEffects.HASTE, 2, amplifier*2, false, false, false));
}
}
diff --git a/src/main/java/net/serenas/shitmod/berserkerTotem.java b/src/main/java/net/serenas/shitmod/berserkerTotem.java
index 0753527..1cc1e05 100644
--- a/src/main/java/net/serenas/shitmod/berserkerTotem.java
+++ b/src/main/java/net/serenas/shitmod/berserkerTotem.java
@@ -20,12 +20,17 @@ public class berserkerTotem extends Item{
@Override
public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity, Hand hand) {
int rand = new Random().nextInt(5);
+ int rand2 = new Random().nextInt(3);
+ ItemStack itemStack = playerEntity.getStackInHand(hand);
if (rand == 0) {
rand++;
- playerEntity.addStatusEffect(new StatusEffectInstance(Shitmod.BERSERK, 400, rand));
+ playerEntity.addStatusEffect(new StatusEffectInstance(Shitmod.BERSERK, 400*(rand2++), rand));
return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, playerEntity.getStackInHand(hand));
}
- playerEntity.addStatusEffect(new StatusEffectInstance(Shitmod.BERSERK, 400, rand));
+ playerEntity.addStatusEffect(new StatusEffectInstance(Shitmod.BERSERK, 400*(rand2++), rand));
+ if (!playerEntity.isCreative()){
+ itemStack.damage(1, playerEntity, (entity) -> entity.sendToolBreakStatus(hand));
+ }
return new TypedActionResult<ItemStack>(ActionResult.SUCCESS, playerEntity.getStackInHand(hand));