This commit is contained in:
Igor Timofeev 2016-04-01 12:42:58 +03:00
parent 11f4734b48
commit bb63a47cbe
2 changed files with 18 additions and 18 deletions

View File

@ -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",

View File

@ -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