View difference between Paste ID: zTJ6WFj7 and H4kALgKf

 
---[ABM Server, use with http://pastebin.com/aNsduCem]]--
+
 --[[Skynet Nuclear ABM Defense Program by Andrew2060]]--
 --[ABM Server, use with http://pastebin.com/fZ5xeB99]]--
 --[System requires atleast 5 CC's with Modems and ABMs]]--
 --[System has 5% chance of failure in killing missiles]]--
 
 --[[Settings]]--
 local waitDelay = 2
 local countersPerMissile = 1
 local missileDelay = 3
-local silos, curSilo = {}, 1
+
 --[[Initialization]]--
 local data, curSilo = {}, 1
 local silos = {}
 peripheral.find("modem", rednet.open)
 term.setBackgroundColor(colors.blue)
 
 local function red()
 term.setBackgroundColor(colors.red)
 print("                                                   ")
 term.setBackgroundColor(colors.blue)
 end
 
-	local id, msg = rednet.receive(waitDelay)
+
-	if msg == "ABM" then table.insert(silos, id) end
+
 repeat
         local id, msg = rednet.receive(waitDelay)
 
         if type(msg) == "table" and msg.Msg == "ABM" then
-	if not redstone.getInput("back") then
+                table.insert(silos, msg)
-		term.clear()
+                table.insert(data, msg.ID)
-		term.setCursorPos(1, 1)
+
         end
-		red()
+
-		print("        SKYNET DEFENSE SYSTEMS ACTIVATED           ")
+
-		red()
+
-		print("      ANTI-BALLISTIC MISSILE SHIELD ONLINE         ")
+
-		red()
+
-	    red()
+
-		print("               [STANDBY ABM Silos]                 ")
+    if not redstone.getInput("back") then
         term.clear()
-		for k, v in ipairs(silos) do print("  silo #" .. k .. " id = "..v) end
+        term.setCursorPos(1,1)
         red()
-
+        print("        SKYNET DEFENSE SYSTEMS ACTIVATED           ")
-		repeat os.pullEvent("redstone") until redstone.getInput("back")
+
-	end
+        print("      ANTI-BALLISTIC MISSILE SHIELD ONLINE         ")
-
+
-	term.clear()
+
-	term.setCursorPos(1, 1)
+        print("               [STANDBY ABM Silos]                 ")
-	term.setTextColor(colors.red)
+
-
+for k, v in ipairs(silos) do
-	print("Incoming Missiles:")
+        print("[S#:".. k .."] [ID:" .. v.ID .."] [Type:".. v.Missile .. "] [Target:".. v.Target .. "]")
-	print("Firing CounterMeasures\n")
+
-
+
 
         repeat os.pullEvent("redstone") until redstone.getInput("back")
     end
 
     term.clear()
     term.setCursorPos(1, 1)
     term.setTextColor(colors.red)
 
     print("Incoming Missiles:")
-		local msg = {["x"] = math.floor(maptab["x_"..i]), ["y"] = math.floor(maptab["y_"..i]), ["z"] = math.floor(maptab["z_"..i])}
+    print("Firing CounterMeasures\n")
 
-		print("Incoming Missile Threat #" .. i .. " at X:" .. msg.x .. " Y:" .. msg.y .. " Z:" .. msg.z)
+
-		print("Launching " .. countersPerMissile .. " of ABM Missile CounterMeasures...\n")
+
  if maptxt ~= "{}" then
-		for i = 1, countersPerMissile do
+
-			rednet.send(silos[curSilo], msg)
+
-			curSilo = (curSilo == #silos) and 1 or (curSilo + 1)
+
-			sleep(missileDelay)
+
-			end
+
-	    sleep(0)
+
-		end
+        local msg = {["x"] = math.floor(maptab["x_"..i]), ["y"] = math.floor(maptab["y_"..i]), ["z"] = math.floor(maptab["z_"..i])}
 
-	end
+        print("Incoming Missile Threat #" .. i .. " at X:" .. msg.x .. " Y:" .. msg.y .. " Z:" .. msg.z)
         print("Launching " .. countersPerMissile .. " of ABM Missile CounterMeasures...\n")
 
         for i = 1, countersPerMissile do
             rednet.send(data[curSilo], msg)
             curSilo = (curSilo == #data) and 1 or (curSilo + 1)
             sleep(missileDelay)
             end
         sleep(0)
         end
      sleep(0)
     end
    sleep(2)
 end
 sleep(1)