From 8a4ba35cefed00f0680609edbb5361f22debbc2a Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Fri, 22 Nov 2019 11:35:04 +0000 Subject: [PATCH 1/3] add twisted league support add twisted league support for XP Drops --- .../client/plugins/experiencedrop/XpDropPlugin.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 aef6be3085..69353d9c81 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 @@ -69,6 +69,7 @@ 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; @Inject private Client client; @Inject @@ -352,12 +353,18 @@ public class XpDropPlugin extends Plugin private void calculateDamageDealt(int diff) { double damageDealt = diff / HITPOINT_RATIO; - // DeadMan mode has an XP modifier + + // DeadMan mode has an XP modifier of 10x if (client.getWorldType().contains(WorldType.DEADMAN)) { damageDealt = damageDealt / DMM_MULTIPLIER_RATIO; } - + // Twisted League mode has an XP modifier of 5x + if (client.getWorldType().contains(WorldType.LEAGUE)) + { + damageDealt = damageDealt / TL_MULTIPLIER_RATIO; + } + // Some NPCs have an XP modifier, account for it here. Actor a = client.getLocalPlayer().getInteracting(); if (!(a instanceof NPC) && !(a instanceof Player)) From ca84d9f78f6a42fc6ab9c0b53091f5d1a9419ab5 Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Fri, 22 Nov 2019 11:36:16 +0000 Subject: [PATCH 2/3] Update XpDropPlugin.java --- .../runelite/client/plugins/experiencedrop/XpDropPlugin.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 69353d9c81..56cb5f4c90 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 @@ -354,12 +354,11 @@ public class XpDropPlugin extends Plugin { double damageDealt = diff / HITPOINT_RATIO; - // DeadMan mode has an XP modifier of 10x + // DeadMan mode has an XP modifier of 10x, Twisted League mode has an XP modifier of 5x if (client.getWorldType().contains(WorldType.DEADMAN)) { damageDealt = damageDealt / DMM_MULTIPLIER_RATIO; } - // Twisted League mode has an XP modifier of 5x if (client.getWorldType().contains(WorldType.LEAGUE)) { damageDealt = damageDealt / TL_MULTIPLIER_RATIO; From ef6ca92a5c2ccb80391618fdb5d410e8bdd1b941 Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Fri, 22 Nov 2019 13:55:32 +0000 Subject: [PATCH 3/3] Update XpDropPlugin.java --- .../client/plugins/experiencedrop/XpDropPlugin.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 56cb5f4c90..df131187fd 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 @@ -70,6 +70,8 @@ public class XpDropPlugin extends Plugin 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; @Inject @@ -362,6 +364,15 @@ public class XpDropPlugin extends Plugin 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.