mrkubax10/industrialtest
1
3
Fork 3
Code Issues 2 Pull Requests Packages Projects Releases 7 Wiki Activity

Fixes in ActivatedElectricMachine and ElectricMachine

Browse Source
This commit is contained in:
mrkubax10
2024-10-25 12:40:27 +02:00
parent 1f6f711b64
commit 83ee6fb4c8
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
machines/activated_electric_machine.lua
View File

@@ -17,14 +17,17 @@
industrialtest.ActivatedElectricMachine=table.copy(industrialtest.ElectricMachine)
function industrialtest.ActivatedElectricMachine.onTimer(self,pos,elapsed)
industrialtest.ElectricMachine.requestPower(self,pos)
return industrialtest.ActivatedMachine.onTimer(self,pos,elapsed)
local result=self:powerExchange(pos)
local result2=industrialtest.ActivatedMachine.onTimer(self,pos,elapsed)
return result or result2
end
industrialtest.ActivatedElectricMachine.register=industrialtest.ActivatedMachine.register
industrialtest.ActivatedElectricMachine.createDefinitionTable=industrialtest.ActivatedMachine.createDefinitionTable
industrialtest.ActivatedElectricMachine.createActiveDefinitionTable=industrialtest.ActivatedMachine.createActiveDefinitionTable
industrialtest.ActivatedElectricMachine.shouldActivate=industrialtest.ActivatedMachine.shouldActivate
industrialtest.ActivatedElectricMachine.shouldDeactivate=industrialtest.ActivatedMachine.shouldDeactivate
@@ -34,7 +37,8 @@ industrialtest.ActivatedElectricMachine.afterActivation=industrialtest.Activated
industrialtest.ActivatedElectricMachine.afterDeactivation=industrialtest.ActivatedMachine.afterDeactivation
function industrialtest.ActivatedElectricMachine.activeOnTimer(self,pos,elapsed)
industrialtest.ElectricMachine.requestPower(self,pos)
return industrialtest.ActivatedMachine.activeOnTimer(self,pos,elapsed)
local result=self:powerExchange(pos)
local result2=industrialtest.ActivatedMachine.activeOnTimer(self,pos,elapsed)
return result or result2
end