Add kneeboard pages for presets and navaids

obfuscoder · obfuscoder · commit ed8d2e2bbf92 · 2020-11-21T17:49:06.000+01:00
diff --git a/Mods/tech/mdc/kneeboard/01.lua b/Mods/tech/mdc/kneeboard/01.lua
@@ -1,4 +1,4 @@
--- 1
+-- 01 - lineup/loadout/procedures
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
diff --git a/Mods/tech/mdc/kneeboard/02.lua b/Mods/tech/mdc/kneeboard/02.lua
@@ -1,4 +1,4 @@
--- 2
+-- 02 - flight/comms plan
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
diff --git a/Mods/tech/mdc/kneeboard/03.lua b/Mods/tech/mdc/kneeboard/03.lua
@@ -1,4 +1,4 @@
--- 3
+-- 03 - notes
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
diff --git a/Mods/tech/mdc/kneeboard/04.lua b/Mods/tech/mdc/kneeboard/04.lua
@@ -1,4 +1,4 @@
--- 4
+-- 04 - support
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
diff --git a/Mods/tech/mdc/kneeboard/05.lua b/Mods/tech/mdc/kneeboard/05.lua
@@ -1,4 +1,4 @@
--- 4
+-- 05 - other flights
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
diff --git a/Mods/tech/mdc/kneeboard/06.lua b/Mods/tech/mdc/kneeboard/06.lua
@@ -1,30 +1,20 @@
--- 5
+-- 06 - presets
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-headline(0, "RAMROD")
+headline(0, "PRESETS")
 
-columns = 10
-for i = 1, string.len(mdc.ramrod) do
-	head(1, i-1, i-1)
-	cell(2, i-1, string.sub(mdc.ramrod, i, i))
-end
-
-headline(3, "DRYAD")
-
-columns = 11
-head(4, 0, "")
-for i, header in ipairs(mdc.dryad.header) do
-	head(4, i, i - 1)
-end
+columns = 6
+head(1, 0, "#")
+head(1, 1, "FREQ")
+multihead(1, 2, 1, 5, "NAME")
 
-for i, row in ipairs(mdc.dryad.rows) do
-	head(4 + i, 0, row.header)
-	for j, col in ipairs(row.columns) do
-		cell(4 + i, j, col)
-	end
+for i, preset in ipairs(mdc.presets) do
+	cell(1 + i, 0, i)
+	cell(1 + i, 1, preset.freq)
+	multicell(1 + i, 2, 1 + i, 5, preset.name)
 end
diff --git a/Mods/tech/mdc/kneeboard/07.lua b/Mods/tech/mdc/kneeboard/07.lua
@@ -1,9 +1,30 @@
--- 7
+-- 07 - crypto
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-plate(dataPath .. '/plates/' .. mdc.plates.departure.ad)
+headline(0, "RAMROD")
+
+columns = 10
+for i = 1, string.len(mdc.ramrod) do
+	head(1, i-1, i-1)
+	cell(2, i-1, string.sub(mdc.ramrod, i, i))
+end
+
+headline(3, "DRYAD")
+
+columns = 11
+head(4, 0, "")
+for i, header in ipairs(mdc.dryad.header) do
+	head(4, i, i - 1)
+end
+
+for i, row in ipairs(mdc.dryad.rows) do
+	head(4 + i, 0, row.header)
+	for j, col in ipairs(row.columns) do
+		cell(4 + i, j, col)
+	end
+end
diff --git a/Mods/tech/mdc/kneeboard/08.lua b/Mods/tech/mdc/kneeboard/08.lua
@@ -1,9 +1,25 @@
--- 7
+-- 08 - navaids
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-plate(dataPath .. '/plates/' .. mdc.plates.departure.procedure)
+headline(0, "NAVAIDS")
+
+columns = 12
+
+head(1, 0, "ID")
+multihead(1, 1, 1, 4, "NAME")
+head(1, 5, "TCN")
+multihead(1, 6, 1, 10, "POSITION")
+head(1, 11, "ELEV")
+
+for i, item in ipairs(mdc.navaids) do
+	cell(1 + i, 0, item.id)
+	multicell(1 + i, 1, 1 + i, 4, item.name)
+	cell(1 + i, 5, item.tcn)
+	multicell(1 + i, 6, 1 + i, 10, item.pos)
+	cell(1 + i, 11, item.elev)
+end
diff --git a/Mods/tech/mdc/kneeboard/09.lua b/Mods/tech/mdc/kneeboard/09.lua
@@ -1,9 +1,9 @@
--- 7
+-- 09 - departure ad
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-plate(dataPath .. '/plates/' .. mdc.plates.recovery.ad)
+plate(dataPath .. '/plates/' .. mdc.plates.departure.ad)
diff --git a/Mods/tech/mdc/kneeboard/10.lua b/Mods/tech/mdc/kneeboard/10.lua
@@ -1,9 +1,9 @@
--- 7
+-- 10 - departure procedure
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-plate(dataPath .. '/plates/' .. mdc.plates.recovery.procedure)
+plate(dataPath .. '/plates/' .. mdc.plates.departure.procedure)
diff --git a/Mods/tech/mdc/kneeboard/11.lua b/Mods/tech/mdc/kneeboard/11.lua
@@ -1,9 +1,9 @@
--- 7
+-- 11 - recovery ad
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-plate(dataPath .. '/plates/' .. mdc.plates.divert.ad)
+plate(dataPath .. '/plates/' .. mdc.plates.recovery.ad)
diff --git a/Mods/tech/mdc/kneeboard/12.lua b/Mods/tech/mdc/kneeboard/12.lua
@@ -1,9 +1,9 @@
--- 7
+-- 12 - recovery procedure
 local lfs = require('lfs')
 local dataPath = lfs.writedir() .. 'Data\\mdc\\'
 local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
 
 dofile(modPath..'mdc.lua')
 dofile(dataPath..'mdc.lua')
 
