diff --git a/mine/server.lua b/mine/server.lua index 125518d..8e04e89 100644 --- a/mine/server.lua +++ b/mine/server.lua @@ -1,5 +1,8 @@ rednet.open("back") +state = {} +ores = {} + curjob = 69 while true do print("From what index do you want to resume jobs?") @@ -16,6 +19,22 @@ function getNextJob() return curjob - 1 end +function drawState() + print("owwe") + print() + print() + print() + print() + print() + print() + print() + print() + print() + print() + print() + print() +end + while true do sender, message, proto = rednet.receive() if not message then @@ -34,6 +53,7 @@ while true do else rednet.send(receiver, "nojobs") end + drawState() elseif message == "report" then _, job, _ = rednet.receive() thejob = tonumber(job) @@ -46,31 +66,16 @@ while true do end _, number, _ = rednet.receive() --thenumber = tonumber(thenumber) - print(tostring(job)..": "..ore.." "..tostring(number).."x") + if ores[ore] then + ores[ore] = ores[ore] + tonumber(number) + else + ores[ore] = tonumber(number) + end + drawState() end rednet.send(receiver, "thanks") end end end - -- if message == "gibjob" then - -- if rs.getInput("top") then - -- job = getNextJob() - -- rednet.send(sender, tostring(job), "newjob") - -- print("Found job request. Offering "..tostring(job)) - -- end - -- else - -- -- numberic job is complete - -- completejob = tonumber(message) - -- fuelused = "??" - -- fuelsender, fuelmessage, fuelproto = rednet.receive("fuel") - -- if fuelmessage then - -- fuelused = fuelmessage - -- end - -- print("Job "..tostring(completejob).." was completed, "..fuelused.." fuel was used") - -- rednet.broadcast("thanks", "jobcomplete") - -- log = io.open("jobs.log","a") - -- log:write(tostring(completejob),"\n") - -- log:close() - -- end end end