Some fixes (#359)

- Added message of the week to welcome screen interface
- Added face north when clicking compass
- Disabled the blank tab on game frame
- Fixed all of the dialogue issues I could find in rune mysteries
- Fixed a few typos and did a very minor clean up in the dialogue file still a lot more planned soon
- Disabled resizable on the client seeing as it doesnt work correct currently anyways

2006Redone Client/src/ClientSettings.java

@@ -7,6 +7,7 @@ import java.math.BigInteger;
 
 public class ClientSettings {
 	
+	public static String SNOW_MONTH = ".12";
 	/**
 	 * The Servers Name
 	 */

2006Redone Client/src/Flo.java

@@ -21,6 +21,12 @@ public final class Flo {
 		}
 	}
 	
+	public static String getTodaysDate() {
+		Calendar date = new GregorianCalendar();
+		return date.get(Calendar.DAY_OF_MONTH) + "."+ (date.get(Calendar.MONTH) + 1) + "." + date.get(Calendar.YEAR);
+	}
+
+
 	private void readValues(Stream stream) {
 		do {
 			int i = stream.readUnsignedByte();

2006Redone Client/src/Game.java

@@ -29,8 +29,14 @@ import java.util.Date;
  */
 @SuppressWarnings("serial")
 public class Game extends RSApplet {
+	
 	private boolean graphicsEnabled = true;
 	
+	public static int random(final float range) {
+		return (int) (java.lang.Math.random() * (range + 1));
+	}
+    
+
 	public static String intToKOrMilLongName(int i) {
 		String s = String.valueOf(i);
 		for (int k = s.length() - 3; k > 0; k -= 3) {
@@ -522,9 +528,9 @@ public class Game extends RSApplet {
 		}
 	}
 
-	public void processMenuClick() {
+	public boolean processMenuClick() {
 		if (activeInterfaceType != 0) {
-			return;
+			return false;
 		}
 		int j = super.clickMode3;
 		if (spellSelected == 1 && super.saveClickX >= 516 && super.saveClickY >= 160 && super.saveClickX <= 765 && super.saveClickY <= 205) {
@@ -614,7 +620,7 @@ public class Game extends RSApplet {
 						if (RSInterface.interfaceCache[j2].parentID == backDialogID) {
 							activeInterfaceType = 3;
 						}
-						return;
+						return true;
 					}
 				}
 			}
@@ -628,6 +634,7 @@ public class Game extends RSApplet {
 				determineMenuSize();
 			}
 		}
+		return false;
 	}
 
 	public void saveMidi(boolean flag, byte abyte0[]) {
@@ -3049,8 +3056,7 @@ public class Game extends RSApplet {
 			inputTaken = true;
 			super.clickMode3 = 0;
 		}
-		processMenuClick();
+		if (!processMenuClick()) {
-		if (fullScreenBackDialogID == -1) {
 			processMainScreenClick();
 			processTabClick();
 			processChatModeClick();
@@ -3453,6 +3459,10 @@ public class Game extends RSApplet {
 		if (l >= 2000) {
 			l -= 2000;
 		}
+		if (l == 696) {
+			minimapInt1 = 0;
+            anInt1184 = 120;
+        }
 		if (l == 582) {
 			NPC npc = npcArray[i1];
 			if (npc != null) {
@@ -4763,7 +4773,7 @@ public class Game extends RSApplet {
 					inputDialogState = 0;
 					inputTaken = true;
 				}
-			} else if (backDialogID == -1 && fullScreenBackDialogID == -1) {
+			} else {
 				if (j >= 32 && j <= 122 && inputString.length() < 80) {
 					inputString += (char) j;
 					inputTaken = true;
@@ -5346,6 +5356,16 @@ public class Game extends RSApplet {
 		chatMessages[0] = s;
 	}
 	
+	public void processMinimapActions() {
+        int x = super.mouseX;
+        int y = super.mouseY;
+        if (x >= 551 && x <= 577 && y >= 7 && y <= 40) {
+            menuActionName[1] = "Face North";
+            menuActionID[1] = 696;
+            menuActionRow = 2;
+        }
+	}
+
 	public void processTabClick() {
 		if (super.clickMode3 == 1) {
 			if (super.saveClickX >= 539 && super.saveClickX <= 573 && super.saveClickY >= 169 && super.saveClickY < 205 && tabInterfaceIDs[0] != -1) {
@@ -5383,11 +5403,11 @@ public class Game extends RSApplet {
 				tabID = 6;
 				tabAreaAltered = true;
 			}
-			if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) {
+			/*if (super.saveClickX >= 540 && super.saveClickX <= 574 && super.saveClickY >= 466 && super.saveClickY < 502 && tabInterfaceIDs[7] != -1) {
 				needDrawTabArea = true;
 				tabID = 7;
 				tabAreaAltered = true;
-			}
+			}*/
 			if (super.saveClickX >= 572 && super.saveClickX <= 602 && super.saveClickY >= 466 && super.saveClickY < 503 && tabInterfaceIDs[8] != -1) {
 				needDrawTabArea = true;
 				tabID = 8;
@@ -5541,9 +5561,9 @@ public class Game extends RSApplet {
 		menuActionName[0] = "Cancel";
 		menuActionID[0] = 1107;
 		menuActionRow = 1;
-		if(fullScreenBackDialogID != -1) {
+		 if (fullScreenInterfaceId != -1) {
 			anInt886 = 0;
-			buildInterfaceMenu(0, RSInterface.interfaceCache[fullScreenBackDialogID], super.mouseX, 0, super.mouseY, 0);
+			buildInterfaceMenu(0, RSInterface.interfaceCache[fullScreenInterfaceId], super.mouseX, 0, super.mouseY, 0);
 			if (anInt886 != anInt1026) {
 				anInt1026 = anInt886;
 			}
@@ -5587,6 +5607,7 @@ public class Game extends RSApplet {
 			inputTaken = true;
 			anInt1039 = anInt886;
 		}
+		processMinimapActions();
 		boolean flag = false;
 		while (!flag) {
 			flag = true;
@@ -5763,7 +5784,6 @@ public class Game extends RSApplet {
 				backDialogID = -1;
 				openInterfaceID = -1;
 				invOverlayInterfaceID = -1;
-				fullScreenBackDialogID = -1;
 				fullScreenInterfaceId = -1;
 				anInt1018 = -1;
 				aBoolean1149 = false;
@@ -7466,9 +7486,9 @@ public class Game extends RSApplet {
 	}
 
 	public void drawGameScreen() {
-		if (fullScreenBackDialogID != -1 && (loadingStage == 2 || super.fullGameScreen != null)) {
+		if (fullScreenInterfaceId != -1 && (loadingStage == 2 || super.fullGameScreen != null)) {
 			if (loadingStage == 2) {
-				method119(anInt945, fullScreenBackDialogID);
+				method119(anInt945, fullScreenInterfaceId);
 				if (fullScreenInterfaceId != -1)
 					method119(anInt945, fullScreenInterfaceId);
 				anInt945 = 0;
@@ -7477,15 +7497,8 @@ public class Game extends RSApplet {
 				Texture.lineOffsets = gameScreenOffsets;
 				DrawingArea.setAllPixelsToZero();
 				welcomeScreenRaised = true;
-				RSInterface rSInterface = RSInterface.interfaceCache[fullScreenBackDialogID];
+				if (openInterfaceID != -1) {
-				if (rSInterface.width == 512 && rSInterface.height == 334
+					RSInterface class13_1 = RSInterface.interfaceCache[openInterfaceID];
-						&& rSInterface.type == 0) {
-					rSInterface.width = 765;
-					rSInterface.height = 503;
-				}
-				drawInterface(0, 0, rSInterface, 0);
-				if (fullScreenInterfaceId != -1) {
-					RSInterface class13_1 = RSInterface.interfaceCache[fullScreenInterfaceId];
 					if (class13_1.width == 512 && class13_1.height == 334
 							&& class13_1.type == 0) {
 						class13_1.width = 765;
@@ -7493,6 +7506,13 @@ public class Game extends RSApplet {
 					}
 					drawInterface(0, 0, class13_1, 0);
 				}
+				RSInterface rSInterface = RSInterface.interfaceCache[fullScreenInterfaceId];
+				if (rSInterface.width == 512 && rSInterface.height == 334
+						&& rSInterface.type == 0) {
+					rSInterface.width = 765;
+					rSInterface.height = 503;
+				}
+				drawInterface(0, 0, rSInterface, 0);
 				if (!menuOpen) {
 					processRightClick();
 					drawTooltip();
@@ -8468,10 +8488,12 @@ public class Game extends RSApplet {
 		if (anInt1055 == 1) {
 			multiOverlay.drawSprite(472, 296);
 		}
+		int k = 20;
+		int i1 = 0xffff00;
+		int x = baseX + (myPlayer.x - 6 >> 7);
+	    int y = baseY + (myPlayer.y - 6 >> 7);
 		if (fpsOn) {
 			char c = '\u01FB';
-			int k = 20;
-			int i1 = 0xffff00;
 			if (super.fps < 15) {
 				i1 = 0xff0000;
 			}
@@ -8486,6 +8508,20 @@ public class Game extends RSApplet {
 			aTextDrawingArea_1271.method380("Mem:" + j1 + "k", c, 0xffff00, k);
 			k += 15;
 		}
+	 if (showInfo) {
+            if (super.fps < 15)
+                i1 = 0xff0000;
+            aTextDrawingArea_1271.method385(0xffff00, "Fps:" + super.fps, 285, 5);
+            Runtime runtime = Runtime.getRuntime();
+            int j1 = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L);
+            i1 = 0xffff00;
+            if (j1 > 0x2000000 && lowMem)
+                i1 = 0xff0000;
+            k += 15;
+            aTextDrawingArea_1271.method385(0xffff00, "Mem:" + j1 + "k", 299, 5);
+            aTextDrawingArea_1271.method385(0xffff00, "Mouse X: " + super.mouseX + " , Mouse Y: " + super.mouseY, 314, 5);
+            aTextDrawingArea_1271.method385(0xffff00, "Coords: " + x + ", " + y, 329, 5);
+        }
 		if (anInt1104 != 0) {
 			int j = anInt1104 / 50;
 			int l = j / 60;
@@ -10867,10 +10903,6 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11002,10 +11034,6 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11067,9 +11095,6 @@ public class Game extends RSApplet {
 				if (backDialogID != -1) {
 					backDialogID = -1;
 				}
-				if (fullScreenBackDialogID != k15) {
-					fullScreenBackDialogID = k15;
-				}
 				if (fullScreenInterfaceId != k15) {
 					fullScreenInterfaceId = k9;
 				}
@@ -11201,61 +11226,31 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
-				if (fullScreenInterfaceId != -1) {
-					fullScreenInterfaceId = -1;
-				}
-				/*if (openInterfaceID != l7) {
-					openInterfaceID = l7;
-				}*/
 				if (inputDialogState != 0) {
 					inputDialogState = 0;
 					inputTaken = true;
 				}
-				/*
+				// 17511 = Question Type
-        		 * 15244 = main Interface ID
+				// 15819 = Christmas Type
-        		 * 17511 = Question Type
+				// 15812 = Security Type
-        		 * 15819 = Christmas Type
+				// 15801 = Item Scam Type
-        		 * 15812 = Security Type
+				// 15791 = Password Safety ?
-        		 * 15801 = Item Scam Type
+				// 15774 = Good/Bad Password
-        		 * 15791 = Password Safety
+				// 15767 = Drama Type ????
-        		 * 15774 = Good/Bad Password
+				int[] welcome = {17511, 15812, 15801, 15791, 15774, 15767};
-        		 * 15767 = Drama Type
-        		 */
-				
 				if (l7 == 15244) {
-					openInterfaceID = 15812;//secondary/bottom part
+					if (Flo.getTodaysDate().contains(ClientSettings.SNOW_MONTH)) {
-            		fullScreenBackDialogID = 15244;
+						openInterfaceID = welcome[random(5)];
-				/*} else if (l7 == 17511) {
+					} else {
-        			openInterfaceID = 17511;
+						openInterfaceID = welcome[random(5)];
-            		fullScreenBackDialogID = 15244;
+					}
-        		} else if (l7 == 15819) {
+					fullScreenInterfaceId = 15244;
-        			openInterfaceID = 15819;
+				} else {
-            		fullScreenBackDialogID = 15244;
+					openInterfaceID = l7;
-        		} else if (l7 == 15812) {
+				}
-        			openInterfaceID = 15812;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15801) {
-        			openInterfaceID = 15801;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15791) {
-        			openInterfaceID = 15791;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15774) {
-        			openInterfaceID = 15774;
-            		fullScreenBackDialogID = 15244;
-        		} else if (l7 == 15767) {
-        			openInterfaceID = 15767;
-            		fullScreenBackDialogID = 15244;*/
-        		} else {
-        			openInterfaceID = l7;
-        		}
 				aBoolean1149 = false;
 				pktType = -1;
-				return true;
+                return true;
 			}
 			if (pktType == 218) {
 				int i8 = inStream.method438();
@@ -11321,10 +11316,6 @@ public class Game extends RSApplet {
 					backDialogID = -1;
 					inputTaken = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11378,10 +11369,6 @@ public class Game extends RSApplet {
 					needDrawTabArea = true;
 					tabAreaAltered = true;
 				}
-				if (fullScreenBackDialogID != -1) {
-					fullScreenBackDialogID = -1;
-					welcomeScreenRaised = true;
-				}
 				if (fullScreenInterfaceId != -1) {
 					fullScreenInterfaceId = -1;
 				}
@@ -11514,10 +11501,6 @@ public class Game extends RSApplet {
 			inputTaken = true;
 			aBoolean1149 = false;
 		}
-		if (fullScreenBackDialogID != -1) {
-			fullScreenBackDialogID = -1;
-			welcomeScreenRaised = true;
-		}
 		if (fullScreenInterfaceId != -1) {
 			fullScreenInterfaceId = -1;
 		}
@@ -11721,7 +11704,6 @@ public class Game extends RSApplet {
 	public static int anInt854;
 	public int anInt855;
 	public int openInterfaceID;
-	public int fullScreenBackDialogID = -1;
 	public int fullScreenInterfaceId = -1;
 	public int xCameraPos;
 	public int zCameraPos;

2006Redone Client/src/RSFrame.java

@@ -10,7 +10,7 @@ final class RSFrame extends Frame {
 	public RSFrame(RSApplet RSApplet_, int i, int j) {
 		rsApplet = RSApplet_;
 		setTitle(ClientSettings.SERVER_NAME);
-		setResizable(true);
+		setResizable(false);
 		setMinimumSize(new Dimension(i + 8, j + 28));
 		setVisible(true);
 		toFront();

2006Redone Server/src/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java

@@ -112,7 +112,6 @@ public class CookingTutorialIsland extends SkillHandler {
 						c.getPacketSender().chatbox(6180);
 						c.getDialogueHandler()
 								.chatboxText(
-										c,
 										"You have just burned your first shrimp. This is normal. As you",
 										"get more experience in Cooking, you will burn stuff less often.",
 										"Let's try cooking without burning it this time. First catch some",
@@ -126,7 +125,6 @@ public class CookingTutorialIsland extends SkillHandler {
 						c.getPacketSender().chatbox(6180);
 						c.getDialogueHandler()
 								.chatboxText(
-										c,
 										"If you'd like a recap on anything you've learnt so far, speak to",
 										"the Survival Expert. You can now move on to the next",
 										"instructor. Click on the gate shown and follow the path.",

2006Redone Server/src/com/rebotted/game/content/skills/core/Fishing.java

@@ -110,7 +110,6 @@ public class Fishing extends SkillHandler {
 					c.getPacketSender().chatbox(6180);
 					c.getDialogueHandler()
 							.chatboxText(
-									c,
 									"This should only take a few seconds.",
 									"As you gain Fishing experience you'll find that there are many",
 									"types of fish and many ways to catch them.",

2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java

@@ -189,7 +189,7 @@ public class Mining {
 		// Tutorial only stuff
 		if (player.tutorialProgress == 17 || player.tutorialProgress == 18) {
 			player.getPacketSender().chatbox(6180);
-			player.getDialogueHandler().chatboxText(player, "", "Your character is now attempting to mine the rock.", "This should only take a few seconds.", "", "Please wait");
+			player.getDialogueHandler().chatboxText("", "Your character is now attempting to mine the rock.", "This should only take a few seconds.", "", "Please wait");
 			player.getPacketSender().chatbox(6179);
 		} else {
 			player.getPacketSender().sendMessage("You swing your pick at the rock.");
@@ -217,7 +217,7 @@ public class Mining {
 					}
 					if (player.getItemAssistant().playerHasItem(438)) {
 						player.getPacketSender().createArrow(3086, 9501, player.getH(), 2);
-						player.getDialogueHandler().chatboxText(player, "Now you have some tin ore you must need some copper ore, then", "you'll have all you need to create a bronze bar. As you did before", "riger click on the copper rock and select 'mine'.", "", "Mining");
+						player.getDialogueHandler().chatboxText("Now you have some tin ore you must need some copper ore, then", "you'll have all you need to create a bronze bar. As you did before", "riger click on the copper rock and select 'mine'.", "", "Mining");
 						player.tutorialProgress = 18;
 					}
 				} else if (player.tutorialProgress == 18) {
@@ -295,7 +295,6 @@ public class Mining {
 			player.getPacketSender().chatbox(6180);
 			player.getDialogueHandler()
 			.chatboxText(
-					player,
 					"Please wait.",
 					"Your character is now attempting to prospect the rock. This should",
 					"only take a few seconds.", "", "");
@@ -310,7 +309,6 @@ public class Mining {
 						player.getPacketSender().chatbox(6180);
 						player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"",
 								"So now you know there's tin in the grey rocks. Try prospecting",
 								"the brown ones next.", "",
@@ -328,7 +326,6 @@ public class Mining {
 						player.getPacketSender().chatbox(6180);
 						player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"Talk to the Mining Instructor to find out about these types of",
 								"ore and how you can mine them. He'll even give you the",
 								"required tools.", "",

2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java

@@ -280,9 +280,9 @@ public class Woodcutting {
 				p.getPacketSender().closeAllWindows();
 				p.getPacketSender().chatbox(6180);
 				if (p.playerAppearance[0] == 0) {
-					p.getDialogueHandler().chatboxText(p, "", "Your character is now attempting to cut down the tree. Sit back", "for a moment while he does all the hard work.", "", "Please wait");
+					p.getDialogueHandler().chatboxText("", "Your character is now attempting to cut down the tree. Sit back", "for a moment while he does all the hard work.", "", "Please wait");
 				} else {
-					p.getDialogueHandler().chatboxText(p, "", "Your character is now attempting to cut down the tree. Sit back", "for a moment while she does all the hard work.", "", "Please wait");
+					p.getDialogueHandler().chatboxText("", "Your character is now attempting to cut down the tree. Sit back", "for a moment while she does all the hard work.", "", "Please wait");
 				}
 				p.getPacketSender().chatbox(6179);
 			} else {

2006Redone Server/src/com/rebotted/game/content/skills/firemaking/Firemaking.java

@@ -67,7 +67,7 @@ public class Firemaking {
 					}
 					if (c.tutorialProgress == 4) {
 						c.getPacketSender().chatbox(6180);
-						c.getDialogueHandler().chatboxText(c, "", "Your character is now attempting to light the fire.", "This should only take a few seconds.", "", "Please wait");
+						c.getDialogueHandler().chatboxText("", "Your character is now attempting to light the fire.", "This should only take a few seconds.", "", "Please wait");
 						c.getPacketSender().chatbox(6179);
 					}
 					if (groundObject == false) {

2006Redone Server/src/com/rebotted/game/content/skills/smithing/SmithingInterface.java

@@ -18,7 +18,7 @@ public class SmithingInterface {
 		}
 		if (itemId == 2349 && c.tutorialProgress == 20) {
 			c.getPacketSender().chatbox(6180);
-			c.getDialogueHandler().chatboxText(c, "Now you have the Smithing menu open, you will see a list of all", "the things you can make. Only the dagger can be made at your", "skill level, this is shown by the white text under it. You'll need", "to select the dagger to continue.", "Smithing a dagger");
+			c.getDialogueHandler().chatboxText("Now you have the Smithing menu open, you will see a list of all", "the things you can make. Only the dagger can be made at your", "skill level, this is shown by the white text under it. You'll need", "to select the dagger to continue.", "Smithing a dagger");
 			c.getPacketSender().chatbox(6179);
 			makeBronzeInterface(c);
 			c.isSmithing = true;

2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java

@@ -900,15 +900,15 @@ public class DialogueHandler {
 				break;
 			case 195:
 				sendNpcChat2(
-						"It seems to be mystical and I have never seen anything like it before.",
+						"It seems to be mystical and I have never seen anything like it",
-						"Would you take it to the head wizard at",
+						"before. Would you take it to the head wizard at-",
 						player.talkingNpc, "Duke Horacio");
 				player.nextChat = 196;
 				break;
 			case 196:
 				sendNpcChat3(
-						"the Wizards Tower for me?",
+						"the Wizards Tower for me? It's just south-west",
-						"It's just south-west of here and should not take you very long at all.",
+						"of here and should not take you very long at all.",
 						"I would be awfully grateful.", player.talkingNpc,
 						"Duke Horacio");
 				player.nextChat = 197;
@@ -923,8 +923,8 @@ public class DialogueHandler {
 				break;
 			case 199:
 				sendNpcChat2(
-						"Thank you very much, stranger.",
+						"Thank you very much, stranger. I'm sure the ",
-						"I'm sure the head wizard will reward you for such an interesting find.",
+						"head wizard will reward you for such an interesting find.",
 						player.talkingNpc, "Duke Horacio");
 				player.nextChat = 200;
 				break;
@@ -938,8 +938,8 @@ public class DialogueHandler {
 				break;
 			case 201:
 				sendNpcChat2(
-						"Welcome adventurer, to the world renowed Wizards Tower",
+						"Welcome adventurer, to the world renowed",
-						"How may I help you?", player.talkingNpc, "Sedridor");
+						"Wizards Tower. How may I help you?", player.talkingNpc, "Sedridor");
 				player.nextChat = 202;
 				break;
 			case 202:
@@ -965,9 +965,9 @@ public class DialogueHandler {
 				break;
 			case 207:
 				sendPlayerChat3(
-						"The Duke of Lumbridge sent me to find him. Most of these",
+						"The Duke of Lumbridge sent me to find him.",
-						"I have this weird talisman he found.",
+						"I have this weird talisman he found. He said",
-						"He said the head wizard would be very interested in it.");
+						"the head wizard would be very interested in it.");
 				player.nextChat = 208;
 				break;
 			case 208:
@@ -1000,8 +1000,8 @@ public class DialogueHandler {
 				break;
 			case 214:
 				sendNpcChat4("Th-this talisman you brought me...! ",
-						"It is the last piece of the puzzle, I think! Finally!",
+						"It is the last piece of the puzzle, I think!",
-						"The legacy of our ancestors.",
+						"Finally! The legacy of our ancestors.",
 						"It will return to us once more!", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 215;
@@ -1009,22 +1009,23 @@ public class DialogueHandler {
 			case 215:
 				sendNpcChat3(
 						"I need time to study this, " + Misc.capitalize(player.playerName) + ".",
-						"Can you please do me this task while I study this talisman you have brought me?",
+						"Can you please do me this task while I study this talisman",
-						"In the mighty town of Varrock, which", player.talkingNpc,
+						"you have brought me? In the mighty town of Varrock, which", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 216;
 				break;
 			case 216:
-				sendNpcChat2(
+				sendNpcChat3(
-						"is located North East of here, there is a certain shop that sells magical runes.",
+						"is located North East of here, there is a certain shop",
-						"I have in this package all of the research I have done relating to the Rune Stones, and",
+						"that sells magical runes.I have in this package all of the research",
+						"I have done relating to the Rune Stones, and",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 217;
 				break;
 			case 217:
 				sendNpcChat3(
-						"require sombody to take them to the shopkeeper so that he may share my research",
+						"require somebody to take them to the shopkeeper so",
-						"and offer me his insights.",
+						"that he may share my research and offer me his insights.",
 						"Do this thing for me, and bring back what he gives you,",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 218;
@@ -1032,8 +1033,8 @@ public class DialogueHandler {
 			case 218:
 				sendNpcChat3(
 						"and if my suspicions are correct,",
-						"I will let you into the knowledge of one of the greatest secrets this world has ever known!",
+						"I will let you into the knowledge of one of the greatest secrets",
-						"A secret so powerful that it destroyed the",
+						"this world has ever known! A secret so powerful that it destroyed the",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 219;
 				break;
@@ -1070,15 +1071,16 @@ public class DialogueHandler {
 			case 225:
 				sendNpcChat3(
 						"Once in Varrock, take this package to the owner of the rune shop.",
-						"His name is Aubury.",
+						"His name is Aubury. You may find it ",
-						"You may find it helpful to ask one of Varrock's citizens for directions,",
+						"helpful to ask one of Varrock's citizens for directions,",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 226;
 				break;
 			case 226:
-				sendNpcChat3(
+				sendNpcChat4(
-						"as Varrock can be a confusing place for the first time visitor.",
+						"as Varrock can be a confusing place for the first time",
-						"He will give you a special item - bring it back to me,",
+						"visitor. He will give you a special item - bring it",
+						"back to me,",
 						"and I shall show you the mystery of the runes...",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 227;
@@ -1110,14 +1112,15 @@ public class DialogueHandler {
 				player.nextChat = 0;
 				break;
 			case 232: // 9169
-				sendPlayerChat1("I have been sent here with a package for you. It's for the head wizard at the Wizards Tower.");
+				sendPlayerChat2("I have been sent here with a package for you.",
+						"It's for the head wizard at the Wizards Tower.");
 				player.nextChat = 233;
 				break;
 			case 233:
 				sendNpcChat3(
 						"Really? But... surely he can't have..?",
-						"Please, let me have it,",
+						"Please, let me have it, it must be ",
-						"it must be extremely important for him to have sent a stranger.",
+						"extremely important for him to have sent a stranger.",
 						player.talkingNpc, "Aubury");
 				player.nextChat = 234;
 				break;
@@ -1128,9 +1131,10 @@ public class DialogueHandler {
 				player.nextChat = 235;
 				break;
 			case 235:
-				sendNpcChat2(
+				sendNpcChat3(
 						"This... this is incredible. Please,",
-						"give me a few moments to quickly look over this, and then talk to me again.",
+						"give me a few moments to quickly look over this,",
+						"and then talk to me again.",
 						player.talkingNpc, "Aubury");
 				player.nextChat = 236;
 				break;
@@ -1140,25 +1144,28 @@ public class DialogueHandler {
 				player.nextChat = 237;
 				break;
 			case 237:
-				sendNpcChat1(
+				sendNpcChat2(
-						"Thank you, now you should head back to Sedridor and tell him your discoveries.",
+						"Thank you, now you should head back to Sedridor",
+						"and tell him your discoveries.",
 						player.talkingNpc, "Aubury");
 				player.nextChat = 0;
 				break;
 			case 238:
 				sendNpcChat2(
-						"Welcome, adventure to the world-renowed Wizards Tower.",
+						"Welcome, adventure to the world-renowed",
-						"How may i help you?", player.talkingNpc, "Sedridor");
+						"Wizards Tower. How may i help you?", player.talkingNpc, "Sedridor");
 				player.nextChat = 239;
 				break;
 			case 239:
-				sendNpcChat2("Ah, " + Misc.capitalize(player.playerName) + ". How goes your quest?",
+				sendNpcChat3("Ah, " + Misc.capitalize(player.playerName) + ".",
-						"Have you delivered the research notes to my friend yet?",
+						"How goes your quest? Have you delivered the research",
+						"notes to my friend yet?",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 240;
 				break;
 			case 240:
-				sendPlayerChat1("Yes, I have. He gave me some research notes to pass on to you.");
+				sendPlayerChat2("Yes, I have.",
+						"He gave me some research notes to pass on to you.");
 				player.nextChat = 241;
 				break;
 			case 241:
@@ -1177,62 +1184,67 @@ public class DialogueHandler {
 				player.nextChat = 245;
 				break;
 			case 245:
-				sendNpcChat2(
+				sendNpcChat3(
-						"Many centuries ago, the wizards of the Wizards Tower learnt the secret of creating runes,",
+						"Many centuries ago, the wizards of the Wizards Tower",
+						"learnt the secret of creating runes,",
 						"which allowed them to cast magic very easily.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 247;
 				break;
 			case 247:
 				sendNpcChat3(
-						"But, when this tower was burnt down, the secret of creating runes was lost with it...",
+						"But, when this tower was burnt down, the secret of creating",
-						"or so I thought.",
+						"runes was lost with it... or so I thought. Some",
-						"Some months ago, while searching these ruins for information, ",
+						"months ago, while searching these ruins for information, ",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 248;
 				break;
 			case 248:
 				sendNpcChat2(
-						"I came upon a scroll that made refrence to a magical rock",
+						"I came upon a scroll that made refrence to a magical",
-						"deep in the ice fields of the north.", player.talkingNpc,
+						"rock deep in the ice fields of the north.", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 249;
 				break;
 			case 249:
-				sendNpcChat3(
+				sendNpcChat4(
-						"This rock was called the rune essence by those magicians who studied it's powers.",
+						"This rock was called the rune essence by",
-						"Apparently, by simply breaking a chunk for it,",
+						"those magicians who studied it's powers. Apparently, by simply",
-						"a rune could be fashioned and taken to certain",
+						"breaking a chunk for it, a rune could be fashioned",
+						"and taken to certain magical altars",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 250;
 				break;
 			case 250:
-				sendNpcChat3(
+				sendNpcChat4(
-						"magical altars that were scattered across the land.",
+						"that were scattered across the land.",
 						"Now, this is an intersting little peice of history,",
-						"not much use to us since we do not have access to this rune essence",
+						"not much use to us since we do not have access to",
+						"this rune essence",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 251;
 				break;
 			case 251:
-				sendNpcChat2(
+				sendNpcChat3(
-						"teleportations spell that he had never come across before, When cast,",
+						"teleportations spell that he had never come across before,",
-						"it took him to a strange rock, yet it felt strangly familiar.",
+						"When cast, it took him to a strange rock, yet it",
+						"felt strangly familiar.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 252;
 				break;
 			case 252:
 				sendNpcChat3(
-						"As I'm sure you have guessed, he had discovered a spell to the mythical rune essence.",
+						"As I'm sure you have guessed, he had discovered a spell",
-						"As soon as he told me of this,",
+						"to the mythical rune essence. As soon as he told me of",
-						"I saw the importance of the find.", player.talkingNpc,
+						"this. I saw the importance of the find.", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 253;
 				break;
 			case 253:
-				sendNpcChat2(
+				sendNpcChat3(
-						"For, if we could find the altars spoken of in the ancient texts",
+						"For, if we could find the altars spoken of in the ancient",
-						"we would once more be able to create runes as our ancestors had done!",
+						"texts, we would once more be able to create runes as",
+						"our ancestors had done!",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 254; 
 				break;
@@ -1243,8 +1255,8 @@ public class DialogueHandler {
 			case 255:
 				sendNpcChat3(
 						"You haven't guessed?",
-						"This talisman you brough me is the key to the elemental altar of air!",
+						"This talisman you brough me is the key to the elemental altar",
-						"When you hold it, it directs you to", player.talkingNpc,
+						"of air! When you hold it, it directs you to", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 256;
 				break;
@@ -1258,69 +1270,75 @@ public class DialogueHandler {
 			case 257:
 				sendNpcChat3(
 						"That's not all!",
-						"By finding other talismans similar to his one,",
+						"By finding other talismans similar to his one, ou will eventually",
-						"you will eventually be able to craft every rune that is available in this world, jus",
+						"be able to craft every rune that is available in this world, just",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 258;
 				break;
 			case 258:
 				sendNpcChat3(
 						"as our ancestors did.",
-						"I cannot stress enough what find this is!",
+						"I cannot stress enough what find this is! ow, due to the risks",
-						"Now, due to the risks invovled in letting this mighty power fall into the wrong hands.",
+						"involved in letting this mighty power fall into the wrong hands.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 259;
 				break;
 			case 259:
-				sendNpcChat3(
+				sendNpcChat4(
-						"I will keep the teleport spell to the rune essence a closely guarded secret.",
+						"I will keep the teleport spell to the rune essence a closely",
-						"This means that, if any evil power should discover the talismans required to enter the emental temples,",
+						"guarded secret. This means that, if any evil power should discover",
-						"we will be able to prevent their", player.talkingNpc,
+						"the talismans required to enter the emental temples, we will be",
+						"able to prevent their", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 260;
 				break;
 			case 260:
 				sendNpcChat3(
-						"access to the rune essence.",
+						"access to the rune essence.I know not where the altars",
-						"I know not where the altars are located, not do I know where the talismans have been scattered,",
+						"are located, not do I know where the talismans have been scattered,",
 						"but now return your air talisman.", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 261;
 				break;
 			case 261:
-				sendNpcChat1(
+				sendNpcChat2(
-						"Find the Air Altar and you will be able to craft you blank runes into air runes at will.",
+						"Find the Air Altar and you will be able to craft",
+						"blank runes into air runes at will.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 262;
 				break;
 			case 262:
-				sendNpcChat2(
+				sendNpcChat3(
 						"Any time you wish to visit the rune essence,",
-						"speak to me or Aubury and we will open a portal to that mystical place.",
+						"speak to me or Aubury and we will open a portal",
+						"to that mystical place.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 264;
 				break;
 			case 264:
-				sendPlayerChat1("So, only you and Aubury know the teleport spell to the rune essence?");
+				sendPlayerChat2("So, only you and Aubury know the teleport spell",
+						"to the rune essence?");
 				player.nextChat = 266;
 				break;
 			case 266:
-				sendNpcChat2(
+				sendNpcChat3(
 						"No, there are others. When you speak to them,",
-						"they will know you and grant you access to that place when asked.",
+						"they will know you and grant you access to that place",
+						"when asked.",
 						player.talkingNpc, "Sedridor");
 				player.nextChat = 267;
 				break;
 			case 267:
-				sendNpcChat2(
+				sendNpcChat3(
-						"Use the air talisman to locate the Air Altar and use any further talismans you find to locate the other altars.",
+						"Use the air talisman to locate the Air Altar and use",
+						"any further talismans you find to locate the other altars.",
 						"Now, my research notes please?", player.talkingNpc,
 						"Sedridor");
 				player.nextChat = 268;
 				break;
 			case 268:
 				itemMessage1(
-						"You give the research notes to Sedrdior. He gives you an air talisman.",
+						"You give the research notes to Sedridor. He gives you an air talisman.",
 						290, 1);
 				player.getItemAssistant().deleteItem(290, 1);
 				player.runeMist = 4;
@@ -3754,7 +3772,7 @@ public class DialogueHandler {
 				player.nextChat = 740;
 				break;
 			case 740:
-				sendItemChat1(player, "", "Straven hands you a key", 759, 150);
+				sendItemChat1("", "Straven hands you a key", 759, 150);
 				player.getItemAssistant().addOrDropItem(759, 1);
 				player.shieldArrav = 6;
 				player.nextChat = 0;
@@ -3775,7 +3793,7 @@ public class DialogueHandler {
 				sendStatement("It's empty.");
 				break;
 			case 744:
-				sendItemChat1(player, "", "You find half of a shield, which you take.", 763, 150);
+				sendItemChat1("", "You find half of a shield, which you take.", 763, 150);
 				player.getItemAssistant().addOrDropItem(763, 1);
 				player.nextChat = 0;
 				break;
@@ -3808,9 +3826,9 @@ public class DialogueHandler {
 				break;
 			case 750:
 				if (player.getItemAssistant().playerHasItem(763))
-					sendItemChat1(player, "", "The curator peers at the shield", 763, 150);
+					sendItemChat1("", "The curator peers at the shield", 763, 150);
 				else if (player.getItemAssistant().playerHasItem(765))
-					sendItemChat1(player, "", "The curator peers at the shield", 765, 150);
+					sendItemChat1("", "The curator peers at the shield", 765, 150);
 				player.nextChat = 751;
 				break;
 			case 751:
@@ -3830,16 +3848,16 @@ public class DialogueHandler {
 				break;
 			case 754:
 				if (player.getItemAssistant().playerHasItem(763)) {
-					sendItemChat1(player, "", "You hand over the shield half.", 763, 150);
+					sendItemChat1("", "You hand over the shield half.", 763, 150);
 					player.getItemAssistant().deleteItem(763, 1);
 				} else if (player.getItemAssistant().playerHasItem(765)) {
-					sendItemChat1(player, "", "You hand over the shield half.", 765, 150);
+					sendItemChat1("", "You hand over the shield half.", 765, 150);
 					player.getItemAssistant().deleteItem(765, 1);
 				}
 				player.nextChat = 755;
 				break;
 			case 755:
-				sendItemChat1(player, "", "The curator writes out a certificate.", 769, 150);
+				sendItemChat1("", "The curator writes out a certificate.", 769, 150);
 				player.getItemAssistant().addOrDropItem(769, 1);
 				player.shieldArrav = 7;
 				player.nextChat = 0;
@@ -3854,7 +3872,7 @@ public class DialogueHandler {
 				player.nextChat = 758;
 				break;
 			case 758:
-				sendItemChat1(player, "", "You show the certificate to the king.", 769, 150);
+				sendItemChat1("", "You show the certificate to the king.", 769, 150);
 				player.nextChat = 759;
 				break;
 			case 759:
@@ -3870,7 +3888,7 @@ public class DialogueHandler {
 				player.nextChat = 761;
 				break;
 			case 761:
-				sendItemChat1(player, "", "You hand over the certificate, The king gives you 1,200gp.", 995, 150);
+				sendItemChat1("", "You hand over the certificate, The king gives you 1,200gp.", 995, 150);
 				player.nextChat = 762;
 				break;
 			case 762:
@@ -4998,7 +5016,7 @@ public class DialogueHandler {
 				// progress bar + tutorial int
 				player.getPacketSender().createArrow(1, 1);
 				chatboxText(
-						player,
+						
 						"To start the tutorial use your left mouse button to click on the",
 						"" + GameConstants.SERVER_NAME
 								+ " in this room. He is indicated by a flashing",
@@ -5068,7 +5086,7 @@ public class DialogueHandler {
 			case 3007: // Player controls
 				player.getPacketSender().closeAllWindows();
 				chatboxText(
-						player,
+						
 						"Please click on the flashing wrench icon found at the bottom",
 						"right of your screen. This will display your player controls.",
 						"", "", "Player controls");
@@ -5092,7 +5110,7 @@ public class DialogueHandler {
 				player.getPacketSender().chatbox(6180);
 				player.getPacketSender().closeAllWindows();
 				chatboxText(
-						player,
+						
 						"You can interact with many items of scenery by simply clicking",
 						"on them. Right clicking will also give more options. Feel free to",
 						"try it with the things in this room, then click on the door",
@@ -5107,7 +5125,7 @@ public class DialogueHandler {
 			case 3011: // door handling
 				player.getPacketSender().closeAllWindows();
 				chatboxText(
-						player,
+						
 						"Follow the path to find the next instructor. Clicking on the",
 						"ground will walk you to that point. Talk to the Survival Expert by",
 						"the pond to the continue the tutorial. Remember you can rotate",
@@ -5132,14 +5150,14 @@ public class DialogueHandler {
 				break;
 
 			case 3013: // giving bronze and tinder
-				sendItemChat2(player, "",
+				sendItemChat2("",
 						"The Survival Guide gives you a @blu@tinderbox @bla@and a",
 						"@blu@bronze axe!", 590, 150);
 				player.getItemAssistant().addOrDropItem(590, 1);
 				player.getItemAssistant().addOrDropItem(1351, 1);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"Click on the flashing backpack icons to the right hand side of",
 						"the main window to view your inventory. Your inventory is a list",
 						"of everything you have on your backpack.", "",
@@ -5151,14 +5169,14 @@ public class DialogueHandler {
 				player.tutorialProgress = 3;
 				break;
 			case 3014: // finished cutting tree
-				sendItemChat1(player, "", "You got some logs", 1511, 150);
+				sendItemChat1("", "You got some logs", 1511, 150);
 				PlayerAssistant.removeHintIcon(player);
 				player.nextChat = 3015;
 				break;
 			case 3015: // firemaking time
 				player.getPacketSender().closeAllWindows();
 				chatboxText(
-						player,
+						
 						"Well done! You managed to cut some logs from the tree! Next,",
 						"use the tinderbox in your inventory to light the logs.",
 						"First click on the tinderbox to use it.",
@@ -5172,7 +5190,7 @@ public class DialogueHandler {
 			case 3016: // firemaking done skill tab flashing now.
 				// client.getPacketSender().closeAllWindows();
 				chatboxText(
-						player,
+						
 						"Click on the flashing bar graph icon near the inventory button",
 						"to see your skill stats.", "", "",
 						"You gained some experience.");
@@ -5195,12 +5213,12 @@ public class DialogueHandler {
 				break;
 
 			case 3018:
-				sendItemChat1(player, "",
+				sendItemChat1("",
 						"The Survival Guide gives you a @blu@net!", 303, 150);
 				player.getItemAssistant().addOrDropItem(303, 1);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"Click on the sparkling fishing spot indicated by the flashing",
 						"arrow. Remember, you can check your inventory by clicking the",
 						"backpack icon.", "", "Catch some Shrimp");
@@ -5212,7 +5230,7 @@ public class DialogueHandler {
 			case 3019: // Cooking the shrimp
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Now you have caught some shrimp let's cook it. First light a",
 						"fire, chop down a tree and then use the tinderbox on the logs.",
 						"If you've lost your axe or tinderbox, Brynna will give you",
@@ -5229,7 +5247,7 @@ public class DialogueHandler {
 				// // 15 percent
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Talk to the chef indicated. He will teach you the more advanced",
 						"aspects of Cooking such as combining ingredients. He will also",
 						"teach you about your music player menu as well.", "",
@@ -5268,7 +5286,7 @@ public class DialogueHandler {
 
 			case 3025: // he gives u bucket of water etc TTUOTRIAL PROG 8
 				sendItemChat2(
-						player,
+						
 						"",
 						"The Cooking Guide gives you a @blu@bucket of water@bla@ and a",
 						"@blu@pot of flour!", 1933, 150);
@@ -5276,7 +5294,7 @@ public class DialogueHandler {
 				player.getItemAssistant().addOrDropItem(1929, 1);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"This is the base for many of the meals. To make dough we must",
 						"mix flour and water. First right click the bucket of water and",
 						"select use, then left click on the pot of flour.", "",
@@ -5288,7 +5306,7 @@ public class DialogueHandler {
 			case 3026: // cooking dough
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Now you have made dough, you can cook it. To cook the dough",
 						"use it with the range shown by the arrow. If you lose your",
 						"dough, talk to Leo - he will give you more ingredients.",
@@ -5303,7 +5321,7 @@ public class DialogueHandler {
 			case 3037: // new tutorial prog
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Well done! Your first loaf of bread. As you gain experience in",
 						"Cooking you will be able to make other things like pies, cakes",
 						"and even kebabs. Now you've got the hang of cooking, let's",
@@ -5322,7 +5340,7 @@ public class DialogueHandler {
 			case 3038: // Emotes
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"",
 						"Now, how about showing some feelings? You will see a flashing",
 						"icon in the shape of a person. Click on that to access your",
@@ -5339,7 +5357,7 @@ public class DialogueHandler {
 			case 3039: // running
 				player.tutorialProgress = 11;
 				player.getPacketSender().chatbox(6180);
-				chatboxText(player,
+				chatboxText(
 						"It's only a short distance to the next guide.",
 						"Why not try running there? Start by opening the player",
 						"settings, that's the flashing icon of a wrench.", "",
@@ -5353,7 +5371,7 @@ public class DialogueHandler {
 			case 3040:
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"In this menu you will see many options. At the bottom in the",
 						"middle is a button with the symbol of a running shoe. You can",
 						"turn this button on or off to select run or walk. Give it a go,",
@@ -5364,7 +5382,7 @@ public class DialogueHandler {
 			case 3041: // clicked on run
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Now that you have the run button turned on, follow the path",
 						"until you come to the end. You may notice that the numbers on",
 						"the button goes down. This is your run energy. If your run",
@@ -5386,7 +5404,7 @@ public class DialogueHandler {
 				// guide
 				// client.getPacketDispatcher().tutorialIslandInterface(35, 8);//30 or 35 percent
 				player.getPacketSender().chatbox(6180);
-				chatboxText(player, "Talk with the Quest Guide.", "",
+				chatboxText("Talk with the Quest Guide.", "",
 						"He will tell you all about quests.", "", "");
 				player.getPacketSender().chatbox(6179);
 				player.tutorialProgress = 12;
@@ -5405,7 +5423,7 @@ public class DialogueHandler {
 			case 3044: // Send quest tab
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
-				chatboxText(player, "Open the Quest Journal.", "",
+				chatboxText("Open the Quest Journal.", "",
 						"Click on the flashing icon next to your inventory.", "",
 						"");
 				player.getPacketSender().chatbox(6179);
@@ -5464,7 +5482,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"",
 						"It's time to enter some caves. Click on the ladder to go down to",
 						"the next area.", "", "Moving on");
@@ -5483,7 +5501,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Next let's get you a weapon or more to the point, you can",
 						"make your first weapon yourself. Don't panic, the Mining",
 						"Instructor will help you. Talk to him and he'll tell you all about it.",
@@ -5520,7 +5538,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"To prospect a mineable rock, just right click it and select the",
 						"'prospect rock' option. This will tell you the type of ore you can",
 						"mine from it. Try it now on one of the rocks indicated.",
@@ -5557,12 +5575,12 @@ public class DialogueHandler {
 				player.nextChat = 3060;
 				break;
 			case 3060:
-				sendItemChat1(player, "",
+				sendItemChat1("",
 						"Dezzick gives you a @blu@bronze pickaxe!", 1265, 300);
 				player.getItemAssistant().addOrDropItem(1265, 1);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"It's quite simple really. All you need to do is right click on the",
 						"rock and select 'mine'. You can only mine when you have a",
 						"pickaxe. So give a try: first mine one tin ore.", "",
@@ -5579,7 +5597,7 @@ public class DialogueHandler {
 				player.tutorialProgress = 19;
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"You should now have both some copper and tin ore. So let's",
 						"smelt them to make a bronze bar. To do this, right click on",
 						"either tin or copper ore and select use, then left click on the",
@@ -5589,7 +5607,7 @@ public class DialogueHandler {
 				player.tutorialProgress = 20;
 				player.nextChat = 0;
 				player.getPacketSender().chatbox(6180);
-				chatboxText(player, "", "Speak to the Mining Instructor and he'll show you how to make", "it into a weapon.", "", "You've made a bronze bar!");
+				chatboxText("", "Speak to the Mining Instructor and he'll show you how to make", "it into a weapon.", "", "You've made a bronze bar!");
 				player.getPacketSender().chatbox(6179);
 				player.getPacketSender().createArrow(1, 5);
 				break;
@@ -5607,10 +5625,10 @@ public class DialogueHandler {
 				break;
 
 			case 3065: // giving you the hammer
-				sendItemChat1(player, "", "Dezzick gives you a @blu@hammer!", 2347, 300);
+				sendItemChat1("", "Dezzick gives you a @blu@hammer!", 2347, 300);
 				player.getItemAssistant().addOrDropItem(2347, 1);
 				player.nextChat = 0;
-				chatboxText(player, "To smith you'll need a hammer - like the one you were given by", "Dezzick - access to an anvil like the one with the arrow over it", "and enough metal bars to make what you are trying to smith.", "", "Smithing a dagger");
+				chatboxText("To smith you'll need a hammer - like the one you were given by", "Dezzick - access to an anvil like the one with the arrow over it", "and enough metal bars to make what you are trying to smith.", "", "Smithing a dagger");
 				player.getPacketSender().createArrow(3082, 9499, player.getH(), 2); // send
 				// hint
 				// to
@@ -5618,7 +5636,7 @@ public class DialogueHandler {
 				break;
 
 			case 3066:
-				chatboxText(player, "So let's move on. Go through the gates shown by the arrow.", "Remember you may need to move the camera to see your,", "surroundings. Speak to the guide for a recap at any time.", "", "You've finished in this area");
+				chatboxText("So let's move on. Go through the gates shown by the arrow.", "Remember you may need to move the camera to see your,", "surroundings. Speak to the guide for a recap at any time.", "", "You've finished in this area");
 				player.tutorialProgress = 21;
 				player.getPacketSender().createArrow(3094, 9503, player.getH(), 2); // send
 				// hint
@@ -5660,7 +5678,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"",
 						"You now have access to a new interface. Click on the flashing",
 						"icon of a man the one to the right of your backpack icon.",
@@ -5681,7 +5699,7 @@ public class DialogueHandler {
 
 			case 3073:
 				sendItemChat2(
-						player,
+						
 						"",// Gives me sword and shield
 						"The Combat Guide gives you a @blu@bronze sword@bla@ and a",
 						"@blu@wooden shield!", 1171, 300);
@@ -5689,7 +5707,7 @@ public class DialogueHandler {
 				player.getItemAssistant().addOrDropItem(1277, 1);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"In your worn inventory panel, right click on the dagger and",
 						"select the remove option from the drop down list. After you've",
 						"unequipped the dagger, wield the sword and shield. As you",
@@ -5725,7 +5743,7 @@ public class DialogueHandler {
 
 			case 3077: // gives me bow and arrow
 				sendItemChat2(
-						player,
+						
 						"",
 						"The Combat Guide gives you some @blu@bronze arrows@bla@ and",
 						"a @blu@shortbow!", 841, 300);
@@ -5733,7 +5751,7 @@ public class DialogueHandler {
 				player.getItemAssistant().addOrDropItem(882, 50);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"Now you have a bow and some arrows. Before you can use",
 						"them you'll need to equip them. Remember: to attack, right",
 						"click on the monster and select attack.", "",
@@ -5751,7 +5769,7 @@ public class DialogueHandler {
 			case 3078: // fresh
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"Follow the path and you will come to the front of the building.",
 						"This is the Bank of " + GameConstants.SERVER_NAME
 								+ ", where you can store all your",
@@ -5834,7 +5852,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.tutorialProgress = 28;
 				player.getPacketSender().chatbox(6180);
-				chatboxText(player, "", "Continue through the next door.", "", "",
+				chatboxText("", "Continue through the next door.", "", "",
 						"");
 				player.getPacketSender().chatbox(6179);
 				player.getPacketSender().createArrow(3129, 3124, player.getH(),
@@ -5865,7 +5883,7 @@ public class DialogueHandler {
 			case 3091:
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
-				chatboxText(player, "",
+				chatboxText("",
 						"Click on the flashing icon to open the Prayer menu.", "",
 						"", "Your Prayer menu");
 				player.getPacketSender().chatbox(6179);
@@ -5910,7 +5928,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"You should now see another new icon. Click on the flashing",
 						"icon to open your friends list.", "", "", "Friends list");
 				player.getPacketSender().chatbox(6179);
@@ -5976,7 +5994,7 @@ public class DialogueHandler {
 				sendPlayerChat1("Okay thanks. I'll bear that in mind.");
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"You're almost finished on tutorial island. Pass through the",
 						"door to find the path leading to your final instructor.",
 						"", "", "Your final instructor!");
@@ -6009,7 +6027,7 @@ public class DialogueHandler {
 				player.getPacketSender().closeAllWindows();
 				player.getPacketSender().chatbox(6180);
 				chatboxText(
-						player,
+						
 						"",
 						"Open up the Magic menu by clicking on the flashing icon next",
 						"to the Prayer button you just learned about.", "",
@@ -6031,7 +6049,7 @@ public class DialogueHandler {
 
 			case 3109:
 				sendItemChat1(
-						player,
+						
 						"",
 						"Terrova gives you five @blu@air runes@bla@ and @blu@five mind runes!",
 						556, 300);
@@ -6039,7 +6057,7 @@ public class DialogueHandler {
 				player.getItemAssistant().addOrDropItem(556, 5);
 				player.nextChat = 0;
 				chatboxText(
-						player,
+						
 						"Now you have runes you should see the Wind Strike icon at the",
 						"top left corner of the Magic interface - second in from the",
 						"left. Walk over to the caged chickens, click the Wind Strike icon",
@@ -6933,7 +6951,7 @@ public class DialogueHandler {
 
 	}
 
-	public void chatboxText(Player c, String text, String text1, String text2,
+	public void chatboxText(String text, String text1, String text2,
 			String text3, String title) {
 		player.getPacketSender().sendFrame126(title, 6180);
 		player.getPacketSender().sendFrame126(text, 6181);
@@ -7173,7 +7191,7 @@ public class DialogueHandler {
 	 * 4151, 5698}, new int { 150, 150}); Displays two items with a select one
 	 * option.
 	 */
-	public void displayTwoItemsOption(Player c, String[] s, int items[],
+	public void displayTwoItemsOption(String[] s, int items[],
 			int[] zoom) {
 		player.getPacketSender().sendFrame126(s[0], 144);
 		player.getPacketSender().sendFrame126(s[1], 145);
@@ -7185,7 +7203,7 @@ public class DialogueHandler {
 	/**
 	 * Displays single line text
 	 */
-	public void displaySingleLine(Player c, String s) {
+	public void displaySingleLine(String s) {
 		player.getPacketSender().sendFrame126(s, 357);
 		player.getPacketSender().sendChatInterface(356);
 	}
@@ -7193,7 +7211,7 @@ public class DialogueHandler {
 	/**
 	 * Displays two lined text
 	 */
-	public void displayTwoLined(Player c, String[] s) {
+	public void displayTwoLined(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 360);
 		player.getPacketSender().sendFrame126(s[1], 361);
 		player.getPacketSender().sendChatInterface(359);
@@ -7202,7 +7220,7 @@ public class DialogueHandler {
 	/**
 	 * Displays Three lined text
 	 */
-	public void displayThreeLined(Player c, String[] s) {
+	public void displayThreeLined(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 364);
 		player.getPacketSender().sendFrame126(s[1], 365);
 		player.getPacketSender().sendFrame126(s[2], 366);
@@ -7212,7 +7230,7 @@ public class DialogueHandler {
 	/**
 	 * Displays Four lined text
 	 */
-	public void displayFourLined(Player c, String[] s) {
+	public void displayFourLined(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 369);
 		player.getPacketSender().sendFrame126(s[1], 370);
 		player.getPacketSender().sendFrame126(s[2], 371);
@@ -7223,7 +7241,7 @@ public class DialogueHandler {
 	/**
 	 * Select Option 2
 	 */
-	public void displaySelectOption2(Player c, String[] s) {
+	public void displaySelectOption2(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 2461);
 		player.getPacketSender().sendFrame126(s[1], 2462);
 		player.getPacketSender().sendChatInterface(2459);
@@ -7232,7 +7250,7 @@ public class DialogueHandler {
 	/**
 	 * Select Option 3
 	 */
-	public void displaySelectOption3(Player c, String[] s) {
+	public void displaySelectOption3(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 2471);
 		player.getPacketSender().sendFrame126(s[1], 2472);
 		player.getPacketSender().sendFrame126(s[2], 2473);
@@ -7242,7 +7260,7 @@ public class DialogueHandler {
 	/**
 	 * Select Option 4
 	 */
-	public void displaySelectOption4(Player c, String[] s) {
+	public void displaySelectOption4(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 2482);
 		player.getPacketSender().sendFrame126(s[1], 2483);
 		player.getPacketSender().sendFrame126(s[2], 2484);
@@ -7253,7 +7271,7 @@ public class DialogueHandler {
 	/**
 	 * Select Option 5
 	 */
-	public void displaySelectOption5(Player c, String[] s) {
+	public void displaySelectOption5(String[] s) {
 		player.getPacketSender().sendFrame126(s[0], 2494);
 		player.getPacketSender().sendFrame126(s[1], 2495);
 		player.getPacketSender().sendFrame126(s[2], 2496);
@@ -7262,15 +7280,15 @@ public class DialogueHandler {
 		player.getPacketSender().sendChatInterface(2492);
 	}
 
-	public void itemMessage(Player c, String message1, int itemid, int size) {
+	public void itemMessage(String message1, int itemid, int size) {
 		player.getPacketSender().sendDialogueAnimation(307, 591);
 		player.getPacketSender().sendFrame126(message1, 308);
 		player.getPacketSender().sendFrame246(307, size, itemid);
 		player.getPacketSender().sendChatInterface(306);
-		c.nextChat = 0;
+		player.nextChat = 0;
 	}
 
-	public void sendItemChat1(Player c, String header, String one, int item,
+	public void sendItemChat1(String header, String one, int item,
 			int zoom) {
 		player.getPacketSender().sendFrame246(4883, zoom, item);
 		player.getPacketSender().sendFrame126(header, 4884);
@@ -7278,7 +7296,7 @@ public class DialogueHandler {
 		player.getPacketSender().sendChatInterface(4882);
 	}
 
-	public void sendItemChat2(Player player, String header, String one, String two,
+	public void sendItemChat2(String header, String one, String two,
 			int item, int zoom) {
 		player.getPacketSender().sendFrame246(4888, zoom, item);
 		player.getPacketSender().sendFrame126(header, 4889);
@@ -7287,7 +7305,7 @@ public class DialogueHandler {
 		player.getPacketSender().sendChatInterface(4887);
 	}
 
-	public void sendItemChat3(Player c, String header, String one, String two,
+	public void sendItemChat3(String header, String one, String two,
 			String three, int item, int zoom) {
 		player.getPacketSender().sendFrame246(4894, zoom, item);
 		player.getPacketSender().sendFrame126(header, 4895);
@@ -7297,7 +7315,7 @@ public class DialogueHandler {
 		player.getPacketSender().sendChatInterface(4893);
 	}
 
-	public void sendItemChat4(Player c, String header, String one, String two,
+	public void sendItemChat4(String header, String one, String two,
 			String three, String four, int item, int zoom) {
 		player.getPacketSender().sendFrame246(4901, zoom, item);
 		player.getPacketSender().sendFrame126(header, 4902);

2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java

@@ -1300,7 +1300,7 @@ public class ItemAssistant {
 		if (c.tutorialProgress == 22) {
 			c.getPacketSender().chatbox(6180);
 			c.getDialogueHandler()
-					.chatboxText(c,
+					.chatboxText(
 							"Clothes, armour, weapons and many other items are equipped",
 							"like this. You can unequip items by clicking on the item in the",
 							"worn inventory. You can close this window by clicking on the",
@@ -1314,7 +1314,6 @@ public class ItemAssistant {
 			c.getPacketSender().chatbox(6180);
 			c.getDialogueHandler()
 					.chatboxText(
-							c,
 							"",
 							"Click on the flashing crossed swords icon to see the combat",
 							"interface.", "", "Combat interface");

2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java

@@ -285,7 +285,6 @@ public class NpcActions {
 				c.nextChat = 0;
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"In your worn inventory panel, right click on the dagger and",
 								"select the remove option from the drop down list. After you've",
 								"unequipped the dagger, wield the sword and shield. As you",

2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java

@@ -775,7 +775,6 @@ public class NpcHandler {
 			c.getPacketSender().chatbox(6180);
 			c.getDialogueHandler()
 					.chatboxText(
-							c,
 							"",
 							"Pass through the gate and talk to the Combat Instructor, he",
 							"will give you your next task.", "",
@@ -794,7 +793,6 @@ public class NpcHandler {
 			c.getPacketSender().chatbox(6180);
 			c.getDialogueHandler()
 					.chatboxText(
-							c,
 							"You have completed the tasks here. To move on, click on the",
 							"ladder shown. If you need to go over any of what you learnt",
 							"here, just talk to the Combat Instructor and he'll tell you what",

2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java

@@ -970,7 +970,6 @@ public class ObjectsActions {
 				player.getPacketSender().chatbox(6180);
 				player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"Follow the path to the chapel and enter it.",
 								"Once inside talk to the monk. He'll tell you all about the skill.",
 								"", "", "Prayer");
@@ -1006,7 +1005,6 @@ public class ObjectsActions {
 				player.getPacketSender().chatbox(6180);
 				player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"The guide here will tell you all about making cash. Just click on",
 								"him to hear what he's got to say.", "", "",
 								"Financial advice");
@@ -1025,7 +1023,6 @@ public class ObjectsActions {
 				player.getPacketSender().chatbox(6180);
 				player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"You can store stuff here for safekeeping. If you die anything",
 								"in your bank will be saved. To deposit something, rich click it",
 								"and select 'store'. Once you've had a good look, close the",
@@ -1129,7 +1126,6 @@ public class ObjectsActions {
 				player.getPacketSender().chatbox(6180);
 				player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"In this area you will find out about combat with swords and",
 								"bows. Speak to the guide and he will tell you all about it.",
 								"", "", "Combat");
@@ -1181,7 +1177,6 @@ public class ObjectsActions {
 				player.getPacketSender().chatbox(6180);
 				player.getDialogueHandler()
 						.chatboxText(
-								player,
 								"",
 								"To attack the rat, right click it and select the attack option. you",
 								"will then walk over to it and start hitting it.",

2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java

@@ -62,8 +62,7 @@ public class SpecialObjects {
 
 	public static void initKharid(Player player, int objectId) {
 		if (!player.getItemAssistant().playerHasItem(995, 10)) {
-			player.getDialogueHandler().itemMessage(player,
+			player.getDialogueHandler().itemMessage("You need 10 coins to pass through this gate.", 995, 200);
-					"You need 10 coins to pass through this gate.", 995, 200);
 			player.nextChat = 0;
 			return;
 		}

2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java

@@ -40,7 +40,6 @@ public class ClickNPC implements PacketType {
 				client.getPacketSender().chatbox(6180);
 				client.getDialogueHandler()
 						.chatboxText(
-								client,
 								"While you are fighting you will see a bar over your head. The",
 								"bar shows how much health you have left. Your opponent will",
 								"have one too. You will continue to attack the rat until it's dead",
@@ -168,7 +167,6 @@ public class ClickNPC implements PacketType {
 				client.getPacketSender().chatbox(6180);
 				client.getDialogueHandler()
 						.chatboxText(
-								client,
 								"",
 								"All you need to do is move on to the mainland. Just speak",
 								"with Terrova and he'll teleport you to Lumbridge Castle.",

2006Redone Server/src/com/rebotted/net/packets/impl/ClickTab.java

@@ -14,7 +14,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"On the side panel you can now see a variety of options from",
 								"changing your graphic settings and audio and music volume",
 								"to selecting whether your player should accept help from",
@@ -26,7 +25,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"You can click on the backpack icon at any time to view the",
 								"items that you currently have in your inventory. You will see",
 								"that you now have an axe in your inventory. Use this to get",
@@ -38,7 +36,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"Here you will see how good your skills are. As you move your",
 								"mouse over any of the icons in this panel, the small yellow",
 								"popup box will show you the exact amount of experience you",
@@ -51,7 +48,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"From this interface you can control the music that is played.",
 								"As you explore the world, more of the tunes will become",
 								"unlocked. Once you've examined this menu use the next door",
@@ -64,7 +60,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"For those situations where words don't quite describe how you",
 								"feel, try an emote. Go ahead, try one out! You might notice",
 								"that some of the emotes are grey and cannot be used now.",
@@ -75,7 +70,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"",
 								"This is your Quest Journal, a list of all the quests in the game.",
 								"Talk to the Quest Guide again for an explaination.",
@@ -86,7 +80,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"You can see what items you are wearing in the worn inventory",
 								"to the left of the screen with their combined statistics on the",
 								"right. Let's add something. Left click your dagger to 'wield' it.",
@@ -97,7 +90,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"From this interface you can select the type of attack your",
 								"character will use. Different monsters have different",
 								"weaknesses. If you hover your mouse over the buttons, you",
@@ -117,7 +109,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"This will be explaing by Brother Brace shortly, but first click",
 								"on the other flashing face to the right of your screen.",
 								"", "", "This is your friends list");
@@ -129,7 +120,6 @@ public class ClickTab implements PacketType {
 				c.getPacketSender().chatbox(6180);
 				c.getDialogueHandler()
 						.chatboxText(
-								c,
 								"The two lists - friends and ignore - can be very helpful for",
 								"keeping track of when your friends are online or for blocking",
 								"messages from people you simply don't like. Speak with",