2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Fix Naming For Some Vars

Browse Source
This commit is contained in:
Dark98
2021-12-14 01:51:22 +00:00
parent 79357215c7
commit 24e5ad9415
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/ServerConfig.Sample.json
+2 -2
View File
@@ -4,9 +4,9 @@
"server_debug": false,
"file_server": true,
"world_id": 1,
"variable_xp_rates": false,
"xp_rate": 1.0,
"player_xp_rates": [1, 2, 5, 10],
"variable_xp_rate": false,
"variable_xp_rates": [1, 2, 5, 10],
"members_only": false,
"tutorial_island_enabled": false,
"party_room_enabled": true,
2006Scape Server/src/main/java/com/rs2/ConfigLoader.java
+6 -6
View File
@@ -50,16 +50,16 @@ public class ConfigLoader {
GameConstants.TIMEOUT = obj.getInt("timeout");
if(obj.has("item_requirements"))
GameConstants.ITEM_REQUIREMENTS = obj.getBoolean("item_requirements");
if(obj.has("variable_xp_rates"))
GameConstants.VARIABLE_XP_RATES = obj.getBoolean("variable_xp_rates");
if(obj.has("variable_xp_rate"))
GameConstants.VARIABLE_XP_RATE = obj.getBoolean("variable_xp_rate");
if(obj.has("xp_rate"))
GameConstants.XP_RATE = obj.getDouble("xp_rate");
if(obj.has("max_players"))
GameConstants.MAX_PLAYERS = obj.getInt("max_players");
if (obj.has("player_xp_rates")) {
JSONArray rates = obj.optJSONArray("player_xp_rates");
if (obj.has("variable_xp_rates")) {
JSONArray rates = obj.optJSONArray("variable_xp_rates");
for (int i = 0; i < rates.length(); ++i) {
GameConstants.PLAYER_XP_RATES[i] = rates.optInt(i);
GameConstants.VARIABLE_XP_RATES[i] = rates.optInt(i);
}
}
}
@@ -97,7 +97,7 @@ public class ConfigLoader {
JavaCord.token = obj.getString("bot-token");
if(obj.has("websitepass"))
PlayersOnlineWebsite.password = obj.getString("websitepass");
RegisteredAccsWebsite.password = obj.getString("websitepass");
RegisteredAccsWebsite.password = obj.getString("websitepass");
if(obj.has("erssecret"))
GameEngine.ersSecret = obj.getString("erssecret");
2006Scape Server/src/main/java/com/rs2/GameConstants.java
+4 -4
View File
@@ -18,7 +18,7 @@ public class GameConstants {
* FILE_SERVER Sets Whether The FileServer Should Run With The Server
* SERVER_DEBUG Sets Whether The Server Should Start In Debug Mode
* MEMBERS_ONLY Sets Whether The World Is Members Only
* TUTORIAL_ISLAND Sets Enables/Disables Tutorial Island For Players On First Login
* TUTORIAL_ISLAND Enables/Disables Tutorial Island For Players On First Login
* PARTY_ROOM_DISABLED Enables/Disables The Party Room Should Be Disabled
* CLUES_ENABLED Enables/Disables Clue Scrolls
* ITEM_REQUIREMENTS Enables/Disables Item Requirements for All Players
@@ -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_RATES Allows Players To Choose An XP Rate Set In PLAYER_XP_RATES
* PLAYER_XP_RATES Defines The XP Rates That Should Be Available To Players When VARIABLE_XP_RATES is true(Array Must Contain Four Entries)
* VARIABLE_XP_RATE Defines The XP Rates That Should Be Available To Players When VARIABLE_XP_RATES is true(Array Must Contain Four Entries)
* 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";
@@ -34,8 +34,8 @@ public class GameConstants {
RESPAWN_X = 3222, RESPAWN_Y = 3218;
public static boolean FILE_SERVER = true, SERVER_DEBUG = false, MEMBERS_ONLY = false, TUTORIAL_ISLAND = false,
PARTY_ROOM_DISABLED = false, CLUES_ENABLED = true, ITEM_REQUIREMENTS = true,
ADMIN_CAN_TRADE = false, ADMIN_DROP_ITEMS = false, ADMIN_CAN_SELL_ITEMS = false, VARIABLE_XP_RATES = true;
public static int[] PLAYER_XP_RATES = new int[] {1, 2, 5, 10};
ADMIN_CAN_TRADE = false, ADMIN_DROP_ITEMS = false, ADMIN_CAN_SELL_ITEMS = false, VARIABLE_XP_RATE = false;
public static int[] VARIABLE_XP_RATES = new int[] {1, 2, 5, 10};
public static double XP_RATE = 1.0;
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java
+5 -5
View File
@@ -6137,7 +6137,7 @@ public class DialogueHandler {
break;
case 3116:
if(GameConstants.VARIABLE_XP_RATES) {
if(GameConstants.VARIABLE_XP_RATE) {
player.getDialogueHandler().sendDialogues(10001, -1);
} else {
player.getPacketSender().showInterface(3559);
@@ -7603,7 +7603,7 @@ public class DialogueHandler {
player.nextChat = 10002;
break;
case 10002:
sendOption("x" + GameConstants.PLAYER_XP_RATES[0], "x" + GameConstants.PLAYER_XP_RATES[1], "x" + GameConstants.PLAYER_XP_RATES[2], "x" + GameConstants.PLAYER_XP_RATES[3]);
sendOption("x" + GameConstants.VARIABLE_XP_RATES[0], "x" + GameConstants.VARIABLE_XP_RATES[1], "x" + GameConstants.VARIABLE_XP_RATES[2], "x" + GameConstants.VARIABLE_XP_RATES[3]);
player.dialogueAction = 10002;
break;
case 10003:
@@ -7615,15 +7615,15 @@ public class DialogueHandler {
player.dialogueAction = 10004;
break;
case 10005:
sendOption("x" + GameConstants.PLAYER_XP_RATES[1], "x" + GameConstants.PLAYER_XP_RATES[2], "x" + GameConstants.PLAYER_XP_RATES[3]);
sendOption("x" + GameConstants.VARIABLE_XP_RATES[1], "x" + GameConstants.VARIABLE_XP_RATES[2], "x" + GameConstants.VARIABLE_XP_RATES[3]);
player.dialogueAction = 10005;
break;
case 10006:
sendOption("x" + GameConstants.PLAYER_XP_RATES[2], "x" + GameConstants.PLAYER_XP_RATES[3]);
sendOption("x" + GameConstants.VARIABLE_XP_RATES[2], "x" + GameConstants.VARIABLE_XP_RATES[3]);
player.dialogueAction = 10006;
break;
case 10007:
sendOption("x" + GameConstants.PLAYER_XP_RATES[3], "Don't Change");
sendOption("x" + GameConstants.VARIABLE_XP_RATES[3], "Don't Change");
player.dialogueAction = 10007;
break;
}
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java
+11 -11
View File
@@ -105,7 +105,7 @@ public class DialogueOptions {
BotHandler.playerShop(player);
return;
case 10005:
player.setXPRate(GameConstants.PLAYER_XP_RATES[1]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[1]);
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using");
player.getPacketSender().sendMessage("::xprate");
player.getPacketSender().closeAllWindows();
@@ -199,7 +199,7 @@ public class DialogueOptions {
BotHandler.closeShop(player);
return;
case 10005:
player.setXPRate(GameConstants.PLAYER_XP_RATES[2]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[2]);
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using");
player.getPacketSender().sendMessage("::xprate");
player.getPacketSender().closeAllWindows();
@@ -296,7 +296,7 @@ public class DialogueOptions {
BotHandler.takeCoins(player);
return;
case 10005:
player.setXPRate(GameConstants.PLAYER_XP_RATES[3]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[3]);
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate.");
player.getPacketSender().closeAllWindows();
return;
@@ -646,7 +646,7 @@ public class DialogueOptions {
player.canChangeAppearance = true;
player.closeTutorialInterface = true;
return;
} else if (player.getXPRate() != + GameConstants.PLAYER_XP_RATES[3]) {
} else if (player.getXPRate() != + GameConstants.VARIABLE_XP_RATES[3]) {
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using");
player.getPacketSender().sendMessage("::xprate");
return;
@@ -655,13 +655,13 @@ public class DialogueOptions {
return;
}
} else if(player.dialogueAction == 10006) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[2]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[2]);
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you can increase your rate in the future by using");
player.getPacketSender().sendMessage("::xprate");
player.getPacketSender().closeAllWindows();
return;
} else if(player.dialogueAction == 10007) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[3]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[3]);
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate.");
player.getPacketSender().closeAllWindows();
return;
@@ -895,7 +895,7 @@ public class DialogueOptions {
player.getDialogueHandler().sendDialogues(10002, 2244);
return;
} else if(player.dialogueAction == 10006) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[3]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[3]);
player.getPacketSender().sendMessage("Your XP rate is now set to x" + player.getXPRate() + " you now have the highest XP rate.");
player.getPacketSender().sendMessage("::xprate");
player.getPacketSender().closeAllWindows();
@@ -975,7 +975,7 @@ public class DialogueOptions {
player.getDialogueHandler().sendDialogues(3561, player.npcType);
}
if (player.dialogueAction == 10002) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[0]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[0]);
player.getDialogueHandler().sendDialogues(10003, player.npcType);
}
break;
@@ -1048,7 +1048,7 @@ public class DialogueOptions {
player.getDialogueHandler().sendDialogues(3562, player.npcType);
}
if (player.dialogueAction == 10002) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[1]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[1]);
player.getDialogueHandler().sendDialogues(10003, player.npcType);
}
break;
@@ -1124,7 +1124,7 @@ public class DialogueOptions {
player.getDialogueHandler().sendDialogues(3563, player.npcType);
}
if (player.dialogueAction == 10002) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[2]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[2]);
player.getDialogueHandler().sendDialogues(10003, player.npcType);
}
break;
@@ -1185,7 +1185,7 @@ public class DialogueOptions {
player.getDialogueHandler().sendDialogues(3564, player.npcType);
}
if (player.dialogueAction == 10002) {
player.setXPRate(GameConstants.PLAYER_XP_RATES[3]);
player.setXPRate(GameConstants.VARIABLE_XP_RATES[3]);
player.getDialogueHandler().sendDialogues(10003, player.npcType);
}
break;
2006Scape Server/src/main/java/com/rs2/game/players/PlayerAssistant.java
+1 -1
View File
@@ -2032,7 +2032,7 @@ public class PlayerAssistant {
if (player.tutorialProgress < 36 && player.playerLevel[skill] == 3 && GameConstants.TUTORIAL_ISLAND) {
return false;
}
if (GameConstants.VARIABLE_XP_RATES){
if (GameConstants.VARIABLE_XP_RATE){
amount *= player.getXPRate();
} else {
amount *= GameConstants.XP_RATE;
2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java
+8 -8
View File
@@ -46,22 +46,22 @@ public class Commands implements PacketType {
switch (playerCommand.toLowerCase()) {
case "myxprate":
case "checkxprate":
if(GameConstants.VARIABLE_XP_RATES) {
if(GameConstants.VARIABLE_XP_RATE) {
player.getPacketSender().sendMessage("Your current XP rate is x" + player.getXPRate());
break;
}
case "xprate":
if(GameConstants.VARIABLE_XP_RATES) {
if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[0]) {
if(GameConstants.VARIABLE_XP_RATE) {
if (player.getXPRate() == GameConstants.VARIABLE_XP_RATES[0]) {
player.getDialogueHandler().sendDialogues(10005, 2244);
return;
} else if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[1]) {
} else if (player.getXPRate() == GameConstants.VARIABLE_XP_RATES[1]) {
player.getDialogueHandler().sendDialogues(10006, 2244);
return;
} else if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[2]) {
} else if (player.getXPRate() == GameConstants.VARIABLE_XP_RATES[2]) {
player.getDialogueHandler().sendDialogues(10007, 2244);
return;
} else if (player.getXPRate() == GameConstants.PLAYER_XP_RATES[3]) {
} else if (player.getXPRate() == GameConstants.VARIABLE_XP_RATES[3]) {
player.getPacketSender().sendMessage("You already have the highest XP rate.");
return;
} else {
@@ -304,8 +304,8 @@ public class Commands implements PacketType {
"",
"::snow",
"Add some snow in your mainscreen(works only in december)",
(GameConstants.VARIABLE_XP_RATES ? "\\n" + "::xprate\\n" + "Opens dialogue for the player to set/increase their XP rate." : ""),
(GameConstants.VARIABLE_XP_RATES ? "\\n" + "::checkxprate(::myxprate)\\n" + "Displays the players currently set XP rate." : ""),
(GameConstants.VARIABLE_XP_RATE ? "\\n" + "::xprate\\n" + "Opens dialogue for the player to set/increase their XP rate." : ""),
(GameConstants.VARIABLE_XP_RATE ? "\\n" + "::checkxprate(::myxprate)\\n" + "Displays the players currently set XP rate." : ""),
};
// Clear all lines