From f6087f53204628cacdeee973eed57f95b48f887b Mon Sep 17 00:00:00 2001 From: LemADEC Date: Wed, 20 Apr 2016 14:17:45 +0200 Subject: [PATCH] Improved reactor adjustment steps Improved exit for CC scripts --- .../lua.ComputerCraft/warpdriveEnanReactorCore/startup | 8 ++++---- .../lua.ComputerCraft/warpdriveMainframe/startup | 9 +++++---- .../lua.ComputerCraft/warpdriveShipController/startup | 1 + .../warpdriveEnanReactorCore/autorun.lua | 8 ++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveEnanReactorCore/startup b/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveEnanReactorCore/startup index b31b0ac9..f3a7fd56 100644 --- a/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveEnanReactorCore/startup +++ b/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveEnanReactorCore/startup @@ -486,22 +486,22 @@ function reactor_key(keycode) data_save() return true elseif keycode == 34 then -- G - data.reactor_rate = data.reactor_rate / 10 + data.reactor_rate = data.reactor_rate - 1000 reactor_setMode() data_save() return true elseif keycode == 20 then -- T - data.reactor_rate = data.reactor_rate * 10 + data.reactor_rate = data.reactor_rate + 1000 reactor_setMode() data_save() return true elseif keycode == 36 then -- J - data.reactor_laserAmount = data.reactor_laserAmount / 10 + data.reactor_laserAmount = data.reactor_laserAmount - 500 reactor_setLaser() data_save() return true elseif keycode == 22 then -- U - data.reactor_laserAmount = data.reactor_laserAmount * 10 + data.reactor_laserAmount = data.reactor_laserAmount + 500 reactor_setLaser() data_save() return true diff --git a/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveMainframe/startup b/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveMainframe/startup index 18963a64..f3ae679a 100644 --- a/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveMainframe/startup +++ b/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveMainframe/startup @@ -1205,22 +1205,22 @@ function reactor_key(keycode) data_save() return true elseif keycode == 34 then -- G - data.reactor_rate = data.reactor_rate / 10 + data.reactor_rate = data.reactor_rate - 1000 reactor_setMode() data_save() return true elseif keycode == 20 then -- T - data.reactor_rate = data.reactor_rate * 10 + data.reactor_rate = data.reactor_rate + 1000 reactor_setMode() data_save() return true elseif keycode == 36 then -- J - data.reactor_laserAmount = data.reactor_laserAmount / 10 + data.reactor_laserAmount = data.reactor_laserAmount - 500 reactor_setLaser() data_save() return true elseif keycode == 22 then -- U - data.reactor_laserAmount = data.reactor_laserAmount * 10 + data.reactor_laserAmount = data.reactor_laserAmount + 500 reactor_setLaser() data_save() return true @@ -2069,6 +2069,7 @@ repeat if eventName == "key" then keycode = params[2] if char == 88 or char == 120 or keycode == 45 then -- x for eXit + os.pullEventRaw() abort = true elseif char == 48 or keycode == 11 or keycode == 82 then -- 0 page = connections_page diff --git a/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveShipController/startup b/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveShipController/startup index cf2bd261..4363e9d3 100644 --- a/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveShipController/startup +++ b/src/main/resources/assets/warpdrive/lua.ComputerCraft/warpdriveShipController/startup @@ -950,6 +950,7 @@ repeat if eventName == "key" then keycode = params[2] if char == 88 or char == 120 or keycode == 45 then -- x for eXit + os.pullEventRaw() abort = true elseif char == 48 or keycode == 11 or keycode == 82 then -- 0 page = connections_page diff --git a/src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveEnanReactorCore/autorun.lua b/src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveEnanReactorCore/autorun.lua index 4e14ab14..74efe155 100644 --- a/src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveEnanReactorCore/autorun.lua +++ b/src/main/resources/assets/warpdrive/lua.OpenComputers/warpdriveEnanReactorCore/autorun.lua @@ -442,22 +442,22 @@ function reactor_key(char, keycode) data_save() return true elseif char == 71 or char == 103 then -- G - data.reactor_rate = data.reactor_rate / 10 + data.reactor_rate = data.reactor_rate - 1000 reactor_setMode() data_save() return true elseif char == 84 or char == 116 then -- T - data.reactor_rate = data.reactor_rate * 10 + data.reactor_rate = data.reactor_rate + 1000 reactor_setMode() data_save() return true elseif char == 74 or char == 106 then -- J - data.reactor_laserAmount = data.reactor_laserAmount / 10 + data.reactor_laserAmount = data.reactor_laserAmount - 500 reactor_setLaser() data_save() return true elseif char == 85 or char == 117 then -- U - data.reactor_laserAmount = data.reactor_laserAmount * 10 + data.reactor_laserAmount = data.reactor_laserAmount + 500 reactor_setLaser() data_save() return true