1x exp rate, ::debug command

2006-Scape · Jun 25, 2019 · 24c6058 · 24c6058
1 parent 248ee03
commit 24c6058
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/2006Redone Server/src/redone/Constants.java b/2006Redone Server/src/redone/Constants.java
@@ -154,9 +154,9 @@ public class Constants {
 	public final static boolean SINGLE_AND_MULTI_ZONES = true;
 	public final static boolean COMBAT_LEVEL_DIFFERENCE = true;
 	public final static boolean itemRequirements = true;
-	public final static int MELEE_EXP_RATE = 4; // damage * exp rate
-	public final static int RANGE_EXP_RATE = 4;
-	public final static int MAGIC_EXP_RATE = 4;
+	public final static int MELEE_EXP_RATE = 1; // damage * exp rate
+	public final static int RANGE_EXP_RATE = 1;
+	public final static int MAGIC_EXP_RATE = 1;
 	public final static int CASTLE_WARS_X = 2439;
 	public final static int CASTLE_WARS_Y = 3087;
 	public static double SERVER_EXP_BONUS = 5;

diff --git a/2006Redone Server/src/redone/game/players/Player.java b/2006Redone Server/src/redone/game/players/Player.java
@@ -42,7 +42,7 @@ public abstract class Player {
 			doorDelay, doubleDoorDelay, buySlayerTimer, lastIncrease,
 			boneDelay, botAttempts, leverDelay = 0, farmTime, searchObjectDelay = 0;
 
-    private Npc specialTarget = null;
+	private Npc specialTarget = null;
 	public void setSpecialTarget(Npc target) {
 			this.specialTarget = target;
 		}
@@ -81,7 +81,7 @@ public Npc getSpecialTarget() {
 			treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true,
 			stopPlayer = false, npcCanAttack = true, gliderOpen = false, hasSandwhichLady = false,
 			isHarvesting, openDuel = false,  killedJad = false, canHealersRespawn = true, playerIsBusy = false, miningRock,
-			randomToggle = false;
+			randomToggle = false, debugMode = false;
 
 	public int thankedForDonation, saveDelay, playerKilled, gertCat, restGhost,
 			romeojuliet, runeMist, vampSlayer, cookAss, doricQuest,

diff --git a/2006Redone Server/src/redone/game/players/PlayerSave.java b/2006Redone Server/src/redone/game/players/PlayerSave.java
@@ -132,6 +132,9 @@ public static int loadPlayerInfo(Client player, String playerName, String player
 							case "randomActions":
 								player.randomActions = Integer.parseInt(token2);
 								break;
+							case "debugMode":
+								player.debugMode = Boolean.parseBoolean(token2);
+								break;
 							case "skull-timer":
 								player.skullTimer = Integer.parseInt(token2);
 								break;
@@ -838,6 +841,10 @@ public static boolean saveGame(Client player) {
 			characterfile.write(Boolean.toString(player.ratdied2), 0, Boolean
 					.toString(player.ratdied2).length());
 			characterfile.newLine();
+			characterfile.write("debugMode = ", 0, 12);
+			characterfile.write(Boolean.toString(player.debugMode), 0, Boolean
+					.toString(player.debugMode).length());
+			characterfile.newLine();
 			characterfile.write("randomToggle = ", 0, 15);
 			characterfile.write(Boolean.toString(player.randomToggle), 0, Boolean
 					.toString(player.randomToggle).length());

diff --git a/2006Redone Server/src/redone/net/packets/impl/ClickObject.java b/2006Redone Server/src/redone/net/packets/impl/ClickObject.java
@@ -35,11 +35,12 @@ public void processPacket(final Client player, int packetType,
 			player.objectY = player.getInStream().readUnsignedWordA();
 			player.objectDistance = 1;
 			player.turnPlayerTo(player.objectX, player.objectY);
-			if (player.playerRights == 3) {
+			if (player.playerRights == 3 || player.debugMode) {
 				player.getActionSender().sendMessage("ObjectId: " + player.objectId + " ObjectX: " + player.objectX + " ObjectY: " + player.objectY + " Objectclick = 1, Xoff: " + (player.getX() - player.objectX) + " Yoff: " + (player.getY() - player.objectY));
 			}
 			if(player.goodDistance(player.getX(), player.getY(), player.objectX, player.objectY, 1)) {
 				if (Doors.getSingleton().handleDoor(player.objectId, player.objectX, player.objectY, player.heightLevel)) {
+					System.out.println("Door debug?");
 				}
 			}
 

diff --git a/2006Redone Server/src/redone/net/packets/impl/Commands.java b/2006Redone Server/src/redone/net/packets/impl/Commands.java
@@ -53,13 +53,14 @@ public static void playerCommands(Client player, String playerCommand) {
                         return;
                 }
 
+                String message = null;
                 switch (playerCommand)
                 {
                         case "close_interface":
                             player.getPlayerAssistant().closeAllWindows();
                             break;
                         case "commands":
-                            player.getActionSender().sendMessage("::players, ::highscores, ::loc, ::stuck, ::randomtoggle");
+                            player.getActionSender().sendMessage("::players, ::highscores, ::loc, ::stuck, ::randomtoggle, ::debug");
                             break;
                         case "loc":
                                 player.getActionSender().sendMessage(player.absX + "," + player.absY);
@@ -72,7 +73,13 @@ public static void playerCommands(Client player, String playerCommand) {
                                 break;
                         case "randomtoggle":
                                 player.randomToggle = !player.randomToggle;
-                                String message = player.randomToggle ? "You will now receive random events." : "You will no longer receieve random events.";
+                                message = player.randomToggle ? "You will now receive random events." : "You will no longer receieve random events.";
+                                player.getActionSender().sendMessage(message);
+                                break;
+                        case "debug":
+                        case "debugmode":
+                                player.debugMode = !player.debugMode;
+                                message = player.debugMode ? "You will now receieve additional debug information when doing things" : "You will no longer receive additional info when doing things";
                                 player.getActionSender().sendMessage(message);
                                 break;
                         case "highscores":