View difference between Paste ID: sHfsrt2M and QxnRYA3B

 --Library for saving/loading table for all this code. all the settings below are saved in it.
 local ttf=require("tableToFile")
 local doorVersion = "7.0"
-local testR = true
+testR = true
---0 = doorcontrol block. 1 = redstone. 2 = bundled redstone. 3 = rolldoor
+
-local doorType = 0
+--0 = doorcontrol block. 1 = redstone. 2 = bundled redstone. Always bundled redstone with this version of the code.
 local doorType = 2
---bottom = 0; top = 1; back = 2 front = 3 right = 4 left = 5
+
-local redSide = 0
+--bottom = 0; top = 1; back = 2 front = 3 right = 4 left = 5. Should always be 2 for back.
 local redSide = 2
 --if doortype =2, set this to the color you want to output in.
 local redColor = 0
 --Delay before the door closes again
 local delay = 5
---0 = level; 1 = armory level; 2 = MTF; 3 = GOI; 4 = Security; 5 = Department
+
 --0 = level; 1 = armory level; 2 = MTF; 3 = GOI; 4 = Security
 local cardRead = 0;
---If cardRead = 0, then it is the card level.
+
---If cardRead = 1, then it is the armory level.
+
---If cardRead = 5, then it is the department. 1=SD, 2=ScD, 3=MD, 4=E&T, 5=O5 (any department door)
+
 local forceOpen = 1
 local bypassLock = 0
---toggle=0: it will automatically close after being opened.
+
---toggle=1: it will stay open/closed when opened.
+local doorAddress = ""
 
 local toggle = 0
 
 local adminCard = "admincard"
---Labels for admin security cards, which are cards that make the security system send diagnostic info of the door.
+
 
 local cryptKey = {1, 2, 3, 4, 5}
 local modemPort = 199
-local departments = {"SD","ScD","MD","E&T","O5"}
+local updatePort = 197
 local diagPort = 180
