From de5daf49bd4484f84f868aaefb098eb1b273e9e8 Mon Sep 17 00:00:00 2001 From: Gabriel Moreira Minossi Date: Sun, 17 Jan 2021 23:36:25 -0300 Subject: [PATCH] Removing references to self because real machines have no references to self Improving working/not working behaviour on MockMultiblock --- .../data/mock/mock-multi-block.lua | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Programs/monitor-system/data/mock/mock-multi-block.lua b/Programs/monitor-system/data/mock/mock-multi-block.lua index cdf3121..e465a31 100644 --- a/Programs/monitor-system/data/mock/mock-multi-block.lua +++ b/Programs/monitor-system/data/mock/mock-multi-block.lua @@ -8,34 +8,35 @@ local MockMultiBlock = MockSingleBlock, { name = "MockMultiBlock", - progress = 0, - maxProgress = 0, + isBroken = false } ) -function MockMultiBlock:getSensorInformation() - self.progress = self.progress + 1 - if self.progress > self.maxProgress then - self.maxProgress = math.random(500) - self.progress = 0 +function MockMultiBlock.getSensorInformation() + MockMultiBlock.workProgress = MockMultiBlock.workProgress + 1 + if MockMultiBlock.workProgress > MockMultiBlock.workMaxProgress then + MockMultiBlock.workProgress = 0 end - self.isBroken = self.isBroken or math.random(100000) > 99999 + if MockMultiBlock.workAllowed and not MockMultiBlock.isBroken and math.random(1000) > 999 then + MockMultiBlock.workMaxProgress = math.random(500) + end + MockMultiBlock.isBroken = MockMultiBlock.isBroken or math.random(100000) > 99999 return { - "Progress: §a" .. self.progress .. "§r s / §e" .. self.maxProgress .. "§r s", + "Progress: §a" .. MockMultiBlock.workProgress .. "§r s / §e" .. MockMultiBlock.workMaxProgress .. "§r s", "Stored Energy: §a1000§r EU / §e1000§r EU", "Probably uses: §c4§r EU/t", "Max Energy Income: §e128§r EU/t(x2A) Tier: §eMV§r", - "Problems: §c" .. self.isBroken and 1 or 0 .. "§r Efficiency: §e100.0§r %", + "Problems: §c" .. (MockMultiBlock.isBroken and 1 or 0) .. "§r Efficiency: §e100.0§r %", "Pollution reduced to: §a0§r %", n = 6 } end -function MockMultiBlock:setWorkAllowed(allow) - if self.isBroken then - self.isBroken = false +function MockMultiBlock.setWorkAllowed(allow) + if MockMultiBlock.isBroken then + MockMultiBlock.isBroken = false end - self.workAllowed = allow + MockMultiBlock.workAllowed = allow end return MockMultiBlock