Fix Abyss, Fix selling for tokkull (#186)

* Fix local Parabot instructions

* Add kick command, and force logout function

* fixup abyss

* fixup tokkull selling

2006Redone Server/src/redone/game/content/skills/runecrafting/AbyssalHandler.java

@@ -6,7 +6,7 @@ public class AbyssalHandler {
 
 	public static void handleAbyssalTeleport(Client c, int objectId) {
 		switch (objectId) {
-		case 7147:// added
+		case 7147:// added squeeze through gap
 			c.getPlayerAssistant().movePlayer(3030, 4842, 0);
 			break;
 		case 7133:// added nature
@@ -48,13 +48,7 @@ public class AbyssalHandler {
 		case 7134: // chaos
 			c.getPlayerAssistant().startTeleport(2274, 4842, 0, "modern");
 			break;
-		default:
-			c.getActionSender().sendMessage(
-					"If you see this message, please PM an Administrator.");
-			break;
 		}
-		c.getActionSender().sendMessage(
-				"As you click the object, you teleport to a mystical place...");
 	}
 
 }

2006Redone Server/src/redone/game/npcs/NpcActions.java

@@ -1207,6 +1207,15 @@ public class NpcActions {
 			String type = c.playerMagicBook == 0 ? "modern" : "ancient";
 			c.getPlayerAssistant().startTeleport(2911, 4832, 0, type);
 			break;
+
+		case 2258:
+			if (c.playerLevel[20] < 35) {
+				c.getActionSender().sendMessage("You need a Runecrafting level of 35 to enter the Abyss.");
+				return;
+			}
+			c.getPlayerAssistant().spellTeleport(3027, 4852, 0);
+			break;
+
 		default:
 			if (c.playerRights == 3) {
 				Misc.println("Third Click NPC : " + npcType);

2006Redone Server/src/redone/game/objects/ObjectsActions.java

@@ -20,6 +20,7 @@ import redone.game.content.skills.core.Woodcutting;
 import redone.game.content.skills.crafting.Spinning;
 import redone.game.content.skills.farming.Farming;
 import redone.game.content.skills.fletching.LogCutting;
+import redone.game.content.skills.runecrafting.AbyssalHandler;
 import redone.game.content.skills.runecrafting.RuneCraftingActions;
 import redone.game.content.skills.smithing.Smelting;
 import redone.game.content.skills.thieving.Stalls;
@@ -112,6 +113,7 @@ public class ObjectsActions {
 		SingleGates.useSingleGate(player, objectType);
 		DoubleGates.useDoubleGate(player, objectType);
 		PassDoor.processDoor(player, objectType);
+		AbyssalHandler.handleAbyssalTeleport(player, objectType);
 		// if its a rock we can mine, mine it
 		if (Mining.rockExists(objectType))
 			player.getMining().startMining(player, objectType, player.objectX, player.objectY, player.clickObjectType);
@@ -1697,14 +1699,6 @@ public class ObjectsActions {
 				player.getPlayerAssistant().movePlayer(3233, 9317, 0);
 			break;
 
-		case 2258:
-			if (player.playerLevel[20] >= 35) {
-				player.getPlayerAssistant().spellTeleport(3027, 4852, 0);
-			} else {
-				player.getActionSender().sendMessage("You need a Runecrafting level of 35 to enter the Abyss.");
-			}
-			break;
-
 		/**
 		 * End
 		 */

2006Redone Server/src/redone/game/shops/ShopAssistant.java

@@ -372,9 +372,9 @@ public class ShopAssistant {
 			String itemName = ItemAssistant.getItemName(itemID).toLowerCase();
 			int TotPrice2 = 0;
 			if (player.myShopId == 138 || player.myShopId == 58 || player.myShopId == 139) {
-				TotPrice2 = (int) (getTokkulValue(itemID) * .85);
+				TotPrice2 = (int) Math.floor(getTokkulValue(itemID) * .85) * amount;
 			} else {
-				 TotPrice2 = (int) Math.floor(getItemShopValue(itemID, amount, true) * amount); //Something about total price of item?
+				TotPrice2 = (int) Math.floor(getItemShopValue(itemID, amount, true) * amount); //Something about total price of item?
 			}
 			if (player.getItemAssistant().freeSlots() > 0 || player.getItemAssistant().playerHasItem(995) || player.getItemAssistant().playerHasItem(6529)) { //Checks to see if player has room for coins.
 				if (!ItemDefinitions.getDef()[itemID].isNoteable) { //Check to see if its notable.

2006Redone Server/src/redone/game/shops/ShopHandler.java

@@ -133,11 +133,7 @@ public class ShopHandler {
 				token = token.trim();
 				token2 = line.substring(spot + 1);
 				token2 = token2.trim();
-				token2_2 = token2.replaceAll("\t\t", "\t");
+				token2_2 = token2.replaceAll("\t+", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
-				token2_2 = token2_2.replaceAll("\t\t", "\t");
 				token3 = token2_2.split("\t");
 				if (token.equals("shop")) {
 					int ShopID = Integer.parseInt(token3[0]);