-local updatePort = 198
+
 local serverSend = {"checkuser","checkarmor","checkMtf","checkgoi","checksec","checkdepartment","checkint","checkstaff"}
 
 local component = require("component")
 local gpu = component.gpu
 local event = require("event")
 local ser = require("serialization")
 local term = require("term")
 local thread = require("thread")
 local process = require("process")
 local computer = component.computer
 
 local magReader = component.os_magreader
 
 local modem = component.modem
 
 local settingData = {}
 
 local function convert( chars, dist, inv )
   return string.char( ( string.byte( chars ) - 32 + ( inv and -dist or dist ) ) % 95 + 32 )
 end
 
 local function crypt(str,k,inv)
   local enc= "";
   for i=1,#str do
     if(#str-k[5] >= i or not inv)then
       for inc=0,3 do
     if(i%4 == inc)then
       enc = enc .. convert(string.sub(str,i,i),k[inc+1],inv);
       break;
     end
       end
     end
   end
   if(not inv)then
     for i=1,k[5] do
       enc = enc .. string.char(math.random(32,126));
     end
   end
   return enc;
 end
 
 
 function splitString(str, sep)
         local sep, fields = sep or ":", {}
         local pattern = string.format("([^%s]+)", sep)
         str:gsub(pattern, function(c) fields[#fields+1] = c end)
         return fields
 end
 
 local function update(msg, localAddress, remoteAddress, port, distance, msg, data)
     	if(port == updatePort and testR == true) then
         data = crypt(data, cryptKey, true)
         if msg == "update" then
         term.write("Updating door")
         local fileReceiveFinal = io.open("ctrl.lua","w")
   		fileReceiveFinal:write(data)
   		fileReceiveFinal:flush()
   		fileReceiveFinal:close()
         event.ignore("modem_message", update)
     	os.execute("ctrl")
         os.exit()
         elseif msg == "forceopen" then
-        elseif msg == "forceopen" and forceOpen ~= 0 then
+            local keyed = nil
             if data == "open" then
-                if(doorType == 0)then
+  				for key, valued in pairs(settingData) do
-        component.os_doorcontroller.open()
+                    if valued.forceOpen ~= 0 then
-    elseif(doorType == 1)then
+        			if valued.doorType == 0 then
-        if(component.redstone.getOutput(redSide) == 0) then
+                        component.proxy(valued.doorAddress).open()
-            component.redstone.setOutput(redSide,15)
+                    elseif valued.doorType == 1 then
 
-            component.redstone.setOutput(redSide,0)
+                    elseif valued.doorType == 2 then
                         component.redstone.setBundledOutput(redSide, { [valued.redColor] = 255})
-    elseif(doorType == 2)then
+                    elseif valued.doorType == 3 then
-        if(component.redstone.getBundledOutput(redSide, redColor) == 0) then
+                        component.proxy(valued.doorAddress).open()
-            component.redstone.setBundledOutput(redSide, { [redColor] = 255 } )
+                    end
                     end
-            component.redstone.setBundledOutput(redSide, { [redColor] = 0 } )
+  				end
             else
                 for key, valued in pairs(settingData) do
-        component.os_rolldoorcontroller.open()
+                    if valued.forceOpen ~= 0 then
         			if valued.doorType == 0 then
                         component.proxy(valued.doorAddress).close()
-                if(doorType == 0)then
+                    elseif valued.doorType == 1 then
-        component.os_doorcontroller.close()
+
-    elseif(doorType == 1)then
+                    elseif valued.doorType == 2 then
-        if(component.redstone.getOutput(redSide) == 0) then
+                        component.redstone.setBundledOutput(redSide, { [valued.redColor] = 0})
-            component.redstone.setOutput(redSide,15)
+                    elseif valued.doorType == 3 then
                         component.proxy(valued.doorAddress).close()
-            component.redstone.setOutput(redSide,0)
+                    end
                     end
-    elseif(doorType == 2)then
+  				end
-        if(component.redstone.getBundledOutput(redSide, redColor) == 0) then
+
-            component.redstone.setBundledOutput(redSide, { [redColor] = 255 } )
+
         end
-            component.redstone.setBundledOutput(redSide, { [redColor] = 0 } )
+
 
 function openDoor()
-        component.os_rolldoorcontroller.close()
+    local delayH = delay
     local redColorH = redColor
     local doorAddressH = doorAddress
     local toggleH = toggle
     if(toggleH == 0) then
         if(doorType == 0 or doorType == 3)then
         	component.proxy(doorAddressH).toggle()
         	os.sleep(delayH)
-    if(toggle == 0) then
+        	component.proxy(doorAddressH).toggle()
-        if(doorType == 0)then
+    	elseif(doorType == 1)then
-        component.os_doorcontroller.toggle()
+        	component.redstone.setOutput(redSide,15)
-        os.sleep(delay)
+    		os.sleep(delayH)
-        component.os_doorcontroller.toggle()
+    		component.redstone.setOutput(redSide,0)
-    elseif(doorType == 1)then
+    	elseif(doorType == 2)then
-        component.redstone.setOutput(redSide,15)
+        	component.redstone.setBundledOutput(redSide, { [redColorH] = 255 } )
-    	os.sleep(delay)
+        	os.sleep(delayH)
-    	component.redstone.setOutput(redSide,0)
+        	component.redstone.setBundledOutput(redSide, { [redColorH] = 0 } )
-    elseif(doorType == 2)then
+    	else
-        component.redstone.setBundledOutput(redSide, { [redColor] = 255 } )
+        	os.sleep(1)
-        os.sleep(delay)
+    	end
-        component.redstone.setBundledOutput(redSide, { [redColor] = 0 } )
+
         if(doorType == 0 or doorType == 3)then
-        component.os_rolldoorcontroller.toggle()
+        	component.proxy(doorAddressH).toggle()
-        os.sleep(delay)
+    	elseif(doorType == 1)then
-        component.os_rolldoorcontroller.toggle()
+        	if(component.redstone.getOutput(redSide) == 0) then
             	component.redstone.setOutput(redSide,15)
         	else
-    if(doorType == 0)then
+            	component.redstone.setOutput(redSide,0)
-        component.os_doorcontroller.toggle()
+        	end
-    elseif(doorType == 1)then
+    	elseif(doorType == 2)then
-        if(component.redstone.getOutput(redSide) == 0) then
+        	if(component.redstone.getBundledOutput(redSide, redColorH) == 0) then
-            component.redstone.setOutput(redSide,15)
+            component.redstone.setBundledOutput(redSide, { [redColorH] = 255 } )
         else
-            component.redstone.setOutput(redSide,0)
+            component.redstone.setBundledOutput(redSide, { [redColorH] = 0 } )
         end
-    elseif(doorType == 2)then
+    	else
-        if(component.redstone.getBundledOutput(redSide, redColor) == 0) then
+        	os.sleep(1)
-            component.redstone.setBundledOutput(redSide, { [redColor] = 255 } )
+    	end
     end
-            component.redstone.setBundledOutput(redSide, { [redColor] = 0 } )
+
 
 term.clear()
-        component.os_rolldoorcontroller.toggle()
+
 if fill~=nil then
     io.close(fill)
 else
     settingData["q"] = {}
     settingData["w"] = {}
     settingData["q"]["reader"] = ""
     settingData["q"]["redColor"] = 0
     settingData["q"]["delay"] = 5
     settingData["q"]["cardRead"] = 0
-	settingData["doorType"] = 0
+    settingData["q"]["accessLevel"] = 1
-    settingData["redSide"] = 0
+    settingData["q"]["doorType"] = 2
-    settingData["redColor"] = 0
+    settingData["q"]["doorAddress"] = ""
-    settingData["delay"] = 5
+    settingData["q"]["toggle"] = 0
-    settingData["cardRead"] = 0
+    settingData["q"]["forceOpen"] = 1
-    settingData["accessLevel"] = 1
+    settingData["q"]["bypassLock"] = 0
-    settingData["toggle"] = 1
+    settingData["w"]["reader"] = ""
-    settingData["forceOpen"] = 1
+    settingData["w"]["redColor"] = 0
-    settingData["bypassLock"] = 0
+    settingData["w"]["delay"] = 5
     settingData["w"]["cardRead"] = 0
     settingData["w"]["accessLevel"] = 1
     settingData["w"]["doorType"] = 2
     settingData["w"]["doorAddress"] = ""
-
+    settingData["w"]["toggle"] = 0
-	doorType = settingData.doorType
+    settingData["w"]["forceOpen"] = 1
-	redSide = settingData.redSide
+    settingData["w"]["bypassLock"] = 0
-	redColor = settingData.redColor
+
-	delay = settingData.delay
+
-	cardRead = settingData.cardRead
+
-	accessLevel = settingData.accessLevel
+
-	toggle = settingData.toggle
+
-	forceOpen = settingData.forceOpen
+print("Multi-Door Control terminal")
-	bypassLock = settingData.bypassLock
+
-
+
 if modem.isOpen(modemPort) == false then
-if (cardRead == 0)then
+
-    print("ACCESS LEVEL " .. tostring(accessLevel) .. " REQUIRED")
+
-elseif (cardRead == 1)then
+
-    print("ARMORY CLEARANCE LEVEL " .. tostring(accessLevel) .. " REQUIRED")
+
-elseif (cardRead == 2)then
+
-    print("MTF PASS REQUIRED")
+
-elseif (cardRead == 3)then
+
-    print("GOI PASS REQUIRED")
+
-elseif (cardRead == 4)then
+
-    print("SECURITY PASS REQUIRED")
+
-elseif (cardRead == 5)then
+
-    print("DEPARTMENT " .. departments[accessLevel] .. " ONLY")
+
-elseif (cardRead == 6)then
+
-    print("INTERCOM PASS REQUIRED")
+
-elseif (cardRead == 7)then
+
-    print("STAFF ONLY")
+
   end
   ev, address, user, str, uuid, data = event.pull("magData")
   term.write(str .. "\n")
 
   local keyed = nil
   for key, valuedd in pairs(settingData) do
         if(valuedd.reader == address) then
             keyed = key
       end
   end
   local isOk = "incorrect magreader"
    if(keyed ~= nil)then
         term.write(settingData[keyed].redColor)
       	redColor = settingData[keyed].redColor
         delay = settingData[keyed].delay
-end
+        cardRead = settingData[keyed].cardRead
         accessLevel = settingData[keyed].accessLevel
         doorType = settingData[keyed].doorType
         doorAddress = settingData[keyed].doorAddress
         toggle = settingData[keyed].toggle
         forceOpen = settingData[keyed].forceOpen
-  ev, _, user, str, uuid, data = event.pull("magData")
+        bypassLock = settingData[keyed].bypassLock
         isOk = "ok"
    else
         print("MAG READER IS NOT SET UP! PLEASE FIX")
    end
 
   local data = crypt(str, cryptKey, true)
-            local diagData = settingData
+
-            diagData["status"] = "ok"
+
-            diagData["type"] = "single"
+
             modem.open(diagPort)
-            diagData["key"] = "NAN"
+            local diagData = settingData[keyed]
             if diagData == nil then
-            modem.broadcast(diagPort, "diag", data)
+                diagData = {}
             end
             diagData["status"] = isOk
             diagData["type"] = "multi"
             diagData["version"] = doorVersion
             diagData["key"] = keyed
             local counter = 0
             for index in pairs(settingData) do
                 counter = counter + 1
             end
-
+            diagData["entries"] = counter
             data = crypt(ser.serialize(diagData),cryptKey)
-    	data = crypt(tostring(accessLevel), cryptKey)
+            modem.broadcast(diagPort, "temp", data)
     else
     local tmpTable = ser.unserialize(data)
     term.write(tmpTable["name"] .. ":")
     if modem.isOpen(modemPort) == false then
       modem.open(modemPort)
     end
-		(tmpTable["uuid"], cryptKey)
+
-    	modem.broadcast(modemPort, serverSend[(cardRead + 1)], data, bypassLock)
+
   	end
-
+
         data = crypt(tostring(accessLevel), cryptKey)
         modem.broadcast(modemPort, "setlevel", data)
         data = crypt
         (tmpTable["uuid"], cryptKey)
         modem.broadcast(modemPort, serverSend[(cardRead + 1)], data, bypassLock)
     elseif (cardRead == 2 or cardRead == 3 or cardRead == 4 or cardRead == 6 or cardRead == 7) then
         data = crypt
-    openDoor()
+
         modem.broadcast(modemPort, serverSend[(cardRead + 1)], data, bypassLock)
     end
     local e, _, from, port, _, msg = event.pull(1, "modem_message")
     if e then
       data = crypt(msg, cryptKey, true)
 --    print(data)
       if data == "true" then
     term.write("Access granted\n")
     computer.beep()
     thread.create(function(delayH, redColorH, doorAddressH, toggleH, doorTypeH, redSideH)
         if(toggleH == 0) then
             if(doorTypeH == 0 or doorTypeH == 3)then
                 component.proxy(doorAddressH).toggle()
                 os.sleep(delayH)
                 component.proxy(doorAddressH).toggle()
             elseif(doorTypeH == 1)then
                 component.redstone.setOutput(redSideH,15)
                 os.sleep(delayH)
                 component.redstone.setOutput(redSideH,0)
             elseif(doorTypeH == 2)then
                 component.redstone.setBundledOutput(redSideH, { [redColorH] = 255 } )
                 os.sleep(delayH)
                 component.redstone.setBundledOutput(redSideH, { [redColorH] = 0 } )
             else
                 os.sleep(1)
             end
         else
             if(doorTypeH == 0 or doorTypeH == 3)then
                 component.proxy(doorAddressH).toggle()
             elseif(doorTypeH == 1)then
                 if(component.redstone.getOutput(redSideH) == 0) then
                     component.redstone.setOutput(redSideH,15)
                 else
                     component.redstone.setOutput(redSideH,0)
                 end
             elseif(doorTypeH == 2)then
                 if(component.redstone.getBundledOutput(redSideH, redColorH) == 0) then
                 component.redstone.setBundledOutput(redSideH, { [redColorH] = 255 } )
             else
                 component.redstone.setBundledOutput(redSideH, { [redColorH] = 0 } )
             end
             else
                 os.sleep(1)
             end
         end
     end, delay, redColor, doorAddress, toggle, doorType, redSide)
       elseif data == "false" then
     term.write("Access denied\n")
     computer.beep()
     computer.beep()
       elseif data == "locked" then
     term.write("Doors have been locked\n")
     computer.beep()
     computer.beep()
     computer.beep()
       else
     term.write("Unknown command\n")
       end
     else
       term.write("server timeout\n")
     end
     end
   end
 end