Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved weapon controller configuration pages

Browse source
This commit is contained in:
Unknown 2019-10-02 03:29:00 +02:00 committed by unknown
parent e6092443d7
commit d5b53b15d3
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveWeaponController/startup
View file

@ -79,7 +79,7 @@ function laser_getDescription(address)
return "~not defined~"
end
local laser = w.device_get(address)
if laser == nil or laser.position == nil then
if laser == nil or laser.getLocalPosition == nil then
return "~invalid~"
end
local x, y, z = laser.getLocalPosition()
@ -250,7 +250,7 @@ function laser_battery_config()
return
end
w.page_begin(w.data_getName() .. " - Laser battery configuration")
w.setCursorPos(1, 4)
w.setCursorPos(1, 5)
w.setColorHelp()
w.writeFullLine(" Press enter to validate.")
w.setCursorPos(1, 3)
@ -260,6 +260,7 @@ function laser_battery_config()
w.setCursorPos(1, 3)
w.clearLine()
w.writeLn("Battery name set to " .. laserbattery.name)
w.setCursorPos(1, 5)
w.clearLine()
if laserbattery.head == nil then
@ -360,7 +361,7 @@ function laser_battery_linkLasers()
local key = 1
local addressCurrent = nil
repeat
w.setCursorPos(1, 10 + (key % 5))
w.setCursorPos(1, 10 + (key % 7))
w.setColorNormal()
w.write("Booster #" .. key)
addressCurrent = nil
@ -569,7 +570,7 @@ function laser_station_config()
return
end
w.page_begin(w.data_getName() .. " - Laser station configuration")
w.setCursorPos(1, 4)
w.setCursorPos(1, 5)
w.setColorHelp()
w.writeFullLine(" Press enter to validate.")
w.setCursorPos(1, 3)
@ -579,6 +580,7 @@ function laser_station_config()
w.setCursorPos(1, 3)
w.clearLine()
w.writeLn("Laser station name set to " .. laserstation.name)
w.setCursorPos(1, 5)
w.clearLine()
if laserstation.camera == nil then
@ -598,7 +600,7 @@ function laser_station_config()
repeat
w.setCursorPos(1, 7)
w.setColorNormal()
w.write("Camera video channel (" .. w.format_integer(camVideoChannel, 5) .. "): ")
w.write("Camera video channel (" .. w.format_integer(camVideoChannel, 9) .. "): ")
channel = w.input_readInteger(camVideoChannel)
if channel ~= 0 and (channel < 0 or channel > 268435455) then
w.status_showWarning("This is not a valid video channel. Try again.")

12
src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveWeaponController/startup
View file

@ -78,7 +78,7 @@ function laser_getDescription(address)
return "~not defined~"
end
local laser = w.device_get(address)
if laser == nil or laser.position == nil then
if laser == nil or laser.getLocalPosition == nil then
return "~invalid~"
end
local x, y, z = laser.getLocalPosition()
@ -249,7 +249,7 @@ function laser_battery_config()
return
end
w.page_begin(w.data_getName() .. " - Laser battery configuration")
w.setCursorPos(1, 4)
w.setCursorPos(1, 5)
w.setColorHelp()
w.writeFullLine(" Press enter to validate.")
w.setCursorPos(1, 3)
@ -259,6 +259,7 @@ function laser_battery_config()
w.setCursorPos(1, 3)
w.clearLine()
w.writeLn("Battery name set to " .. laserbattery.name)
w.setCursorPos(1, 5)
w.clearLine()
if laserbattery.head == nil then
@ -359,7 +360,7 @@ function laser_battery_linkLasers()
local key = 1
local addressCurrent = nil
repeat
w.setCursorPos(1, 10 + (key % 5))
w.setCursorPos(1, 10 + (key % 7))
w.setColorNormal()
w.write("Booster #" .. key)
addressCurrent = nil
@ -568,7 +569,7 @@ function laser_station_config()
return
end
w.page_begin(w.data_getName() .. " - Laser station configuration")
w.setCursorPos(1, 4)
w.setCursorPos(1, 5)
w.setColorHelp()
w.writeFullLine(" Press enter to validate.")
w.setCursorPos(1, 3)
@ -578,6 +579,7 @@ function laser_station_config()
w.setCursorPos(1, 3)
w.clearLine()
w.writeLn("Laser station name set to " .. laserstation.name)
w.setCursorPos(1, 5)
w.clearLine()
if laserstation.camera == nil then
@ -597,7 +599,7 @@ function laser_station_config()
repeat
w.setCursorPos(1, 7)
w.setColorNormal()
w.write("Camera video channel (" .. w.format_integer(camVideoChannel, 5) .. "): ")
w.write("Camera video channel (" .. w.format_integer(camVideoChannel, 9) .. "): ")
channel = w.input_readInteger(camVideoChannel)
if channel ~= 0 and (channel < 0 or channel > 268435455) then
w.status_showWarning("This is not a valid video channel. Try again.")