View difference between Paste ID: fi1egskZ and kaQ5jnNQ

-local targetMonitor = "monitor_239"
+local targetMonitor = os.getComputerID()==32 and "monitor_10" or "monitor_239"
 local mon = peripheral.wrap(targetMonitor)
 if not mon then
-  error("Missing: monitor_239",0)
+	error("Missing: "..targetMonitor,0)
-  return
+	return
 end
 
---interfaces
+
-os.loadAPI("pos/ZombieWI")
+
-os.loadAPI("pos/ZombieED")
+
 os.loadAPI("pos/ZombieLightMgr")
 --turtle
 os.loadAPI("pos/ZombieKiller")
 --drive
 os.loadAPI("pos/ZombieLogs")
 os.loadAPI("pos/SpawnerLogs")
 
 local wi = peripheral.find("WorldInterface")
 
 local void = function() return "" end
 
-local ed = peripheral.isPresent("EntityDetector")
+
 	local block = wi.getBlockInfos(c.x,c.y,c.z)
 	if os.getComputerID()~=32 then
 		block.datatags = wi.getBlockDatatags(c.x,c.y,c.z).datatags
 	end
-  local block = wi.getBlockInfos(c.x,c.y,c.z)
+	loaded = block.isChunkLoaded
-  block.datatags = wi.getBlockDatatags(c.x,c.y,c.z).datatags
+	local connected,p = false,false
-  loaded = block.isChunkLoaded
+	if wrap then
-  local connected,p = false,false
+		connected = peripheral.isPresent(c.name)
-  if wrap then
+		p = connected and peripheral.wrap(c.name) or false
-    connected = peripheral.isPresent(c.name)
+	end
-    p = connected and peripheral.wrap(c.name) or false
+	return block, loaded, connected, p
-  end
+
-  return block, loaded, connected, p
+
 local function _computer(c)
 	local block, loaded, connected, p = info(c,true)
-local function _interface(c,name)
+	local present = block.blockName=="computercraft:CC-Computer"
-  local block, loaded, connected = info(c)
+	local isOn = block.datatags.on==1
-  local present = block.blockName == "lifeisperipheral:"..name
+	local reboot = not connected and void or function()
-  return {loaded, present, peripheral.isPresent(c.name), "--", {"",void}}
+			if p.isOn() then
 				p.reboot()
 			else
 				p.turnOn()
-  local block, loaded, connected, p = info(c,true)
+			end return p.isOn()
-  local present = block.blockName=="computercraft:CC-Computer"
+		end
-  local isOn = block.datatags.on==1
+	return {loaded, present, connected, isOn and "On" or "Off", {"reboot",reboot}}
-  local reboot = connected and function() if p.isOn() then p.reboot() else p.turnOn() end return p.isOn() end or function() return "--" end
+
-  return {loaded, present, connected, isOn and "On" or "Off", {"reboot",reboot}}
+
 	local block, loaded, connected, p = info(c,true)
 	local present = block.blockName=="computercraft:CC-Peripheral"
-  local block, loaded, connected, p = info(c,true)
+	local hasData,freeSpace = false, void
-  local present = block.blockName=="computercraft:CC-Peripheral"
+	if connected then
-  local hasData,freeSpace = false, void
+		hasData = p.isDiskPresent() and p.hasData()
-  if connected then
+		freeSpace = function() return hasData and fs.getFreeSpace("/"..p.getMountPath()) or "--" end
-    hasData = p.isDiskPresent() and p.hasData()
+	end
-    freeSpace = function() return fs.getFreeSpace("/"..p.getMountPath()) end
+	return {loaded, present, connected, hasData and "hasData" or "noData", {"freeSpace",freeSpace}}
-  end
+
-  return {loaded, present, connected, hasData and "hasData" or "noData", {"freeSpace",freeSpace}}
+
 	local block, loaded = info(c,false)
 	local present = block.blockName=="computercraft:CC-TurtleExpanded"