-plate(dataPath .. '/plates/' .. mdc.plates.divert.procedure)
+plate(dataPath .. '/plates/' .. mdc.plates.recovery.procedure)
diff --git a/Mods/tech/mdc/kneeboard/13.lua b/Mods/tech/mdc/kneeboard/13.lua
@@ -0,0 +1,9 @@
+-- 13 - divert ad
+local lfs = require('lfs')
+local dataPath = lfs.writedir() .. 'Data\\mdc\\'
+local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
+
+dofile(modPath..'mdc.lua')
+dofile(dataPath..'mdc.lua')
+
+plate(dataPath .. '/plates/' .. mdc.plates.divert.ad)
diff --git a/Mods/tech/mdc/kneeboard/14.lua b/Mods/tech/mdc/kneeboard/14.lua
@@ -0,0 +1,9 @@
+-- 14 - divert procedure
+local lfs = require('lfs')
+local dataPath = lfs.writedir() .. 'Data\\mdc\\'
+local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'
+
+dofile(modPath..'mdc.lua')
+dofile(dataPath..'mdc.lua')
+
+plate(dataPath .. '/plates/' .. mdc.plates.divert.procedure)
diff --git a/Scripts/Hooks/mdc.lua b/Scripts/Hooks/mdc.lua
@@ -13,7 +13,7 @@ dofile(lfs.writedir() .. "Config\\mdc.lua")
 
 local http = require("socket.http")
 
-local num_scripts = 12
+local num_scripts = 14
 
 local copyScripts = function()
 	net.log("MDC - Installing kneeboard scripts")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- 1`
	`1`	`+-- 01 - lineup/loadout/procedures`
`2`	`2`	`local lfs = require('lfs')`
`3`	`3`	`local dataPath = lfs.writedir() .. 'Data\\mdc\\'`
`4`	`4`	`local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- 2`
	`1`	`+-- 02 - flight/comms plan`
`2`	`2`	`local lfs = require('lfs')`
`3`	`3`	`local dataPath = lfs.writedir() .. 'Data\\mdc\\'`
`4`	`4`	`local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- 3`
	`1`	`+-- 03 - notes`
`2`	`2`	`local lfs = require('lfs')`
`3`	`3`	`local dataPath = lfs.writedir() .. 'Data\\mdc\\'`
`4`	`4`	`local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- 4`
	`1`	`+-- 04 - support`
`2`	`2`	`local lfs = require('lfs')`
`3`	`3`	`local dataPath = lfs.writedir() .. 'Data\\mdc\\'`
`4`	`4`	`local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`--- 4`
	`1`	`+-- 05 - other flights`
`2`	`2`	`local lfs = require('lfs')`
`3`	`3`	`local dataPath = lfs.writedir() .. 'Data\\mdc\\'`
`4`	`4`	`local modPath = lfs.writedir() .. 'Mods\\tech\\mdc\\'`