From d6769a6e64e97cf0fe69c1c3480759d6ec18dfda Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Thu, 16 Jan 2020 10:56:53 +0000 Subject: [PATCH 1/2] xpdrops: remove Twisted league xpdrops: remove Twisted league --- .../plugins/experiencedrop/XpDropPlugin.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index b381fcb49c..5ab1ff8124 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -74,9 +74,6 @@ public class XpDropPlugin extends Plugin private static final int XPDROP_PADDING = 2; // space between xp drop icons private static final double HITPOINT_RATIO = 1.33; // Base rate of hp xp per point damage private static final double DMM_MULTIPLIER_RATIO = 10; - private static final double TL_MULTIPLIER_RATIO = 5; - private static final int TWISTED_LEAGUE_WAY_OF_THE_WARRIOR = 3; - private static final int TWISTED_LEAGUE_XERICS_WISDOM = 3; @Inject private Client client; @@ -410,20 +407,7 @@ private void calculateDamageDealt(int diff) { damageDealt = damageDealt / DMM_MULTIPLIER_RATIO; } - if (client.getWorldType().contains(WorldType.LEAGUE)) - { - damageDealt = damageDealt / TL_MULTIPLIER_RATIO; - - if (client.getVar(Varbits.TWISTED_LEAGUE_RELIC_3) == TWISTED_LEAGUE_WAY_OF_THE_WARRIOR) - { - damageDealt = damageDealt / 2; - } - if (client.getVar(Varbits.TWISTED_LEAGUE_RELIC_5) == TWISTED_LEAGUE_XERICS_WISDOM) - { - damageDealt = damageDealt / 2; - } - } - + // Some NPCs have an XP modifier, account for it here. Actor a = client.getLocalPlayer().getInteracting(); if (!(a instanceof NPC) && !(a instanceof Player)) From fa623e56f812c1568485eba3bd5c54296e6ed030 Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Thu, 16 Jan 2020 10:57:43 +0000 Subject: [PATCH 2/2] Update XpDropPlugin.java --- .../runelite/client/plugins/experiencedrop/XpDropPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index 5ab1ff8124..5c552c7385 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -402,7 +402,7 @@ private void calculateDamageDealt(int diff) { double damageDealt = diff / HITPOINT_RATIO; - // DeadMan mode has an XP modifier of 10x, Twisted League mode has an XP modifier of 5x + // DeadMan mode has an XP modifier of 10x if (client.getWorldType().contains(WorldType.DEADMAN)) { damageDealt = damageDealt / DMM_MULTIPLIER_RATIO;