Tweaked item-trigger.

develop
expwnent 2014-07-01 00:02:19 -04:00
parent f58e659193
commit f4c948054e
1 changed files with 11 additions and 7 deletions

@ -6,7 +6,7 @@
local eventful = require 'plugins.eventful' local eventful = require 'plugins.eventful'
local utils = require 'utils' local utils = require 'utils'
eventful.enableEvent(eventful.eventType.UNIT_ATTACK,1) -- this event type is cheap, so checking every tick is fine eventful.enableEvent(eventful.eventType.UNIT_ATTACK,1) -- this event type is cheap, so checking every tick is fine
eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,1000) --this is expensive, but you'll still want to set it lower --eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,1000) --this is expensive, but you'll still want to set it lower
eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,1) eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,1)
itemTriggers = itemTriggers or {} itemTriggers = itemTriggers or {}
@ -70,7 +70,6 @@ function handler(table)
for _,command in ipairs(itemTriggers[itemType] or {}) do for _,command in ipairs(itemTriggers[itemType] or {}) do
if command[table.mode] then if command[table.mode] then
print('asdf')
fillTable(command,table) fillTable(command,table)
processTrigger(command) processTrigger(command)
unfillTable(command,table) unfillTable(command,table)
@ -79,7 +78,6 @@ function handler(table)
for _,command in ipairs(materialTriggers[itemMatStr] or {}) do for _,command in ipairs(materialTriggers[itemMatStr] or {}) do
if command[table.mode] then if command[table.mode] then
print('asdf')
fillTable(command,table) fillTable(command,table)
processTrigger(command) processTrigger(command)
unfillTable(command,table) unfillTable(command,table)
@ -91,7 +89,6 @@ function handler(table)
local contaminantStr = contaminantMat:getToken() local contaminantStr = contaminantMat:getToken()
table.contaminantMat = contaminantMat table.contaminantMat = contaminantMat
for _,command in ipairs(contaminantTriggers[contaminantStr] or {}) do for _,command in ipairs(contaminantTriggers[contaminantStr] or {}) do
print('asdf')
fillTable(command,table) fillTable(command,table)
processTrigger(command) processTrigger(command)
unfillTable(command,table) unfillTable(command,table)
@ -150,11 +147,18 @@ if args.clear then
contaminantTriggers = {} contaminantTriggers = {}
end end
if args.checkEvery then if args.checkAttackEvery then
if not tonumber(args.checkEvery) then if not tonumber(args.checkAttackEvery) then
error('checkEvery must be a number') error('checkEvery must be a number')
end end
eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,tonumber(args.checkEvery)) eventful.enableEvent(eventful.eventType.UNIT_ATTACK,tonumber(args.checkAttackEvery))
end
if args.checkInventoryEvery then
if not tonumber(args.checkInventoryEvery) then
error('checkEvery must be a number')
end
eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,tonumber(args.checkInventoryEvery))
end end
if not args.command then if not args.command then