From 83eb0be61a50e8b45261a1b654a923db852fbdcd Mon Sep 17 00:00:00 2001 From: Dark98 Date: Sat, 11 Dec 2021 22:26:28 +0000 Subject: [PATCH] Use Either VARIABLE_SKILL_RATE OR XP_RATE Not Both TODO(Convert Player.xpRate Into An Array For Easier Rate Changes) --- 2006Scape Server/src/main/java/com/rs2/GameConstants.java | 2 +- .../main/java/com/rs2/game/players/PlayerAssistant.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/2006Scape Server/src/main/java/com/rs2/GameConstants.java b/2006Scape Server/src/main/java/com/rs2/GameConstants.java index fb0ba4a1..aec7243f 100644 --- a/2006Scape Server/src/main/java/com/rs2/GameConstants.java +++ b/2006Scape Server/src/main/java/com/rs2/GameConstants.java @@ -26,7 +26,7 @@ public class GameConstants { * ADMIN_DROP_ITEMS Defines Whether Admins Can Drop Items * ADMIN_CAN_SELL_ITEMS Defines Whether Admins Can Sell Items * VARIABLE_XP_RATE Allows Players To Choose An XP Rate(x1,x2,x5,x10) - * XP_RATE Sets The XP Rate Multiplier For All Players/Skills + * XP_RATE Sets The XP Rate Multiplier For All Players/Skills If VARIABLE_XP_RATES is false */ public static String SERVER_NAME = "2006Scape", WEBSITE_LINK = "https://2006Scape.org"; public static int WORLD = 1, MAX_PLAYERS = 200, TIMEOUT = 60, SAVE_TIMER = 120, diff --git a/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java index b3b5a80b..94497641 100644 --- a/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java +++ b/2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java @@ -2033,8 +2033,11 @@ public class PlayerAssistant { if (player.tutorialProgress < 36 && player.playerLevel[skill] == 3 && GameConstants.TUTORIAL_ISLAND) { return false; } - - amount *= GameConstants.XP_RATE * player.getXPRate(); + if (GameConstants.VARIABLE_XP_RATE){ + amount *= player.getXPRate(); + } else { + amount *= GameConstants.XP_RATE; + } int oldLevel = getLevelForXP(player.playerXP[skill]); player.playerXP[skill] += amount; if (oldLevel < getLevelForXP(player.playerXP[skill])) {