From 455c7b355ceff59a67133774142c82cfddf4e918 Mon Sep 17 00:00:00 2001
From: DebbySaurus <xx_debby@hotmail.com>
Date: Fri, 9 Sep 2022 11:24:46 +0000
Subject: [PATCH] Fixed beer keg effects, now authentically -40 attack and +10
 str bonus

---
 .../game/content/consumable/Consumables.java  |  1 +
 .../consumable/effects/KegOfBeerEffect.java   | 22 -------------------
 .../consumable/effects/KegOfBeerEffect.kt     | 18 +++++++++++++++
 3 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 Server/src/main/java/core/game/content/consumable/effects/KegOfBeerEffect.java
 create mode 100644 Server/src/main/kotlin/rs09/game/content/consumable/effects/KegOfBeerEffect.kt

diff --git a/Server/src/main/java/core/game/content/consumable/Consumables.java b/Server/src/main/java/core/game/content/consumable/Consumables.java
index 09742c546..3452379fb 100644
--- a/Server/src/main/java/core/game/content/consumable/Consumables.java
+++ b/Server/src/main/java/core/game/content/consumable/Consumables.java
@@ -6,6 +6,7 @@ import core.game.node.entity.state.EntityState;
 import core.game.world.update.flag.context.Animation;
 import core.game.content.consumable.effects.*;
 import core.game.node.entity.skill.Skills;
+import rs09.game.content.consumable.effects.KegOfBeerEffect;
 
 import java.util.HashMap;
 
diff --git a/Server/src/main/java/core/game/content/consumable/effects/KegOfBeerEffect.java b/Server/src/main/java/core/game/content/consumable/effects/KegOfBeerEffect.java
deleted file mode 100644
index 027f03c7b..000000000
--- a/Server/src/main/java/core/game/content/consumable/effects/KegOfBeerEffect.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package core.game.content.consumable.effects;
-
-import core.game.node.entity.player.Player;
-import core.game.content.consumable.ConsumableEffect;
-import core.game.node.entity.skill.Skills;
-
-public class KegOfBeerEffect extends ConsumableEffect {
-
-    private final static int healing = 15;
-
-    @Override
-    public void activate(Player p) {
-        final int attackLevelReduction = (p.getSkills().getLevel(Skills.ATTACK) * 65) / 99;
-        final MultiEffect effect = new MultiEffect(new HealingEffect(15), new RandomSkillEffect(Skills.STRENGTH, 2, 10), new SkillEffect(Skills.ATTACK, attackLevelReduction, 0));
-        effect.activate(p);
-    }
-
-    @Override
-    public int getHealthEffectValue(Player player) {
-        return healing;
-    }
-}
diff --git a/Server/src/main/kotlin/rs09/game/content/consumable/effects/KegOfBeerEffect.kt b/Server/src/main/kotlin/rs09/game/content/consumable/effects/KegOfBeerEffect.kt
new file mode 100644
index 000000000..dcb8a5e6a
--- /dev/null
+++ b/Server/src/main/kotlin/rs09/game/content/consumable/effects/KegOfBeerEffect.kt
@@ -0,0 +1,18 @@
+package rs09.game.content.consumable.effects
+
+import core.game.content.consumable.ConsumableEffect
+import core.game.content.consumable.effects.HealingEffect
+import core.game.content.consumable.effects.MultiEffect
+import core.game.content.consumable.effects.SkillEffect
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.Skills
+
+
+class KegOfBeerEffect : ConsumableEffect() {
+
+    override fun activate(p: Player?) {
+        val effect = MultiEffect(HealingEffect(15), SkillEffect(Skills.STRENGTH, 10.0, 0.0), SkillEffect(Skills.ATTACK, -40.0, 0.0))
+        effect.activate(p)
+    }
+
+}
\ No newline at end of file