View difference between Paste ID: 4RfTdBFk and KJ4t2DM9

---[[
+-- 'Map' by EldidiStroyrr (LDDestroier)
-   'Map' (GPS Minimap) by EldidiStroyrr (LDDestroier)
+-- This program can be copied, and it can be modified, but it
 -- can NOT be copied, modified slightly, and then claimed as your own.
-    Get with
+-- You must give me, EldidiStroyrr, credit for the creation and
-   pastebin get KJ4t2DM9 map
+-- only reference yourself as some guy who changed a bit.
-     or
+
-    std pb KJ4t2DM9 map
+parentDir = "/" .. fs.getDir(shell.getRunningProgram())
-    std ld map map
+waypointFile = "/" .. fs.combine(parentDir, ".waypoints")
 mapConfigFile = "/" .. fs.combine(parentDir, "/.map_conf")
-	This is a beta release. You fool!
+
---]]
+local mapVersion = "1.3" --Version of Map. Must be string.
 if string.sub(shell.dir(), 1, 4) == "rom/" or shell.dir() == "rom" then
-local mapRelease = "beta"
+	waypointFile = ("/.waypoints")
-local pastebinIDList = {
+	mapConfigFile = ("/.map_conf")
-	main = "x9ajKSc0",
+
-	beta = "KJ4t2DM9",
+
 function updateMapProgram()
-mapVersion = "1.3.9 Beta" --Version of Map. Must be string.
+	local mapName = shell.getRunningProgram()
 	local updateFile = http.get("http://pastebin.com/raw.php?i=x9ajKSc0").readAll()
-os.pullEvent = os.pullEventRaw
+
-local parentDir = fs.combine("",fs.getDir(shell.getRunningProgram()))
+
-local configDir = fs.combine(parentDir,".map")
+
-if not fs.isDir(configDir) then
+
-	if fs.exists(configDir) then fs.delete(configDir) end
+
-	fs.makeDir(configDir)
+
 scr_x, scr_y = term.getSize()
-if fs.isReadOnly(shell.resolve(shell.getRunningProgram())) then --In case Map is located in a write-protected directory.
+
-	waypointDir = fs.combine(fs.getName(configDir),"waypoints")
+
-	mapConfigFile = fs.combine(fs.getName(configDir),"config")
+
-	pathDir = fs.combine(fs.getName(configDir),"paths")
+
 			fs.delete(mapConfigFile)
-	waypointDir = "/" .. fs.combine(configDir, "waypoints")
+
-	mapConfigFile = "/" .. fs.combine(configDir, "config")
+
-	pathDir = fs.combine(configDir,"paths")
+
 		end
-if not fs.exists(waypointDir) then fs.makeDir(waypointDir) end
+
-if not fs.exists(pathDir) then fs.makeDir(pathDir) end
+
-defaultWaypointFile = "waypoints" --The name of the waypoint file that is written to.
+		if fs.exists(waypointFile) then
-mapNetworkWaypointsFile = fs.combine(waypointDir,"networkPoints")
+			fs.delete(waypointFile)
-local mapName
+
-function updateMapProgram(url)
+
-	if not fs.isReadOnly(shell.resolve(shell.getRunningProgram())) then
+
-		mapName = fs.combine("",shell.getRunningProgram())
+
 		return
-		mapName = shell.getRunningProgram()
+
 		write("Updating " .. shell.getRunningProgram() .. "...")
-	local updateFile
+
-	if url then
+		local fileSize = updateMapProgram()
-		updateFile = http.get(url)
+
 		return true
-		updateFile = http.get("http://pastebin.com/raw.php?i=" .. pastebinIDList[mapRelease])
+
 	if tArg[1] ~= "mon" then
-	if updateFile then
+
-		updateFile = updateFile.readAll()
+
 end
-		error("Could not connect.")
+mapColors = {
 	colors.gray, --Background color
 	colors.white, --Border color
 	colors.yellow, --Waypoint color
 	colors.red, --Off-screen waypoint text color
 	colors.lightBlue, --Player color
 	colors.black, --Command screen text color
 	colors.lightGray, --Command screen background color
-function setColormode()
+	colors.red --Background color if not connected to a GPS server
-	if term.isColor() and colorLimit >= 2 then
+
-		colormode = true
+
-		grayAllowed = true
+directionSensitivity = 0.6
 mapCorners = { --Top left corner, bottom right corner
-		colormode = false
+	{
-		if _VERSION and colorLimit == 1 then
+		2,
-			grayAllowed = true
+		2,
 	},
-			grayAllowed = false
+	{
 		scr_x - 1,
 		scr_y - 6,
 	}
 }
-local nothing = false
+corner1 = mapCorners[1]
 corner2 = mapCorners[2]
 midPoint = {
 	math.floor((corner1[1] + corner2[1]) / 2),
 	math.floor((corner1[2] + corner2[2]) / 2)
 }
 mapDimensions = {
 	corner2[1] - corner1[1],
 	corner2[2] - corner1[2]
 }
-		fakeX = nil
+
-		fakeY = nil
+if term.isColor() then
-		fakeZ = nil
+	colormode = true
-		fakeDir = nil
+
 	colormode = false
 end
-		if fs.exists(waypointDir) then
+
-			fs.delete(waypointDir)
+isConnected = true
 arrows = {
 	">",
 	"v",
 	"<",
 	"^"
-	elseif tArg[1] == "oc" then
+
-		shell.run("edit "..mapConfigFile)
+
-		print("Config updated.")
+
 
-	elseif tArg[1] == "nothing" then
+function getConfig()
-		nothing = true
+	if not fs.exists(waypointFile) then
 		file = fs.open(waypointFile, "w")
-		local file = tArg[2]
+		file.write({})
-		local updateURL
+
-		if not tArg[2] then
+
-			file = "beta"
+	file = fs.open(waypointFile, "r")
-			updateURL = pastebinIDList[file]
+	contents = file.readAll()
 	contents = textutils.unserialize(contents)
-			if pastebinIDList[file] then
+
-				updateURL = pastebinIDList[file]
+
 	for a = 1, #contents do
-				print("Invalid update source.")
+		table.insert(waypoints, contents[a])
-				return false
+
 
 	if not fs.exists(mapConfigFile) then
 		file = fs.open(mapConfigFile, "w")
 		file.writeLine("-" .. "- Do not break the format of this config.")
-		local fileSize = updateMapProgram("http://pastebin.com/raw.php?i=" .. updateURL)
+		file.writeLine("-" .. "- This is for Eldidi's Map. Do 'map cc' to fix broken config.")
 		file.writeLine("spoofMode = false -" .. "-boolean, set true if testing program in emulator. Replaces gps movement detection with arrow keys. Default: false")
-		write("Updated from "..mapVersion)
+		file.writeLine("scaleFactor = 0.25 -" .. "-number, the zoom factor for the minimap. Lower means wider range. Does not affect GPS range. Default: 0.25")
-		shell.run(fs.getName(shell.getRunningProgram()),"nothing")
+		file.writeLine("labelMode = true -" .. "-boolean, true if waypoint labels are their names, false if their distances. Default: true")
-		if mapVersion then
+		file.writeLine("youChar = 'O' -" .. "-string, the character which defaultly represents you in the map. is overwritten by arrows, so this is useless come to think of it. Default: 'O'")
-			print(" to "..mapVersion)
+		file.writeLine("waypointChar = '*' -" .. "-string, the character that waypoints on the map are represented by. Default: '*'")
 		file.writeLine("blankChar = ' ' -" .. "-string, the blank character that the inside of the map is made of. Default: ' '")
-			print("...whatever.")
+		file.writeLine("refreshSleep = 0.4 -" .. "-number, the delay between each GPS request. Default: 0.4")
 		file.writeLine("autoUpdate = false -" .. "-boolean, whether or not Map automatically updates to the latest version. this is reccommended FALSE because new updates could break the program into a state where it can't update again.")
 		file.close()
-	elseif tArg[1] == "help" then
+
-		local helpText = [[
+	shell.run(mapConfigFile)
-'map update' Updates program.
+	return contents
-'map fast' Runs term.redirect(term.native()).
+
-'map cw' Deletes waypoints.
+
-'map cc' Deletes config.
+function setConfig(pointname, mode, x, y, z)
-'map oc' Opens config.
+	config = getConfig()
-'map nothing' gets config, but doesn't run
+	file = fs.open(waypointFile, "w")
-Config path: ']]..mapConfigFile..[['
+
-Waypoint directory: ']]..waypointDir..[[']]
+
-		print(helpText)
+
 			if point[1] == pointname then
-	elseif tArg[1] == "fast" then
+
 				file.writeLine(textutils.serialize(config))
 				file.close()
 				getConfig()
-local sides = {"up","down","left","right","front","back"}
+
-for a = 1, #sides do
+
-	if peripheral.getType(sides[a]) == "modem" then
+
-		rednet.open(sides[a])
+
-		break
+
 	elseif mode == "add" then
 		if x == nil or y == nil or z == nil then
-local function runMapProgramAlready() --This is to allow me to run pcall on the program.
+
-function numberToColor(input)
+
-	if type(input) == "number" then
+
-		for k,v in pairs(colors) do
+		table.insert(config, {pointname, x, y, z})
-			if input == v then
+
-				return "colors."..k
+
 	elseif mode == "rename" then
 		for a = 1, #config do
-	elseif type(input) == "table" then
+
-		local output = {}
+
-		for a = 1, #input do
+
-			for k,v in pairs(colors) do
+
-				if input[a] == v then
+
-					table.insert(output,"colors."..k)
+
 				getConfig()
 				return true
 			end
-		return output
+
 		file.close()
 		return false
 	end
-function yield()
+
-	os.queueEvent("yield")
+
-	os.pullEvent("yield")
+
 
-function seperateMethods(input)
+
-	local output={}
+	file = fs.open(mapConfigFile, "r")
-	for key,value in pairs(input) do
+	configFile = file.readAll()
-		table.insert(output, {key,value})
+	configFile = textutils.unserialize(configFile)
 	file.close()
-	return output
+
 	file = fs.open(mapConfigFile, "w")
-function defineMapBorders()
+	settings = {
-	scr_x, scr_y = term.getSize()
+		"spoofMode = " .. tostring(spoofMode),
-	local mapCorners
+		"scaleFactor = " .. tostring(scaleFactor),
-	if not monitorMode then
+		"labelMode = " .. tostring(labelMode),
-		mapCorners = { --Top left corner, bottom right corner
+		"youChar = '" .. tostring(youChar) .. "'",
 		"waypointChar = '" .. tostring(waypointChar) .. "'",
 		"blankChar = '" .. tostring(blankChar) .. "'",
 		"refreshSleep = " .. tostring(refreshSleep),
 		"autoUpdate = " .. tostring(autoUpdate),
 	}
-				scr_x - 1,
+	for a = 1, #settings do
-				scr_y - 6,
+		file.writeLine(settings[a])
 	end
 	file.close()
 	getConfig()
-		mapCorners = {
+
 
-				1,
+function setDefaultConfig()
-				1,
+	if not fs.exists(waypointFile) then
 		waypoints = {
 			{
-				scr_x,
+				"Test 1",
-				scr_y - 3,
+
 				62,
 				6
 			},
-	corner1 = mapCorners[1]
+
-	corner2 = mapCorners[2]
+				"Test 2",
-	midPoint = {
+				5,
-		math.floor((corner1[1] + corner2[1]) / 2),
+				70,
-		math.floor((corner1[2] + corner2[2]) / 2)
+				3
 			}
-	mapDimensions = {
+
-		corner2[1] - corner1[1],
+		file = fs.open(waypointFile, "w")
-		corner2[2] - corner1[2]
+		file.writeLine(textutils.serialize(waypoints))
 		file.close()
 	end
---[[ In case adding this to the config messes something up, I want to easily fix it.
+
-	mapColors = { --This controls most of the colors in the program, except for some hardcoded colors. If you are using a normal computer, grayscale or not, colors will not be pulled from this list.
+
-		colors.gray,      --Background color (default: colors.gray)
+
-		colors.white,     --Border color (default: colors.white)
+
-		colors.yellow,    --Waypoint color (default: colors.yellow)
+
-		colors.red,       --Offscreen waypoint arrow color (default: colors.red)
+
-		colors.lightBlue, --Direction indicator color (default: colors.lightBlue)
+
-		colors.black,     --Command list text color (default: colors.black)
+
-		colors.lightGray, --Command list background color (default: colors.lightGray)
+
-		colors.red,       --Background color if not connected to GPS server (default: colors.red)
+
-		colors.black,     --Map background color (default: colors.black)
+
 		else
 			term.setBackgroundColor(colors.black)
-	directionSensitivity = 0.15 --This is used to prevent the arrow on the middle of the screen from going crazy.
+
---]]
+
 		if colormode then
-currentlyConnected = false --We don't know, so assume false because of glitch with numpad
+
-isConnected = true --We still don't know, and it's just safer to assume false because of visual bugs
+
 			term.setBackgroundColor(colors.white)
 		end
 	end
 end
 
 function setDefaultTextColor()
-youChar = "O" --This used to be a config item, too bad it was useless. Luckily, it was replaced with many, much more useful options for you to screw up.
+
 		term.setTextColor(mapColors[2])
-function displayTitleScreen()
+
 		if isConnected then
-	term.setCursorPos(1,1)
+
 		else
-		paintutils.drawImage(mapTitleScreen_adv, 1, 1)
+
 		end
-		if grayAllowed then
+
-			paintutils.drawImage(mapTitleScreen_gray, 1, 1)
+
 
-			paintutils.drawImage(mapTitleScreen_norm, 1, 1)
+
 	setDefaultTextColor()
 	setDefaultBackgroundColor()
-	term.setTextColor(colors.white)
+
 
-		term.setBackgroundColor(colors.lightBlue)
+
 	if spoofMode then
-		if grayAllowed then
+
 		return {fakeX, fakeY, fakeZ}
 	else
-			term.setBackgroundColor(colors.gray)
+		local coord_x, coord_y, coord_z = gps.locate(1)
 		if coord_x == nil then
 			if displayStuffs then
-	term.setCursorPos(5,4)
+
-	print("Version " .. mapVersion)
+
-	term.setCursorPos(5,3)
+
-	print("Made by EldidiStroyrr")
+
 					term.setTextColor(colors.white)
 				end
-		event, param1 = os.pullEvent()
+
-	until event == "key" or event == "mouse_click" or event == "monitor_touch"
+
 				if displayStuffs then
-function getConfig(mode)
+
-	if not fs.exists(fs.combine(waypointDir, defaultWaypointFile)) or (not fs.isDir(waypointDir)) then
+
-		if fs.exists("/.waypoints") and (not fs.isDir("/.waypoints")) then
+				local coord_x, coord_y, coord_z = gps.locate(3)
-			fs.move("/.waypoints", "/waypoints")
+
-			fs.makeDir(waypointDir)
+
-			fs.move("/waypoints", fs.combine(waypointDir, defaultWaypointFile))
+
 					end
-			fs.makeDir(waypointDir)
+
-			file = fs.open(fs.combine(waypointDir, defaultWaypointFile), "w")
+
-			file.write({})
+
 		if coord_x == nil then
 			isConnected = false
 			return {0, 0, 0}
-	local wayFiles = fs.list(waypointDir)
+
 			term.setCursorPos(1,1)
-	fileWaypoints = {}
+
-	for a = 1, #wayFiles do
+
-		if not fs.isDir(fs.combine(waypointDir, wayFiles[a])) then
+
-			file = fs.open(fs.combine(waypointDir, wayFiles[a]), "r")
+
-			contents = file.readAll()
+
-			contents = textutils.unserialize(contents)
+
 
-			for b = 1, #contents do
+
-				table.insert(waypoints, contents[b])
+
-				if wayFiles[a] == defaultWaypointFile then
+
-					table.insert(fileWaypoints, contents[b])
+		local buffX = corner1[1] + 1
 		local mapLengthInner = (corner2[1]) - (corner1[1]) - 1
 		local longBlankChar1 = string.rep(blankChar, mapLengthInner)
 		for y = corner1[2] + 1, corner2[2] - 1 do
 			term.setCursorPos(buffX,y)
 			write(longBlankChar1)
-	--This part has been modified to automatically fix missing config options, at the cost of the inability to add custom ones. Sorry, but this is more useful.
+
-	local modem = peripheral.find("modem")
+		local buffX = corner1[1] - 1
-	if modem and mapProtocol then
+		for y = corner1[2], corner2[2] do
-		for a = 1, #mapProtocol do
+			term.setCursorPos(buffX,y)
-			modem.close(mapProtocol[a])
+			write(" ") --I do " " because 'blankChar' is for the inside of the map.
 		end
 		local buffX = corner2[1] + 1
-	spoofMode = false
+		for y = corner1[2], corner2[2] do
-	broadcastData = true
+			term.setCursorPos(buffX,y)
-	scaleFactor = 0.25
+			write(" ") --Same here.
-	networkName = "mapuser"..math.random(1,9999)
+
-	mapProtocol = {10666}
+
-	displayTitle = false
+			buffY = corner1[2] - 1
-	labelMode = true
+			term.setCursorPos(1,buffY)
-	waypointChar = '*'
+
-	blankChar = ' '
+
-	refreshSleep = 0.4
+
-	autoUpdate = false
+
-	if turtle then
+
-		turtleMode = true
+
 function drawBorder()
-		turtleMode = false
+	--Drawing border. Always is drawn first.
 	if displayStuffs and isConnected then
-	keyAgoesRight = false --Useless and probably cauyses problems..but whatever
+
-	spoofStep = 1
+			term.setTextColor(mapColors[2])
-	mapColors = { --This controls most of the colors in the program, except for some hardcoded colors. If you are using a normal computer, grayscale or not, colors will not be pulled from this list.
+
-		colors.gray, --Background color outside map square
+
-		colors.white, --Border color
+
-		colors.yellow, --Default waypoint color
+
-		colors.red, --Off-screen waypoint text color
+
-		colors.lightBlue, --Player color
+
-		colors.black, --Command screen text color
+
-		colors.lightGray, --Command screen background color
+
-		colors.red, --Background color if not connected to a GPS server
+
-		colors.black, --Background color inside map square
+
 		local mapLength = corner2[1] - corner1[1]
-	directionSensitivity = 0.15 --This is used to prevent the arrow on the middle of the screen from going crazy.
+		local longMapChar = string.rep("#", mapLength)
-	monitorTextScale = 0.5 --This determines what scale factor the text has if Map is being ran on a monitor.
+
-	fakeX = 0
+
-	fakeY = 66
+
-	fakeZ = 0
+
-	fakeDir = 0
+
-	doFlash = fals
+
-	colorLimit = 2
+			write("#")
 		end
-	shell.run(mapConfigFile) --Get the existing config options.
+
-	setColormode()
+
 				term.setCursorPos(corner2[1],b)
-	if not type(networkName) == "string" then networkName = "mapuser"..math.random(1,9999) end
+				write("#")
-	if not type(mapProtocol) == "table" then mapProtocol = {10666} end
+
 		end
-	refreshOtherConfig() --Set the config file to what the variables are.
+
 			term.setTextColor(mapColors[7])
-	scr_x, scr_y = term.getSize()
+
-	if scr_x > 16 or scr_y > 10 then --Determines if Map is being ran on a single monitor block.
+
-		monitorMode = false
+
 				term.setTextColor(colors.black)
-		monitorMode = true
+
 			else
-	if not monitorTextScale then --This whole bit is for monitors, should you be arsed to use them with this.
+
-		monitorTextScale = 0.5
+
 			end
-	if monitorTextScale < 0.5 then
+
-		monitorTextScale = 0.5
+
-	elseif monitorTextScale > 5 then
+
-		monitorTextScale = 5
+		term.setCursorPos(corner2[1],midPoint[2])
 		write("X")
-	if type(monitorTextScale) ~= "number" then
+
-		monitorTextScale = 0.5
+
 	return
 end
-	local mon = peripheral.find("monitor")
+
-	if mon then
+
-		if not monitorMode then
+
-			mon.setTextScale(monitorTextScale)
+		itemX = corner1[1] + 1
 		itemY = corner2[2] + 1
-			mon.setTextScale(0.5)
+		term.setCursorPos(itemX,itemY)
 		setDefaultColors()
 		term.clearLine()
-	if mode == "waypoint" then
+
-		return fileWaypoints
+
 		end
-		return contents
+
 		if colormode then
 			term.setTextColor(colors.orange)
-function set(list) --Used to check if a phrase is in a table. Straight from StackOverflow, by Jon Ericson.
+
-	local set = {}
+		write(scaleFactor .. "x")
-	for _, l in ipairs(list) do
+
-		set[l] = true
+
 
-	return set
+
 	isConnected = true
-function stringToColor(color)
+
-	local stringColors = {"white","orange","magneta","lightBlue","yellow","lime","pink","gray","lightGray","cyan","purple","blue","brown","green","red","black"}
+
-	local numberColors = {colors.white,colors.orange,colors.magneta,colors.lightBlue,colors.yellow,colors.lime,colors.pink,colors.gray,colors.lightGray,colors.cyan,colors.purple,colors.blue,colors.brown,colors.green,colors.red,colors.black}
+
-	if string.sub(color, 1, 7) == "colors." then
+
-		color = string.sub(color, 8)
+
 	while true do
-	for a = 1, #stringColors do
+
-		if string.lower(color) == string.lower(stringColors[a]) then
+
-			return numberColors[a]
+
 				poses = getCoordinates()
 				if not isConnected then
 					wasConnected = false
 					if displayStuffs then
-function setConfig(pointname, mode, x, y, z, derf)
+
-	config = getConfig("waypoint")
+							term.setBackgroundColor(colors.red)
-	file = fs.open(fs.combine(waypointDir, defaultWaypointFile), "w")
+
 							term.setBackgroundColor(colors.white)
 						end
 						term.clear()
 						renderCommands()
 						repeat
 							poses = getCoordinates()
 							sleep(0)
 						until isConnected == true
 					end
 				end
 			until isConnected == true
 			if isConnected then
 				setDefaultColors()
 				if not wasConnected then
 					wasConnected = true
 					term.clear()
 					renderCommands()
 					drawBorder()
-		table.insert(config, {pointname, x, y, z, derf})
+
 			end
 		end
 		oldCoord_x = posX
 		oldCoord_y = posY
 		oldCoord_z = posZ
 		posX = poses[1]
 		posY = poses[2]
 		posZ = poses[3]
 		if oldCoord_x ~= nil then
 			if math.abs(oldCoord_x - posX) > directionSensitivity or math.abs(oldCoord_z - posZ) > directionSensitivity then
 				if math.abs(oldCoord_x - posX) > math.abs(oldCoord_z - posZ) and oldCoord_x - posX > 0 then
 					direction_long = "west"
 					direction = "west"
 				elseif math.abs(oldCoord_x - posX) > math.abs(oldCoord_z - posZ) and oldCoord_x - posX < 0 then
 					direction_long = "east"
 					direction = "east"
 				elseif math.abs(oldCoord_z - posZ) > math.abs(oldCoord_x - posX) and oldCoord_z - posZ > 0 then
 					direction_lat = "south"
 					direction = "south"
 				elseif math.abs(oldCoord_z - posZ) > math.abs(oldCoord_x - posX) and oldCoord_z - posZ < 0 then
 					direction_lat = "north"
 					direction = "north"
-	local file = fs.open(mapConfigFile, "w")
+
-	local mapSettings = {
+
-		{
+
-			"spoofMode = " .. tostring(spoofMode),
+
-			"boolean, set true if testing program in emulator. Replaces gps movement detection with arrow keys. Default: false",
+
-		},
+			if (oldCoord_x ~= posX or oldCoord_z ~= posZ) then
-		{
+
-			"broadcastData = " .. tostring(broadcastData),
+
-			"boolean, set true if you want other people to see your location. Default: true",
+
-		},
+			if hadCleared then
-		{
+
-			"networkName = '" .. tostring(networkName) .. "'",
+
-			"string, what your name appears as for other Map clients. Default: 'mapuser'..math.random(1,9999)",
+
-		},
+			hadCleared = false
-		{
+
-			"mapProtocol = " .. textutils.serialize(mapProtocol),
+
-			"table, list of modem protocols of the data broadcasted to other clients. Default: {10666}",
+
-		},
+
-		{
+
-			"scaleFactor = " .. tostring(scaleFactor),
+
-			"number, the zoom factor for the minimap. Lower means wider range. Does not affect GPS range. Default: 0.25",
+
-		},
+
-		{
+
-			"displayTitle = " .. tostring(displayTitle),
+				itemX = math.ceil((midPoint[1] + (wayX - posX) * scaleFactor))
-			"boolean, whether or not to display the title screen. I find it kind of garish, but I already did the work. Default: false",
+				itemZ = math.floor((midPoint[2] + (posZ - wayZ) * scaleFactor))
-		},
+
-		{
+
-			"labelMode = " .. tostring(labelMode),
+				if itemX > corner1[1] and itemX < corner2[1] and itemZ < corner2[2] and itemZ > corner1[2] then
-			"boolean, true if waypoint labels are their names, false if their distances. Default: true",
+					if not (itemX == midPoint[1] and itemZ == midPoint[2]) then
-		},
+
-		{
+
-			"waypointChar = '" .. tostring(waypointChar) .. "'",
+								term.setTextColor(mapColors[3])
-			"string, the character that waypoints on the map are represented by. Default: '*'",
+
-		},
+
-		{
+								term.setBackgroundColor(colors.black)
-			"blankChar = '" .. tostring(blankChar) .. "'",
+
-			"string, the blank character that the inside of the map is made of. Default: ' '",
+							write(waypointChar)
-		},
+
-		{
+
-			"refreshSleep = " .. tostring(refreshSleep),
+
-			"number, the delay between each GPS request. Default: 0.4",
+
-		},
+
-		{
+
-			"autoUpdate = " .. tostring(autoUpdate),
+
-			"boolean, whether or not Map automatically updates to the latest version. this is reccommended FALSE because new updates could break the program into a state where it can't update again. Default: false",
+
-		},
+
-		{
+
-			"turtleMode = " .. tostring(turtleMode),
+						term.setTextColor(mapColors[4])
-			"boolean, whether Map should be tuned to turtle controlling. Especially useful if used in conjunction with Lyqyd's NSH. Default: false",
+
-		},
+
-		{
+
-			"keyAgoesRight = " .. tostring(keyAgoesRight),
+
-			"boolean, determines whether to invert the left/right turtle turning controls. Requires turtleMode=true. This option exists because the 'A' button turns the turtle left on the map, but not in minecraft world. Default: false",
+
-		},
+
-		{
+
-			"spoofStep = " .. tostring(spoofStep),
+
-			"number, amount you move in one keypress in spoof mode. Used to move faster. Default: 1",
+
-		},
+
-		{
+						if itemX * -1 >= itemZ * -1 then
-			"mapColors = " .. string.gsub( textutils.serialize(numberToColor(mapColors)), "\"", "" ),
+
-			"table, there are 9 items in this array, and this controls most of the colors in the program, except for some hardcoded colors and for normal computers. The colors are, in sequence: background color outside, border color, waypoint color, offscreen waypoint arrow color, direction indicator color, command screen text color, command screen background color, background color if not connected to GPS, background color inside. Do not input any values into this config option that isn't a color, or the program will crash. Default: {colors.gray, colors.white, colors.yellow, colors.red, colors.lightBlue, colors.black, colors.lightGray, colors.red, colors.black}",
+
-		},
+
-		{
+
-			"directionSensitivity = " .. tostring(directionSensitivity),
+
-			"number, this is used to prevent the arrow on the middle of the screen from going crazy. it will only change the middle indicator if you move that amount of meters. Default: 0.15",
+
-		},
+						if itemX * -1 >= itemZ then
-		{
+
-			"monitorTextScale = " .. tostring(monitorTextScale),
+
-			"number, this determines what scale factor the text has if Map is being ran on a monitor. Default: 0.5",
+
-		},
+
-		{
+
-			"fakeX = " .. tostring(fakeX),
+
-			"number, this is the last recorded X position of the turtle/PDA. Is used in spoofMode, and updates when using turtleMode. Default: 0",
+
-		},
+
-		{
+
-			"fakeY = " .. tostring(fakeY),
+						if itemX >= itemZ * -1 then
-			"number, same as fakeX but for Y. Default: 66",
+
-		},
+
-		{
+
-			"fakeZ = " .. tostring(fakeZ),
+
-			"number, same as fakeX but for Z. Default: 0",
+
-		},
+
-		{
+						if itemX >= itemZ then
-			"fakeDir = " .. tostring(fakeDir),
+
-			"number, equal to 'f' in Debug mode in Minecraft (F3), range=0-3. Default: nil",
+
-		},
+
-		{
+
-			"doFlash = " .. tostring(doFlash),
+
-			"boolean, whether or not to do the flash animation when starting map up or exiting a menu. Default: false",
+
-		},
+
-		{
+
-			"colorLimit = " .. tostring(colorLimit),
+
-			"number, artificially limits the color palate. (0=monochrome,1=grayscale,2=colors). Default: 2",
+
-		},
+
 					setDefaultColors()
-	file.writeLine("-" .. "- Do not break the format of this config.")
+
-	file.writeLine("-" .. "- This is for EldidiStroyrr/LDDestroier's 'Map' (GPS Minimap). Do 'map cc' to fix broken config.")
+
-	file.writeLine("-" .. "- This config has been last used on version " .. mapVersion .. ", for reference.")
+					term.setTextColor(mapColors[3])
-	for a = 1, #mapSettings do
+
-		file.writeLine(mapSettings[a][1] .. "  -" .. "-" .. mapSettings[a][2])
+
 					term.setBackgroundColor(colors.black)
-	file.writeLine("")
+
 				if itemZ < corner2[2] + 2 then
 					if labelMode == true then
 						pointName = point[1]
 						pointMidX = math.ceil(itemX - (string.len(pointName) / 2))
 						pointMidZ = itemZ - 1
 						term.setCursorPos(pointMidX,pointMidZ)
 					elseif labelMode == false then
 						pointName = tostring(round(math.sqrt((point[2]-posX)^2 + (point[3]-posY)^2 + (point[4]-posZ)^2), 2))
 						pointMidX = itemX - math.floor(string.len(pointName) / 2)
 						pointMidZ = itemZ - 1
 						term.setCursorPos(pointMidX,pointMidZ)
-			if grayAllowed then
+
-				term.setBackgroundColor(colors.gray)
+					if pointMidX + string.len(pointName) >= scr_x then
 						subLength = (scr_x - pointMidX) + 1
 						subName = string.sub(pointName, 1, subLength)
 						if pointMidX <= scr_x + 1 then
 							pointName = subName
 						end
 					end
 					if pointMidX <= scr_x then
 						for i = 1, #pointName do
 							labelPosX, labelPosY = term.getCursorPos()
 							if ((labelPosY == corner1[2] or labelPosY == corner2[2]) or (labelPosX == corner1[1] or labelPosX == corner2[1])) and ((labelPosX >= corner1[1] and labelPosX <= corner2[1]) and (labelPosY >= corner1[2] and labelPosY <= corner2[2])) then
 								if colormode then
 									term.setTextColor(mapColors[1])
 									term.setBackgroundColor(mapColors[2])
 								else
 									term.setTextColor(colors.white)
 									term.setBackgroundColor(colors.black)
 								end
 							else
 								if colormode then
 									term.setTextColor(mapColors[3])
 									term.setBackgroundColor(mapColors[1])
 								else
 									term.setTextColor(colors.white)
 									term.setBackgroundColor(colors.black)
 								end
 							end
 							write(string.sub(pointName, i, i))
-recordBuffer = {}
+
-if not oldCoord_x then
+
-	oldCoord_x, oldCoord_y, oldCoord_z = 0,0,0
+
-	posX, posY, posZ = 0,0,0
+
 			end
-local function savePath(path)
+			term.setCursorPos(midPoint[1],midPoint[2])
-	if not path then return false, "you need a table." end
+
-	local pathpath
+				term.setTextColor(mapColors[5])
 			else
 				if isConnected then
 					term.setTextColor(colors.white)
-	print("Save path as: (blank for cancel)")
+
 				else
 					term.setTextColor(colors.white)
-		pathpath = read()
+
-		if pathpath == "" then
+
 			end
 			if direction == "east" then
 				playerChar = ">"
 			elseif direction == "west" then
-		if fs.exists(fs.combine(pathDir,pathpath)) then
+				playerChar = "<"
-			pathpath = ""
+			elseif direction == "south" then
-			print("That already exists.")
+				playerChar = "v"
 			elseif direction == "north" then
-	until pathpath ~= ""
+				playerChar = "^"
-	pathpath = fs.combine(pathDir,pathpath)
+
-	local file = fs.open(pathpath,"w")
+				playerChar = "O"
-	file.writeLine(textutils.serialize(path))
+
 			write(playerChar)
-	print("Okay!")
+
 		if not spoofMode then
 			sleep(refreshSleep)
 		else
 			sleep(0)
 		end
 	end
-		currentlyConnected = true
+
-		os.queueEvent("gpsRequest", true)
+
 function renderCommands()
 	commands = {
-		oldCoord_x, oldCoord_y, oldCoord_z = coord_x, coord_y, coord_z
+		"(L)abel/distance",
-		coord_x, coord_y, coord_z = gps.locate(0.75)
+		"(M)ore Options",
-		if (coord_x == nil) and isConnected then
+		"(H)elp",
-			currentlyConnected = false
+
-			os.queueEvent("gpsRequest", false)
+
 	if not isConnected then
 		term.setCursorPos(2,1)
 		if colormode then
 			term.setTextColor(colors.gray)
 		else
 			term.setTextColor(colors.black)
 		end
 		gpsNotFoundString = "GPS not found."
 		print(gpsNotFoundString .. string.rep(" ", scr_x-string.len(gpsNotFoundString)-2))
 	end
-					term.clearLine()
+
 	startY = corner2[2] + 1
 	commandX = startX
-				for a = 1, 5 do
+
-					coord_x, coord_y, coord_z = gps.locate(1)
+
-					if coord_x == nil then os.queueEvent("gpsRequest", false) end
+		term.setCursorPos(startX,startY)
 		term.clearLine()
 		term.setCursorPos(commandX,commandY)
 		if colormode then
 			term.setTextColor(mapColors[6])
 			term.setBackgroundColor(mapColors[7])
 		else
 			term.setTextColor(colors.white)
 			term.setBackgroundColor(colors.black)
 		end
 		term.clearLine()
-			os.queueEvent("gpsRequest", false)
+
-			return nil
+
 			scr_x, scr_y = term.getSize()
 			if scr_x - comPosX <= string.len(commands[f]) + 1 then
-			currentlyConnected = true
+
-			os.queueEvent("gpsRequest", true)
+
-			fakeX, fakeY, fakeZ = coord_x, coord_y, coord_z
+
-			if recording then
+
-				if (math.floor(coord_x) ~= math.floor(oldCoord_x)) or (math.floor(coord_y) ~= math.floor(oldCoord_y)) or (math.floor(coord_z) ~= math.floor(oldCoord_z)) then
+			if f ~= #commands then
-					table.insert(recordBuffer,{math.floor(coord_x),math.floor(coord_y),math.floor(coord_z)})
+				write(", ")
 			end
 		end
-				if #recordBuffer > 0 then
+
-					currentLocation = "savePath"
+
-					displayStuffs = false
+
-					savePath(recordBuffer)
+
-					displayStuffs = true
+
-					currentLocation = "renderMap"
+
 	term.setCursorPos(1,2)
-				recordBuffer = {}
+
 		term.setTextColor(colors.orange)
 	end
 	print(" 'Map v1.3' is a GPS minimap program made by EldidiStroyrr (LDDestroier).")
 	setDefaultColors()
 	print(" * 'map cc' clears config.")
 	print(" * 'map cw' clears waypoints.")
-function rollOver(input, max)
+	print(" * A red screen means no access to a GPS server.")
-	return math.floor(input % max)
+	print(" * Pressing numpad '+' or '-' will zoom in and out without a prompt.")
 	print(" * Do 'map update' to update Map.")
 	sleep(0.1)
-function drawMovingLine(ypos, size, speed, spacesize)
+
-	for a = 1, size do
+
-		if currentLocation == "waypointSettings" then
+
-			term.setCursorPos(1,ypos)
+
 	print("Press a key to continue.")
-				term.setTextColor(colors.orange)
+
 	local event, key = os.pullEvent("key")
-				if grayAllowed then
+
 end
 function setWaypoint()
-					if isConnected then
+
 	defaultNewPointName = "way" --Not used, in favor of a way to cancel.
 	print("Set waypoint.")
-						term.setTextColor(colors.black)
+
 	write(">")
 	newName = tostring(read())
 	if newName == "" then
-			for x = 1, scr_x do
+
-				if rollOver(x - a, size) < spacesize then
+
-					write(" ")
+
 	end
-					write("-")
+	print("What X? (default: here)")
 	write(">")
 	newX = tonumber(read())
-			sleep(speed)
+
 		newX = math.floor(posX)
 	end
 	print("What Y? (default: here)")
 	write(">")
-function flashScreen(times)
+	newY = tonumber(read())
-	if (not times) or (type(times) ~= "number") then
+	if newY == nil then
-		times = 1
+		newY = math.floor(posY)
 	end
-	if colormode or grayAllowed then
+	print("What Z? (default: here)")
-		flashes = {
+
-			colors.black,
+	newZ = tonumber(read())
-			colors.gray,
+	if newZ == nil then
-			colors.lightGray,
+		newZ = math.floor(posZ)
-			colors.white,
+
-			colors.lightGray,
+	setConfig(newName, "add", newX, newY, newZ)
-			colors.black,
+
 	print("Waypoint '" .. newName .. "' set!")
 	getConfig()
-		flashes = {
+
-			colors.black,
+
-			colors.white,
+
 function setScale()
 	term.setCursorPos(1,2)
-	if doFlash then
+
-		for a = 1, times do
+
-			for b = 1, #flashes do
+
-				term.setBackgroundColor(flashes[b])
+
-				term.clear()
+
-				sleep(0)
+
 			print("Cancelling.")
 			sleep(0.2)
 			return
-	flashes = nil
+
 		newScale = tonumber(newScaleRaw)
 		if newScale == nil then
 			print("That's not a number!")
---The badly whitespaced function were made by PhyscoKillerMonkey. Beta.
+
-local function forward()
+
- while not mapturt.forward() do
+
- --print("Can't move, checking fuel")
+
-  if turtle.getFuelLevel() == 0 then
+
-   turtle.select(1)
+
-   turtle.refuel(1)
+
-  end
+
-  if digBlocks then
+
-   turtle.dig()
+
-  else
+
-   mapturt.up()
+
-   goneUp = goneUp + 1
+
-   cy = cy + 1
+
-  end
+
- end
+
- if dir == 0 then cz = cz + 1
+
- elseif dir == 1 then cx = cx - 1
+
- elseif dir == 2 then cz = cz - 1
+
- elseif dir == 3 then cx = cx + 1 end
+
- while goneUp > 0 and not turtle.detectDown() do
+
-  mapturt.down()
+
-  goneUp = goneUp - 1
+
-  cy = cy - 1
+
- end
+
 	for a = 1, #waypoints do
-local function up()
+
- while not mapturt.up() do
+
- --print("Can't move, checking fuel")
+
-  if turtle.getFuelLevel() == 0 then
+
-   turtle.select(1)
+
-   turtle.refuel(1)
+
-  end
+
-  if digBlocks then
+
-   turtle.digUp()
+
-  end
+
- end
+
- cy = cy + 1
+
 	return false
-local function down()
+
- while not mapturt.down() do
+
- --print("Can't move, checking fuel")
+
-  if turtle.getFuelLevel() == 0 then
+
-   turtle.select(1)
+
-   turtle.refuel(1)
+
-  end
+
-  if digBlocks then
+
-   turtle.digDown()
+
-  end
+
- end
+
- cy = cy - 1
+
 	if colormode then
-local function getPos()
+
- --print("Getting position")
+
- cx, cy, cz = gps.locate(5)
+
- --print(cx, cy, cz)
+	renName = tostring(read())
 	print("Rename to what?")
-local function getDir()
+
- --print("Getting direction")
+
- getPos()
+
- ox, oy, oz = cx, cy, cz
+
- forward()
+
- getPos()
+
- if oz > cz then dir = 0
+
- elseif oz < cz then dir = 2
+
- elseif ox < cx then dir = 1
+
- elseif ox > cx then dir = 3 end
+
- --print(dir)
+
- mapturt.back()
+
- getPos()
+
 	print("Invalid waypoint '" .. renName .. "'!")
-local function turn(d)
+
- --getDir()
+
- --print("Aligning")
+
- --print(dir, d)
+
- while dir ~= d do
+
-  mapturt.turnRight()
+--	setDefaultColors()
-  dir = dir + 1
+--	term.clear()
-  if dir == 4 then dir = 0 end
+
- end
+--	clearMap()
 --	renderCommands()
-local function moveX()
+
- --print("Moving X")
+
- --getPos()
+
- if gox > cx then
+
-  turn(1)
+
-  for x = 1, gox - cx do
+
-   forward()
+
-   cx = cx + 1
+		print(" Map Options:")
-  end
+		term.setCursorPos(1,3)
- elseif gox < cx then
+		for a = 1, scr_x do
-  turn(3)
+			write("-")
-  for x = 1, cx - gox do
+
-   forward()
+		term.setCursorPos(1,5)
-   cx = cx - 1
+
-  end
+
- end
+
 		print(" * (C)reate Waypoint")
-local function moveZ()
+		print(" * (D)elete Waypoint")
- --print("Moving Z")
+		print(" * (R)ename Waypoint")
- --getPos()
+		print(" * Edit C(o)nfig")
- if goz > cz then
+		print(" * (S)et Scale")
-  turn(2)
+		print(" * E(x)it")
-  for z = 1, goz - cz do
+
-   forward()
+		key = keys.getName(key)
-   cz = cz + 1
+	until string.find("cdrosx", key)
-  end
+
- elseif goz < cz then
+		displayStuffs = false
-  turn(0)
+
-  for z = 1, cz - goz do
+
-   forward()
+
-   cz = cz - 1
+
-  end
+
- end
+
 		displayStuffs = true
-local function moveY()
+
- --print("Moving Y")
+
- --getPos()
+
- if goy > cy then
+
-  for z = 1, goy - cy do
+		displayStuffs = false
-   up()
+
-   cy = cy + 1
+
-  end
+
- elseif goy < cy then
+
-  for z = 1, cy - goy do
+
-   down()
+
-   cy = cy - 1
+
-  end
+
- end
+
 	end
 	if key == "s" then
 		displayStuffs = false
 		setDefaultColors()
-		if not doGrid then
+
-			setDefaultTextColor()
+
 		setScale()
-				term.setBackgroundColor(mapColors[9])
+
 		sleep(0)
 		displayStuffs = true
 		redrawSceen()
-			local mapLengthInner = (corner2[1]) - (corner1[1]) - 1
+
-			local longBlankChar1 = string.rep(blankChar, mapLengthInner)
+
-			for y = corner1[2] + 1, corner2[2] - 1 do
+
-				term.setCursorPos(corner1[1]+1,y)
+
-				if y == math.floor(midPoint[2]) then
+		displayStuffs = false
-					write(string.rep(blankChar, math.ceil(mapLengthInner/2)-1))
+
-					term.setCursorPos(midPoint[1]+1,y)
+
-					write(string.rep(blankChar, math.floor(mapLengthInner/2)))
+
 		shell.run("edit " .. mapConfigFile)
-					write(longBlankChar1)
+
 		displayStuffs = true
 		getConfig()
 		setDefaultColors()
-			for y = corner1[2], corner2[2] do
+
-				term.setCursorPos(corner1[1]-1,y)
+
-				write(" ") --I do " " because 'blankChar' is for the inside of the map.
+
 	end
-			for y = corner1[2], corner2[2] do
+
-				term.setCursorPos(corner2[1]+1,y)
+		displayStuffs = false
-				write(" ") --Same here.
+
 		term.clear()
 		sleep(0)
-				term.setCursorPos(1,corner1[2]-1)
+
 		term.clear()
 		sleep(0)
 		displayStuffs = true
 		redrawSceen()
 	end
 	if key == "x" then
 		sleep(0)
 		return
-	defineMapBorders()
+
 	print("Cancelling.")
 	sleep(0.1)
-			term.setTextColor(colors.lightGray)
+
 end
 
 function keyPress()
 	displayStuffs = true
 	while true do
 		local event, key = os.pullEvent("key")
-				if grayAllowed then
+		key = tostring(keys.getName(key))
 		if key == "l" then
-					term.setBackgroundColor(colors.gray)
+			if labelMode == true then
 				labelMode = false
 			elseif labelMode == false then
 				labelMode = true
 			end
 			refreshOtherConfig()
 			drawBorder()
 			clearMap()
-		local mapHeight = corner2[2] - corner1[2]
+
-		local longMapChar = string.rep(" ", mapLength)
+		if spoofMode then
-		local longMapCharHalf = string.rep(" ", math.floor(mapLength/2))
+
 				fakeX = fakeX - 1
-		write(longMapCharHalf)
+				sleep(0.07)
-		term.setCursorPos(midPoint[1]+1,corner1[2])
+
-		write(longMapCharHalf)
+
 				fakeX = fakeX + 1
 				sleep(0.07)
 			end
 			if key == "down" then
 				fakeZ = fakeZ - 1
-				write(" ")
+				sleep(0.07)
 			end
-				write("X")
+
 				fakeZ = fakeZ + 1
 				sleep(0.07)
 			end
-			term.setCursorPos(corner2[1],b)
+
-			write(" ")
+		if key == "h" then
 			displayStuffs = false
-
+
 			term.clear()
 			sleep(0)
---		term.setCursorPos(corner1[1],midPoint[2])
+			displayHelp()
---		write("X")
+
 			sleep(0)
 			displayStuffs = true
 			clearMap()
 			drawBorder()
 			renderCommands()
 		end
 		if key == "m" then
-		scaleX = corner1[1] + 1
+			displayStuffs = false
-		if not monitorMode then
+
-			scaleY = corner2[2] + 1
+
 			sleep(0)
-			scaleY = scr_y - 2
+			waypointSettings()
 			term.clear()
-		term.setCursorPos(scaleX,scaleY)
+
 			displayStuffs = true
 			clearMap()
 			drawBorder()
 			renderCommands()
 		end
 		if key == "numPadAdd" or key == "add" then
 			scaleFactor = scaleFactor * 1.1
 			displayStuffs = true
-				if grayAllowed then
+
-					term.setTextColor(colors.gray)
+
 			drawBorder()
-					term.setTextColor(colors.black)
+			drawScaleIndicator()
 		elseif key == "minus" or key == "numPadSubtract" then
 			scaleFactor = scaleFactor / 1.1
 			displayStuffs = true
 			refreshOtherConfig()
 			clearMap()
 			drawBorder()
 			drawScaleIndicator()
-			if grayAllowed then
+
-				term.setTextColor(colors.lightGray)
+
 			sleep(0)
 			return
 		end
 	end
-					term.setTextColor(colors.black)
+
 
 getConfig()
 
-		if not monitorMode then
+fakeX = 3 --Used if spoofMode == true, if not then these are set in the event that it is later set true.
-			write(string.sub(scaleFactor, 1, 12).. "x")
+fakeY = 62
 fakeZ = 5
-			write(string.sub(scaleFactor, 1, 6) .. "x")
+
 if autoUpdate then
 	write("Automatically updating Map...")
 	updateMapProgram()
 	print("up to date!")
-local function printOutput(commie)
+
-	local oldCurX, oldCurY = term.getCursorPos()
+
-	if type(commie) == "table" then
+parallel.waitForAny(renderMap, keyPress)
-		for a = 1, #commie do
+
-			term.setCursorPos(2,scr_y-(#commie-a))
+
 term.setBackgroundColor(colors.black)
-				term.setTextColor(colors.gray)
+
-				term.setBackgroundColor(colors.lightGray)
+
 print("Thanks for using Map v" .. mapVersion .. "!")
 print("(code: 4RfTdBFk)")
 sleep(0)