diff --git a/Applications.txt b/Applications.txt index 604493e3..d2eed945 100644 --- a/Applications.txt +++ b/Applications.txt @@ -765,20 +765,20 @@ -- }, -- }, -- { - -- ["name"]="MineOS/Applications/TurretControl", - -- ["url"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/TurretControl.lua", - -- ["type"]="Application", - -- ["about"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/About.txt", - -- ["icon"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/Icon.pic", - -- ["createShortcut"]="desktop", - -- ["version"]=1.0, - -- ["resources"]={ - -- { - -- ["name"]="Turret.pic", - -- ["url"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/Turret.pic", - -- }, - -- }, - -- }, + ["name"]="MineOS/Applications/TurretControl", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/TurretControl.lua", + ["type"]="Application", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/About.txt", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.0, + ["resources"]={ + { + ["name"]="Turret.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/Turret.pic", + }, + }, + }, { ["name"]="MineOS/Applications/FlappyBird", ["url"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/FlappyBird.lua", diff --git a/Applications/TurretControl/TurretControl.lua b/Applications/TurretControl/TurretControl.lua index a1ea71b1..e0a0d833 100644 --- a/Applications/TurretControl/TurretControl.lua +++ b/Applications/TurretControl/TurretControl.lua @@ -50,16 +50,16 @@ end local function getTurrets() turretConfig.turretsOn = false - turretConfig.attacksNeutrals = false, - turretConfig.attacksPlayers = false, - turretConfig.attacksMobs = false, + turretConfig.attacksNeutrals = false + turretConfig.attacksPlayers = false + turretConfig.attacksMobs = false getProxiesOfAllComponents("tierOneTurretBase") getProxiesOfAllComponents("tierTwoTurretBase") getProxiesOfAllComponents("tierThreeTurretBase") getProxiesOfAllComponents("tierFourTurretBase") getProxiesOfAllComponents("tierFiveTurretBase") - + for i = 1, #proxies do -- print(proxies[i].type) if type(proxies[i].getCurrentEnergyStorage()) ~= "string" then