xpdrops: add support for new dmm xp rates (open-osrs#251)

* xpdrop: support new dmm xp rates supports hits in XP drops for new DMM XP rates * Update XpDropPlugin.java
JacobSiau · May 20, 2020 · 1b9635c · 1b9635c
1 parent ead25fb
commit 1b9635c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/experiencedrop/experiencedrop.gradle.kts b/experiencedrop/experiencedrop.gradle.kts
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.4"
+version = "0.0.5"
 
 project.extra["PluginName"] = "XP Drop"
 project.extra["PluginDescription"] = "Enable customization of the way XP drops are displayed"
@@ -40,4 +40,4 @@ tasks {
             ))
         }
     }
-}
+}
diff --git a/experiencedrop/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/experiencedrop/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
@@ -41,6 +41,7 @@
 import static net.runelite.api.ScriptID.XPDROP_DISABLED;
 import net.runelite.api.Skill;
 import net.runelite.api.SpriteID;
+import net.runelite.api.VarClientInt;
 import net.runelite.api.Varbits;
 import net.runelite.api.WorldType;
 import net.runelite.api.events.FakeXpDrop;
@@ -75,7 +76,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 double DMM_MULTIPLIER_RATIO;
 
 	@Inject
 	private Client client;
@@ -395,6 +396,14 @@ private void calculateDamageDealt(int diff)
 		// DeadMan mode has an XP modifier of 10x
 		if (client.getWorldType().contains(WorldType.DEADMAN))
 		{
+			if (client.getVar(VarClientInt.DMM_SAFEZONE) == 0)
+			{
+				DMM_MULTIPLIER_RATIO = 15;
+			}
+			if (client.getVar(VarClientInt.DMM_SAFEZONE) == 1)
+			{
+				DMM_MULTIPLIER_RATIO = 10;
+			}
 			damageDealt = damageDealt / DMM_MULTIPLIER_RATIO;
 		}
 
@@ -441,4 +450,4 @@ public void onStatChanged(StatChanged statChanged)
 			hasDropped = true;
 		}
 	}
-}
+}