From d2e25cb9517a04557f8984f862a06cdbb168d47e Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Mon, 8 Jul 2019 00:15:50 -0400 Subject: [PATCH] minor tweaks --- common/multiMiner.lua | 2 +- milo/apis/init.lua | 4 ++-- milo/autorun/milo.lua | 7 ++----- miners/scanningMiner.lua | 2 +- packages.list | 3 +-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/common/multiMiner.lua b/common/multiMiner.lua index f62a110..5b40286 100644 --- a/common/multiMiner.lua +++ b/common/multiMiner.lua @@ -131,7 +131,7 @@ local function run(member, point) local function emptySlots(retain, pt) local slots = turtle.getFilledSlots() for _,slot in pairs(slots) do - if not retain[slot.key] then + if not retain[slot.key] and not slot.name:find('turtle') then turtle.select(slot.index) if pt then turtle.dropAt(pt, 64) diff --git a/milo/apis/init.lua b/milo/apis/init.lua index 8bfdb55..5287811 100644 --- a/milo/apis/init.lua +++ b/milo/apis/init.lua @@ -222,8 +222,8 @@ function Milo:eject(item, count) total = total + amount count = count - amount - Sound.play('ui.button.click') - --Sound.play('entity.illusion_illager.death', .3) + --Sound.play('ui.button.click') + Sound.play('entity.illusion_illager.death', .3) turtle.emptyInventory() end return total diff --git a/milo/autorun/milo.lua b/milo/autorun/milo.lua index 2e7966f..bbb626f 100644 --- a/milo/autorun/milo.lua +++ b/milo/autorun/milo.lua @@ -2,11 +2,8 @@ local fs = _G.fs local peripheral = _G.peripheral local shell = _ENV.shell -if fs.exists('packages/milo/Milo.lua') then - fs.delete('packages/milo/Milo.lua') - fs.delete('packages/milo/plugins/listing.lua') -end - +fs.delete('packages/milo/Milo.lua') +fs.delete('packages/milo/plugins/listing.lua') fs.delete('packages/milo/apis/milo.lua') fs.delete('packages/milo/plugins/manipulator.lua') diff --git a/miners/scanningMiner.lua b/miners/scanningMiner.lua index 8c002de..1d5e361 100644 --- a/miners/scanningMiner.lua +++ b/miners/scanningMiner.lua @@ -592,7 +592,7 @@ Event.addRoutine(function() _G._syslog({ distance = distance, maxDistance = maxDistance }) - if distance > maxDistance + 16 then + if distance > maxDistance + 32 then term.clear() term.setCursorPos(1, 1) _G.printError('WARNING\n\nTurtle is outside the mining area\n') diff --git a/packages.list b/packages.list index 5f00076..7f56846 100644 --- a/packages.list +++ b/packages.list @@ -7,7 +7,7 @@ -- [ 'forestry' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/forestry/.package', [ 'games' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/games/.package', -- [ 'glasses' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/glasses/.package', - [ 'gps' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/gps/.package', + [ 'gps' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/gps/.package', [ 'mbs' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/mbs/.package', [ 'milo' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/milo/.package', [ 'miners' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/miners/.package', @@ -16,7 +16,6 @@ -- [ 'pickup' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/pickup/.package', [ 'recipeBook' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/recipeBook/.package', [ 'shellex' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/shellex/.package', --- [ 'storage' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/storage/.package', [ 'swshop' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/swshop/.package', [ 'turtle' ] = 'https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/turtle/.package', } \ No newline at end of file