-  local block, loaded = info(c,false)
+	local isOn = block.datatags.on==1
-  local present = block.blockName=="computercraft:CC-TurtleExpanded"
+	return {loaded, present, connected, isOn and "On" or "Off", {"--",void}}
-  local isOn = block.datatags.on==1
+
-  return {loaded, present, connected, isOn and "On" or "Off", {"--",void}}
+
 local menu = {
 	function() return {"ZombieLeader", _computer(ZombieLeader)} end,
 	function() return {"Monitoring  ", _computer(ZombieMonitoring)} end,
---  {"WorldInterface", _interface(ZombieWI,"WorldInterface")},
+	function() return {"LightMgr    ", _computer(ZombieLightMgr)} end,
---  {"EntityDetector", _interface(ZombieED,"EntityDetector")},
+	function() return {"ZombieKiller", _turtle(ZombieKiller)} end,
-    {"ZombieLeader", _computer(ZombieLeader)},
+	function() return {"ZombieLogs  ", _drive(ZombieLogs)} end,
-    {"Monitoring  ", _computer(ZombieMonitoring)},
+	function() return {"SpawnerLogs ", _drive(SpawnerLogs)} end,
-    {"LightMgr    ", _computer(ZombieLightMgr)},
+
-    {"ZombieKiller", _turtle(ZombieKiller)},
+
-    {"ZombieLogs  ", _drive(ZombieLogs)},
+
-    {"SpawnerLogs ", _drive(SpawnerLogs)},
+	clicked = clicked or false
 	local line1 = string.format("%s %s %s",
 		name,
 		o[1] and "loaded" or "unload",
-  clicked = clicked or false
+		o[2] and "here" or "miss"
-  local line1 = string.format("%s %s %s",
+	)
-    name,
+	local line2 = string.format("%s %s%s %s",
-    o[1] and "loaded" or "unload",
+		o[3] and "plugged	" or "unplugged",
-    o[2] and "here" or "miss"
+		o[4],
-  )
+		string.rep(" ",math.max(0,7-string.len(o[4]))),
-  local line2 = string.format("%s %s%s %s",
+		clicked and o[5][2]() or o[5][1]
-    o[3] and "plugged  " or "unplugged",
+	)
-    o[4],
+	return line1,line2
-    string.rep(" ",math.max(0,7-string.len(o[4]))),
+
-    clicked and o[5][2]() or o[5][1]
+
-  )
+
-  return line1,line2
+	click = click or 0
 	mon.setTextScale(1)
 	mon.setCursorPos(1,1)
 	mon.clear()
-  click = click or 0
+	local line,o,oF
-  mon.setTextScale(1)
+	for line,oF in pairs(menu) do
-  mon.setCursorPos(1,1)
+		o = oF()
-  mon.clear()
+		local line1,line2 = item(line,o[1],o[2],click==line and act)
-  local line,o
+		mon.setCursorPos(1,(line*2)-1)
-  for line,o in pairs(menu) do
+		if click==line then
-    local line1,line2 = item(line,o[1],o[2],click==line and act)
+			mon.setBackgroundColor(colors.yellow)
-    mon.setCursorPos(1,(line*2)-1)
+			mon.setTextColor(colors.black)
-    if click==line then
+		else
-      mon.setBackgroundColor(colors.yellow)
+			mon.setBackgroundColor(line%2==1 and colors.black or colors.gray)
-      mon.setTextColor(colors.black)
+			mon.setTextColor(line%2==1 and colors.lightGray or colors.white)
-    else
+		end
-      mon.setBackgroundColor(line%2==1 and colors.black or colors.gray)
+		mon.clearLine()
-      mon.setTextColor(line%2==1 and colors.lightGray or colors.white)
+		mon.write(line1)
-    end
+		mon.setCursorPos(1,line*2)
-    mon.clearLine()
+		mon.clearLine()
-    mon.write(line1)
+		mon.write(line2)
-    mon.setCursorPos(1,line*2)
+	end
-    mon.clearLine()
+	mon.setBackgroundColor(colors.black)
-    mon.write(line2)
+	mon.setTextColor(colors.white)
-  end
+
-  mon.setBackgroundColor(colors.black)
+
-  mon.setTextColor(colors.white)
+
 	if e=="sound_played" or e=="timer" or e=="char" or e=="key_up" or e=="key" then
 		return
 	end
-  if e=="timer" or e=="char" or e=="key_up" or e=="key" then
+	print(string.format("e=%s\np=%s\np2=%s\np3=%s\np4=%s\np5=%s\n--\n",
-    return
+	tostring(e) and tostring(e) or type(e),
-  end
+	tostring(p1) and tostring(p1) or type(p1),
-  print(string.format("e=%s\np=%s\np2=%s\np3=%s\np4=%s\np5=%s\n--\n",
+	tostring(p2) and tostring(p2) or type(p2),
-  tostring(e) and tostring(e) or type(e),
+	tostring(p3) and tostring(p3) or type(p3),
-  tostring(p1) and tostring(p1) or type(p1),
+	tostring(p4) and tostring(p4) or type(p4),
-  tostring(p2) and tostring(p2) or type(p2),
+	tostring(p5) and tostring(p5) or type(p5)
-  tostring(p3) and tostring(p3) or type(p3),
+	))
-  tostring(p4) and tostring(p4) or type(p4),
+
-  tostring(p5) and tostring(p5) or type(p5)
+
-  ))
+local tick = os.startTimer(2.5)
 local e,p,x,y,p4,p5
 while true do
-local tick = os.startTimer(2)
+	printMenu(sel,act)
 --	initMenu()
 	act = false
-  printMenu(sel,act)
+	e,p,x,y,p4,p5 = os.pullEventRaw()
---  initMenu()
+	traceEvent(e,p,x,y,p4,p5)
-  act = false
+	if e=="monitor_touch" and p==targetMonitor then
-  e,p,x,y,p4,p5 = os.pullEventRaw()
+		os.cancelTimer(tick)
-  traceEvent(e,p,x,y,p4,p5)
+		sel = math.ceil(y/2)
-  if e=="monitor_touch" and p==targetMonitor then
+		act = true
-    sel = math.ceil(y/2)
+		if delay then
-    if delay then
+			os.cancelTimer(delay)
-      os.cancelTimer(delay)
+		end
-    end
+		delay = os.startTimer(2.5)
-    delay = os.startTimer(5)
+		tick = os.startTimer(2.5)
-  elseif e=="timer" and p==tick then
+	elseif e=="timer" and p==tick then
-    tick = os.startTimer(2)
+		tick = os.startTimer(2.5)
-  elseif e=="timer" and p==delay then
+	elseif e=="timer" and p==delay then
-    sel = 0
+		sel = 0
-  elseif e=="terminate" or (e=="key" and p==keys.q) then
+	elseif e=="terminate" or (e=="key" and p==keys.q) then
-    sleep(.3)
+		sleep(.3)
-    printError("Terminated")
+		printError("Terminated")
-    return
+		return
-  end
+	end
 end